|
0 |
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
1 |
## 01_i18n.dpatch
|
|
2 |
## All lines beginning with `## DP:' are a description of the patch.
|
|
3 |
## DP: Add an install target to the Makefile and fix binary name
|
|
4 |
##
|
|
5 |
##===============================
|
|
6 |
## Dillo i18n patch by Kiyo
|
|
7 |
##===============================
|
|
8 |
##
|
|
9 |
##This is an unofficial i18n patch.
|
|
10 |
##Please see ChangeLog for details.
|
|
11 |
##Please do not ask a dillo team about this patch.
|
|
12 |
##
|
|
13 |
##The newest patch can get in http://teki.jpn.ph/pc/software/index-e.shtml
|
|
14 |
##If you found bug, please mail to webmaster@teki.jpn.ph.
|
|
15 |
|
|
16 |
@DPATCH@
|
|
17 |
diff -pruN dillo-0.8.6/ABOUT-NLS dillo-0.8.6-i18n-misc-20070916/ABOUT-NLS
|
|
18 |
--- dillo-0.8.6/ABOUT-NLS 1970-01-01 09:00:00.000000000 +0900
|
|
19 |
+++ dillo-0.8.6-i18n-misc-20070916/ABOUT-NLS 2006-05-16 01:21:07.000000000 +0900
|
|
20 |
@@ -0,0 +1,432 @@
|
|
21 |
+Notes on the Free Translation Project
|
|
22 |
+*************************************
|
|
23 |
+
|
|
24 |
+ Free software is going international! The Free Translation Project
|
|
25 |
+is a way to get maintainers of free software, translators, and users all
|
|
26 |
+together, so that will gradually become able to speak many languages.
|
|
27 |
+A few packages already provide translations for their messages.
|
|
28 |
+
|
|
29 |
+ If you found this `ABOUT-NLS' file inside a distribution, you may
|
|
30 |
+assume that the distributed package does use GNU `gettext' internally,
|
|
31 |
+itself available at your nearest GNU archive site. But you do _not_
|
|
32 |
+need to install GNU `gettext' prior to configuring, installing or using
|
|
33 |
+this package with messages translated.
|
|
34 |
+
|
|
35 |
+ Installers will find here some useful hints. These notes also
|
|
36 |
+explain how users should proceed for getting the programs to use the
|
|
37 |
+available translations. They tell how people wanting to contribute and
|
|
38 |
+work at translations should contact the appropriate team.
|
|
39 |
+
|
|
40 |
+ When reporting bugs in the `intl/' directory or bugs which may be
|
|
41 |
+related to internationalization, you should tell about the version of
|
|
42 |
+`gettext' which is used. The information can be found in the
|
|
43 |
+`intl/VERSION' file, in internationalized packages.
|
|
44 |
+
|
|
45 |
+Quick configuration advice
|
|
46 |
+==========================
|
|
47 |
+
|
|
48 |
+ If you want to exploit the full power of internationalization, you
|
|
49 |
+should configure it using
|
|
50 |
+
|
|
51 |
+ ./configure --with-included-gettext
|
|
52 |
+
|
|
53 |
+to force usage of internationalizing routines provided within this
|
|
54 |
+package, despite the existence of internationalizing capabilities in the
|
|
55 |
+operating system where this package is being installed. So far, only
|
|
56 |
+the `gettext' implementation in the GNU C library version 2 provides as
|
|
57 |
+many features (such as locale alias, message inheritance, automatic
|
|
58 |
+charset conversion or plural form handling) as the implementation here.
|
|
59 |
+It is also not possible to offer this additional functionality on top
|
|
60 |
+of a `catgets' implementation. Future versions of GNU `gettext' will
|
|
61 |
+very likely convey even more functionality. So it might be a good idea
|
|
62 |
+to change to GNU `gettext' as soon as possible.
|
|
63 |
+
|
|
64 |
+ So you need _not_ provide this option if you are using GNU libc 2 or
|
|
65 |
+you have installed a recent copy of the GNU gettext package with the
|
|
66 |
+included `libintl'.
|
|
67 |
+
|
|
68 |
+INSTALL Matters
|
|
69 |
+===============
|
|
70 |
+
|
|
71 |
+ Some packages are "localizable" when properly installed; the
|
|
72 |
+programs they contain can be made to speak your own native language.
|
|
73 |
+Most such packages use GNU `gettext'. Other packages have their own
|
|
74 |
+ways to internationalization, predating GNU `gettext'.
|
|
75 |
+
|
|
76 |
+ By default, this package will be installed to allow translation of
|
|
77 |
+messages. It will automatically detect whether the system already
|
|
78 |
+provides the GNU `gettext' functions. If not, the GNU `gettext' own
|
|
79 |
+library will be used. This library is wholly contained within this
|
|
80 |
+package, usually in the `intl/' subdirectory, so prior installation of
|
|
81 |
+the GNU `gettext' package is _not_ required. Installers may use
|
|
82 |
+special options at configuration time for changing the default
|
|
83 |
+behaviour. The commands:
|
|
84 |
+
|
|
85 |
+ ./configure --with-included-gettext
|
|
86 |
+ ./configure --disable-nls
|
|
87 |
+
|
|
88 |
+will respectively bypass any pre-existing `gettext' to use the
|
|
89 |
+internationalizing routines provided within this package, or else,
|
|
90 |
+_totally_ disable translation of messages.
|
|
91 |
+
|
|
92 |
+ When you already have GNU `gettext' installed on your system and run
|
|
93 |
+configure without an option for your new package, `configure' will
|
|
94 |
+probably detect the previously built and installed `libintl.a' file and
|
|
95 |
+will decide to use this. This might be not what is desirable. You
|
|
96 |
+should use the more recent version of the GNU `gettext' library. I.e.
|
|
97 |
+if the file `intl/VERSION' shows that the library which comes with this
|
|
98 |
+package is more recent, you should use
|
|
99 |
+
|
|
100 |
+ ./configure --with-included-gettext
|
|
101 |
+
|
|
102 |
+to prevent auto-detection.
|
|
103 |
+
|
|
104 |
+ The configuration process will not test for the `catgets' function
|
|
105 |
+and therefore it will not be used. The reason is that even an
|
|
106 |
+emulation of `gettext' on top of `catgets' could not provide all the
|
|
107 |
+extensions of the GNU `gettext' library.
|
|
108 |
+
|
|
109 |
+ Internationalized packages have usually many `po/LL.po' files, where
|
|
110 |
+LL gives an ISO 639 two-letter code identifying the language. Unless
|
|
111 |
+translations have been forbidden at `configure' time by using the
|
|
112 |
+`--disable-nls' switch, all available translations are installed
|
|
113 |
+together with the package. However, the environment variable `LINGUAS'
|
|
114 |
+may be set, prior to configuration, to limit the installed set.
|
|
115 |
+`LINGUAS' should then contain a space separated list of two-letter
|
|
116 |
+codes, stating which languages are allowed.
|
|
117 |
+
|
|
118 |
+Using This Package
|
|
119 |
+==================
|
|
120 |
+
|
|
121 |
+ As a user, if your language has been installed for this package, you
|
|
122 |
+only have to set the `LANG' environment variable to the appropriate
|
|
123 |
+`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
|
|
124 |
+and `CC' is an ISO 3166 two-letter country code. For example, let's
|
|
125 |
+suppose that you speak German and live in Germany. At the shell
|
|
126 |
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
|
|
127 |
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
|
|
128 |
+This can be done from your `.login' or `.profile' file, once and for
|
|
129 |
+all.
|
|
130 |
+
|
|
131 |
+ You might think that the country code specification is redundant.
|
|
132 |
+But in fact, some languages have dialects in different countries. For
|
|
133 |
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
|
|
134 |
+country code serves to distinguish the dialects.
|
|
135 |
+
|
|
136 |
+ The locale naming convention of `LL_CC', with `LL' denoting the
|
|
137 |
+language and `CC' denoting the country, is the one use on systems based
|
|
138 |
+on GNU libc. On other systems, some variations of this scheme are
|
|
139 |
+used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
|
|
140 |
+locales supported by your system for your country by running the command
|
|
141 |
+`locale -a | grep '^LL''.
|
|
142 |
+
|
|
143 |
+ Not all programs have translations for all languages. By default, an
|
|
144 |
+English message is shown in place of a nonexistent translation. If you
|
|
145 |
+understand other languages, you can set up a priority list of languages.
|
|
146 |
+This is done through a different environment variable, called
|
|
147 |
+`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
|
|
148 |
+for the purpose of message handling, but you still need to have `LANG'
|
|
149 |
+set to the primary language; this is required by other parts of the
|
|
150 |
+system libraries. For example, some Swedish users who would rather
|
|
151 |
+read translations in German than English for when Swedish is not
|
|
152 |
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
|
|
153 |
+
|
|
154 |
+ In the `LANGUAGE' environment variable, but not in the `LANG'
|
|
155 |
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
|
|
156 |
+to denote the language's main dialect. For example, `de' is equivalent
|
|
157 |
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
|
|
158 |
+(Portuguese as spoken in Portugal) in this context.
|
|
159 |
+
|
|
160 |
+Translating Teams
|
|
161 |
+=================
|
|
162 |
+
|
|
163 |
+ For the Free Translation Project to be a success, we need interested
|
|
164 |
+people who like their own language and write it well, and who are also
|
|
165 |
+able to synergize with other translators speaking the same language.
|
|
166 |
+Each translation team has its own mailing list. The up-to-date list of
|
|
167 |
+teams can be found at the Free Translation Project's homepage,
|
|
168 |
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
|
|
169 |
+area.
|
|
170 |
+
|
|
171 |
+ If you'd like to volunteer to _work_ at translating messages, you
|
|
172 |
+should become a member of the translating team for your own language.
|
|
173 |
+The subscribing address is _not_ the same as the list itself, it has
|
|
174 |
+`-request' appended. For example, speakers of Swedish can send a
|
|
175 |
+message to `sv-request@li.org', having this message body:
|
|
176 |
+
|
|
177 |
+ subscribe
|
|
178 |
+
|
|
179 |
+ Keep in mind that team members are expected to participate
|
|
180 |
+_actively_ in translations, or at solving translational difficulties,
|
|
181 |
+rather than merely lurking around. If your team does not exist yet and
|
|
182 |
+you want to start one, or if you are unsure about what to do or how to
|
|
183 |
+get started, please write to `translation@iro.umontreal.ca' to reach the
|
|
184 |
+coordinator for all translator teams.
|
|
185 |
+
|
|
186 |
+ The English team is special. It works at improving and uniformizing
|
|
187 |
+the terminology in use. Proven linguistic skill are praised more than
|
|
188 |
+programming skill, here.
|
|
189 |
+
|
|
190 |
+Available Packages
|
|
191 |
+==================
|
|
192 |
+
|
|
193 |
+ Languages are not equally supported in all packages. The following
|
|
194 |
+matrix shows the current state of internationalization, as of July
|
|
195 |
+2002. The matrix shows, in regard of each package, for which languages
|
|
196 |
+PO files have been submitted to translation coordination, with a
|
|
197 |
+translation percentage of at least 50%.
|
|
198 |
+
|
|
199 |
+ Ready PO files be bg ca cs da de el en eo es et fi fr
|
|
200 |
+ +----------------------------------------+
|
|
201 |
+ a2ps | [] [] [] [] |
|
|
202 |
+ bash | [] [] [] [] |
|
|
203 |
+ bfd | [] [] |
|
|
204 |
+ binutils | [] [] |
|
|
205 |
+ bison | [] [] [] [] |
|
|
206 |
+ clisp | [] [] [] [] |
|
|
207 |
+ clisp | |
|
|
208 |
+ clisplow | |
|
|
209 |
+ cpio | [] [] [] [] |
|
|
210 |
+ darkstat | () |
|
|
211 |
+ diffutils | [] [] [] [] [] [] |
|
|
212 |
+ enscript | [] [] |
|
|
213 |
+ error | [] [] [] |
|
|
214 |
+ fetchmail | [] () [] [] [] () |
|
|
215 |
+ fileutils | [] [] [] [] [] |
|
|
216 |
+ findutils | [] [] [] [] [] [] |
|
|
217 |
+ flex | [] [] [] [] [] |
|
|
218 |
+ gas | [] [] |
|
|
219 |
+ gawk | [] [] [] |
|
|
220 |
+ gcal | [] [] |
|
|
221 |
+ gcc | [] [] |
|
|
222 |
+ gettext | [] [] [] [] [] |
|
|
223 |
+ gnupg | [] [] [] [] [] [] [] |
|
|
224 |
+ gprof | [] [] |
|
|
225 |
+ gpsdrive | () () () () () |
|
|
226 |
+ grep | [] [] [] [] [] [] [] |
|
|
227 |
+ gretl | [] |
|
|
228 |
+ gthumb | () () () |
|
|
229 |
+ hello | [] [] [] [] [] [] [] [] [] |
|
|
230 |
+ id-utils | [] [] [] |
|
|
231 |
+ indent | [] [] [] [] [] |
|
|
232 |
+ jpilot | () [] [] [] |
|
|
233 |
+ jwhois | [] [] |
|
|
234 |
+ kbd | [] [] [] |
|
|
235 |
+ ld | [] [] |
|
|
236 |
+ libc | [] [] [] [] [] [] [] |
|
|
237 |
+ libiconv | [] [] [] [] |
|
|
238 |
+ lifelines | () () |
|
|
239 |
+ lilypond | [] [] [] |
|
|
240 |
+ lingoteach | [] [] |
|
|
241 |
+ lingoteach_lessons| () () |
|
|
242 |
+ lynx | [] [] [] [] [] |
|
|
243 |
+ m4 | [] [] [] [] [] |
|
|
244 |
+ make | [] [] [] [] |
|
|
245 |
+ man-db | [] () () [] () () |
|
|
246 |
+ mysecretdiary | [] [] [] |
|
|
247 |
+ nano | [] () [] [] [] [] |
|
|
248 |
+ nano_1_0 | [] () [] [] [] [] |
|
|
249 |
+ opcodes | [] [] [] |
|
|
250 |
+ parted | [] [] [] [] [] |
|
|
251 |
+ ptx | [] [] [] [] [] [] [] |
|
|
252 |
+ python | |
|
|
253 |
+ recode | [] [] [] [] [] [] |
|
|
254 |
+ sed | [] [] [] [] [] [] [] [] [] |
|
|
255 |
+ sh-utils | [] [] [] [] |
|
|
256 |
+ sharutils | [] [] [] [] [] [] |
|
|
257 |
+ sketch | () [] () |
|
|
258 |
+ soundtracker | [] [] [] |
|
|
259 |
+ sp | [] |
|
|
260 |
+ tar | [] [] [] [] [] [] |
|
|
261 |
+ texinfo | [] [] [] [] [] |
|
|
262 |
+ textutils | [] [] [] [] [] |
|
|
263 |
+ util-linux | [] [] [] [] [] [] |
|
|
264 |
+ vorbis-tools | [] |
|
|
265 |
+ wastesedge | |
|
|
266 |
+ wdiff | [] [] [] [] [] [] |
|
|
267 |
+ wget | [] [] [] [] [] [] [] [] [] [] |
|
|
268 |
+ +----------------------------------------+
|
|
269 |
+ be bg ca cs da de el en eo es et fi fr
|
|
270 |
+ 0 2 19 10 30 44 9 1 12 45 16 3 53
|
|
271 |
+
|
|
272 |
+ gl he hr hu id it ja ko lv nb nl nn
|
|
273 |
+ +-------------------------------------+
|
|
274 |
+ a2ps | () () [] |
|
|
275 |
+ bash | [] |
|
|
276 |
+ bfd | [] |
|
|
277 |
+ binutils | [] |
|
|
278 |
+ bison | [] [] [] [] |
|
|
279 |
+ clisp | [] |
|
|
280 |
+ clisp | |
|
|
281 |
+ clisplow | |
|
|
282 |
+ cpio | [] [] [] [] |
|
|
283 |
+ darkstat | () |
|
|
284 |
+ diffutils | [] [] [] [] [] |
|
|
285 |
+ enscript | [] [] |
|
|
286 |
+ error | [] |
|
|
287 |
+ fetchmail | [] |
|
|
288 |
+ fileutils | [] [] [] |
|
|
289 |
+ findutils | [] [] [] [] [] [] [] [] |
|
|
290 |
+ flex | [] |
|
|
291 |
+ gas | |
|
|
292 |
+ gawk | [] |
|
|
293 |
+ gcal | |
|
|
294 |
+ gcc | [] |
|
|
295 |
+ gettext | [] [] |
|
|
296 |
+ gnupg | [] [] [] [] |
|
|
297 |
+ gprof | |
|
|
298 |
+ gpsdrive | [] () () |
|
|
299 |
+ grep | [] [] [] [] [] [] [] |
|
|
300 |
+ gretl | |
|
|
301 |
+ gthumb | () () |
|
|
302 |
+ hello | [] [] [] [] [] [] [] [] [] [] [] [] |
|
|
303 |
+ id-utils | [] [] |
|
|
304 |
+ indent | [] [] [] [] |
|
|
305 |
+ jpilot | () () |
|
|
306 |
+ jwhois | [] [] |
|
|
307 |
+ kbd | |
|
|
308 |
+ ld | |
|
|
309 |
+ libc | [] [] [] [] |
|
|
310 |
+ libiconv | [] [] [] |
|
|
311 |
+ lifelines | |
|
|
312 |
+ lilypond | [] [] |
|
|
313 |
+ lingoteach | [] |
|
|
314 |
+ lingoteach_lessons| |
|
|
315 |
+ lynx | [] [] [] [] |
|
|
316 |
+ m4 | [] [] [] [] |
|
|
317 |
+ make | [] [] [] [] [] [] |
|
|
318 |
+ man-db | () () |
|
|
319 |
+ mysecretdiary | [] |
|
|
320 |
+ nano | [] [] [] [] [] [] |
|
|
321 |
+ nano_1_0 | [] [] [] [] [] |
|
|
322 |
+ opcodes | [] [] |
|
|
323 |
+ parted | [] [] [] |
|
|
324 |
+ ptx | [] [] [] [] [] |
|
|
325 |
+ python | |
|
|
326 |
+ recode | [] [] [] |
|
|
327 |
+ sed | [] [] [] [] [] [] [] [] |
|
|
328 |
+ sh-utils | [] [] [] |
|
|
329 |
+ sharutils | [] [] [] |
|
|
330 |
+ sketch | () |
|
|
331 |
+ soundtracker | [] [] |
|
|
332 |
+ sp | |
|
|
333 |
+ tar | [] [] [] [] [] |
|
|
334 |
+ texinfo | [] [] [] |
|
|
335 |
+ textutils | [] [] [] |
|
|
336 |
+ util-linux | () [] |
|
|
337 |
+ vorbis-tools | |
|
|
338 |
+ wastesedge | |
|
|
339 |
+ wdiff | [] [] [] |
|
|
340 |
+ wget | [] [] [] [] [] [] |
|
|
341 |
+ +-------------------------------------+
|
|
342 |
+ gl he hr hu id it ja ko lv nb nl nn
|
|
343 |
+ 23 9 12 18 14 13 26 9 1 8 19 4
|
|
344 |
+
|
|
345 |
+ no pl pt pt_BR ru sk sl sv tr uk zh_TW
|
|
346 |
+ +----------------------------------------+
|
|
347 |
+ a2ps | () () () [] [] [] [] [] | 10
|
|
348 |
+ bash | [] | 6
|
|
349 |
+ bfd | [] [] | 5
|
|
350 |
+ binutils | [] [] | 5
|
|
351 |
+ bison | [] [] [] | 11
|
|
352 |
+ clisp | | 5
|
|
353 |
+ clisp | | 0
|
|
354 |
+ clisplow | | 0
|
|
355 |
+ cpio | [] [] [] [] | 12
|
|
356 |
+ darkstat | [] () | 1
|
|
357 |
+ diffutils | [] [] [] [] [] [] | 17
|
|
358 |
+ enscript | [] [] [] [] | 8
|
|
359 |
+ error | [] [] [] | 7
|
|
360 |
+ fetchmail | () () [] | 6
|
|
361 |
+ fileutils | [] [] [] [] [] | 13
|
|
362 |
+ findutils | [] [] [] [] [] [] [] | 21
|
|
363 |
+ flex | [] [] [] | 9
|
|
364 |
+ gas | [] | 3
|
|
365 |
+ gawk | [] [] | 6
|
|
366 |
+ gcal | [] [] | 4
|
|
367 |
+ gcc | [] | 4
|
|
368 |
+ gettext | [] [] [] [] [] [] | 13
|
|
369 |
+ gnupg | [] [] [] | 14
|
|
370 |
+ gprof | [] [] | 4
|
|
371 |
+ gpsdrive | [] [] () | 3
|
|
372 |
+ grep | [] [] [] [] | 18
|
|
373 |
+ gretl | | 1
|
|
374 |
+ gthumb | () () [] | 1
|
|
375 |
+ hello | [] [] [] [] [] [] [] | 28
|
|
376 |
+ id-utils | [] [] [] [] | 9
|
|
377 |
+ indent | [] [] [] [] [] | 14
|
|
378 |
+ jpilot | () () [] | 4
|
|
379 |
+ jwhois | [] () () [] [] | 7
|
|
380 |
+ kbd | [] [] | 5
|
|
381 |
+ ld | [] [] | 4
|
|
382 |
+ libc | [] [] [] [] [] [] | 17
|
|
383 |
+ libiconv | [] [] [] [] | 11
|
|
384 |
+ lifelines | [] | 1
|
|
385 |
+ lilypond | [] | 6
|
|
386 |
+ lingoteach | [] [] | 5
|
|
387 |
+ lingoteach_lessons| | 0
|
|
388 |
+ lynx | [] [] [] [] | 13
|
|
389 |
+ m4 | [] [] [] | 12
|
|
390 |
+ make | [] [] [] [] | 14
|
|
391 |
+ man-db | | 3
|
|
392 |
+ mysecretdiary | [] [] [] | 7
|
|
393 |
+ nano | [] [] [] [] | 15
|
|
394 |
+ nano_1_0 | [] [] [] [] | 14
|
|
395 |
+ opcodes | [] [] | 7
|
|
396 |
+ parted | [] [] [] | 11
|
|
397 |
+ ptx | [] [] [] [] [] [] [] | 19
|
|
398 |
+ python | | 0
|
|
399 |
+ recode | [] [] [] [] [] [] | 15
|
|
400 |
+ sed | [] [] [] [] [] [] | 23
|
|
401 |
+ sh-utils | [] | 8
|
|
402 |
+ sharutils | [] [] [] [] | 13
|
|
403 |
+ sketch | [] () [] | 4
|
|
404 |
+ soundtracker | [] | 6
|
|
405 |
+ sp | | 1
|
|
406 |
+ tar | [] [] [] [] [] [] [] | 18
|
|
407 |
+ texinfo | [] [] | 10
|
|
408 |
+ textutils | [] [] [] [] [] | 13
|
|
409 |
+ util-linux | [] [] [] | 10
|
|
410 |
+ vorbis-tools | [] | 2
|
|
411 |
+ wastesedge | | 0
|
|
412 |
+ wdiff | [] [] [] [] [] | 14
|
|
413 |
+ wget | [] [] [] [] [] [] [] [] | 24
|
|
414 |
+ +----------------------------------------+
|
|
415 |
+ 36 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW
|
|
416 |
+ 67 domains 4 15 2 24 26 12 10 47 42 4 8 594
|
|
417 |
+
|
|
418 |
+ Some counters in the preceding matrix are higher than the number of
|
|
419 |
+visible blocks let us expect. This is because a few extra PO files are
|
|
420 |
+used for implementing regional variants of languages, or language
|
|
421 |
+dialects.
|
|
422 |
+
|
|
423 |
+ For a PO file in the matrix above to be effective, the package to
|
|
424 |
+which it applies should also have been internationalized and
|
|
425 |
+distributed as such by its maintainer. There might be an observable
|
|
426 |
+lag between the mere existence a PO file and its wide availability in a
|
|
427 |
+distribution.
|
|
428 |
+
|
|
429 |
+ If July 2002 seems to be old, you may fetch a more recent copy of
|
|
430 |
+this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
|
|
431 |
+matrix with full percentage details can be found at
|
|
432 |
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
|
|
433 |
+
|
|
434 |
+Using `gettext' in new packages
|
|
435 |
+===============================
|
|
436 |
+
|
|
437 |
+ If you are writing a freely available program and want to
|
|
438 |
+internationalize it you are welcome to use GNU `gettext' in your
|
|
439 |
+package. Of course you have to respect the GNU Library General Public
|
|
440 |
+License which covers the use of the GNU `gettext' library. This means
|
|
441 |
+in particular that even non-free programs can use `libintl' as a shared
|
|
442 |
+library, whereas only free software can use `libintl' as a static
|
|
443 |
+library or use modified versions of `libintl'.
|
|
444 |
+
|
|
445 |
+ Once the sources are changed appropriately and the setup can handle
|
|
446 |
+to use of `gettext' the only thing missing are the translations. The
|
|
447 |
+Free Translation Project is also available for packages which are not
|
|
448 |
+developed inside the GNU project. Therefore the information given above
|
|
449 |
+applies also for every other Free Software Project. Contact
|
|
450 |
+`translation@iro.umontreal.ca' to make the `.pot' files available to
|
|
451 |
+the translation teams.
|
|
452 |
+
|
|
453 |
diff -pruN dillo-0.8.6/AUTHORS dillo-0.8.6-i18n-misc-20070916/AUTHORS
|
|
454 |
--- dillo-0.8.6/AUTHORS 2004-08-13 04:48:49.000000000 +0900
|
|
455 |
+++ dillo-0.8.6-i18n-misc-20070916/AUTHORS 2006-05-16 01:21:07.000000000 +0900
|
|
456 |
@@ -35,6 +35,7 @@
|
|
457 |
* Adam Sampson
|
|
458 |
* Andreas Schweitzer
|
|
459 |
* Dominic Wong
|
|
460 |
+ * Kiyo
|
|
461 |
_________________________________________________________________
|
|
462 |
|
|
463 |
Web site logo:
|
|
464 |
diff -pruN dillo-0.8.6/ChangeLog dillo-0.8.6-i18n-misc-20070916/ChangeLog
|
|
465 |
--- dillo-0.8.6/ChangeLog 2006-04-27 01:06:54.000000000 +0900
|
|
466 |
+++ dillo-0.8.6-i18n-misc-20070916/ChangeLog 2007-09-15 00:45:55.000000000 +0900
|
|
467 |
@@ -3,6 +3,15 @@ Dillo project
|
|
468 |
=============================================================================
|
|
469 |
|
|
470 |
|
|
471 |
+dillo-0.8.6-i18n-misc [??, 2006]
|
|
472 |
+
|
|
473 |
+ - * Applied 0.8.6 Changes to dillo-0.8.5-i18n-misc
|
|
474 |
+ * Some bug fixed.
|
|
475 |
+ Patches: Kiyo
|
|
476 |
+ - * Added German Message Catalog.
|
|
477 |
+ po catalogs: Carsten Stupka
|
|
478 |
+
|
|
479 |
+
|
|
480 |
dillo-0.8.6 [Apr 26, 2006]
|
|
481 |
|
|
482 |
- * Designed and implemented a dpi protocol library (libDpip.a in /dpip).
|
|
483 |
@@ -52,6 +61,29 @@ dillo-0.8.6 [Apr 26, 2006]
|
|
484 |
Patch: Francis Daly
|
|
485 |
|
|
486 |
|
|
487 |
+dillo-0.8.5-i18n-misc [??, 2005]
|
|
488 |
+
|
|
489 |
+ - * Applied 0.8.5 Changes to dillo-0.8.4-i18n-misc
|
|
490 |
+ * Added dynamic font change system in a page unit.
|
|
491 |
+ * New-line processing is improved.
|
|
492 |
+ * Added send_referer option.
|
|
493 |
+ * Added the option which can specify config file.
|
|
494 |
+ * Two or more URLs are opened by tab.
|
|
495 |
+ * Added more checks for sane values in html.c.
|
|
496 |
+ * Fixed locale detection.
|
|
497 |
+ * Some bug fixed.
|
|
498 |
+ Patches: Kiyo
|
|
499 |
+ - * Fixed crash bug.
|
|
500 |
+ Patch: Richard Zidlicky
|
|
501 |
+ - * use an alternative rcfile from command line.
|
|
502 |
+ Patch: Tito
|
|
503 |
+ - * Fixed crash bug.
|
|
504 |
+ Patch: Christian Holland
|
|
505 |
+ - * Added Adblock.
|
|
506 |
+ * about:blank support.
|
|
507 |
+ Patches: Rudolf Polzer
|
|
508 |
+
|
|
509 |
+
|
|
510 |
dillo-0.8.5 [Jun 15, 2005]
|
|
511 |
|
|
512 |
- * Set "file:" to work as URI for current directory.
|
|
513 |
@@ -65,6 +97,18 @@ dillo-0.8.5 [Jun 15, 2005]
|
|
514 |
Patches: Jorge Arellano
|
|
515 |
|
|
516 |
|
|
517 |
+dillo-0.8.4-i18n-misc [??, 2005]
|
|
518 |
+
|
|
519 |
+ - * Applied 0.8.4 Changes to dillo-0.8.3-i18n-misc
|
|
520 |
+ * Added more i18n.
|
|
521 |
+ * Some bug fixed.
|
|
522 |
+ Patch: Kiyo
|
|
523 |
+ - * Added Chinese Message Catalog.
|
|
524 |
+ po catalogs: Babyfai Cheung
|
|
525 |
+ - * cache-control
|
|
526 |
+ Patch:: madis
|
|
527 |
+
|
|
528 |
+
|
|
529 |
dillo-0.8.4 [Jan 11, 2005]
|
|
530 |
|
|
531 |
- * Fixed a possible attack (program abortion) by malicious web pages, which
|
|
532 |
@@ -116,6 +160,15 @@ dillo-0.8.4 [Jan 11, 2005]
|
|
533 |
Patch: Tavis Ormandy
|
|
534 |
|
|
535 |
|
|
536 |
+dillo-0.8.3-i18n-misc [??, 2004]
|
|
537 |
+
|
|
538 |
+ - * Applied 0.8.3 Changes to dillo-0.8.2-i18n-misc
|
|
539 |
+ * Text Search in status bar
|
|
540 |
+ * Added more i18n.
|
|
541 |
+ * Some bug fixed.
|
|
542 |
+ Patch: Kiyo
|
|
543 |
+
|
|
544 |
+
|
|
545 |
dillo-0.8.3 [Oct 27, 2004]
|
|
546 |
|
|
547 |
- * Added a missing error handler for unreachable host in http.c.
|
|
548 |
@@ -170,6 +223,12 @@ dillo-0.8.3 [Oct 27, 2004]
|
|
549 |
Patch: Björn Brill
|
|
550 |
|
|
551 |
|
|
552 |
+dillo-0.8.2-i18n-misc [??, 2004]
|
|
553 |
+
|
|
554 |
+ - * Applied 0.8.2 Changes to dillo-0.8.1-i18n-misc
|
|
555 |
+ Patch: Kiyo
|
|
556 |
+
|
|
557 |
+
|
|
558 |
dillo-0.8.2 [Jul 06, 2004]
|
|
559 |
|
|
560 |
- * Made PgUp/PgDn scroll by a full page, instead of a half (BUG#418).
|
|
561 |
@@ -204,6 +263,12 @@ dillo-0.8.2 [Jul 06, 2004]
|
|
562 |
Patch: Diego Sáenz
|
|
563 |
|
|
564 |
|
|
565 |
+dillo-0.8.1-i18n-misc [??, 2004]
|
|
566 |
+
|
|
567 |
+ - * Applied 0.8.1 Changes to dillo-0.8.0-i18n-misc
|
|
568 |
+ Patch: Kiyo
|
|
569 |
+
|
|
570 |
+
|
|
571 |
dillo-0.8.1 [May 14, 2004]
|
|
572 |
|
|
573 |
- * Fixed dirent.h includes inside dpid.
|
|
574 |
@@ -258,6 +323,13 @@ dillo-0.8.1 [May 14, 2004]
|
|
575 |
Patches: Jorge Arellano
|
|
576 |
|
|
577 |
|
|
578 |
+dillo-0.8.0-i18n-misc [??, 2004]
|
|
579 |
+
|
|
580 |
+ - * Applied 0.8.0 Changes to dillo-0.7.3-i18n-misc
|
|
581 |
+ * Fixed some bugs.
|
|
582 |
+ Patch: Kiyo
|
|
583 |
+
|
|
584 |
+
|
|
585 |
dillo-0.8.0 [Feb 08, 2004]
|
|
586 |
|
|
587 |
- * Added a right-mouse-button popup for images!
|
|
588 |
@@ -391,9 +463,46 @@ dillo-0.8.0 [Feb 08, 2004]
|
|
589 |
- * Added the "-geometry" switch to the CLI.
|
|
590 |
Patch: Jorge Arellano, Jan Dittmer
|
|
591 |
|
|
592 |
+dillo-0.7.3-i18n-misc [Oct ??, 2003]
|
|
593 |
+
|
|
594 |
+ - * Xft support
|
|
595 |
+ * changed internal code that is processed by UTF-8
|
|
596 |
+ * charset automatic recognition support
|
|
597 |
+ * GUI setting tool
|
|
598 |
+ * Start-up URL specification support
|
|
599 |
+ * gzip compression transmission support
|
|
600 |
+ * SSL support
|
|
601 |
+ * BASIC authorization support
|
|
602 |
+ * Referer support
|
|
603 |
+ * User-Agent change support
|
|
604 |
+ * meta-refresh support(optional)
|
|
605 |
+ * "Character entity references" (like &#xnnnn;) support
|
|
606 |
+ * Gettextize
|
|
607 |
+ * multi byte char selection support
|
|
608 |
+ * Fixed scroll quantity
|
|
609 |
+ * Fixed tab, frame patch
|
|
610 |
+ * Change font setting code for i18n
|
|
611 |
+ * Add Search box
|
|
612 |
+ Patches: Kiyo(http://teki.jpn.ph/)
|
|
613 |
+ (These patches referred to --
|
|
614 |
+ Robert Thomson, Tor Andersson, Frank de lange, madis, Geoff Lane,
|
|
615 |
+ Lars Clausen, Jim Huang, Takubo, LJ, Sam Mason)
|
|
616 |
|
|
617 |
dillo-0.7.3 [Aug 03, 2003]
|
|
618 |
|
|
619 |
+ - * Implemented tabbed browsing, separated 'document' from 'interface' code
|
|
620 |
+ - Moved all document-specific code into DilloDoc (src/doc.c/h and
|
|
621 |
+ src/browser.h for definition of DilloDoc)
|
|
622 |
+ - Added tab browsing as an option (enabled by default, disable
|
|
623 |
+ with --disable-tabs configure option)
|
|
624 |
+ * Focus is on location bar on new empty window/tab
|
|
625 |
+ * Open new window on link-shift-click1, new tab on link-control-click1
|
|
626 |
+ - optionally open tab on link-click2 (pref tab_on_middle_click=YES)
|
|
627 |
+ * Implemented experimental frame and iframe support
|
|
628 |
+ - Added frame and iframe support as an option (enabled by default,
|
|
629 |
+ disable with --disable-frames configure option)
|
|
630 |
+ - Added support for named windows/frames (target= and name= parameters)
|
|
631 |
+ Patch: Frank de Lange
|
|
632 |
- * Some more selection goodies:
|
|
633 |
- Redesign of the selection state model, now the selection is preserved
|
|
634 |
as long as possible.
|
|
635 |
@@ -791,7 +900,7 @@ dillo-0.6.1 [Sep 13, 2001]
|
|
636 |
* Fixed (and made faster) Url_str_resolve_relative (BUG#194)
|
|
637 |
Patch: Jorge Arellano, Livio Baldini
|
|
638 |
- * Added parsing support for %HexHex escape sequences in file URIs
|
|
639 |
- Patch: Jorge Arellano, Livio Baldini, Agustín Ferrín :)
|
|
640 |
+ Patch: Jorge Arellano, Livio Baldini, Agustú‹ Ferrú‹ :)
|
|
641 |
- * Implemented Ctrl-W (close window) (BUG#87)
|
|
642 |
Patch: Jorge Arellano, Martynas Jocius
|
|
643 |
- * Fixed a segfault when dillo cannot access ~/.dillo for some reason.
|
|
644 |
@@ -1181,7 +1290,7 @@ dillo-0.2.1 [June 17, 2000]
|
|
645 |
- * Added some functionality to reload button (not complete yet)
|
|
646 |
Patch: Luca Rota , Jorge Arellano Cid
|
|
647 |
- * Fixed hash handling within URL parsing. (Bug #9)
|
|
648 |
- Patch: Marcos Ramírez , Jorge Arellano Cid
|
|
649 |
+ Patch: Marcos Ramú�ez , Jorge Arellano Cid
|
|
650 |
|
|
651 |
|
|
652 |
dillo-0.2.0 [June 2, 2000]
|
|
653 |
@@ -1232,7 +1341,7 @@ dillo-0.1.0 [Mar 30, 2000]
|
|
654 |
* Added a startup page
|
|
655 |
Patches: Jorge Arellano Cid
|
|
656 |
- * Fixed a bug with http queries that sometimes produced infinite loops
|
|
657 |
- Patch: Marcos Ramírez
|
|
658 |
+ Patch: Marcos Ramú�ez
|
|
659 |
|
|
660 |
|
|
661 |
dillo-0.0.6 [Mar 9, 2000]
|
|
662 |
diff -pruN dillo-0.8.6/Makefile.am dillo-0.8.6-i18n-misc-20070916/Makefile.am
|
|
663 |
--- dillo-0.8.6/Makefile.am 2005-10-29 03:55:23.000000000 +0900
|
|
664 |
+++ dillo-0.8.6-i18n-misc-20070916/Makefile.am 2006-07-09 00:18:49.000000000 +0900
|
|
665 |
@@ -1,5 +1,10 @@
|
|
666 |
-SUBDIRS = doc dpip src dpid dpi
|
|
667 |
+AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' -DLOCALEDIR='"$(localedir)"'
|
|
668 |
|
|
669 |
-EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
|
|
670 |
+SUBDIRS = m4 doc dpip src dpid dpi config po
|
|
671 |
+
|
|
672 |
+EXTRA_DIST = config.rpath ChangeLog.old dillorc install-dpi-local autogen.sh bm-update
|
|
673 |
+bin_SCRIPTS = bm-update
|
|
674 |
|
|
675 |
sysconf_DATA = dillorc
|
|
676 |
+
|
|
677 |
+ACLOCAL_AMFLAGS = -I m4
|
|
678 |
diff -pruN dillo-0.8.6/Makefile.in dillo-0.8.6-i18n-misc-20070916/Makefile.in
|
|
679 |
--- dillo-0.8.6/Makefile.in 2006-04-27 01:07:27.000000000 +0900
|
|
680 |
+++ dillo-0.8.6-i18n-misc-20070916/Makefile.in 2007-09-07 01:00:12.000000000 +0900
|
|
681 |
@@ -1,8 +1,8 @@
|
|
682 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
683 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
684 |
# @configure_input@
|
|
685 |
|
|
686 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
687 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
688 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
689 |
+# Free Software Foundation, Inc.
|
|
690 |
# This Makefile.in is free software; the Free Software Foundation
|
|
691 |
# gives unlimited permission to copy and/or distribute it,
|
|
692 |
# with or without modifications, as long as this notice is preserved.
|
|
693 |
@@ -21,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
694 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
695 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
696 |
top_builddir = .
|
|
697 |
+
|
|
698 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
699 |
INSTALL = @INSTALL@
|
|
700 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
701 |
@@ -37,51 +38,6 @@ POST_UNINSTALL = :
|
|
702 |
build_triplet = @build@
|
|
703 |
host_triplet = @host@
|
|
704 |
target_triplet = @target@
|
|
705 |
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
|
706 |
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
|
707 |
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
|
708 |
- config.guess config.sub depcomp install-sh missing
|
|
709 |
-subdir = .
|
|
710 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
711 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
712 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
713 |
- $(ACLOCAL_M4)
|
|
714 |
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
|
715 |
- configure.lineno configure.status.lineno
|
|
716 |
-mkinstalldirs = $(install_sh) -d
|
|
717 |
-CONFIG_HEADER = config.h
|
|
718 |
-CONFIG_CLEAN_FILES =
|
|
719 |
-SOURCES =
|
|
720 |
-DIST_SOURCES =
|
|
721 |
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
722 |
- html-recursive info-recursive install-data-recursive \
|
|
723 |
- install-exec-recursive install-info-recursive \
|
|
724 |
- install-recursive installcheck-recursive installdirs-recursive \
|
|
725 |
- pdf-recursive ps-recursive uninstall-info-recursive \
|
|
726 |
- uninstall-recursive
|
|
727 |
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
|
728 |
-am__vpath_adj = case $$p in \
|
|
729 |
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
|
730 |
- *) f=$$p;; \
|
|
731 |
- esac;
|
|
732 |
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
|
733 |
-am__installdirs = "$(DESTDIR)$(sysconfdir)"
|
|
734 |
-sysconfDATA_INSTALL = $(INSTALL_DATA)
|
|
735 |
-DATA = $(sysconf_DATA)
|
|
736 |
-ETAGS = etags
|
|
737 |
-CTAGS = ctags
|
|
738 |
-DIST_SUBDIRS = $(SUBDIRS)
|
|
739 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
740 |
-distdir = $(PACKAGE)-$(VERSION)
|
|
741 |
-top_distdir = $(distdir)
|
|
742 |
-am__remove_distdir = \
|
|
743 |
- { test ! -d $(distdir) \
|
|
744 |
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
|
|
745 |
- && rm -fr $(distdir); }; }
|
|
746 |
-DIST_ARCHIVES = $(distdir).tar.gz
|
|
747 |
-GZIP_ENV = --best
|
|
748 |
-distuninstallcheck_listfiles = find . -type f -print
|
|
749 |
-distcleancheck_listfiles = find . -type f -print
|
|
750 |
ACLOCAL = @ACLOCAL@
|
|
751 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
752 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
753 |
@@ -111,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
754 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
755 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
756 |
GLIB_LIBS = @GLIB_LIBS@
|
|
757 |
+GMSGFMT = @GMSGFMT@
|
|
758 |
+GREP = @GREP@
|
|
759 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
760 |
GTK_CONFIG = @GTK_CONFIG@
|
|
761 |
GTK_LIBS = @GTK_LIBS@
|
|
762 |
@@ -118,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
763 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
764 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
765 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
766 |
+INTLLIBS = @INTLLIBS@
|
|
767 |
LDFLAGS = @LDFLAGS@
|
|
768 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
769 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
770 |
+LIBICONV = @LIBICONV@
|
|
771 |
+LIBINTL = @LIBINTL@
|
|
772 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
773 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
774 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
775 |
@@ -132,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
776 |
LIBS = @LIBS@
|
|
777 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
778 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
779 |
+LTLIBICONV = @LTLIBICONV@
|
|
780 |
+LTLIBINTL = @LTLIBINTL@
|
|
781 |
LTLIBOBJS = @LTLIBOBJS@
|
|
782 |
MAKEINFO = @MAKEINFO@
|
|
783 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
784 |
+MSGFMT = @MSGFMT@
|
|
785 |
+MSGMERGE = @MSGMERGE@
|
|
786 |
OBJEXT = @OBJEXT@
|
|
787 |
PACKAGE = @PACKAGE@
|
|
788 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
789 |
@@ -142,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
790 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
791 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
792 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
793 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
794 |
+POSUB = @POSUB@
|
|
795 |
RANLIB = @RANLIB@
|
|
796 |
SET_MAKE = @SET_MAKE@
|
|
797 |
SHELL = @SHELL@
|
|
798 |
STRIP = @STRIP@
|
|
799 |
+USE_NLS = @USE_NLS@
|
|
800 |
VERSION = @VERSION@
|
|
801 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
802 |
+XGETTEXT = @XGETTEXT@
|
|
803 |
ac_ct_CC = @ac_ct_CC@
|
|
804 |
ac_ct_CXX = @ac_ct_CXX@
|
|
805 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
806 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
807 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
808 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
809 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
810 |
@@ -158,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
811 |
am__include = @am__include@
|
|
812 |
am__leading_dot = @am__leading_dot@
|
|
813 |
am__quote = @am__quote@
|
|
814 |
-am__tar = @am__tar@
|
|
815 |
-am__untar = @am__untar@
|
|
816 |
bindir = @bindir@
|
|
817 |
build = @build@
|
|
818 |
build_alias = @build_alias@
|
|
819 |
@@ -167,23 +134,29 @@ build_cpu = @build_cpu@
|
|
820 |
build_os = @build_os@
|
|
821 |
build_vendor = @build_vendor@
|
|
822 |
datadir = @datadir@
|
|
823 |
+datarootdir = @datarootdir@
|
|
824 |
+docdir = @docdir@
|
|
825 |
+dvidir = @dvidir@
|
|
826 |
exec_prefix = @exec_prefix@
|
|
827 |
host = @host@
|
|
828 |
host_alias = @host_alias@
|
|
829 |
host_cpu = @host_cpu@
|
|
830 |
host_os = @host_os@
|
|
831 |
host_vendor = @host_vendor@
|
|
832 |
+htmldir = @htmldir@
|
|
833 |
includedir = @includedir@
|
|
834 |
infodir = @infodir@
|
|
835 |
install_sh = @install_sh@
|
|
836 |
libdir = @libdir@
|
|
837 |
libexecdir = @libexecdir@
|
|
838 |
+localedir = @localedir@
|
|
839 |
localstatedir = @localstatedir@
|
|
840 |
mandir = @mandir@
|
|
841 |
-mkdir_p = @mkdir_p@
|
|
842 |
oldincludedir = @oldincludedir@
|
|
843 |
+pdfdir = @pdfdir@
|
|
844 |
prefix = @prefix@
|
|
845 |
program_transform_name = @program_transform_name@
|
|
846 |
+psdir = @psdir@
|
|
847 |
sbindir = @sbindir@
|
|
848 |
sharedstatedir = @sharedstatedir@
|
|
849 |
sysconfdir = @sysconfdir@
|
|
850 |
@@ -192,45 +165,56 @@ target_alias = @target_alias@
|
|
851 |
target_cpu = @target_cpu@
|
|
852 |
target_os = @target_os@
|
|
853 |
target_vendor = @target_vendor@
|
|
854 |
-SUBDIRS = doc dpip src dpid dpi
|
|
855 |
-EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
|
|
856 |
+AM_CPPFLAGS = -DDILLORC_SYS='"$(sysconfdir)/dillorc"' -DLOCALEDIR='"$(localedir)"'
|
|
857 |
+
|
|
858 |
+SUBDIRS = m4 doc dpip src dpid dpi config po
|
|
859 |
+
|
|
860 |
+EXTRA_DIST = config.rpath ChangeLog.old dillorc install-dpi-local autogen.sh bm-update
|
|
861 |
+bin_SCRIPTS = bm-update
|
|
862 |
+
|
|
863 |
sysconf_DATA = dillorc
|
|
864 |
+
|
|
865 |
+ACLOCAL_AMFLAGS = -I m4
|
|
866 |
+subdir = .
|
|
867 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
868 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
869 |
+CONFIG_HEADER = config.h
|
|
870 |
+CONFIG_CLEAN_FILES =
|
|
871 |
+SCRIPTS = $(bin_SCRIPTS)
|
|
872 |
+
|
|
873 |
+DIST_SOURCES =
|
|
874 |
+DATA = $(sysconf_DATA)
|
|
875 |
+
|
|
876 |
+
|
|
877 |
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
|
|
878 |
+ ps-recursive install-info-recursive uninstall-info-recursive \
|
|
879 |
+ all-recursive install-data-recursive install-exec-recursive \
|
|
880 |
+ installdirs-recursive install-recursive uninstall-recursive \
|
|
881 |
+ check-recursive installcheck-recursive
|
|
882 |
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
|
|
883 |
+ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \
|
|
884 |
+ aclocal.m4 config.guess config.h.in config.rpath config.sub \
|
|
885 |
+ configure configure.in depcomp install-sh missing mkinstalldirs
|
|
886 |
+DIST_SUBDIRS = $(SUBDIRS)
|
|
887 |
all: config.h
|
|
888 |
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
889 |
|
|
890 |
.SUFFIXES:
|
|
891 |
-am--refresh:
|
|
892 |
- @:
|
|
893 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
894 |
- @for dep in $?; do \
|
|
895 |
- case '$(am__configure_deps)' in \
|
|
896 |
- *$$dep*) \
|
|
897 |
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
|
898 |
- cd $(srcdir) && $(AUTOMAKE) --gnu \
|
|
899 |
- && exit 0; \
|
|
900 |
- exit 1;; \
|
|
901 |
- esac; \
|
|
902 |
- done; \
|
|
903 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
|
904 |
+
|
|
905 |
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
|
906 |
+ configure.lineno
|
|
907 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
908 |
cd $(top_srcdir) && \
|
|
909 |
$(AUTOMAKE) --gnu Makefile
|
|
910 |
-.PRECIOUS: Makefile
|
|
911 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
912 |
- @case '$?' in \
|
|
913 |
- *config.status*) \
|
|
914 |
- echo ' $(SHELL) ./config.status'; \
|
|
915 |
- $(SHELL) ./config.status;; \
|
|
916 |
- *) \
|
|
917 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
|
|
918 |
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
|
|
919 |
- esac;
|
|
920 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
921 |
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
|
|
922 |
|
|
923 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
924 |
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
925 |
$(SHELL) ./config.status --recheck
|
|
926 |
-
|
|
927 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
928 |
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
|
929 |
cd $(srcdir) && $(AUTOCONF)
|
|
930 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
931 |
+
|
|
932 |
+$(ACLOCAL_M4): configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4
|
|
933 |
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
|
934 |
|
|
935 |
config.h: stamp-h1
|
|
936 |
@@ -242,30 +226,51 @@ config.h: stamp-h1
|
|
937 |
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
|
|
938 |
@rm -f stamp-h1
|
|
939 |
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
|
940 |
-$(srcdir)/config.h.in: $(am__configure_deps)
|
|
941 |
+
|
|
942 |
+$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
943 |
cd $(top_srcdir) && $(AUTOHEADER)
|
|
944 |
- rm -f stamp-h1
|
|
945 |
- touch $@
|
|
946 |
+ touch $(srcdir)/config.h.in
|
|
947 |
|
|
948 |
distclean-hdr:
|
|
949 |
-rm -f config.h stamp-h1
|
|
950 |
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
|
951 |
+install-binSCRIPTS: $(bin_SCRIPTS)
|
|
952 |
+ @$(NORMAL_INSTALL)
|
|
953 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
954 |
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
|
|
955 |
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
956 |
+ if test -f $$d$$p; then \
|
|
957 |
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
|
958 |
+ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
|
|
959 |
+ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
|
|
960 |
+ else :; fi; \
|
|
961 |
+ done
|
|
962 |
+
|
|
963 |
+uninstall-binSCRIPTS:
|
|
964 |
+ @$(NORMAL_UNINSTALL)
|
|
965 |
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
|
|
966 |
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
|
967 |
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
|
|
968 |
+ rm -f $(DESTDIR)$(bindir)/$$f; \
|
|
969 |
+ done
|
|
970 |
uninstall-info-am:
|
|
971 |
+sysconfDATA_INSTALL = $(INSTALL_DATA)
|
|
972 |
install-sysconfDATA: $(sysconf_DATA)
|
|
973 |
@$(NORMAL_INSTALL)
|
|
974 |
- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
|
|
975 |
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
|
|
976 |
@list='$(sysconf_DATA)'; for p in $$list; do \
|
|
977 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
978 |
- f=$(am__strip_dir) \
|
|
979 |
- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
|
980 |
- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
|
981 |
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
|
|
982 |
+ echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
|
|
983 |
+ $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
|
|
984 |
done
|
|
985 |
|
|
986 |
uninstall-sysconfDATA:
|
|
987 |
@$(NORMAL_UNINSTALL)
|
|
988 |
@list='$(sysconf_DATA)'; for p in $$list; do \
|
|
989 |
- f=$(am__strip_dir) \
|
|
990 |
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
|
991 |
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
|
992 |
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
|
|
993 |
+ echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \
|
|
994 |
+ rm -f $(DESTDIR)$(sysconfdir)/$$f; \
|
|
995 |
done
|
|
996 |
|
|
997 |
# This directory's subdirectories are mostly independent; you can cd
|
|
998 |
@@ -275,13 +280,7 @@ uninstall-sysconfDATA:
|
|
999 |
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
1000 |
# (2) otherwise, pass the desired values on the `make' command line.
|
|
1001 |
$(RECURSIVE_TARGETS):
|
|
1002 |
- @failcom='exit 1'; \
|
|
1003 |
- for f in x $$MAKEFLAGS; do \
|
|
1004 |
- case $$f in \
|
|
1005 |
- *=* | --[!k]*);; \
|
|
1006 |
- *k*) failcom='fail=yes';; \
|
|
1007 |
- esac; \
|
|
1008 |
- done; \
|
|
1009 |
+ @set fnord $$MAKEFLAGS; amf=$$2; \
|
|
1010 |
dot_seen=no; \
|
|
1011 |
target=`echo $@ | sed s/-recursive//`; \
|
|
1012 |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
1013 |
@@ -293,7 +292,7 @@ $(RECURSIVE_TARGETS):
|
|
1014 |
local_target="$$target"; \
|
|
1015 |
fi; \
|
|
1016 |
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
1017 |
- || eval $$failcom; \
|
|
1018 |
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
|
1019 |
done; \
|
|
1020 |
if test "$$dot_seen" = "no"; then \
|
|
1021 |
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
|
1022 |
@@ -301,13 +300,7 @@ $(RECURSIVE_TARGETS):
|
|
1023 |
|
|
1024 |
mostlyclean-recursive clean-recursive distclean-recursive \
|
|
1025 |
maintainer-clean-recursive:
|
|
1026 |
- @failcom='exit 1'; \
|
|
1027 |
- for f in x $$MAKEFLAGS; do \
|
|
1028 |
- case $$f in \
|
|
1029 |
- *=* | --[!k]*);; \
|
|
1030 |
- *k*) failcom='fail=yes';; \
|
|
1031 |
- esac; \
|
|
1032 |
- done; \
|
|
1033 |
+ @set fnord $$MAKEFLAGS; amf=$$2; \
|
|
1034 |
dot_seen=no; \
|
|
1035 |
case "$@" in \
|
|
1036 |
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
|
1037 |
@@ -328,7 +321,7 @@ maintainer-clean-recursive:
|
|
1038 |
local_target="$$target"; \
|
|
1039 |
fi; \
|
|
1040 |
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
1041 |
- || eval $$failcom; \
|
|
1042 |
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
|
1043 |
done && test -z "$$fail"
|
|
1044 |
tags-recursive:
|
|
1045 |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
1046 |
@@ -339,6 +332,14 @@ ctags-recursive:
|
|
1047 |
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
1048 |
done
|
|
1049 |
|
|
1050 |
+ETAGS = etags
|
|
1051 |
+ETAGSFLAGS =
|
|
1052 |
+
|
|
1053 |
+CTAGS = ctags
|
|
1054 |
+CTAGSFLAGS =
|
|
1055 |
+
|
|
1056 |
+tags: TAGS
|
|
1057 |
+
|
|
1058 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
1059 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
1060 |
unique=`for i in $$list; do \
|
|
1061 |
@@ -347,22 +348,19 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
|
|
1062 |
$(AWK) ' { files[$$0] = 1; } \
|
|
1063 |
END { for (i in files) print i; }'`; \
|
|
1064 |
mkid -fID $$unique
|
|
1065 |
-tags: TAGS
|
|
1066 |
|
|
1067 |
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|
1068 |
$(TAGS_FILES) $(LISP)
|
|
1069 |
tags=; \
|
|
1070 |
here=`pwd`; \
|
|
1071 |
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
1072 |
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
|
|
1073 |
include_option=--etags-include; \
|
|
1074 |
- empty_fix=.; \
|
|
1075 |
else \
|
|
1076 |
include_option=--include; \
|
|
1077 |
- empty_fix=; \
|
|
1078 |
fi; \
|
|
1079 |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
1080 |
if test "$$subdir" = .; then :; else \
|
|
1081 |
- test ! -f $$subdir/TAGS || \
|
|
1082 |
+ test -f $$subdir/TAGS && \
|
|
1083 |
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
1084 |
fi; \
|
|
1085 |
done; \
|
|
1086 |
@@ -372,11 +370,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
1087 |
done | \
|
|
1088 |
$(AWK) ' { files[$$0] = 1; } \
|
|
1089 |
END { for (i in files) print i; }'`; \
|
|
1090 |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
1091 |
- test -n "$$unique" || unique=$$empty_fix; \
|
|
1092 |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
1093 |
- $$tags $$unique; \
|
|
1094 |
- fi
|
|
1095 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
1096 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
1097 |
+ $$tags $$unique
|
|
1098 |
+
|
|
1099 |
ctags: CTAGS
|
|
1100 |
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|
1101 |
$(TAGS_FILES) $(LISP)
|
|
1102 |
@@ -399,10 +396,24 @@ GTAGS:
|
|
1103 |
|
|
1104 |
distclean-tags:
|
|
1105 |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
1106 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
1107 |
+
|
|
1108 |
+top_distdir = .
|
|
1109 |
+distdir = $(PACKAGE)-$(VERSION)
|
|
1110 |
+
|
|
1111 |
+am__remove_distdir = \
|
|
1112 |
+ { test ! -d $(distdir) \
|
|
1113 |
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
|
|
1114 |
+ && rm -fr $(distdir); }; }
|
|
1115 |
+
|
|
1116 |
+GZIP_ENV = --best
|
|
1117 |
+distuninstallcheck_listfiles = find . -type f -print
|
|
1118 |
+distcleancheck_listfiles = find . -type f -print
|
|
1119 |
|
|
1120 |
distdir: $(DISTFILES)
|
|
1121 |
$(am__remove_distdir)
|
|
1122 |
mkdir $(distdir)
|
|
1123 |
+ $(mkinstalldirs) $(distdir)/po
|
|
1124 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
1125 |
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
|
1126 |
list='$(DISTFILES)'; for file in $$list; do \
|
|
1127 |
@@ -414,7 +425,7 @@ distdir: $(DISTFILES)
|
|
1128 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
1129 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
1130 |
dir="/$$dir"; \
|
|
1131 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
1132 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
1133 |
else \
|
|
1134 |
dir=''; \
|
|
1135 |
fi; \
|
|
1136 |
@@ -429,17 +440,15 @@ distdir: $(DISTFILES)
|
|
1137 |
|| exit 1; \
|
|
1138 |
fi; \
|
|
1139 |
done
|
|
1140 |
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
1141 |
+ list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
1142 |
if test "$$subdir" = .; then :; else \
|
|
1143 |
- test -d "$(distdir)/$$subdir" \
|
|
1144 |
- || $(mkdir_p) "$(distdir)/$$subdir" \
|
|
1145 |
+ test -d $(distdir)/$$subdir \
|
|
1146 |
+ || mkdir $(distdir)/$$subdir \
|
|
1147 |
|| exit 1; \
|
|
1148 |
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
1149 |
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
1150 |
(cd $$subdir && \
|
|
1151 |
$(MAKE) $(AM_MAKEFLAGS) \
|
|
1152 |
- top_distdir="$$top_distdir" \
|
|
1153 |
- distdir="$$distdir/$$subdir" \
|
|
1154 |
+ top_distdir="$(top_distdir)" \
|
|
1155 |
+ distdir=../$(distdir)/$$subdir \
|
|
1156 |
distdir) \
|
|
1157 |
|| exit 1; \
|
|
1158 |
fi; \
|
|
1159 |
@@ -450,46 +459,19 @@ distdir: $(DISTFILES)
|
|
1160 |
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|
|
1161 |
|| chmod -R a+r $(distdir)
|
|
1162 |
dist-gzip: distdir
|
|
1163 |
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
|
1164 |
- $(am__remove_distdir)
|
|
1165 |
-
|
|
1166 |
-dist-bzip2: distdir
|
|
1167 |
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
|
|
1168 |
- $(am__remove_distdir)
|
|
1169 |
-
|
|
1170 |
-dist-tarZ: distdir
|
|
1171 |
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
|
1172 |
- $(am__remove_distdir)
|
|
1173 |
-
|
|
1174 |
-dist-shar: distdir
|
|
1175 |
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
|
1176 |
- $(am__remove_distdir)
|
|
1177 |
-
|
|
1178 |
-dist-zip: distdir
|
|
1179 |
- -rm -f $(distdir).zip
|
|
1180 |
- zip -rq $(distdir).zip $(distdir)
|
|
1181 |
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
|
1182 |
$(am__remove_distdir)
|
|
1183 |
|
|
1184 |
dist dist-all: distdir
|
|
1185 |
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
|
1186 |
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
|
1187 |
$(am__remove_distdir)
|
|
1188 |
|
|
1189 |
# This target untars the dist file and tries a VPATH configuration. Then
|
|
1190 |
# it guarantees that the distribution is self-contained by making another
|
|
1191 |
# tarfile.
|
|
1192 |
distcheck: dist
|
|
1193 |
- case '$(DIST_ARCHIVES)' in \
|
|
1194 |
- *.tar.gz*) \
|
|
1195 |
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
|
1196 |
- *.tar.bz2*) \
|
|
1197 |
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
1198 |
- *.tar.Z*) \
|
|
1199 |
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
|
1200 |
- *.shar.gz*) \
|
|
1201 |
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
|
1202 |
- *.zip*) \
|
|
1203 |
- unzip $(distdir).zip ;;\
|
|
1204 |
- esac
|
|
1205 |
+ $(am__remove_distdir)
|
|
1206 |
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
|
|
1207 |
chmod -R a-w $(distdir); chmod a+w $(distdir)
|
|
1208 |
mkdir $(distdir)/_build
|
|
1209 |
mkdir $(distdir)/_inst
|
|
1210 |
@@ -509,20 +491,19 @@ distcheck: dist
|
|
1211 |
distuninstallcheck \
|
|
1212 |
&& chmod -R a-w "$$dc_install_base" \
|
|
1213 |
&& ({ \
|
|
1214 |
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
|
|
1215 |
+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
|
|
1216 |
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
|
|
1217 |
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
|
|
1218 |
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
|
|
1219 |
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
|
|
1220 |
} || { rm -rf "$$dc_destdir"; exit 1; }) \
|
|
1221 |
&& rm -rf "$$dc_destdir" \
|
|
1222 |
- && $(MAKE) $(AM_MAKEFLAGS) dist \
|
|
1223 |
- && rm -rf $(DIST_ARCHIVES) \
|
|
1224 |
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
|
|
1225 |
+ && rm -f $(distdir).tar.gz \
|
|
1226 |
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
|
|
1227 |
$(am__remove_distdir)
|
|
1228 |
- @(echo "$(distdir) archives ready for distribution: "; \
|
|
1229 |
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
|
1230 |
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
|
|
1231 |
+ @echo "$(distdir).tar.gz is ready for distribution" | \
|
|
1232 |
+ sed 'h;s/./=/g;p;x;p;x'
|
|
1233 |
distuninstallcheck:
|
|
1234 |
@cd $(distuninstallcheck_dir) \
|
|
1235 |
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
|
1236 |
@@ -543,12 +524,11 @@ distcleancheck: distclean
|
|
1237 |
exit 1; } >&2
|
|
1238 |
check-am: all-am
|
|
1239 |
check: check-recursive
|
|
1240 |
-all-am: Makefile $(DATA) config.h
|
|
1241 |
+all-am: Makefile $(SCRIPTS) $(DATA) config.h
|
|
1242 |
installdirs: installdirs-recursive
|
|
1243 |
installdirs-am:
|
|
1244 |
- for dir in "$(DESTDIR)$(sysconfdir)"; do \
|
|
1245 |
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
|
1246 |
- done
|
|
1247 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
|
|
1248 |
+
|
|
1249 |
install: install-recursive
|
|
1250 |
install-exec: install-exec-recursive
|
|
1251 |
install-data: install-data-recursive
|
|
1252 |
@@ -568,7 +548,7 @@ mostlyclean-generic:
|
|
1253 |
clean-generic:
|
|
1254 |
|
|
1255 |
distclean-generic:
|
|
1256 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
1257 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
1258 |
|
|
1259 |
maintainer-clean-generic:
|
|
1260 |
@echo "This command is intended for maintainers to use"
|
|
1261 |
@@ -586,15 +566,13 @@ dvi: dvi-recursive
|
|
1262 |
|
|
1263 |
dvi-am:
|
|
1264 |
|
|
1265 |
-html: html-recursive
|
|
1266 |
-
|
|
1267 |
info: info-recursive
|
|
1268 |
|
|
1269 |
info-am:
|
|
1270 |
|
|
1271 |
install-data-am:
|
|
1272 |
|
|
1273 |
-install-exec-am: install-sysconfDATA
|
|
1274 |
+install-exec-am: install-binSCRIPTS install-sysconfDATA
|
|
1275 |
|
|
1276 |
install-info: install-info-recursive
|
|
1277 |
|
|
1278 |
@@ -620,24 +598,28 @@ ps: ps-recursive
|
|
1279 |
|
|
1280 |
ps-am:
|
|
1281 |
|
|
1282 |
-uninstall-am: uninstall-info-am uninstall-sysconfDATA
|
|
1283 |
+uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
|
|
1284 |
+ uninstall-sysconfDATA
|
|
1285 |
|
|
1286 |
uninstall-info: uninstall-info-recursive
|
|
1287 |
|
|
1288 |
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
|
1289 |
- check-am clean clean-generic clean-recursive ctags \
|
|
1290 |
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
|
|
1291 |
- dist-tarZ dist-zip distcheck distclean distclean-generic \
|
|
1292 |
- distclean-hdr distclean-recursive distclean-tags \
|
|
1293 |
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
|
|
1294 |
- html-am info info-am install install-am install-data \
|
|
1295 |
- install-data-am install-exec install-exec-am install-info \
|
|
1296 |
- install-info-am install-man install-strip install-sysconfDATA \
|
|
1297 |
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
|
|
1298 |
+ clean-generic clean-recursive ctags ctags-recursive dist \
|
|
1299 |
+ dist-all dist-gzip distcheck distclean distclean-generic \
|
|
1300 |
+ distclean-hdr distclean-recursive distclean-tags distcleancheck \
|
|
1301 |
+ distdir distuninstallcheck dvi dvi-am dvi-recursive info \
|
|
1302 |
+ info-am info-recursive install install-am install-binSCRIPTS \
|
|
1303 |
+ install-data install-data-am install-data-recursive \
|
|
1304 |
+ install-exec install-exec-am install-exec-recursive \
|
|
1305 |
+ install-info install-info-am install-info-recursive install-man \
|
|
1306 |
+ install-recursive install-strip install-sysconfDATA \
|
|
1307 |
installcheck installcheck-am installdirs installdirs-am \
|
|
1308 |
- maintainer-clean maintainer-clean-generic \
|
|
1309 |
+ installdirs-recursive maintainer-clean maintainer-clean-generic \
|
|
1310 |
maintainer-clean-recursive mostlyclean mostlyclean-generic \
|
|
1311 |
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
|
|
1312 |
- uninstall uninstall-am uninstall-info-am uninstall-sysconfDATA
|
|
1313 |
+ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
|
|
1314 |
+ ps-recursive tags tags-recursive uninstall uninstall-am \
|
|
1315 |
+ uninstall-binSCRIPTS uninstall-info-am uninstall-info-recursive \
|
|
1316 |
+ uninstall-recursive uninstall-sysconfDATA
|
|
1317 |
|
|
1318 |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
1319 |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
1320 |
diff -pruN dillo-0.8.6/README dillo-0.8.6-i18n-misc-20070916/README
|
|
1321 |
--- dillo-0.8.6/README 2006-03-25 01:00:18.000000000 +0900
|
|
1322 |
+++ dillo-0.8.6-i18n-misc-20070916/README 2006-05-16 01:21:07.000000000 +0900
|
|
1323 |
@@ -1,3 +1,14 @@
|
|
1324 |
+===============================
|
|
1325 |
+ Dillo i18n patch by Kiyo
|
|
1326 |
+===============================
|
|
1327 |
+
|
|
1328 |
+This is an unofficial i18n patch.
|
|
1329 |
+Please see ChangeLog for details.
|
|
1330 |
+Please do not ask a dillo team about this patch.
|
|
1331 |
+
|
|
1332 |
+The newest patch can get in http://teki.jpn.ph/pc/software/index-e.shtml
|
|
1333 |
+If you found bug, please mail to webmaster@teki.jpn.ph.
|
|
1334 |
+
|
|
1335 |
=======
|
|
1336 |
Dillo
|
|
1337 |
=======
|
|
1338 |
@@ -116,3 +127,5 @@ gcc
|
|
1339 |
Jorge.-
|
|
1340 |
(jcid@dillo.org)
|
|
1341 |
Mar 24, 2006
|
|
1342 |
+
|
|
1343 |
+
|
|
1344 |
diff -pruN dillo-0.8.6/aclocal.m4 dillo-0.8.6-i18n-misc-20070916/aclocal.m4
|
|
1345 |
--- dillo-0.8.6/aclocal.m4 2006-04-27 01:06:18.000000000 +0900
|
|
1346 |
+++ dillo-0.8.6-i18n-misc-20070916/aclocal.m4 2007-09-07 00:59:39.000000000 +0900
|
|
1347 |
@@ -1,7 +1,7 @@
|
|
1348 |
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
|
|
1349 |
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
|
|
1350 |
|
|
1351 |
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
1352 |
-# 2005 Free Software Foundation, Inc.
|
|
1353 |
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
|
1354 |
+# Free Software Foundation, Inc.
|
|
1355 |
# This file is free software; the Free Software Foundation
|
|
1356 |
# gives unlimited permission to copy and/or distribute it,
|
|
1357 |
# with or without modifications, as long as this notice is preserved.
|
|
1358 |
@@ -11,535 +11,496 @@
|
|
1359 |
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
1360 |
# PARTICULAR PURPOSE.
|
|
1361 |
|
|
1362 |
-# Configure paths for GLIB
|
|
1363 |
-# Owen Taylor 97-11-3
|
|
1364 |
+# Do all the work for Automake. -*- Autoconf -*-
|
|
1365 |
|
|
1366 |
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
|
1367 |
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
|
|
1368 |
-dnl gthread is specified in MODULES, pass to glib-config
|
|
1369 |
-dnl
|
|
1370 |
-AC_DEFUN(AM_PATH_GLIB,
|
|
1371 |
-[dnl
|
|
1372 |
-dnl Get the cflags and libraries from the glib-config script
|
|
1373 |
-dnl
|
|
1374 |
-AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
|
|
1375 |
- glib_config_prefix="$withval", glib_config_prefix="")
|
|
1376 |
-AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
|
|
1377 |
- glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
|
|
1378 |
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
|
|
1379 |
- , enable_glibtest=yes)
|
|
1380 |
+# This macro actually does too much some checks are only needed if
|
|
1381 |
+# your package does certain things. But this isn't really a big deal.
|
|
1382 |
|
|
1383 |
- if test x$glib_config_exec_prefix != x ; then
|
|
1384 |
- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
|
|
1385 |
- if test x${GLIB_CONFIG+set} != xset ; then
|
|
1386 |
- GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
|
|
1387 |
- fi
|
|
1388 |
- fi
|
|
1389 |
- if test x$glib_config_prefix != x ; then
|
|
1390 |
- glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
|
|
1391 |
- if test x${GLIB_CONFIG+set} != xset ; then
|
|
1392 |
- GLIB_CONFIG=$glib_config_prefix/bin/glib-config
|
|
1393 |
- fi
|
|
1394 |
- fi
|
|
1395 |
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
1396 |
+# Free Software Foundation, Inc.
|
|
1397 |
|
|
1398 |
- for module in . $4
|
|
1399 |
- do
|
|
1400 |
- case "$module" in
|
|
1401 |
- gmodule)
|
|
1402 |
- glib_config_args="$glib_config_args gmodule"
|
|
1403 |
- ;;
|
|
1404 |
- gthread)
|
|
1405 |
- glib_config_args="$glib_config_args gthread"
|
|
1406 |
- ;;
|
|
1407 |
- esac
|
|
1408 |
- done
|
|
1409 |
+# This program is free software; you can redistribute it and/or modify
|
|
1410 |
+# it under the terms of the GNU General Public License as published by
|
|
1411 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
1412 |
+# any later version.
|
|
1413 |
|
|
1414 |
- AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
|
|
1415 |
- min_glib_version=ifelse([$1], ,0.99.7,$1)
|
|
1416 |
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
|
|
1417 |
- no_glib=""
|
|
1418 |
- if test "$GLIB_CONFIG" = "no" ; then
|
|
1419 |
- no_glib=yes
|
|
1420 |
- else
|
|
1421 |
- GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
|
|
1422 |
- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
|
|
1423 |
- glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
1424 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
1425 |
- glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
1426 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
1427 |
- glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
1428 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
1429 |
- if test "x$enable_glibtest" = "xyes" ; then
|
|
1430 |
- ac_save_CFLAGS="$CFLAGS"
|
|
1431 |
- ac_save_LIBS="$LIBS"
|
|
1432 |
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
1433 |
- LIBS="$GLIB_LIBS $LIBS"
|
|
1434 |
-dnl
|
|
1435 |
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
|
|
1436 |
-dnl checks the results of glib-config to some extent
|
|
1437 |
-dnl
|
|
1438 |
- rm -f conf.glibtest
|
|
1439 |
- AC_TRY_RUN([
|
|
1440 |
-#include <glib.h>
|
|
1441 |
-#include <stdio.h>
|
|
1442 |
-#include <stdlib.h>
|
|
1443 |
+# This program is distributed in the hope that it will be useful,
|
|
1444 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
1445 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
1446 |
+# GNU General Public License for more details.
|
|
1447 |
|
|
1448 |
-int
|
|
1449 |
-main ()
|
|
1450 |
-{
|
|
1451 |
- int major, minor, micro;
|
|
1452 |
- char *tmp_version;
|
|
1453 |
+# You should have received a copy of the GNU General Public License
|
|
1454 |
+# along with this program; if not, write to the Free Software
|
|
1455 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
1456 |
+# 02111-1307, USA.
|
|
1457 |
|
|
1458 |
- system ("touch conf.glibtest");
|
|
1459 |
+# serial 10
|
|
1460 |
|
|
1461 |
- /* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
1462 |
- tmp_version = g_strdup("$min_glib_version");
|
|
1463 |
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
1464 |
- printf("%s, bad version string\n", "$min_glib_version");
|
|
1465 |
- exit(1);
|
|
1466 |
- }
|
|
1467 |
+AC_PREREQ([2.54])
|
|
1468 |
|
|
1469 |
- if ((glib_major_version != $glib_config_major_version) ||
|
|
1470 |
- (glib_minor_version != $glib_config_minor_version) ||
|
|
1471 |
- (glib_micro_version != $glib_config_micro_version))
|
|
1472 |
- {
|
|
1473 |
- printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
|
|
1474 |
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
|
|
1475 |
- glib_major_version, glib_minor_version, glib_micro_version);
|
|
1476 |
- printf ("*** was found! If glib-config was correct, then it is best\n");
|
|
1477 |
- printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
|
|
1478 |
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
1479 |
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
1480 |
- printf("*** required on your system.\n");
|
|
1481 |
- printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
|
|
1482 |
- printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
|
|
1483 |
- printf("*** before re-running configure\n");
|
|
1484 |
- }
|
|
1485 |
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
|
|
1486 |
- (glib_minor_version != GLIB_MINOR_VERSION) ||
|
|
1487 |
- (glib_micro_version != GLIB_MICRO_VERSION))
|
|
1488 |
- {
|
|
1489 |
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
|
|
1490 |
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
|
|
1491 |
- printf("*** library (version %d.%d.%d)\n",
|
|
1492 |
- glib_major_version, glib_minor_version, glib_micro_version);
|
|
1493 |
- }
|
|
1494 |
- else
|
|
1495 |
- {
|
|
1496 |
- if ((glib_major_version > major) ||
|
|
1497 |
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
|
|
1498 |
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
|
|
1499 |
- {
|
|
1500 |
- return 0;
|
|
1501 |
- }
|
|
1502 |
- else
|
|
1503 |
- {
|
|
1504 |
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
|
|
1505 |
- glib_major_version, glib_minor_version, glib_micro_version);
|
|
1506 |
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
|
|
1507 |
- major, minor, micro);
|
|
1508 |
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
|
|
1509 |
- printf("***\n");
|
|
1510 |
- printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
1511 |
- printf("*** probably means that the wrong copy of the glib-config shell script is\n");
|
|
1512 |
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
1513 |
- printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
|
|
1514 |
- printf("*** correct copy of glib-config. (In this case, you will have to\n");
|
|
1515 |
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
1516 |
- printf("*** so that the correct libraries are found at run-time))\n");
|
|
1517 |
- }
|
|
1518 |
- }
|
|
1519 |
- return 1;
|
|
1520 |
-}
|
|
1521 |
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
1522 |
- CFLAGS="$ac_save_CFLAGS"
|
|
1523 |
- LIBS="$ac_save_LIBS"
|
|
1524 |
- fi
|
|
1525 |
- fi
|
|
1526 |
- if test "x$no_glib" = x ; then
|
|
1527 |
- AC_MSG_RESULT(yes)
|
|
1528 |
- ifelse([$2], , :, [$2])
|
|
1529 |
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
|
|
1530 |
+# the ones we care about.
|
|
1531 |
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
1532 |
+
|
|
1533 |
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
|
|
1534 |
+# AM_INIT_AUTOMAKE([OPTIONS])
|
|
1535 |
+# -----------------------------------------------
|
|
1536 |
+# The call with PACKAGE and VERSION arguments is the old style
|
|
1537 |
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
|
|
1538 |
+# and VERSION should now be passed to AC_INIT and removed from
|
|
1539 |
+# the call to AM_INIT_AUTOMAKE.
|
|
1540 |
+# We support both call styles for the transition. After
|
|
1541 |
+# the next Automake release, Autoconf can make the AC_INIT
|
|
1542 |
+# arguments mandatory, and then we can depend on a new Autoconf
|
|
1543 |
+# release and drop the old call support.
|
|
1544 |
+AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
1545 |
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
|
1546 |
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
1547 |
+# test to see if srcdir already configured
|
|
1548 |
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
|
1549 |
+ test -f $srcdir/config.status; then
|
|
1550 |
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
1551 |
+fi
|
|
1552 |
+
|
|
1553 |
+# test whether we have cygpath
|
|
1554 |
+if test -z "$CYGPATH_W"; then
|
|
1555 |
+ if (cygpath --version) >/dev/null 2>/dev/null; then
|
|
1556 |
+ CYGPATH_W='cygpath -w'
|
|
1557 |
else
|
|
1558 |
- AC_MSG_RESULT(no)
|
|
1559 |
- if test "$GLIB_CONFIG" = "no" ; then
|
|
1560 |
- echo "*** The glib-config script installed by GLIB could not be found"
|
|
1561 |
- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
|
|
1562 |
- echo "*** your path, or set the GLIB_CONFIG environment variable to the"
|
|
1563 |
- echo "*** full path to glib-config."
|
|
1564 |
- else
|
|
1565 |
- if test -f conf.glibtest ; then
|
|
1566 |
- :
|
|
1567 |
- else
|
|
1568 |
- echo "*** Could not run GLIB test program, checking why..."
|
|
1569 |
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
1570 |
- LIBS="$LIBS $GLIB_LIBS"
|
|
1571 |
- AC_TRY_LINK([
|
|
1572 |
-#include <glib.h>
|
|
1573 |
-#include <stdio.h>
|
|
1574 |
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
|
|
1575 |
- [ echo "*** The test program compiled, but did not run. This usually means"
|
|
1576 |
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
|
1577 |
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
|
|
1578 |
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
1579 |
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
1580 |
- echo "*** is required on your system"
|
|
1581 |
- echo "***"
|
|
1582 |
- echo "*** If you have an old version installed, it is best to remove it, although"
|
|
1583 |
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
1584 |
- echo "***"
|
|
1585 |
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
|
1586 |
- echo "*** came with the system with the command"
|
|
1587 |
- echo "***"
|
|
1588 |
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
|
1589 |
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
1590 |
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
|
|
1591 |
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
|
|
1592 |
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
|
|
1593 |
- CFLAGS="$ac_save_CFLAGS"
|
|
1594 |
- LIBS="$ac_save_LIBS"
|
|
1595 |
- fi
|
|
1596 |
- fi
|
|
1597 |
- GLIB_CFLAGS=""
|
|
1598 |
- GLIB_LIBS=""
|
|
1599 |
- ifelse([$3], , :, [$3])
|
|
1600 |
+ CYGPATH_W=echo
|
|
1601 |
fi
|
|
1602 |
- AC_SUBST(GLIB_CFLAGS)
|
|
1603 |
- AC_SUBST(GLIB_LIBS)
|
|
1604 |
- rm -f conf.glibtest
|
|
1605 |
-])
|
|
1606 |
-
|
|
1607 |
-# Configure paths for GTK+
|
|
1608 |
-# Owen Taylor 97-11-3
|
|
1609 |
+fi
|
|
1610 |
+AC_SUBST([CYGPATH_W])
|
|
1611 |
|
|
1612 |
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
|
1613 |
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
|
|
1614 |
-dnl
|
|
1615 |
-AC_DEFUN(AM_PATH_GTK,
|
|
1616 |
-[dnl
|
|
1617 |
-dnl Get the cflags and libraries from the gtk-config script
|
|
1618 |
-dnl
|
|
1619 |
-AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
|
|
1620 |
- gtk_config_prefix="$withval", gtk_config_prefix="")
|
|
1621 |
-AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
|
|
1622 |
- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
|
|
1623 |
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
|
|
1624 |
- , enable_gtktest=yes)
|
|
1625 |
+# Define the identity of the package.
|
|
1626 |
+dnl Distinguish between old-style and new-style calls.
|
|
1627 |
+m4_ifval([$2],
|
|
1628 |
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
|
|
1629 |
+ AC_SUBST([PACKAGE], [$1])dnl
|
|
1630 |
+ AC_SUBST([VERSION], [$2])],
|
|
1631 |
+[_AM_SET_OPTIONS([$1])dnl
|
|
1632 |
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
|
1633 |
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
|
1634 |
|
|
1635 |
- for module in . $4
|
|
1636 |
- do
|
|
1637 |
- case "$module" in
|
|
1638 |
- gthread)
|
|
1639 |
- gtk_config_args="$gtk_config_args gthread"
|
|
1640 |
- ;;
|
|
1641 |
- esac
|
|
1642 |
- done
|
|
1643 |
+_AM_IF_OPTION([no-define],,
|
|
1644 |
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
|
|
1645 |
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
|
|
1646 |
|
|
1647 |
- if test x$gtk_config_exec_prefix != x ; then
|
|
1648 |
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
|
1649 |
- if test x${GTK_CONFIG+set} != xset ; then
|
|
1650 |
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
|
1651 |
- fi
|
|
1652 |
- fi
|
|
1653 |
- if test x$gtk_config_prefix != x ; then
|
|
1654 |
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
|
1655 |
- if test x${GTK_CONFIG+set} != xset ; then
|
|
1656 |
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
|
1657 |
- fi
|
|
1658 |
- fi
|
|
1659 |
+# Some tools Automake needs.
|
|
1660 |
+AC_REQUIRE([AM_SANITY_CHECK])dnl
|
|
1661 |
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
|
|
1662 |
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
|
|
1663 |
+AM_MISSING_PROG(AUTOCONF, autoconf)
|
|
1664 |
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
|
1665 |
+AM_MISSING_PROG(AUTOHEADER, autoheader)
|
|
1666 |
+AM_MISSING_PROG(MAKEINFO, makeinfo)
|
|
1667 |
+AM_MISSING_PROG(AMTAR, tar)
|
|
1668 |
+AM_PROG_INSTALL_SH
|
|
1669 |
+AM_PROG_INSTALL_STRIP
|
|
1670 |
+# We need awk for the "check" target. The system "awk" is bad on
|
|
1671 |
+# some platforms.
|
|
1672 |
+AC_REQUIRE([AC_PROG_AWK])dnl
|
|
1673 |
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
1674 |
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
|
1675 |
|
|
1676 |
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
|
|
1677 |
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
|
|
1678 |
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
|
|
1679 |
- no_gtk=""
|
|
1680 |
- if test "$GTK_CONFIG" = "no" ; then
|
|
1681 |
- no_gtk=yes
|
|
1682 |
- else
|
|
1683 |
- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
|
|
1684 |
- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
|
|
1685 |
- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
|
|
1686 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
1687 |
- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
|
|
1688 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
1689 |
- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
|
|
1690 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
1691 |
- if test "x$enable_gtktest" = "xyes" ; then
|
|
1692 |
- ac_save_CFLAGS="$CFLAGS"
|
|
1693 |
- ac_save_LIBS="$LIBS"
|
|
1694 |
- CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
1695 |
- LIBS="$GTK_LIBS $LIBS"
|
|
1696 |
-dnl
|
|
1697 |
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
|
|
1698 |
-dnl checks the results of gtk-config to some extent
|
|
1699 |
-dnl
|
|
1700 |
- rm -f conf.gtktest
|
|
1701 |
- AC_TRY_RUN([
|
|
1702 |
-#include <gtk/gtk.h>
|
|
1703 |
-#include <stdio.h>
|
|
1704 |
-#include <stdlib.h>
|
|
1705 |
+_AM_IF_OPTION([no-dependencies],,
|
|
1706 |
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
|
1707 |
+ [_AM_DEPENDENCIES(CC)],
|
|
1708 |
+ [define([AC_PROG_CC],
|
|
1709 |
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
|
1710 |
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
1711 |
+ [_AM_DEPENDENCIES(CXX)],
|
|
1712 |
+ [define([AC_PROG_CXX],
|
|
1713 |
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
1714 |
+])
|
|
1715 |
+])
|
|
1716 |
|
|
1717 |
-int
|
|
1718 |
-main ()
|
|
1719 |
-{
|
|
1720 |
- int major, minor, micro;
|
|
1721 |
- char *tmp_version;
|
|
1722 |
|
|
1723 |
- system ("touch conf.gtktest");
|
|
1724 |
+# When config.status generates a header, we must update the stamp-h file.
|
|
1725 |
+# This file resides in the same directory as the config header
|
|
1726 |
+# that is generated. The stamp files are numbered to have different names.
|
|
1727 |
|
|
1728 |
- /* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
1729 |
- tmp_version = g_strdup("$min_gtk_version");
|
|
1730 |
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
1731 |
- printf("%s, bad version string\n", "$min_gtk_version");
|
|
1732 |
- exit(1);
|
|
1733 |
- }
|
|
1734 |
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
|
|
1735 |
+# loop where config.status creates the headers, so we can generate
|
|
1736 |
+# our stamp files there.
|
|
1737 |
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
|
|
1738 |
+[# Compute $1's index in $config_headers.
|
|
1739 |
+_am_stamp_count=1
|
|
1740 |
+for _am_header in $config_headers :; do
|
|
1741 |
+ case $_am_header in
|
|
1742 |
+ $1 | $1:* )
|
|
1743 |
+ break ;;
|
|
1744 |
+ * )
|
|
1745 |
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
|
1746 |
+ esac
|
|
1747 |
+done
|
|
1748 |
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
|
1749 |
|
|
1750 |
- if ((gtk_major_version != $gtk_config_major_version) ||
|
|
1751 |
- (gtk_minor_version != $gtk_config_minor_version) ||
|
|
1752 |
- (gtk_micro_version != $gtk_config_micro_version))
|
|
1753 |
- {
|
|
1754 |
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
|
1755 |
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
|
1756 |
- gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
1757 |
- printf ("*** was found! If gtk-config was correct, then it is best\n");
|
|
1758 |
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
|
1759 |
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
1760 |
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
1761 |
- printf("*** required on your system.\n");
|
|
1762 |
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
|
1763 |
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
|
1764 |
- printf("*** before re-running configure\n");
|
|
1765 |
- }
|
|
1766 |
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
|
|
1767 |
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
|
1768 |
- (gtk_minor_version != GTK_MINOR_VERSION) ||
|
|
1769 |
- (gtk_micro_version != GTK_MICRO_VERSION))
|
|
1770 |
- {
|
|
1771 |
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
1772 |
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
1773 |
- printf("*** library (version %d.%d.%d)\n",
|
|
1774 |
- gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
1775 |
- }
|
|
1776 |
-#endif /* defined (GTK_MAJOR_VERSION) ... */
|
|
1777 |
- else
|
|
1778 |
- {
|
|
1779 |
- if ((gtk_major_version > major) ||
|
|
1780 |
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
|
1781 |
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
|
1782 |
- {
|
|
1783 |
- return 0;
|
|
1784 |
- }
|
|
1785 |
- else
|
|
1786 |
- {
|
|
1787 |
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
|
1788 |
- gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
1789 |
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
|
1790 |
- major, minor, micro);
|
|
1791 |
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
|
1792 |
- printf("***\n");
|
|
1793 |
- printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
1794 |
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
|
1795 |
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
1796 |
- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
|
1797 |
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
|
1798 |
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
1799 |
- printf("*** so that the correct libraries are found at run-time))\n");
|
|
1800 |
- }
|
|
1801 |
- }
|
|
1802 |
- return 1;
|
|
1803 |
-}
|
|
1804 |
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
1805 |
- CFLAGS="$ac_save_CFLAGS"
|
|
1806 |
- LIBS="$ac_save_LIBS"
|
|
1807 |
- fi
|
|
1808 |
- fi
|
|
1809 |
- if test "x$no_gtk" = x ; then
|
|
1810 |
- AC_MSG_RESULT(yes)
|
|
1811 |
- ifelse([$2], , :, [$2])
|
|
1812 |
- else
|
|
1813 |
- AC_MSG_RESULT(no)
|
|
1814 |
- if test "$GTK_CONFIG" = "no" ; then
|
|
1815 |
- echo "*** The gtk-config script installed by GTK could not be found"
|
|
1816 |
- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
|
1817 |
- echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
|
1818 |
- echo "*** full path to gtk-config."
|
|
1819 |
- else
|
|
1820 |
- if test -f conf.gtktest ; then
|
|
1821 |
- :
|
|
1822 |
- else
|
|
1823 |
- echo "*** Could not run GTK test program, checking why..."
|
|
1824 |
- CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
1825 |
- LIBS="$LIBS $GTK_LIBS"
|
|
1826 |
- AC_TRY_LINK([
|
|
1827 |
-#include <gtk/gtk.h>
|
|
1828 |
-#include <stdio.h>
|
|
1829 |
-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
|
1830 |
- [ echo "*** The test program compiled, but did not run. This usually means"
|
|
1831 |
- echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
|
1832 |
- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
|
|
1833 |
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
1834 |
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
1835 |
- echo "*** is required on your system"
|
|
1836 |
- echo "***"
|
|
1837 |
- echo "*** If you have an old version installed, it is best to remove it, although"
|
|
1838 |
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
1839 |
- echo "***"
|
|
1840 |
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
|
1841 |
- echo "*** came with the system with the command"
|
|
1842 |
- echo "***"
|
|
1843 |
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
|
1844 |
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
1845 |
- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
|
1846 |
- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
|
1847 |
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
|
|
1848 |
- CFLAGS="$ac_save_CFLAGS"
|
|
1849 |
- LIBS="$ac_save_LIBS"
|
|
1850 |
- fi
|
|
1851 |
- fi
|
|
1852 |
- GTK_CFLAGS=""
|
|
1853 |
- GTK_LIBS=""
|
|
1854 |
- ifelse([$3], , :, [$3])
|
|
1855 |
- fi
|
|
1856 |
- AC_SUBST(GTK_CFLAGS)
|
|
1857 |
- AC_SUBST(GTK_LIBS)
|
|
1858 |
- rm -f conf.gtktest
|
|
1859 |
-])
|
|
1860 |
+# Copyright 2002 Free Software Foundation, Inc.
|
|
1861 |
|
|
1862 |
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
1863 |
-#
|
|
1864 |
-# This file is free software; the Free Software Foundation
|
|
1865 |
-# gives unlimited permission to copy and/or distribute it,
|
|
1866 |
-# with or without modifications, as long as this notice is preserved.
|
|
1867 |
+# This program is free software; you can redistribute it and/or modify
|
|
1868 |
+# it under the terms of the GNU General Public License as published by
|
|
1869 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
1870 |
+# any later version.
|
|
1871 |
+
|
|
1872 |
+# This program is distributed in the hope that it will be useful,
|
|
1873 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
1874 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
1875 |
+# GNU General Public License for more details.
|
|
1876 |
+
|
|
1877 |
+# You should have received a copy of the GNU General Public License
|
|
1878 |
+# along with this program; if not, write to the Free Software
|
|
1879 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
1880 |
|
|
1881 |
# AM_AUTOMAKE_VERSION(VERSION)
|
|
1882 |
# ----------------------------
|
|
1883 |
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
|
1884 |
# generated from the m4 files accompanying Automake X.Y.
|
|
1885 |
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
|
1886 |
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
|
|
1887 |
|
|
1888 |
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
|
1889 |
# -------------------------------
|
|
1890 |
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
|
1891 |
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
|
1892 |
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
1893 |
- [AM_AUTOMAKE_VERSION([1.9.5])])
|
|
1894 |
+ [AM_AUTOMAKE_VERSION([1.7.9])])
|
|
1895 |
|
|
1896 |
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
1897 |
+# Helper functions for option handling. -*- Autoconf -*-
|
|
1898 |
|
|
1899 |
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
1900 |
-#
|
|
1901 |
-# This file is free software; the Free Software Foundation
|
|
1902 |
-# gives unlimited permission to copy and/or distribute it,
|
|
1903 |
-# with or without modifications, as long as this notice is preserved.
|
|
1904 |
+# Copyright 2001, 2002 Free Software Foundation, Inc.
|
|
1905 |
|
|
1906 |
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
|
|
1907 |
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
|
|
1908 |
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
|
|
1909 |
-#
|
|
1910 |
-# Of course, Automake must honor this variable whenever it calls a
|
|
1911 |
-# tool from the auxiliary directory. The problem is that $srcdir (and
|
|
1912 |
-# therefore $ac_aux_dir as well) can be either absolute or relative,
|
|
1913 |
-# depending on how configure is run. This is pretty annoying, since
|
|
1914 |
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
|
|
1915 |
-# source directory, any form will work fine, but in subdirectories a
|
|
1916 |
-# relative path needs to be adjusted first.
|
|
1917 |
-#
|
|
1918 |
-# $ac_aux_dir/missing
|
|
1919 |
-# fails when called from a subdirectory if $ac_aux_dir is relative
|
|
1920 |
-# $top_srcdir/$ac_aux_dir/missing
|
|
1921 |
-# fails if $ac_aux_dir is absolute,
|
|
1922 |
-# fails when called from a subdirectory in a VPATH build with
|
|
1923 |
-# a relative $ac_aux_dir
|
|
1924 |
-#
|
|
1925 |
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
|
|
1926 |
-# are both prefixed by $srcdir. In an in-source build this is usually
|
|
1927 |
-# harmless because $srcdir is `.', but things will broke when you
|
|
1928 |
-# start a VPATH build or use an absolute $srcdir.
|
|
1929 |
-#
|
|
1930 |
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
|
|
1931 |
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
|
|
1932 |
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
|
|
1933 |
-# and then we would define $MISSING as
|
|
1934 |
-# MISSING="\${SHELL} $am_aux_dir/missing"
|
|
1935 |
-# This will work as long as MISSING is not called from configure, because
|
|
1936 |
-# unfortunately $(top_srcdir) has no meaning in configure.
|
|
1937 |
-# However there are other variables, like CC, which are often used in
|
|
1938 |
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
|
|
1939 |
-#
|
|
1940 |
-# Another solution, used here, is to always expand $ac_aux_dir to an
|
|
1941 |
-# absolute PATH. The drawback is that using absolute paths prevent a
|
|
1942 |
-# configured tree to be moved without reconfiguration.
|
|
1943 |
+# This program is free software; you can redistribute it and/or modify
|
|
1944 |
+# it under the terms of the GNU General Public License as published by
|
|
1945 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
1946 |
+# any later version.
|
|
1947 |
|
|
1948 |
-AC_DEFUN([AM_AUX_DIR_EXPAND],
|
|
1949 |
-[dnl Rely on autoconf to set up CDPATH properly.
|
|
1950 |
-AC_PREREQ([2.50])dnl
|
|
1951 |
-# expand $ac_aux_dir to an absolute path
|
|
1952 |
-am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
1953 |
-])
|
|
1954 |
+# This program is distributed in the hope that it will be useful,
|
|
1955 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
1956 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
1957 |
+# GNU General Public License for more details.
|
|
1958 |
+
|
|
1959 |
+# You should have received a copy of the GNU General Public License
|
|
1960 |
+# along with this program; if not, write to the Free Software
|
|
1961 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
1962 |
+# 02111-1307, USA.
|
|
1963 |
|
|
1964 |
+# serial 2
|
|
1965 |
|
|
1966 |
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
|
|
1967 |
-# Free Software Foundation, Inc.
|
|
1968 |
-#
|
|
1969 |
-# This file is free software; the Free Software Foundation
|
|
1970 |
-# gives unlimited permission to copy and/or distribute it,
|
|
1971 |
-# with or without modifications, as long as this notice is preserved.
|
|
1972 |
+# _AM_MANGLE_OPTION(NAME)
|
|
1973 |
+# -----------------------
|
|
1974 |
+AC_DEFUN([_AM_MANGLE_OPTION],
|
|
1975 |
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
|
|
1976 |
+
|
|
1977 |
+# _AM_SET_OPTION(NAME)
|
|
1978 |
+# ------------------------------
|
|
1979 |
+# Set option NAME. Presently that only means defining a flag for this option.
|
|
1980 |
+AC_DEFUN([_AM_SET_OPTION],
|
|
1981 |
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
|
|
1982 |
+
|
|
1983 |
+# _AM_SET_OPTIONS(OPTIONS)
|
|
1984 |
+# ----------------------------------
|
|
1985 |
+# OPTIONS is a space-separated list of Automake options.
|
|
1986 |
+AC_DEFUN([_AM_SET_OPTIONS],
|
|
1987 |
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
|
1988 |
+
|
|
1989 |
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
|
|
1990 |
+# -------------------------------------------
|
|
1991 |
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
|
|
1992 |
+AC_DEFUN([_AM_IF_OPTION],
|
|
1993 |
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
|
1994 |
+
|
|
1995 |
+#
|
|
1996 |
+# Check to make sure that the build environment is sane.
|
|
1997 |
+#
|
|
1998 |
+
|
|
1999 |
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
|
|
2000 |
+
|
|
2001 |
+# This program is free software; you can redistribute it and/or modify
|
|
2002 |
+# it under the terms of the GNU General Public License as published by
|
|
2003 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2004 |
+# any later version.
|
|
2005 |
+
|
|
2006 |
+# This program is distributed in the hope that it will be useful,
|
|
2007 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2008 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2009 |
+# GNU General Public License for more details.
|
|
2010 |
+
|
|
2011 |
+# You should have received a copy of the GNU General Public License
|
|
2012 |
+# along with this program; if not, write to the Free Software
|
|
2013 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2014 |
+# 02111-1307, USA.
|
|
2015 |
+
|
|
2016 |
+# serial 3
|
|
2017 |
+
|
|
2018 |
+# AM_SANITY_CHECK
|
|
2019 |
+# ---------------
|
|
2020 |
+AC_DEFUN([AM_SANITY_CHECK],
|
|
2021 |
+[AC_MSG_CHECKING([whether build environment is sane])
|
|
2022 |
+# Just in case
|
|
2023 |
+sleep 1
|
|
2024 |
+echo timestamp > conftest.file
|
|
2025 |
+# Do `set' in a subshell so we don't clobber the current shell's
|
|
2026 |
+# arguments. Must try -L first in case configure is actually a
|
|
2027 |
+# symlink; some systems play weird games with the mod time of symlinks
|
|
2028 |
+# (eg FreeBSD returns the mod time of the symlink's containing
|
|
2029 |
+# directory).
|
|
2030 |
+if (
|
|
2031 |
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
|
2032 |
+ if test "$[*]" = "X"; then
|
|
2033 |
+ # -L didn't work.
|
|
2034 |
+ set X `ls -t $srcdir/configure conftest.file`
|
|
2035 |
+ fi
|
|
2036 |
+ rm -f conftest.file
|
|
2037 |
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
|
|
2038 |
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
|
|
2039 |
+
|
|
2040 |
+ # If neither matched, then we have a broken ls. This can happen
|
|
2041 |
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
|
|
2042 |
+ # broken ls alias from the environment. This has actually
|
|
2043 |
+ # happened. Such a system could not be considered "sane".
|
|
2044 |
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
|
|
2045 |
+alias in your environment])
|
|
2046 |
+ fi
|
|
2047 |
|
|
2048 |
-# serial 4
|
|
2049 |
+ test "$[2]" = conftest.file
|
|
2050 |
+ )
|
|
2051 |
+then
|
|
2052 |
+ # Ok.
|
|
2053 |
+ :
|
|
2054 |
+else
|
|
2055 |
+ AC_MSG_ERROR([newly created file is older than distributed files!
|
|
2056 |
+Check your system clock])
|
|
2057 |
+fi
|
|
2058 |
+AC_MSG_RESULT(yes)])
|
|
2059 |
+
|
|
2060 |
+# -*- Autoconf -*-
|
|
2061 |
+
|
|
2062 |
+
|
|
2063 |
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
|
|
2064 |
+
|
|
2065 |
+# This program is free software; you can redistribute it and/or modify
|
|
2066 |
+# it under the terms of the GNU General Public License as published by
|
|
2067 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2068 |
+# any later version.
|
|
2069 |
+
|
|
2070 |
+# This program is distributed in the hope that it will be useful,
|
|
2071 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2072 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2073 |
+# GNU General Public License for more details.
|
|
2074 |
+
|
|
2075 |
+# You should have received a copy of the GNU General Public License
|
|
2076 |
+# along with this program; if not, write to the Free Software
|
|
2077 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2078 |
+# 02111-1307, USA.
|
|
2079 |
|
|
2080 |
-# This was merged into AC_PROG_CC in Autoconf.
|
|
2081 |
+# serial 3
|
|
2082 |
+
|
|
2083 |
+# AM_MISSING_PROG(NAME, PROGRAM)
|
|
2084 |
+# ------------------------------
|
|
2085 |
+AC_DEFUN([AM_MISSING_PROG],
|
|
2086 |
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
|
|
2087 |
+$1=${$1-"${am_missing_run}$2"}
|
|
2088 |
+AC_SUBST($1)])
|
|
2089 |
|
|
2090 |
-AU_DEFUN([AM_PROG_CC_STDC],
|
|
2091 |
-[AC_PROG_CC
|
|
2092 |
-AC_DIAGNOSE([obsolete], [$0:
|
|
2093 |
- your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
|
|
2094 |
- `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
|
|
2095 |
- you adjust the code. You can also remove the above call to
|
|
2096 |
- AC_PROG_CC if you already called it elsewhere.])
|
|
2097 |
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
|
|
2098 |
+
|
|
2099 |
+# AM_MISSING_HAS_RUN
|
|
2100 |
+# ------------------
|
|
2101 |
+# Define MISSING if not defined so far and test if it supports --run.
|
|
2102 |
+# If it does, set am_missing_run to use it, otherwise, to nothing.
|
|
2103 |
+AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
2104 |
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
2105 |
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
2106 |
+# Use eval to expand $SHELL
|
|
2107 |
+if eval "$MISSING --run true"; then
|
|
2108 |
+ am_missing_run="$MISSING --run "
|
|
2109 |
+else
|
|
2110 |
+ am_missing_run=
|
|
2111 |
+ AC_MSG_WARN([`missing' script is too old or missing])
|
|
2112 |
+fi
|
|
2113 |
])
|
|
2114 |
-AU_DEFUN([fp_PROG_CC_STDC])
|
|
2115 |
|
|
2116 |
-# AM_CONDITIONAL -*- Autoconf -*-
|
|
2117 |
+# AM_AUX_DIR_EXPAND
|
|
2118 |
|
|
2119 |
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
|
2120 |
-# Free Software Foundation, Inc.
|
|
2121 |
+# Copyright 2001 Free Software Foundation, Inc.
|
|
2122 |
+
|
|
2123 |
+# This program is free software; you can redistribute it and/or modify
|
|
2124 |
+# it under the terms of the GNU General Public License as published by
|
|
2125 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2126 |
+# any later version.
|
|
2127 |
+
|
|
2128 |
+# This program is distributed in the hope that it will be useful,
|
|
2129 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2130 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2131 |
+# GNU General Public License for more details.
|
|
2132 |
+
|
|
2133 |
+# You should have received a copy of the GNU General Public License
|
|
2134 |
+# along with this program; if not, write to the Free Software
|
|
2135 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2136 |
+# 02111-1307, USA.
|
|
2137 |
+
|
|
2138 |
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
|
|
2139 |
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
|
|
2140 |
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
|
|
2141 |
#
|
|
2142 |
-# This file is free software; the Free Software Foundation
|
|
2143 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2144 |
-# with or without modifications, as long as this notice is preserved.
|
|
2145 |
+# Of course, Automake must honor this variable whenever it calls a
|
|
2146 |
+# tool from the auxiliary directory. The problem is that $srcdir (and
|
|
2147 |
+# therefore $ac_aux_dir as well) can be either absolute or relative,
|
|
2148 |
+# depending on how configure is run. This is pretty annoying, since
|
|
2149 |
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
|
|
2150 |
+# source directory, any form will work fine, but in subdirectories a
|
|
2151 |
+# relative path needs to be adjusted first.
|
|
2152 |
+#
|
|
2153 |
+# $ac_aux_dir/missing
|
|
2154 |
+# fails when called from a subdirectory if $ac_aux_dir is relative
|
|
2155 |
+# $top_srcdir/$ac_aux_dir/missing
|
|
2156 |
+# fails if $ac_aux_dir is absolute,
|
|
2157 |
+# fails when called from a subdirectory in a VPATH build with
|
|
2158 |
+# a relative $ac_aux_dir
|
|
2159 |
+#
|
|
2160 |
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
|
|
2161 |
+# are both prefixed by $srcdir. In an in-source build this is usually
|
|
2162 |
+# harmless because $srcdir is `.', but things will broke when you
|
|
2163 |
+# start a VPATH build or use an absolute $srcdir.
|
|
2164 |
+#
|
|
2165 |
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
|
|
2166 |
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
|
|
2167 |
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
|
|
2168 |
+# and then we would define $MISSING as
|
|
2169 |
+# MISSING="\${SHELL} $am_aux_dir/missing"
|
|
2170 |
+# This will work as long as MISSING is not called from configure, because
|
|
2171 |
+# unfortunately $(top_srcdir) has no meaning in configure.
|
|
2172 |
+# However there are other variables, like CC, which are often used in
|
|
2173 |
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
|
|
2174 |
+#
|
|
2175 |
+# Another solution, used here, is to always expand $ac_aux_dir to an
|
|
2176 |
+# absolute PATH. The drawback is that using absolute paths prevent a
|
|
2177 |
+# configured tree to be moved without reconfiguration.
|
|
2178 |
|
|
2179 |
-# serial 7
|
|
2180 |
+# Rely on autoconf to set up CDPATH properly.
|
|
2181 |
+AC_PREREQ([2.50])
|
|
2182 |
|
|
2183 |
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
2184 |
-# -------------------------------------
|
|
2185 |
-# Define a conditional.
|
|
2186 |
-AC_DEFUN([AM_CONDITIONAL],
|
|
2187 |
-[AC_PREREQ(2.52)dnl
|
|
2188 |
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
2189 |
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
2190 |
-AC_SUBST([$1_TRUE])
|
|
2191 |
-AC_SUBST([$1_FALSE])
|
|
2192 |
-if $2; then
|
|
2193 |
- $1_TRUE=
|
|
2194 |
- $1_FALSE='#'
|
|
2195 |
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
|
|
2196 |
+# expand $ac_aux_dir to an absolute path
|
|
2197 |
+am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
2198 |
+])
|
|
2199 |
+
|
|
2200 |
+# AM_PROG_INSTALL_SH
|
|
2201 |
+# ------------------
|
|
2202 |
+# Define $install_sh.
|
|
2203 |
+
|
|
2204 |
+# Copyright 2001 Free Software Foundation, Inc.
|
|
2205 |
+
|
|
2206 |
+# This program is free software; you can redistribute it and/or modify
|
|
2207 |
+# it under the terms of the GNU General Public License as published by
|
|
2208 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2209 |
+# any later version.
|
|
2210 |
+
|
|
2211 |
+# This program is distributed in the hope that it will be useful,
|
|
2212 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2213 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2214 |
+# GNU General Public License for more details.
|
|
2215 |
+
|
|
2216 |
+# You should have received a copy of the GNU General Public License
|
|
2217 |
+# along with this program; if not, write to the Free Software
|
|
2218 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2219 |
+# 02111-1307, USA.
|
|
2220 |
+
|
|
2221 |
+AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
2222 |
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
2223 |
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
2224 |
+AC_SUBST(install_sh)])
|
|
2225 |
+
|
|
2226 |
+# AM_PROG_INSTALL_STRIP
|
|
2227 |
+
|
|
2228 |
+# Copyright 2001 Free Software Foundation, Inc.
|
|
2229 |
+
|
|
2230 |
+# This program is free software; you can redistribute it and/or modify
|
|
2231 |
+# it under the terms of the GNU General Public License as published by
|
|
2232 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2233 |
+# any later version.
|
|
2234 |
+
|
|
2235 |
+# This program is distributed in the hope that it will be useful,
|
|
2236 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2237 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2238 |
+# GNU General Public License for more details.
|
|
2239 |
+
|
|
2240 |
+# You should have received a copy of the GNU General Public License
|
|
2241 |
+# along with this program; if not, write to the Free Software
|
|
2242 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2243 |
+# 02111-1307, USA.
|
|
2244 |
+
|
|
2245 |
+# One issue with vendor `install' (even GNU) is that you can't
|
|
2246 |
+# specify the program used to strip binaries. This is especially
|
|
2247 |
+# annoying in cross-compiling environments, where the build's strip
|
|
2248 |
+# is unlikely to handle the host's binaries.
|
|
2249 |
+# Fortunately install-sh will honor a STRIPPROG variable, so we
|
|
2250 |
+# always use install-sh in `make install-strip', and initialize
|
|
2251 |
+# STRIPPROG with the value of the STRIP variable (set by the user).
|
|
2252 |
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
|
|
2253 |
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
|
2254 |
+# Installed binaries are usually stripped using `strip' when the user
|
|
2255 |
+# run `make install-strip'. However `strip' might not be the right
|
|
2256 |
+# tool to use in cross-compilation environments, therefore Automake
|
|
2257 |
+# will honor the `STRIP' environment variable to overrule this program.
|
|
2258 |
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
|
2259 |
+if test "$cross_compiling" != no; then
|
|
2260 |
+ AC_CHECK_TOOL([STRIP], [strip], :)
|
|
2261 |
+fi
|
|
2262 |
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
2263 |
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
2264 |
+
|
|
2265 |
+# -*- Autoconf -*-
|
|
2266 |
+# Copyright (C) 2003 Free Software Foundation, Inc.
|
|
2267 |
+
|
|
2268 |
+# This program is free software; you can redistribute it and/or modify
|
|
2269 |
+# it under the terms of the GNU General Public License as published by
|
|
2270 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2271 |
+# any later version.
|
|
2272 |
+
|
|
2273 |
+# This program is distributed in the hope that it will be useful,
|
|
2274 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2275 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2276 |
+# GNU General Public License for more details.
|
|
2277 |
+
|
|
2278 |
+# You should have received a copy of the GNU General Public License
|
|
2279 |
+# along with this program; if not, write to the Free Software
|
|
2280 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2281 |
+# 02111-1307, USA.
|
|
2282 |
+
|
|
2283 |
+# serial 1
|
|
2284 |
+
|
|
2285 |
+# Check whether the underlying file-system supports filenames
|
|
2286 |
+# with a leading dot. For instance MS-DOS doesn't.
|
|
2287 |
+AC_DEFUN([AM_SET_LEADING_DOT],
|
|
2288 |
+[rm -rf .tst 2>/dev/null
|
|
2289 |
+mkdir .tst 2>/dev/null
|
|
2290 |
+if test -d .tst; then
|
|
2291 |
+ am__leading_dot=.
|
|
2292 |
else
|
|
2293 |
- $1_TRUE='#'
|
|
2294 |
- $1_FALSE=
|
|
2295 |
+ am__leading_dot=_
|
|
2296 |
fi
|
|
2297 |
-AC_CONFIG_COMMANDS_PRE(
|
|
2298 |
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
|
|
2299 |
- AC_MSG_ERROR([[conditional "$1" was never defined.
|
|
2300 |
-Usually this means the macro was only invoked conditionally.]])
|
|
2301 |
-fi])])
|
|
2302 |
+rmdir .tst 2>/dev/null
|
|
2303 |
+AC_SUBST([am__leading_dot])])
|
|
2304 |
|
|
2305 |
+# serial 5 -*- Autoconf -*-
|
|
2306 |
|
|
2307 |
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
2308 |
-# Free Software Foundation, Inc.
|
|
2309 |
-#
|
|
2310 |
-# This file is free software; the Free Software Foundation
|
|
2311 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2312 |
-# with or without modifications, as long as this notice is preserved.
|
|
2313 |
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
|
2314 |
+
|
|
2315 |
+# This program is free software; you can redistribute it and/or modify
|
|
2316 |
+# it under the terms of the GNU General Public License as published by
|
|
2317 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2318 |
+# any later version.
|
|
2319 |
+
|
|
2320 |
+# This program is distributed in the hope that it will be useful,
|
|
2321 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2322 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2323 |
+# GNU General Public License for more details.
|
|
2324 |
+
|
|
2325 |
+# You should have received a copy of the GNU General Public License
|
|
2326 |
+# along with this program; if not, write to the Free Software
|
|
2327 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2328 |
+# 02111-1307, USA.
|
|
2329 |
|
|
2330 |
-# serial 8
|
|
2331 |
|
|
2332 |
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
|
2333 |
# written in clear, in which case automake, when reading aclocal.m4,
|
|
2334 |
@@ -548,6 +509,7 @@ fi])])
|
|
2335 |
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
|
|
2336 |
|
|
2337 |
|
|
2338 |
+
|
|
2339 |
# _AM_DEPENDENCIES(NAME)
|
|
2340 |
# ----------------------
|
|
2341 |
# See how the compiler implements dependency checking.
|
|
2342 |
@@ -606,9 +568,7 @@ AC_CACHE_CHECK([dependency style of $dep
|
|
2343 |
: > sub/conftest.c
|
|
2344 |
for i in 1 2 3 4 5 6; do
|
|
2345 |
echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
|
2346 |
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
|
2347 |
- # Solaris 8's {/usr,}/bin/sh.
|
|
2348 |
- touch sub/conftst$i.h
|
|
2349 |
+ : > sub/conftst$i.h
|
|
2350 |
done
|
|
2351 |
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
2352 |
|
|
2353 |
@@ -636,14 +596,9 @@ AC_CACHE_CHECK([dependency style of $dep
|
|
2354 |
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
2355 |
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
2356 |
# icc doesn't choke on unknown options, it will just issue warnings
|
|
2357 |
- # or remarks (even with -Werror). So we grep stderr for any message
|
|
2358 |
- # that says an option was ignored or not supported.
|
|
2359 |
- # When given -MP, icc 7.0 and 7.1 complain thusly:
|
|
2360 |
- # icc: Command line warning: ignoring option '-M'; no argument required
|
|
2361 |
- # The diagnosis changed in icc 8.0:
|
|
2362 |
- # icc: Command line remark: option '-MP' not supported
|
|
2363 |
- if (grep 'ignoring option' conftest.err ||
|
|
2364 |
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
|
2365 |
+ # (even with -Werror). So we grep stderr for any message
|
|
2366 |
+ # that says an option was ignored.
|
|
2367 |
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
|
|
2368 |
am_cv_$1_dependencies_compiler_type=$depmode
|
|
2369 |
break
|
|
2370 |
fi
|
|
2371 |
@@ -677,8 +632,8 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}d
|
|
2372 |
# ------------
|
|
2373 |
AC_DEFUN([AM_DEP_TRACK],
|
|
2374 |
[AC_ARG_ENABLE(dependency-tracking,
|
|
2375 |
-[ --disable-dependency-tracking speeds up one-time build
|
|
2376 |
- --enable-dependency-tracking do not reject slow dependency extractors])
|
|
2377 |
+[ --disable-dependency-tracking Speeds up one-time builds
|
|
2378 |
+ --enable-dependency-tracking Do not reject slow dependency extractors])
|
|
2379 |
if test "x$enable_dependency_tracking" != xno; then
|
|
2380 |
am_depcomp="$ac_aux_dir/depcomp"
|
|
2381 |
AMDEPBACKSLASH='\'
|
|
2382 |
@@ -687,16 +642,26 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_
|
|
2383 |
AC_SUBST([AMDEPBACKSLASH])
|
|
2384 |
])
|
|
2385 |
|
|
2386 |
-# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
2387 |
+# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
2388 |
|
|
2389 |
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
2390 |
-# Free Software Foundation, Inc.
|
|
2391 |
-#
|
|
2392 |
-# This file is free software; the Free Software Foundation
|
|
2393 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2394 |
-# with or without modifications, as long as this notice is preserved.
|
|
2395 |
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
2396 |
+
|
|
2397 |
+# This program is free software; you can redistribute it and/or modify
|
|
2398 |
+# it under the terms of the GNU General Public License as published by
|
|
2399 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2400 |
+# any later version.
|
|
2401 |
+
|
|
2402 |
+# This program is distributed in the hope that it will be useful,
|
|
2403 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2404 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2405 |
+# GNU General Public License for more details.
|
|
2406 |
+
|
|
2407 |
+# You should have received a copy of the GNU General Public License
|
|
2408 |
+# along with this program; if not, write to the Free Software
|
|
2409 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2410 |
+# 02111-1307, USA.
|
|
2411 |
|
|
2412 |
-#serial 3
|
|
2413 |
+#serial 2
|
|
2414 |
|
|
2415 |
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
2416 |
# ------------------------------
|
|
2417 |
@@ -715,21 +680,27 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
2418 |
else
|
|
2419 |
continue
|
|
2420 |
fi
|
|
2421 |
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
2422 |
- # from the Makefile without running `make'.
|
|
2423 |
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
2424 |
+ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
|
|
2425 |
+ # Extract the definition of DEP_FILES from the Makefile without
|
|
2426 |
+ # running `make'.
|
|
2427 |
+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
|
|
2428 |
test -z "$DEPDIR" && continue
|
|
2429 |
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
2430 |
- test -z "am__include" && continue
|
|
2431 |
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
2432 |
# When using ansi2knr, U may be empty or an underscore; expand it
|
|
2433 |
- U=`sed -n 's/^U = //p' < "$mf"`
|
|
2434 |
- # Find all dependency output files, they are included files with
|
|
2435 |
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
2436 |
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
2437 |
- # expansion.
|
|
2438 |
- for file in `sed -n "
|
|
2439 |
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
2440 |
+ U=`sed -n -e '/^U = / s///p' < "$mf"`
|
|
2441 |
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
|
|
2442 |
+ # We invoke sed twice because it is the simplest approach to
|
|
2443 |
+ # changing $(DEPDIR) to its actual value in the expansion.
|
|
2444 |
+ for file in `sed -n -e '
|
|
2445 |
+ /^DEP_FILES = .*\\\\$/ {
|
|
2446 |
+ s/^DEP_FILES = //
|
|
2447 |
+ :loop
|
|
2448 |
+ s/\\\\$//
|
|
2449 |
+ p
|
|
2450 |
+ n
|
|
2451 |
+ /\\\\$/ b loop
|
|
2452 |
+ p
|
|
2453 |
+ }
|
|
2454 |
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
|
|
2455 |
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
2456 |
# Make sure the directory exists.
|
|
2457 |
test -f "$dirpart/$file" && continue
|
|
2458 |
@@ -755,176 +726,26 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
|
|
2459 |
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
|
|
2460 |
])
|
|
2461 |
|
|
2462 |
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
|
2463 |
-# Free Software Foundation, Inc.
|
|
2464 |
-#
|
|
2465 |
-# This file is free software; the Free Software Foundation
|
|
2466 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2467 |
-# with or without modifications, as long as this notice is preserved.
|
|
2468 |
-
|
|
2469 |
-# serial 8
|
|
2470 |
-
|
|
2471 |
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
|
|
2472 |
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
2473 |
+# Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
2474 |
|
|
2475 |
-# Do all the work for Automake. -*- Autoconf -*-
|
|
2476 |
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
|
|
2477 |
|
|
2478 |
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
2479 |
-# Free Software Foundation, Inc.
|
|
2480 |
-#
|
|
2481 |
-# This file is free software; the Free Software Foundation
|
|
2482 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2483 |
-# with or without modifications, as long as this notice is preserved.
|
|
2484 |
+# This program is free software; you can redistribute it and/or modify
|
|
2485 |
+# it under the terms of the GNU General Public License as published by
|
|
2486 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2487 |
+# any later version.
|
|
2488 |
|
|
2489 |
-# serial 12
|
|
2490 |
+# This program is distributed in the hope that it will be useful,
|
|
2491 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2492 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2493 |
+# GNU General Public License for more details.
|
|
2494 |
+
|
|
2495 |
+# You should have received a copy of the GNU General Public License
|
|
2496 |
+# along with this program; if not, write to the Free Software
|
|
2497 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2498 |
+# 02111-1307, USA.
|
|
2499 |
|
|
2500 |
-# This macro actually does too much. Some checks are only needed if
|
|
2501 |
-# your package does certain things. But this isn't really a big deal.
|
|
2502 |
-
|
|
2503 |
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
|
|
2504 |
-# AM_INIT_AUTOMAKE([OPTIONS])
|
|
2505 |
-# -----------------------------------------------
|
|
2506 |
-# The call with PACKAGE and VERSION arguments is the old style
|
|
2507 |
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
|
|
2508 |
-# and VERSION should now be passed to AC_INIT and removed from
|
|
2509 |
-# the call to AM_INIT_AUTOMAKE.
|
|
2510 |
-# We support both call styles for the transition. After
|
|
2511 |
-# the next Automake release, Autoconf can make the AC_INIT
|
|
2512 |
-# arguments mandatory, and then we can depend on a new Autoconf
|
|
2513 |
-# release and drop the old call support.
|
|
2514 |
-AC_DEFUN([AM_INIT_AUTOMAKE],
|
|
2515 |
-[AC_PREREQ([2.58])dnl
|
|
2516 |
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
|
2517 |
-dnl the ones we care about.
|
|
2518 |
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
|
2519 |
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
|
2520 |
-AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
2521 |
-# test to see if srcdir already configured
|
|
2522 |
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
|
2523 |
- test -f $srcdir/config.status; then
|
|
2524 |
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
2525 |
-fi
|
|
2526 |
-
|
|
2527 |
-# test whether we have cygpath
|
|
2528 |
-if test -z "$CYGPATH_W"; then
|
|
2529 |
- if (cygpath --version) >/dev/null 2>/dev/null; then
|
|
2530 |
- CYGPATH_W='cygpath -w'
|
|
2531 |
- else
|
|
2532 |
- CYGPATH_W=echo
|
|
2533 |
- fi
|
|
2534 |
-fi
|
|
2535 |
-AC_SUBST([CYGPATH_W])
|
|
2536 |
-
|
|
2537 |
-# Define the identity of the package.
|
|
2538 |
-dnl Distinguish between old-style and new-style calls.
|
|
2539 |
-m4_ifval([$2],
|
|
2540 |
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
|
|
2541 |
- AC_SUBST([PACKAGE], [$1])dnl
|
|
2542 |
- AC_SUBST([VERSION], [$2])],
|
|
2543 |
-[_AM_SET_OPTIONS([$1])dnl
|
|
2544 |
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
|
2545 |
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
|
2546 |
-
|
|
2547 |
-_AM_IF_OPTION([no-define],,
|
|
2548 |
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
|
|
2549 |
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
|
|
2550 |
-
|
|
2551 |
-# Some tools Automake needs.
|
|
2552 |
-AC_REQUIRE([AM_SANITY_CHECK])dnl
|
|
2553 |
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
|
|
2554 |
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
|
|
2555 |
-AM_MISSING_PROG(AUTOCONF, autoconf)
|
|
2556 |
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
|
2557 |
-AM_MISSING_PROG(AUTOHEADER, autoheader)
|
|
2558 |
-AM_MISSING_PROG(MAKEINFO, makeinfo)
|
|
2559 |
-AM_PROG_INSTALL_SH
|
|
2560 |
-AM_PROG_INSTALL_STRIP
|
|
2561 |
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
|
2562 |
-# We need awk for the "check" target. The system "awk" is bad on
|
|
2563 |
-# some platforms.
|
|
2564 |
-AC_REQUIRE([AC_PROG_AWK])dnl
|
|
2565 |
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
2566 |
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
|
2567 |
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
|
2568 |
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
|
2569 |
- [_AM_PROG_TAR([v7])])])
|
|
2570 |
-_AM_IF_OPTION([no-dependencies],,
|
|
2571 |
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
|
2572 |
- [_AM_DEPENDENCIES(CC)],
|
|
2573 |
- [define([AC_PROG_CC],
|
|
2574 |
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
|
2575 |
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
|
2576 |
- [_AM_DEPENDENCIES(CXX)],
|
|
2577 |
- [define([AC_PROG_CXX],
|
|
2578 |
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
|
2579 |
-])
|
|
2580 |
-])
|
|
2581 |
-
|
|
2582 |
-
|
|
2583 |
-# When config.status generates a header, we must update the stamp-h file.
|
|
2584 |
-# This file resides in the same directory as the config header
|
|
2585 |
-# that is generated. The stamp files are numbered to have different names.
|
|
2586 |
-
|
|
2587 |
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
|
|
2588 |
-# loop where config.status creates the headers, so we can generate
|
|
2589 |
-# our stamp files there.
|
|
2590 |
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
|
|
2591 |
-[# Compute $1's index in $config_headers.
|
|
2592 |
-_am_stamp_count=1
|
|
2593 |
-for _am_header in $config_headers :; do
|
|
2594 |
- case $_am_header in
|
|
2595 |
- $1 | $1:* )
|
|
2596 |
- break ;;
|
|
2597 |
- * )
|
|
2598 |
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
|
2599 |
- esac
|
|
2600 |
-done
|
|
2601 |
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
|
2602 |
-
|
|
2603 |
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
2604 |
-#
|
|
2605 |
-# This file is free software; the Free Software Foundation
|
|
2606 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2607 |
-# with or without modifications, as long as this notice is preserved.
|
|
2608 |
-
|
|
2609 |
-# AM_PROG_INSTALL_SH
|
|
2610 |
-# ------------------
|
|
2611 |
-# Define $install_sh.
|
|
2612 |
-AC_DEFUN([AM_PROG_INSTALL_SH],
|
|
2613 |
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
2614 |
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
2615 |
-AC_SUBST(install_sh)])
|
|
2616 |
-
|
|
2617 |
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
2618 |
-#
|
|
2619 |
-# This file is free software; the Free Software Foundation
|
|
2620 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2621 |
-# with or without modifications, as long as this notice is preserved.
|
|
2622 |
-
|
|
2623 |
-# serial 2
|
|
2624 |
-
|
|
2625 |
-# Check whether the underlying file-system supports filenames
|
|
2626 |
-# with a leading dot. For instance MS-DOS doesn't.
|
|
2627 |
-AC_DEFUN([AM_SET_LEADING_DOT],
|
|
2628 |
-[rm -rf .tst 2>/dev/null
|
|
2629 |
-mkdir .tst 2>/dev/null
|
|
2630 |
-if test -d .tst; then
|
|
2631 |
- am__leading_dot=.
|
|
2632 |
-else
|
|
2633 |
- am__leading_dot=_
|
|
2634 |
-fi
|
|
2635 |
-rmdir .tst 2>/dev/null
|
|
2636 |
-AC_SUBST([am__leading_dot])])
|
|
2637 |
-
|
|
2638 |
-# Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
2639 |
-
|
|
2640 |
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
2641 |
-#
|
|
2642 |
-# This file is free software; the Free Software Foundation
|
|
2643 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2644 |
-# with or without modifications, as long as this notice is preserved.
|
|
2645 |
-
|
|
2646 |
-# serial 3
|
|
2647 |
+# serial 2
|
|
2648 |
|
|
2649 |
# AM_MAKE_INCLUDE()
|
|
2650 |
# -----------------
|
|
2651 |
@@ -968,310 +789,2492 @@ AC_MSG_RESULT([$_am_result])
|
|
2652 |
rm -f confinc confmf
|
|
2653 |
])
|
|
2654 |
|
|
2655 |
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
2656 |
+# AM_CONDITIONAL -*- Autoconf -*-
|
|
2657 |
|
|
2658 |
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
|
2659 |
-# Free Software Foundation, Inc.
|
|
2660 |
-#
|
|
2661 |
-# This file is free software; the Free Software Foundation
|
|
2662 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2663 |
-# with or without modifications, as long as this notice is preserved.
|
|
2664 |
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
|
|
2665 |
|
|
2666 |
-# serial 4
|
|
2667 |
+# This program is free software; you can redistribute it and/or modify
|
|
2668 |
+# it under the terms of the GNU General Public License as published by
|
|
2669 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2670 |
+# any later version.
|
|
2671 |
|
|
2672 |
-# AM_MISSING_PROG(NAME, PROGRAM)
|
|
2673 |
-# ------------------------------
|
|
2674 |
-AC_DEFUN([AM_MISSING_PROG],
|
|
2675 |
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
|
|
2676 |
-$1=${$1-"${am_missing_run}$2"}
|
|
2677 |
-AC_SUBST($1)])
|
|
2678 |
+# This program is distributed in the hope that it will be useful,
|
|
2679 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2680 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2681 |
+# GNU General Public License for more details.
|
|
2682 |
+
|
|
2683 |
+# You should have received a copy of the GNU General Public License
|
|
2684 |
+# along with this program; if not, write to the Free Software
|
|
2685 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2686 |
+# 02111-1307, USA.
|
|
2687 |
|
|
2688 |
+# serial 5
|
|
2689 |
|
|
2690 |
-# AM_MISSING_HAS_RUN
|
|
2691 |
-# ------------------
|
|
2692 |
-# Define MISSING if not defined so far and test if it supports --run.
|
|
2693 |
-# If it does, set am_missing_run to use it, otherwise, to nothing.
|
|
2694 |
-AC_DEFUN([AM_MISSING_HAS_RUN],
|
|
2695 |
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
2696 |
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
|
2697 |
-# Use eval to expand $SHELL
|
|
2698 |
-if eval "$MISSING --run true"; then
|
|
2699 |
- am_missing_run="$MISSING --run "
|
|
2700 |
+AC_PREREQ(2.52)
|
|
2701 |
+
|
|
2702 |
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
2703 |
+# -------------------------------------
|
|
2704 |
+# Define a conditional.
|
|
2705 |
+AC_DEFUN([AM_CONDITIONAL],
|
|
2706 |
+[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
2707 |
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
2708 |
+AC_SUBST([$1_TRUE])
|
|
2709 |
+AC_SUBST([$1_FALSE])
|
|
2710 |
+if $2; then
|
|
2711 |
+ $1_TRUE=
|
|
2712 |
+ $1_FALSE='#'
|
|
2713 |
else
|
|
2714 |
- am_missing_run=
|
|
2715 |
- AC_MSG_WARN([`missing' script is too old or missing])
|
|
2716 |
+ $1_TRUE='#'
|
|
2717 |
+ $1_FALSE=
|
|
2718 |
fi
|
|
2719 |
-])
|
|
2720 |
+AC_CONFIG_COMMANDS_PRE(
|
|
2721 |
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
|
|
2722 |
+ AC_MSG_ERROR([conditional "$1" was never defined.
|
|
2723 |
+Usually this means the macro was only invoked conditionally.])
|
|
2724 |
+fi])])
|
|
2725 |
|
|
2726 |
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
2727 |
-#
|
|
2728 |
-# This file is free software; the Free Software Foundation
|
|
2729 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2730 |
-# with or without modifications, as long as this notice is preserved.
|
|
2731 |
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
|
|
2732 |
|
|
2733 |
-# AM_PROG_MKDIR_P
|
|
2734 |
-# ---------------
|
|
2735 |
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
|
|
2736 |
-#
|
|
2737 |
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
|
|
2738 |
-# created by `make install' are always world readable, even if the
|
|
2739 |
-# installer happens to have an overly restrictive umask (e.g. 077).
|
|
2740 |
-# This was a mistake. There are at least two reasons why we must not
|
|
2741 |
-# use `-m 0755':
|
|
2742 |
-# - it causes special bits like SGID to be ignored,
|
|
2743 |
-# - it may be too restrictive (some setups expect 775 directories).
|
|
2744 |
-#
|
|
2745 |
-# Do not use -m 0755 and let people choose whatever they expect by
|
|
2746 |
-# setting umask.
|
|
2747 |
-#
|
|
2748 |
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
|
|
2749 |
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
|
|
2750 |
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
|
|
2751 |
-# concurrently, both version can detect that a/ is missing, but only
|
|
2752 |
-# one can create it and the other will error out. Consequently we
|
|
2753 |
-# restrict ourselves to GNU make (using the --version option ensures
|
|
2754 |
-# this.)
|
|
2755 |
-AC_DEFUN([AM_PROG_MKDIR_P],
|
|
2756 |
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
|
2757 |
- # We used to keeping the `.' as first argument, in order to
|
|
2758 |
- # allow $(mkdir_p) to be used without argument. As in
|
|
2759 |
- # $(mkdir_p) $(somedir)
|
|
2760 |
- # where $(somedir) is conditionally defined. However this is wrong
|
|
2761 |
- # for two reasons:
|
|
2762 |
- # 1. if the package is installed by a user who cannot write `.'
|
|
2763 |
- # make install will fail,
|
|
2764 |
- # 2. the above comment should most certainly read
|
|
2765 |
- # $(mkdir_p) $(DESTDIR)$(somedir)
|
|
2766 |
- # so it does not work when $(somedir) is undefined and
|
|
2767 |
- # $(DESTDIR) is not.
|
|
2768 |
- # To support the latter case, we have to write
|
|
2769 |
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
|
|
2770 |
- # so the `.' trick is pointless.
|
|
2771 |
- mkdir_p='mkdir -p --'
|
|
2772 |
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
|
|
2773 |
+
|
|
2774 |
+# This program is free software; you can redistribute it and/or modify
|
|
2775 |
+# it under the terms of the GNU General Public License as published by
|
|
2776 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2777 |
+# any later version.
|
|
2778 |
+
|
|
2779 |
+# This program is distributed in the hope that it will be useful,
|
|
2780 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2781 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2782 |
+# GNU General Public License for more details.
|
|
2783 |
+
|
|
2784 |
+# You should have received a copy of the GNU General Public License
|
|
2785 |
+# along with this program; if not, write to the Free Software
|
|
2786 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2787 |
+# 02111-1307, USA.
|
|
2788 |
+
|
|
2789 |
+AC_PREREQ([2.52])
|
|
2790 |
+
|
|
2791 |
+# serial 6
|
|
2792 |
+
|
|
2793 |
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
|
|
2794 |
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
2795 |
+
|
|
2796 |
+
|
|
2797 |
+# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
2798 |
+
|
|
2799 |
+# This program is free software; you can redistribute it and/or modify
|
|
2800 |
+# it under the terms of the GNU General Public License as published by
|
|
2801 |
+# the Free Software Foundation; either version 2, or (at your option)
|
|
2802 |
+# any later version.
|
|
2803 |
+
|
|
2804 |
+# This program is distributed in the hope that it will be useful,
|
|
2805 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
2806 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
2807 |
+# GNU General Public License for more details.
|
|
2808 |
+
|
|
2809 |
+# You should have received a copy of the GNU General Public License
|
|
2810 |
+# along with this program; if not, write to the Free Software
|
|
2811 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
2812 |
+# 02111-1307, USA.
|
|
2813 |
+
|
|
2814 |
+# serial 2
|
|
2815 |
+
|
|
2816 |
+# @defmac AC_PROG_CC_STDC
|
|
2817 |
+# @maindex PROG_CC_STDC
|
|
2818 |
+# @ovindex CC
|
|
2819 |
+# If the C compiler in not in ANSI C mode by default, try to add an option
|
|
2820 |
+# to output variable @code{CC} to make it so. This macro tries various
|
|
2821 |
+# options that select ANSI C on some system or another. It considers the
|
|
2822 |
+# compiler to be in ANSI C mode if it handles function prototypes correctly.
|
|
2823 |
+#
|
|
2824 |
+# If you use this macro, you should check after calling it whether the C
|
|
2825 |
+# compiler has been set to accept ANSI C; if not, the shell variable
|
|
2826 |
+# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
|
|
2827 |
+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
|
|
2828 |
+# program @code{ansi2knr}, which comes with Ghostscript.
|
|
2829 |
+# @end defmac
|
|
2830 |
+
|
|
2831 |
+AC_DEFUN([AM_PROG_CC_STDC],
|
|
2832 |
+[AC_REQUIRE([AC_PROG_CC])
|
|
2833 |
+AC_BEFORE([$0], [AC_C_INLINE])
|
|
2834 |
+AC_BEFORE([$0], [AC_C_CONST])
|
|
2835 |
+dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require
|
|
2836 |
+dnl a magic option to avoid problems with ANSI preprocessor commands
|
|
2837 |
+dnl like #elif.
|
|
2838 |
+dnl FIXME: can't do this because then AC_AIX won't work due to a
|
|
2839 |
+dnl circular dependency.
|
|
2840 |
+dnl AC_BEFORE([$0], [AC_PROG_CPP])
|
|
2841 |
+AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
|
|
2842 |
+AC_CACHE_VAL(am_cv_prog_cc_stdc,
|
|
2843 |
+[am_cv_prog_cc_stdc=no
|
|
2844 |
+ac_save_CC="$CC"
|
|
2845 |
+# Don't try gcc -ansi; that turns off useful extensions and
|
|
2846 |
+# breaks some systems' header files.
|
|
2847 |
+# AIX -qlanglvl=ansi
|
|
2848 |
+# Ultrix and OSF/1 -std1
|
|
2849 |
+# HP-UX 10.20 and later -Ae
|
|
2850 |
+# HP-UX older versions -Aa -D_HPUX_SOURCE
|
|
2851 |
+# SVR4 -Xc -D__EXTENSIONS__
|
|
2852 |
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
2853 |
+do
|
|
2854 |
+ CC="$ac_save_CC $ac_arg"
|
|
2855 |
+ AC_TRY_COMPILE(
|
|
2856 |
+[#include <stdarg.h>
|
|
2857 |
+#include <stdio.h>
|
|
2858 |
+#include <sys/types.h>
|
|
2859 |
+#include <sys/stat.h>
|
|
2860 |
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
2861 |
+struct buf { int x; };
|
|
2862 |
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
2863 |
+static char *e (p, i)
|
|
2864 |
+ char **p;
|
|
2865 |
+ int i;
|
|
2866 |
+{
|
|
2867 |
+ return p[i];
|
|
2868 |
+}
|
|
2869 |
+static char *f (char * (*g) (char **, int), char **p, ...)
|
|
2870 |
+{
|
|
2871 |
+ char *s;
|
|
2872 |
+ va_list v;
|
|
2873 |
+ va_start (v,p);
|
|
2874 |
+ s = g (p, va_arg (v,int));
|
|
2875 |
+ va_end (v);
|
|
2876 |
+ return s;
|
|
2877 |
+}
|
|
2878 |
+int test (int i, double x);
|
|
2879 |
+struct s1 {int (*f) (int a);};
|
|
2880 |
+struct s2 {int (*f) (double a);};
|
|
2881 |
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
|
2882 |
+int argc;
|
|
2883 |
+char **argv;
|
|
2884 |
+], [
|
|
2885 |
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
|
2886 |
+],
|
|
2887 |
+[am_cv_prog_cc_stdc="$ac_arg"; break])
|
|
2888 |
+done
|
|
2889 |
+CC="$ac_save_CC"
|
|
2890 |
+])
|
|
2891 |
+if test -z "$am_cv_prog_cc_stdc"; then
|
|
2892 |
+ AC_MSG_RESULT([none needed])
|
|
2893 |
else
|
|
2894 |
- # On NextStep and OpenStep, the `mkdir' command does not
|
|
2895 |
- # recognize any option. It will interpret all options as
|
|
2896 |
- # directories to create, and then abort because `.' already
|
|
2897 |
- # exists.
|
|
2898 |
- for d in ./-p ./--version;
|
|
2899 |
- do
|
|
2900 |
- test -d $d && rmdir $d
|
|
2901 |
- done
|
|
2902 |
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
|
|
2903 |
- if test -f "$ac_aux_dir/mkinstalldirs"; then
|
|
2904 |
- mkdir_p='$(mkinstalldirs)'
|
|
2905 |
- else
|
|
2906 |
- mkdir_p='$(install_sh) -d'
|
|
2907 |
- fi
|
|
2908 |
+ AC_MSG_RESULT([$am_cv_prog_cc_stdc])
|
|
2909 |
fi
|
|
2910 |
-AC_SUBST([mkdir_p])])
|
|
2911 |
+case "x$am_cv_prog_cc_stdc" in
|
|
2912 |
+ x|xno) ;;
|
|
2913 |
+ *) CC="$CC $am_cv_prog_cc_stdc" ;;
|
|
2914 |
+esac
|
|
2915 |
+])
|
|
2916 |
|
|
2917 |
-# Helper functions for option handling. -*- Autoconf -*-
|
|
2918 |
+AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
|
|
2919 |
|
|
2920 |
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
2921 |
-#
|
|
2922 |
-# This file is free software; the Free Software Foundation
|
|
2923 |
-# gives unlimited permission to copy and/or distribute it,
|
|
2924 |
-# with or without modifications, as long as this notice is preserved.
|
|
2925 |
+# gettext.m4 serial 16 (gettext-0.11.4)
|
|
2926 |
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
2927 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
2928 |
+dnl General Public License. As a special exception to the GNU General
|
|
2929 |
+dnl Public License, this file may be distributed as part of a program
|
|
2930 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
2931 |
+dnl the same distribution terms as the rest of that program.
|
|
2932 |
+dnl
|
|
2933 |
+dnl This file can can be used in projects which are not available under
|
|
2934 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
2935 |
+dnl License but which still want to provide support for the GNU gettext
|
|
2936 |
+dnl functionality.
|
|
2937 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
2938 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
2939 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
2940 |
+dnl They are *not* in the public domain.
|
|
2941 |
+
|
|
2942 |
+dnl Authors:
|
|
2943 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
2944 |
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
|
|
2945 |
+
|
|
2946 |
+dnl Macro to add for using GNU gettext.
|
|
2947 |
+
|
|
2948 |
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
|
|
2949 |
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
|
|
2950 |
+dnl default (if it is not specified or empty) is 'no-libtool'.
|
|
2951 |
+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
|
|
2952 |
+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
|
|
2953 |
+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
|
|
2954 |
+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
|
|
2955 |
+dnl depending on --{enable,disable}-{shared,static} and on the presence of
|
|
2956 |
+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
|
|
2957 |
+dnl $(top_builddir)/intl/libintl.a will be created.
|
|
2958 |
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
|
|
2959 |
+dnl implementations (in libc or libintl) without the ngettext() function
|
|
2960 |
+dnl will be ignored. If NEEDSYMBOL is specified and is
|
|
2961 |
+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
|
|
2962 |
+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
|
|
2963 |
+dnl INTLDIR is used to find the intl libraries. If empty,
|
|
2964 |
+dnl the value `$(top_builddir)/intl/' is used.
|
|
2965 |
+dnl
|
|
2966 |
+dnl The result of the configuration is one of three cases:
|
|
2967 |
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
|
|
2968 |
+dnl and used.
|
|
2969 |
+dnl Catalog format: GNU --> install in $(datadir)
|
|
2970 |
+dnl Catalog extension: .mo after installation, .gmo in source tree
|
|
2971 |
+dnl 2) GNU gettext has been found in the system's C library.
|
|
2972 |
+dnl Catalog format: GNU --> install in $(datadir)
|
|
2973 |
+dnl Catalog extension: .mo after installation, .gmo in source tree
|
|
2974 |
+dnl 3) No internationalization, always use English msgid.
|
|
2975 |
+dnl Catalog format: none
|
|
2976 |
+dnl Catalog extension: none
|
|
2977 |
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
|
|
2978 |
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
|
|
2979 |
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
|
|
2980 |
+dnl but we keep it in order not to force irrelevant filename changes on the
|
|
2981 |
+dnl maintainers.
|
|
2982 |
+dnl
|
|
2983 |
+AC_DEFUN([AM_GNU_GETTEXT],
|
|
2984 |
+[
|
|
2985 |
+ dnl Argument checking.
|
|
2986 |
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
|
|
2987 |
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
|
|
2988 |
+])])])])])
|
|
2989 |
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
|
|
2990 |
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
|
|
2991 |
+])])])])
|
|
2992 |
+ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
|
|
2993 |
+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
|
|
2994 |
+
|
|
2995 |
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
|
|
2996 |
+ ifelse(gt_included_intl, yes, [
|
|
2997 |
+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
|
|
2998 |
+ ])
|
|
2999 |
+
|
|
3000 |
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
|
3001 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
3002 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
3003 |
+
|
|
3004 |
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
|
|
3005 |
+ dnl Ideally we would do this search only after the
|
|
3006 |
+ dnl if test "$USE_NLS" = "yes"; then
|
|
3007 |
+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
|
|
3008 |
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
|
|
3009 |
+ dnl the configure script would need to contain the same shell code
|
|
3010 |
+ dnl again, outside any 'if'. There are two solutions:
|
|
3011 |
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
|
|
3012 |
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
|
|
3013 |
+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
|
|
3014 |
+ dnl documented, we avoid it.
|
|
3015 |
+ ifelse(gt_included_intl, yes, , [
|
|
3016 |
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
3017 |
+ ])
|
|
3018 |
+
|
|
3019 |
+ AC_MSG_CHECKING([whether NLS is requested])
|
|
3020 |
+ dnl Default is enabled NLS
|
|
3021 |
+ AC_ARG_ENABLE(nls,
|
|
3022 |
+ [ --disable-nls do not use Native Language Support],
|
|
3023 |
+ USE_NLS=$enableval, USE_NLS=yes)
|
|
3024 |
+ AC_MSG_RESULT($USE_NLS)
|
|
3025 |
+ AC_SUBST(USE_NLS)
|
|
3026 |
+
|
|
3027 |
+ ifelse(gt_included_intl, yes, [
|
|
3028 |
+ BUILD_INCLUDED_LIBINTL=no
|
|
3029 |
+ USE_INCLUDED_LIBINTL=no
|
|
3030 |
+ ])
|
|
3031 |
+ LIBINTL=
|
|
3032 |
+ LTLIBINTL=
|
|
3033 |
+ POSUB=
|
|
3034 |
+
|
|
3035 |
+ dnl If we use NLS figure out what method
|
|
3036 |
+ if test "$USE_NLS" = "yes"; then
|
|
3037 |
+ gt_use_preinstalled_gnugettext=no
|
|
3038 |
+ ifelse(gt_included_intl, yes, [
|
|
3039 |
+ AC_MSG_CHECKING([whether included gettext is requested])
|
|
3040 |
+ AC_ARG_WITH(included-gettext,
|
|
3041 |
+ [ --with-included-gettext use the GNU gettext library included here],
|
|
3042 |
+ nls_cv_force_use_gnu_gettext=$withval,
|
|
3043 |
+ nls_cv_force_use_gnu_gettext=no)
|
|
3044 |
+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
|
|
3045 |
+
|
|
3046 |
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
|
3047 |
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
|
3048 |
+ ])
|
|
3049 |
+ dnl User does not insist on using GNU NLS library. Figure out what
|
|
3050 |
+ dnl to use. If GNU gettext is available we use this. Else we have
|
|
3051 |
+ dnl to fall back to GNU NLS library.
|
|
3052 |
+
|
|
3053 |
+ dnl Add a version number to the cache macros.
|
|
3054 |
+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
|
|
3055 |
+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
|
|
3056 |
+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
|
|
3057 |
+
|
|
3058 |
+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
|
|
3059 |
+ [AC_TRY_LINK([#include <libintl.h>
|
|
3060 |
+]ifelse([$2], [need-formatstring-macros],
|
|
3061 |
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
|
3062 |
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
|
3063 |
+#endif
|
|
3064 |
+changequote(,)dnl
|
|
3065 |
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
|
3066 |
+changequote([,])dnl
|
|
3067 |
+], [])[extern int _nl_msg_cat_cntr;
|
|
3068 |
+extern int *_nl_domain_bindings;],
|
|
3069 |
+ [bindtextdomain ("", "");
|
|
3070 |
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
|
|
3071 |
+ gt_cv_func_gnugettext_libc=yes,
|
|
3072 |
+ gt_cv_func_gnugettext_libc=no)])
|
|
3073 |
+
|
|
3074 |
+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
|
|
3075 |
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
|
|
3076 |
+ ifelse(gt_included_intl, yes, , [
|
|
3077 |
+ AM_ICONV_LINK
|
|
3078 |
+ ])
|
|
3079 |
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
|
|
3080 |
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
|
|
3081 |
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
|
|
3082 |
+ dnl even if libiconv doesn't exist.
|
|
3083 |
+ AC_LIB_LINKFLAGS_BODY([intl])
|
|
3084 |
+ AC_CACHE_CHECK([for GNU gettext in libintl],
|
|
3085 |
+ gt_cv_func_gnugettext_libintl,
|
|
3086 |
+ [gt_save_CPPFLAGS="$CPPFLAGS"
|
|
3087 |
+ CPPFLAGS="$CPPFLAGS $INCINTL"
|
|
3088 |
+ gt_save_LIBS="$LIBS"
|
|
3089 |
+ LIBS="$LIBS $LIBINTL"
|
|
3090 |
+ dnl Now see whether libintl exists and does not depend on libiconv.
|
|
3091 |
+ AC_TRY_LINK([#include <libintl.h>
|
|
3092 |
+]ifelse([$2], [need-formatstring-macros],
|
|
3093 |
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
|
3094 |
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
|
3095 |
+#endif
|
|
3096 |
+changequote(,)dnl
|
|
3097 |
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
|
3098 |
+changequote([,])dnl
|
|
3099 |
+], [])[extern int _nl_msg_cat_cntr;
|
|
3100 |
+extern
|
|
3101 |
+#ifdef __cplusplus
|
|
3102 |
+"C"
|
|
3103 |
+#endif
|
|
3104 |
+const char *_nl_expand_alias ();],
|
|
3105 |
+ [bindtextdomain ("", "");
|
|
3106 |
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
3107 |
+ gt_cv_func_gnugettext_libintl=yes,
|
|
3108 |
+ gt_cv_func_gnugettext_libintl=no)
|
|
3109 |
+ dnl Now see whether libintl exists and depends on libiconv.
|
|
3110 |
+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
|
|
3111 |
+ LIBS="$LIBS $LIBICONV"
|
|
3112 |
+ AC_TRY_LINK([#include <libintl.h>
|
|
3113 |
+]ifelse([$2], [need-formatstring-macros],
|
|
3114 |
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
|
3115 |
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
|
3116 |
+#endif
|
|
3117 |
+changequote(,)dnl
|
|
3118 |
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
|
3119 |
+changequote([,])dnl
|
|
3120 |
+], [])[extern int _nl_msg_cat_cntr;
|
|
3121 |
+extern
|
|
3122 |
+#ifdef __cplusplus
|
|
3123 |
+"C"
|
|
3124 |
+#endif
|
|
3125 |
+const char *_nl_expand_alias ();],
|
|
3126 |
+ [bindtextdomain ("", "");
|
|
3127 |
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
3128 |
+ [LIBINTL="$LIBINTL $LIBICONV"
|
|
3129 |
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
|
3130 |
+ gt_cv_func_gnugettext_libintl=yes
|
|
3131 |
+ ])
|
|
3132 |
+ fi
|
|
3133 |
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
3134 |
+ LIBS="$gt_save_LIBS"])
|
|
3135 |
+ fi
|
|
3136 |
+
|
|
3137 |
+ dnl If an already present or preinstalled GNU gettext() is found,
|
|
3138 |
+ dnl use it. But if this macro is used in GNU gettext, and GNU
|
|
3139 |
+ dnl gettext is already preinstalled in libintl, we update this
|
|
3140 |
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
|
|
3141 |
+ if test "$gt_cv_func_gnugettext_libc" = "yes" \
|
|
3142 |
+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
|
|
3143 |
+ && test "$PACKAGE" != gettext; }; then
|
|
3144 |
+ gt_use_preinstalled_gnugettext=yes
|
|
3145 |
+ else
|
|
3146 |
+ dnl Reset the values set by searching for libintl.
|
|
3147 |
+ LIBINTL=
|
|
3148 |
+ LTLIBINTL=
|
|
3149 |
+ INCINTL=
|
|
3150 |
+ fi
|
|
3151 |
+
|
|
3152 |
+ ifelse(gt_included_intl, yes, [
|
|
3153 |
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
|
|
3154 |
+ dnl GNU gettext is not found in the C library.
|
|
3155 |
+ dnl Fall back on included GNU gettext library.
|
|
3156 |
+ nls_cv_use_gnu_gettext=yes
|
|
3157 |
+ fi
|
|
3158 |
+ fi
|
|
3159 |
|
|
3160 |
-# serial 3
|
|
3161 |
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
3162 |
+ dnl Mark actions used to generate GNU NLS library.
|
|
3163 |
+ INTLOBJS="\$(GETTOBJS)"
|
|
3164 |
+ BUILD_INCLUDED_LIBINTL=yes
|
|
3165 |
+ USE_INCLUDED_LIBINTL=yes
|
|
3166 |
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
|
|
3167 |
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
|
|
3168 |
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
|
3169 |
+ fi
|
|
3170 |
|
|
3171 |
-# _AM_MANGLE_OPTION(NAME)
|
|
3172 |
-# -----------------------
|
|
3173 |
-AC_DEFUN([_AM_MANGLE_OPTION],
|
|
3174 |
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
|
|
3175 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
3176 |
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
3177 |
+ dnl Mark actions to use GNU gettext tools.
|
|
3178 |
+ CATOBJEXT=.gmo
|
|
3179 |
+ fi
|
|
3180 |
+ ])
|
|
3181 |
|
|
3182 |
-# _AM_SET_OPTION(NAME)
|
|
3183 |
-# ------------------------------
|
|
3184 |
-# Set option NAME. Presently that only means defining a flag for this option.
|
|
3185 |
-AC_DEFUN([_AM_SET_OPTION],
|
|
3186 |
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
|
|
3187 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
3188 |
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
3189 |
+ AC_DEFINE(ENABLE_NLS, 1,
|
|
3190 |
+ [Define to 1 if translation of program messages to the user's native language
|
|
3191 |
+ is requested.])
|
|
3192 |
+ else
|
|
3193 |
+ USE_NLS=no
|
|
3194 |
+ fi
|
|
3195 |
+ fi
|
|
3196 |
|
|
3197 |
-# _AM_SET_OPTIONS(OPTIONS)
|
|
3198 |
-# ----------------------------------
|
|
3199 |
-# OPTIONS is a space-separated list of Automake options.
|
|
3200 |
-AC_DEFUN([_AM_SET_OPTIONS],
|
|
3201 |
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
|
3202 |
+ if test "$USE_NLS" = "yes"; then
|
|
3203 |
|
|
3204 |
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
|
|
3205 |
-# -------------------------------------------
|
|
3206 |
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
|
|
3207 |
-AC_DEFUN([_AM_IF_OPTION],
|
|
3208 |
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
|
3209 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
|
3210 |
+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
|
|
3211 |
+ AC_MSG_CHECKING([how to link with libintl])
|
|
3212 |
+ AC_MSG_RESULT([$LIBINTL])
|
|
3213 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
|
|
3214 |
+ fi
|
|
3215 |
|
|
3216 |
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
3217 |
+ dnl For backward compatibility. Some packages may be using this.
|
|
3218 |
+ AC_DEFINE(HAVE_GETTEXT, 1,
|
|
3219 |
+ [Define if the GNU gettext() function is already present or preinstalled.])
|
|
3220 |
+ AC_DEFINE(HAVE_DCGETTEXT, 1,
|
|
3221 |
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
|
|
3222 |
+ fi
|
|
3223 |
|
|
3224 |
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
|
3225 |
-# Free Software Foundation, Inc.
|
|
3226 |
-#
|
|
3227 |
-# This file is free software; the Free Software Foundation
|
|
3228 |
-# gives unlimited permission to copy and/or distribute it,
|
|
3229 |
-# with or without modifications, as long as this notice is preserved.
|
|
3230 |
+ dnl We need to process the po/ directory.
|
|
3231 |
+ POSUB=po
|
|
3232 |
+ fi
|
|
3233 |
|
|
3234 |
-# serial 4
|
|
3235 |
+ ifelse(gt_included_intl, yes, [
|
|
3236 |
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
|
|
3237 |
+ dnl to 'yes' because some of the testsuite requires it.
|
|
3238 |
+ if test "$PACKAGE" = gettext; then
|
|
3239 |
+ BUILD_INCLUDED_LIBINTL=yes
|
|
3240 |
+ fi
|
|
3241 |
|
|
3242 |
-# AM_SANITY_CHECK
|
|
3243 |
-# ---------------
|
|
3244 |
-AC_DEFUN([AM_SANITY_CHECK],
|
|
3245 |
-[AC_MSG_CHECKING([whether build environment is sane])
|
|
3246 |
-# Just in case
|
|
3247 |
-sleep 1
|
|
3248 |
-echo timestamp > conftest.file
|
|
3249 |
-# Do `set' in a subshell so we don't clobber the current shell's
|
|
3250 |
-# arguments. Must try -L first in case configure is actually a
|
|
3251 |
-# symlink; some systems play weird games with the mod time of symlinks
|
|
3252 |
-# (eg FreeBSD returns the mod time of the symlink's containing
|
|
3253 |
-# directory).
|
|
3254 |
-if (
|
|
3255 |
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
|
3256 |
- if test "$[*]" = "X"; then
|
|
3257 |
- # -L didn't work.
|
|
3258 |
- set X `ls -t $srcdir/configure conftest.file`
|
|
3259 |
- fi
|
|
3260 |
- rm -f conftest.file
|
|
3261 |
- if test "$[*]" != "X $srcdir/configure conftest.file" \
|
|
3262 |
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
|
|
3263 |
+ dnl Make all variables we use known to autoconf.
|
|
3264 |
+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
|
3265 |
+ AC_SUBST(USE_INCLUDED_LIBINTL)
|
|
3266 |
+ AC_SUBST(CATOBJEXT)
|
|
3267 |
+ AC_SUBST(INTLOBJS)
|
|
3268 |
+
|
|
3269 |
+ dnl For backward compatibility. Some configure.ins may be using this.
|
|
3270 |
+ nls_cv_header_intl=
|
|
3271 |
+ nls_cv_header_libgt=
|
|
3272 |
+
|
|
3273 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
3274 |
+ DATADIRNAME=share
|
|
3275 |
+ AC_SUBST(DATADIRNAME)
|
|
3276 |
+
|
|
3277 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
3278 |
+ INSTOBJEXT=.mo
|
|
3279 |
+ AC_SUBST(INSTOBJEXT)
|
|
3280 |
+
|
|
3281 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
3282 |
+ GENCAT=gencat
|
|
3283 |
+ AC_SUBST(GENCAT)
|
|
3284 |
+
|
|
3285 |
+ dnl Enable libtool support if the surrounding package wishes it.
|
|
3286 |
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
|
|
3287 |
+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
|
|
3288 |
+ ])
|
|
3289 |
+
|
|
3290 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
3291 |
+ INTLLIBS="$LIBINTL"
|
|
3292 |
+ AC_SUBST(INTLLIBS)
|
|
3293 |
+
|
|
3294 |
+ dnl Make all documented variables known to autoconf.
|
|
3295 |
+ AC_SUBST(LIBINTL)
|
|
3296 |
+ AC_SUBST(LTLIBINTL)
|
|
3297 |
+ AC_SUBST(POSUB)
|
|
3298 |
+])
|
|
3299 |
|
|
3300 |
- # If neither matched, then we have a broken ls. This can happen
|
|
3301 |
- # if, for instance, CONFIG_SHELL is bash and it inherits a
|
|
3302 |
- # broken ls alias from the environment. This has actually
|
|
3303 |
- # happened. Such a system could not be considered "sane".
|
|
3304 |
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
|
|
3305 |
-alias in your environment])
|
|
3306 |
- fi
|
|
3307 |
|
|
3308 |
- test "$[2]" = conftest.file
|
|
3309 |
- )
|
|
3310 |
-then
|
|
3311 |
- # Ok.
|
|
3312 |
- :
|
|
3313 |
-else
|
|
3314 |
- AC_MSG_ERROR([newly created file is older than distributed files!
|
|
3315 |
-Check your system clock])
|
|
3316 |
-fi
|
|
3317 |
-AC_MSG_RESULT(yes)])
|
|
3318 |
+dnl Checks for all prerequisites of the po subdirectory,
|
|
3319 |
+dnl except for USE_NLS.
|
|
3320 |
+AC_DEFUN([AM_PO_SUBDIRS],
|
|
3321 |
+[
|
|
3322 |
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
3323 |
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
3324 |
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
3325 |
+
|
|
3326 |
+ dnl Perform the following tests also if --disable-nls has been given,
|
|
3327 |
+ dnl because they are needed for "make dist" to work.
|
|
3328 |
+
|
|
3329 |
+ dnl Search for GNU msgfmt in the PATH.
|
|
3330 |
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
|
3331 |
+ dnl The second test excludes FreeBSD msgfmt.
|
|
3332 |
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
|
3333 |
+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
|
|
3334 |
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
3335 |
+ :)
|
|
3336 |
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
3337 |
+
|
|
3338 |
+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
|
|
3339 |
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
|
3340 |
+ dnl The second test excludes FreeBSD xgettext.
|
|
3341 |
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
3342 |
+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
3343 |
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
3344 |
+ :)
|
|
3345 |
+ dnl Remove leftover from FreeBSD xgettext call.
|
|
3346 |
+ rm -f messages.po
|
|
3347 |
+
|
|
3348 |
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
|
3349 |
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
|
3350 |
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
|
|
3351 |
+
|
|
3352 |
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
3353 |
+ dnl Test whether we really found GNU msgfmt.
|
|
3354 |
+ if test "$GMSGFMT" != ":"; then
|
|
3355 |
+ dnl If it is no GNU msgfmt we define it as : so that the
|
|
3356 |
+ dnl Makefiles still can work.
|
|
3357 |
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
|
|
3358 |
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
3359 |
+ : ;
|
|
3360 |
+ else
|
|
3361 |
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
|
|
3362 |
+ AC_MSG_RESULT(
|
|
3363 |
+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
|
|
3364 |
+ GMSGFMT=":"
|
|
3365 |
+ fi
|
|
3366 |
+ fi
|
|
3367 |
|
|
3368 |
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
3369 |
-#
|
|
3370 |
-# This file is free software; the Free Software Foundation
|
|
3371 |
-# gives unlimited permission to copy and/or distribute it,
|
|
3372 |
-# with or without modifications, as long as this notice is preserved.
|
|
3373 |
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
3374 |
+ dnl Test whether we really found GNU xgettext.
|
|
3375 |
+ if test "$XGETTEXT" != ":"; then
|
|
3376 |
+ dnl If it is no GNU xgettext we define it as : so that the
|
|
3377 |
+ dnl Makefiles still can work.
|
|
3378 |
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
3379 |
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
3380 |
+ : ;
|
|
3381 |
+ else
|
|
3382 |
+ AC_MSG_RESULT(
|
|
3383 |
+ [found xgettext program is not GNU xgettext; ignore it])
|
|
3384 |
+ XGETTEXT=":"
|
|
3385 |
+ fi
|
|
3386 |
+ dnl Remove leftover from FreeBSD xgettext call.
|
|
3387 |
+ rm -f messages.po
|
|
3388 |
+ fi
|
|
3389 |
|
|
3390 |
-# AM_PROG_INSTALL_STRIP
|
|
3391 |
-# ---------------------
|
|
3392 |
-# One issue with vendor `install' (even GNU) is that you can't
|
|
3393 |
-# specify the program used to strip binaries. This is especially
|
|
3394 |
-# annoying in cross-compiling environments, where the build's strip
|
|
3395 |
-# is unlikely to handle the host's binaries.
|
|
3396 |
-# Fortunately install-sh will honor a STRIPPROG variable, so we
|
|
3397 |
-# always use install-sh in `make install-strip', and initialize
|
|
3398 |
-# STRIPPROG with the value of the STRIP variable (set by the user).
|
|
3399 |
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
|
|
3400 |
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
|
3401 |
-# Installed binaries are usually stripped using `strip' when the user
|
|
3402 |
-# run `make install-strip'. However `strip' might not be the right
|
|
3403 |
-# tool to use in cross-compilation environments, therefore Automake
|
|
3404 |
-# will honor the `STRIP' environment variable to overrule this program.
|
|
3405 |
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
|
3406 |
-if test "$cross_compiling" != no; then
|
|
3407 |
- AC_CHECK_TOOL([STRIP], [strip], :)
|
|
3408 |
-fi
|
|
3409 |
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
3410 |
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
3411 |
+ AC_OUTPUT_COMMANDS([
|
|
3412 |
+ for ac_file in $CONFIG_FILES; do
|
|
3413 |
+ # Support "outfile[:infile[:infile...]]"
|
|
3414 |
+ case "$ac_file" in
|
|
3415 |
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
3416 |
+ esac
|
|
3417 |
+ # PO directories have a Makefile.in generated from Makefile.in.in.
|
|
3418 |
+ case "$ac_file" in */Makefile.in)
|
|
3419 |
+ # Adjust a relative srcdir.
|
|
3420 |
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
3421 |
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
3422 |
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
3423 |
+ # In autoconf-2.13 it is called $ac_given_srcdir.
|
|
3424 |
+ # In autoconf-2.50 it is called $srcdir.
|
|
3425 |
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
|
3426 |
+ case "$ac_given_srcdir" in
|
|
3427 |
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
3428 |
+ /*) top_srcdir="$ac_given_srcdir" ;;
|
|
3429 |
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
3430 |
+ esac
|
|
3431 |
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
|
3432 |
+ rm -f "$ac_dir/POTFILES"
|
|
3433 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
|
3434 |
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
|
|
3435 |
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
|
|
3436 |
+ # on $ac_dir but don't depend on user-specified configuration
|
|
3437 |
+ # parameters.
|
|
3438 |
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
|
3439 |
+ # The LINGUAS file contains the set of available languages.
|
|
3440 |
+ if test -n "$ALL_LINGUAS"; then
|
|
3441 |
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
|
3442 |
+ fi
|
|
3443 |
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
|
3444 |
+ # Hide the ALL_LINGUAS assigment from automake.
|
|
3445 |
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
|
3446 |
+ fi
|
|
3447 |
+ case "$ac_given_srcdir" in
|
|
3448 |
+ .) srcdirpre= ;;
|
|
3449 |
+ *) srcdirpre='$(srcdir)/' ;;
|
|
3450 |
+ esac
|
|
3451 |
+ POFILES=
|
|
3452 |
+ GMOFILES=
|
|
3453 |
+ UPDATEPOFILES=
|
|
3454 |
+ DUMMYPOFILES=
|
|
3455 |
+ for lang in $ALL_LINGUAS; do
|
|
3456 |
+ POFILES="$POFILES $srcdirpre$lang.po"
|
|
3457 |
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
|
3458 |
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
|
3459 |
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
|
3460 |
+ done
|
|
3461 |
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
3462 |
+ # environment variable.
|
|
3463 |
+ INST_LINGUAS=
|
|
3464 |
+ if test -n "$ALL_LINGUAS"; then
|
|
3465 |
+ for presentlang in $ALL_LINGUAS; do
|
|
3466 |
+ useit=no
|
|
3467 |
+ if test "%UNSET%" != "$LINGUAS"; then
|
|
3468 |
+ desiredlanguages="$LINGUAS"
|
|
3469 |
+ else
|
|
3470 |
+ desiredlanguages="$ALL_LINGUAS"
|
|
3471 |
+ fi
|
|
3472 |
+ for desiredlang in $desiredlanguages; do
|
|
3473 |
+ # Use the presentlang catalog if desiredlang is
|
|
3474 |
+ # a. equal to presentlang, or
|
|
3475 |
+ # b. a variant of presentlang (because in this case,
|
|
3476 |
+ # presentlang can be used as a fallback for messages
|
|
3477 |
+ # which are not translated in the desiredlang catalog).
|
|
3478 |
+ case "$desiredlang" in
|
|
3479 |
+ "$presentlang"*) useit=yes;;
|
|
3480 |
+ esac
|
|
3481 |
+ done
|
|
3482 |
+ if test $useit = yes; then
|
|
3483 |
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
|
|
3484 |
+ fi
|
|
3485 |
+ done
|
|
3486 |
+ fi
|
|
3487 |
+ CATALOGS=
|
|
3488 |
+ if test -n "$INST_LINGUAS"; then
|
|
3489 |
+ for lang in $INST_LINGUAS; do
|
|
3490 |
+ CATALOGS="$CATALOGS $lang.gmo"
|
|
3491 |
+ done
|
|
3492 |
+ fi
|
|
3493 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
|
|
3494 |
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
|
3495 |
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
|
|
3496 |
+ if test -f "$f"; then
|
|
3497 |
+ case "$f" in
|
|
3498 |
+ *.orig | *.bak | *~) ;;
|
|
3499 |
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
|
|
3500 |
+ esac
|
|
3501 |
+ fi
|
|
3502 |
+ done
|
|
3503 |
+ fi
|
|
3504 |
+ ;;
|
|
3505 |
+ esac
|
|
3506 |
+ done],
|
|
3507 |
+ [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
|
|
3508 |
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
|
|
3509 |
+ # from automake.
|
|
3510 |
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
|
|
3511 |
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
|
|
3512 |
+ LINGUAS="${LINGUAS-%UNSET%}"
|
|
3513 |
+ ])
|
|
3514 |
+])
|
|
3515 |
|
|
3516 |
-# Check how to create a tarball. -*- Autoconf -*-
|
|
3517 |
|
|
3518 |
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
|
3519 |
-#
|
|
3520 |
-# This file is free software; the Free Software Foundation
|
|
3521 |
-# gives unlimited permission to copy and/or distribute it,
|
|
3522 |
-# with or without modifications, as long as this notice is preserved.
|
|
3523 |
+dnl Checks for all prerequisites of the intl subdirectory,
|
|
3524 |
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
|
|
3525 |
+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
|
|
3526 |
+AC_DEFUN([AM_INTL_SUBDIR],
|
|
3527 |
+[
|
|
3528 |
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
3529 |
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
3530 |
+ AC_REQUIRE([AC_PROG_CC])dnl
|
|
3531 |
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
3532 |
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
3533 |
+ AC_REQUIRE([AC_ISC_POSIX])dnl
|
|
3534 |
+ AC_REQUIRE([AC_HEADER_STDC])dnl
|
|
3535 |
+ AC_REQUIRE([AC_C_CONST])dnl
|
|
3536 |
+ AC_REQUIRE([AC_C_INLINE])dnl
|
|
3537 |
+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
|
3538 |
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
|
3539 |
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
|
3540 |
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
|
|
3541 |
+ AC_REQUIRE([jm_GLIBC21])dnl
|
|
3542 |
+ AC_REQUIRE([gt_INTDIV0])dnl
|
|
3543 |
+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
|
|
3544 |
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
|
|
3545 |
+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
|
|
3546 |
+
|
|
3547 |
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
|
|
3548 |
+stdlib.h string.h unistd.h sys/param.h])
|
|
3549 |
+ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
|
|
3550 |
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
|
|
3551 |
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
|
3552 |
+
|
|
3553 |
+ AM_ICONV
|
|
3554 |
+ AM_LANGINFO_CODESET
|
|
3555 |
+ if test $ac_cv_header_locale_h = yes; then
|
|
3556 |
+ AM_LC_MESSAGES
|
|
3557 |
+ fi
|
|
3558 |
|
|
3559 |
-# serial 2
|
|
3560 |
+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
|
3561 |
+ dnl because plural.y uses bison specific features. It requires at least
|
|
3562 |
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
|
|
3563 |
+ dnl compile.
|
|
3564 |
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
|
|
3565 |
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
|
|
3566 |
+ dnl the rule in general Makefile. Now, some people carelessly touch the
|
|
3567 |
+ dnl files or have a broken "make" program, hence the plural.c rule will
|
|
3568 |
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
|
|
3569 |
+ dnl present or too old.
|
|
3570 |
+ AC_CHECK_PROGS([INTLBISON], [bison])
|
|
3571 |
+ if test -z "$INTLBISON"; then
|
|
3572 |
+ ac_verc_fail=yes
|
|
3573 |
+ else
|
|
3574 |
+ dnl Found it, now check the version.
|
|
3575 |
+ AC_MSG_CHECKING([version of bison])
|
|
3576 |
+changequote(<<,>>)dnl
|
|
3577 |
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
3578 |
+ case $ac_prog_version in
|
|
3579 |
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
3580 |
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
|
|
3581 |
+changequote([,])dnl
|
|
3582 |
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
3583 |
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
3584 |
+ esac
|
|
3585 |
+ AC_MSG_RESULT([$ac_prog_version])
|
|
3586 |
+ fi
|
|
3587 |
+ if test $ac_verc_fail = yes; then
|
|
3588 |
+ INTLBISON=:
|
|
3589 |
+ fi
|
|
3590 |
+])
|
|
3591 |
|
|
3592 |
-# _AM_PROG_TAR(FORMAT)
|
|
3593 |
-# --------------------
|
|
3594 |
-# Check how to create a tarball in format FORMAT.
|
|
3595 |
-# FORMAT should be one of `v7', `ustar', or `pax'.
|
|
3596 |
-#
|
|
3597 |
-# Substitute a variable $(am__tar) that is a command
|
|
3598 |
-# writing to stdout a FORMAT-tarball containing the directory
|
|
3599 |
-# $tardir.
|
|
3600 |
-# tardir=directory && $(am__tar) > result.tar
|
|
3601 |
-#
|
|
3602 |
-# Substitute a variable $(am__untar) that extract such
|
|
3603 |
-# a tarball read from stdin.
|
|
3604 |
-# $(am__untar) < result.tar
|
|
3605 |
-AC_DEFUN([_AM_PROG_TAR],
|
|
3606 |
-[# Always define AMTAR for backward compatibility.
|
|
3607 |
-AM_MISSING_PROG([AMTAR], [tar])
|
|
3608 |
-m4_if([$1], [v7],
|
|
3609 |
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
|
|
3610 |
- [m4_case([$1], [ustar],, [pax],,
|
|
3611 |
- [m4_fatal([Unknown tar format])])
|
|
3612 |
-AC_MSG_CHECKING([how to create a $1 tar archive])
|
|
3613 |
-# Loop over all known methods to create a tar archive until one works.
|
|
3614 |
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
|
|
3615 |
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
|
|
3616 |
-# Do not fold the above two line into one, because Tru64 sh and
|
|
3617 |
-# Solaris sh will not grok spaces in the rhs of `-'.
|
|
3618 |
-for _am_tool in $_am_tools
|
|
3619 |
-do
|
|
3620 |
- case $_am_tool in
|
|
3621 |
- gnutar)
|
|
3622 |
- for _am_tar in tar gnutar gtar;
|
|
3623 |
- do
|
|
3624 |
- AM_RUN_LOG([$_am_tar --version]) && break
|
|
3625 |
+
|
|
3626 |
+AC_DEFUN([AM_MKINSTALLDIRS],
|
|
3627 |
+[
|
|
3628 |
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
|
3629 |
+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
|
3630 |
+ dnl Try to locate is.
|
|
3631 |
+ MKINSTALLDIRS=
|
|
3632 |
+ if test -n "$ac_aux_dir"; then
|
|
3633 |
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
3634 |
+ fi
|
|
3635 |
+ if test -z "$MKINSTALLDIRS"; then
|
|
3636 |
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
3637 |
+ fi
|
|
3638 |
+ AC_SUBST(MKINSTALLDIRS)
|
|
3639 |
+])
|
|
3640 |
+
|
|
3641 |
+
|
|
3642 |
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
|
|
3643 |
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
|
|
3644 |
+
|
|
3645 |
+# lib-prefix.m4 serial 1 (gettext-0.11)
|
|
3646 |
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
|
3647 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
3648 |
+dnl General Public License. As a special exception to the GNU General
|
|
3649 |
+dnl Public License, this file may be distributed as part of a program
|
|
3650 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
3651 |
+dnl the same distribution terms as the rest of that program.
|
|
3652 |
+
|
|
3653 |
+dnl From Bruno Haible.
|
|
3654 |
+
|
|
3655 |
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
|
|
3656 |
+dnl to access previously installed libraries. The basic assumption is that
|
|
3657 |
+dnl a user will want packages to use other packages he previously installed
|
|
3658 |
+dnl with the same --prefix option.
|
|
3659 |
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
|
|
3660 |
+dnl libraries, but is otherwise very convenient.
|
|
3661 |
+AC_DEFUN([AC_LIB_PREFIX],
|
|
3662 |
+[
|
|
3663 |
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
|
|
3664 |
+ AC_REQUIRE([AC_PROG_CC])
|
|
3665 |
+ AC_REQUIRE([AC_CANONICAL_HOST])
|
|
3666 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
3667 |
+ dnl By default, look in $includedir and $libdir.
|
|
3668 |
+ use_additional=yes
|
|
3669 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
3670 |
+ eval additional_includedir=\"$includedir\"
|
|
3671 |
+ eval additional_libdir=\"$libdir\"
|
|
3672 |
+ ])
|
|
3673 |
+ AC_ARG_WITH([lib-prefix],
|
|
3674 |
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
|
|
3675 |
+ --without-lib-prefix don't search for libraries in includedir and libdir],
|
|
3676 |
+[
|
|
3677 |
+ if test "X$withval" = "Xno"; then
|
|
3678 |
+ use_additional=no
|
|
3679 |
+ else
|
|
3680 |
+ if test "X$withval" = "X"; then
|
|
3681 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
3682 |
+ eval additional_includedir=\"$includedir\"
|
|
3683 |
+ eval additional_libdir=\"$libdir\"
|
|
3684 |
+ ])
|
|
3685 |
+ else
|
|
3686 |
+ additional_includedir="$withval/include"
|
|
3687 |
+ additional_libdir="$withval/lib"
|
|
3688 |
+ fi
|
|
3689 |
+ fi
|
|
3690 |
+])
|
|
3691 |
+ if test $use_additional = yes; then
|
|
3692 |
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
|
|
3693 |
+ dnl But don't add it
|
|
3694 |
+ dnl 1. if it's the standard /usr/include,
|
|
3695 |
+ dnl 2. if it's already present in $CPPFLAGS,
|
|
3696 |
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
|
|
3697 |
+ dnl 4. if it doesn't exist as a directory.
|
|
3698 |
+ if test "X$additional_includedir" != "X/usr/include"; then
|
|
3699 |
+ haveit=
|
|
3700 |
+ for x in $CPPFLAGS; do
|
|
3701 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
3702 |
+ if test "X$x" = "X-I$additional_includedir"; then
|
|
3703 |
+ haveit=yes
|
|
3704 |
+ break
|
|
3705 |
+ fi
|
|
3706 |
+ done
|
|
3707 |
+ if test -z "$haveit"; then
|
|
3708 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
3709 |
+ if test -n "$GCC"; then
|
|
3710 |
+ case $host_os in
|
|
3711 |
+ linux*) haveit=yes;;
|
|
3712 |
+ esac
|
|
3713 |
+ fi
|
|
3714 |
+ fi
|
|
3715 |
+ if test -z "$haveit"; then
|
|
3716 |
+ if test -d "$additional_includedir"; then
|
|
3717 |
+ dnl Really add $additional_includedir to $CPPFLAGS.
|
|
3718 |
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
|
|
3719 |
+ fi
|
|
3720 |
+ fi
|
|
3721 |
+ fi
|
|
3722 |
+ fi
|
|
3723 |
+ dnl Potentially add $additional_libdir to $LDFLAGS.
|
|
3724 |
+ dnl But don't add it
|
|
3725 |
+ dnl 1. if it's the standard /usr/lib,
|
|
3726 |
+ dnl 2. if it's already present in $LDFLAGS,
|
|
3727 |
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
|
|
3728 |
+ dnl 4. if it doesn't exist as a directory.
|
|
3729 |
+ if test "X$additional_libdir" != "X/usr/lib"; then
|
|
3730 |
+ haveit=
|
|
3731 |
+ for x in $LDFLAGS; do
|
|
3732 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
3733 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
3734 |
+ haveit=yes
|
|
3735 |
+ break
|
|
3736 |
+ fi
|
|
3737 |
+ done
|
|
3738 |
+ if test -z "$haveit"; then
|
|
3739 |
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
3740 |
+ if test -n "$GCC"; then
|
|
3741 |
+ case $host_os in
|
|
3742 |
+ linux*) haveit=yes;;
|
|
3743 |
+ esac
|
|
3744 |
+ fi
|
|
3745 |
+ fi
|
|
3746 |
+ if test -z "$haveit"; then
|
|
3747 |
+ if test -d "$additional_libdir"; then
|
|
3748 |
+ dnl Really add $additional_libdir to $LDFLAGS.
|
|
3749 |
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
|
|
3750 |
+ fi
|
|
3751 |
+ fi
|
|
3752 |
+ fi
|
|
3753 |
+ fi
|
|
3754 |
+ fi
|
|
3755 |
+])
|
|
3756 |
+
|
|
3757 |
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
|
|
3758 |
+dnl acl_final_exec_prefix, containing the values to which $prefix and
|
|
3759 |
+dnl $exec_prefix will expand at the end of the configure script.
|
|
3760 |
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
|
|
3761 |
+[
|
|
3762 |
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
|
|
3763 |
+ dnl at the end of configure.
|
|
3764 |
+ if test "X$prefix" = "XNONE"; then
|
|
3765 |
+ acl_final_prefix="$ac_default_prefix"
|
|
3766 |
+ else
|
|
3767 |
+ acl_final_prefix="$prefix"
|
|
3768 |
+ fi
|
|
3769 |
+ if test "X$exec_prefix" = "XNONE"; then
|
|
3770 |
+ acl_final_exec_prefix='${prefix}'
|
|
3771 |
+ else
|
|
3772 |
+ acl_final_exec_prefix="$exec_prefix"
|
|
3773 |
+ fi
|
|
3774 |
+ acl_save_prefix="$prefix"
|
|
3775 |
+ prefix="$acl_final_prefix"
|
|
3776 |
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
|
3777 |
+ prefix="$acl_save_prefix"
|
|
3778 |
+])
|
|
3779 |
+
|
|
3780 |
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
|
|
3781 |
+dnl variables prefix and exec_prefix bound to the values they will have
|
|
3782 |
+dnl at the end of the configure script.
|
|
3783 |
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
|
3784 |
+[
|
|
3785 |
+ acl_save_prefix="$prefix"
|
|
3786 |
+ prefix="$acl_final_prefix"
|
|
3787 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
3788 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
3789 |
+ $1
|
|
3790 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
3791 |
+ prefix="$acl_save_prefix"
|
|
3792 |
+])
|
|
3793 |
+
|
|
3794 |
+# lib-link.m4 serial 3 (gettext-0.11.3)
|
|
3795 |
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
|
3796 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
3797 |
+dnl General Public License. As a special exception to the GNU General
|
|
3798 |
+dnl Public License, this file may be distributed as part of a program
|
|
3799 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
3800 |
+dnl the same distribution terms as the rest of that program.
|
|
3801 |
+
|
|
3802 |
+dnl From Bruno Haible.
|
|
3803 |
+
|
|
3804 |
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
|
3805 |
+dnl the libraries corresponding to explicit and implicit dependencies.
|
|
3806 |
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
|
3807 |
+dnl augments the CPPFLAGS variable.
|
|
3808 |
+AC_DEFUN([AC_LIB_LINKFLAGS],
|
|
3809 |
+[
|
|
3810 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
3811 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
3812 |
+ define([Name],[translit([$1],[./-], [___])])
|
|
3813 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
3814 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
3815 |
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
|
3816 |
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
3817 |
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
|
3818 |
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
|
|
3819 |
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
|
|
3820 |
+ ])
|
|
3821 |
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
|
|
3822 |
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
|
|
3823 |
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
|
|
3824 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
3825 |
+ AC_SUBST([LIB]NAME)
|
|
3826 |
+ AC_SUBST([LTLIB]NAME)
|
|
3827 |
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
|
3828 |
+ dnl results of this search when this library appears as a dependency.
|
|
3829 |
+ HAVE_LIB[]NAME=yes
|
|
3830 |
+ undefine([Name])
|
|
3831 |
+ undefine([NAME])
|
|
3832 |
+])
|
|
3833 |
+
|
|
3834 |
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
|
|
3835 |
+dnl searches for libname and the libraries corresponding to explicit and
|
|
3836 |
+dnl implicit dependencies, together with the specified include files and
|
|
3837 |
+dnl the ability to compile and link the specified testcode. If found, it
|
|
3838 |
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
|
|
3839 |
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
|
3840 |
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
|
3841 |
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
|
3842 |
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
3843 |
+[
|
|
3844 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
3845 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
3846 |
+ define([Name],[translit([$1],[./-], [___])])
|
|
3847 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
3848 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
3849 |
+
|
|
3850 |
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
|
3851 |
+ dnl accordingly.
|
|
3852 |
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
3853 |
+
|
|
3854 |
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
|
|
3855 |
+ dnl because if the user has installed lib[]Name and not disabled its use
|
|
3856 |
+ dnl via --without-lib[]Name-prefix, he wants to use it.
|
|
3857 |
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
|
3858 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
3859 |
+
|
|
3860 |
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
|
3861 |
+ ac_save_LIBS="$LIBS"
|
|
3862 |
+ LIBS="$LIBS $LIB[]NAME"
|
|
3863 |
+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
|
|
3864 |
+ LIBS="$ac_save_LIBS"
|
|
3865 |
+ ])
|
|
3866 |
+ if test "$ac_cv_lib[]Name" = yes; then
|
|
3867 |
+ HAVE_LIB[]NAME=yes
|
|
3868 |
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
|
|
3869 |
+ AC_MSG_CHECKING([how to link with lib[]$1])
|
|
3870 |
+ AC_MSG_RESULT([$LIB[]NAME])
|
|
3871 |
+ else
|
|
3872 |
+ HAVE_LIB[]NAME=no
|
|
3873 |
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
|
|
3874 |
+ dnl $INC[]NAME either.
|
|
3875 |
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
|
3876 |
+ LIB[]NAME=
|
|
3877 |
+ LTLIB[]NAME=
|
|
3878 |
+ fi
|
|
3879 |
+ AC_SUBST([HAVE_LIB]NAME)
|
|
3880 |
+ AC_SUBST([LIB]NAME)
|
|
3881 |
+ AC_SUBST([LTLIB]NAME)
|
|
3882 |
+ undefine([Name])
|
|
3883 |
+ undefine([NAME])
|
|
3884 |
+])
|
|
3885 |
+
|
|
3886 |
+dnl Determine the platform dependent parameters needed to use rpath:
|
|
3887 |
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
|
|
3888 |
+dnl hardcode_direct, hardcode_minus_L,
|
|
3889 |
+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
|
|
3890 |
+AC_DEFUN([AC_LIB_RPATH],
|
|
3891 |
+[
|
|
3892 |
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
|
3893 |
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
|
3894 |
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
|
3895 |
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
|
3896 |
+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
|
|
3897 |
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
|
3898 |
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
|
3899 |
+ . ./conftest.sh
|
|
3900 |
+ rm -f ./conftest.sh
|
|
3901 |
+ acl_cv_rpath=done
|
|
3902 |
+ ])
|
|
3903 |
+ wl="$acl_cv_wl"
|
|
3904 |
+ libext="$acl_cv_libext"
|
|
3905 |
+ shlibext="$acl_cv_shlibext"
|
|
3906 |
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
|
3907 |
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
|
3908 |
+ hardcode_direct="$acl_cv_hardcode_direct"
|
|
3909 |
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
|
3910 |
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
|
|
3911 |
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
|
|
3912 |
+ dnl Determine whether the user wants rpath handling at all.
|
|
3913 |
+ AC_ARG_ENABLE(rpath,
|
|
3914 |
+ [ --disable-rpath do not hardcode runtime library paths],
|
|
3915 |
+ :, enable_rpath=yes)
|
|
3916 |
+])
|
|
3917 |
+
|
|
3918 |
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
|
3919 |
+dnl the libraries corresponding to explicit and implicit dependencies.
|
|
3920 |
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
|
3921 |
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
3922 |
+[
|
|
3923 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
3924 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
3925 |
+ dnl By default, look in $includedir and $libdir.
|
|
3926 |
+ use_additional=yes
|
|
3927 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
3928 |
+ eval additional_includedir=\"$includedir\"
|
|
3929 |
+ eval additional_libdir=\"$libdir\"
|
|
3930 |
+ ])
|
|
3931 |
+ AC_ARG_WITH([lib$1-prefix],
|
|
3932 |
+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
|
|
3933 |
+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
|
|
3934 |
+[
|
|
3935 |
+ if test "X$withval" = "Xno"; then
|
|
3936 |
+ use_additional=no
|
|
3937 |
+ else
|
|
3938 |
+ if test "X$withval" = "X"; then
|
|
3939 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
3940 |
+ eval additional_includedir=\"$includedir\"
|
|
3941 |
+ eval additional_libdir=\"$libdir\"
|
|
3942 |
+ ])
|
|
3943 |
+ else
|
|
3944 |
+ additional_includedir="$withval/include"
|
|
3945 |
+ additional_libdir="$withval/lib"
|
|
3946 |
+ fi
|
|
3947 |
+ fi
|
|
3948 |
+])
|
|
3949 |
+ dnl Search the library and its dependencies in $additional_libdir and
|
|
3950 |
+ dnl $LDFLAGS. Using breadth-first-seach.
|
|
3951 |
+ LIB[]NAME=
|
|
3952 |
+ LTLIB[]NAME=
|
|
3953 |
+ INC[]NAME=
|
|
3954 |
+ rpathdirs=
|
|
3955 |
+ ltrpathdirs=
|
|
3956 |
+ names_already_handled=
|
|
3957 |
+ names_next_round='$1 $2'
|
|
3958 |
+ while test -n "$names_next_round"; do
|
|
3959 |
+ names_this_round="$names_next_round"
|
|
3960 |
+ names_next_round=
|
|
3961 |
+ for name in $names_this_round; do
|
|
3962 |
+ already_handled=
|
|
3963 |
+ for n in $names_already_handled; do
|
|
3964 |
+ if test "$n" = "$name"; then
|
|
3965 |
+ already_handled=yes
|
|
3966 |
+ break
|
|
3967 |
+ fi
|
|
3968 |
+ done
|
|
3969 |
+ if test -z "$already_handled"; then
|
|
3970 |
+ names_already_handled="$names_already_handled $name"
|
|
3971 |
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
|
|
3972 |
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
|
|
3973 |
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
|
3974 |
+ eval value=\"\$HAVE_LIB$uppername\"
|
|
3975 |
+ if test -n "$value"; then
|
|
3976 |
+ if test "$value" = yes; then
|
|
3977 |
+ eval value=\"\$LIB$uppername\"
|
|
3978 |
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
|
|
3979 |
+ eval value=\"\$LTLIB$uppername\"
|
|
3980 |
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
|
|
3981 |
+ else
|
|
3982 |
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
|
|
3983 |
+ dnl that this library doesn't exist. So just drop it.
|
|
3984 |
+ :
|
|
3985 |
+ fi
|
|
3986 |
+ else
|
|
3987 |
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
|
|
3988 |
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
|
|
3989 |
+ found_dir=
|
|
3990 |
+ found_la=
|
|
3991 |
+ found_so=
|
|
3992 |
+ found_a=
|
|
3993 |
+ if test $use_additional = yes; then
|
|
3994 |
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
|
|
3995 |
+ found_dir="$additional_libdir"
|
|
3996 |
+ found_so="$additional_libdir/lib$name.$shlibext"
|
|
3997 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
3998 |
+ found_la="$additional_libdir/lib$name.la"
|
|
3999 |
+ fi
|
|
4000 |
+ else
|
|
4001 |
+ if test -f "$additional_libdir/lib$name.$libext"; then
|
|
4002 |
+ found_dir="$additional_libdir"
|
|
4003 |
+ found_a="$additional_libdir/lib$name.$libext"
|
|
4004 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
4005 |
+ found_la="$additional_libdir/lib$name.la"
|
|
4006 |
+ fi
|
|
4007 |
+ fi
|
|
4008 |
+ fi
|
|
4009 |
+ fi
|
|
4010 |
+ if test "X$found_dir" = "X"; then
|
|
4011 |
+ for x in $LDFLAGS $LTLIB[]NAME; do
|
|
4012 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
4013 |
+ case "$x" in
|
|
4014 |
+ -L*)
|
|
4015 |
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
|
|
4016 |
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
|
|
4017 |
+ found_dir="$dir"
|
|
4018 |
+ found_so="$dir/lib$name.$shlibext"
|
|
4019 |
+ if test -f "$dir/lib$name.la"; then
|
|
4020 |
+ found_la="$dir/lib$name.la"
|
|
4021 |
+ fi
|
|
4022 |
+ else
|
|
4023 |
+ if test -f "$dir/lib$name.$libext"; then
|
|
4024 |
+ found_dir="$dir"
|
|
4025 |
+ found_a="$dir/lib$name.$libext"
|
|
4026 |
+ if test -f "$dir/lib$name.la"; then
|
|
4027 |
+ found_la="$dir/lib$name.la"
|
|
4028 |
+ fi
|
|
4029 |
+ fi
|
|
4030 |
+ fi
|
|
4031 |
+ ;;
|
|
4032 |
+ esac
|
|
4033 |
+ if test "X$found_dir" != "X"; then
|
|
4034 |
+ break
|
|
4035 |
+ fi
|
|
4036 |
+ done
|
|
4037 |
+ fi
|
|
4038 |
+ if test "X$found_dir" != "X"; then
|
|
4039 |
+ dnl Found the library.
|
|
4040 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
|
|
4041 |
+ if test "X$found_so" != "X"; then
|
|
4042 |
+ dnl Linking with a shared library. We attempt to hardcode its
|
|
4043 |
+ dnl directory into the executable's runpath, unless it's the
|
|
4044 |
+ dnl standard /usr/lib.
|
|
4045 |
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
|
|
4046 |
+ dnl No hardcoding is needed.
|
|
4047 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
4048 |
+ else
|
|
4049 |
+ dnl Use an explicit option to hardcode DIR into the resulting
|
|
4050 |
+ dnl binary.
|
|
4051 |
+ dnl Potentially add DIR to ltrpathdirs.
|
|
4052 |
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
4053 |
+ haveit=
|
|
4054 |
+ for x in $ltrpathdirs; do
|
|
4055 |
+ if test "X$x" = "X$found_dir"; then
|
|
4056 |
+ haveit=yes
|
|
4057 |
+ break
|
|
4058 |
+ fi
|
|
4059 |
+ done
|
|
4060 |
+ if test -z "$haveit"; then
|
|
4061 |
+ ltrpathdirs="$ltrpathdirs $found_dir"
|
|
4062 |
+ fi
|
|
4063 |
+ dnl The hardcoding into $LIBNAME is system dependent.
|
|
4064 |
+ if test "$hardcode_direct" = yes; then
|
|
4065 |
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
|
|
4066 |
+ dnl resulting binary.
|
|
4067 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
4068 |
+ else
|
|
4069 |
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
|
4070 |
+ dnl Use an explicit option to hardcode DIR into the resulting
|
|
4071 |
+ dnl binary.
|
|
4072 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
4073 |
+ dnl Potentially add DIR to rpathdirs.
|
|
4074 |
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
4075 |
+ haveit=
|
|
4076 |
+ for x in $rpathdirs; do
|
|
4077 |
+ if test "X$x" = "X$found_dir"; then
|
|
4078 |
+ haveit=yes
|
|
4079 |
+ break
|
|
4080 |
+ fi
|
|
4081 |
+ done
|
|
4082 |
+ if test -z "$haveit"; then
|
|
4083 |
+ rpathdirs="$rpathdirs $found_dir"
|
|
4084 |
+ fi
|
|
4085 |
+ else
|
|
4086 |
+ dnl Rely on "-L$found_dir".
|
|
4087 |
+ dnl But don't add it if it's already contained in the LDFLAGS
|
|
4088 |
+ dnl or the already constructed $LIBNAME
|
|
4089 |
+ haveit=
|
|
4090 |
+ for x in $LDFLAGS $LIB[]NAME; do
|
|
4091 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
4092 |
+ if test "X$x" = "X-L$found_dir"; then
|
|
4093 |
+ haveit=yes
|
|
4094 |
+ break
|
|
4095 |
+ fi
|
|
4096 |
+ done
|
|
4097 |
+ if test -z "$haveit"; then
|
|
4098 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
|
|
4099 |
+ fi
|
|
4100 |
+ if test "$hardcode_minus_L" != no; then
|
|
4101 |
+ dnl FIXME: Not sure whether we should use
|
|
4102 |
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
4103 |
+ dnl here.
|
|
4104 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
4105 |
+ else
|
|
4106 |
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
|
|
4107 |
+ dnl here, because this doesn't fit in flags passed to the
|
|
4108 |
+ dnl compiler. So give up. No hardcoding. This affects only
|
|
4109 |
+ dnl very old systems.
|
|
4110 |
+ dnl FIXME: Not sure whether we should use
|
|
4111 |
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
4112 |
+ dnl here.
|
|
4113 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
4114 |
+ fi
|
|
4115 |
+ fi
|
|
4116 |
+ fi
|
|
4117 |
+ fi
|
|
4118 |
+ else
|
|
4119 |
+ if test "X$found_a" != "X"; then
|
|
4120 |
+ dnl Linking with a static library.
|
|
4121 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
|
|
4122 |
+ else
|
|
4123 |
+ dnl We shouldn't come here, but anyway it's good to have a
|
|
4124 |
+ dnl fallback.
|
|
4125 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
|
|
4126 |
+ fi
|
|
4127 |
+ fi
|
|
4128 |
+ dnl Assume the include files are nearby.
|
|
4129 |
+ additional_includedir=
|
|
4130 |
+ case "$found_dir" in
|
|
4131 |
+ */lib | */lib/)
|
|
4132 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
|
|
4133 |
+ additional_includedir="$basedir/include"
|
|
4134 |
+ ;;
|
|
4135 |
+ esac
|
|
4136 |
+ if test "X$additional_includedir" != "X"; then
|
|
4137 |
+ dnl Potentially add $additional_includedir to $INCNAME.
|
|
4138 |
+ dnl But don't add it
|
|
4139 |
+ dnl 1. if it's the standard /usr/include,
|
|
4140 |
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
|
|
4141 |
+ dnl 3. if it's already present in $CPPFLAGS or the already
|
|
4142 |
+ dnl constructed $INCNAME,
|
|
4143 |
+ dnl 4. if it doesn't exist as a directory.
|
|
4144 |
+ if test "X$additional_includedir" != "X/usr/include"; then
|
|
4145 |
+ haveit=
|
|
4146 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
4147 |
+ if test -n "$GCC"; then
|
|
4148 |
+ case $host_os in
|
|
4149 |
+ linux*) haveit=yes;;
|
|
4150 |
+ esac
|
|
4151 |
+ fi
|
|
4152 |
+ fi
|
|
4153 |
+ if test -z "$haveit"; then
|
|
4154 |
+ for x in $CPPFLAGS $INC[]NAME; do
|
|
4155 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
4156 |
+ if test "X$x" = "X-I$additional_includedir"; then
|
|
4157 |
+ haveit=yes
|
|
4158 |
+ break
|
|
4159 |
+ fi
|
|
4160 |
+ done
|
|
4161 |
+ if test -z "$haveit"; then
|
|
4162 |
+ if test -d "$additional_includedir"; then
|
|
4163 |
+ dnl Really add $additional_includedir to $INCNAME.
|
|
4164 |
+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
|
|
4165 |
+ fi
|
|
4166 |
+ fi
|
|
4167 |
+ fi
|
|
4168 |
+ fi
|
|
4169 |
+ fi
|
|
4170 |
+ dnl Look for dependencies.
|
|
4171 |
+ if test -n "$found_la"; then
|
|
4172 |
+ dnl Read the .la file. It defines the variables
|
|
4173 |
+ dnl dlname, library_names, old_library, dependency_libs, current,
|
|
4174 |
+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
|
|
4175 |
+ save_libdir="$libdir"
|
|
4176 |
+ case "$found_la" in
|
|
4177 |
+ */* | *\\*) . "$found_la" ;;
|
|
4178 |
+ *) . "./$found_la" ;;
|
|
4179 |
+ esac
|
|
4180 |
+ libdir="$save_libdir"
|
|
4181 |
+ dnl We use only dependency_libs.
|
|
4182 |
+ for dep in $dependency_libs; do
|
|
4183 |
+ case "$dep" in
|
|
4184 |
+ -L*)
|
|
4185 |
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
|
4186 |
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
|
|
4187 |
+ dnl But don't add it
|
|
4188 |
+ dnl 1. if it's the standard /usr/lib,
|
|
4189 |
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
|
|
4190 |
+ dnl 3. if it's already present in $LDFLAGS or the already
|
|
4191 |
+ dnl constructed $LIBNAME,
|
|
4192 |
+ dnl 4. if it doesn't exist as a directory.
|
|
4193 |
+ if test "X$additional_libdir" != "X/usr/lib"; then
|
|
4194 |
+ haveit=
|
|
4195 |
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
4196 |
+ if test -n "$GCC"; then
|
|
4197 |
+ case $host_os in
|
|
4198 |
+ linux*) haveit=yes;;
|
|
4199 |
+ esac
|
|
4200 |
+ fi
|
|
4201 |
+ fi
|
|
4202 |
+ if test -z "$haveit"; then
|
|
4203 |
+ haveit=
|
|
4204 |
+ for x in $LDFLAGS $LIB[]NAME; do
|
|
4205 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
4206 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
4207 |
+ haveit=yes
|
|
4208 |
+ break
|
|
4209 |
+ fi
|
|
4210 |
+ done
|
|
4211 |
+ if test -z "$haveit"; then
|
|
4212 |
+ if test -d "$additional_libdir"; then
|
|
4213 |
+ dnl Really add $additional_libdir to $LIBNAME.
|
|
4214 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
|
|
4215 |
+ fi
|
|
4216 |
+ fi
|
|
4217 |
+ haveit=
|
|
4218 |
+ for x in $LDFLAGS $LTLIB[]NAME; do
|
|
4219 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
4220 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
4221 |
+ haveit=yes
|
|
4222 |
+ break
|
|
4223 |
+ fi
|
|
4224 |
+ done
|
|
4225 |
+ if test -z "$haveit"; then
|
|
4226 |
+ if test -d "$additional_libdir"; then
|
|
4227 |
+ dnl Really add $additional_libdir to $LTLIBNAME.
|
|
4228 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
|
|
4229 |
+ fi
|
|
4230 |
+ fi
|
|
4231 |
+ fi
|
|
4232 |
+ fi
|
|
4233 |
+ ;;
|
|
4234 |
+ -R*)
|
|
4235 |
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
|
4236 |
+ if test "$enable_rpath" != no; then
|
|
4237 |
+ dnl Potentially add DIR to rpathdirs.
|
|
4238 |
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
4239 |
+ haveit=
|
|
4240 |
+ for x in $rpathdirs; do
|
|
4241 |
+ if test "X$x" = "X$dir"; then
|
|
4242 |
+ haveit=yes
|
|
4243 |
+ break
|
|
4244 |
+ fi
|
|
4245 |
+ done
|
|
4246 |
+ if test -z "$haveit"; then
|
|
4247 |
+ rpathdirs="$rpathdirs $dir"
|
|
4248 |
+ fi
|
|
4249 |
+ dnl Potentially add DIR to ltrpathdirs.
|
|
4250 |
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
4251 |
+ haveit=
|
|
4252 |
+ for x in $ltrpathdirs; do
|
|
4253 |
+ if test "X$x" = "X$dir"; then
|
|
4254 |
+ haveit=yes
|
|
4255 |
+ break
|
|
4256 |
+ fi
|
|
4257 |
+ done
|
|
4258 |
+ if test -z "$haveit"; then
|
|
4259 |
+ ltrpathdirs="$ltrpathdirs $dir"
|
|
4260 |
+ fi
|
|
4261 |
+ fi
|
|
4262 |
+ ;;
|
|
4263 |
+ -l*)
|
|
4264 |
+ dnl Handle this in the next round.
|
|
4265 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
|
4266 |
+ ;;
|
|
4267 |
+ *.la)
|
|
4268 |
+ dnl Handle this in the next round. Throw away the .la's
|
|
4269 |
+ dnl directory; it is already contained in a preceding -L
|
|
4270 |
+ dnl option.
|
|
4271 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
|
4272 |
+ ;;
|
|
4273 |
+ *)
|
|
4274 |
+ dnl Most likely an immediate library name.
|
|
4275 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
|
|
4276 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
|
|
4277 |
+ ;;
|
|
4278 |
+ esac
|
|
4279 |
+ done
|
|
4280 |
+ fi
|
|
4281 |
+ else
|
|
4282 |
+ dnl Didn't find the library; assume it is in the system directories
|
|
4283 |
+ dnl known to the linker and runtime loader. (All the system
|
|
4284 |
+ dnl directories known to the linker should also be known to the
|
|
4285 |
+ dnl runtime loader, otherwise the system is severely misconfigured.)
|
|
4286 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
4287 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
|
|
4288 |
+ fi
|
|
4289 |
+ fi
|
|
4290 |
+ fi
|
|
4291 |
done
|
|
4292 |
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
|
|
4293 |
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
|
|
4294 |
- am__untar="$_am_tar -xf -"
|
|
4295 |
- ;;
|
|
4296 |
- plaintar)
|
|
4297 |
- # Must skip GNU tar: if it does not support --format= it doesn't create
|
|
4298 |
- # ustar tarball either.
|
|
4299 |
- (tar --version) >/dev/null 2>&1 && continue
|
|
4300 |
- am__tar='tar chf - "$$tardir"'
|
|
4301 |
- am__tar_='tar chf - "$tardir"'
|
|
4302 |
- am__untar='tar xf -'
|
|
4303 |
- ;;
|
|
4304 |
- pax)
|
|
4305 |
- am__tar='pax -L -x $1 -w "$$tardir"'
|
|
4306 |
- am__tar_='pax -L -x $1 -w "$tardir"'
|
|
4307 |
- am__untar='pax -r'
|
|
4308 |
- ;;
|
|
4309 |
- cpio)
|
|
4310 |
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
|
|
4311 |
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
|
|
4312 |
- am__untar='cpio -i -H $1 -d'
|
|
4313 |
+ done
|
|
4314 |
+ if test "X$rpathdirs" != "X"; then
|
|
4315 |
+ if test -n "$hardcode_libdir_separator"; then
|
|
4316 |
+ dnl Weird platform: only the last -rpath option counts, the user must
|
|
4317 |
+ dnl pass all path elements in one option. We can arrange that for a
|
|
4318 |
+ dnl single library, but not when more than one $LIBNAMEs are used.
|
|
4319 |
+ alldirs=
|
|
4320 |
+ for found_dir in $rpathdirs; do
|
|
4321 |
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
|
4322 |
+ done
|
|
4323 |
+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
|
|
4324 |
+ acl_save_libdir="$libdir"
|
|
4325 |
+ libdir="$alldirs"
|
|
4326 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
4327 |
+ libdir="$acl_save_libdir"
|
|
4328 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
4329 |
+ else
|
|
4330 |
+ dnl The -rpath options are cumulative.
|
|
4331 |
+ for found_dir in $rpathdirs; do
|
|
4332 |
+ acl_save_libdir="$libdir"
|
|
4333 |
+ libdir="$found_dir"
|
|
4334 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
4335 |
+ libdir="$acl_save_libdir"
|
|
4336 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
4337 |
+ done
|
|
4338 |
+ fi
|
|
4339 |
+ fi
|
|
4340 |
+ if test "X$ltrpathdirs" != "X"; then
|
|
4341 |
+ dnl When using libtool, the option that works for both libraries and
|
|
4342 |
+ dnl executables is -R. The -R options are cumulative.
|
|
4343 |
+ for found_dir in $ltrpathdirs; do
|
|
4344 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
|
4345 |
+ done
|
|
4346 |
+ fi
|
|
4347 |
+])
|
|
4348 |
+
|
|
4349 |
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
|
4350 |
+dnl unless already present in VAR.
|
|
4351 |
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
|
|
4352 |
+dnl contains two or three consecutive elements that belong together.
|
|
4353 |
+AC_DEFUN([AC_LIB_APPENDTOVAR],
|
|
4354 |
+[
|
|
4355 |
+ for element in [$2]; do
|
|
4356 |
+ haveit=
|
|
4357 |
+ for x in $[$1]; do
|
|
4358 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
4359 |
+ if test "X$x" = "X$element"; then
|
|
4360 |
+ haveit=yes
|
|
4361 |
+ break
|
|
4362 |
+ fi
|
|
4363 |
+ done
|
|
4364 |
+ if test -z "$haveit"; then
|
|
4365 |
+ [$1]="${[$1]}${[$1]:+ }$element"
|
|
4366 |
+ fi
|
|
4367 |
+ done
|
|
4368 |
+])
|
|
4369 |
+
|
|
4370 |
+# lib-ld.m4 serial 1 (gettext-0.11)
|
|
4371 |
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
|
|
4372 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4373 |
+dnl General Public License. As a special exception to the GNU General
|
|
4374 |
+dnl Public License, this file may be distributed as part of a program
|
|
4375 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4376 |
+dnl the same distribution terms as the rest of that program.
|
|
4377 |
+
|
|
4378 |
+dnl Subroutines of libtool.m4,
|
|
4379 |
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
|
4380 |
+dnl with libtool.m4.
|
|
4381 |
+
|
|
4382 |
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
|
4383 |
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
|
4384 |
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
|
|
4385 |
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
4386 |
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
|
4387 |
+ acl_cv_prog_gnu_ld=yes
|
|
4388 |
+else
|
|
4389 |
+ acl_cv_prog_gnu_ld=no
|
|
4390 |
+fi])
|
|
4391 |
+with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
4392 |
+])
|
|
4393 |
+
|
|
4394 |
+dnl From libtool-1.4. Sets the variable LD.
|
|
4395 |
+AC_DEFUN([AC_LIB_PROG_LD],
|
|
4396 |
+[AC_ARG_WITH(gnu-ld,
|
|
4397 |
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
|
4398 |
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
|
4399 |
+AC_REQUIRE([AC_PROG_CC])dnl
|
|
4400 |
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
4401 |
+ac_prog=ld
|
|
4402 |
+if test "$GCC" = yes; then
|
|
4403 |
+ # Check if gcc -print-prog-name=ld gives a path.
|
|
4404 |
+ AC_MSG_CHECKING([for ld used by GCC])
|
|
4405 |
+ case $host in
|
|
4406 |
+ *-*-mingw*)
|
|
4407 |
+ # gcc leaves a trailing carriage return which upsets mingw
|
|
4408 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
4409 |
+ *)
|
|
4410 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
|
4411 |
+ esac
|
|
4412 |
+ case $ac_prog in
|
|
4413 |
+ # Accept absolute paths.
|
|
4414 |
+ [[\\/]* | [A-Za-z]:[\\/]*)]
|
|
4415 |
+ [re_direlt='/[^/][^/]*/\.\./']
|
|
4416 |
+ # Canonicalize the path of ld
|
|
4417 |
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
|
4418 |
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
4419 |
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
4420 |
+ done
|
|
4421 |
+ test -z "$LD" && LD="$ac_prog"
|
|
4422 |
+ ;;
|
|
4423 |
+ "")
|
|
4424 |
+ # If it fails, then pretend we aren't using GCC.
|
|
4425 |
+ ac_prog=ld
|
|
4426 |
;;
|
|
4427 |
- none)
|
|
4428 |
- am__tar=false
|
|
4429 |
- am__tar_=false
|
|
4430 |
- am__untar=false
|
|
4431 |
+ *)
|
|
4432 |
+ # If it is relative, then search for the first ld in PATH.
|
|
4433 |
+ with_gnu_ld=unknown
|
|
4434 |
;;
|
|
4435 |
esac
|
|
4436 |
+elif test "$with_gnu_ld" = yes; then
|
|
4437 |
+ AC_MSG_CHECKING([for GNU ld])
|
|
4438 |
+else
|
|
4439 |
+ AC_MSG_CHECKING([for non-GNU ld])
|
|
4440 |
+fi
|
|
4441 |
+AC_CACHE_VAL(acl_cv_path_LD,
|
|
4442 |
+[if test -z "$LD"; then
|
|
4443 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
4444 |
+ for ac_dir in $PATH; do
|
|
4445 |
+ test -z "$ac_dir" && ac_dir=.
|
|
4446 |
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
4447 |
+ acl_cv_path_LD="$ac_dir/$ac_prog"
|
|
4448 |
+ # Check to see if the program is GNU ld. I'd rather use --version,
|
|
4449 |
+ # but apparently some GNU ld's only accept -v.
|
|
4450 |
+ # Break only if it was the GNU/non-GNU ld that we prefer.
|
|
4451 |
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
|
4452 |
+ test "$with_gnu_ld" != no && break
|
|
4453 |
+ else
|
|
4454 |
+ test "$with_gnu_ld" != yes && break
|
|
4455 |
+ fi
|
|
4456 |
+ fi
|
|
4457 |
+ done
|
|
4458 |
+ IFS="$ac_save_ifs"
|
|
4459 |
+else
|
|
4460 |
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
4461 |
+fi])
|
|
4462 |
+LD="$acl_cv_path_LD"
|
|
4463 |
+if test -n "$LD"; then
|
|
4464 |
+ AC_MSG_RESULT($LD)
|
|
4465 |
+else
|
|
4466 |
+ AC_MSG_RESULT(no)
|
|
4467 |
+fi
|
|
4468 |
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
4469 |
+AC_LIB_PROG_LD_GNU
|
|
4470 |
+])
|
|
4471 |
|
|
4472 |
- # If the value was cached, stop now. We just wanted to have am__tar
|
|
4473 |
- # and am__untar set.
|
|
4474 |
- test -n "${am_cv_prog_tar_$1}" && break
|
|
4475 |
+# iconv.m4 serial AM4 (gettext-0.11.3)
|
|
4476 |
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
4477 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4478 |
+dnl General Public License. As a special exception to the GNU General
|
|
4479 |
+dnl Public License, this file may be distributed as part of a program
|
|
4480 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4481 |
+dnl the same distribution terms as the rest of that program.
|
|
4482 |
+
|
|
4483 |
+dnl From Bruno Haible.
|
|
4484 |
+
|
|
4485 |
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
|
4486 |
+[
|
|
4487 |
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
|
4488 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
4489 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
4490 |
+
|
|
4491 |
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
4492 |
+ dnl accordingly.
|
|
4493 |
+ AC_LIB_LINKFLAGS_BODY([iconv])
|
|
4494 |
+])
|
|
4495 |
|
|
4496 |
- # tar/untar a dummy directory, and stop if the command works
|
|
4497 |
- rm -rf conftest.dir
|
|
4498 |
- mkdir conftest.dir
|
|
4499 |
- echo GrepMe > conftest.dir/file
|
|
4500 |
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
|
|
4501 |
- rm -rf conftest.dir
|
|
4502 |
- if test -s conftest.tar; then
|
|
4503 |
- AM_RUN_LOG([$am__untar <conftest.tar])
|
|
4504 |
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
|
|
4505 |
+AC_DEFUN([AM_ICONV_LINK],
|
|
4506 |
+[
|
|
4507 |
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
|
4508 |
+ dnl those with the standalone portable GNU libiconv installed).
|
|
4509 |
+
|
|
4510 |
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
4511 |
+ dnl accordingly.
|
|
4512 |
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
4513 |
+
|
|
4514 |
+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
|
4515 |
+ dnl because if the user has installed libiconv and not disabled its use
|
|
4516 |
+ dnl via --without-libiconv-prefix, he wants to use it. The first
|
|
4517 |
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
|
|
4518 |
+ am_save_CPPFLAGS="$CPPFLAGS"
|
|
4519 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
|
4520 |
+
|
|
4521 |
+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
|
|
4522 |
+ am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
4523 |
+ am_cv_lib_iconv=no
|
|
4524 |
+ AC_TRY_LINK([#include <stdlib.h>
|
|
4525 |
+#include <iconv.h>],
|
|
4526 |
+ [iconv_t cd = iconv_open("","");
|
|
4527 |
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
4528 |
+ iconv_close(cd);],
|
|
4529 |
+ am_cv_func_iconv=yes)
|
|
4530 |
+ if test "$am_cv_func_iconv" != yes; then
|
|
4531 |
+ am_save_LIBS="$LIBS"
|
|
4532 |
+ LIBS="$LIBS $LIBICONV"
|
|
4533 |
+ AC_TRY_LINK([#include <stdlib.h>
|
|
4534 |
+#include <iconv.h>],
|
|
4535 |
+ [iconv_t cd = iconv_open("","");
|
|
4536 |
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
4537 |
+ iconv_close(cd);],
|
|
4538 |
+ am_cv_lib_iconv=yes
|
|
4539 |
+ am_cv_func_iconv=yes)
|
|
4540 |
+ LIBS="$am_save_LIBS"
|
|
4541 |
+ fi
|
|
4542 |
+ ])
|
|
4543 |
+ if test "$am_cv_func_iconv" = yes; then
|
|
4544 |
+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
|
|
4545 |
fi
|
|
4546 |
-done
|
|
4547 |
-rm -rf conftest.dir
|
|
4548 |
+ if test "$am_cv_lib_iconv" = yes; then
|
|
4549 |
+ AC_MSG_CHECKING([how to link with libiconv])
|
|
4550 |
+ AC_MSG_RESULT([$LIBICONV])
|
|
4551 |
+ else
|
|
4552 |
+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
|
|
4553 |
+ dnl either.
|
|
4554 |
+ CPPFLAGS="$am_save_CPPFLAGS"
|
|
4555 |
+ LIBICONV=
|
|
4556 |
+ LTLIBICONV=
|
|
4557 |
+ fi
|
|
4558 |
+ AC_SUBST(LIBICONV)
|
|
4559 |
+ AC_SUBST(LTLIBICONV)
|
|
4560 |
+])
|
|
4561 |
+
|
|
4562 |
+AC_DEFUN([AM_ICONV],
|
|
4563 |
+[
|
|
4564 |
+ AM_ICONV_LINK
|
|
4565 |
+ if test "$am_cv_func_iconv" = yes; then
|
|
4566 |
+ AC_MSG_CHECKING([for iconv declaration])
|
|
4567 |
+ AC_CACHE_VAL(am_cv_proto_iconv, [
|
|
4568 |
+ AC_TRY_COMPILE([
|
|
4569 |
+#include <stdlib.h>
|
|
4570 |
+#include <iconv.h>
|
|
4571 |
+extern
|
|
4572 |
+#ifdef __cplusplus
|
|
4573 |
+"C"
|
|
4574 |
+#endif
|
|
4575 |
+#if defined(__STDC__) || defined(__cplusplus)
|
|
4576 |
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
4577 |
+#else
|
|
4578 |
+size_t iconv();
|
|
4579 |
+#endif
|
|
4580 |
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
|
4581 |
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
4582 |
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
4583 |
+ AC_MSG_RESULT([$]{ac_t:-
|
|
4584 |
+ }[$]am_cv_proto_iconv)
|
|
4585 |
+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
|
4586 |
+ [Define as const if the declaration of iconv() needs const.])
|
|
4587 |
+ fi
|
|
4588 |
+])
|
|
4589 |
+
|
|
4590 |
+# progtest.m4 serial 2 (gettext-0.10.40)
|
|
4591 |
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
|
|
4592 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4593 |
+dnl General Public License. As a special exception to the GNU General
|
|
4594 |
+dnl Public License, this file may be distributed as part of a program
|
|
4595 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4596 |
+dnl the same distribution terms as the rest of that program.
|
|
4597 |
+dnl
|
|
4598 |
+dnl This file can can be used in projects which are not available under
|
|
4599 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
4600 |
+dnl License but which still want to provide support for the GNU gettext
|
|
4601 |
+dnl functionality.
|
|
4602 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
4603 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
4604 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
4605 |
+dnl They are *not* in the public domain.
|
|
4606 |
+
|
|
4607 |
+dnl Authors:
|
|
4608 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
4609 |
+
|
|
4610 |
+# Search path for a program which passes the given test.
|
|
4611 |
+
|
|
4612 |
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
|
4613 |
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
|
4614 |
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
|
|
4615 |
+[# Extract the first word of "$2", so it can be a program name with args.
|
|
4616 |
+set dummy $2; ac_word=[$]2
|
|
4617 |
+AC_MSG_CHECKING([for $ac_word])
|
|
4618 |
+AC_CACHE_VAL(ac_cv_path_$1,
|
|
4619 |
+[case "[$]$1" in
|
|
4620 |
+ /*)
|
|
4621 |
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
|
|
4622 |
+ ;;
|
|
4623 |
+ *)
|
|
4624 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
4625 |
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
|
|
4626 |
+ test -z "$ac_dir" && ac_dir=.
|
|
4627 |
+ if test -f $ac_dir/$ac_word; then
|
|
4628 |
+ if [$3]; then
|
|
4629 |
+ ac_cv_path_$1="$ac_dir/$ac_word"
|
|
4630 |
+ break
|
|
4631 |
+ fi
|
|
4632 |
+ fi
|
|
4633 |
+ done
|
|
4634 |
+ IFS="$ac_save_ifs"
|
|
4635 |
+dnl If no 4th arg is given, leave the cache variable unset,
|
|
4636 |
+dnl so AC_PATH_PROGS will keep looking.
|
|
4637 |
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
|
|
4638 |
+])dnl
|
|
4639 |
+ ;;
|
|
4640 |
+esac])dnl
|
|
4641 |
+$1="$ac_cv_path_$1"
|
|
4642 |
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
|
|
4643 |
+ AC_MSG_RESULT([$]$1)
|
|
4644 |
+else
|
|
4645 |
+ AC_MSG_RESULT(no)
|
|
4646 |
+fi
|
|
4647 |
+AC_SUBST($1)dnl
|
|
4648 |
+])
|
|
4649 |
+
|
|
4650 |
+# isc-posix.m4 serial 2 (gettext-0.11.2)
|
|
4651 |
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
4652 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4653 |
+dnl General Public License. As a special exception to the GNU General
|
|
4654 |
+dnl Public License, this file may be distributed as part of a program
|
|
4655 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4656 |
+dnl the same distribution terms as the rest of that program.
|
|
4657 |
+
|
|
4658 |
+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
|
|
4659 |
+
|
|
4660 |
+# This test replaces the one in autoconf.
|
|
4661 |
+# Currently this macro should have the same name as the autoconf macro
|
|
4662 |
+# because gettext's gettext.m4 (distributed in the automake package)
|
|
4663 |
+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
|
4664 |
+# give these diagnostics:
|
|
4665 |
+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
|
4666 |
+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
|
4667 |
+
|
|
4668 |
+undefine([AC_ISC_POSIX])
|
|
4669 |
+
|
|
4670 |
+AC_DEFUN([AC_ISC_POSIX],
|
|
4671 |
+ [
|
|
4672 |
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
|
4673 |
+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
|
4674 |
+ ]
|
|
4675 |
+)
|
|
4676 |
+
|
|
4677 |
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
|
|
4678 |
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
4679 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4680 |
+dnl General Public License. As a special exception to the GNU General
|
|
4681 |
+dnl Public License, this file may be distributed as part of a program
|
|
4682 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4683 |
+dnl the same distribution terms as the rest of that program.
|
|
4684 |
+
|
|
4685 |
+# Test for the GNU C Library, version 2.1 or newer.
|
|
4686 |
+# From Bruno Haible.
|
|
4687 |
+
|
|
4688 |
+AC_DEFUN([jm_GLIBC21],
|
|
4689 |
+ [
|
|
4690 |
+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
|
4691 |
+ ac_cv_gnu_library_2_1,
|
|
4692 |
+ [AC_EGREP_CPP([Lucky GNU user],
|
|
4693 |
+ [
|
|
4694 |
+#include <features.h>
|
|
4695 |
+#ifdef __GNU_LIBRARY__
|
|
4696 |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
|
|
4697 |
+ Lucky GNU user
|
|
4698 |
+ #endif
|
|
4699 |
+#endif
|
|
4700 |
+ ],
|
|
4701 |
+ ac_cv_gnu_library_2_1=yes,
|
|
4702 |
+ ac_cv_gnu_library_2_1=no)
|
|
4703 |
+ ]
|
|
4704 |
+ )
|
|
4705 |
+ AC_SUBST(GLIBC21)
|
|
4706 |
+ GLIBC21="$ac_cv_gnu_library_2_1"
|
|
4707 |
+ ]
|
|
4708 |
+)
|
|
4709 |
+
|
|
4710 |
+# intdiv0.m4 serial 1 (gettext-0.11.3)
|
|
4711 |
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
|
|
4712 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4713 |
+dnl General Public License. As a special exception to the GNU General
|
|
4714 |
+dnl Public License, this file may be distributed as part of a program
|
|
4715 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4716 |
+dnl the same distribution terms as the rest of that program.
|
|
4717 |
+
|
|
4718 |
+dnl From Bruno Haible.
|
|
4719 |
+
|
|
4720 |
+AC_DEFUN([gt_INTDIV0],
|
|
4721 |
+[
|
|
4722 |
+ AC_REQUIRE([AC_PROG_CC])dnl
|
|
4723 |
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
4724 |
+
|
|
4725 |
+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
|
|
4726 |
+ gt_cv_int_divbyzero_sigfpe,
|
|
4727 |
+ [
|
|
4728 |
+ AC_TRY_RUN([
|
|
4729 |
+#include <stdlib.h>
|
|
4730 |
+#include <signal.h>
|
|
4731 |
+
|
|
4732 |
+static void
|
|
4733 |
+#ifdef __cplusplus
|
|
4734 |
+sigfpe_handler (int sig)
|
|
4735 |
+#else
|
|
4736 |
+sigfpe_handler (sig) int sig;
|
|
4737 |
+#endif
|
|
4738 |
+{
|
|
4739 |
+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
|
|
4740 |
+ exit (sig != SIGFPE);
|
|
4741 |
+}
|
|
4742 |
+
|
|
4743 |
+int x = 1;
|
|
4744 |
+int y = 0;
|
|
4745 |
+int z;
|
|
4746 |
+int nan;
|
|
4747 |
+
|
|
4748 |
+int main ()
|
|
4749 |
+{
|
|
4750 |
+ signal (SIGFPE, sigfpe_handler);
|
|
4751 |
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
|
|
4752 |
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
|
|
4753 |
+ signal (SIGTRAP, sigfpe_handler);
|
|
4754 |
+#endif
|
|
4755 |
+/* Linux/SPARC yields signal SIGILL. */
|
|
4756 |
+#if defined (__sparc__) && defined (__linux__)
|
|
4757 |
+ signal (SIGILL, sigfpe_handler);
|
|
4758 |
+#endif
|
|
4759 |
+
|
|
4760 |
+ z = x / y;
|
|
4761 |
+ nan = y / y;
|
|
4762 |
+ exit (1);
|
|
4763 |
+}
|
|
4764 |
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
|
|
4765 |
+ [
|
|
4766 |
+ # Guess based on the CPU.
|
|
4767 |
+ case "$host_cpu" in
|
|
4768 |
+ alpha* | i[34567]86 | m68k | s390*)
|
|
4769 |
+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
|
|
4770 |
+ *)
|
|
4771 |
+ gt_cv_int_divbyzero_sigfpe="guessing no";;
|
|
4772 |
+ esac
|
|
4773 |
+ ])
|
|
4774 |
+ ])
|
|
4775 |
+ case "$gt_cv_int_divbyzero_sigfpe" in
|
|
4776 |
+ *yes) value=1;;
|
|
4777 |
+ *) value=0;;
|
|
4778 |
+ esac
|
|
4779 |
+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
|
|
4780 |
+ [Define if integer division by zero raises signal SIGFPE.])
|
|
4781 |
+])
|
|
4782 |
+
|
|
4783 |
+# uintmax_t.m4 serial 6 (gettext-0.11)
|
|
4784 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
4785 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4786 |
+dnl General Public License. As a special exception to the GNU General
|
|
4787 |
+dnl Public License, this file may be distributed as part of a program
|
|
4788 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4789 |
+dnl the same distribution terms as the rest of that program.
|
|
4790 |
+
|
|
4791 |
+dnl From Paul Eggert.
|
|
4792 |
+
|
|
4793 |
+AC_PREREQ(2.13)
|
|
4794 |
+
|
|
4795 |
+# Define uintmax_t to `unsigned long' or `unsigned long long'
|
|
4796 |
+# if <inttypes.h> does not exist.
|
|
4797 |
+
|
|
4798 |
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
|
|
4799 |
+[
|
|
4800 |
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
|
4801 |
+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
|
4802 |
+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
|
|
4803 |
+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
|
|
4804 |
+ test $ac_cv_type_unsigned_long_long = yes \
|
|
4805 |
+ && ac_type='unsigned long long' \
|
|
4806 |
+ || ac_type='unsigned long'
|
|
4807 |
+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
|
|
4808 |
+ [Define to unsigned long or unsigned long long
|
|
4809 |
+ if <inttypes.h> and <stdint.h> don't define.])
|
|
4810 |
+ fi
|
|
4811 |
+])
|
|
4812 |
+
|
|
4813 |
+# inttypes_h.m4 serial 4 (gettext-0.11.4)
|
|
4814 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
4815 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4816 |
+dnl General Public License. As a special exception to the GNU General
|
|
4817 |
+dnl Public License, this file may be distributed as part of a program
|
|
4818 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4819 |
+dnl the same distribution terms as the rest of that program.
|
|
4820 |
+
|
|
4821 |
+dnl From Paul Eggert.
|
|
4822 |
+
|
|
4823 |
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
|
|
4824 |
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
|
4825 |
+
|
|
4826 |
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
|
|
4827 |
+[
|
|
4828 |
+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
|
|
4829 |
+ [AC_TRY_COMPILE(
|
|
4830 |
+ [#include <sys/types.h>
|
|
4831 |
+#include <inttypes.h>],
|
|
4832 |
+ [uintmax_t i = (uintmax_t) -1;],
|
|
4833 |
+ jm_ac_cv_header_inttypes_h=yes,
|
|
4834 |
+ jm_ac_cv_header_inttypes_h=no)])
|
|
4835 |
+ if test $jm_ac_cv_header_inttypes_h = yes; then
|
|
4836 |
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
|
|
4837 |
+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
|
|
4838 |
+ and declares uintmax_t. ])
|
|
4839 |
+ fi
|
|
4840 |
+])
|
|
4841 |
+
|
|
4842 |
+# stdint_h.m4 serial 2 (gettext-0.11.4)
|
|
4843 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
4844 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4845 |
+dnl General Public License. As a special exception to the GNU General
|
|
4846 |
+dnl Public License, this file may be distributed as part of a program
|
|
4847 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4848 |
+dnl the same distribution terms as the rest of that program.
|
|
4849 |
+
|
|
4850 |
+dnl From Paul Eggert.
|
|
4851 |
+
|
|
4852 |
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
|
|
4853 |
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
|
4854 |
+
|
|
4855 |
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
|
|
4856 |
+[
|
|
4857 |
+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
|
|
4858 |
+ [AC_TRY_COMPILE(
|
|
4859 |
+ [#include <sys/types.h>
|
|
4860 |
+#include <stdint.h>],
|
|
4861 |
+ [uintmax_t i = (uintmax_t) -1;],
|
|
4862 |
+ jm_ac_cv_header_stdint_h=yes,
|
|
4863 |
+ jm_ac_cv_header_stdint_h=no)])
|
|
4864 |
+ if test $jm_ac_cv_header_stdint_h = yes; then
|
|
4865 |
+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
|
|
4866 |
+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
|
|
4867 |
+ and declares uintmax_t. ])
|
|
4868 |
+ fi
|
|
4869 |
+])
|
|
4870 |
+
|
|
4871 |
+# ulonglong.m4 serial 3
|
|
4872 |
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
|
4873 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4874 |
+dnl General Public License. As a special exception to the GNU General
|
|
4875 |
+dnl Public License, this file may be distributed as part of a program
|
|
4876 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4877 |
+dnl the same distribution terms as the rest of that program.
|
|
4878 |
+
|
|
4879 |
+dnl From Paul Eggert.
|
|
4880 |
+
|
|
4881 |
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
|
|
4882 |
+
|
|
4883 |
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
|
|
4884 |
+[
|
|
4885 |
+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
|
|
4886 |
+ [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
|
|
4887 |
+ [unsigned long long ullmax = (unsigned long long) -1;
|
|
4888 |
+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
|
|
4889 |
+ ac_cv_type_unsigned_long_long=yes,
|
|
4890 |
+ ac_cv_type_unsigned_long_long=no)])
|
|
4891 |
+ if test $ac_cv_type_unsigned_long_long = yes; then
|
|
4892 |
+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
|
|
4893 |
+ [Define if you have the 'unsigned long long' type.])
|
|
4894 |
+ fi
|
|
4895 |
+])
|
|
4896 |
+
|
|
4897 |
+# inttypes.m4 serial 1 (gettext-0.11.4)
|
|
4898 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
4899 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4900 |
+dnl General Public License. As a special exception to the GNU General
|
|
4901 |
+dnl Public License, this file may be distributed as part of a program
|
|
4902 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4903 |
+dnl the same distribution terms as the rest of that program.
|
|
4904 |
+
|
|
4905 |
+dnl From Paul Eggert.
|
|
4906 |
+
|
|
4907 |
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
|
|
4908 |
+# <sys/types.h>.
|
|
4909 |
+
|
|
4910 |
+AC_DEFUN([gt_HEADER_INTTYPES_H],
|
|
4911 |
+[
|
|
4912 |
+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
|
|
4913 |
+ [
|
|
4914 |
+ AC_TRY_COMPILE(
|
|
4915 |
+ [#include <sys/types.h>
|
|
4916 |
+#include <inttypes.h>],
|
|
4917 |
+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
|
|
4918 |
+ ])
|
|
4919 |
+ if test $gt_cv_header_inttypes_h = yes; then
|
|
4920 |
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
|
|
4921 |
+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
|
|
4922 |
+ fi
|
|
4923 |
+])
|
|
4924 |
+
|
|
4925 |
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
|
|
4926 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
4927 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4928 |
+dnl General Public License. As a special exception to the GNU General
|
|
4929 |
+dnl Public License, this file may be distributed as part of a program
|
|
4930 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4931 |
+dnl the same distribution terms as the rest of that program.
|
|
4932 |
+
|
|
4933 |
+dnl From Bruno Haible.
|
|
4934 |
+
|
|
4935 |
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
|
|
4936 |
+# macros to non-string values. This is the case on AIX 4.3.3.
|
|
4937 |
+
|
|
4938 |
+AC_DEFUN([gt_INTTYPES_PRI],
|
|
4939 |
+[
|
|
4940 |
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
|
|
4941 |
+ if test $gt_cv_header_inttypes_h = yes; then
|
|
4942 |
+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
|
|
4943 |
+ gt_cv_inttypes_pri_broken,
|
|
4944 |
+ [
|
|
4945 |
+ AC_TRY_COMPILE([#include <inttypes.h>
|
|
4946 |
+#ifdef PRId32
|
|
4947 |
+char *p = PRId32;
|
|
4948 |
+#endif
|
|
4949 |
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
|
|
4950 |
+ ])
|
|
4951 |
+ fi
|
|
4952 |
+ if test "$gt_cv_inttypes_pri_broken" = yes; then
|
|
4953 |
+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
|
|
4954 |
+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
|
|
4955 |
+ fi
|
|
4956 |
+])
|
|
4957 |
+
|
|
4958 |
+# codeset.m4 serial AM1 (gettext-0.10.40)
|
|
4959 |
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
4960 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4961 |
+dnl General Public License. As a special exception to the GNU General
|
|
4962 |
+dnl Public License, this file may be distributed as part of a program
|
|
4963 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4964 |
+dnl the same distribution terms as the rest of that program.
|
|
4965 |
+
|
|
4966 |
+dnl From Bruno Haible.
|
|
4967 |
+
|
|
4968 |
+AC_DEFUN([AM_LANGINFO_CODESET],
|
|
4969 |
+[
|
|
4970 |
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
|
|
4971 |
+ [AC_TRY_LINK([#include <langinfo.h>],
|
|
4972 |
+ [char* cs = nl_langinfo(CODESET);],
|
|
4973 |
+ am_cv_langinfo_codeset=yes,
|
|
4974 |
+ am_cv_langinfo_codeset=no)
|
|
4975 |
+ ])
|
|
4976 |
+ if test $am_cv_langinfo_codeset = yes; then
|
|
4977 |
+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
|
4978 |
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
|
4979 |
+ fi
|
|
4980 |
+])
|
|
4981 |
+
|
|
4982 |
+# lcmessage.m4 serial 3 (gettext-0.11.3)
|
|
4983 |
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
4984 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
4985 |
+dnl General Public License. As a special exception to the GNU General
|
|
4986 |
+dnl Public License, this file may be distributed as part of a program
|
|
4987 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
4988 |
+dnl the same distribution terms as the rest of that program.
|
|
4989 |
+dnl
|
|
4990 |
+dnl This file can can be used in projects which are not available under
|
|
4991 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
4992 |
+dnl License but which still want to provide support for the GNU gettext
|
|
4993 |
+dnl functionality.
|
|
4994 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
4995 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
4996 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
4997 |
+dnl They are *not* in the public domain.
|
|
4998 |
+
|
|
4999 |
+dnl Authors:
|
|
5000 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
5001 |
+
|
|
5002 |
+# Check whether LC_MESSAGES is available in <locale.h>.
|
|
5003 |
+
|
|
5004 |
+AC_DEFUN([AM_LC_MESSAGES],
|
|
5005 |
+[
|
|
5006 |
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
|
5007 |
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
|
5008 |
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
|
5009 |
+ if test $am_cv_val_LC_MESSAGES = yes; then
|
|
5010 |
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
|
5011 |
+ [Define if your <locale.h> file defines LC_MESSAGES.])
|
|
5012 |
+ fi
|
|
5013 |
+])
|
|
5014 |
+
|
|
5015 |
+# Configure paths for GLIB
|
|
5016 |
+# Owen Taylor 97-11-3
|
|
5017 |
+
|
|
5018 |
+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
|
5019 |
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
|
|
5020 |
+dnl gthread is specified in MODULES, pass to glib-config
|
|
5021 |
+dnl
|
|
5022 |
+AC_DEFUN([AM_PATH_GLIB],
|
|
5023 |
+[dnl
|
|
5024 |
+dnl Get the cflags and libraries from the glib-config script
|
|
5025 |
+dnl
|
|
5026 |
+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
|
|
5027 |
+ glib_config_prefix="$withval", glib_config_prefix="")
|
|
5028 |
+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
|
|
5029 |
+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
|
|
5030 |
+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
|
|
5031 |
+ , enable_glibtest=yes)
|
|
5032 |
|
|
5033 |
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
|
|
5034 |
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
|
|
5035 |
-AC_SUBST([am__tar])
|
|
5036 |
-AC_SUBST([am__untar])
|
|
5037 |
-]) # _AM_PROG_TAR
|
|
5038 |
+ if test x$glib_config_exec_prefix != x ; then
|
|
5039 |
+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
|
|
5040 |
+ if test x${GLIB_CONFIG+set} != xset ; then
|
|
5041 |
+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
|
|
5042 |
+ fi
|
|
5043 |
+ fi
|
|
5044 |
+ if test x$glib_config_prefix != x ; then
|
|
5045 |
+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
|
|
5046 |
+ if test x${GLIB_CONFIG+set} != xset ; then
|
|
5047 |
+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config
|
|
5048 |
+ fi
|
|
5049 |
+ fi
|
|
5050 |
+
|
|
5051 |
+ for module in . $4
|
|
5052 |
+ do
|
|
5053 |
+ case "$module" in
|
|
5054 |
+ gmodule)
|
|
5055 |
+ glib_config_args="$glib_config_args gmodule"
|
|
5056 |
+ ;;
|
|
5057 |
+ gthread)
|
|
5058 |
+ glib_config_args="$glib_config_args gthread"
|
|
5059 |
+ ;;
|
|
5060 |
+ esac
|
|
5061 |
+ done
|
|
5062 |
+
|
|
5063 |
+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
|
|
5064 |
+ min_glib_version=ifelse([$1], ,0.99.7,$1)
|
|
5065 |
+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
|
|
5066 |
+ no_glib=""
|
|
5067 |
+ if test "$GLIB_CONFIG" = "no" ; then
|
|
5068 |
+ no_glib=yes
|
|
5069 |
+ else
|
|
5070 |
+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
|
|
5071 |
+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
|
|
5072 |
+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
5073 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
5074 |
+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
5075 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
5076 |
+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
5077 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
5078 |
+ if test "x$enable_glibtest" = "xyes" ; then
|
|
5079 |
+ ac_save_CFLAGS="$CFLAGS"
|
|
5080 |
+ ac_save_LIBS="$LIBS"
|
|
5081 |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
5082 |
+ LIBS="$GLIB_LIBS $LIBS"
|
|
5083 |
+dnl
|
|
5084 |
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
|
|
5085 |
+dnl checks the results of glib-config to some extent
|
|
5086 |
+dnl
|
|
5087 |
+ rm -f conf.glibtest
|
|
5088 |
+ AC_TRY_RUN([
|
|
5089 |
+#include <glib.h>
|
|
5090 |
+#include <stdio.h>
|
|
5091 |
+#include <stdlib.h>
|
|
5092 |
+
|
|
5093 |
+int
|
|
5094 |
+main ()
|
|
5095 |
+{
|
|
5096 |
+ int major, minor, micro;
|
|
5097 |
+ char *tmp_version;
|
|
5098 |
+
|
|
5099 |
+ system ("touch conf.glibtest");
|
|
5100 |
+
|
|
5101 |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
5102 |
+ tmp_version = g_strdup("$min_glib_version");
|
|
5103 |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
5104 |
+ printf("%s, bad version string\n", "$min_glib_version");
|
|
5105 |
+ exit(1);
|
|
5106 |
+ }
|
|
5107 |
+
|
|
5108 |
+ if ((glib_major_version != $glib_config_major_version) ||
|
|
5109 |
+ (glib_minor_version != $glib_config_minor_version) ||
|
|
5110 |
+ (glib_micro_version != $glib_config_micro_version))
|
|
5111 |
+ {
|
|
5112 |
+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
|
|
5113 |
+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
|
|
5114 |
+ glib_major_version, glib_minor_version, glib_micro_version);
|
|
5115 |
+ printf ("*** was found! If glib-config was correct, then it is best\n");
|
|
5116 |
+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
|
|
5117 |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
5118 |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
5119 |
+ printf("*** required on your system.\n");
|
|
5120 |
+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
|
|
5121 |
+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
|
|
5122 |
+ printf("*** before re-running configure\n");
|
|
5123 |
+ }
|
|
5124 |
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
|
|
5125 |
+ (glib_minor_version != GLIB_MINOR_VERSION) ||
|
|
5126 |
+ (glib_micro_version != GLIB_MICRO_VERSION))
|
|
5127 |
+ {
|
|
5128 |
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
|
|
5129 |
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
|
|
5130 |
+ printf("*** library (version %d.%d.%d)\n",
|
|
5131 |
+ glib_major_version, glib_minor_version, glib_micro_version);
|
|
5132 |
+ }
|
|
5133 |
+ else
|
|
5134 |
+ {
|
|
5135 |
+ if ((glib_major_version > major) ||
|
|
5136 |
+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
|
|
5137 |
+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
|
|
5138 |
+ {
|
|
5139 |
+ return 0;
|
|
5140 |
+ }
|
|
5141 |
+ else
|
|
5142 |
+ {
|
|
5143 |
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
|
|
5144 |
+ glib_major_version, glib_minor_version, glib_micro_version);
|
|
5145 |
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
|
|
5146 |
+ major, minor, micro);
|
|
5147 |
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
|
|
5148 |
+ printf("***\n");
|
|
5149 |
+ printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
5150 |
+ printf("*** probably means that the wrong copy of the glib-config shell script is\n");
|
|
5151 |
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
5152 |
+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
|
|
5153 |
+ printf("*** correct copy of glib-config. (In this case, you will have to\n");
|
|
5154 |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
5155 |
+ printf("*** so that the correct libraries are found at run-time))\n");
|
|
5156 |
+ }
|
|
5157 |
+ }
|
|
5158 |
+ return 1;
|
|
5159 |
+}
|
|
5160 |
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
5161 |
+ CFLAGS="$ac_save_CFLAGS"
|
|
5162 |
+ LIBS="$ac_save_LIBS"
|
|
5163 |
+ fi
|
|
5164 |
+ fi
|
|
5165 |
+ if test "x$no_glib" = x ; then
|
|
5166 |
+ AC_MSG_RESULT(yes)
|
|
5167 |
+ ifelse([$2], , :, [$2])
|
|
5168 |
+ else
|
|
5169 |
+ AC_MSG_RESULT(no)
|
|
5170 |
+ if test "$GLIB_CONFIG" = "no" ; then
|
|
5171 |
+ echo "*** The glib-config script installed by GLIB could not be found"
|
|
5172 |
+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
|
|
5173 |
+ echo "*** your path, or set the GLIB_CONFIG environment variable to the"
|
|
5174 |
+ echo "*** full path to glib-config."
|
|
5175 |
+ else
|
|
5176 |
+ if test -f conf.glibtest ; then
|
|
5177 |
+ :
|
|
5178 |
+ else
|
|
5179 |
+ echo "*** Could not run GLIB test program, checking why..."
|
|
5180 |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
5181 |
+ LIBS="$LIBS $GLIB_LIBS"
|
|
5182 |
+ AC_TRY_LINK([
|
|
5183 |
+#include <glib.h>
|
|
5184 |
+#include <stdio.h>
|
|
5185 |
+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
|
|
5186 |
+ [ echo "*** The test program compiled, but did not run. This usually means"
|
|
5187 |
+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
|
5188 |
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
|
|
5189 |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
5190 |
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
5191 |
+ echo "*** is required on your system"
|
|
5192 |
+ echo "***"
|
|
5193 |
+ echo "*** If you have an old version installed, it is best to remove it, although"
|
|
5194 |
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
5195 |
+ echo "***"
|
|
5196 |
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
|
5197 |
+ echo "*** came with the system with the command"
|
|
5198 |
+ echo "***"
|
|
5199 |
+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
|
5200 |
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
5201 |
+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
|
|
5202 |
+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
|
|
5203 |
+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
|
|
5204 |
+ CFLAGS="$ac_save_CFLAGS"
|
|
5205 |
+ LIBS="$ac_save_LIBS"
|
|
5206 |
+ fi
|
|
5207 |
+ fi
|
|
5208 |
+ GLIB_CFLAGS=""
|
|
5209 |
+ GLIB_LIBS=""
|
|
5210 |
+ ifelse([$3], , :, [$3])
|
|
5211 |
+ fi
|
|
5212 |
+ AC_SUBST(GLIB_CFLAGS)
|
|
5213 |
+ AC_SUBST(GLIB_LIBS)
|
|
5214 |
+ rm -f conf.glibtest
|
|
5215 |
+])
|
|
5216 |
+
|
|
5217 |
+# Configure paths for GTK+
|
|
5218 |
+# Owen Taylor 97-11-3
|
|
5219 |
+
|
|
5220 |
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
|
5221 |
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
|
|
5222 |
+dnl
|
|
5223 |
+AC_DEFUN([AM_PATH_GTK],
|
|
5224 |
+[dnl
|
|
5225 |
+dnl Get the cflags and libraries from the gtk-config script
|
|
5226 |
+dnl
|
|
5227 |
+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
|
|
5228 |
+ gtk_config_prefix="$withval", gtk_config_prefix="")
|
|
5229 |
+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
|
|
5230 |
+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
|
|
5231 |
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
|
|
5232 |
+ , enable_gtktest=yes)
|
|
5233 |
+
|
|
5234 |
+ for module in . $4
|
|
5235 |
+ do
|
|
5236 |
+ case "$module" in
|
|
5237 |
+ gthread)
|
|
5238 |
+ gtk_config_args="$gtk_config_args gthread"
|
|
5239 |
+ ;;
|
|
5240 |
+ esac
|
|
5241 |
+ done
|
|
5242 |
+
|
|
5243 |
+ if test x$gtk_config_exec_prefix != x ; then
|
|
5244 |
+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
|
5245 |
+ if test x${GTK_CONFIG+set} != xset ; then
|
|
5246 |
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
|
5247 |
+ fi
|
|
5248 |
+ fi
|
|
5249 |
+ if test x$gtk_config_prefix != x ; then
|
|
5250 |
+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
|
5251 |
+ if test x${GTK_CONFIG+set} != xset ; then
|
|
5252 |
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
|
5253 |
+ fi
|
|
5254 |
+ fi
|
|
5255 |
+
|
|
5256 |
+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
|
|
5257 |
+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
|
|
5258 |
+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
|
|
5259 |
+ no_gtk=""
|
|
5260 |
+ if test "$GTK_CONFIG" = "no" ; then
|
|
5261 |
+ no_gtk=yes
|
|
5262 |
+ else
|
|
5263 |
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
|
|
5264 |
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
|
|
5265 |
+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
|
|
5266 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
5267 |
+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
|
|
5268 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
5269 |
+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
|
|
5270 |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
5271 |
+ if test "x$enable_gtktest" = "xyes" ; then
|
|
5272 |
+ ac_save_CFLAGS="$CFLAGS"
|
|
5273 |
+ ac_save_LIBS="$LIBS"
|
|
5274 |
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
5275 |
+ LIBS="$GTK_LIBS $LIBS"
|
|
5276 |
+dnl
|
|
5277 |
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
|
|
5278 |
+dnl checks the results of gtk-config to some extent
|
|
5279 |
+dnl
|
|
5280 |
+ rm -f conf.gtktest
|
|
5281 |
+ AC_TRY_RUN([
|
|
5282 |
+#include <gtk/gtk.h>
|
|
5283 |
+#include <stdio.h>
|
|
5284 |
+#include <stdlib.h>
|
|
5285 |
+
|
|
5286 |
+int
|
|
5287 |
+main ()
|
|
5288 |
+{
|
|
5289 |
+ int major, minor, micro;
|
|
5290 |
+ char *tmp_version;
|
|
5291 |
+
|
|
5292 |
+ system ("touch conf.gtktest");
|
|
5293 |
+
|
|
5294 |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
5295 |
+ tmp_version = g_strdup("$min_gtk_version");
|
|
5296 |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
5297 |
+ printf("%s, bad version string\n", "$min_gtk_version");
|
|
5298 |
+ exit(1);
|
|
5299 |
+ }
|
|
5300 |
+
|
|
5301 |
+ if ((gtk_major_version != $gtk_config_major_version) ||
|
|
5302 |
+ (gtk_minor_version != $gtk_config_minor_version) ||
|
|
5303 |
+ (gtk_micro_version != $gtk_config_micro_version))
|
|
5304 |
+ {
|
|
5305 |
+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
|
5306 |
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
|
5307 |
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
5308 |
+ printf ("*** was found! If gtk-config was correct, then it is best\n");
|
|
5309 |
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
|
5310 |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
5311 |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
5312 |
+ printf("*** required on your system.\n");
|
|
5313 |
+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
|
5314 |
+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
|
5315 |
+ printf("*** before re-running configure\n");
|
|
5316 |
+ }
|
|
5317 |
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
|
|
5318 |
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
|
5319 |
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
|
|
5320 |
+ (gtk_micro_version != GTK_MICRO_VERSION))
|
|
5321 |
+ {
|
|
5322 |
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
5323 |
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
5324 |
+ printf("*** library (version %d.%d.%d)\n",
|
|
5325 |
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
5326 |
+ }
|
|
5327 |
+#endif /* defined (GTK_MAJOR_VERSION) ... */
|
|
5328 |
+ else
|
|
5329 |
+ {
|
|
5330 |
+ if ((gtk_major_version > major) ||
|
|
5331 |
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
|
5332 |
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
|
5333 |
+ {
|
|
5334 |
+ return 0;
|
|
5335 |
+ }
|
|
5336 |
+ else
|
|
5337 |
+ {
|
|
5338 |
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
|
5339 |
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
5340 |
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
|
5341 |
+ major, minor, micro);
|
|
5342 |
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
|
5343 |
+ printf("***\n");
|
|
5344 |
+ printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
5345 |
+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
|
5346 |
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
5347 |
+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
|
5348 |
+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
|
5349 |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
5350 |
+ printf("*** so that the correct libraries are found at run-time))\n");
|
|
5351 |
+ }
|
|
5352 |
+ }
|
|
5353 |
+ return 1;
|
|
5354 |
+}
|
|
5355 |
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
5356 |
+ CFLAGS="$ac_save_CFLAGS"
|
|
5357 |
+ LIBS="$ac_save_LIBS"
|
|
5358 |
+ fi
|
|
5359 |
+ fi
|
|
5360 |
+ if test "x$no_gtk" = x ; then
|
|
5361 |
+ AC_MSG_RESULT(yes)
|
|
5362 |
+ ifelse([$2], , :, [$2])
|
|
5363 |
+ else
|
|
5364 |
+ AC_MSG_RESULT(no)
|
|
5365 |
+ if test "$GTK_CONFIG" = "no" ; then
|
|
5366 |
+ echo "*** The gtk-config script installed by GTK could not be found"
|
|
5367 |
+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
|
5368 |
+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
|
5369 |
+ echo "*** full path to gtk-config."
|
|
5370 |
+ else
|
|
5371 |
+ if test -f conf.gtktest ; then
|
|
5372 |
+ :
|
|
5373 |
+ else
|
|
5374 |
+ echo "*** Could not run GTK test program, checking why..."
|
|
5375 |
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
5376 |
+ LIBS="$LIBS $GTK_LIBS"
|
|
5377 |
+ AC_TRY_LINK([
|
|
5378 |
+#include <gtk/gtk.h>
|
|
5379 |
+#include <stdio.h>
|
|
5380 |
+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
|
5381 |
+ [ echo "*** The test program compiled, but did not run. This usually means"
|
|
5382 |
+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
|
5383 |
+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
|
|
5384 |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
5385 |
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
5386 |
+ echo "*** is required on your system"
|
|
5387 |
+ echo "***"
|
|
5388 |
+ echo "*** If you have an old version installed, it is best to remove it, although"
|
|
5389 |
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
5390 |
+ echo "***"
|
|
5391 |
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
|
5392 |
+ echo "*** came with the system with the command"
|
|
5393 |
+ echo "***"
|
|
5394 |
+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
|
5395 |
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
5396 |
+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
|
5397 |
+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
|
5398 |
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
|
|
5399 |
+ CFLAGS="$ac_save_CFLAGS"
|
|
5400 |
+ LIBS="$ac_save_LIBS"
|
|
5401 |
+ fi
|
|
5402 |
+ fi
|
|
5403 |
+ GTK_CFLAGS=""
|
|
5404 |
+ GTK_LIBS=""
|
|
5405 |
+ ifelse([$3], , :, [$3])
|
|
5406 |
+ fi
|
|
5407 |
+ AC_SUBST(GTK_CFLAGS)
|
|
5408 |
+ AC_SUBST(GTK_LIBS)
|
|
5409 |
+ rm -f conf.gtktest
|
|
5410 |
+])
|
|
5411 |
|
|
5412 |
diff -pruN dillo-0.8.6/autogen.sh dillo-0.8.6-i18n-misc-20070916/autogen.sh
|
|
5413 |
--- dillo-0.8.6/autogen.sh 1970-01-01 09:00:00.000000000 +0900
|
|
5414 |
+++ dillo-0.8.6-i18n-misc-20070916/autogen.sh 2006-05-16 01:21:07.000000000 +0900
|
|
5415 |
@@ -0,0 +1,58 @@
|
|
5416 |
+#!/bin/sh
|
|
5417 |
+#
|
|
5418 |
+# Script to generate configure&make stuff
|
|
5419 |
+#
|
|
5420 |
+
|
|
5421 |
+#-----------------------------------------------------
|
|
5422 |
+# If defined, get these programs from the environment
|
|
5423 |
+#
|
|
5424 |
+: ${ACLOCAL:=aclocal}
|
|
5425 |
+: ${AUTOHEADER:=autoheader}
|
|
5426 |
+: ${AUTOCONF:=autoconf}
|
|
5427 |
+: ${AUTOMAKE:=automake}
|
|
5428 |
+
|
|
5429 |
+#-------------------------
|
|
5430 |
+# Required binaries check
|
|
5431 |
+#
|
|
5432 |
+check_bin_file(){
|
|
5433 |
+ which $1 > /dev/null 2>&1
|
|
5434 |
+ if [ $? = 0 ]; then
|
|
5435 |
+ return 0
|
|
5436 |
+ else
|
|
5437 |
+ return 1
|
|
5438 |
+ fi
|
|
5439 |
+}
|
|
5440 |
+
|
|
5441 |
+#------
|
|
5442 |
+# Main
|
|
5443 |
+#
|
|
5444 |
+clear
|
|
5445 |
+ERR="no"
|
|
5446 |
+for cmd in "$ACLOCAL" "$AUTOHEADER" "$AUTOCONF" "$AUTOMAKE"
|
|
5447 |
+do
|
|
5448 |
+ if check_bin_file "$cmd"
|
|
5449 |
+ then
|
|
5450 |
+ echo -e "$cmd \tfound"
|
|
5451 |
+ else
|
|
5452 |
+ echo -e "$cmd \tNOT found"
|
|
5453 |
+ ERR="yes"
|
|
5454 |
+ fi
|
|
5455 |
+done
|
|
5456 |
+
|
|
5457 |
+if test $ERR = "yes"
|
|
5458 |
+then
|
|
5459 |
+ echo
|
|
5460 |
+ echo "ERROR: to run this program you need the following installed"
|
|
5461 |
+ echo " $ACLOCAL $AUTOHEADER $AUTOCONF $AUTOMAKE"
|
|
5462 |
+ echo
|
|
5463 |
+ exit 1
|
|
5464 |
+fi
|
|
5465 |
+
|
|
5466 |
+echo "[Checks passed]"
|
|
5467 |
+echo "Generating..."
|
|
5468 |
+
|
|
5469 |
+"$ACLOCAL"
|
|
5470 |
+"$AUTOHEADER"
|
|
5471 |
+"$AUTOCONF"
|
|
5472 |
+"$AUTOMAKE" -a -c
|
|
5473 |
+
|
|
5474 |
diff -pruN dillo-0.8.6/bm-update dillo-0.8.6-i18n-misc-20070916/bm-update
|
|
5475 |
--- dillo-0.8.6/bm-update 1970-01-01 09:00:00.000000000 +0900
|
|
5476 |
+++ dillo-0.8.6-i18n-misc-20070916/bm-update 2006-07-09 00:32:51.000000000 +0900
|
|
5477 |
@@ -0,0 +1,54 @@
|
|
5478 |
+#!/bin/sh
|
|
5479 |
+SED=`which sed`
|
|
5480 |
+if test "x$SED" = "x"; then
|
|
5481 |
+ echo "ERROR: sed not found"
|
|
5482 |
+ exit
|
|
5483 |
+fi
|
|
5484 |
+ICONV=`which iconv`
|
|
5485 |
+if test "x$ICONV" = "x"; then
|
|
5486 |
+ echo "ERROR: iconv not found"
|
|
5487 |
+ exit
|
|
5488 |
+fi
|
|
5489 |
+
|
|
5490 |
+CONVTEST=`LANG=C iconv -f UTF-8 -t UTF-8 ~/.dillo/bm.txt -o ~/.dillo/bm.txt.update 2>&1| sed -e "s/.*illegal.*/illegal/g"`
|
|
5491 |
+
|
|
5492 |
+rm -f ~/.dillo/bm.txt.update
|
|
5493 |
+if test "x$CONVTEST" = "xillegal"; then
|
|
5494 |
+ echo "bookmark needs update."
|
|
5495 |
+else
|
|
5496 |
+ echo "already updated.(or no bookmark)"
|
|
5497 |
+ exit
|
|
5498 |
+fi
|
|
5499 |
+
|
|
5500 |
+CHARSET=`locale | grep "LC_CTYPE.*\." | sed -e "s/^.*\.//g" -e "s/\"//g"`
|
|
5501 |
+if test "x$CHARSET" = "x"; then
|
|
5502 |
+ CHARSET="iso88591"
|
|
5503 |
+fi
|
|
5504 |
+
|
|
5505 |
+case $CHARSET in
|
|
5506 |
+ iso885915@euro)
|
|
5507 |
+ CHARSET="iso885915"
|
|
5508 |
+ ;;
|
|
5509 |
+ koi8t)
|
|
5510 |
+ CHARSET="koi8-t"
|
|
5511 |
+ ;;
|
|
5512 |
+ utf8*)
|
|
5513 |
+ CHARSET="utf8"
|
|
5514 |
+ ;;
|
|
5515 |
+esac
|
|
5516 |
+
|
|
5517 |
+CONVTEST=`LANG=C iconv -f $CHARSET -t UTF-8 ~/.dillo/bm.txt -o ~/.dillo/bm.txt.update 2>&1| sed -e "s/.*illegal.*/illegal/g"`
|
|
5518 |
+
|
|
5519 |
+if test "x$CONVTEST" = "xillegal"; then
|
|
5520 |
+ rm -f ~/.dillo/bm.txt.update
|
|
5521 |
+ echo "** WARNING **: bookmark was broken!"
|
|
5522 |
+ for i in `cat ~/.dillo/bm.txt|sed -e "s/ /\\\\\\\\s/g"`; do
|
|
5523 |
+ echo $i|sed -e "s/\\\\s/ /g" |LANG=C iconv -f $CHARSET -t UTF-8 2>&1 >> ~/.dillo/bm.txt.update | sed -e "s/.*illegal.*/\\n/g" >> ~/.dillo/bm.txt.update;
|
|
5524 |
+ done
|
|
5525 |
+else
|
|
5526 |
+ echo "update success!"
|
|
5527 |
+fi
|
|
5528 |
+
|
|
5529 |
+mv -f ~/.dillo/bm.txt ~/.dillo/bm.txt.old
|
|
5530 |
+mv -f ~/.dillo/bm.txt.update ~/.dillo/bm.txt
|
|
5531 |
+echo "backup old bookmark as ~/.dillo/bm.txt.old"
|
|
5532 |
diff -pruN dillo-0.8.6/config/Makefile.am dillo-0.8.6-i18n-misc-20070916/config/Makefile.am
|
|
5533 |
--- dillo-0.8.6/config/Makefile.am 1970-01-01 09:00:00.000000000 +0900
|
|
5534 |
+++ dillo-0.8.6-i18n-misc-20070916/config/Makefile.am 2006-05-16 01:21:15.000000000 +0900
|
|
5535 |
@@ -0,0 +1,13 @@
|
|
5536 |
+AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @GTK_CFLAGS@ -DLOCALEDIR='"$(localedir)"'
|
|
5537 |
+
|
|
5538 |
+bin_PROGRAMS = dillocfg
|
|
5539 |
+
|
|
5540 |
+dillocfg_LDADD = @GTK_LIBS@
|
|
5541 |
+dillocfg_SOURCES = dillocfg.c \
|
|
5542 |
+ dillocfg.h \
|
|
5543 |
+ dillocfg_option.c \
|
|
5544 |
+ dillocfg_option.h \
|
|
5545 |
+ dillocfg_token.h \
|
|
5546 |
+ dillocfg_token.c
|
|
5547 |
+
|
|
5548 |
+#EXTRA_DIST = dillocfg.tcl
|
|
5549 |
diff -pruN dillo-0.8.6/config/Makefile.in dillo-0.8.6-i18n-misc-20070916/config/Makefile.in
|
|
5550 |
--- dillo-0.8.6/config/Makefile.in 1970-01-01 09:00:00.000000000 +0900
|
|
5551 |
+++ dillo-0.8.6-i18n-misc-20070916/config/Makefile.in 2007-09-07 01:06:14.000000000 +0900
|
|
5552 |
@@ -0,0 +1,455 @@
|
|
5553 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
5554 |
+# @configure_input@
|
|
5555 |
+
|
|
5556 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
5557 |
+# Free Software Foundation, Inc.
|
|
5558 |
+# This Makefile.in is free software; the Free Software Foundation
|
|
5559 |
+# gives unlimited permission to copy and/or distribute it,
|
|
5560 |
+# with or without modifications, as long as this notice is preserved.
|
|
5561 |
+
|
|
5562 |
+# This program is distributed in the hope that it will be useful,
|
|
5563 |
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|
5564 |
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
5565 |
+# PARTICULAR PURPOSE.
|
|
5566 |
+
|
|
5567 |
+@SET_MAKE@
|
|
5568 |
+
|
|
5569 |
+srcdir = @srcdir@
|
|
5570 |
+top_srcdir = @top_srcdir@
|
|
5571 |
+VPATH = @srcdir@
|
|
5572 |
+pkgdatadir = $(datadir)/@PACKAGE@
|
|
5573 |
+pkglibdir = $(libdir)/@PACKAGE@
|
|
5574 |
+pkgincludedir = $(includedir)/@PACKAGE@
|
|
5575 |
+top_builddir = ..
|
|
5576 |
+
|
|
5577 |
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
5578 |
+INSTALL = @INSTALL@
|
|
5579 |
+install_sh_DATA = $(install_sh) -c -m 644
|
|
5580 |
+install_sh_PROGRAM = $(install_sh) -c
|
|
5581 |
+install_sh_SCRIPT = $(install_sh) -c
|
|
5582 |
+INSTALL_HEADER = $(INSTALL_DATA)
|
|
5583 |
+transform = $(program_transform_name)
|
|
5584 |
+NORMAL_INSTALL = :
|
|
5585 |
+PRE_INSTALL = :
|
|
5586 |
+POST_INSTALL = :
|
|
5587 |
+NORMAL_UNINSTALL = :
|
|
5588 |
+PRE_UNINSTALL = :
|
|
5589 |
+POST_UNINSTALL = :
|
|
5590 |
+build_triplet = @build@
|
|
5591 |
+host_triplet = @host@
|
|
5592 |
+target_triplet = @target@
|
|
5593 |
+ACLOCAL = @ACLOCAL@
|
|
5594 |
+AMDEP_FALSE = @AMDEP_FALSE@
|
|
5595 |
+AMDEP_TRUE = @AMDEP_TRUE@
|
|
5596 |
+AMTAR = @AMTAR@
|
|
5597 |
+AUTOCONF = @AUTOCONF@
|
|
5598 |
+AUTOHEADER = @AUTOHEADER@
|
|
5599 |
+AUTOMAKE = @AUTOMAKE@
|
|
5600 |
+AWK = @AWK@
|
|
5601 |
+CC = @CC@
|
|
5602 |
+CCDEPMODE = @CCDEPMODE@
|
|
5603 |
+CFLAGS = @CFLAGS@
|
|
5604 |
+CPP = @CPP@
|
|
5605 |
+CPPFLAGS = @CPPFLAGS@
|
|
5606 |
+CXX = @CXX@
|
|
5607 |
+CXXDEPMODE = @CXXDEPMODE@
|
|
5608 |
+CXXFLAGS = @CXXFLAGS@
|
|
5609 |
+CYGPATH_W = @CYGPATH_W@
|
|
5610 |
+DEFS = @DEFS@
|
|
5611 |
+DEPDIR = @DEPDIR@
|
|
5612 |
+DLGUI_FALSE = @DLGUI_FALSE@
|
|
5613 |
+DLGUI_TRUE = @DLGUI_TRUE@
|
|
5614 |
+ECHO_C = @ECHO_C@
|
|
5615 |
+ECHO_N = @ECHO_N@
|
|
5616 |
+ECHO_T = @ECHO_T@
|
|
5617 |
+EGREP = @EGREP@
|
|
5618 |
+EXEEXT = @EXEEXT@
|
|
5619 |
+GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
5620 |
+GLIB_CONFIG = @GLIB_CONFIG@
|
|
5621 |
+GLIB_LIBS = @GLIB_LIBS@
|
|
5622 |
+GMSGFMT = @GMSGFMT@
|
|
5623 |
+GREP = @GREP@
|
|
5624 |
+GTK_CFLAGS = @GTK_CFLAGS@
|
|
5625 |
+GTK_CONFIG = @GTK_CONFIG@
|
|
5626 |
+GTK_LIBS = @GTK_LIBS@
|
|
5627 |
+INSTALL_DATA = @INSTALL_DATA@
|
|
5628 |
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
5629 |
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
5630 |
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
5631 |
+INTLLIBS = @INTLLIBS@
|
|
5632 |
+LDFLAGS = @LDFLAGS@
|
|
5633 |
+LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
5634 |
+LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
5635 |
+LIBICONV = @LIBICONV@
|
|
5636 |
+LIBINTL = @LIBINTL@
|
|
5637 |
+LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
5638 |
+LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
5639 |
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
5640 |
+LIBOBJS = @LIBOBJS@
|
|
5641 |
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
|
|
5642 |
+LIBPNG_LIBS = @LIBPNG_LIBS@
|
|
5643 |
+LIBPTHREAD_LDFLAGS = @LIBPTHREAD_LDFLAGS@
|
|
5644 |
+LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
5645 |
+LIBS = @LIBS@
|
|
5646 |
+LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
5647 |
+LIBZ_LIBS = @LIBZ_LIBS@
|
|
5648 |
+LTLIBICONV = @LTLIBICONV@
|
|
5649 |
+LTLIBINTL = @LTLIBINTL@
|
|
5650 |
+LTLIBOBJS = @LTLIBOBJS@
|
|
5651 |
+MAKEINFO = @MAKEINFO@
|
|
5652 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
5653 |
+MSGFMT = @MSGFMT@
|
|
5654 |
+MSGMERGE = @MSGMERGE@
|
|
5655 |
+OBJEXT = @OBJEXT@
|
|
5656 |
+PACKAGE = @PACKAGE@
|
|
5657 |
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
5658 |
+PACKAGE_NAME = @PACKAGE_NAME@
|
|
5659 |
+PACKAGE_STRING = @PACKAGE_STRING@
|
|
5660 |
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
5661 |
+PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
5662 |
+PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
5663 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
5664 |
+POSUB = @POSUB@
|
|
5665 |
+RANLIB = @RANLIB@
|
|
5666 |
+SET_MAKE = @SET_MAKE@
|
|
5667 |
+SHELL = @SHELL@
|
|
5668 |
+STRIP = @STRIP@
|
|
5669 |
+USE_NLS = @USE_NLS@
|
|
5670 |
+VERSION = @VERSION@
|
|
5671 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
5672 |
+XGETTEXT = @XGETTEXT@
|
|
5673 |
+ac_ct_CC = @ac_ct_CC@
|
|
5674 |
+ac_ct_CXX = @ac_ct_CXX@
|
|
5675 |
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
5676 |
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
5677 |
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
5678 |
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
|
5679 |
+am__include = @am__include@
|
|
5680 |
+am__leading_dot = @am__leading_dot@
|
|
5681 |
+am__quote = @am__quote@
|
|
5682 |
+bindir = @bindir@
|
|
5683 |
+build = @build@
|
|
5684 |
+build_alias = @build_alias@
|
|
5685 |
+build_cpu = @build_cpu@
|
|
5686 |
+build_os = @build_os@
|
|
5687 |
+build_vendor = @build_vendor@
|
|
5688 |
+datadir = @datadir@
|
|
5689 |
+datarootdir = @datarootdir@
|
|
5690 |
+docdir = @docdir@
|
|
5691 |
+dvidir = @dvidir@
|
|
5692 |
+exec_prefix = @exec_prefix@
|
|
5693 |
+host = @host@
|
|
5694 |
+host_alias = @host_alias@
|
|
5695 |
+host_cpu = @host_cpu@
|
|
5696 |
+host_os = @host_os@
|
|
5697 |
+host_vendor = @host_vendor@
|
|
5698 |
+htmldir = @htmldir@
|
|
5699 |
+includedir = @includedir@
|
|
5700 |
+infodir = @infodir@
|
|
5701 |
+install_sh = @install_sh@
|
|
5702 |
+libdir = @libdir@
|
|
5703 |
+libexecdir = @libexecdir@
|
|
5704 |
+localedir = @localedir@
|
|
5705 |
+localstatedir = @localstatedir@
|
|
5706 |
+mandir = @mandir@
|
|
5707 |
+oldincludedir = @oldincludedir@
|
|
5708 |
+pdfdir = @pdfdir@
|
|
5709 |
+prefix = @prefix@
|
|
5710 |
+program_transform_name = @program_transform_name@
|
|
5711 |
+psdir = @psdir@
|
|
5712 |
+sbindir = @sbindir@
|
|
5713 |
+sharedstatedir = @sharedstatedir@
|
|
5714 |
+sysconfdir = @sysconfdir@
|
|
5715 |
+target = @target@
|
|
5716 |
+target_alias = @target_alias@
|
|
5717 |
+target_cpu = @target_cpu@
|
|
5718 |
+target_os = @target_os@
|
|
5719 |
+target_vendor = @target_vendor@
|
|
5720 |
+AM_CPPFLAGS = -DDILLORC_SYS='"$(sysconfdir)/dillorc"' @GTK_CFLAGS@ -DLOCALEDIR='"$(localedir)"'
|
|
5721 |
+
|
|
5722 |
+bin_PROGRAMS = dillocfg
|
|
5723 |
+
|
|
5724 |
+dillocfg_LDADD = @GTK_LIBS@
|
|
5725 |
+dillocfg_SOURCES = dillocfg.c \
|
|
5726 |
+ dillocfg.h \
|
|
5727 |
+ dillocfg_option.c \
|
|
5728 |
+ dillocfg_option.h \
|
|
5729 |
+ dillocfg_token.h \
|
|
5730 |
+ dillocfg_token.c
|
|
5731 |
+
|
|
5732 |
+subdir = config
|
|
5733 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
5734 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
5735 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
5736 |
+CONFIG_CLEAN_FILES =
|
|
5737 |
+bin_PROGRAMS = dillocfg$(EXEEXT)
|
|
5738 |
+PROGRAMS = $(bin_PROGRAMS)
|
|
5739 |
+
|
|
5740 |
+am_dillocfg_OBJECTS = dillocfg.$(OBJEXT) dillocfg_option.$(OBJEXT) \
|
|
5741 |
+ dillocfg_token.$(OBJEXT)
|
|
5742 |
+dillocfg_OBJECTS = $(am_dillocfg_OBJECTS)
|
|
5743 |
+dillocfg_DEPENDENCIES =
|
|
5744 |
+dillocfg_LDFLAGS =
|
|
5745 |
+
|
|
5746 |
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
5747 |
+depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
5748 |
+am__depfiles_maybe = depfiles
|
|
5749 |
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dillocfg.Po \
|
|
5750 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dillocfg_option.Po \
|
|
5751 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dillocfg_token.Po
|
|
5752 |
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
5753 |
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
5754 |
+CCLD = $(CC)
|
|
5755 |
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
5756 |
+DIST_SOURCES = $(dillocfg_SOURCES)
|
|
5757 |
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
|
|
5758 |
+SOURCES = $(dillocfg_SOURCES)
|
|
5759 |
+
|
|
5760 |
+all: all-am
|
|
5761 |
+
|
|
5762 |
+.SUFFIXES:
|
|
5763 |
+.SUFFIXES: .c .o .obj
|
|
5764 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
5765 |
+ cd $(top_srcdir) && \
|
|
5766 |
+ $(AUTOMAKE) --gnu config/Makefile
|
|
5767 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
5768 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
5769 |
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
5770 |
+install-binPROGRAMS: $(bin_PROGRAMS)
|
|
5771 |
+ @$(NORMAL_INSTALL)
|
|
5772 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
5773 |
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
5774 |
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
5775 |
+ if test -f $$p \
|
|
5776 |
+ ; then \
|
|
5777 |
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
5778 |
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
|
|
5779 |
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
|
|
5780 |
+ else :; fi; \
|
|
5781 |
+ done
|
|
5782 |
+
|
|
5783 |
+uninstall-binPROGRAMS:
|
|
5784 |
+ @$(NORMAL_UNINSTALL)
|
|
5785 |
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
5786 |
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
5787 |
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
|
|
5788 |
+ rm -f $(DESTDIR)$(bindir)/$$f; \
|
|
5789 |
+ done
|
|
5790 |
+
|
|
5791 |
+clean-binPROGRAMS:
|
|
5792 |
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
|
|
5793 |
+dillocfg$(EXEEXT): $(dillocfg_OBJECTS) $(dillocfg_DEPENDENCIES)
|
|
5794 |
+ @rm -f dillocfg$(EXEEXT)
|
|
5795 |
+ $(LINK) $(dillocfg_LDFLAGS) $(dillocfg_OBJECTS) $(dillocfg_LDADD) $(LIBS)
|
|
5796 |
+
|
|
5797 |
+mostlyclean-compile:
|
|
5798 |
+ -rm -f *.$(OBJEXT) core *.core
|
|
5799 |
+
|
|
5800 |
+distclean-compile:
|
|
5801 |
+ -rm -f *.tab.c
|
|
5802 |
+
|
|
5803 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillocfg.Po@am__quote@
|
|
5804 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillocfg_option.Po@am__quote@
|
|
5805 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillocfg_token.Po@am__quote@
|
|
5806 |
+
|
|
5807 |
+.c.o:
|
|
5808 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
5809 |
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
5810 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
5811 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
5812 |
+@am__fastdepCC_TRUE@ fi
|
|
5813 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
5814 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
5815 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
5816 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
|
|
5817 |
+
|
|
5818 |
+.c.obj:
|
|
5819 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
5820 |
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
5821 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
5822 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
5823 |
+@am__fastdepCC_TRUE@ fi
|
|
5824 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
5825 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
5826 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
5827 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
5828 |
+uninstall-info-am:
|
|
5829 |
+
|
|
5830 |
+ETAGS = etags
|
|
5831 |
+ETAGSFLAGS =
|
|
5832 |
+
|
|
5833 |
+CTAGS = ctags
|
|
5834 |
+CTAGSFLAGS =
|
|
5835 |
+
|
|
5836 |
+tags: TAGS
|
|
5837 |
+
|
|
5838 |
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
5839 |
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
5840 |
+ unique=`for i in $$list; do \
|
|
5841 |
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
5842 |
+ done | \
|
|
5843 |
+ $(AWK) ' { files[$$0] = 1; } \
|
|
5844 |
+ END { for (i in files) print i; }'`; \
|
|
5845 |
+ mkid -fID $$unique
|
|
5846 |
+
|
|
5847 |
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
5848 |
+ $(TAGS_FILES) $(LISP)
|
|
5849 |
+ tags=; \
|
|
5850 |
+ here=`pwd`; \
|
|
5851 |
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
5852 |
+ unique=`for i in $$list; do \
|
|
5853 |
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
5854 |
+ done | \
|
|
5855 |
+ $(AWK) ' { files[$$0] = 1; } \
|
|
5856 |
+ END { for (i in files) print i; }'`; \
|
|
5857 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
5858 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
5859 |
+ $$tags $$unique
|
|
5860 |
+
|
|
5861 |
+ctags: CTAGS
|
|
5862 |
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
5863 |
+ $(TAGS_FILES) $(LISP)
|
|
5864 |
+ tags=; \
|
|
5865 |
+ here=`pwd`; \
|
|
5866 |
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
5867 |
+ unique=`for i in $$list; do \
|
|
5868 |
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
5869 |
+ done | \
|
|
5870 |
+ $(AWK) ' { files[$$0] = 1; } \
|
|
5871 |
+ END { for (i in files) print i; }'`; \
|
|
5872 |
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
|
5873 |
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
5874 |
+ $$tags $$unique
|
|
5875 |
+
|
|
5876 |
+GTAGS:
|
|
5877 |
+ here=`$(am__cd) $(top_builddir) && pwd` \
|
|
5878 |
+ && cd $(top_srcdir) \
|
|
5879 |
+ && gtags -i $(GTAGS_ARGS) $$here
|
|
5880 |
+
|
|
5881 |
+distclean-tags:
|
|
5882 |
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
5883 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
5884 |
+
|
|
5885 |
+top_distdir = ..
|
|
5886 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
5887 |
+
|
|
5888 |
+distdir: $(DISTFILES)
|
|
5889 |
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
5890 |
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
|
5891 |
+ list='$(DISTFILES)'; for file in $$list; do \
|
|
5892 |
+ case $$file in \
|
|
5893 |
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
|
5894 |
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
|
5895 |
+ esac; \
|
|
5896 |
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
5897 |
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
5898 |
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
5899 |
+ dir="/$$dir"; \
|
|
5900 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
5901 |
+ else \
|
|
5902 |
+ dir=''; \
|
|
5903 |
+ fi; \
|
|
5904 |
+ if test -d $$d/$$file; then \
|
|
5905 |
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
5906 |
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
5907 |
+ fi; \
|
|
5908 |
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
5909 |
+ else \
|
|
5910 |
+ test -f $(distdir)/$$file \
|
|
5911 |
+ || cp -p $$d/$$file $(distdir)/$$file \
|
|
5912 |
+ || exit 1; \
|
|
5913 |
+ fi; \
|
|
5914 |
+ done
|
|
5915 |
+check-am: all-am
|
|
5916 |
+check: check-am
|
|
5917 |
+all-am: Makefile $(PROGRAMS)
|
|
5918 |
+
|
|
5919 |
+installdirs:
|
|
5920 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
5921 |
+install: install-am
|
|
5922 |
+install-exec: install-exec-am
|
|
5923 |
+install-data: install-data-am
|
|
5924 |
+uninstall: uninstall-am
|
|
5925 |
+
|
|
5926 |
+install-am: all-am
|
|
5927 |
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
|
5928 |
+
|
|
5929 |
+installcheck: installcheck-am
|
|
5930 |
+install-strip:
|
|
5931 |
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
|
5932 |
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
|
5933 |
+ `test -z '$(STRIP)' || \
|
|
5934 |
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
|
5935 |
+mostlyclean-generic:
|
|
5936 |
+
|
|
5937 |
+clean-generic:
|
|
5938 |
+
|
|
5939 |
+distclean-generic:
|
|
5940 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
5941 |
+
|
|
5942 |
+maintainer-clean-generic:
|
|
5943 |
+ @echo "This command is intended for maintainers to use"
|
|
5944 |
+ @echo "it deletes files that may require special tools to rebuild."
|
|
5945 |
+clean: clean-am
|
|
5946 |
+
|
|
5947 |
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
|
|
5948 |
+
|
|
5949 |
+distclean: distclean-am
|
|
5950 |
+ -rm -rf ./$(DEPDIR)
|
|
5951 |
+ -rm -f Makefile
|
|
5952 |
+distclean-am: clean-am distclean-compile distclean-generic \
|
|
5953 |
+ distclean-tags
|
|
5954 |
+
|
|
5955 |
+dvi: dvi-am
|
|
5956 |
+
|
|
5957 |
+dvi-am:
|
|
5958 |
+
|
|
5959 |
+info: info-am
|
|
5960 |
+
|
|
5961 |
+info-am:
|
|
5962 |
+
|
|
5963 |
+install-data-am:
|
|
5964 |
+
|
|
5965 |
+install-exec-am: install-binPROGRAMS
|
|
5966 |
+
|
|
5967 |
+install-info: install-info-am
|
|
5968 |
+
|
|
5969 |
+install-man:
|
|
5970 |
+
|
|
5971 |
+installcheck-am:
|
|
5972 |
+
|
|
5973 |
+maintainer-clean: maintainer-clean-am
|
|
5974 |
+ -rm -rf ./$(DEPDIR)
|
|
5975 |
+ -rm -f Makefile
|
|
5976 |
+maintainer-clean-am: distclean-am maintainer-clean-generic
|
|
5977 |
+
|
|
5978 |
+mostlyclean: mostlyclean-am
|
|
5979 |
+
|
|
5980 |
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
|
|
5981 |
+
|
|
5982 |
+pdf: pdf-am
|
|
5983 |
+
|
|
5984 |
+pdf-am:
|
|
5985 |
+
|
|
5986 |
+ps: ps-am
|
|
5987 |
+
|
|
5988 |
+ps-am:
|
|
5989 |
+
|
|
5990 |
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
|
|
5991 |
+
|
|
5992 |
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
|
|
5993 |
+ clean-generic ctags distclean distclean-compile \
|
|
5994 |
+ distclean-generic distclean-tags distdir dvi dvi-am info \
|
|
5995 |
+ info-am install install-am install-binPROGRAMS install-data \
|
|
5996 |
+ install-data-am install-exec install-exec-am install-info \
|
|
5997 |
+ install-info-am install-man install-strip installcheck \
|
|
5998 |
+ installcheck-am installdirs maintainer-clean \
|
|
5999 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
|
|
6000 |
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
|
6001 |
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
|
|
6002 |
+
|
|
6003 |
+
|
|
6004 |
+#EXTRA_DIST = dillocfg.tcl
|
|
6005 |
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
6006 |
+# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
6007 |
+.NOEXPORT:
|
|
6008 |
diff -pruN dillo-0.8.6/config/dillocfg.c dillo-0.8.6-i18n-misc-20070916/config/dillocfg.c
|
|
6009 |
--- dillo-0.8.6/config/dillocfg.c 1970-01-01 09:00:00.000000000 +0900
|
|
6010 |
+++ dillo-0.8.6-i18n-misc-20070916/config/dillocfg.c 2006-08-20 02:51:33.000000000 +0900
|
|
6011 |
@@ -0,0 +1,484 @@
|
|
6012 |
+/*
|
|
6013 |
+ * File: dillocfg-gtk.c
|
|
6014 |
+ *
|
|
6015 |
+ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
|
|
6016 |
+ *
|
|
6017 |
+ * This program is free software; you can redistribute it and/or modify
|
|
6018 |
+ * it under the terms of the GNU General Public License as published by
|
|
6019 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
6020 |
+ * (at your option) any later version.
|
|
6021 |
+ */
|
|
6022 |
+
|
|
6023 |
+#include <stdio.h>
|
|
6024 |
+#include <stdlib.h>
|
|
6025 |
+#include <ctype.h>
|
|
6026 |
+#include <string.h>
|
|
6027 |
+#include <locale.h>
|
|
6028 |
+#include <gtk/gtk.h>
|
|
6029 |
+
|
|
6030 |
+#include "../config.h"
|
|
6031 |
+#include "../src/intl.h"
|
|
6032 |
+#include "dillocfg.h"
|
|
6033 |
+#include "dillocfg_option.h"
|
|
6034 |
+#include "dillocfg_token.h"
|
|
6035 |
+
|
|
6036 |
+static gboolean modified_ = FALSE;
|
|
6037 |
+
|
|
6038 |
+#define IS_LINE_END(c) (c == '\0' || c == '#')
|
|
6039 |
+#define SKIPSPACE(buf, i) while (!IS_LINE_END(buf[i]) && isspace(buf[i])) i++
|
|
6040 |
+
|
|
6041 |
+DillocfgWin *DillocfgWin_new();
|
|
6042 |
+void DillocfgWin_init(DillocfgWin *d, gboolean use_default);
|
|
6043 |
+void DillocfgWin_free(GtkWidget *widget, DillocfgWin *d);
|
|
6044 |
+void DillocfgWin_callback_reset(GtkButton *button, gpointer user_data);
|
|
6045 |
+void DillocfgWin_callback_reload(GtkButton *button, gpointer user_data);
|
|
6046 |
+void DillocfgWin_callback_save(GtkButton *button, gpointer user_data);
|
|
6047 |
+DillocfgInterface *DillocfgInterface_new(DillocfgWin *w, const gchar *label);
|
|
6048 |
+DillocfgFont *DillocfgFont_new(DillocfgWin *w, const gchar *label);
|
|
6049 |
+DillocfgColor *DillocfgColor_new(DillocfgWin *w, const gchar *label);
|
|
6050 |
+DillocfgNetwork *DillocfgNetwork_new(DillocfgWin *w, const gchar *label);
|
|
6051 |
+#ifndef DISABLE_TABS
|
|
6052 |
+DillocfgTab *DillocfgTab_new(DillocfgWin *w, const gchar *label);
|
|
6053 |
+#endif
|
|
6054 |
+DillocfgOther *DillocfgOther_new(DillocfgWin *w, const gchar *label);
|
|
6055 |
+DillocfgCookie *DillocfgCookie_new(DillocfgWin *w, const gchar *label);
|
|
6056 |
+void ReadUserconfig(DillocfgWin *d);
|
|
6057 |
+void WriteUserconfig(DillocfgWin *d);
|
|
6058 |
+
|
|
6059 |
+/****************************** M A I N ********************************/
|
|
6060 |
+int main(int argc, char **argv) {
|
|
6061 |
+ DillocfgWin *dialog;
|
|
6062 |
+
|
|
6063 |
+#ifdef ENABLE_NLS
|
|
6064 |
+ /* set locale */
|
|
6065 |
+ gtk_set_locale();
|
|
6066 |
+ /* Initialize Gettext */
|
|
6067 |
+ bindtextdomain (PACKAGE, LOCALEDIR);
|
|
6068 |
+ textdomain (PACKAGE);
|
|
6069 |
+#endif
|
|
6070 |
+ /* Initialize GUI and parse GTK related args */
|
|
6071 |
+ gtk_init(&argc, &argv);
|
|
6072 |
+ gdk_rgb_init();
|
|
6073 |
+
|
|
6074 |
+ dialog = DillocfgWin_new();
|
|
6075 |
+
|
|
6076 |
+ DillocfgWin_init(dialog, TRUE);
|
|
6077 |
+ ReadUserconfig(dialog);
|
|
6078 |
+
|
|
6079 |
+ /* Start the GTK+ cycle */
|
|
6080 |
+ gtk_main();
|
|
6081 |
+
|
|
6082 |
+ //g_print("Dillocfg:normal exit\n");
|
|
6083 |
+ gtk_exit (0);
|
|
6084 |
+ return 0;
|
|
6085 |
+}
|
|
6086 |
+
|
|
6087 |
+DillocfgWin *DillocfgWin_new() {
|
|
6088 |
+ DillocfgWin *d = g_new(DillocfgWin, 1);
|
|
6089 |
+ GtkWidget *dialog_main = gtk_window_new(GTK_WINDOW_TOPLEVEL);//DIALOG);
|
|
6090 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6091 |
+ GtkWidget *button_hbox = gtk_hbox_new(FALSE, 0);
|
|
6092 |
+ GtkWidget *button_reset = gtk_button_new_with_label(_("Reset"));
|
|
6093 |
+ GtkWidget *button_reload = gtk_button_new_with_label(_("Reload"));
|
|
6094 |
+ GtkWidget *button_save = gtk_button_new_with_label(_("Save"));
|
|
6095 |
+ GtkWidget *button_quit = gtk_button_new_with_label(_("Quit"));
|
|
6096 |
+
|
|
6097 |
+ gtk_window_set_title(GTK_WINDOW(dialog_main), _("Dillo Preferences"));
|
|
6098 |
+ gtk_window_set_policy(GTK_WINDOW(dialog_main), TRUE, TRUE, FALSE);
|
|
6099 |
+ gtk_signal_connect(GTK_OBJECT(dialog_main), "delete_event",
|
|
6100 |
+ GTK_SIGNAL_FUNC(gtk_widget_destroy), d);
|
|
6101 |
+ gtk_signal_connect(GTK_OBJECT(dialog_main), "destroy",
|
|
6102 |
+ GTK_SIGNAL_FUNC(DillocfgWin_free), d);
|
|
6103 |
+ gtk_window_set_wmclass(GTK_WINDOW(dialog_main), "dillocfg", _("Dillo Preferences"));
|
|
6104 |
+ gtk_widget_set_usize(dialog_main, WIDTH, HEIGHT);
|
|
6105 |
+
|
|
6106 |
+ d->notebook = gtk_notebook_new();
|
|
6107 |
+ gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(d->notebook), FALSE);
|
|
6108 |
+ gtk_container_add(GTK_CONTAINER(dialog_main), vbox);
|
|
6109 |
+ gtk_container_add(GTK_CONTAINER(vbox), d->notebook);
|
|
6110 |
+ gtk_signal_connect(GTK_OBJECT(button_reset), "clicked",
|
|
6111 |
+ GTK_SIGNAL_FUNC(DillocfgWin_callback_reset), d);
|
|
6112 |
+ gtk_signal_connect(GTK_OBJECT(button_reload), "clicked",
|
|
6113 |
+ GTK_SIGNAL_FUNC(DillocfgWin_callback_reload), d);
|
|
6114 |
+ gtk_signal_connect(GTK_OBJECT(button_save), "clicked",
|
|
6115 |
+ GTK_SIGNAL_FUNC(DillocfgWin_callback_save), d);
|
|
6116 |
+ gtk_signal_connect(GTK_OBJECT(button_quit), "clicked",
|
|
6117 |
+ GTK_SIGNAL_FUNC(DillocfgWin_free), d);
|
|
6118 |
+ gtk_box_set_spacing(GTK_BOX(button_hbox), 5);
|
|
6119 |
+ gtk_container_add(GTK_CONTAINER(button_hbox), button_reset);
|
|
6120 |
+ gtk_container_add(GTK_CONTAINER(button_hbox), button_reload);
|
|
6121 |
+ gtk_container_add(GTK_CONTAINER(button_hbox), button_save);
|
|
6122 |
+ gtk_container_add(GTK_CONTAINER(button_hbox), button_quit);
|
|
6123 |
+ gtk_box_pack_end(GTK_BOX(vbox), button_hbox, FALSE, FALSE, 5);
|
|
6124 |
+
|
|
6125 |
+ d->list = NULL;
|
|
6126 |
+ d->interface = DillocfgInterface_new(d, _("Interface"));
|
|
6127 |
+ d->font = DillocfgFont_new(d, _(" Font "));
|
|
6128 |
+ d->color = DillocfgColor_new(d, _(" Color "));
|
|
6129 |
+ d->network = DillocfgNetwork_new(d, _(" Network "));
|
|
6130 |
+#ifndef DISABLE_TABS
|
|
6131 |
+ d->tab = DillocfgTab_new(d, _(" Tab "));
|
|
6132 |
+#endif
|
|
6133 |
+ d->cookie = NULL;//DillocfgCookie_new(d, _(" Cookie "));
|
|
6134 |
+ d->other = DillocfgOther_new(d, _(" Other "));
|
|
6135 |
+
|
|
6136 |
+ gtk_widget_show_all(dialog_main);
|
|
6137 |
+ return d;
|
|
6138 |
+}
|
|
6139 |
+
|
|
6140 |
+void DillocfgWin_init(DillocfgWin *d, gboolean use_default) {
|
|
6141 |
+ g_list_foreach(d->list, (GFunc)Option_init, (gpointer)use_default);
|
|
6142 |
+}
|
|
6143 |
+
|
|
6144 |
+void DillocfgWin_free(GtkWidget *widget, DillocfgWin *d) {
|
|
6145 |
+ g_list_foreach(d->list, (GFunc)Option_free, (gpointer)&d->list);
|
|
6146 |
+ g_free(d->interface);
|
|
6147 |
+ g_free(d->font);
|
|
6148 |
+ g_free(d->color);
|
|
6149 |
+ g_free(d->network);
|
|
6150 |
+#ifndef DISABLE_TABS
|
|
6151 |
+ g_free(d->tab);
|
|
6152 |
+#endif
|
|
6153 |
+ g_free(d->cookie);
|
|
6154 |
+ g_free(d->other);
|
|
6155 |
+ g_list_free(d->list);
|
|
6156 |
+ g_free(d);
|
|
6157 |
+ gtk_main_quit();
|
|
6158 |
+}
|
|
6159 |
+
|
|
6160 |
+#ifndef DISABLE_TABS
|
|
6161 |
+DillocfgTab *DillocfgTab_new(DillocfgWin *w, const gchar *label) {
|
|
6162 |
+ DillocfgTab *t = g_new(DillocfgTab, 1);
|
|
6163 |
+ gint x, y;
|
|
6164 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6165 |
+ GtkWidget *table = gtk_table_new(4, 2, FALSE);
|
|
6166 |
+ GtkWidget *table2 = gtk_table_new(2, 1, FALSE);
|
|
6167 |
+
|
|
6168 |
+ gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
|
|
6169 |
+ gtk_table_set_homogeneous(GTK_TABLE(table2), TRUE);
|
|
6170 |
+ gtk_container_add(GTK_CONTAINER(vbox), table);
|
|
6171 |
+ gtk_container_add(GTK_CONTAINER(vbox), table2);
|
|
6172 |
+ x = 0; y = 0;
|
|
6173 |
+ t->tab_bar_homogeneous = Option_new(TOKEN_TAB_BAR_HOMOGENEOUS, &w->list, table, x, y++);
|
|
6174 |
+ t->tab_bar_scroller = Option_new(TOKEN_TAB_BAR_SCROLLER, &w->list, table, x, y++);
|
|
6175 |
+ t->tab_bar_show_fullscreen = Option_new(TOKEN_TAB_BAR_SHOW_FULLSCREEN, &w->list, table, x, y++);
|
|
6176 |
+ t->tab_close_middle_click = Option_new(TOKEN_TAB_CLOSE_MIDDLE_CLICK, &w->list, table, x, y++);
|
|
6177 |
+ x++; y = 0;
|
|
6178 |
+ t->tab_bar_show_single_tab = Option_new(TOKEN_TAB_BAR_SHOW_SINGLE_TAB, &w->list, table, x, y++);
|
|
6179 |
+ t->tab_instead_of_window = Option_new(TOKEN_TAB_INSTEAD_OF_WINDOW, &w->list, table, x, y++);
|
|
6180 |
+ t->tab_load_in_background = Option_new(TOKEN_TAB_LOAD_IN_BACKGROUND, &w->list, table, x, y++);
|
|
6181 |
+ t->tab_title_compress
|
|
6182 |
+ = Option_new(TOKEN_TAB_TITLE_COMPRESS, &w->list, table, x, y++);
|
|
6183 |
+ x = 0; y = 0;
|
|
6184 |
+ t->compress_vowels = Option_new(TOKEN_COMPRESS_VOWELS, &w->list, table2, x, y++);
|
|
6185 |
+ t->compress_common_prefixes = Option_new(TOKEN_COMPRESS_COMMON_PREFIXES, &w->list, table2, x, y++);
|
|
6186 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6187 |
+ return t;
|
|
6188 |
+}
|
|
6189 |
+
|
|
6190 |
+#endif
|
|
6191 |
+
|
|
6192 |
+DillocfgOther *DillocfgOther_new(DillocfgWin *w, const gchar *label) {
|
|
6193 |
+ DillocfgOther *g = g_new(DillocfgOther, 1);
|
|
6194 |
+ gint x, y;
|
|
6195 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6196 |
+ GtkWidget *table = gtk_table_new(9, 1, FALSE);
|
|
6197 |
+
|
|
6198 |
+ gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
|
|
6199 |
+ gtk_container_add(GTK_CONTAINER(vbox), table);
|
|
6200 |
+ x = 0; y = 0;
|
|
6201 |
+ g->w3c_plus_heuristics
|
|
6202 |
+ = Option_new(TOKEN_W3C_PLUS_HEURISTICS, &w->list, table, x, y++);
|
|
6203 |
+ g->use_dicache = Option_new(TOKEN_USE_DICACHE, &w->list, table, x, y++);
|
|
6204 |
+ g->focus_location_on_new
|
|
6205 |
+ = Option_new(TOKEN_FOCUS_LOCATION_ON_NEW, &w->list, table, x, y++);
|
|
6206 |
+ g->enterpress_forces_submit
|
|
6207 |
+ = Option_new(TOKEN_ENTERPRESS_FORCES_SUBMIT, &w->list, table, x, y++);
|
|
6208 |
+ g->generate_submit = Option_new(TOKEN_GENERATE_SUBMIT, &w->list, table, x, y++);
|
|
6209 |
+ g->limit_text_width = Option_new(TOKEN_LIMIT_TEXT_WIDTH, &w->list, table, x, y++);
|
|
6210 |
+ g->search_url = Option_new(TOKEN_SEARCH_URL, &w->list, table, x, y++);
|
|
6211 |
+ g->search_charset = Option_new(TOKEN_SEARCH_CHARSET, &w->list, table, x, y++);
|
|
6212 |
+ g->accept_language = Option_new(TOKEN_ACCEPT_LANGUAGE, &w->list, table, x, y++);
|
|
6213 |
+ g->show_msg = Option_new(TOKEN_SHOW_MSG, &w->list, table, x, y++);
|
|
6214 |
+ g->show_extra_warnings = Option_new(TOKEN_SHOW_EXTRA_WARNINGS, &w->list, table, x, y++);
|
|
6215 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6216 |
+ return g;
|
|
6217 |
+}
|
|
6218 |
+
|
|
6219 |
+DillocfgInterface *DillocfgInterface_new(DillocfgWin *w, const gchar *label) {
|
|
6220 |
+ DillocfgInterface *di = g_new(DillocfgInterface, 1);
|
|
6221 |
+ gint x, y;
|
|
6222 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6223 |
+ GtkWidget *table = gtk_table_new(10, 2, FALSE);
|
|
6224 |
+
|
|
6225 |
+ gtk_table_set_homogeneous (GTK_TABLE(table), FALSE);
|
|
6226 |
+ gtk_container_add(GTK_CONTAINER(vbox), table);
|
|
6227 |
+ x = 0; y = 0;
|
|
6228 |
+ di->geometry = Option_new(TOKEN_GEOMETRY, &w->list, table, x, y++);
|
|
6229 |
+ di->panel_size = Option_new(TOKEN_PANEL_SIZE, &w->list, table, x, y++);
|
|
6230 |
+ di->show_back = Option_new(TOKEN_SHOW_BACK, &w->list, table, x, y++);
|
|
6231 |
+ di->show_forw = Option_new(TOKEN_SHOW_FORW, &w->list, table, x, y++);
|
|
6232 |
+ di->show_bookmarks = Option_new(TOKEN_SHOW_BOOKMARKS, &w->list, table, x, y++);
|
|
6233 |
+ di->show_clear_url = Option_new(TOKEN_SHOW_CLEAR_URL, &w->list, table, x, y++);
|
|
6234 |
+ di->show_home = Option_new(TOKEN_SHOW_HOME, &w->list, table, x, y++);
|
|
6235 |
+ di->show_menubar = Option_new(TOKEN_SHOW_MENUBAR, &w->list, table, x, y++);
|
|
6236 |
+ di->show_progress_box = Option_new(TOKEN_SHOW_PROGRESS_BOX, &w->list, table, x, y++);
|
|
6237 |
+ di->show_reload = Option_new(TOKEN_SHOW_RELOAD, &w->list, table, x, y++);
|
|
6238 |
+ x++; y = 0;
|
|
6239 |
+ di->show_save = Option_new(TOKEN_SHOW_SAVE, &w->list, table, x, y++);
|
|
6240 |
+ di->show_stop = Option_new(TOKEN_SHOW_STOP, &w->list, table, x, y++);
|
|
6241 |
+ di->show_tooltip = Option_new(TOKEN_SHOW_TOOLTIP, &w->list, table, x, y++);
|
|
6242 |
+ di->show_url = Option_new(TOKEN_SHOW_URL, &w->list, table, x, y++);
|
|
6243 |
+ di->show_search = Option_new(TOKEN_SHOW_SEARCH, &w->list, table, x, y++);
|
|
6244 |
+ di->small_icons = Option_new(TOKEN_SMALL_ICONS, &w->list, table, x, y++);
|
|
6245 |
+ di->fullwindow_start = Option_new(TOKEN_FULLWINDOW_START, &w->list, table, x, y++);
|
|
6246 |
+ di->transient_dialogs = Option_new(TOKEN_TRANSIENT_DIALOGS, &w->list, table, x, y++);
|
|
6247 |
+ di->popup_dialogs = Option_new(TOKEN_POPUP_DIALOGS, &w->list, table, x, y++);
|
|
6248 |
+ di->show_popup_navigation = Option_new(TOKEN_SHOW_POPUP_NAVIGATION, &w->list, table, x, y++);
|
|
6249 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6250 |
+ return di;
|
|
6251 |
+}
|
|
6252 |
+
|
|
6253 |
+DillocfgFont *DillocfgFont_new(DillocfgWin *w, const gchar *label) {
|
|
6254 |
+ DillocfgFont *r = g_new(DillocfgFont, 1);
|
|
6255 |
+ gint x, y;
|
|
6256 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 5);
|
|
6257 |
+ GtkWidget *table = gtk_table_new(4, 1, FALSE);
|
|
6258 |
+ GtkWidget *table2 = gtk_table_new(1, 2, FALSE);
|
|
6259 |
+
|
|
6260 |
+ gtk_table_set_homogeneous (GTK_TABLE(table), TRUE);
|
|
6261 |
+ gtk_table_set_row_spacings(GTK_TABLE(table), 5);
|
|
6262 |
+ gtk_table_set_homogeneous (GTK_TABLE(table2), TRUE);
|
|
6263 |
+ //gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, FALSE, 5);
|
|
6264 |
+ //gtk_box_pack_start(GTK_BOX(vbox), table2, TRUE, FALSE, 5);
|
|
6265 |
+ gtk_container_add(GTK_CONTAINER(vbox), table);
|
|
6266 |
+ gtk_container_add(GTK_CONTAINER(vbox), table2);
|
|
6267 |
+ x=0; y=0;
|
|
6268 |
+#ifdef DISABLE_ANTI_ALIAS
|
|
6269 |
+ r->vw_fontname = Option_new(TOKEN_VW_FONT, &w->list, table, x, y++);
|
|
6270 |
+#else
|
|
6271 |
+ r->vw_aafontname = Option_new(TOKEN_VW_AAFONT, &w->list, table, x, y++);
|
|
6272 |
+#endif
|
|
6273 |
+#ifdef DISABLE_ANTI_ALIAS
|
|
6274 |
+ r->fw_fontname = Option_new(TOKEN_FW_FONT, &w->list, table, x, y++);
|
|
6275 |
+#else
|
|
6276 |
+ r->fw_aafontname = Option_new(TOKEN_FW_AAFONT, &w->list, table, x, y++);
|
|
6277 |
+#endif
|
|
6278 |
+ r->font_sizes = Option_new(TOKEN_FONT_SIZES, &w->list, table, x, y++);
|
|
6279 |
+ r->font_factor = Option_new(TOKEN_FONT_FACTOR, &w->list, table, x, y++);
|
|
6280 |
+ x=0; y=0;
|
|
6281 |
+ r->use_oblique = Option_new(TOKEN_USE_OBLIQUE, &w->list, table2, x, y++);
|
|
6282 |
+ x++; y=0;
|
|
6283 |
+ r->limit_font_decoration = Option_new(TOKEN_LIMIT_FONT_DECORATION, &w->list, table2, x, y++);
|
|
6284 |
+
|
|
6285 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6286 |
+ return r;
|
|
6287 |
+}
|
|
6288 |
+
|
|
6289 |
+DillocfgColor *DillocfgColor_new(DillocfgWin *w, const gchar *label) {
|
|
6290 |
+ DillocfgColor *c = g_new(DillocfgColor, 1);
|
|
6291 |
+ gint x, y;
|
|
6292 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6293 |
+ GtkWidget *table = gtk_table_new(3, 1, FALSE);
|
|
6294 |
+ GtkWidget *table2 = gtk_table_new(2, 2, TRUE);
|
|
6295 |
+
|
|
6296 |
+ gtk_table_set_homogeneous (GTK_TABLE(table), TRUE);
|
|
6297 |
+ gtk_table_set_homogeneous (GTK_TABLE(table2), FALSE);
|
|
6298 |
+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 5);
|
|
6299 |
+ gtk_box_pack_start(GTK_BOX(vbox), table2, FALSE, FALSE, 5);
|
|
6300 |
+ x = 0; y = 0;
|
|
6301 |
+ c->force_my_colors = Option_new(TOKEN_FORCE_MY_COLORS, &w->list, table, x, y++);
|
|
6302 |
+ c->contrast_visited_color
|
|
6303 |
+ = Option_new(TOKEN_CONTRAST_VISITED_COLOR, &w->list, table, x, y++);
|
|
6304 |
+ c->allow_white_bg = Option_new(TOKEN_ALLOW_WHITE_BG, &w->list, table, x, y++);
|
|
6305 |
+ x = 0; y = 0;
|
|
6306 |
+ c->link_color = Option_new(TOKEN_LINK_COLOR, &w->list, table2, x, y++);
|
|
6307 |
+ c->bg_color = Option_new(TOKEN_BG_COLOR, &w->list, table2, x, y++);
|
|
6308 |
+ x++; y = 0;
|
|
6309 |
+ c->visited_color = Option_new(TOKEN_VISITED_COLOR, &w->list, table2, x, y++);
|
|
6310 |
+ c->text_color = Option_new(TOKEN_TEXT_COLOR, &w->list, table2, x, y++);
|
|
6311 |
+
|
|
6312 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6313 |
+ return c;
|
|
6314 |
+}
|
|
6315 |
+
|
|
6316 |
+DillocfgNetwork *DillocfgNetwork_new(DillocfgWin *w, const gchar *label) {
|
|
6317 |
+ DillocfgNetwork *n = g_new(DillocfgNetwork, 1);
|
|
6318 |
+ gint x, y;
|
|
6319 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6320 |
+ GtkWidget *table = gtk_table_new(10, 2, FALSE);
|
|
6321 |
+
|
|
6322 |
+ gtk_container_add(GTK_CONTAINER(vbox), table);
|
|
6323 |
+ x = 0; y = 0;
|
|
6324 |
+ n->user_agent = Option_new(TOKEN_USER_AGENT, &w->list, table, x, y++);
|
|
6325 |
+ n->home = Option_new(TOKEN_HOME, &w->list, table, x, y++);
|
|
6326 |
+ n->start_page = Option_new(TOKEN_START_PAGE, &w->list, table, x, y++);;
|
|
6327 |
+ n->http_proxy = Option_new(TOKEN_PROXY, &w->list, table, x, y++);;
|
|
6328 |
+ n->http_proxyuser = Option_new(TOKEN_PROXYUSER, &w->list, table, x, y++);;
|
|
6329 |
+ n->no_proxy = Option_new(TOKEN_NOPROXY, &w->list, table, x, y++);;
|
|
6330 |
+ n->send_referer = Option_new(TOKEN_SEND_REFERER, &w->list, table, x, y++);;
|
|
6331 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6332 |
+ return n;
|
|
6333 |
+}
|
|
6334 |
+
|
|
6335 |
+DillocfgCookie *DillocfgCookie_new(DillocfgWin *w, const gchar *label) {
|
|
6336 |
+ DillocfgCookie *c = g_new(DillocfgCookie, 1);
|
|
6337 |
+ gint x, y;
|
|
6338 |
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
|
|
6339 |
+ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
|
|
6340 |
+ GtkWidget *table = gtk_table_new(1, 1, TRUE);
|
|
6341 |
+ GtkWidget *clist = gtk_clist_new(2);
|
|
6342 |
+ GtkWidget *add_btn= gtk_button_new_with_label(_("Add"));
|
|
6343 |
+ GtkWidget *del_btn= gtk_button_new_with_label(_("Delete"));
|
|
6344 |
+ gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
|
|
6345 |
+ gtk_container_add(GTK_CONTAINER(hbox), add_btn);
|
|
6346 |
+ gtk_container_add(GTK_CONTAINER(hbox), del_btn);
|
|
6347 |
+ x = 0; y = 0;
|
|
6348 |
+ c->cookie_default = Option_new(TOKEN_COOKIE_DEFAULT, &w->list, table, x, y++);
|
|
6349 |
+ gtk_clist_set_column_title(GTK_CLIST(clist), 0, _("Address"));
|
|
6350 |
+ gtk_clist_set_column_title(GTK_CLIST(clist), 1, _("Rule"));
|
|
6351 |
+ gtk_clist_column_titles_show(GTK_CLIST(clist));
|
|
6352 |
+ gtk_clist_set_column_width(GTK_CLIST(clist), 0, 200);
|
|
6353 |
+ /*
|
|
6354 |
+ gtk_clist_insert(GTK_CLIST(clist), 1, NULL);
|
|
6355 |
+ gtk_clist_set_text(GTK_CLIST(clist), 0, 0, "DEFAULT");
|
|
6356 |
+ gtk_clist_set_text(GTK_CLIST(clist), 0, 1, "ACCEPT");
|
|
6357 |
+ */
|
|
6358 |
+ gtk_widget_set_usize(table, 320, 32);
|
|
6359 |
+ gtk_box_pack_start(GTK_BOX(vbox), clist, TRUE, TRUE, 10);
|
|
6360 |
+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 10);
|
|
6361 |
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
|
|
6362 |
+ //gtk_table_attach_defaults(GTK_TABLE(table), clist, x, x + 1, y, y + 1);
|
|
6363 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
|
|
6364 |
+ return c;
|
|
6365 |
+}
|
|
6366 |
+
|
|
6367 |
+#define BUFSIZE 4096
|
|
6368 |
+void ReadUserconfig(DillocfgWin *d) {
|
|
6369 |
+ FILE *usercfg, *usercookiecfg;
|
|
6370 |
+ gchar *filepass = g_strconcat(g_get_home_dir(), "/", USER_CFG, NULL);
|
|
6371 |
+ char buf[BUFSIZE], name[BUFSIZE], value[BUFSIZE];
|
|
6372 |
+ gchar *locale = g_strdup (setlocale (LC_NUMERIC, NULL));;
|
|
6373 |
+
|
|
6374 |
+ setlocale (LC_NUMERIC, "C");
|
|
6375 |
+ if (!(usercfg = fopen(filepass, "r"))) {
|
|
6376 |
+ g_print(_("Read failed <%s>\n"), filepass);
|
|
6377 |
+ return;
|
|
6378 |
+ }
|
|
6379 |
+ g_free(filepass);
|
|
6380 |
+ filepass = g_strconcat(g_get_home_dir(), "/", USER_COOKIE_CFG, NULL);
|
|
6381 |
+ if (!(usercookiecfg = fopen(filepass, "r"))) {
|
|
6382 |
+ g_print(_("Read failed <%s>\n"), filepass);
|
|
6383 |
+ return;
|
|
6384 |
+ }
|
|
6385 |
+ g_free(filepass);
|
|
6386 |
+
|
|
6387 |
+ /* First, set default data. */
|
|
6388 |
+ DillocfgWin_init(d, TRUE);
|
|
6389 |
+
|
|
6390 |
+ /* Read dillorc. */
|
|
6391 |
+ while (fgets(buf, BUFSIZE, usercfg)) {
|
|
6392 |
+ /* Parse name and value. */
|
|
6393 |
+ int i = 0, j = 0, k = 0;
|
|
6394 |
+ guint token;
|
|
6395 |
+ SKIPSPACE(buf, i);
|
|
6396 |
+ if (buf[i] == '#') continue;
|
|
6397 |
+ SKIPSPACE(buf, i);
|
|
6398 |
+ while (!IS_LINE_END(buf[i]) && buf[i] != '=' && !isspace(buf[i]))
|
|
6399 |
+ name[j++] = buf[i++];
|
|
6400 |
+ name[j] = '\0';
|
|
6401 |
+ SKIPSPACE(buf, i);
|
|
6402 |
+ if (buf[i++] != '=') continue;
|
|
6403 |
+ SKIPSPACE(buf, i);
|
|
6404 |
+ if (buf[i] == '"') {
|
|
6405 |
+ i++;
|
|
6406 |
+ while (!IS_LINE_END(buf[i]) && buf[i] != '"') value[k++] = buf[i++];
|
|
6407 |
+ } else
|
|
6408 |
+ while (!IS_LINE_END(buf[i]) && !isspace(buf[i])) value[k++] = buf[i++];
|
|
6409 |
+ value[k] = '\0';
|
|
6410 |
+ if (strlen(value) == 0) continue;
|
|
6411 |
+ token = name2token(name);
|
|
6412 |
+ /* Set value */
|
|
6413 |
+ Option_set(get_token_object(token), value);
|
|
6414 |
+ }
|
|
6415 |
+
|
|
6416 |
+ /* Read cookiesrc */
|
|
6417 |
+ while (fgets(buf, BUFSIZE, usercookiecfg)) {
|
|
6418 |
+ /* Parse name and value. */
|
|
6419 |
+ int i = 0, j = 0, k = 0;
|
|
6420 |
+ guint token;
|
|
6421 |
+ SKIPSPACE(buf, i);
|
|
6422 |
+ if (buf[i] == '#') continue;
|
|
6423 |
+ SKIPSPACE(buf, i);
|
|
6424 |
+ while (!IS_LINE_END(buf[i]) && !isspace(buf[i])) name[j++] = buf[i++];
|
|
6425 |
+ name[j] = '\0';
|
|
6426 |
+ SKIPSPACE(buf, i);
|
|
6427 |
+ while (!IS_LINE_END(buf[i]) && !isspace(buf[i])) value[k++] = buf[i++];
|
|
6428 |
+ value[k] = '\0';
|
|
6429 |
+ if (strlen(value) == 0) continue;
|
|
6430 |
+ if (strcmp(name, "DEFAULT") == 0)
|
|
6431 |
+ token = TOKEN_COOKIE_DEFAULT;
|
|
6432 |
+ else
|
|
6433 |
+ token = TOKEN_COOKIE;
|
|
6434 |
+ /* Set value */
|
|
6435 |
+ Option_set(get_token_object(token), value);
|
|
6436 |
+ }
|
|
6437 |
+ fclose(usercfg);
|
|
6438 |
+ fclose(usercookiecfg);
|
|
6439 |
+ setlocale(LC_NUMERIC, locale);
|
|
6440 |
+ DillocfgWin_init(d, FALSE);
|
|
6441 |
+ g_free (locale);
|
|
6442 |
+}
|
|
6443 |
+
|
|
6444 |
+void DillocfgWin_callback_reset(GtkButton *button, gpointer user_data) {
|
|
6445 |
+ DillocfgWin *d = (DillocfgWin *)user_data;
|
|
6446 |
+ DillocfgWin_init(d, TRUE);
|
|
6447 |
+ modified_ = TRUE;
|
|
6448 |
+}
|
|
6449 |
+
|
|
6450 |
+void DillocfgWin_callback_reload(GtkButton *button, gpointer user_data) {
|
|
6451 |
+ DillocfgWin *d = (DillocfgWin *)user_data;
|
|
6452 |
+ ReadUserconfig(d);
|
|
6453 |
+ modified_ = FALSE;
|
|
6454 |
+}
|
|
6455 |
+
|
|
6456 |
+void WriteUserconfig(DillocfgWin *d) {
|
|
6457 |
+ FILE *usercfg;
|
|
6458 |
+ //FILE *usercookiecfg;
|
|
6459 |
+ GList *list;
|
|
6460 |
+ gchar *filepass = g_strconcat(g_get_home_dir(), "/", USER_CFG, NULL);
|
|
6461 |
+
|
|
6462 |
+ if (!(usercfg = fopen(filepass, "w"))) {
|
|
6463 |
+ g_print(_("can't write <%s>\n"), filepass);
|
|
6464 |
+ return;
|
|
6465 |
+ }
|
|
6466 |
+ g_free(filepass);
|
|
6467 |
+ fprintf(usercfg, "#This file is written by Dillocfg\n");
|
|
6468 |
+#if 0
|
|
6469 |
+ filepass = g_strconcat(g_get_home_dir(), "/", USER_COOKIE_CFG, NULL);
|
|
6470 |
+ if (!(usercookiecfg = fopen(filepass, "w"))) {
|
|
6471 |
+ g_print(_("can't write <%s>\n"), filepass);
|
|
6472 |
+ fclose(usercfg);
|
|
6473 |
+ return;
|
|
6474 |
+ }
|
|
6475 |
+ g_free(filepass);
|
|
6476 |
+ fprintf(usercookiecfg, "#This file is written by Dillocfg\n");
|
|
6477 |
+#endif
|
|
6478 |
+ for (list = g_list_first(d->list); list; list = g_list_next(list)) {
|
|
6479 |
+ Option *o = (Option *)list->data;
|
|
6480 |
+ if (get_token_type(o->base.token) == COOKIE)
|
|
6481 |
+ ;//Option_get(o, usercookiecfg);
|
|
6482 |
+ else
|
|
6483 |
+ Option_get(o, usercfg);
|
|
6484 |
+ }
|
|
6485 |
+ fclose(usercfg);
|
|
6486 |
+ //fclose(usercookiecfg);
|
|
6487 |
+}
|
|
6488 |
+
|
|
6489 |
+void DillocfgWin_callback_save(GtkButton *button, gpointer user_data) {
|
|
6490 |
+ DillocfgWin *d = (DillocfgWin *)user_data;
|
|
6491 |
+ WriteUserconfig(d);
|
|
6492 |
+ modified_ = FALSE;
|
|
6493 |
+}
|
|
6494 |
+
|
|
6495 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
6496 |
diff -pruN dillo-0.8.6/config/dillocfg.h dillo-0.8.6-i18n-misc-20070916/config/dillocfg.h
|
|
6497 |
--- dillo-0.8.6/config/dillocfg.h 1970-01-01 09:00:00.000000000 +0900
|
|
6498 |
+++ dillo-0.8.6-i18n-misc-20070916/config/dillocfg.h 2006-05-16 01:21:16.000000000 +0900
|
|
6499 |
@@ -0,0 +1,126 @@
|
|
6500 |
+#ifndef __DILLOCFG_GTK_H__
|
|
6501 |
+#define __DILLOCFG_GTK_H__
|
|
6502 |
+
|
|
6503 |
+#include <gtk/gtk.h>
|
|
6504 |
+
|
|
6505 |
+#include "../config.h"
|
|
6506 |
+#include "dillocfg_option.h"
|
|
6507 |
+
|
|
6508 |
+#define WIDTH 640
|
|
6509 |
+#define HEIGHT 370
|
|
6510 |
+#define USER_CFG ".dillo/dillorc"
|
|
6511 |
+#define USER_COOKIE_CFG ".dillo/cookiesrc"
|
|
6512 |
+
|
|
6513 |
+#ifdef __cplusplus
|
|
6514 |
+extern "C" {
|
|
6515 |
+#endif /* __cplusplus */
|
|
6516 |
+
|
|
6517 |
+#ifndef DISABLE_TABS
|
|
6518 |
+ typedef struct {
|
|
6519 |
+ Option *tab_bar_homogeneous;
|
|
6520 |
+ Option *tab_bar_scroller;
|
|
6521 |
+ Option *tab_bar_show_fullscreen;
|
|
6522 |
+ Option *tab_bar_show_single_tab;
|
|
6523 |
+ Option *tab_instead_of_window;
|
|
6524 |
+ Option *tab_load_in_background;
|
|
6525 |
+ Option *tab_close_middle_click;
|
|
6526 |
+ Option *compress_vowels;
|
|
6527 |
+ Option *compress_common_prefixes;
|
|
6528 |
+ Option *tab_title_compress;
|
|
6529 |
+ } DillocfgTab;
|
|
6530 |
+#endif
|
|
6531 |
+
|
|
6532 |
+ typedef struct {
|
|
6533 |
+ Option *w3c_plus_heuristics;
|
|
6534 |
+ Option *use_dicache;
|
|
6535 |
+ Option *focus_location_on_new;
|
|
6536 |
+ Option *enterpress_forces_submit;
|
|
6537 |
+ Option *limit_text_width;
|
|
6538 |
+ Option *generate_submit;
|
|
6539 |
+ Option *search_url;
|
|
6540 |
+ Option *search_charset;
|
|
6541 |
+ Option *accept_language;
|
|
6542 |
+ Option *show_msg;
|
|
6543 |
+ Option *show_extra_warnings;
|
|
6544 |
+ } DillocfgOther;
|
|
6545 |
+
|
|
6546 |
+ typedef struct {
|
|
6547 |
+ Option *geometry;
|
|
6548 |
+ Option *panel_size;
|
|
6549 |
+ Option *show_back;
|
|
6550 |
+ Option *show_bookmarks;
|
|
6551 |
+ Option *show_clear_url;
|
|
6552 |
+ Option *show_forw;
|
|
6553 |
+ Option *show_home;
|
|
6554 |
+ Option *show_menubar;
|
|
6555 |
+ Option *show_popup_navigation;
|
|
6556 |
+ Option *show_progress_box;
|
|
6557 |
+ Option *show_reload;
|
|
6558 |
+ Option *show_save;
|
|
6559 |
+ Option *show_stop;
|
|
6560 |
+ Option *show_tooltip;
|
|
6561 |
+ Option *show_url;
|
|
6562 |
+ Option *show_search;
|
|
6563 |
+ Option *small_icons;
|
|
6564 |
+ Option *fullwindow_start;
|
|
6565 |
+ Option *transient_dialogs;
|
|
6566 |
+ Option *popup_dialogs;
|
|
6567 |
+ } DillocfgInterface;
|
|
6568 |
+
|
|
6569 |
+ typedef struct {
|
|
6570 |
+ Option *font_sizes;
|
|
6571 |
+ Option *font_factor;
|
|
6572 |
+ Option *vw_fontname;
|
|
6573 |
+ Option *fw_fontname;
|
|
6574 |
+ Option *vw_aafontname;
|
|
6575 |
+ Option *fw_aafontname;
|
|
6576 |
+ Option *use_oblique;
|
|
6577 |
+ Option *limit_font_decoration;
|
|
6578 |
+ } DillocfgFont;
|
|
6579 |
+
|
|
6580 |
+ typedef struct {
|
|
6581 |
+ Option *force_my_colors;
|
|
6582 |
+ Option *contrast_visited_color;
|
|
6583 |
+ Option *allow_white_bg;
|
|
6584 |
+ Option *link_color;
|
|
6585 |
+ Option *bg_color;
|
|
6586 |
+ Option *visited_color;
|
|
6587 |
+ Option *text_color;
|
|
6588 |
+ } DillocfgColor;
|
|
6589 |
+
|
|
6590 |
+ typedef struct {
|
|
6591 |
+ Option *user_agent;
|
|
6592 |
+ Option *home;
|
|
6593 |
+ Option *start_page;
|
|
6594 |
+ Option *http_proxy;
|
|
6595 |
+ Option *http_proxyuser;
|
|
6596 |
+ Option *no_proxy;
|
|
6597 |
+ Option *send_referer;
|
|
6598 |
+ } DillocfgNetwork;
|
|
6599 |
+
|
|
6600 |
+ typedef struct {
|
|
6601 |
+ Option *cookie_default;
|
|
6602 |
+ } DillocfgCookie;
|
|
6603 |
+
|
|
6604 |
+ typedef struct {
|
|
6605 |
+ GtkWidget *notebook;
|
|
6606 |
+ GList *list;
|
|
6607 |
+ DillocfgInterface *interface;
|
|
6608 |
+ DillocfgFont *font;
|
|
6609 |
+ DillocfgColor *color;
|
|
6610 |
+ DillocfgNetwork *network;
|
|
6611 |
+#ifndef DISABLE_TABS
|
|
6612 |
+ DillocfgTab *tab;
|
|
6613 |
+#endif
|
|
6614 |
+ DillocfgCookie *cookie;
|
|
6615 |
+ DillocfgOther *other;
|
|
6616 |
+ } DillocfgWin;
|
|
6617 |
+
|
|
6618 |
+#ifdef __cplusplus
|
|
6619 |
+}
|
|
6620 |
+#endif /* __cplusplus */
|
|
6621 |
+
|
|
6622 |
+
|
|
6623 |
+#endif /* __DILLOCFG_GTK_H__ */
|
|
6624 |
+
|
|
6625 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
6626 |
diff -pruN dillo-0.8.6/config/dillocfg_option.c dillo-0.8.6-i18n-misc-20070916/config/dillocfg_option.c
|
|
6627 |
--- dillo-0.8.6/config/dillocfg_option.c 1970-01-01 09:00:00.000000000 +0900
|
|
6628 |
+++ dillo-0.8.6-i18n-misc-20070916/config/dillocfg_option.c 2006-05-16 01:21:16.000000000 +0900
|
|
6629 |
@@ -0,0 +1,688 @@
|
|
6630 |
+/*
|
|
6631 |
+ * File: dillocfg-gtk_option.c
|
|
6632 |
+ *
|
|
6633 |
+ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
|
|
6634 |
+ *
|
|
6635 |
+ * This program is free software; you can redistribute it and/or modify
|
|
6636 |
+ * it under the terms of the GNU General Public License as published by
|
|
6637 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
6638 |
+ * (at your option) any later version.
|
|
6639 |
+ */
|
|
6640 |
+
|
|
6641 |
+#include <stdio.h>
|
|
6642 |
+#include <stdlib.h>
|
|
6643 |
+#include <ctype.h>
|
|
6644 |
+#include <string.h>
|
|
6645 |
+#include <gtk/gtk.h>
|
|
6646 |
+
|
|
6647 |
+#include "../config.h"
|
|
6648 |
+#include "../src/intl.h"
|
|
6649 |
+#include "dillocfg_option.h"
|
|
6650 |
+#include "dillocfg_token.h"
|
|
6651 |
+
|
|
6652 |
+/* Private class. */
|
|
6653 |
+typedef struct {
|
|
6654 |
+ OptionBase base;
|
|
6655 |
+ GtkWidget *button;
|
|
6656 |
+ gboolean value;
|
|
6657 |
+ gboolean default_value;
|
|
6658 |
+} CheckOption;
|
|
6659 |
+
|
|
6660 |
+typedef struct {
|
|
6661 |
+ OptionBase base;
|
|
6662 |
+ GtkWidget *hbox;
|
|
6663 |
+ GtkWidget *entry;
|
|
6664 |
+ gchar *value;
|
|
6665 |
+ gchar *default_value;
|
|
6666 |
+ gboolean allow_space;
|
|
6667 |
+} EntryOption;
|
|
6668 |
+
|
|
6669 |
+typedef struct {
|
|
6670 |
+ OptionBase base;
|
|
6671 |
+ GtkWidget *hbox;
|
|
6672 |
+ GtkWidget *combo;
|
|
6673 |
+ gchar *value;
|
|
6674 |
+ gchar *default_value;
|
|
6675 |
+} ComboOption;
|
|
6676 |
+
|
|
6677 |
+typedef ComboOption FontOption;
|
|
6678 |
+
|
|
6679 |
+typedef struct {
|
|
6680 |
+ OptionBase base;
|
|
6681 |
+ GtkWidget *hbox;
|
|
6682 |
+ GtkWidget *option_menu;
|
|
6683 |
+ gchar **items;
|
|
6684 |
+ gint value;
|
|
6685 |
+ gint default_value;
|
|
6686 |
+} SelectOption;
|
|
6687 |
+
|
|
6688 |
+typedef struct {
|
|
6689 |
+ OptionBase base;
|
|
6690 |
+ GtkWidget *hbox;
|
|
6691 |
+ GtkWidget *label;
|
|
6692 |
+ GdkImage *image;
|
|
6693 |
+ GtkWidget *button_image;
|
|
6694 |
+ GtkWidget *dialog;
|
|
6695 |
+ GdkColor *value;
|
|
6696 |
+ GdkColor *default_value;
|
|
6697 |
+} ColorOption;
|
|
6698 |
+
|
|
6699 |
+typedef struct {
|
|
6700 |
+ OptionBase base;
|
|
6701 |
+ GtkWidget *hbox;
|
|
6702 |
+ GtkWidget *button;
|
|
6703 |
+ double value;
|
|
6704 |
+ double default_value;
|
|
6705 |
+ gboolean is_integer;
|
|
6706 |
+} SpinOption;
|
|
6707 |
+
|
|
6708 |
+typedef struct {
|
|
6709 |
+ gint x;
|
|
6710 |
+ gint y;
|
|
6711 |
+} Geometry;
|
|
6712 |
+
|
|
6713 |
+typedef struct {
|
|
6714 |
+ OptionBase base;
|
|
6715 |
+ GtkWidget *hbox;
|
|
6716 |
+ GtkWidget *button;
|
|
6717 |
+ GtkWidget *button2;
|
|
6718 |
+ Geometry value;
|
|
6719 |
+ Geometry default_value;
|
|
6720 |
+} GeometryOption;
|
|
6721 |
+
|
|
6722 |
+CheckOption *CheckOption_new(guint token,
|
|
6723 |
+ GtkWidget *table, gint x, gint y);
|
|
6724 |
+void CheckOption_init(CheckOption *o, gboolean use_default);
|
|
6725 |
+void CheckOption_set(CheckOption *o, gchar *value);
|
|
6726 |
+gchar *CheckOption_get(CheckOption *o);
|
|
6727 |
+void CheckOption_free(CheckOption *o);
|
|
6728 |
+
|
|
6729 |
+EntryOption *EntryOption_new(guint token,
|
|
6730 |
+ GtkWidget *table, gint x, gint y);
|
|
6731 |
+void EntryOption_init(EntryOption *o, gboolean use_default);
|
|
6732 |
+void EntryOption_set(EntryOption *o, gchar *value);
|
|
6733 |
+gchar *EntryOption_get(EntryOption *o);
|
|
6734 |
+void EntryOption_free(EntryOption *o);
|
|
6735 |
+
|
|
6736 |
+ComboOption *ComboOption_new(guint token,
|
|
6737 |
+ GtkWidget *table, gint x, gint y);
|
|
6738 |
+void ComboOption_init(ComboOption *o, gboolean use_default);
|
|
6739 |
+void ComboOption_set(ComboOption *o, gchar *value);
|
|
6740 |
+gchar *ComboOption_get(ComboOption *o);
|
|
6741 |
+void ComboOption_free(ComboOption *o);
|
|
6742 |
+
|
|
6743 |
+FontOption *FontOption_new(guint token,
|
|
6744 |
+ GtkWidget *table, gint x, gint y);
|
|
6745 |
+
|
|
6746 |
+SelectOption *SelectOption_new(guint token,
|
|
6747 |
+ GtkWidget *table, gint x, gint y);
|
|
6748 |
+void SelectOption_init(SelectOption *o, gboolean use_default);
|
|
6749 |
+void SelectOption_set(SelectOption *o, gchar *value);
|
|
6750 |
+gchar *SelectOption_get(SelectOption *o);
|
|
6751 |
+void SelectOption_free(SelectOption *o);
|
|
6752 |
+
|
|
6753 |
+ColorOption *ColorOption_new(guint token,
|
|
6754 |
+ GtkWidget *table, gint x, gint y);
|
|
6755 |
+void ColorOption_init(ColorOption *o, gboolean use_default);
|
|
6756 |
+void ColorOption_set(ColorOption *o, gchar *value);
|
|
6757 |
+gchar *ColorOption_get(ColorOption *o);
|
|
6758 |
+void ColorOption_free(ColorOption *o);
|
|
6759 |
+
|
|
6760 |
+SpinOption *SpinOption_new(guint token,
|
|
6761 |
+ GtkWidget *table, gint x, gint y);
|
|
6762 |
+void SpinOption_init(SpinOption *o, gboolean use_default);
|
|
6763 |
+void SpinOption_set(SpinOption *o, gchar *value);
|
|
6764 |
+gchar *SpinOption_get(SpinOption *o);
|
|
6765 |
+void SpinOption_free(SpinOption *o);
|
|
6766 |
+
|
|
6767 |
+GeometryOption *GeometryOption_new(guint token,
|
|
6768 |
+ GtkWidget *table, gint x, gint y);
|
|
6769 |
+void GeometryOption_init(GeometryOption *o, gboolean use_default);
|
|
6770 |
+void GeometryOption_set(GeometryOption *o, gchar *value);
|
|
6771 |
+gchar *GeometryOption_get(GeometryOption *o);
|
|
6772 |
+void GeometryOption_free(SpinOption *o);
|
|
6773 |
+
|
|
6774 |
+
|
|
6775 |
+Option *Option_new(guint token, GList **list,
|
|
6776 |
+ GtkWidget *table, gint x, gint y) {
|
|
6777 |
+ guint type = get_token_type(token);
|
|
6778 |
+ Option *o;
|
|
6779 |
+ switch (type) {
|
|
6780 |
+ case CHECK_OPTION:
|
|
6781 |
+ o = (Option *)CheckOption_new(token, table, x, y);
|
|
6782 |
+ break;
|
|
6783 |
+ case ENTRY_OPTION:
|
|
6784 |
+ o = (Option *)EntryOption_new(token, table, x, y);
|
|
6785 |
+ break;
|
|
6786 |
+ case COMBO_OPTION:
|
|
6787 |
+ o = (Option *)ComboOption_new(token, table, x, y);
|
|
6788 |
+ break;
|
|
6789 |
+ case FONT_OPTION:
|
|
6790 |
+ o = (Option *)FontOption_new(token, table, x, y);
|
|
6791 |
+ break;
|
|
6792 |
+ case SELECT_OPTION:
|
|
6793 |
+ case COOKIE:
|
|
6794 |
+ o = (Option *)SelectOption_new(token, table, x, y);
|
|
6795 |
+ break;
|
|
6796 |
+ case COLOR_OPTION:
|
|
6797 |
+ o = (Option *)ColorOption_new(token, table, x, y);
|
|
6798 |
+ break;
|
|
6799 |
+ case SPIN_OPTION:
|
|
6800 |
+ o = (Option *)SpinOption_new (token, table, x, y);
|
|
6801 |
+ break;
|
|
6802 |
+ case GEOMETRY_OPTION:
|
|
6803 |
+ o = (Option *)GeometryOption_new(token, table, x, y);
|
|
6804 |
+ break;
|
|
6805 |
+ default:
|
|
6806 |
+ o = (Option *)NULL;
|
|
6807 |
+ }
|
|
6808 |
+ set_token_object(token, o);
|
|
6809 |
+ *list = g_list_append(*list, o);
|
|
6810 |
+ return o;
|
|
6811 |
+}
|
|
6812 |
+
|
|
6813 |
+void Option_init(Option *o, gboolean use_default) {
|
|
6814 |
+ return ((o) ? o->base.init(o, use_default) : NULL);
|
|
6815 |
+}
|
|
6816 |
+
|
|
6817 |
+void Option_set(Option *o, gchar *value) {
|
|
6818 |
+ return ((o) ? o->base.set(o, value) : NULL);
|
|
6819 |
+}
|
|
6820 |
+
|
|
6821 |
+gchar *Option_get(Option *o, FILE *fp) {
|
|
6822 |
+ if (!o) return NULL;
|
|
6823 |
+ if (fp && o->base.get(o)) fprintf(fp, "%s\n", o->base.get(o));
|
|
6824 |
+ return ((o) ? o->base.get(o) : NULL);
|
|
6825 |
+}
|
|
6826 |
+
|
|
6827 |
+void Option_free(Option *o, GList **list) {
|
|
6828 |
+ return ((o) ? o->base.free(o) : NULL);
|
|
6829 |
+}
|
|
6830 |
+
|
|
6831 |
+CheckOption *CheckOption_new(guint token, GtkWidget *table, gint x, gint y) {
|
|
6832 |
+ CheckOption *o = g_new(CheckOption, 1);
|
|
6833 |
+
|
|
6834 |
+ o->base.token = token;
|
|
6835 |
+ o->base.init = CheckOption_init;
|
|
6836 |
+ o->base.set = CheckOption_set;
|
|
6837 |
+ o->base.get = CheckOption_get;
|
|
6838 |
+ o->base.free = CheckOption_free;
|
|
6839 |
+ o->button = gtk_check_button_new_with_label(_(get_token_label(token)));
|
|
6840 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
6841 |
+ o->default_value = o->value;
|
|
6842 |
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(o->button), o->value);
|
|
6843 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->button, x, x + 1, y, y + 1);
|
|
6844 |
+ return o;
|
|
6845 |
+}
|
|
6846 |
+
|
|
6847 |
+void CheckOption_init(CheckOption *o, gboolean use_default) {
|
|
6848 |
+ if (use_default) o->value = o->default_value;
|
|
6849 |
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(o->button), o->value);
|
|
6850 |
+}
|
|
6851 |
+
|
|
6852 |
+void CheckOption_set(CheckOption *o, gchar *value) {
|
|
6853 |
+ if (value)
|
|
6854 |
+ o->value = (strcmp(value, "YES") == 0);
|
|
6855 |
+}
|
|
6856 |
+
|
|
6857 |
+gchar *CheckOption_get(CheckOption *o) {
|
|
6858 |
+ return g_strdup_printf("%s=%s", get_token_name(o->base.token),
|
|
6859 |
+ (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(o->button)))
|
|
6860 |
+ ? "YES" : "NO");
|
|
6861 |
+}
|
|
6862 |
+
|
|
6863 |
+void CheckOption_free(CheckOption *o) {
|
|
6864 |
+ g_free(o);
|
|
6865 |
+}
|
|
6866 |
+
|
|
6867 |
+EntryOption *EntryOption_new(guint token,
|
|
6868 |
+ GtkWidget *table, gint x, gint y) {
|
|
6869 |
+ EntryOption *o = g_new(EntryOption, 1);
|
|
6870 |
+ GtkWidget *label = gtk_label_new(_(get_token_label(token)));
|
|
6871 |
+
|
|
6872 |
+ o->base.token = token;
|
|
6873 |
+ o->base.init = EntryOption_init;
|
|
6874 |
+ o->base.set = EntryOption_set;
|
|
6875 |
+ o->base.get = EntryOption_get;
|
|
6876 |
+ o->base.free = EntryOption_free;
|
|
6877 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
6878 |
+ o->entry = gtk_entry_new();
|
|
6879 |
+ o->value = NULL;
|
|
6880 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
6881 |
+ o->default_value = g_strdup(o->value);
|
|
6882 |
+ o->allow_space = (gboolean)get_token_option(token);
|
|
6883 |
+ //gtk_box_set_homogeneous(GTK_BOX(o->hbox), TRUE);
|
|
6884 |
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
|
|
6885 |
+ if (o->value) gtk_entry_set_text(GTK_ENTRY(o->entry), o->value);
|
|
6886 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), label, FALSE, FALSE, 10);
|
|
6887 |
+ gtk_box_pack_end(GTK_BOX(o->hbox), o->entry, TRUE, TRUE, 5);
|
|
6888 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
6889 |
+ return o;
|
|
6890 |
+}
|
|
6891 |
+
|
|
6892 |
+void EntryOption_init(EntryOption *o, gboolean use_default) {
|
|
6893 |
+ if (use_default) {
|
|
6894 |
+ g_free(o->value);
|
|
6895 |
+ o->value = g_strdup(o->default_value);
|
|
6896 |
+ }
|
|
6897 |
+ if (o->value) gtk_entry_set_text(GTK_ENTRY(o->entry), o->value);
|
|
6898 |
+}
|
|
6899 |
+
|
|
6900 |
+void EntryOption_set(EntryOption *o, gchar *value) {
|
|
6901 |
+ g_free(o->value);
|
|
6902 |
+ o->value = g_strdup(value);
|
|
6903 |
+}
|
|
6904 |
+
|
|
6905 |
+gchar *EntryOption_get(EntryOption *o) {
|
|
6906 |
+ gchar *format;
|
|
6907 |
+ gchar *value = gtk_entry_get_text(GTK_ENTRY(o->entry));
|
|
6908 |
+
|
|
6909 |
+ if (!value) return NULL;
|
|
6910 |
+ if (strcmp(value, "") == 0) return NULL;
|
|
6911 |
+ if (o->allow_space) format = "%s=\"%s\"";
|
|
6912 |
+ else format = "%s=%s";
|
|
6913 |
+ return g_strdup_printf(format, get_token_name(o->base.token),
|
|
6914 |
+ value);
|
|
6915 |
+}
|
|
6916 |
+
|
|
6917 |
+void EntryOption_free(EntryOption *o) {
|
|
6918 |
+ g_free(o);
|
|
6919 |
+}
|
|
6920 |
+
|
|
6921 |
+ComboOption *ComboOption_new(guint token, GtkWidget *table, gint x, gint y) {
|
|
6922 |
+ ComboOption *o = g_new(ComboOption, 1);
|
|
6923 |
+ GList *list = NULL;
|
|
6924 |
+ gchar **items = NULL;
|
|
6925 |
+ gint i;
|
|
6926 |
+
|
|
6927 |
+ o->base.token = token;
|
|
6928 |
+ o->base.init = ComboOption_init;
|
|
6929 |
+ o->base.set = ComboOption_set;
|
|
6930 |
+ o->base.get = ComboOption_get;
|
|
6931 |
+ o->base.free = ComboOption_free;
|
|
6932 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
6933 |
+ o->combo = gtk_combo_new();
|
|
6934 |
+ items = (gchar **)get_token_option(token);
|
|
6935 |
+ for (i = 0; items[i]; i++)
|
|
6936 |
+ list = g_list_append(list, items[i]);
|
|
6937 |
+ o->value = NULL;
|
|
6938 |
+ gtk_combo_set_popdown_strings(GTK_COMBO(o->combo), list);
|
|
6939 |
+ g_free(list);
|
|
6940 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
6941 |
+ o->default_value = g_strdup(o->value);
|
|
6942 |
+ if (o->value) gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (o->combo)->entry), o->value);
|
|
6943 |
+ gtk_box_pack_start(GTK_BOX(o->hbox),
|
|
6944 |
+ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 5);
|
|
6945 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->combo, TRUE, TRUE, 5);
|
|
6946 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
6947 |
+ return o;
|
|
6948 |
+}
|
|
6949 |
+
|
|
6950 |
+void ComboOption_init(ComboOption *o, gboolean use_default) {
|
|
6951 |
+ if (use_default) {
|
|
6952 |
+ g_free(o->value);
|
|
6953 |
+ o->value = g_strdup(o->default_value);
|
|
6954 |
+ }
|
|
6955 |
+ if (o->value) gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (o->combo)->entry), o->value);
|
|
6956 |
+}
|
|
6957 |
+
|
|
6958 |
+void ComboOption_set(ComboOption *o, gchar *value) {
|
|
6959 |
+ g_free(o->value);
|
|
6960 |
+ o->value = g_strdup(value);
|
|
6961 |
+}
|
|
6962 |
+
|
|
6963 |
+gchar *ComboOption_get(ComboOption *o) {
|
|
6964 |
+ gchar *value = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO (o->combo)->entry));
|
|
6965 |
+
|
|
6966 |
+ if (!value) return NULL;
|
|
6967 |
+ if (strcmp(value, "") == 0) return NULL;
|
|
6968 |
+ return g_strdup_printf("%s=\"%s\"", get_token_name(o->base.token),
|
|
6969 |
+ value);
|
|
6970 |
+}
|
|
6971 |
+
|
|
6972 |
+void ComboOption_free(ComboOption *o) {
|
|
6973 |
+ g_free(o);
|
|
6974 |
+}
|
|
6975 |
+
|
|
6976 |
+/* FontOption class extends ComboOption. */
|
|
6977 |
+FontOption *FontOption_new(guint token, GtkWidget *table, gint x, gint y) {
|
|
6978 |
+ FontOption *o = g_new(FontOption, 1);
|
|
6979 |
+ GList *list = NULL;
|
|
6980 |
+#define MAX_FONT_NAME 1024
|
|
6981 |
+ gchar buf[MAX_FONT_NAME]; //max font name
|
|
6982 |
+ FILE *fp;
|
|
6983 |
+
|
|
6984 |
+ o->base.token = token;
|
|
6985 |
+ o->base.init = ComboOption_init;
|
|
6986 |
+ o->base.set = ComboOption_set;
|
|
6987 |
+ o->base.get = ComboOption_get;
|
|
6988 |
+ o->base.free = ComboOption_free;
|
|
6989 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
6990 |
+ o->combo = gtk_combo_new();
|
|
6991 |
+#ifdef DISABLE_ANTI_ALIAS
|
|
6992 |
+ fp = popen("xlsfonts -fn \"-*-*\"|cut -d \"-\" -f 2-3|sort|uniq", "r");
|
|
6993 |
+ list = g_list_append(list, "*-*");
|
|
6994 |
+ list = g_list_append(list, "*-gothic");
|
|
6995 |
+#else
|
|
6996 |
+ fp = popen("fc-list|sed \"s/[:|,]/\\n#/g\"|grep -v \"^#\"|sort|uniq", "r");
|
|
6997 |
+ list = g_list_append(list, "serif");
|
|
6998 |
+ list = g_list_append(list, "sans-serif");
|
|
6999 |
+ list = g_list_append(list, "monospace");
|
|
7000 |
+#endif
|
|
7001 |
+ while(fgets(buf, MAX_FONT_NAME, fp)) {
|
|
7002 |
+ g_strchomp(buf);
|
|
7003 |
+ list = g_list_append(list, g_strdup(buf));
|
|
7004 |
+ }
|
|
7005 |
+ pclose(fp);
|
|
7006 |
+ o->value = NULL;
|
|
7007 |
+ if (list) gtk_combo_set_popdown_strings(GTK_COMBO(o->combo), list);
|
|
7008 |
+ g_list_free(list);
|
|
7009 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
7010 |
+ o->default_value = g_strdup(o->value);
|
|
7011 |
+ if (o->value) gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (o->combo)->entry), o->value);
|
|
7012 |
+ gtk_box_pack_start(GTK_BOX(o->hbox),
|
|
7013 |
+ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 5);
|
|
7014 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->combo, TRUE, TRUE, 5);
|
|
7015 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
7016 |
+ return o;
|
|
7017 |
+}
|
|
7018 |
+
|
|
7019 |
+SelectOption *SelectOption_new(guint token, GtkWidget *table, gint x, gint y) {
|
|
7020 |
+ SelectOption *o = g_new(SelectOption, 1);
|
|
7021 |
+ GtkWidget *menu = gtk_menu_new ();
|
|
7022 |
+ gint i;
|
|
7023 |
+
|
|
7024 |
+ o->base.token = token;
|
|
7025 |
+ o->base.init = SelectOption_init;
|
|
7026 |
+ o->base.set = SelectOption_set;
|
|
7027 |
+ o->base.get = SelectOption_get;
|
|
7028 |
+ o->base.free = SelectOption_free;
|
|
7029 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
7030 |
+ o->option_menu = gtk_option_menu_new();
|
|
7031 |
+ o->items = (gchar **)get_token_option(token);
|
|
7032 |
+ for (i = 0; o->items[i]; i++)
|
|
7033 |
+ gtk_menu_append(GTK_MENU(menu),
|
|
7034 |
+ gtk_menu_item_new_with_label(o->items[i]));
|
|
7035 |
+ gtk_option_menu_set_menu (GTK_OPTION_MENU(o->option_menu), menu);
|
|
7036 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
7037 |
+ o->default_value = o->value;
|
|
7038 |
+ gtk_option_menu_set_history(GTK_OPTION_MENU(o->option_menu), o->value);
|
|
7039 |
+ gtk_box_pack_start(GTK_BOX(o->hbox),
|
|
7040 |
+ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 5);
|
|
7041 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->option_menu, TRUE, TRUE, 5);
|
|
7042 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
7043 |
+ return o;
|
|
7044 |
+}
|
|
7045 |
+
|
|
7046 |
+void SelectOption_init(SelectOption *o, gboolean use_default) {
|
|
7047 |
+ if (use_default) o->value = o->default_value;
|
|
7048 |
+ gtk_option_menu_set_history (GTK_OPTION_MENU(o->option_menu), o->value);
|
|
7049 |
+}
|
|
7050 |
+
|
|
7051 |
+void SelectOption_set(SelectOption *o, gchar *value) {
|
|
7052 |
+ gint i;
|
|
7053 |
+ for (i = 0; o->items[i]; i++)
|
|
7054 |
+ if (!g_strcasecmp(value, o->items[i]))
|
|
7055 |
+ o->value = i;
|
|
7056 |
+}
|
|
7057 |
+
|
|
7058 |
+gchar *SelectOption_get(SelectOption *o) {
|
|
7059 |
+ GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(o->option_menu));
|
|
7060 |
+ /* always null...
|
|
7061 |
+ gchar *str = NULL;
|
|
7062 |
+ GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));
|
|
7063 |
+ GtkWidget *label = GTK_BIN(GTK_MENU_ITEM(item))->child;
|
|
7064 |
+ if(!label) str = g_strdup("");
|
|
7065 |
+ else gtk_label_get(GTK_LABEL(label), &str);
|
|
7066 |
+ */
|
|
7067 |
+ gint i = g_list_index(GTK_MENU_SHELL(menu)->children,
|
|
7068 |
+ GTK_OPTION_MENU(o->option_menu)->menu_item);
|
|
7069 |
+ gchar *format = (get_token_type(o->base.token) == COOKIE) ? "%s %s" : "%s=\"%s\"";
|
|
7070 |
+ return g_strdup_printf(format, get_token_name(o->base.token), o->items[i]);
|
|
7071 |
+}
|
|
7072 |
+
|
|
7073 |
+void SelectOption_free(SelectOption *o) {
|
|
7074 |
+ g_free(o);
|
|
7075 |
+}
|
|
7076 |
+
|
|
7077 |
+void change_color_GdkColor(const double *color, GdkColor* o) {
|
|
7078 |
+ o->red = color[0] * 65535;
|
|
7079 |
+ o->green = color[1] * 65535;
|
|
7080 |
+ o->blue = color[2] * 65535;
|
|
7081 |
+}
|
|
7082 |
+
|
|
7083 |
+void change_color_double(const GdkColor* o, double *color) {
|
|
7084 |
+ color[0] = o->red / (double)65535;
|
|
7085 |
+ color[1] = o->green / (double)65535;
|
|
7086 |
+ color[2] = o->blue / (double)65535;
|
|
7087 |
+}
|
|
7088 |
+
|
|
7089 |
+void ColorDialog_ok(GtkButton *button, gpointer user_data) {
|
|
7090 |
+ ColorOption *o = (ColorOption *)user_data;
|
|
7091 |
+ double color[4];
|
|
7092 |
+ gtk_color_selection_get_color(
|
|
7093 |
+ GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(o->dialog)->colorsel),
|
|
7094 |
+ color);
|
|
7095 |
+ change_color_GdkColor(color, o->value);
|
|
7096 |
+ ColorOption_init(o, FALSE);
|
|
7097 |
+ gtk_widget_destroy(o->dialog);
|
|
7098 |
+}
|
|
7099 |
+
|
|
7100 |
+void ColorDialog_cancel(GtkButton *button, gpointer user_data) {
|
|
7101 |
+ ColorOption *o = (ColorOption *)user_data;
|
|
7102 |
+ gtk_widget_destroy(o->dialog);
|
|
7103 |
+}
|
|
7104 |
+
|
|
7105 |
+void ColorOption_clicked(GtkButton *button, gpointer user_data) {
|
|
7106 |
+ ColorOption *o = (ColorOption *)user_data;
|
|
7107 |
+ gchar *title;
|
|
7108 |
+ double color[4];
|
|
7109 |
+ gtk_label_get(GTK_LABEL(o->label), &title);
|
|
7110 |
+ change_color_double(o->value, color);
|
|
7111 |
+ o->dialog = gtk_color_selection_dialog_new(title);
|
|
7112 |
+ gtk_color_selection_set_color(
|
|
7113 |
+ GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(o->dialog)->colorsel),
|
|
7114 |
+ color);
|
|
7115 |
+ gtk_signal_connect(
|
|
7116 |
+ GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(o->dialog)->ok_button),
|
|
7117 |
+ "clicked", GTK_SIGNAL_FUNC(ColorDialog_ok), o);
|
|
7118 |
+ gtk_signal_connect(
|
|
7119 |
+ GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(o->dialog)->cancel_button),
|
|
7120 |
+ "clicked", GTK_SIGNAL_FUNC(ColorDialog_cancel), o);
|
|
7121 |
+ gtk_widget_hide(GTK_COLOR_SELECTION_DIALOG(o->dialog)->help_button);
|
|
7122 |
+ gtk_widget_show(o->dialog);
|
|
7123 |
+}
|
|
7124 |
+
|
|
7125 |
+#define PREVIEW_SIZE 48
|
|
7126 |
+ColorOption *ColorOption_new(guint token,
|
|
7127 |
+ GtkWidget *table, gint x, gint y) {
|
|
7128 |
+ ColorOption *o = g_new(ColorOption, 1);
|
|
7129 |
+ GtkWidget *button = gtk_button_new();
|
|
7130 |
+
|
|
7131 |
+ o->base.token = token;
|
|
7132 |
+ o->base.init = ColorOption_init;
|
|
7133 |
+ o->base.set = ColorOption_set;
|
|
7134 |
+ o->base.get = ColorOption_get;
|
|
7135 |
+ o->base.free = ColorOption_free;
|
|
7136 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
7137 |
+ o->label = gtk_label_new(_(get_token_label(token)));
|
|
7138 |
+ o->image = gdk_image_new(GDK_IMAGE_NORMAL,
|
|
7139 |
+ gdk_visual_get_system(), PREVIEW_SIZE, PREVIEW_SIZE);
|
|
7140 |
+ o->button_image = gtk_image_new(o->image, NULL);
|
|
7141 |
+ o->value = g_new(GdkColor, 1);
|
|
7142 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
7143 |
+ o->default_value = g_new(GdkColor, 1);
|
|
7144 |
+ o->default_value = gdk_color_copy(o->value);
|
|
7145 |
+ gtk_signal_connect(GTK_OBJECT(button), "clicked",
|
|
7146 |
+ GTK_SIGNAL_FUNC(ColorOption_clicked), o);
|
|
7147 |
+ gtk_container_add(GTK_CONTAINER(button), o->button_image);
|
|
7148 |
+ //gtk_box_set_homogeneous(GTK_BOX(o->hbox), TRUE);
|
|
7149 |
+ gtk_label_set_justify (GTK_LABEL(o->label), GTK_JUSTIFY_LEFT);
|
|
7150 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), button, FALSE, FALSE, 10);
|
|
7151 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->label, FALSE, FALSE, 10);
|
|
7152 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
7153 |
+ return o;
|
|
7154 |
+}
|
|
7155 |
+
|
|
7156 |
+guint32 change_color(GdkColor *o) {
|
|
7157 |
+ gdk_colormap_alloc_color(gdk_colormap_get_system(),
|
|
7158 |
+ o, TRUE, TRUE);
|
|
7159 |
+ return o->pixel;
|
|
7160 |
+}
|
|
7161 |
+
|
|
7162 |
+void ColorOption_init(ColorOption *o, gboolean use_default) {
|
|
7163 |
+ int i, j;
|
|
7164 |
+ if (use_default) o->value = gdk_color_copy(o->default_value);
|
|
7165 |
+ for (i = 0; i < PREVIEW_SIZE; i++)
|
|
7166 |
+ for (j = 0; j < PREVIEW_SIZE; j++)
|
|
7167 |
+ gdk_image_put_pixel(o->image, i, j, change_color(o->value));
|
|
7168 |
+ gtk_image_set(GTK_IMAGE(o->button_image), o->image, NULL);
|
|
7169 |
+}
|
|
7170 |
+
|
|
7171 |
+void ColorOption_set(ColorOption *o, gchar *value) {
|
|
7172 |
+ guint32 i;
|
|
7173 |
+ if (strlen(value) != 8) return;
|
|
7174 |
+ if (value[0] != '0' || value[1] != 'x') return;
|
|
7175 |
+ sscanf(value, "0x%x", &i);
|
|
7176 |
+ o->value->red = (i&0x00FF0000) >> 8;
|
|
7177 |
+ o->value->green = (i&0x0000FF00);
|
|
7178 |
+ o->value->blue = (i&0x000000FF) << 8;
|
|
7179 |
+}
|
|
7180 |
+
|
|
7181 |
+gchar *ColorOption_get(ColorOption *o) {
|
|
7182 |
+ return g_strdup_printf("%s=0x%.2x%.2x%.2x",
|
|
7183 |
+ get_token_name(o->base.token),
|
|
7184 |
+ o->value->red >> 8,
|
|
7185 |
+ o->value->green >> 8,
|
|
7186 |
+ o->value->blue >> 8);
|
|
7187 |
+}
|
|
7188 |
+
|
|
7189 |
+void ColorOption_free(ColorOption *o) {
|
|
7190 |
+ gdk_image_destroy (o->image);
|
|
7191 |
+ g_free(o);
|
|
7192 |
+}
|
|
7193 |
+
|
|
7194 |
+SpinOption *SpinOption_new(guint token,
|
|
7195 |
+ GtkWidget *table, gint x, gint y) {
|
|
7196 |
+ SpinOption *o = g_new(SpinOption, 1);
|
|
7197 |
+ OptionAdjustment_t *opt = (OptionAdjustment_t *)get_token_option(token);
|
|
7198 |
+
|
|
7199 |
+ o->base.token = token;
|
|
7200 |
+ o->base.init = SpinOption_init;
|
|
7201 |
+ o->base.set = SpinOption_set;
|
|
7202 |
+ o->base.get = SpinOption_get;
|
|
7203 |
+ o->base.free = SpinOption_free;
|
|
7204 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
7205 |
+ o->button = gtk_spin_button_new(
|
|
7206 |
+ (GtkAdjustment *)gtk_adjustment_new(0,
|
|
7207 |
+ opt->lower,
|
|
7208 |
+ opt->upper,
|
|
7209 |
+ opt->increment,
|
|
7210 |
+ opt->increment,
|
|
7211 |
+ opt->increment),
|
|
7212 |
+ opt->increment, opt->digits);
|
|
7213 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
7214 |
+ o->default_value = o->value;
|
|
7215 |
+ o->is_integer = (opt->digits == 0);
|
|
7216 |
+ gtk_box_pack_start(GTK_BOX(o->hbox),
|
|
7217 |
+ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 10);
|
|
7218 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->button, FALSE, FALSE, 10);
|
|
7219 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
7220 |
+ return o;
|
|
7221 |
+}
|
|
7222 |
+
|
|
7223 |
+void SpinOption_init(SpinOption *o, gboolean use_default) {
|
|
7224 |
+ if (use_default) o->value = o->default_value;
|
|
7225 |
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(o->button), o->value);
|
|
7226 |
+}
|
|
7227 |
+
|
|
7228 |
+void SpinOption_set(SpinOption *o, gchar *value) {
|
|
7229 |
+ if (o->is_integer)
|
|
7230 |
+ o->value = strtol(value, NULL, 0);
|
|
7231 |
+ else
|
|
7232 |
+ o->value = strtod(value, NULL);
|
|
7233 |
+}
|
|
7234 |
+
|
|
7235 |
+ gchar *SpinOption_get(SpinOption *o) {
|
|
7236 |
+ if (o->is_integer)
|
|
7237 |
+ return g_strdup_printf("%s=%d", get_token_name(o->base.token),
|
|
7238 |
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o->button)));
|
|
7239 |
+ else {
|
|
7240 |
+ gchar *float_str = g_strdup_printf("%s=%f",
|
|
7241 |
+ get_token_name(o->base.token),
|
|
7242 |
+ gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(o->button)));
|
|
7243 |
+ if (strchr(float_str, ','))
|
|
7244 |
+ strchr(float_str, ',')[0] = '.';
|
|
7245 |
+ return float_str;
|
|
7246 |
+ }
|
|
7247 |
+ }
|
|
7248 |
+
|
|
7249 |
+void SpinOption_free(SpinOption *o) {
|
|
7250 |
+ g_free(o);
|
|
7251 |
+}
|
|
7252 |
+
|
|
7253 |
+GeometryOption *GeometryOption_new(guint token,
|
|
7254 |
+ GtkWidget *table, gint x, gint y) {
|
|
7255 |
+ GeometryOption *o = g_new(GeometryOption, 1);
|
|
7256 |
+ OptionAdjustment_t *opt = (OptionAdjustment_t *)get_token_option(token);
|
|
7257 |
+
|
|
7258 |
+ o->base.token = token;
|
|
7259 |
+ o->base.init = GeometryOption_init;
|
|
7260 |
+ o->base.set = GeometryOption_set;
|
|
7261 |
+ o->base.get = GeometryOption_get;
|
|
7262 |
+ o->base.free = GeometryOption_free;
|
|
7263 |
+ o->hbox = gtk_hbox_new(FALSE, 0);
|
|
7264 |
+ o->button = gtk_spin_button_new(
|
|
7265 |
+ (GtkAdjustment *)gtk_adjustment_new(0,
|
|
7266 |
+ opt->lower,
|
|
7267 |
+ opt->upper,
|
|
7268 |
+ opt->increment,
|
|
7269 |
+ opt->increment,
|
|
7270 |
+ opt->increment),
|
|
7271 |
+ opt->increment, 0);
|
|
7272 |
+ o->button2 = gtk_spin_button_new(
|
|
7273 |
+ (GtkAdjustment *)gtk_adjustment_new(0,
|
|
7274 |
+ opt->lower,
|
|
7275 |
+ opt->upper,
|
|
7276 |
+ opt->increment,
|
|
7277 |
+ opt->increment,
|
|
7278 |
+ opt->increment),
|
|
7279 |
+ opt->increment, 0);
|
|
7280 |
+ o->base.set(o, (gchar *)get_token_value(token));
|
|
7281 |
+ o->default_value = o->value;
|
|
7282 |
+ gtk_box_pack_start(GTK_BOX(o->hbox),
|
|
7283 |
+ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 10);
|
|
7284 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->button, FALSE, FALSE, 10);
|
|
7285 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), gtk_label_new("X"), FALSE, FALSE, 0);
|
|
7286 |
+ gtk_box_pack_start(GTK_BOX(o->hbox), o->button2, FALSE, FALSE, 10);
|
|
7287 |
+ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
|
|
7288 |
+ return o;
|
|
7289 |
+}
|
|
7290 |
+
|
|
7291 |
+void GeometryOption_init(GeometryOption *o, gboolean use_default) {
|
|
7292 |
+ if(use_default) o->value = o->default_value;
|
|
7293 |
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(o->button), o->value.x);
|
|
7294 |
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(o->button2), o->value.y);
|
|
7295 |
+}
|
|
7296 |
+
|
|
7297 |
+void GeometryOption_set(GeometryOption *o, gchar *value) {
|
|
7298 |
+ gchar *ptr;
|
|
7299 |
+
|
|
7300 |
+ if ((ptr = strchr(value, 'x'))) {
|
|
7301 |
+ o->value.x = atoi(value);
|
|
7302 |
+ o->value.y = atoi(++ptr);
|
|
7303 |
+ }
|
|
7304 |
+}
|
|
7305 |
+
|
|
7306 |
+gchar *GeometryOption_get(GeometryOption *o) {
|
|
7307 |
+ return g_strdup_printf("%s=%dx%d", get_token_name(o->base.token),
|
|
7308 |
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o->button)),
|
|
7309 |
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o->button2)));
|
|
7310 |
+}
|
|
7311 |
+
|
|
7312 |
+void GeometryOption_free(SpinOption *o) {
|
|
7313 |
+ g_free(o);
|
|
7314 |
+}
|
|
7315 |
+
|
|
7316 |
+
|
|
7317 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
7318 |
diff -pruN dillo-0.8.6/config/dillocfg_option.h dillo-0.8.6-i18n-misc-20070916/config/dillocfg_option.h
|
|
7319 |
--- dillo-0.8.6/config/dillocfg_option.h 1970-01-01 09:00:00.000000000 +0900
|
|
7320 |
+++ dillo-0.8.6-i18n-misc-20070916/config/dillocfg_option.h 2006-05-16 01:21:16.000000000 +0900
|
|
7321 |
@@ -0,0 +1,57 @@
|
|
7322 |
+#ifndef __DILLOCFG_GTK_OPTION_H__
|
|
7323 |
+#define __DILLOCFG_GTK_OPTION_H__
|
|
7324 |
+
|
|
7325 |
+#include <stdio.h>
|
|
7326 |
+#include <gtk/gtk.h>
|
|
7327 |
+
|
|
7328 |
+#include "../config.h"
|
|
7329 |
+
|
|
7330 |
+#ifdef __cplusplus
|
|
7331 |
+extern "C" {
|
|
7332 |
+#endif /* __cplusplus */
|
|
7333 |
+
|
|
7334 |
+ typedef enum {
|
|
7335 |
+ CHECK_OPTION = 0,
|
|
7336 |
+ ENTRY_OPTION,
|
|
7337 |
+ COMBO_OPTION,
|
|
7338 |
+ FONT_OPTION,
|
|
7339 |
+ SELECT_OPTION,
|
|
7340 |
+ COLOR_OPTION,
|
|
7341 |
+ SPIN_OPTION,
|
|
7342 |
+ GEOMETRY_OPTION,
|
|
7343 |
+ COOKIE
|
|
7344 |
+ } OptionType;
|
|
7345 |
+
|
|
7346 |
+ typedef struct {
|
|
7347 |
+ guint token;
|
|
7348 |
+ void (*init)();
|
|
7349 |
+ void (*set)();
|
|
7350 |
+ gchar *(*get)();
|
|
7351 |
+ void (*free)();
|
|
7352 |
+ } OptionBase;
|
|
7353 |
+
|
|
7354 |
+ typedef struct {
|
|
7355 |
+ OptionBase base;
|
|
7356 |
+ } Option;
|
|
7357 |
+
|
|
7358 |
+ typedef struct {
|
|
7359 |
+ gfloat lower;
|
|
7360 |
+ gfloat upper;
|
|
7361 |
+ gfloat increment;
|
|
7362 |
+ guint digits;
|
|
7363 |
+ } OptionAdjustment_t;
|
|
7364 |
+
|
|
7365 |
+ Option *Option_new(guint token, GList **list, GtkWidget *table, gint x, gint y);
|
|
7366 |
+ void Option_init(Option *o, gboolean use_default);
|
|
7367 |
+ void Option_set(Option *o, gchar *value);
|
|
7368 |
+ gchar *Option_get(Option *o, FILE *fp);
|
|
7369 |
+ void Option_free(Option *o, GList **list);
|
|
7370 |
+
|
|
7371 |
+#ifdef __cplusplus
|
|
7372 |
+}
|
|
7373 |
+#endif /* __cplusplus */
|
|
7374 |
+
|
|
7375 |
+
|
|
7376 |
+#endif /* __DILLOCFG_GTK_OPTION_H__ */
|
|
7377 |
+
|
|
7378 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
7379 |
diff -pruN dillo-0.8.6/config/dillocfg_token.c dillo-0.8.6-i18n-misc-20070916/config/dillocfg_token.c
|
|
7380 |
--- dillo-0.8.6/config/dillocfg_token.c 1970-01-01 09:00:00.000000000 +0900
|
|
7381 |
+++ dillo-0.8.6-i18n-misc-20070916/config/dillocfg_token.c 2006-05-16 01:21:16.000000000 +0900
|
|
7382 |
@@ -0,0 +1,635 @@
|
|
7383 |
+/*
|
|
7384 |
+ * File: dillocfg-gtk_token.c
|
|
7385 |
+ *
|
|
7386 |
+ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
|
|
7387 |
+ *
|
|
7388 |
+ * This program is free software; you can redistribute it and/or modify
|
|
7389 |
+ * it under the terms of the GNU General Public License as published by
|
|
7390 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
7391 |
+ * (at your option) any later version.
|
|
7392 |
+ */
|
|
7393 |
+
|
|
7394 |
+#include <string.h>
|
|
7395 |
+#include <gtk/gtk.h>
|
|
7396 |
+
|
|
7397 |
+#include "../config.h"
|
|
7398 |
+#include "../src/intl.h"
|
|
7399 |
+#include "dillocfg_token.h"
|
|
7400 |
+#include "dillocfg_option.h"
|
|
7401 |
+
|
|
7402 |
+static const OptionAdjustment_t font_factor_option = {0.1, 20, 0.1, 1};
|
|
7403 |
+static const OptionAdjustment_t geometry_option = {1, 65535, 1, 0};
|
|
7404 |
+static const gchar *panel_sizes[] = {"tiny", "small", "medium", "large", NULL};
|
|
7405 |
+static const gchar *user_agents[] = {
|
|
7406 |
+ "Dillo/%v",
|
|
7407 |
+ "Mozilla/3.0 (compatible;) Dillo/%v",
|
|
7408 |
+ "Mozilla/4.0 (compatible; MSIE 4.0;) Dillo/%v",
|
|
7409 |
+ "Mozilla/4.0 (Macintosh; U; PPC Mac OS X; ja-jp) Dillo/%v",
|
|
7410 |
+ "DoCoMo/1.0/x505i (Dillo/%v)",
|
|
7411 |
+ "J-PHONE/4.2/J-x53 (Dillo/%v)",
|
|
7412 |
+ "KDDI-x24 UP.Browser/6.0.x.x (GUI) MMP/1.1 (Dillo/%v)",
|
|
7413 |
+ NULL
|
|
7414 |
+};
|
|
7415 |
+static const gchar *cookie_rules[] = {
|
|
7416 |
+ "ACCEPT_SESSION",
|
|
7417 |
+ "DENY",
|
|
7418 |
+ "ACCEPT",
|
|
7419 |
+ NULL
|
|
7420 |
+};
|
|
7421 |
+
|
|
7422 |
+/* symbol array */
|
|
7423 |
+static struct {
|
|
7424 |
+ const gchar *name;
|
|
7425 |
+ const gchar *label;
|
|
7426 |
+ const guint token;
|
|
7427 |
+ const guint type;
|
|
7428 |
+ const gchar *value;
|
|
7429 |
+ const gpointer option;
|
|
7430 |
+ Option *object;
|
|
7431 |
+
|
|
7432 |
+} symbols[] = {
|
|
7433 |
+ { "null",
|
|
7434 |
+ "null",
|
|
7435 |
+ 0,
|
|
7436 |
+ -1,
|
|
7437 |
+ NULL,
|
|
7438 |
+ (const gpointer)NULL,
|
|
7439 |
+ NULL
|
|
7440 |
+ },
|
|
7441 |
+ { "geometry",
|
|
7442 |
+ N_("Window Size"),
|
|
7443 |
+ TOKEN_GEOMETRY,
|
|
7444 |
+ GEOMETRY_OPTION,
|
|
7445 |
+ "640x550",
|
|
7446 |
+ (const gpointer)&geometry_option,
|
|
7447 |
+ NULL
|
|
7448 |
+ },
|
|
7449 |
+ { "http_proxy",
|
|
7450 |
+ N_("HTTP Proxy"),
|
|
7451 |
+ TOKEN_PROXY,
|
|
7452 |
+ ENTRY_OPTION,
|
|
7453 |
+ "",
|
|
7454 |
+ (const gpointer)TRUE,
|
|
7455 |
+ NULL
|
|
7456 |
+ },
|
|
7457 |
+ { "http_proxyuser",
|
|
7458 |
+ N_("HTTP Proxy User"),
|
|
7459 |
+ TOKEN_PROXYUSER,
|
|
7460 |
+ ENTRY_OPTION,
|
|
7461 |
+ "",
|
|
7462 |
+ (const gpointer)FALSE,
|
|
7463 |
+ NULL
|
|
7464 |
+ },
|
|
7465 |
+ { "no_proxy",
|
|
7466 |
+ N_("NO Proxy"),
|
|
7467 |
+ TOKEN_NOPROXY,
|
|
7468 |
+ ENTRY_OPTION,
|
|
7469 |
+ "",
|
|
7470 |
+ (const gpointer)TRUE,
|
|
7471 |
+ NULL
|
|
7472 |
+ },
|
|
7473 |
+ { "user_agent",
|
|
7474 |
+ N_("User-Agent"),
|
|
7475 |
+ TOKEN_USER_AGENT,
|
|
7476 |
+ SELECT_OPTION,
|
|
7477 |
+ "Dillo/%v",
|
|
7478 |
+ (const gpointer)&user_agents,
|
|
7479 |
+ NULL
|
|
7480 |
+ },
|
|
7481 |
+ { "send_referer",
|
|
7482 |
+ N_("Send referer header"),
|
|
7483 |
+ TOKEN_SEND_REFERER,
|
|
7484 |
+ CHECK_OPTION,
|
|
7485 |
+ "YES",
|
|
7486 |
+ NULL,
|
|
7487 |
+ NULL
|
|
7488 |
+ },
|
|
7489 |
+ { "link_color",
|
|
7490 |
+ N_("Link color"),
|
|
7491 |
+ TOKEN_LINK_COLOR,
|
|
7492 |
+ COLOR_OPTION,
|
|
7493 |
+ "0x0000ff",
|
|
7494 |
+ NULL,
|
|
7495 |
+ NULL
|
|
7496 |
+ },
|
|
7497 |
+ { "visited_color",
|
|
7498 |
+ N_("Visited color"),
|
|
7499 |
+ TOKEN_VISITED_COLOR,
|
|
7500 |
+ COLOR_OPTION,
|
|
7501 |
+ "0xa020f0",
|
|
7502 |
+ NULL,
|
|
7503 |
+ NULL
|
|
7504 |
+ },
|
|
7505 |
+ { "bg_color",
|
|
7506 |
+ N_("BackGround color"),
|
|
7507 |
+ TOKEN_BG_COLOR,
|
|
7508 |
+ COLOR_OPTION,
|
|
7509 |
+ "0xffffff",
|
|
7510 |
+ NULL,
|
|
7511 |
+ NULL
|
|
7512 |
+ },
|
|
7513 |
+ { "allow_white_bg",
|
|
7514 |
+ N_("Allow white bg"),
|
|
7515 |
+ TOKEN_ALLOW_WHITE_BG,
|
|
7516 |
+ CHECK_OPTION,
|
|
7517 |
+ "NO",
|
|
7518 |
+ NULL,
|
|
7519 |
+ NULL
|
|
7520 |
+ },
|
|
7521 |
+ { "force_my_colors",
|
|
7522 |
+ N_("Force my colors"),
|
|
7523 |
+ TOKEN_FORCE_MY_COLORS,
|
|
7524 |
+ CHECK_OPTION,
|
|
7525 |
+ "NO",
|
|
7526 |
+ NULL,
|
|
7527 |
+ NULL
|
|
7528 |
+ },
|
|
7529 |
+ { "contrast_visited_color",
|
|
7530 |
+ N_("Contrast visited color"),
|
|
7531 |
+ TOKEN_CONTRAST_VISITED_COLOR,
|
|
7532 |
+ CHECK_OPTION,
|
|
7533 |
+ "NO",
|
|
7534 |
+ NULL,
|
|
7535 |
+ NULL
|
|
7536 |
+ },
|
|
7537 |
+ { "text_color",
|
|
7538 |
+ N_("Text color"),
|
|
7539 |
+ TOKEN_TEXT_COLOR,
|
|
7540 |
+ COLOR_OPTION,
|
|
7541 |
+ "0x000000",
|
|
7542 |
+ NULL,
|
|
7543 |
+ NULL
|
|
7544 |
+ },
|
|
7545 |
+ { "use_oblique",
|
|
7546 |
+ N_("Use oblique"),
|
|
7547 |
+ TOKEN_USE_OBLIQUE,
|
|
7548 |
+ CHECK_OPTION,
|
|
7549 |
+ "NO",
|
|
7550 |
+ NULL,
|
|
7551 |
+ NULL
|
|
7552 |
+ },
|
|
7553 |
+ { "start_page",
|
|
7554 |
+ N_("Start Page"),
|
|
7555 |
+ TOKEN_START_PAGE,
|
|
7556 |
+ ENTRY_OPTION,
|
|
7557 |
+ "about:splash",
|
|
7558 |
+ (const gpointer)TRUE,
|
|
7559 |
+ NULL
|
|
7560 |
+ },
|
|
7561 |
+ { "home",
|
|
7562 |
+ N_("HOMEPAGE"),
|
|
7563 |
+ TOKEN_HOME,
|
|
7564 |
+ ENTRY_OPTION,
|
|
7565 |
+ "http://www.google.com/",
|
|
7566 |
+ (const gpointer)TRUE,
|
|
7567 |
+ NULL
|
|
7568 |
+ },
|
|
7569 |
+ { "search_url",
|
|
7570 |
+ N_("Search-engine's URL"),
|
|
7571 |
+ TOKEN_SEARCH_URL,
|
|
7572 |
+ ENTRY_OPTION,
|
|
7573 |
+ "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s",
|
|
7574 |
+ (const gpointer)TRUE,
|
|
7575 |
+ NULL
|
|
7576 |
+ },
|
|
7577 |
+ { "search_charset",
|
|
7578 |
+ N_("Search-engine's charset"),
|
|
7579 |
+ TOKEN_SEARCH_CHARSET,
|
|
7580 |
+ ENTRY_OPTION,
|
|
7581 |
+ "UTF-8",
|
|
7582 |
+ (const gpointer)FALSE,
|
|
7583 |
+ NULL
|
|
7584 |
+ },
|
|
7585 |
+ { "show_tooltip",
|
|
7586 |
+ N_("Show Tooltip"),
|
|
7587 |
+ TOKEN_SHOW_TOOLTIP,
|
|
7588 |
+ CHECK_OPTION,
|
|
7589 |
+ "YES",
|
|
7590 |
+ NULL,
|
|
7591 |
+ NULL
|
|
7592 |
+ },
|
|
7593 |
+ { "panel_size",
|
|
7594 |
+ N_("Panel Size"),
|
|
7595 |
+ TOKEN_PANEL_SIZE,
|
|
7596 |
+ SELECT_OPTION,
|
|
7597 |
+ "tiny",
|
|
7598 |
+ (const gpointer)&panel_sizes,
|
|
7599 |
+ NULL
|
|
7600 |
+ },
|
|
7601 |
+ { "small_icons",
|
|
7602 |
+ N_("Small icons"),
|
|
7603 |
+ TOKEN_SMALL_ICONS,
|
|
7604 |
+ CHECK_OPTION,
|
|
7605 |
+ "YES",
|
|
7606 |
+ NULL,
|
|
7607 |
+ NULL
|
|
7608 |
+ },
|
|
7609 |
+ { "limit_text_width",
|
|
7610 |
+ N_("Limit text width"),
|
|
7611 |
+ TOKEN_LIMIT_TEXT_WIDTH,
|
|
7612 |
+ CHECK_OPTION,
|
|
7613 |
+ "NO",
|
|
7614 |
+ NULL,
|
|
7615 |
+ NULL
|
|
7616 |
+ },
|
|
7617 |
+ { "limit_font_decoration",
|
|
7618 |
+ N_("Limit font decoration"),
|
|
7619 |
+ TOKEN_LIMIT_FONT_DECORATION,
|
|
7620 |
+ CHECK_OPTION,
|
|
7621 |
+ "NO",
|
|
7622 |
+ NULL,
|
|
7623 |
+ NULL
|
|
7624 |
+ },
|
|
7625 |
+ { "font_factor",
|
|
7626 |
+ N_("Font factor"),
|
|
7627 |
+ TOKEN_FONT_FACTOR,
|
|
7628 |
+ SPIN_OPTION,
|
|
7629 |
+ "1.0",
|
|
7630 |
+ (const gpointer)&font_factor_option,
|
|
7631 |
+ NULL
|
|
7632 |
+ },
|
|
7633 |
+ { "font_sizes",
|
|
7634 |
+ N_("Font Sizes"),
|
|
7635 |
+ TOKEN_FONT_SIZES,
|
|
7636 |
+ ENTRY_OPTION,
|
|
7637 |
+ "10 12 14 16 18 20",
|
|
7638 |
+ (const gpointer)TRUE,
|
|
7639 |
+ NULL
|
|
7640 |
+ },
|
|
7641 |
+ { "w3c_plus_heuristics",
|
|
7642 |
+ N_("W3C+heuristics"),
|
|
7643 |
+ TOKEN_W3C_PLUS_HEURISTICS,
|
|
7644 |
+ CHECK_OPTION,
|
|
7645 |
+ "YES",
|
|
7646 |
+ NULL,
|
|
7647 |
+ NULL
|
|
7648 |
+ },
|
|
7649 |
+ { "use_dicache",
|
|
7650 |
+ N_("Use dicache"),
|
|
7651 |
+ TOKEN_USE_DICACHE,
|
|
7652 |
+ CHECK_OPTION,
|
|
7653 |
+ "NO",
|
|
7654 |
+ NULL,
|
|
7655 |
+ NULL
|
|
7656 |
+ },
|
|
7657 |
+ { "show_back",
|
|
7658 |
+ N_("Show Back"),
|
|
7659 |
+ TOKEN_SHOW_BACK,
|
|
7660 |
+ CHECK_OPTION,
|
|
7661 |
+ "YES",
|
|
7662 |
+ NULL,
|
|
7663 |
+ NULL
|
|
7664 |
+ },
|
|
7665 |
+ { "show_forw",
|
|
7666 |
+ N_("Show Forw"),
|
|
7667 |
+ TOKEN_SHOW_FORW,
|
|
7668 |
+ CHECK_OPTION,
|
|
7669 |
+ "YES",
|
|
7670 |
+ NULL,
|
|
7671 |
+ NULL
|
|
7672 |
+ },
|
|
7673 |
+ { "show_home",
|
|
7674 |
+ N_("Show Home"),
|
|
7675 |
+ TOKEN_SHOW_HOME,
|
|
7676 |
+ CHECK_OPTION,
|
|
7677 |
+ "YES",
|
|
7678 |
+ NULL,
|
|
7679 |
+ NULL
|
|
7680 |
+ },
|
|
7681 |
+ { "show_reload",
|
|
7682 |
+ N_("Show Reload"),
|
|
7683 |
+ TOKEN_SHOW_RELOAD,
|
|
7684 |
+ CHECK_OPTION,
|
|
7685 |
+ "YES",
|
|
7686 |
+ NULL,
|
|
7687 |
+ NULL
|
|
7688 |
+ },
|
|
7689 |
+ { "show_save",
|
|
7690 |
+ N_("Show Save"),
|
|
7691 |
+ TOKEN_SHOW_SAVE,
|
|
7692 |
+ CHECK_OPTION,
|
|
7693 |
+ "YES",
|
|
7694 |
+ NULL,
|
|
7695 |
+ NULL
|
|
7696 |
+ },
|
|
7697 |
+ { "show_stop",
|
|
7698 |
+ N_("Show Stop"),
|
|
7699 |
+ TOKEN_SHOW_STOP,
|
|
7700 |
+ CHECK_OPTION,
|
|
7701 |
+ "YES",
|
|
7702 |
+ NULL,
|
|
7703 |
+ NULL
|
|
7704 |
+ },
|
|
7705 |
+ { "show_bookmarks",
|
|
7706 |
+ N_("Show Bookmarks"),
|
|
7707 |
+ TOKEN_SHOW_BOOKMARKS,
|
|
7708 |
+ CHECK_OPTION,
|
|
7709 |
+ "YES",
|
|
7710 |
+ NULL,
|
|
7711 |
+ NULL
|
|
7712 |
+ },
|
|
7713 |
+ { "show_menubar",
|
|
7714 |
+ N_("Show Menubar"),
|
|
7715 |
+ TOKEN_SHOW_MENUBAR,
|
|
7716 |
+ CHECK_OPTION,
|
|
7717 |
+ "YES",
|
|
7718 |
+ NULL,
|
|
7719 |
+ NULL
|
|
7720 |
+ },
|
|
7721 |
+ { "show_clear_url",
|
|
7722 |
+ N_("Show ClearURL"),
|
|
7723 |
+ TOKEN_SHOW_CLEAR_URL,
|
|
7724 |
+ CHECK_OPTION,
|
|
7725 |
+ "YES",
|
|
7726 |
+ NULL,
|
|
7727 |
+ NULL
|
|
7728 |
+ },
|
|
7729 |
+ { "show_url",
|
|
7730 |
+ N_("Show URL box"),
|
|
7731 |
+ TOKEN_SHOW_URL,
|
|
7732 |
+ CHECK_OPTION,
|
|
7733 |
+ "YES",
|
|
7734 |
+ NULL,
|
|
7735 |
+ NULL
|
|
7736 |
+ },
|
|
7737 |
+ { "show_search",
|
|
7738 |
+ N_("Show Web Search"),
|
|
7739 |
+ TOKEN_SHOW_SEARCH,
|
|
7740 |
+ CHECK_OPTION,
|
|
7741 |
+ "YES",
|
|
7742 |
+ NULL,
|
|
7743 |
+ NULL
|
|
7744 |
+ },
|
|
7745 |
+ { "show_progress_box",
|
|
7746 |
+ N_("Show Progress box"),
|
|
7747 |
+ TOKEN_SHOW_PROGRESS_BOX,
|
|
7748 |
+ CHECK_OPTION,
|
|
7749 |
+ "NO",
|
|
7750 |
+ NULL,
|
|
7751 |
+ NULL
|
|
7752 |
+ },
|
|
7753 |
+ { "show_popup_navigation",
|
|
7754 |
+ N_("Show Popup navigation"),
|
|
7755 |
+ TOKEN_SHOW_POPUP_NAVIGATION,
|
|
7756 |
+ CHECK_OPTION,
|
|
7757 |
+ "YES",
|
|
7758 |
+ NULL,
|
|
7759 |
+ NULL
|
|
7760 |
+ },
|
|
7761 |
+ { "fullwindow_start",
|
|
7762 |
+ N_("Fullwindow start"),
|
|
7763 |
+ TOKEN_FULLWINDOW_START,
|
|
7764 |
+ CHECK_OPTION,
|
|
7765 |
+ "NO",
|
|
7766 |
+ NULL,
|
|
7767 |
+ NULL
|
|
7768 |
+ },
|
|
7769 |
+ { "transient_dialogs",
|
|
7770 |
+ N_("Transient dialogs"),
|
|
7771 |
+ TOKEN_TRANSIENT_DIALOGS,
|
|
7772 |
+ CHECK_OPTION,
|
|
7773 |
+ "NO",
|
|
7774 |
+ NULL,
|
|
7775 |
+ NULL
|
|
7776 |
+ },
|
|
7777 |
+ { "popup_dialogs",
|
|
7778 |
+ N_("Popup dialogs"),
|
|
7779 |
+ TOKEN_POPUP_DIALOGS,
|
|
7780 |
+ CHECK_OPTION,
|
|
7781 |
+ "NO",
|
|
7782 |
+ NULL,
|
|
7783 |
+ NULL
|
|
7784 |
+ },
|
|
7785 |
+ { "vw_aafontname",
|
|
7786 |
+ N_("vw_aafontname"),
|
|
7787 |
+ TOKEN_VW_AAFONT,
|
|
7788 |
+ FONT_OPTION,
|
|
7789 |
+ "*",
|
|
7790 |
+ (const gpointer)TRUE,
|
|
7791 |
+ NULL
|
|
7792 |
+ },
|
|
7793 |
+ { "fw_aafontname",
|
|
7794 |
+ N_("fw_aafontname"),
|
|
7795 |
+ TOKEN_FW_AAFONT,
|
|
7796 |
+ FONT_OPTION,
|
|
7797 |
+ "*",
|
|
7798 |
+ (const gpointer)TRUE,
|
|
7799 |
+ NULL
|
|
7800 |
+ },
|
|
7801 |
+ { "vw_fontname",
|
|
7802 |
+ N_("vw_fontname"),
|
|
7803 |
+ TOKEN_VW_FONT,
|
|
7804 |
+ FONT_OPTION,
|
|
7805 |
+ "*-gothic",
|
|
7806 |
+ (const gpointer)TRUE,
|
|
7807 |
+ NULL
|
|
7808 |
+ },
|
|
7809 |
+ { "fw_fontname",
|
|
7810 |
+ N_("fw_fontname"),
|
|
7811 |
+ TOKEN_FW_FONT,
|
|
7812 |
+ FONT_OPTION,
|
|
7813 |
+ "*-gothic",
|
|
7814 |
+ (const gpointer)TRUE,
|
|
7815 |
+ NULL
|
|
7816 |
+ },
|
|
7817 |
+ { "generate_submit",
|
|
7818 |
+ N_("Generate submit"),
|
|
7819 |
+ TOKEN_GENERATE_SUBMIT,
|
|
7820 |
+ CHECK_OPTION,
|
|
7821 |
+ "YES",
|
|
7822 |
+ NULL,
|
|
7823 |
+ NULL
|
|
7824 |
+ },
|
|
7825 |
+ { "enterpress_forces_submit",
|
|
7826 |
+ N_("Enterpress forces submit"),
|
|
7827 |
+ TOKEN_ENTERPRESS_FORCES_SUBMIT,
|
|
7828 |
+ CHECK_OPTION,
|
|
7829 |
+ "NO",
|
|
7830 |
+ NULL,
|
|
7831 |
+ NULL
|
|
7832 |
+ },
|
|
7833 |
+ { "show_msg",
|
|
7834 |
+ N_("Show debugging messsages"),
|
|
7835 |
+ TOKEN_SHOW_MSG,
|
|
7836 |
+ CHECK_OPTION,
|
|
7837 |
+ "NO",
|
|
7838 |
+ NULL,
|
|
7839 |
+ NULL
|
|
7840 |
+ },
|
|
7841 |
+ { "show_extra_warnings",
|
|
7842 |
+ N_("Show Extra Warnings"),
|
|
7843 |
+ TOKEN_SHOW_EXTRA_WARNINGS,
|
|
7844 |
+ CHECK_OPTION,
|
|
7845 |
+ "NO",
|
|
7846 |
+ NULL,
|
|
7847 |
+ NULL
|
|
7848 |
+ },
|
|
7849 |
+ { "focus_location_on_new",
|
|
7850 |
+ N_("Focus location on new"),
|
|
7851 |
+ TOKEN_FOCUS_LOCATION_ON_NEW,
|
|
7852 |
+ CHECK_OPTION,
|
|
7853 |
+ "YES",
|
|
7854 |
+ NULL,
|
|
7855 |
+ NULL
|
|
7856 |
+ },
|
|
7857 |
+ { "accept_language",
|
|
7858 |
+ N_("Accept Language"),
|
|
7859 |
+ TOKEN_ACCEPT_LANGUAGE,
|
|
7860 |
+ ENTRY_OPTION,
|
|
7861 |
+ "en-us",
|
|
7862 |
+ (const gpointer)TRUE,
|
|
7863 |
+ NULL
|
|
7864 |
+ },
|
|
7865 |
+ { "accept_language",
|
|
7866 |
+ N_("Accept Language"),
|
|
7867 |
+ TOKEN_ACCEPT_LANGUAGE,
|
|
7868 |
+ ENTRY_OPTION,
|
|
7869 |
+ "en-us, ja",
|
|
7870 |
+ (const gpointer)TRUE,
|
|
7871 |
+ NULL
|
|
7872 |
+ },
|
|
7873 |
+#ifndef DISABLE_TABS
|
|
7874 |
+ { "tab_load_in_background",
|
|
7875 |
+ N_("Tab load in background"),
|
|
7876 |
+ TOKEN_TAB_LOAD_IN_BACKGROUND,
|
|
7877 |
+ CHECK_OPTION,
|
|
7878 |
+ "YES",
|
|
7879 |
+ NULL,
|
|
7880 |
+ NULL
|
|
7881 |
+ },
|
|
7882 |
+ { "tab_close_middle_click",
|
|
7883 |
+ N_("Tab close middle click"),
|
|
7884 |
+ TOKEN_TAB_CLOSE_MIDDLE_CLICK,
|
|
7885 |
+ CHECK_OPTION,
|
|
7886 |
+ "YES",
|
|
7887 |
+ NULL,
|
|
7888 |
+ NULL
|
|
7889 |
+ },
|
|
7890 |
+ { "tab_instead_of_window",
|
|
7891 |
+ N_("Tab instead of window"),
|
|
7892 |
+ TOKEN_TAB_INSTEAD_OF_WINDOW,
|
|
7893 |
+ CHECK_OPTION,
|
|
7894 |
+ "YES",
|
|
7895 |
+ FALSE,
|
|
7896 |
+ NULL
|
|
7897 |
+ },
|
|
7898 |
+ { "tab_bar_show_fullscreen",
|
|
7899 |
+ N_("Tab bar show fullscreen"),
|
|
7900 |
+ TOKEN_TAB_BAR_SHOW_FULLSCREEN,
|
|
7901 |
+ CHECK_OPTION,
|
|
7902 |
+ "NO",
|
|
7903 |
+ NULL,
|
|
7904 |
+ NULL
|
|
7905 |
+ },
|
|
7906 |
+ { "tab_bar_show_single_tab",
|
|
7907 |
+ N_("Tab bar show single tab"),
|
|
7908 |
+ TOKEN_TAB_BAR_SHOW_SINGLE_TAB,
|
|
7909 |
+ CHECK_OPTION,
|
|
7910 |
+ "NO",
|
|
7911 |
+ NULL,
|
|
7912 |
+ NULL
|
|
7913 |
+ },
|
|
7914 |
+ { "tab_bar_scroller",
|
|
7915 |
+ N_("Tab bar scroller"),
|
|
7916 |
+ TOKEN_TAB_BAR_SCROLLER,
|
|
7917 |
+ CHECK_OPTION,
|
|
7918 |
+ "NO",
|
|
7919 |
+ NULL,
|
|
7920 |
+ NULL
|
|
7921 |
+ },
|
|
7922 |
+ { "tab_bar_homogeneous",
|
|
7923 |
+ N_("Tab bar homogeneous"),
|
|
7924 |
+ TOKEN_TAB_BAR_HOMOGENEOUS,
|
|
7925 |
+ CHECK_OPTION,
|
|
7926 |
+ "YES",
|
|
7927 |
+ NULL,
|
|
7928 |
+ NULL
|
|
7929 |
+ },
|
|
7930 |
+ { "tab_title_compress",
|
|
7931 |
+ N_("Tab title compress"),
|
|
7932 |
+ TOKEN_TAB_TITLE_COMPRESS,
|
|
7933 |
+ CHECK_OPTION,
|
|
7934 |
+ "NO",
|
|
7935 |
+ NULL,
|
|
7936 |
+ NULL
|
|
7937 |
+ },
|
|
7938 |
+ { "compress_vowels",
|
|
7939 |
+ N_("Compress vowels"),
|
|
7940 |
+ TOKEN_COMPRESS_VOWELS,
|
|
7941 |
+ ENTRY_OPTION,
|
|
7942 |
+ "aeiouyAEIOUY",
|
|
7943 |
+ (const gpointer)TRUE,
|
|
7944 |
+ NULL
|
|
7945 |
+ },
|
|
7946 |
+ { "compress_common_prefixes",
|
|
7947 |
+ N_("Compress_common_prefixes"),
|
|
7948 |
+ TOKEN_COMPRESS_COMMON_PREFIXES,
|
|
7949 |
+ ENTRY_OPTION,
|
|
7950 |
+ "index of ;re: ;fwd: ;www.;welcome to ;the ",
|
|
7951 |
+ (const gpointer)TRUE,
|
|
7952 |
+ NULL
|
|
7953 |
+ },
|
|
7954 |
+#endif /* !DISABLE_TABS */
|
|
7955 |
+ { "DEFAULT",
|
|
7956 |
+ N_("Default"),
|
|
7957 |
+ TOKEN_COOKIE_DEFAULT,
|
|
7958 |
+ COOKIE,
|
|
7959 |
+ "ACCEPT_SESSION",
|
|
7960 |
+ (const gpointer)&cookie_rules,
|
|
7961 |
+ NULL
|
|
7962 |
+ },
|
|
7963 |
+ { NULL,
|
|
7964 |
+ NULL,
|
|
7965 |
+ TOKEN_COOKIE,
|
|
7966 |
+ COOKIE,
|
|
7967 |
+ "ACCEPT_SESSION",
|
|
7968 |
+ (const gpointer)&cookie_rules,
|
|
7969 |
+ NULL
|
|
7970 |
+ },
|
|
7971 |
+
|
|
7972 |
+};
|
|
7973 |
+
|
|
7974 |
+
|
|
7975 |
+static guint token2num(guint tkn) {
|
|
7976 |
+ gint i;
|
|
7977 |
+ for (i = 0; i < N_TOKENS && symbols[i].token != tkn; i++);
|
|
7978 |
+ return i;
|
|
7979 |
+}
|
|
7980 |
+
|
|
7981 |
+guint name2token(const gchar *name) {
|
|
7982 |
+ gint i;
|
|
7983 |
+ for (i = 0; i < N_TOKENS; i++)
|
|
7984 |
+ if (symbols[i].name && strcmp(symbols[i].name, name) == 0)
|
|
7985 |
+ return (const guint)symbols[i].token;
|
|
7986 |
+ return 0;
|
|
7987 |
+}
|
|
7988 |
+
|
|
7989 |
+const gchar *get_token_name(guint tkn) {
|
|
7990 |
+ return symbols[token2num(tkn)].name;
|
|
7991 |
+}
|
|
7992 |
+
|
|
7993 |
+const gchar *get_token_label(guint tkn) {
|
|
7994 |
+ return symbols[token2num(tkn)].label;
|
|
7995 |
+}
|
|
7996 |
+
|
|
7997 |
+guint get_token_type(guint tkn) {
|
|
7998 |
+ return symbols[token2num(tkn)].type;
|
|
7999 |
+}
|
|
8000 |
+
|
|
8001 |
+gpointer get_token_value(guint tkn) {
|
|
8002 |
+ return (const gpointer)symbols[token2num(tkn)].value;
|
|
8003 |
+}
|
|
8004 |
+
|
|
8005 |
+gpointer get_token_option(guint tkn) {
|
|
8006 |
+ return symbols[token2num(tkn)].option;
|
|
8007 |
+}
|
|
8008 |
+
|
|
8009 |
+void set_token_object(guint tkn, Option *obj) {
|
|
8010 |
+ symbols[token2num(tkn)].object = obj;
|
|
8011 |
+}
|
|
8012 |
+
|
|
8013 |
+Option *get_token_object(guint tkn) {
|
|
8014 |
+ return symbols[token2num(tkn)].object;
|
|
8015 |
+}
|
|
8016 |
+
|
|
8017 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
8018 |
diff -pruN dillo-0.8.6/config/dillocfg_token.h dillo-0.8.6-i18n-misc-20070916/config/dillocfg_token.h
|
|
8019 |
--- dillo-0.8.6/config/dillocfg_token.h 1970-01-01 09:00:00.000000000 +0900
|
|
8020 |
+++ dillo-0.8.6-i18n-misc-20070916/config/dillocfg_token.h 2006-05-16 01:21:16.000000000 +0900
|
|
8021 |
@@ -0,0 +1,103 @@
|
|
8022 |
+#ifndef __DILLOCFG_GTK_TOKEN_H__
|
|
8023 |
+#define __DILLOCFG_GTK_TOKEN_H__
|
|
8024 |
+
|
|
8025 |
+#include <gtk/gtk.h>
|
|
8026 |
+
|
|
8027 |
+#include "../config.h"
|
|
8028 |
+#include "dillocfg_option.h"
|
|
8029 |
+
|
|
8030 |
+#ifdef __cplusplus
|
|
8031 |
+extern "C" {
|
|
8032 |
+#endif /* __cplusplus */
|
|
8033 |
+ /* define enumeration values to be returned for specific symbols */
|
|
8034 |
+ typedef enum {
|
|
8035 |
+ TOKEN_NULL = 0,
|
|
8036 |
+ TOKEN_GEOMETRY,
|
|
8037 |
+ TOKEN_PROXY,
|
|
8038 |
+ TOKEN_PROXYUSER,
|
|
8039 |
+ TOKEN_NOPROXY,
|
|
8040 |
+ TOKEN_USER_AGENT,
|
|
8041 |
+ TOKEN_SEND_REFERER,
|
|
8042 |
+ TOKEN_LINK_COLOR,
|
|
8043 |
+ TOKEN_VISITED_COLOR,
|
|
8044 |
+ TOKEN_BG_COLOR,
|
|
8045 |
+ TOKEN_ALLOW_WHITE_BG,
|
|
8046 |
+ TOKEN_FORCE_MY_COLORS,
|
|
8047 |
+ TOKEN_CONTRAST_VISITED_COLOR,
|
|
8048 |
+ TOKEN_TEXT_COLOR,
|
|
8049 |
+ TOKEN_USE_OBLIQUE,
|
|
8050 |
+ TOKEN_START_PAGE,
|
|
8051 |
+ TOKEN_HOME,
|
|
8052 |
+ TOKEN_SEARCH_URL,
|
|
8053 |
+ TOKEN_SEARCH_CHARSET,
|
|
8054 |
+ TOKEN_PANEL_SIZE,
|
|
8055 |
+ TOKEN_SMALL_ICONS,
|
|
8056 |
+ TOKEN_FONT_FACTOR,
|
|
8057 |
+ TOKEN_FONT_SIZES,
|
|
8058 |
+ TOKEN_SHOW_TOOLTIP,
|
|
8059 |
+ TOKEN_LIMIT_TEXT_WIDTH,
|
|
8060 |
+ TOKEN_LIMIT_FONT_DECORATION,
|
|
8061 |
+ TOKEN_W3C_PLUS_HEURISTICS,
|
|
8062 |
+ TOKEN_USE_DICACHE,
|
|
8063 |
+ TOKEN_SHOW_BACK,
|
|
8064 |
+ TOKEN_SHOW_FORW,
|
|
8065 |
+ TOKEN_SHOW_HOME,
|
|
8066 |
+ TOKEN_SHOW_RELOAD,
|
|
8067 |
+ TOKEN_SHOW_SAVE,
|
|
8068 |
+ TOKEN_SHOW_STOP,
|
|
8069 |
+ TOKEN_SHOW_BOOKMARKS,
|
|
8070 |
+ TOKEN_SHOW_MENUBAR,
|
|
8071 |
+ TOKEN_SHOW_CLEAR_URL,
|
|
8072 |
+ TOKEN_SHOW_URL,
|
|
8073 |
+ TOKEN_SHOW_SEARCH,
|
|
8074 |
+ TOKEN_SHOW_PROGRESS_BOX,
|
|
8075 |
+ TOKEN_SHOW_POPUP_NAVIGATION,
|
|
8076 |
+ TOKEN_FULLWINDOW_START,
|
|
8077 |
+ TOKEN_TRANSIENT_DIALOGS,
|
|
8078 |
+ TOKEN_POPUP_DIALOGS,
|
|
8079 |
+ TOKEN_FW_FONT,
|
|
8080 |
+ TOKEN_VW_FONT,
|
|
8081 |
+ TOKEN_FW_AAFONT,
|
|
8082 |
+ TOKEN_VW_AAFONT,
|
|
8083 |
+ TOKEN_GENERATE_SUBMIT,
|
|
8084 |
+ TOKEN_ENTERPRESS_FORCES_SUBMIT,
|
|
8085 |
+ TOKEN_SHOW_MSG,
|
|
8086 |
+ TOKEN_SHOW_EXTRA_WARNINGS,
|
|
8087 |
+ TOKEN_FOCUS_LOCATION_ON_NEW,
|
|
8088 |
+ TOKEN_ACCEPT_LANGUAGE,
|
|
8089 |
+#ifndef DISABLE_TABS
|
|
8090 |
+ TOKEN_TAB_LOAD_IN_BACKGROUND,
|
|
8091 |
+ TOKEN_TAB_INSTEAD_OF_WINDOW,
|
|
8092 |
+ TOKEN_TAB_BAR_SHOW_FULLSCREEN,
|
|
8093 |
+ TOKEN_TAB_BAR_SHOW_SINGLE_TAB,
|
|
8094 |
+ TOKEN_TAB_BAR_SCROLLER,
|
|
8095 |
+ TOKEN_TAB_BAR_HOMOGENEOUS,
|
|
8096 |
+ TOKEN_TAB_TITLE_COMPRESS,
|
|
8097 |
+ TOKEN_TAB_CLOSE_MIDDLE_CLICK,
|
|
8098 |
+ TOKEN_COMPRESS_VOWELS,
|
|
8099 |
+ TOKEN_COMPRESS_COMMON_PREFIXES,
|
|
8100 |
+#endif /* !DISABLE_TABS */
|
|
8101 |
+ TOKEN_COOKIE_DEFAULT,
|
|
8102 |
+ TOKEN_COOKIE,
|
|
8103 |
+
|
|
8104 |
+ TOKEN_LAST
|
|
8105 |
+ } TokenType;
|
|
8106 |
+#define N_TOKENS TOKEN_LAST
|
|
8107 |
+
|
|
8108 |
+ guint name2token(const gchar *name);
|
|
8109 |
+ const gchar *get_token_name(guint tkn);
|
|
8110 |
+ const gchar *get_token_label(guint tkn);
|
|
8111 |
+ guint get_token_type(guint tkn);
|
|
8112 |
+ gpointer get_token_value(guint tkn);
|
|
8113 |
+ gpointer get_token_option(guint tkn);
|
|
8114 |
+ Option *get_token_object(guint tkn);
|
|
8115 |
+ void set_token_object(guint tkn, Option *obj);
|
|
8116 |
+
|
|
8117 |
+#ifdef __cplusplus
|
|
8118 |
+}
|
|
8119 |
+#endif /* __cplusplus */
|
|
8120 |
+
|
|
8121 |
+
|
|
8122 |
+#endif /* __DILLOCFG_GTK_TOKEN_H__ */
|
|
8123 |
+
|
|
8124 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
8125 |
diff -pruN dillo-0.8.6/config.guess dillo-0.8.6-i18n-misc-20070916/config.guess
|
|
8126 |
--- dillo-0.8.6/config.guess 2005-03-22 16:17:05.000000000 +0900
|
|
8127 |
+++ dillo-0.8.6-i18n-misc-20070916/config.guess 2006-05-16 01:21:07.000000000 +0900
|
|
8128 |
@@ -1,9 +1,9 @@
|
|
8129 |
#! /bin/sh
|
|
8130 |
# Attempt to guess a canonical system name.
|
|
8131 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
8132 |
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
8133 |
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
|
8134 |
|
|
8135 |
-timestamp='2005-02-10'
|
|
8136 |
+timestamp='2004-03-12'
|
|
8137 |
|
|
8138 |
# This file is free software; you can redistribute it and/or modify it
|
|
8139 |
# under the terms of the GNU General Public License as published by
|
|
8140 |
@@ -53,7 +53,7 @@ version="\
|
|
8141 |
GNU config.guess ($timestamp)
|
|
8142 |
|
|
8143 |
Originally written by Per Bothner.
|
|
8144 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
8145 |
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
|
|
8146 |
Free Software Foundation, Inc.
|
|
8147 |
|
|
8148 |
This is free software; see the source for copying conditions. There is NO
|
|
8149 |
@@ -106,7 +106,6 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
|
|
8150 |
: ${TMPDIR=/tmp} ;
|
|
8151 |
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
|
8152 |
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
|
8153 |
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
|
8154 |
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
|
8155 |
dummy=$tmp/dummy ;
|
|
8156 |
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
|
|
8157 |
@@ -203,15 +202,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
8158 |
amiga:OpenBSD:*:*)
|
|
8159 |
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
|
8160 |
exit 0 ;;
|
|
8161 |
+ arc:OpenBSD:*:*)
|
|
8162 |
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
|
8163 |
+ exit 0 ;;
|
|
8164 |
cats:OpenBSD:*:*)
|
|
8165 |
echo arm-unknown-openbsd${UNAME_RELEASE}
|
|
8166 |
exit 0 ;;
|
|
8167 |
hp300:OpenBSD:*:*)
|
|
8168 |
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
|
8169 |
exit 0 ;;
|
|
8170 |
- luna88k:OpenBSD:*:*)
|
|
8171 |
- echo m88k-unknown-openbsd${UNAME_RELEASE}
|
|
8172 |
- exit 0 ;;
|
|
8173 |
mac68k:OpenBSD:*:*)
|
|
8174 |
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
|
8175 |
exit 0 ;;
|
|
8176 |
@@ -227,12 +226,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
8177 |
mvmeppc:OpenBSD:*:*)
|
|
8178 |
echo powerpc-unknown-openbsd${UNAME_RELEASE}
|
|
8179 |
exit 0 ;;
|
|
8180 |
+ pegasos:OpenBSD:*:*)
|
|
8181 |
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
|
|
8182 |
+ exit 0 ;;
|
|
8183 |
+ pmax:OpenBSD:*:*)
|
|
8184 |
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
|
8185 |
+ exit 0 ;;
|
|
8186 |
sgi:OpenBSD:*:*)
|
|
8187 |
- echo mips64-unknown-openbsd${UNAME_RELEASE}
|
|
8188 |
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
|
|
8189 |
exit 0 ;;
|
|
8190 |
sun3:OpenBSD:*:*)
|
|
8191 |
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
|
8192 |
exit 0 ;;
|
|
8193 |
+ wgrisc:OpenBSD:*:*)
|
|
8194 |
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
|
8195 |
+ exit 0 ;;
|
|
8196 |
*:OpenBSD:*:*)
|
|
8197 |
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
|
|
8198 |
exit 0 ;;
|
|
8199 |
@@ -245,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
8200 |
*:MirBSD:*:*)
|
|
8201 |
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
|
8202 |
exit 0 ;;
|
|
8203 |
+ *:MicroBSD:*:*)
|
|
8204 |
+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
|
|
8205 |
+ exit 0 ;;
|
|
8206 |
alpha:OSF1:*:*)
|
|
8207 |
case $UNAME_RELEASE in
|
|
8208 |
*4.0)
|
|
8209 |
@@ -319,9 +330,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
8210 |
*:OS/390:*:*)
|
|
8211 |
echo i370-ibm-openedition
|
|
8212 |
exit 0 ;;
|
|
8213 |
- *:z/VM:*:*)
|
|
8214 |
- echo s390-ibm-zvmoe
|
|
8215 |
- exit 0 ;;
|
|
8216 |
*:OS400:*:*)
|
|
8217 |
echo powerpc-ibm-os400
|
|
8218 |
exit 0 ;;
|
|
8219 |
@@ -342,10 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
|
8220 |
NILE*:*:*:dcosx)
|
|
8221 |
echo pyramid-pyramid-svr4
|
|
8222 |
exit 0 ;;
|
|
8223 |
- DRS?6000:unix:4.0:6*)
|
|
8224 |
- echo sparc-icl-nx6
|
|
8225 |
- exit 0 ;;
|
|
8226 |
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
|
|
8227 |
+ DRS?6000:UNIX_SV:4.2*:7*)
|
|
8228 |
case `/usr/bin/uname -p` in
|
|
8229 |
sparc) echo sparc-icl-nx7 && exit 0 ;;
|
|
8230 |
esac ;;
|
|
8231 |
@@ -755,7 +760,7 @@ EOF
|
|
8232 |
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
|
8233 |
exit 0 ;;
|
|
8234 |
*:UNICOS/mp:*:*)
|
|
8235 |
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
|
8236 |
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
|
8237 |
exit 0 ;;
|
|
8238 |
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
|
|
8239 |
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
8240 |
@@ -778,7 +783,21 @@ EOF
|
|
8241 |
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
|
8242 |
exit 0 ;;
|
|
8243 |
*:FreeBSD:*:*)
|
|
8244 |
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
|
8245 |
+ # Determine whether the default compiler uses glibc.
|
|
8246 |
+ eval $set_cc_for_build
|
|
8247 |
+ sed 's/^ //' << EOF >$dummy.c
|
|
8248 |
+ #include <features.h>
|
|
8249 |
+ #if __GLIBC__ >= 2
|
|
8250 |
+ LIBC=gnu
|
|
8251 |
+ #else
|
|
8252 |
+ LIBC=
|
|
8253 |
+ #endif
|
|
8254 |
+EOF
|
|
8255 |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
|
8256 |
+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
|
|
8257 |
+ # FreeBSD's kernel, but not the complete OS.
|
|
8258 |
+ case ${LIBC} in gnu) kernel_only='k' ;; esac
|
|
8259 |
+ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
|
|
8260 |
exit 0 ;;
|
|
8261 |
i*:CYGWIN*:*)
|
|
8262 |
echo ${UNAME_MACHINE}-pc-cygwin
|
|
8263 |
@@ -789,8 +808,8 @@ EOF
|
|
8264 |
i*:PW*:*)
|
|
8265 |
echo ${UNAME_MACHINE}-pc-pw32
|
|
8266 |
exit 0 ;;
|
|
8267 |
- x86:Interix*:[34]*)
|
|
8268 |
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
|
8269 |
+ x86:Interix*:3*)
|
|
8270 |
+ echo i586-pc-interix3
|
|
8271 |
exit 0 ;;
|
|
8272 |
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
|
8273 |
echo i${UNAME_MACHINE}-pc-mks
|
|
8274 |
@@ -804,9 +823,6 @@ EOF
|
|
8275 |
i*:UWIN*:*)
|
|
8276 |
echo ${UNAME_MACHINE}-pc-uwin
|
|
8277 |
exit 0 ;;
|
|
8278 |
- amd64:CYGWIN*:*:*)
|
|
8279 |
- echo x86_64-unknown-cygwin
|
|
8280 |
- exit 0 ;;
|
|
8281 |
p*:CYGWIN*:*)
|
|
8282 |
echo powerpcle-unknown-cygwin
|
|
8283 |
exit 0 ;;
|
|
8284 |
@@ -827,15 +843,6 @@ EOF
|
|
8285 |
arm*:Linux:*:*)
|
|
8286 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
8287 |
exit 0 ;;
|
|
8288 |
- cris:Linux:*:*)
|
|
8289 |
- echo cris-axis-linux-gnu
|
|
8290 |
- exit 0 ;;
|
|
8291 |
- crisv32:Linux:*:*)
|
|
8292 |
- echo crisv32-axis-linux-gnu
|
|
8293 |
- exit 0 ;;
|
|
8294 |
- frv:Linux:*:*)
|
|
8295 |
- echo frv-unknown-linux-gnu
|
|
8296 |
- exit 0 ;;
|
|
8297 |
ia64:Linux:*:*)
|
|
8298 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
8299 |
exit 0 ;;
|
|
8300 |
@@ -917,9 +924,6 @@ EOF
|
|
8301 |
s390:Linux:*:* | s390x:Linux:*:*)
|
|
8302 |
echo ${UNAME_MACHINE}-ibm-linux
|
|
8303 |
exit 0 ;;
|
|
8304 |
- sh64*:Linux:*:*)
|
|
8305 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
8306 |
- exit 0 ;;
|
|
8307 |
sh*:Linux:*:*)
|
|
8308 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
8309 |
exit 0 ;;
|
|
8310 |
@@ -977,9 +981,6 @@ EOF
|
|
8311 |
LIBC=gnuaout
|
|
8312 |
#endif
|
|
8313 |
#endif
|
|
8314 |
- #ifdef __dietlibc__
|
|
8315 |
- LIBC=dietlibc
|
|
8316 |
- #endif
|
|
8317 |
EOF
|
|
8318 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
|
8319 |
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
|
|
8320 |
@@ -1082,9 +1083,9 @@ EOF
|
|
8321 |
M680?0:D-NIX:5.3:*)
|
|
8322 |
echo m68k-diab-dnix
|
|
8323 |
exit 0 ;;
|
|
8324 |
- M68*:*:R3V[5678]*:*)
|
|
8325 |
+ M68*:*:R3V[567]*:*)
|
|
8326 |
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
|
|
8327 |
- 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)
|
|
8328 |
+ 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)
|
|
8329 |
OS_REL=''
|
|
8330 |
test -r /etc/.relid \
|
|
8331 |
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
|
8332 |
@@ -1182,10 +1183,9 @@ EOF
|
|
8333 |
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
|
|
8334 |
exit 0 ;;
|
|
8335 |
*:Darwin:*:*)
|
|
8336 |
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
|
8337 |
- case $UNAME_PROCESSOR in
|
|
8338 |
+ case `uname -p` in
|
|
8339 |
*86) UNAME_PROCESSOR=i686 ;;
|
|
8340 |
- unknown) UNAME_PROCESSOR=powerpc ;;
|
|
8341 |
+ powerpc) UNAME_PROCESSOR=powerpc ;;
|
|
8342 |
esac
|
|
8343 |
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
|
8344 |
exit 0 ;;
|
|
8345 |
@@ -1200,9 +1200,6 @@ EOF
|
|
8346 |
*:QNX:*:4*)
|
|
8347 |
echo i386-pc-qnx
|
|
8348 |
exit 0 ;;
|
|
8349 |
- NSE-?:NONSTOP_KERNEL:*:*)
|
|
8350 |
- echo nse-tandem-nsk${UNAME_RELEASE}
|
|
8351 |
- exit 0 ;;
|
|
8352 |
NSR-?:NONSTOP_KERNEL:*:*)
|
|
8353 |
echo nsr-tandem-nsk${UNAME_RELEASE}
|
|
8354 |
exit 0 ;;
|
|
8355 |
@@ -1250,16 +1247,6 @@ EOF
|
|
8356 |
*:DragonFly:*:*)
|
|
8357 |
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
|
8358 |
exit 0 ;;
|
|
8359 |
- *:*VMS:*:*)
|
|
8360 |
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
|
|
8361 |
- case "${UNAME_MACHINE}" in
|
|
8362 |
- A*) echo alpha-dec-vms && exit 0 ;;
|
|
8363 |
- I*) echo ia64-dec-vms && exit 0 ;;
|
|
8364 |
- V*) echo vax-dec-vms && exit 0 ;;
|
|
8365 |
- esac ;;
|
|
8366 |
- *:XENIX:*:SysV)
|
|
8367 |
- echo i386-pc-xenix
|
|
8368 |
- exit 0 ;;
|
|
8369 |
esac
|
|
8370 |
|
|
8371 |
#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
8372 |
diff -pruN dillo-0.8.6/config.h.in dillo-0.8.6-i18n-misc-20070916/config.h.in
|
|
8373 |
--- dillo-0.8.6/config.h.in 2006-04-27 01:06:37.000000000 +0900
|
|
8374 |
+++ dillo-0.8.6-i18n-misc-20070916/config.h.in 2007-09-07 01:01:29.000000000 +0900
|
|
8375 |
@@ -1,23 +1,40 @@
|
|
8376 |
/* config.h.in. Generated from configure.in by autoheader. */
|
|
8377 |
|
|
8378 |
+/* Enable SSL Processing */
|
|
8379 |
+#undef DILLO_SSL
|
|
8380 |
+
|
|
8381 |
/* Enable GIF images */
|
|
8382 |
#undef ENABLE_GIF
|
|
8383 |
|
|
8384 |
/* Enable JPEG images */
|
|
8385 |
#undef ENABLE_JPEG
|
|
8386 |
|
|
8387 |
+/* Define to 1 if translation of program messages to the user's native
|
|
8388 |
+ language is requested. */
|
|
8389 |
+#undef ENABLE_NLS
|
|
8390 |
+
|
|
8391 |
/* Enable PNG images */
|
|
8392 |
#undef ENABLE_PNG
|
|
8393 |
|
|
8394 |
/* Enable SSL support */
|
|
8395 |
#undef ENABLE_SSL
|
|
8396 |
|
|
8397 |
+/* Define if the GNU dcgettext() function is already present or preinstalled.
|
|
8398 |
+ */
|
|
8399 |
+#undef HAVE_DCGETTEXT
|
|
8400 |
+
|
|
8401 |
/* Define to 1 if you have the <fcntl.h> header file. */
|
|
8402 |
#undef HAVE_FCNTL_H
|
|
8403 |
|
|
8404 |
/* Define to 1 if you have the `gethostbyname' function. */
|
|
8405 |
#undef HAVE_GETHOSTBYNAME
|
|
8406 |
|
|
8407 |
+/* Define if the GNU gettext() function is already present or preinstalled. */
|
|
8408 |
+#undef HAVE_GETTEXT
|
|
8409 |
+
|
|
8410 |
+/* Define if you have the iconv() function. */
|
|
8411 |
+#undef HAVE_ICONV
|
|
8412 |
+
|
|
8413 |
/* Define to 1 if you have the <inttypes.h> header file. */
|
|
8414 |
#undef HAVE_INTTYPES_H
|
|
8415 |
|
|
8416 |
@@ -30,9 +47,18 @@
|
|
8417 |
/* Define to 1 if you have the `socket' library (-lsocket). */
|
|
8418 |
#undef HAVE_LIBSOCKET
|
|
8419 |
|
|
8420 |
+/* Define to 1 if you have the `ssl' library (-lssl). */
|
|
8421 |
+#undef HAVE_LIBSSL
|
|
8422 |
+
|
|
8423 |
/* Define to 1 if you have the <memory.h> header file. */
|
|
8424 |
#undef HAVE_MEMORY_H
|
|
8425 |
|
|
8426 |
+/* Define to 1 if you have the <openssl/err.h> header file. */
|
|
8427 |
+#undef HAVE_OPENSSL_ERR_H
|
|
8428 |
+
|
|
8429 |
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
|
|
8430 |
+#undef HAVE_OPENSSL_SSL_H
|
|
8431 |
+
|
|
8432 |
/* Define to 1 if you have the <png.h> header file. */
|
|
8433 |
#undef HAVE_PNG_H
|
|
8434 |
|
|
8435 |
diff -pruN dillo-0.8.6/config.rpath dillo-0.8.6-i18n-misc-20070916/config.rpath
|
|
8436 |
--- dillo-0.8.6/config.rpath 1970-01-01 09:00:00.000000000 +0900
|
|
8437 |
+++ dillo-0.8.6-i18n-misc-20070916/config.rpath 2006-05-16 01:21:07.000000000 +0900
|
|
8438 |
@@ -0,0 +1,513 @@
|
|
8439 |
+#! /bin/sh
|
|
8440 |
+# Output a system dependent set of variables, describing how to set the
|
|
8441 |
+# run time search path of shared libraries in an executable.
|
|
8442 |
+#
|
|
8443 |
+# Copyright 1996-2002 Free Software Foundation, Inc.
|
|
8444 |
+# Taken from GNU libtool, 2001
|
|
8445 |
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
|
8446 |
+#
|
|
8447 |
+# This program is free software; you can redistribute it and/or modify
|
|
8448 |
+# it under the terms of the GNU General Public License as published by
|
|
8449 |
+# the Free Software Foundation; either version 2 of the License, or
|
|
8450 |
+# (at your option) any later version.
|
|
8451 |
+#
|
|
8452 |
+# This program is distributed in the hope that it will be useful, but
|
|
8453 |
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
8454 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
8455 |
+# General Public License for more details.
|
|
8456 |
+#
|
|
8457 |
+# You should have received a copy of the GNU General Public License
|
|
8458 |
+# along with this program; if not, write to the Free Software
|
|
8459 |
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
8460 |
+#
|
|
8461 |
+# As a special exception to the GNU General Public License, if you
|
|
8462 |
+# distribute this file as part of a program that contains a
|
|
8463 |
+# configuration script generated by Autoconf, you may include it under
|
|
8464 |
+# the same distribution terms that you use for the rest of that program.
|
|
8465 |
+#
|
|
8466 |
+# The first argument passed to this file is the canonical host specification,
|
|
8467 |
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
|
|
8468 |
+# or
|
|
8469 |
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
|
|
8470 |
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
|
|
8471 |
+# should be set by the caller.
|
|
8472 |
+#
|
|
8473 |
+# The set of defined variables is at the end of this script.
|
|
8474 |
+
|
|
8475 |
+# All known linkers require a `.a' archive for static linking (except M$VC,
|
|
8476 |
+# which needs '.lib').
|
|
8477 |
+libext=a
|
|
8478 |
+shlibext=
|
|
8479 |
+
|
|
8480 |
+host="$1"
|
|
8481 |
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
8482 |
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
8483 |
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
8484 |
+
|
|
8485 |
+wl=
|
|
8486 |
+if test "$GCC" = yes; then
|
|
8487 |
+ wl='-Wl,'
|
|
8488 |
+else
|
|
8489 |
+ case "$host_os" in
|
|
8490 |
+ aix3* | aix4* | aix5*)
|
|
8491 |
+ wl='-Wl,'
|
|
8492 |
+ ;;
|
|
8493 |
+ hpux9* | hpux10* | hpux11*)
|
|
8494 |
+ wl='-Wl,'
|
|
8495 |
+ ;;
|
|
8496 |
+ irix5* | irix6*)
|
|
8497 |
+ wl='-Wl,'
|
|
8498 |
+ ;;
|
|
8499 |
+ linux*)
|
|
8500 |
+ echo '__INTEL_COMPILER' > conftest.$ac_ext
|
|
8501 |
+ if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
|
|
8502 |
+ then
|
|
8503 |
+ :
|
|
8504 |
+ else
|
|
8505 |
+ # Intel icc
|
|
8506 |
+ wl='-Qoption,ld,'
|
|
8507 |
+ fi
|
|
8508 |
+ ;;
|
|
8509 |
+ osf3* | osf4* | osf5*)
|
|
8510 |
+ wl='-Wl,'
|
|
8511 |
+ ;;
|
|
8512 |
+ solaris*)
|
|
8513 |
+ wl='-Wl,'
|
|
8514 |
+ ;;
|
|
8515 |
+ sunos4*)
|
|
8516 |
+ wl='-Qoption ld '
|
|
8517 |
+ ;;
|
|
8518 |
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
|
8519 |
+ if test "x$host_vendor" = xsni; then
|
|
8520 |
+ wl='-LD'
|
|
8521 |
+ else
|
|
8522 |
+ wl='-Wl,'
|
|
8523 |
+ fi
|
|
8524 |
+ ;;
|
|
8525 |
+ esac
|
|
8526 |
+fi
|
|
8527 |
+
|
|
8528 |
+hardcode_libdir_flag_spec=
|
|
8529 |
+hardcode_libdir_separator=
|
|
8530 |
+hardcode_direct=no
|
|
8531 |
+hardcode_minus_L=no
|
|
8532 |
+
|
|
8533 |
+case "$host_os" in
|
|
8534 |
+ cygwin* | mingw* | pw32*)
|
|
8535 |
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
8536 |
+ # When not using gcc, we currently assume that we are using
|
|
8537 |
+ # Microsoft Visual C++.
|
|
8538 |
+ if test "$GCC" != yes; then
|
|
8539 |
+ with_gnu_ld=no
|
|
8540 |
+ fi
|
|
8541 |
+ ;;
|
|
8542 |
+ openbsd*)
|
|
8543 |
+ with_gnu_ld=no
|
|
8544 |
+ ;;
|
|
8545 |
+esac
|
|
8546 |
+
|
|
8547 |
+ld_shlibs=yes
|
|
8548 |
+if test "$with_gnu_ld" = yes; then
|
|
8549 |
+ case "$host_os" in
|
|
8550 |
+ aix3* | aix4* | aix5*)
|
|
8551 |
+ # On AIX, the GNU linker is very broken
|
|
8552 |
+ ld_shlibs=no
|
|
8553 |
+ ;;
|
|
8554 |
+ amigaos*)
|
|
8555 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8556 |
+ hardcode_minus_L=yes
|
|
8557 |
+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
|
|
8558 |
+ # that the semantics of dynamic libraries on AmigaOS, at least up
|
|
8559 |
+ # to version 4, is to share data among multiple programs linked
|
|
8560 |
+ # with the same dynamic library. Since this doesn't match the
|
|
8561 |
+ # behavior of shared libraries on other platforms, we can use
|
|
8562 |
+ # them.
|
|
8563 |
+ ld_shlibs=no
|
|
8564 |
+ ;;
|
|
8565 |
+ beos*)
|
|
8566 |
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
|
8567 |
+ :
|
|
8568 |
+ else
|
|
8569 |
+ ld_shlibs=no
|
|
8570 |
+ fi
|
|
8571 |
+ ;;
|
|
8572 |
+ cygwin* | mingw* | pw32*)
|
|
8573 |
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
8574 |
+ # no search path for DLLs.
|
|
8575 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8576 |
+ ;;
|
|
8577 |
+ solaris* | sysv5*)
|
|
8578 |
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
|
|
8579 |
+ ld_shlibs=no
|
|
8580 |
+ elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
|
8581 |
+ :
|
|
8582 |
+ else
|
|
8583 |
+ ld_shlibs=no
|
|
8584 |
+ fi
|
|
8585 |
+ ;;
|
|
8586 |
+ sunos4*)
|
|
8587 |
+ hardcode_direct=yes
|
|
8588 |
+ ;;
|
|
8589 |
+ *)
|
|
8590 |
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
|
8591 |
+ :
|
|
8592 |
+ else
|
|
8593 |
+ ld_shlibs=no
|
|
8594 |
+ fi
|
|
8595 |
+ ;;
|
|
8596 |
+ esac
|
|
8597 |
+ if test "$ld_shlibs" = yes; then
|
|
8598 |
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
8599 |
+ fi
|
|
8600 |
+else
|
|
8601 |
+ case "$host_os" in
|
|
8602 |
+ aix3*)
|
|
8603 |
+ # Note: this linker hardcodes the directories in LIBPATH if there
|
|
8604 |
+ # are no directories specified by -L.
|
|
8605 |
+ hardcode_minus_L=yes
|
|
8606 |
+ if test "$GCC" = yes; then
|
|
8607 |
+ # Neither direct hardcoding nor static linking is supported with a
|
|
8608 |
+ # broken collect2.
|
|
8609 |
+ hardcode_direct=unsupported
|
|
8610 |
+ fi
|
|
8611 |
+ ;;
|
|
8612 |
+ aix4* | aix5*)
|
|
8613 |
+ if test "$host_cpu" = ia64; then
|
|
8614 |
+ # On IA64, the linker does run time linking by default, so we don't
|
|
8615 |
+ # have to do anything special.
|
|
8616 |
+ aix_use_runtimelinking=no
|
|
8617 |
+ else
|
|
8618 |
+ aix_use_runtimelinking=no
|
|
8619 |
+ # Test if we are trying to use run time linking or normal
|
|
8620 |
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
|
8621 |
+ # need to do runtime linking.
|
|
8622 |
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
|
|
8623 |
+ for ld_flag in $LDFLAGS; do
|
|
8624 |
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
|
8625 |
+ aix_use_runtimelinking=yes
|
|
8626 |
+ break
|
|
8627 |
+ fi
|
|
8628 |
+ done
|
|
8629 |
+ esac
|
|
8630 |
+ fi
|
|
8631 |
+ hardcode_direct=yes
|
|
8632 |
+ hardcode_libdir_separator=':'
|
|
8633 |
+ if test "$GCC" = yes; then
|
|
8634 |
+ case $host_os in aix4.[012]|aix4.[012].*)
|
|
8635 |
+ collect2name=`${CC} -print-prog-name=collect2`
|
|
8636 |
+ if test -f "$collect2name" && \
|
|
8637 |
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
|
|
8638 |
+ then
|
|
8639 |
+ # We have reworked collect2
|
|
8640 |
+ hardcode_direct=yes
|
|
8641 |
+ else
|
|
8642 |
+ # We have old collect2
|
|
8643 |
+ hardcode_direct=unsupported
|
|
8644 |
+ hardcode_minus_L=yes
|
|
8645 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8646 |
+ hardcode_libdir_separator=
|
|
8647 |
+ fi
|
|
8648 |
+ esac
|
|
8649 |
+ fi
|
|
8650 |
+ if test "$aix_use_runtimelinking" = yes; then
|
|
8651 |
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
|
|
8652 |
+ else
|
|
8653 |
+ if test "$host_cpu" = ia64; then
|
|
8654 |
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
8655 |
+ else
|
|
8656 |
+ hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
|
|
8657 |
+ fi
|
|
8658 |
+ fi
|
|
8659 |
+ ;;
|
|
8660 |
+ amigaos*)
|
|
8661 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8662 |
+ hardcode_minus_L=yes
|
|
8663 |
+ # see comment about different semantics on the GNU ld section
|
|
8664 |
+ ld_shlibs=no
|
|
8665 |
+ ;;
|
|
8666 |
+ cygwin* | mingw* | pw32*)
|
|
8667 |
+ # When not using gcc, we currently assume that we are using
|
|
8668 |
+ # Microsoft Visual C++.
|
|
8669 |
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
8670 |
+ # no search path for DLLs.
|
|
8671 |
+ hardcode_libdir_flag_spec=' '
|
|
8672 |
+ libext=lib
|
|
8673 |
+ ;;
|
|
8674 |
+ darwin* | rhapsody*)
|
|
8675 |
+ hardcode_direct=yes
|
|
8676 |
+ ;;
|
|
8677 |
+ freebsd1*)
|
|
8678 |
+ ld_shlibs=no
|
|
8679 |
+ ;;
|
|
8680 |
+ freebsd2.2*)
|
|
8681 |
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
8682 |
+ hardcode_direct=yes
|
|
8683 |
+ ;;
|
|
8684 |
+ freebsd2*)
|
|
8685 |
+ hardcode_direct=yes
|
|
8686 |
+ hardcode_minus_L=yes
|
|
8687 |
+ ;;
|
|
8688 |
+ freebsd*)
|
|
8689 |
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
8690 |
+ hardcode_direct=yes
|
|
8691 |
+ ;;
|
|
8692 |
+ hpux9* | hpux10* | hpux11*)
|
|
8693 |
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
|
8694 |
+ hardcode_libdir_separator=:
|
|
8695 |
+ hardcode_direct=yes
|
|
8696 |
+ hardcode_minus_L=yes # Not in the search PATH, but as the default
|
|
8697 |
+ # location of the library.
|
|
8698 |
+ ;;
|
|
8699 |
+ irix5* | irix6*)
|
|
8700 |
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
8701 |
+ hardcode_libdir_separator=:
|
|
8702 |
+ ;;
|
|
8703 |
+ netbsd*)
|
|
8704 |
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
8705 |
+ hardcode_direct=yes
|
|
8706 |
+ ;;
|
|
8707 |
+ newsos6)
|
|
8708 |
+ hardcode_direct=yes
|
|
8709 |
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
8710 |
+ hardcode_libdir_separator=:
|
|
8711 |
+ ;;
|
|
8712 |
+ openbsd*)
|
|
8713 |
+ hardcode_direct=yes
|
|
8714 |
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
8715 |
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
8716 |
+ else
|
|
8717 |
+ case "$host_os" in
|
|
8718 |
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
|
8719 |
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
8720 |
+ ;;
|
|
8721 |
+ *)
|
|
8722 |
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
8723 |
+ ;;
|
|
8724 |
+ esac
|
|
8725 |
+ fi
|
|
8726 |
+ ;;
|
|
8727 |
+ os2*)
|
|
8728 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8729 |
+ hardcode_minus_L=yes
|
|
8730 |
+ ;;
|
|
8731 |
+ osf3*)
|
|
8732 |
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
8733 |
+ hardcode_libdir_separator=:
|
|
8734 |
+ ;;
|
|
8735 |
+ osf4* | osf5*)
|
|
8736 |
+ if test "$GCC" = yes; then
|
|
8737 |
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
8738 |
+ else
|
|
8739 |
+ # Both cc and cxx compiler support -rpath directly
|
|
8740 |
+ hardcode_libdir_flag_spec='-rpath $libdir'
|
|
8741 |
+ fi
|
|
8742 |
+ hardcode_libdir_separator=:
|
|
8743 |
+ ;;
|
|
8744 |
+ sco3.2v5*)
|
|
8745 |
+ ;;
|
|
8746 |
+ solaris*)
|
|
8747 |
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
8748 |
+ ;;
|
|
8749 |
+ sunos4*)
|
|
8750 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8751 |
+ hardcode_direct=yes
|
|
8752 |
+ hardcode_minus_L=yes
|
|
8753 |
+ ;;
|
|
8754 |
+ sysv4)
|
|
8755 |
+ if test "x$host_vendor" = xsno; then
|
|
8756 |
+ hardcode_direct=yes # is this really true???
|
|
8757 |
+ else
|
|
8758 |
+ hardcode_direct=no # Motorola manual says yes, but my tests say they lie
|
|
8759 |
+ fi
|
|
8760 |
+ ;;
|
|
8761 |
+ sysv4.3*)
|
|
8762 |
+ ;;
|
|
8763 |
+ sysv5*)
|
|
8764 |
+ hardcode_libdir_flag_spec=
|
|
8765 |
+ ;;
|
|
8766 |
+ uts4*)
|
|
8767 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8768 |
+ ;;
|
|
8769 |
+ dgux*)
|
|
8770 |
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
8771 |
+ ;;
|
|
8772 |
+ sysv4*MP*)
|
|
8773 |
+ if test -d /usr/nec; then
|
|
8774 |
+ ld_shlibs=yes
|
|
8775 |
+ fi
|
|
8776 |
+ ;;
|
|
8777 |
+ sysv4.2uw2*)
|
|
8778 |
+ hardcode_direct=yes
|
|
8779 |
+ hardcode_minus_L=no
|
|
8780 |
+ ;;
|
|
8781 |
+ sysv5uw7* | unixware7*)
|
|
8782 |
+ ;;
|
|
8783 |
+ *)
|
|
8784 |
+ ld_shlibs=no
|
|
8785 |
+ ;;
|
|
8786 |
+ esac
|
|
8787 |
+fi
|
|
8788 |
+
|
|
8789 |
+# Check dynamic linker characteristics
|
|
8790 |
+libname_spec='lib$name'
|
|
8791 |
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
8792 |
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
8793 |
+case "$host_os" in
|
|
8794 |
+ aix3*)
|
|
8795 |
+ shlibext=so
|
|
8796 |
+ ;;
|
|
8797 |
+ aix4* | aix5*)
|
|
8798 |
+ shlibext=so
|
|
8799 |
+ ;;
|
|
8800 |
+ amigaos*)
|
|
8801 |
+ shlibext=ixlibrary
|
|
8802 |
+ ;;
|
|
8803 |
+ beos*)
|
|
8804 |
+ shlibext=so
|
|
8805 |
+ ;;
|
|
8806 |
+ bsdi4*)
|
|
8807 |
+ shlibext=so
|
|
8808 |
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
|
8809 |
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
|
|
8810 |
+ ;;
|
|
8811 |
+ cygwin* | mingw* | pw32*)
|
|
8812 |
+ case $GCC,$host_os in
|
|
8813 |
+ yes,cygwin*)
|
|
8814 |
+ shlibext=dll.a
|
|
8815 |
+ ;;
|
|
8816 |
+ yes,mingw*)
|
|
8817 |
+ shlibext=dll
|
|
8818 |
+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
|
|
8819 |
+ ;;
|
|
8820 |
+ yes,pw32*)
|
|
8821 |
+ shlibext=dll
|
|
8822 |
+ ;;
|
|
8823 |
+ *)
|
|
8824 |
+ shlibext=dll
|
|
8825 |
+ ;;
|
|
8826 |
+ esac
|
|
8827 |
+ ;;
|
|
8828 |
+ darwin* | rhapsody*)
|
|
8829 |
+ shlibext=dylib
|
|
8830 |
+ ;;
|
|
8831 |
+ freebsd1*)
|
|
8832 |
+ ;;
|
|
8833 |
+ freebsd*)
|
|
8834 |
+ shlibext=so
|
|
8835 |
+ ;;
|
|
8836 |
+ gnu*)
|
|
8837 |
+ shlibext=so
|
|
8838 |
+ ;;
|
|
8839 |
+ hpux9* | hpux10* | hpux11*)
|
|
8840 |
+ shlibext=sl
|
|
8841 |
+ ;;
|
|
8842 |
+ irix5* | irix6*)
|
|
8843 |
+ shlibext=so
|
|
8844 |
+ case "$host_os" in
|
|
8845 |
+ irix5*)
|
|
8846 |
+ libsuff= shlibsuff=
|
|
8847 |
+ ;;
|
|
8848 |
+ *)
|
|
8849 |
+ case $LD in
|
|
8850 |
+ *-32|*"-32 ") libsuff= shlibsuff= ;;
|
|
8851 |
+ *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
|
|
8852 |
+ *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
|
|
8853 |
+ *) libsuff= shlibsuff= ;;
|
|
8854 |
+ esac
|
|
8855 |
+ ;;
|
|
8856 |
+ esac
|
|
8857 |
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
|
|
8858 |
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
|
|
8859 |
+ ;;
|
|
8860 |
+ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
|
|
8861 |
+ ;;
|
|
8862 |
+ linux-gnu*)
|
|
8863 |
+ shlibext=so
|
|
8864 |
+ ;;
|
|
8865 |
+ netbsd*)
|
|
8866 |
+ shlibext=so
|
|
8867 |
+ ;;
|
|
8868 |
+ newsos6)
|
|
8869 |
+ shlibext=so
|
|
8870 |
+ ;;
|
|
8871 |
+ openbsd*)
|
|
8872 |
+ shlibext=so
|
|
8873 |
+ ;;
|
|
8874 |
+ os2*)
|
|
8875 |
+ libname_spec='$name'
|
|
8876 |
+ shlibext=dll
|
|
8877 |
+ ;;
|
|
8878 |
+ osf3* | osf4* | osf5*)
|
|
8879 |
+ shlibext=so
|
|
8880 |
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
|
|
8881 |
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
|
|
8882 |
+ ;;
|
|
8883 |
+ sco3.2v5*)
|
|
8884 |
+ shlibext=so
|
|
8885 |
+ ;;
|
|
8886 |
+ solaris*)
|
|
8887 |
+ shlibext=so
|
|
8888 |
+ ;;
|
|
8889 |
+ sunos4*)
|
|
8890 |
+ shlibext=so
|
|
8891 |
+ ;;
|
|
8892 |
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
|
8893 |
+ shlibext=so
|
|
8894 |
+ case "$host_vendor" in
|
|
8895 |
+ motorola)
|
|
8896 |
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
|
|
8897 |
+ ;;
|
|
8898 |
+ esac
|
|
8899 |
+ ;;
|
|
8900 |
+ uts4*)
|
|
8901 |
+ shlibext=so
|
|
8902 |
+ ;;
|
|
8903 |
+ dgux*)
|
|
8904 |
+ shlibext=so
|
|
8905 |
+ ;;
|
|
8906 |
+ sysv4*MP*)
|
|
8907 |
+ if test -d /usr/nec; then
|
|
8908 |
+ shlibext=so
|
|
8909 |
+ fi
|
|
8910 |
+ ;;
|
|
8911 |
+esac
|
|
8912 |
+
|
|
8913 |
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
|
|
8914 |
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
8915 |
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
8916 |
+escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
8917 |
+escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
8918 |
+
|
|
8919 |
+sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
|
|
8920 |
+
|
|
8921 |
+# How to pass a linker flag through the compiler.
|
|
8922 |
+wl="$escaped_wl"
|
|
8923 |
+
|
|
8924 |
+# Static library suffix (normally "a").
|
|
8925 |
+libext="$libext"
|
|
8926 |
+
|
|
8927 |
+# Shared library suffix (normally "so").
|
|
8928 |
+shlibext="$shlibext"
|
|
8929 |
+
|
|
8930 |
+# Flag to hardcode \$libdir into a binary during linking.
|
|
8931 |
+# This must work even if \$libdir does not exist.
|
|
8932 |
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
|
|
8933 |
+
|
|
8934 |
+# Whether we need a single -rpath flag with a separated argument.
|
|
8935 |
+hardcode_libdir_separator="$hardcode_libdir_separator"
|
|
8936 |
+
|
|
8937 |
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
|
|
8938 |
+# resulting binary.
|
|
8939 |
+hardcode_direct="$hardcode_direct"
|
|
8940 |
+
|
|
8941 |
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
|
|
8942 |
+# resulting binary.
|
|
8943 |
+hardcode_minus_L="$hardcode_minus_L"
|
|
8944 |
+
|
|
8945 |
+# Compile-time system search path for libraries
|
|
8946 |
+sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
|
|
8947 |
+
|
|
8948 |
+# Run-time system search path for libraries
|
|
8949 |
+sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
|
|
8950 |
+
|
|
8951 |
+EOF
|
|
8952 |
diff -pruN dillo-0.8.6/config.sub dillo-0.8.6-i18n-misc-20070916/config.sub
|
|
8953 |
--- dillo-0.8.6/config.sub 2005-03-22 16:17:05.000000000 +0900
|
|
8954 |
+++ dillo-0.8.6-i18n-misc-20070916/config.sub 2006-05-16 01:21:07.000000000 +0900
|
|
8955 |
@@ -1,9 +1,9 @@
|
|
8956 |
#! /bin/sh
|
|
8957 |
# Configuration validation subroutine script.
|
|
8958 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
8959 |
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
8960 |
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
|
8961 |
|
|
8962 |
-timestamp='2005-02-10'
|
|
8963 |
+timestamp='2004-03-12'
|
|
8964 |
|
|
8965 |
# This file is (in principle) common to ALL GNU software.
|
|
8966 |
# The presence of a machine in this file suggests that SOME GNU software
|
|
8967 |
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patch
|
|
8968 |
version="\
|
|
8969 |
GNU config.sub ($timestamp)
|
|
8970 |
|
|
8971 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
8972 |
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
|
|
8973 |
Free Software Foundation, Inc.
|
|
8974 |
|
|
8975 |
This is free software; see the source for copying conditions. There is NO
|
|
8976 |
@@ -145,7 +145,7 @@ case $os in
|
|
8977 |
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
|
8978 |
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
|
8979 |
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
|
8980 |
- -apple | -axis | -knuth | -cray)
|
|
8981 |
+ -apple | -axis)
|
|
8982 |
os=
|
|
8983 |
basic_machine=$1
|
|
8984 |
;;
|
|
8985 |
@@ -237,7 +237,7 @@ case $basic_machine in
|
|
8986 |
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
|
8987 |
| i370 | i860 | i960 | ia64 \
|
|
8988 |
| ip2k | iq2000 \
|
|
8989 |
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
|
8990 |
+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
|
|
8991 |
| mips | mipsbe | mipseb | mipsel | mipsle \
|
|
8992 |
| mips16 \
|
|
8993 |
| mips64 | mips64el \
|
|
8994 |
@@ -264,10 +264,10 @@ case $basic_machine in
|
|
8995 |
| sh64 | sh64le \
|
|
8996 |
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
|
|
8997 |
| strongarm \
|
|
8998 |
- | tahoe | thumb | tic4x | tic80 | tron \
|
|
8999 |
+ | tahoe | thumb | tic80 | tron \
|
|
9000 |
| v850 | v850e \
|
|
9001 |
| we32k \
|
|
9002 |
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
|
9003 |
+ | x86 | xscale | xstormy16 | xtensa \
|
|
9004 |
| z8k)
|
|
9005 |
basic_machine=$basic_machine-unknown
|
|
9006 |
;;
|
|
9007 |
@@ -300,7 +300,7 @@ case $basic_machine in
|
|
9008 |
| avr-* \
|
|
9009 |
| bs2000-* \
|
|
9010 |
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
|
9011 |
- | clipper-* | craynv-* | cydra-* \
|
|
9012 |
+ | clipper-* | cydra-* \
|
|
9013 |
| d10v-* | d30v-* | dlx-* \
|
|
9014 |
| elxsi-* \
|
|
9015 |
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
|
9016 |
@@ -310,7 +310,7 @@ case $basic_machine in
|
|
9017 |
| ip2k-* | iq2000-* \
|
|
9018 |
| m32r-* | m32rle-* \
|
|
9019 |
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
9020 |
- | m88110-* | m88k-* | maxq-* | mcore-* \
|
|
9021 |
+ | m88110-* | m88k-* | mcore-* \
|
|
9022 |
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
|
9023 |
| mips16-* \
|
|
9024 |
| mips64-* | mips64el-* \
|
|
9025 |
@@ -326,9 +326,8 @@ case $basic_machine in
|
|
9026 |
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
|
9027 |
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
|
9028 |
| mipstx39-* | mipstx39el-* \
|
|
9029 |
- | mmix-* \
|
|
9030 |
| msp430-* \
|
|
9031 |
- | none-* | np1-* | ns16k-* | ns32k-* \
|
|
9032 |
+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
|
|
9033 |
| orion-* \
|
|
9034 |
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
|
9035 |
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
|
9036 |
@@ -343,8 +342,8 @@ case $basic_machine in
|
|
9037 |
| tron-* \
|
|
9038 |
| v850-* | v850e-* | vax-* \
|
|
9039 |
| we32k-* \
|
|
9040 |
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
|
9041 |
- | xstormy16-* | xtensa-* \
|
|
9042 |
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
|
|
9043 |
+ | xtensa-* \
|
|
9044 |
| ymp-* \
|
|
9045 |
| z8k-*)
|
|
9046 |
;;
|
|
9047 |
@@ -446,10 +445,6 @@ case $basic_machine in
|
|
9048 |
basic_machine=j90-cray
|
|
9049 |
os=-unicos
|
|
9050 |
;;
|
|
9051 |
- craynv)
|
|
9052 |
- basic_machine=craynv-cray
|
|
9053 |
- os=-unicosmp
|
|
9054 |
- ;;
|
|
9055 |
cr16c)
|
|
9056 |
basic_machine=cr16c-unknown
|
|
9057 |
os=-elf
|
|
9058 |
@@ -457,9 +452,6 @@ case $basic_machine in
|
|
9059 |
crds | unos)
|
|
9060 |
basic_machine=m68k-crds
|
|
9061 |
;;
|
|
9062 |
- crisv32 | crisv32-* | etraxfs*)
|
|
9063 |
- basic_machine=crisv32-axis
|
|
9064 |
- ;;
|
|
9065 |
cris | cris-* | etrax*)
|
|
9066 |
basic_machine=cris-axis
|
|
9067 |
;;
|
|
9068 |
@@ -489,10 +481,6 @@ case $basic_machine in
|
|
9069 |
basic_machine=m88k-motorola
|
|
9070 |
os=-sysv3
|
|
9071 |
;;
|
|
9072 |
- djgpp)
|
|
9073 |
- basic_machine=i586-pc
|
|
9074 |
- os=-msdosdjgpp
|
|
9075 |
- ;;
|
|
9076 |
dpx20 | dpx20-*)
|
|
9077 |
basic_machine=rs6000-bull
|
|
9078 |
os=-bosx
|
|
9079 |
@@ -671,6 +659,10 @@ case $basic_machine in
|
|
9080 |
mips3*)
|
|
9081 |
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
|
|
9082 |
;;
|
|
9083 |
+ mmix*)
|
|
9084 |
+ basic_machine=mmix-knuth
|
|
9085 |
+ os=-mmixware
|
|
9086 |
+ ;;
|
|
9087 |
monitor)
|
|
9088 |
basic_machine=m68k-rom68k
|
|
9089 |
os=-coff
|
|
9090 |
@@ -751,6 +743,10 @@ case $basic_machine in
|
|
9091 |
np1)
|
|
9092 |
basic_machine=np1-gould
|
|
9093 |
;;
|
|
9094 |
+ nv1)
|
|
9095 |
+ basic_machine=nv1-cray
|
|
9096 |
+ os=-unicosmp
|
|
9097 |
+ ;;
|
|
9098 |
nsr-tandem)
|
|
9099 |
basic_machine=nsr-tandem
|
|
9100 |
;;
|
|
9101 |
@@ -797,24 +793,18 @@ case $basic_machine in
|
|
9102 |
pentiumpro | p6 | 6x86 | athlon | athlon_*)
|
|
9103 |
basic_machine=i686-pc
|
|
9104 |
;;
|
|
9105 |
- pentiumii | pentium2 | pentiumiii | pentium3)
|
|
9106 |
+ pentiumii | pentium2)
|
|
9107 |
basic_machine=i686-pc
|
|
9108 |
;;
|
|
9109 |
- pentium4)
|
|
9110 |
- basic_machine=i786-pc
|
|
9111 |
- ;;
|
|
9112 |
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
|
|
9113 |
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
9114 |
;;
|
|
9115 |
pentiumpro-* | p6-* | 6x86-* | athlon-*)
|
|
9116 |
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
9117 |
;;
|
|
9118 |
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
|
|
9119 |
+ pentiumii-* | pentium2-*)
|
|
9120 |
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
9121 |
;;
|
|
9122 |
- pentium4-*)
|
|
9123 |
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
9124 |
- ;;
|
|
9125 |
pn)
|
|
9126 |
basic_machine=pn-gould
|
|
9127 |
;;
|
|
9128 |
@@ -873,10 +863,6 @@ case $basic_machine in
|
|
9129 |
sb1el)
|
|
9130 |
basic_machine=mipsisa64sb1el-unknown
|
|
9131 |
;;
|
|
9132 |
- sei)
|
|
9133 |
- basic_machine=mips-sei
|
|
9134 |
- os=-seiux
|
|
9135 |
- ;;
|
|
9136 |
sequent)
|
|
9137 |
basic_machine=i386-sequent
|
|
9138 |
;;
|
|
9139 |
@@ -884,9 +870,6 @@ case $basic_machine in
|
|
9140 |
basic_machine=sh-hitachi
|
|
9141 |
os=-hms
|
|
9142 |
;;
|
|
9143 |
- sh64)
|
|
9144 |
- basic_machine=sh64-unknown
|
|
9145 |
- ;;
|
|
9146 |
sparclite-wrs | simso-wrs)
|
|
9147 |
basic_machine=sparclite-wrs
|
|
9148 |
os=-vxworks
|
|
9149 |
@@ -961,6 +944,10 @@ case $basic_machine in
|
|
9150 |
basic_machine=t90-cray
|
|
9151 |
os=-unicos
|
|
9152 |
;;
|
|
9153 |
+ tic4x | c4x*)
|
|
9154 |
+ basic_machine=tic4x-unknown
|
|
9155 |
+ os=-coff
|
|
9156 |
+ ;;
|
|
9157 |
tic54x | c54x*)
|
|
9158 |
basic_machine=tic54x-unknown
|
|
9159 |
os=-coff
|
|
9160 |
@@ -1033,10 +1020,6 @@ case $basic_machine in
|
|
9161 |
basic_machine=hppa1.1-winbond
|
|
9162 |
os=-proelf
|
|
9163 |
;;
|
|
9164 |
- xbox)
|
|
9165 |
- basic_machine=i686-pc
|
|
9166 |
- os=-mingw32
|
|
9167 |
- ;;
|
|
9168 |
xps | xps100)
|
|
9169 |
basic_machine=xps100-honeywell
|
|
9170 |
;;
|
|
9171 |
@@ -1067,9 +1050,6 @@ case $basic_machine in
|
|
9172 |
romp)
|
|
9173 |
basic_machine=romp-ibm
|
|
9174 |
;;
|
|
9175 |
- mmix)
|
|
9176 |
- basic_machine=mmix-knuth
|
|
9177 |
- ;;
|
|
9178 |
rs6000)
|
|
9179 |
basic_machine=rs6000-ibm
|
|
9180 |
;;
|
|
9181 |
@@ -1202,9 +1182,6 @@ case $os in
|
|
9182 |
-mac*)
|
|
9183 |
os=`echo $os | sed -e 's|mac|macos|'`
|
|
9184 |
;;
|
|
9185 |
- -linux-dietlibc)
|
|
9186 |
- os=-linux-dietlibc
|
|
9187 |
- ;;
|
|
9188 |
-linux*)
|
|
9189 |
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
|
9190 |
;;
|
|
9191 |
@@ -1305,9 +1282,6 @@ case $os in
|
|
9192 |
-kaos*)
|
|
9193 |
os=-kaos
|
|
9194 |
;;
|
|
9195 |
- -zvmoe)
|
|
9196 |
- os=-zvmoe
|
|
9197 |
- ;;
|
|
9198 |
-none)
|
|
9199 |
;;
|
|
9200 |
*)
|
|
9201 |
@@ -1339,9 +1313,6 @@ case $basic_machine in
|
|
9202 |
arm*-semi)
|
|
9203 |
os=-aout
|
|
9204 |
;;
|
|
9205 |
- c4x-* | tic4x-*)
|
|
9206 |
- os=-coff
|
|
9207 |
- ;;
|
|
9208 |
# This must come before the *-dec entry.
|
|
9209 |
pdp10-*)
|
|
9210 |
os=-tops20
|
|
9211 |
@@ -1388,9 +1359,6 @@ case $basic_machine in
|
|
9212 |
*-ibm)
|
|
9213 |
os=-aix
|
|
9214 |
;;
|
|
9215 |
- *-knuth)
|
|
9216 |
- os=-mmixware
|
|
9217 |
- ;;
|
|
9218 |
*-wec)
|
|
9219 |
os=-proelf
|
|
9220 |
;;
|
|
9221 |
diff -pruN dillo-0.8.6/configure dillo-0.8.6-i18n-misc-20070916/configure
|
|
9222 |
--- dillo-0.8.6/configure 2006-04-27 01:06:45.000000000 +0900
|
|
9223 |
+++ dillo-0.8.6-i18n-misc-20070916/configure 2007-09-07 01:00:43.000000000 +0900
|
|
9224 |
@@ -1,25 +1,54 @@
|
|
9225 |
#! /bin/sh
|
|
9226 |
# Guess values for system-dependent variables and create Makefiles.
|
|
9227 |
-# Generated by GNU Autoconf 2.59.
|
|
9228 |
+# Generated by GNU Autoconf 2.61.
|
|
9229 |
#
|
|
9230 |
-# Copyright (C) 2003 Free Software Foundation, Inc.
|
|
9231 |
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
9232 |
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
9233 |
# This configure script is free software; the Free Software Foundation
|
|
9234 |
# gives unlimited permission to copy, distribute and modify it.
|
|
9235 |
## --------------------- ##
|
|
9236 |
## M4sh Initialization. ##
|
|
9237 |
## --------------------- ##
|
|
9238 |
|
|
9239 |
-# Be Bourne compatible
|
|
9240 |
+# Be more Bourne compatible
|
|
9241 |
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
9242 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
9243 |
emulate sh
|
|
9244 |
NULLCMD=:
|
|
9245 |
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
9246 |
# is contrary to our usage. Disable this feature.
|
|
9247 |
alias -g '${1+"$@"}'='"$@"'
|
|
9248 |
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
9249 |
- set -o posix
|
|
9250 |
+ setopt NO_GLOB_SUBST
|
|
9251 |
+else
|
|
9252 |
+ case `(set -o) 2>/dev/null` in
|
|
9253 |
+ *posix*) set -o posix ;;
|
|
9254 |
+esac
|
|
9255 |
+
|
|
9256 |
+fi
|
|
9257 |
+
|
|
9258 |
+
|
|
9259 |
+
|
|
9260 |
+
|
|
9261 |
+# PATH needs CR
|
|
9262 |
+# Avoid depending upon Character Ranges.
|
|
9263 |
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
9264 |
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
9265 |
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
9266 |
+as_cr_digits='0123456789'
|
|
9267 |
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
9268 |
+
|
|
9269 |
+# The user is always right.
|
|
9270 |
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
9271 |
+ echo "#! /bin/sh" >conf$$.sh
|
|
9272 |
+ echo "exit 0" >>conf$$.sh
|
|
9273 |
+ chmod +x conf$$.sh
|
|
9274 |
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
9275 |
+ PATH_SEPARATOR=';'
|
|
9276 |
+ else
|
|
9277 |
+ PATH_SEPARATOR=:
|
|
9278 |
+ fi
|
|
9279 |
+ rm -f conf$$.sh
|
|
9280 |
fi
|
|
9281 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
9282 |
|
|
9283 |
# Support unset when possible.
|
|
9284 |
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
9285 |
@@ -29,8 +58,43 @@ else
|
|
9286 |
fi
|
|
9287 |
|
|
9288 |
|
|
9289 |
+# IFS
|
|
9290 |
+# We need space, tab and new line, in precisely that order. Quoting is
|
|
9291 |
+# there to prevent editors from complaining about space-tab.
|
|
9292 |
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
9293 |
+# splitting by setting IFS to empty value.)
|
|
9294 |
+as_nl='
|
|
9295 |
+'
|
|
9296 |
+IFS=" "" $as_nl"
|
|
9297 |
+
|
|
9298 |
+# Find who we are. Look in the path if we contain no directory separator.
|
|
9299 |
+case $0 in
|
|
9300 |
+ *[\\/]* ) as_myself=$0 ;;
|
|
9301 |
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
9302 |
+for as_dir in $PATH
|
|
9303 |
+do
|
|
9304 |
+ IFS=$as_save_IFS
|
|
9305 |
+ test -z "$as_dir" && as_dir=.
|
|
9306 |
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
9307 |
+done
|
|
9308 |
+IFS=$as_save_IFS
|
|
9309 |
+
|
|
9310 |
+ ;;
|
|
9311 |
+esac
|
|
9312 |
+# We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
9313 |
+# in which case we are not to be found in the path.
|
|
9314 |
+if test "x$as_myself" = x; then
|
|
9315 |
+ as_myself=$0
|
|
9316 |
+fi
|
|
9317 |
+if test ! -f "$as_myself"; then
|
|
9318 |
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
9319 |
+ { (exit 1); exit 1; }
|
|
9320 |
+fi
|
|
9321 |
+
|
|
9322 |
# Work around bugs in pre-3.0 UWIN ksh.
|
|
9323 |
-$as_unset ENV MAIL MAILPATH
|
|
9324 |
+for as_var in ENV MAIL MAILPATH
|
|
9325 |
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
9326 |
+done
|
|
9327 |
PS1='$ '
|
|
9328 |
PS2='> '
|
|
9329 |
PS4='+ '
|
|
9330 |
@@ -44,18 +108,19 @@ do
|
|
9331 |
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
9332 |
eval $as_var=C; export $as_var
|
|
9333 |
else
|
|
9334 |
- $as_unset $as_var
|
|
9335 |
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
9336 |
fi
|
|
9337 |
done
|
|
9338 |
|
|
9339 |
# Required to use basename.
|
|
9340 |
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
9341 |
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
9342 |
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
9343 |
as_expr=expr
|
|
9344 |
else
|
|
9345 |
as_expr=false
|
|
9346 |
fi
|
|
9347 |
|
|
9348 |
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
|
9349 |
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
9350 |
as_basename=basename
|
|
9351 |
else
|
|
9352 |
as_basename=false
|
|
9353 |
@@ -63,157 +128,388 @@ fi
|
|
9354 |
|
|
9355 |
|
|
9356 |
# Name of the executable.
|
|
9357 |
-as_me=`$as_basename "$0" ||
|
|
9358 |
+as_me=`$as_basename -- "$0" ||
|
|
9359 |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
9360 |
X"$0" : 'X\(//\)$' \| \
|
|
9361 |
- X"$0" : 'X\(/\)$' \| \
|
|
9362 |
- . : '\(.\)' 2>/dev/null ||
|
|
9363 |
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
9364 |
echo X/"$0" |
|
|
9365 |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
|
9366 |
- /^X\/\(\/\/\)$/{ s//\1/; q; }
|
|
9367 |
- /^X\/\(\/\).*/{ s//\1/; q; }
|
|
9368 |
- s/.*/./; q'`
|
|
9369 |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
9370 |
+ s//\1/
|
|
9371 |
+ q
|
|
9372 |
+ }
|
|
9373 |
+ /^X\/\(\/\/\)$/{
|
|
9374 |
+ s//\1/
|
|
9375 |
+ q
|
|
9376 |
+ }
|
|
9377 |
+ /^X\/\(\/\).*/{
|
|
9378 |
+ s//\1/
|
|
9379 |
+ q
|
|
9380 |
+ }
|
|
9381 |
+ s/.*/./; q'`
|
|
9382 |
|
|
9383 |
+# CDPATH.
|
|
9384 |
+$as_unset CDPATH
|
|
9385 |
|
|
9386 |
-# PATH needs CR, and LINENO needs CR and PATH.
|
|
9387 |
-# Avoid depending upon Character Ranges.
|
|
9388 |
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
9389 |
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
9390 |
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
9391 |
-as_cr_digits='0123456789'
|
|
9392 |
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
9393 |
|
|
9394 |
-# The user is always right.
|
|
9395 |
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
9396 |
- echo "#! /bin/sh" >conf$$.sh
|
|
9397 |
- echo "exit 0" >>conf$$.sh
|
|
9398 |
- chmod +x conf$$.sh
|
|
9399 |
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
9400 |
- PATH_SEPARATOR=';'
|
|
9401 |
- else
|
|
9402 |
- PATH_SEPARATOR=:
|
|
9403 |
- fi
|
|
9404 |
- rm -f conf$$.sh
|
|
9405 |
+if test "x$CONFIG_SHELL" = x; then
|
|
9406 |
+ if (eval ":") 2>/dev/null; then
|
|
9407 |
+ as_have_required=yes
|
|
9408 |
+else
|
|
9409 |
+ as_have_required=no
|
|
9410 |
+fi
|
|
9411 |
+
|
|
9412 |
+ if test $as_have_required = yes && (eval ":
|
|
9413 |
+(as_func_return () {
|
|
9414 |
+ (exit \$1)
|
|
9415 |
+}
|
|
9416 |
+as_func_success () {
|
|
9417 |
+ as_func_return 0
|
|
9418 |
+}
|
|
9419 |
+as_func_failure () {
|
|
9420 |
+ as_func_return 1
|
|
9421 |
+}
|
|
9422 |
+as_func_ret_success () {
|
|
9423 |
+ return 0
|
|
9424 |
+}
|
|
9425 |
+as_func_ret_failure () {
|
|
9426 |
+ return 1
|
|
9427 |
+}
|
|
9428 |
+
|
|
9429 |
+exitcode=0
|
|
9430 |
+if as_func_success; then
|
|
9431 |
+ :
|
|
9432 |
+else
|
|
9433 |
+ exitcode=1
|
|
9434 |
+ echo as_func_success failed.
|
|
9435 |
fi
|
|
9436 |
|
|
9437 |
+if as_func_failure; then
|
|
9438 |
+ exitcode=1
|
|
9439 |
+ echo as_func_failure succeeded.
|
|
9440 |
+fi
|
|
9441 |
|
|
9442 |
- as_lineno_1=$LINENO
|
|
9443 |
- as_lineno_2=$LINENO
|
|
9444 |
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
9445 |
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
9446 |
- test "x$as_lineno_3" = "x$as_lineno_2" || {
|
|
9447 |
- # Find who we are. Look in the path if we contain no path at all
|
|
9448 |
- # relative or not.
|
|
9449 |
- case $0 in
|
|
9450 |
- *[\\/]* ) as_myself=$0 ;;
|
|
9451 |
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
9452 |
-for as_dir in $PATH
|
|
9453 |
-do
|
|
9454 |
- IFS=$as_save_IFS
|
|
9455 |
- test -z "$as_dir" && as_dir=.
|
|
9456 |
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
9457 |
-done
|
|
9458 |
+if as_func_ret_success; then
|
|
9459 |
+ :
|
|
9460 |
+else
|
|
9461 |
+ exitcode=1
|
|
9462 |
+ echo as_func_ret_success failed.
|
|
9463 |
+fi
|
|
9464 |
|
|
9465 |
- ;;
|
|
9466 |
- esac
|
|
9467 |
- # We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
9468 |
- # in which case we are not to be found in the path.
|
|
9469 |
- if test "x$as_myself" = x; then
|
|
9470 |
- as_myself=$0
|
|
9471 |
- fi
|
|
9472 |
- if test ! -f "$as_myself"; then
|
|
9473 |
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
|
|
9474 |
- { (exit 1); exit 1; }; }
|
|
9475 |
- fi
|
|
9476 |
- case $CONFIG_SHELL in
|
|
9477 |
- '')
|
|
9478 |
+if as_func_ret_failure; then
|
|
9479 |
+ exitcode=1
|
|
9480 |
+ echo as_func_ret_failure succeeded.
|
|
9481 |
+fi
|
|
9482 |
+
|
|
9483 |
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
9484 |
+ :
|
|
9485 |
+else
|
|
9486 |
+ exitcode=1
|
|
9487 |
+ echo positional parameters were not saved.
|
|
9488 |
+fi
|
|
9489 |
+
|
|
9490 |
+test \$exitcode = 0) || { (exit 1); exit 1; }
|
|
9491 |
+
|
|
9492 |
+(
|
|
9493 |
+ as_lineno_1=\$LINENO
|
|
9494 |
+ as_lineno_2=\$LINENO
|
|
9495 |
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
|
9496 |
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
|
9497 |
+") 2> /dev/null; then
|
|
9498 |
+ :
|
|
9499 |
+else
|
|
9500 |
+ as_candidate_shells=
|
|
9501 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
9502 |
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
9503 |
do
|
|
9504 |
IFS=$as_save_IFS
|
|
9505 |
test -z "$as_dir" && as_dir=.
|
|
9506 |
- for as_base in sh bash ksh sh5; do
|
|
9507 |
- case $as_dir in
|
|
9508 |
+ case $as_dir in
|
|
9509 |
/*)
|
|
9510 |
- if ("$as_dir/$as_base" -c '
|
|
9511 |
+ for as_base in sh bash ksh sh5; do
|
|
9512 |
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
|
9513 |
+ done;;
|
|
9514 |
+ esac
|
|
9515 |
+done
|
|
9516 |
+IFS=$as_save_IFS
|
|
9517 |
+
|
|
9518 |
+
|
|
9519 |
+ for as_shell in $as_candidate_shells $SHELL; do
|
|
9520 |
+ # Try only shells that exist, to save several forks.
|
|
9521 |
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
9522 |
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
|
|
9523 |
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
9524 |
+ emulate sh
|
|
9525 |
+ NULLCMD=:
|
|
9526 |
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
9527 |
+ # is contrary to our usage. Disable this feature.
|
|
9528 |
+ alias -g '${1+"$@"}'='"$@"'
|
|
9529 |
+ setopt NO_GLOB_SUBST
|
|
9530 |
+else
|
|
9531 |
+ case `(set -o) 2>/dev/null` in
|
|
9532 |
+ *posix*) set -o posix ;;
|
|
9533 |
+esac
|
|
9534 |
+
|
|
9535 |
+fi
|
|
9536 |
+
|
|
9537 |
+
|
|
9538 |
+:
|
|
9539 |
+_ASEOF
|
|
9540 |
+}; then
|
|
9541 |
+ CONFIG_SHELL=$as_shell
|
|
9542 |
+ as_have_required=yes
|
|
9543 |
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
|
|
9544 |
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
9545 |
+ emulate sh
|
|
9546 |
+ NULLCMD=:
|
|
9547 |
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
9548 |
+ # is contrary to our usage. Disable this feature.
|
|
9549 |
+ alias -g '${1+"$@"}'='"$@"'
|
|
9550 |
+ setopt NO_GLOB_SUBST
|
|
9551 |
+else
|
|
9552 |
+ case `(set -o) 2>/dev/null` in
|
|
9553 |
+ *posix*) set -o posix ;;
|
|
9554 |
+esac
|
|
9555 |
+
|
|
9556 |
+fi
|
|
9557 |
+
|
|
9558 |
+
|
|
9559 |
+:
|
|
9560 |
+(as_func_return () {
|
|
9561 |
+ (exit $1)
|
|
9562 |
+}
|
|
9563 |
+as_func_success () {
|
|
9564 |
+ as_func_return 0
|
|
9565 |
+}
|
|
9566 |
+as_func_failure () {
|
|
9567 |
+ as_func_return 1
|
|
9568 |
+}
|
|
9569 |
+as_func_ret_success () {
|
|
9570 |
+ return 0
|
|
9571 |
+}
|
|
9572 |
+as_func_ret_failure () {
|
|
9573 |
+ return 1
|
|
9574 |
+}
|
|
9575 |
+
|
|
9576 |
+exitcode=0
|
|
9577 |
+if as_func_success; then
|
|
9578 |
+ :
|
|
9579 |
+else
|
|
9580 |
+ exitcode=1
|
|
9581 |
+ echo as_func_success failed.
|
|
9582 |
+fi
|
|
9583 |
+
|
|
9584 |
+if as_func_failure; then
|
|
9585 |
+ exitcode=1
|
|
9586 |
+ echo as_func_failure succeeded.
|
|
9587 |
+fi
|
|
9588 |
+
|
|
9589 |
+if as_func_ret_success; then
|
|
9590 |
+ :
|
|
9591 |
+else
|
|
9592 |
+ exitcode=1
|
|
9593 |
+ echo as_func_ret_success failed.
|
|
9594 |
+fi
|
|
9595 |
+
|
|
9596 |
+if as_func_ret_failure; then
|
|
9597 |
+ exitcode=1
|
|
9598 |
+ echo as_func_ret_failure succeeded.
|
|
9599 |
+fi
|
|
9600 |
+
|
|
9601 |
+if ( set x; as_func_ret_success y && test x = "$1" ); then
|
|
9602 |
+ :
|
|
9603 |
+else
|
|
9604 |
+ exitcode=1
|
|
9605 |
+ echo positional parameters were not saved.
|
|
9606 |
+fi
|
|
9607 |
+
|
|
9608 |
+test $exitcode = 0) || { (exit 1); exit 1; }
|
|
9609 |
+
|
|
9610 |
+(
|
|
9611 |
as_lineno_1=$LINENO
|
|
9612 |
as_lineno_2=$LINENO
|
|
9613 |
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
9614 |
test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
9615 |
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
|
9616 |
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
|
9617 |
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
|
9618 |
- CONFIG_SHELL=$as_dir/$as_base
|
|
9619 |
- export CONFIG_SHELL
|
|
9620 |
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
|
9621 |
- fi;;
|
|
9622 |
- esac
|
|
9623 |
- done
|
|
9624 |
-done
|
|
9625 |
-;;
|
|
9626 |
- esac
|
|
9627 |
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
|
9628 |
+
|
|
9629 |
+_ASEOF
|
|
9630 |
+}; then
|
|
9631 |
+ break
|
|
9632 |
+fi
|
|
9633 |
+
|
|
9634 |
+fi
|
|
9635 |
+
|
|
9636 |
+ done
|
|
9637 |
+
|
|
9638 |
+ if test "x$CONFIG_SHELL" != x; then
|
|
9639 |
+ for as_var in BASH_ENV ENV
|
|
9640 |
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
9641 |
+ done
|
|
9642 |
+ export CONFIG_SHELL
|
|
9643 |
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
|
9644 |
+fi
|
|
9645 |
+
|
|
9646 |
+
|
|
9647 |
+ if test $as_have_required = no; then
|
|
9648 |
+ echo This script requires a shell more modern than all the
|
|
9649 |
+ echo shells that I found on your system. Please install a
|
|
9650 |
+ echo modern shell, or manually run the script under such a
|
|
9651 |
+ echo shell if you do have one.
|
|
9652 |
+ { (exit 1); exit 1; }
|
|
9653 |
+fi
|
|
9654 |
+
|
|
9655 |
+
|
|
9656 |
+fi
|
|
9657 |
+
|
|
9658 |
+fi
|
|
9659 |
+
|
|
9660 |
+
|
|
9661 |
+
|
|
9662 |
+(eval "as_func_return () {
|
|
9663 |
+ (exit \$1)
|
|
9664 |
+}
|
|
9665 |
+as_func_success () {
|
|
9666 |
+ as_func_return 0
|
|
9667 |
+}
|
|
9668 |
+as_func_failure () {
|
|
9669 |
+ as_func_return 1
|
|
9670 |
+}
|
|
9671 |
+as_func_ret_success () {
|
|
9672 |
+ return 0
|
|
9673 |
+}
|
|
9674 |
+as_func_ret_failure () {
|
|
9675 |
+ return 1
|
|
9676 |
+}
|
|
9677 |
+
|
|
9678 |
+exitcode=0
|
|
9679 |
+if as_func_success; then
|
|
9680 |
+ :
|
|
9681 |
+else
|
|
9682 |
+ exitcode=1
|
|
9683 |
+ echo as_func_success failed.
|
|
9684 |
+fi
|
|
9685 |
+
|
|
9686 |
+if as_func_failure; then
|
|
9687 |
+ exitcode=1
|
|
9688 |
+ echo as_func_failure succeeded.
|
|
9689 |
+fi
|
|
9690 |
+
|
|
9691 |
+if as_func_ret_success; then
|
|
9692 |
+ :
|
|
9693 |
+else
|
|
9694 |
+ exitcode=1
|
|
9695 |
+ echo as_func_ret_success failed.
|
|
9696 |
+fi
|
|
9697 |
+
|
|
9698 |
+if as_func_ret_failure; then
|
|
9699 |
+ exitcode=1
|
|
9700 |
+ echo as_func_ret_failure succeeded.
|
|
9701 |
+fi
|
|
9702 |
+
|
|
9703 |
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
9704 |
+ :
|
|
9705 |
+else
|
|
9706 |
+ exitcode=1
|
|
9707 |
+ echo positional parameters were not saved.
|
|
9708 |
+fi
|
|
9709 |
+
|
|
9710 |
+test \$exitcode = 0") || {
|
|
9711 |
+ echo No shell found that supports shell functions.
|
|
9712 |
+ echo Please tell autoconf@gnu.org about your system,
|
|
9713 |
+ echo including any error possibly output before this
|
|
9714 |
+ echo message
|
|
9715 |
+}
|
|
9716 |
+
|
|
9717 |
+
|
|
9718 |
+
|
|
9719 |
+ as_lineno_1=$LINENO
|
|
9720 |
+ as_lineno_2=$LINENO
|
|
9721 |
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
9722 |
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
9723 |
|
|
9724 |
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
9725 |
# uniformly replaced by the line number. The first 'sed' inserts a
|
|
9726 |
- # line-number line before each line; the second 'sed' does the real
|
|
9727 |
- # work. The second script uses 'N' to pair each line-number line
|
|
9728 |
- # with the numbered line, and appends trailing '-' during
|
|
9729 |
- # substitution so that $LINENO is not a special case at line end.
|
|
9730 |
+ # line-number line after each line using $LINENO; the second 'sed'
|
|
9731 |
+ # does the real work. The second script uses 'N' to pair each
|
|
9732 |
+ # line-number line with the line containing $LINENO, and appends
|
|
9733 |
+ # trailing '-' during substitution so that $LINENO is not a special
|
|
9734 |
+ # case at line end.
|
|
9735 |
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
9736 |
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
|
9737 |
- sed '=' <$as_myself |
|
|
9738 |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
9739 |
+ # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
9740 |
+ sed -n '
|
|
9741 |
+ p
|
|
9742 |
+ /[$]LINENO/=
|
|
9743 |
+ ' <$as_myself |
|
|
9744 |
sed '
|
|
9745 |
+ s/[$]LINENO.*/&-/
|
|
9746 |
+ t lineno
|
|
9747 |
+ b
|
|
9748 |
+ :lineno
|
|
9749 |
N
|
|
9750 |
- s,$,-,
|
|
9751 |
- : loop
|
|
9752 |
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
|
9753 |
+ :loop
|
|
9754 |
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
9755 |
t loop
|
|
9756 |
- s,-$,,
|
|
9757 |
- s,^['$as_cr_digits']*\n,,
|
|
9758 |
+ s/-\n.*//
|
|
9759 |
' >$as_me.lineno &&
|
|
9760 |
- chmod +x $as_me.lineno ||
|
|
9761 |
+ chmod +x "$as_me.lineno" ||
|
|
9762 |
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
9763 |
{ (exit 1); exit 1; }; }
|
|
9764 |
|
|
9765 |
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
9766 |
# (the dirname of $[0] is not the place where we might find the
|
|
9767 |
- # original and so on. Autoconf is especially sensible to this).
|
|
9768 |
- . ./$as_me.lineno
|
|
9769 |
+ # original and so on. Autoconf is especially sensitive to this).
|
|
9770 |
+ . "./$as_me.lineno"
|
|
9771 |
# Exit status is that of the last command.
|
|
9772 |
exit
|
|
9773 |
}
|
|
9774 |
|
|
9775 |
|
|
9776 |
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
|
|
9777 |
- *c*,-n*) ECHO_N= ECHO_C='
|
|
9778 |
-' ECHO_T=' ' ;;
|
|
9779 |
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
|
|
9780 |
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
|
|
9781 |
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
9782 |
+ as_dirname=dirname
|
|
9783 |
+else
|
|
9784 |
+ as_dirname=false
|
|
9785 |
+fi
|
|
9786 |
+
|
|
9787 |
+ECHO_C= ECHO_N= ECHO_T=
|
|
9788 |
+case `echo -n x` in
|
|
9789 |
+-n*)
|
|
9790 |
+ case `echo 'x\c'` in
|
|
9791 |
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
9792 |
+ *) ECHO_C='\c';;
|
|
9793 |
+ esac;;
|
|
9794 |
+*)
|
|
9795 |
+ ECHO_N='-n';;
|
|
9796 |
esac
|
|
9797 |
|
|
9798 |
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
9799 |
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
9800 |
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
9801 |
as_expr=expr
|
|
9802 |
else
|
|
9803 |
as_expr=false
|
|
9804 |
fi
|
|
9805 |
|
|
9806 |
rm -f conf$$ conf$$.exe conf$$.file
|
|
9807 |
+if test -d conf$$.dir; then
|
|
9808 |
+ rm -f conf$$.dir/conf$$.file
|
|
9809 |
+else
|
|
9810 |
+ rm -f conf$$.dir
|
|
9811 |
+ mkdir conf$$.dir
|
|
9812 |
+fi
|
|
9813 |
echo >conf$$.file
|
|
9814 |
if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
9815 |
- # We could just check for DJGPP; but this test a) works b) is more generic
|
|
9816 |
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
|
|
9817 |
- if test -f conf$$.exe; then
|
|
9818 |
- # Don't use ln at all; we don't have any links
|
|
9819 |
+ as_ln_s='ln -s'
|
|
9820 |
+ # ... but there are two gotchas:
|
|
9821 |
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
9822 |
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
9823 |
+ # In both cases, we have to default to `cp -p'.
|
|
9824 |
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
9825 |
as_ln_s='cp -p'
|
|
9826 |
- else
|
|
9827 |
- as_ln_s='ln -s'
|
|
9828 |
- fi
|
|
9829 |
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
9830 |
as_ln_s=ln
|
|
9831 |
else
|
|
9832 |
as_ln_s='cp -p'
|
|
9833 |
fi
|
|
9834 |
-rm -f conf$$ conf$$.exe conf$$.file
|
|
9835 |
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
9836 |
+rmdir conf$$.dir 2>/dev/null
|
|
9837 |
|
|
9838 |
if mkdir -p . 2>/dev/null; then
|
|
9839 |
as_mkdir_p=:
|
|
9840 |
@@ -222,7 +518,28 @@ else
|
|
9841 |
as_mkdir_p=false
|
|
9842 |
fi
|
|
9843 |
|
|
9844 |
-as_executable_p="test -f"
|
|
9845 |
+if test -x / >/dev/null 2>&1; then
|
|
9846 |
+ as_test_x='test -x'
|
|
9847 |
+else
|
|
9848 |
+ if ls -dL / >/dev/null 2>&1; then
|
|
9849 |
+ as_ls_L_option=L
|
|
9850 |
+ else
|
|
9851 |
+ as_ls_L_option=
|
|
9852 |
+ fi
|
|
9853 |
+ as_test_x='
|
|
9854 |
+ eval sh -c '\''
|
|
9855 |
+ if test -d "$1"; then
|
|
9856 |
+ test -d "$1/.";
|
|
9857 |
+ else
|
|
9858 |
+ case $1 in
|
|
9859 |
+ -*)set "./$1";;
|
|
9860 |
+ esac;
|
|
9861 |
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
9862 |
+ ???[sx]*):;;*)false;;esac;fi
|
|
9863 |
+ '\'' sh
|
|
9864 |
+ '
|
|
9865 |
+fi
|
|
9866 |
+as_executable_p=$as_test_x
|
|
9867 |
|
|
9868 |
# Sed expression to map a string onto a valid CPP name.
|
|
9869 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
9870 |
@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
|
|
9871 |
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
9872 |
|
|
9873 |
|
|
9874 |
-# IFS
|
|
9875 |
-# We need space, tab and new line, in precisely that order.
|
|
9876 |
-as_nl='
|
|
9877 |
-'
|
|
9878 |
-IFS=" $as_nl"
|
|
9879 |
-
|
|
9880 |
-# CDPATH.
|
|
9881 |
-$as_unset CDPATH
|
|
9882 |
|
|
9883 |
+exec 7<&0 </dev/null 6>&1
|
|
9884 |
|
|
9885 |
# Name of the host.
|
|
9886 |
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
|
9887 |
# so uname gets run too.
|
|
9888 |
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
9889 |
|
|
9890 |
-exec 6>&1
|
|
9891 |
-
|
|
9892 |
#
|
|
9893 |
# Initializations.
|
|
9894 |
#
|
|
9895 |
ac_default_prefix=/usr/local
|
|
9896 |
+ac_clean_files=
|
|
9897 |
ac_config_libobj_dir=.
|
|
9898 |
+LIBOBJS=
|
|
9899 |
cross_compiling=no
|
|
9900 |
subdirs=
|
|
9901 |
MFLAGS=
|
|
9902 |
MAKEFLAGS=
|
|
9903 |
SHELL=${CONFIG_SHELL-/bin/sh}
|
|
9904 |
|
|
9905 |
-# Maximum number of lines to put in a shell here document.
|
|
9906 |
-# This variable seems obsolete. It should probably be removed, and
|
|
9907 |
-# only ac_max_sed_lines should be used.
|
|
9908 |
-: ${ac_max_here_lines=38}
|
|
9909 |
-
|
|
9910 |
# Identity of this package.
|
|
9911 |
PACKAGE_NAME=
|
|
9912 |
PACKAGE_TARNAME=
|
|
9913 |
@@ -275,42 +580,182 @@ ac_unique_file="src/dillo.c"
|
|
9914 |
# Factoring default headers for most tests.
|
|
9915 |
ac_includes_default="\
|
|
9916 |
#include <stdio.h>
|
|
9917 |
-#if HAVE_SYS_TYPES_H
|
|
9918 |
+#ifdef HAVE_SYS_TYPES_H
|
|
9919 |
# include <sys/types.h>
|
|
9920 |
#endif
|
|
9921 |
-#if HAVE_SYS_STAT_H
|
|
9922 |
+#ifdef HAVE_SYS_STAT_H
|
|
9923 |
# include <sys/stat.h>
|
|
9924 |
#endif
|
|
9925 |
-#if STDC_HEADERS
|
|
9926 |
+#ifdef STDC_HEADERS
|
|
9927 |
# include <stdlib.h>
|
|
9928 |
# include <stddef.h>
|
|
9929 |
#else
|
|
9930 |
-# if HAVE_STDLIB_H
|
|
9931 |
+# ifdef HAVE_STDLIB_H
|
|
9932 |
# include <stdlib.h>
|
|
9933 |
# endif
|
|
9934 |
#endif
|
|
9935 |
-#if HAVE_STRING_H
|
|
9936 |
-# if !STDC_HEADERS && HAVE_MEMORY_H
|
|
9937 |
+#ifdef HAVE_STRING_H
|
|
9938 |
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
|
9939 |
# include <memory.h>
|
|
9940 |
# endif
|
|
9941 |
# include <string.h>
|
|
9942 |
#endif
|
|
9943 |
-#if HAVE_STRINGS_H
|
|
9944 |
+#ifdef HAVE_STRINGS_H
|
|
9945 |
# include <strings.h>
|
|
9946 |
#endif
|
|
9947 |
-#if HAVE_INTTYPES_H
|
|
9948 |
+#ifdef HAVE_INTTYPES_H
|
|
9949 |
# include <inttypes.h>
|
|
9950 |
-#else
|
|
9951 |
-# if HAVE_STDINT_H
|
|
9952 |
-# include <stdint.h>
|
|
9953 |
-# endif
|
|
9954 |
#endif
|
|
9955 |
-#if HAVE_UNISTD_H
|
|
9956 |
+#ifdef HAVE_STDINT_H
|
|
9957 |
+# include <stdint.h>
|
|
9958 |
+#endif
|
|
9959 |
+#ifdef HAVE_UNISTD_H
|
|
9960 |
# include <unistd.h>
|
|
9961 |
#endif"
|
|
9962 |
|
|
9963 |
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS'
|
|
9964 |
+ac_subst_vars='SHELL
|
|
9965 |
+PATH_SEPARATOR
|
|
9966 |
+PACKAGE_NAME
|
|
9967 |
+PACKAGE_TARNAME
|
|
9968 |
+PACKAGE_VERSION
|
|
9969 |
+PACKAGE_STRING
|
|
9970 |
+PACKAGE_BUGREPORT
|
|
9971 |
+exec_prefix
|
|
9972 |
+prefix
|
|
9973 |
+program_transform_name
|
|
9974 |
+bindir
|
|
9975 |
+sbindir
|
|
9976 |
+libexecdir
|
|
9977 |
+datarootdir
|
|
9978 |
+datadir
|
|
9979 |
+sysconfdir
|
|
9980 |
+sharedstatedir
|
|
9981 |
+localstatedir
|
|
9982 |
+includedir
|
|
9983 |
+oldincludedir
|
|
9984 |
+docdir
|
|
9985 |
+infodir
|
|
9986 |
+htmldir
|
|
9987 |
+dvidir
|
|
9988 |
+pdfdir
|
|
9989 |
+psdir
|
|
9990 |
+libdir
|
|
9991 |
+localedir
|
|
9992 |
+mandir
|
|
9993 |
+DEFS
|
|
9994 |
+ECHO_C
|
|
9995 |
+ECHO_N
|
|
9996 |
+ECHO_T
|
|
9997 |
+LIBS
|
|
9998 |
+build_alias
|
|
9999 |
+host_alias
|
|
10000 |
+target_alias
|
|
10001 |
+build
|
|
10002 |
+build_cpu
|
|
10003 |
+build_vendor
|
|
10004 |
+build_os
|
|
10005 |
+host
|
|
10006 |
+host_cpu
|
|
10007 |
+host_vendor
|
|
10008 |
+host_os
|
|
10009 |
+target
|
|
10010 |
+target_cpu
|
|
10011 |
+target_vendor
|
|
10012 |
+target_os
|
|
10013 |
+INSTALL_PROGRAM
|
|
10014 |
+INSTALL_SCRIPT
|
|
10015 |
+INSTALL_DATA
|
|
10016 |
+CYGPATH_W
|
|
10017 |
+PACKAGE
|
|
10018 |
+VERSION
|
|
10019 |
+ACLOCAL
|
|
10020 |
+AUTOCONF
|
|
10021 |
+AUTOMAKE
|
|
10022 |
+AUTOHEADER
|
|
10023 |
+MAKEINFO
|
|
10024 |
+AMTAR
|
|
10025 |
+install_sh
|
|
10026 |
+STRIP
|
|
10027 |
+INSTALL_STRIP_PROGRAM
|
|
10028 |
+AWK
|
|
10029 |
+SET_MAKE
|
|
10030 |
+am__leading_dot
|
|
10031 |
+DLGUI_TRUE
|
|
10032 |
+DLGUI_FALSE
|
|
10033 |
+CC
|
|
10034 |
+CFLAGS
|
|
10035 |
+LDFLAGS
|
|
10036 |
+CPPFLAGS
|
|
10037 |
+ac_ct_CC
|
|
10038 |
+EXEEXT
|
|
10039 |
+OBJEXT
|
|
10040 |
+DEPDIR
|
|
10041 |
+am__include
|
|
10042 |
+am__quote
|
|
10043 |
+AMDEP_TRUE
|
|
10044 |
+AMDEP_FALSE
|
|
10045 |
+AMDEPBACKSLASH
|
|
10046 |
+CCDEPMODE
|
|
10047 |
+am__fastdepCC_TRUE
|
|
10048 |
+am__fastdepCC_FALSE
|
|
10049 |
+RANLIB
|
|
10050 |
+CPP
|
|
10051 |
+CXX
|
|
10052 |
+CXXFLAGS
|
|
10053 |
+ac_ct_CXX
|
|
10054 |
+CXXDEPMODE
|
|
10055 |
+am__fastdepCXX_TRUE
|
|
10056 |
+am__fastdepCXX_FALSE
|
|
10057 |
+MKINSTALLDIRS
|
|
10058 |
+MSGFMT
|
|
10059 |
+GMSGFMT
|
|
10060 |
+XGETTEXT
|
|
10061 |
+MSGMERGE
|
|
10062 |
+USE_NLS
|
|
10063 |
+LIBICONV
|
|
10064 |
+LTLIBICONV
|
|
10065 |
+INTLLIBS
|
|
10066 |
+LIBINTL
|
|
10067 |
+LTLIBINTL
|
|
10068 |
+POSUB
|
|
10069 |
+GLIB_CONFIG
|
|
10070 |
+GLIB_CFLAGS
|
|
10071 |
+GLIB_LIBS
|
|
10072 |
+GTK_CONFIG
|
|
10073 |
+GTK_CFLAGS
|
|
10074 |
+GTK_LIBS
|
|
10075 |
+GREP
|
|
10076 |
+EGREP
|
|
10077 |
+XFT_CONFIG
|
|
10078 |
+PKG_CONFIG
|
|
10079 |
+LIBJPEG_LIBS
|
|
10080 |
+LIBJPEG_LDFLAGS
|
|
10081 |
+LIBJPEG_CPPFLAGS
|
|
10082 |
+LIBPNG_LIBS
|
|
10083 |
+LIBPNG_CFLAGS
|
|
10084 |
+LIBZ_LIBS
|
|
10085 |
+LIBSSL_LIBS
|
|
10086 |
+LIBPTHREAD_LIBS
|
|
10087 |
+LIBPTHREAD_LDFLAGS
|
|
10088 |
+LIBFLTK_CXXFLAGS
|
|
10089 |
+LIBFLTK_LIBS
|
|
10090 |
+src doc bin util lib
|
|
10091 |
+LIBOBJS
|
|
10092 |
+LTLIBOBJS'
|
|
10093 |
ac_subst_files=''
|
|
10094 |
+ ac_precious_vars='build_alias
|
|
10095 |
+host_alias
|
|
10096 |
+target_alias
|
|
10097 |
+CC
|
|
10098 |
+CFLAGS
|
|
10099 |
+LDFLAGS
|
|
10100 |
+LIBS
|
|
10101 |
+CPPFLAGS
|
|
10102 |
+CPP
|
|
10103 |
+CXX
|
|
10104 |
+CXXFLAGS
|
|
10105 |
+CCC'
|
|
10106 |
+
|
|
10107 |
|
|
10108 |
# Initialize some variables set by options.
|
|
10109 |
ac_init_help=
|
|
10110 |
@@ -337,34 +782,48 @@ x_libraries=NONE
|
|
10111 |
# and all the variables that are supposed to be based on exec_prefix
|
|
10112 |
# by default will actually change.
|
|
10113 |
# Use braces instead of parens because sh, perl, etc. also accept them.
|
|
10114 |
+# (The list follows the same order as the GNU Coding Standards.)
|
|
10115 |
bindir='${exec_prefix}/bin'
|
|
10116 |
sbindir='${exec_prefix}/sbin'
|
|
10117 |
libexecdir='${exec_prefix}/libexec'
|
|
10118 |
-datadir='${prefix}/share'
|
|
10119 |
+datarootdir='${prefix}/share'
|
|
10120 |
+datadir='${datarootdir}'
|
|
10121 |
sysconfdir='${prefix}/etc'
|
|
10122 |
sharedstatedir='${prefix}/com'
|
|
10123 |
localstatedir='${prefix}/var'
|
|
10124 |
-libdir='${exec_prefix}/lib'
|
|
10125 |
includedir='${prefix}/include'
|
|
10126 |
oldincludedir='/usr/include'
|
|
10127 |
-infodir='${prefix}/info'
|
|
10128 |
-mandir='${prefix}/man'
|
|
10129 |
+docdir='${datarootdir}/doc/${PACKAGE}'
|
|
10130 |
+infodir='${datarootdir}/info'
|
|
10131 |
+htmldir='${docdir}'
|
|
10132 |
+dvidir='${docdir}'
|
|
10133 |
+pdfdir='${docdir}'
|
|
10134 |
+psdir='${docdir}'
|
|
10135 |
+libdir='${exec_prefix}/lib'
|
|
10136 |
+localedir='${datarootdir}/locale'
|
|
10137 |
+mandir='${datarootdir}/man'
|
|
10138 |
|
|
10139 |
ac_prev=
|
|
10140 |
+ac_dashdash=
|
|
10141 |
for ac_option
|
|
10142 |
do
|
|
10143 |
# If the previous option needs an argument, assign it.
|
|
10144 |
if test -n "$ac_prev"; then
|
|
10145 |
- eval "$ac_prev=\$ac_option"
|
|
10146 |
+ eval $ac_prev=\$ac_option
|
|
10147 |
ac_prev=
|
|
10148 |
continue
|
|
10149 |
fi
|
|
10150 |
|
|
10151 |
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
|
|
10152 |
+ case $ac_option in
|
|
10153 |
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
|
10154 |
+ *) ac_optarg=yes ;;
|
|
10155 |
+ esac
|
|
10156 |
|
|
10157 |
# Accept the important Cygnus configure options, so we can diagnose typos.
|
|
10158 |
|
|
10159 |
- case $ac_option in
|
|
10160 |
+ case $ac_dashdash$ac_option in
|
|
10161 |
+ --)
|
|
10162 |
+ ac_dashdash=yes ;;
|
|
10163 |
|
|
10164 |
-bindir | --bindir | --bindi | --bind | --bin | --bi)
|
|
10165 |
ac_prev=bindir ;;
|
|
10166 |
@@ -386,33 +845,45 @@ do
|
|
10167 |
--config-cache | -C)
|
|
10168 |
cache_file=config.cache ;;
|
|
10169 |
|
|
10170 |
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
|
|
10171 |
+ -datadir | --datadir | --datadi | --datad)
|
|
10172 |
ac_prev=datadir ;;
|
|
10173 |
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
|
|
10174 |
- | --da=*)
|
|
10175 |
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
|
|
10176 |
datadir=$ac_optarg ;;
|
|
10177 |
|
|
10178 |
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
|
|
10179 |
+ | --dataroo | --dataro | --datar)
|
|
10180 |
+ ac_prev=datarootdir ;;
|
|
10181 |
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
|
|
10182 |
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
|
|
10183 |
+ datarootdir=$ac_optarg ;;
|
|
10184 |
+
|
|
10185 |
-disable-* | --disable-*)
|
|
10186 |
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
10187 |
# Reject names that are not valid shell variable names.
|
|
10188 |
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
10189 |
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
10190 |
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
10191 |
{ (exit 1); exit 1; }; }
|
|
10192 |
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
|
10193 |
- eval "enable_$ac_feature=no" ;;
|
|
10194 |
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
10195 |
+ eval enable_$ac_feature=no ;;
|
|
10196 |
+
|
|
10197 |
+ -docdir | --docdir | --docdi | --doc | --do)
|
|
10198 |
+ ac_prev=docdir ;;
|
|
10199 |
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
|
|
10200 |
+ docdir=$ac_optarg ;;
|
|
10201 |
+
|
|
10202 |
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
|
|
10203 |
+ ac_prev=dvidir ;;
|
|
10204 |
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
|
|
10205 |
+ dvidir=$ac_optarg ;;
|
|
10206 |
|
|
10207 |
-enable-* | --enable-*)
|
|
10208 |
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
10209 |
# Reject names that are not valid shell variable names.
|
|
10210 |
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
10211 |
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
10212 |
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
|
10213 |
{ (exit 1); exit 1; }; }
|
|
10214 |
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
|
10215 |
- case $ac_option in
|
|
10216 |
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
|
10217 |
- *) ac_optarg=yes ;;
|
|
10218 |
- esac
|
|
10219 |
- eval "enable_$ac_feature='$ac_optarg'" ;;
|
|
10220 |
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
|
|
10221 |
+ eval enable_$ac_feature=\$ac_optarg ;;
|
|
10222 |
|
|
10223 |
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
|
10224 |
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
|
|
10225 |
@@ -439,6 +910,12 @@ do
|
|
10226 |
-host=* | --host=* | --hos=* | --ho=*)
|
|
10227 |
host_alias=$ac_optarg ;;
|
|
10228 |
|
|
10229 |
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
|
|
10230 |
+ ac_prev=htmldir ;;
|
|
10231 |
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
|
|
10232 |
+ | --ht=*)
|
|
10233 |
+ htmldir=$ac_optarg ;;
|
|
10234 |
+
|
|
10235 |
-includedir | --includedir | --includedi | --included | --include \
|
|
10236 |
| --includ | --inclu | --incl | --inc)
|
|
10237 |
ac_prev=includedir ;;
|
|
10238 |
@@ -463,13 +940,16 @@ do
|
|
10239 |
| --libexe=* | --libex=* | --libe=*)
|
|
10240 |
libexecdir=$ac_optarg ;;
|
|
10241 |
|
|
10242 |
+ -localedir | --localedir | --localedi | --localed | --locale)
|
|
10243 |
+ ac_prev=localedir ;;
|
|
10244 |
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
|
|
10245 |
+ localedir=$ac_optarg ;;
|
|
10246 |
+
|
|
10247 |
-localstatedir | --localstatedir | --localstatedi | --localstated \
|
|
10248 |
- | --localstate | --localstat | --localsta | --localst \
|
|
10249 |
- | --locals | --local | --loca | --loc | --lo)
|
|
10250 |
+ | --localstate | --localstat | --localsta | --localst | --locals)
|
|
10251 |
ac_prev=localstatedir ;;
|
|
10252 |
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
|
|
10253 |
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
|
|
10254 |
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
|
|
10255 |
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
|
|
10256 |
localstatedir=$ac_optarg ;;
|
|
10257 |
|
|
10258 |
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
|
|
10259 |
@@ -534,6 +1014,16 @@ do
|
|
10260 |
| --progr-tra=* | --program-tr=* | --program-t=*)
|
|
10261 |
program_transform_name=$ac_optarg ;;
|
|
10262 |
|
|
10263 |
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
|
|
10264 |
+ ac_prev=pdfdir ;;
|
|
10265 |
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
|
|
10266 |
+ pdfdir=$ac_optarg ;;
|
|
10267 |
+
|
|
10268 |
+ -psdir | --psdir | --psdi | --psd | --ps)
|
|
10269 |
+ ac_prev=psdir ;;
|
|
10270 |
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
|
|
10271 |
+ psdir=$ac_optarg ;;
|
|
10272 |
+
|
|
10273 |
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
10274 |
| -silent | --silent | --silen | --sile | --sil)
|
|
10275 |
silent=yes ;;
|
|
10276 |
@@ -586,24 +1076,20 @@ do
|
|
10277 |
-with-* | --with-*)
|
|
10278 |
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
10279 |
# Reject names that are not valid shell variable names.
|
|
10280 |
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
10281 |
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
10282 |
{ echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
10283 |
{ (exit 1); exit 1; }; }
|
|
10284 |
- ac_package=`echo $ac_package| sed 's/-/_/g'`
|
|
10285 |
- case $ac_option in
|
|
10286 |
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
|
10287 |
- *) ac_optarg=yes ;;
|
|
10288 |
- esac
|
|
10289 |
- eval "with_$ac_package='$ac_optarg'" ;;
|
|
10290 |
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
10291 |
+ eval with_$ac_package=\$ac_optarg ;;
|
|
10292 |
|
|
10293 |
-without-* | --without-*)
|
|
10294 |
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
10295 |
# Reject names that are not valid shell variable names.
|
|
10296 |
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
|
10297 |
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
|
10298 |
{ echo "$as_me: error: invalid package name: $ac_package" >&2
|
|
10299 |
{ (exit 1); exit 1; }; }
|
|
10300 |
- ac_package=`echo $ac_package | sed 's/-/_/g'`
|
|
10301 |
- eval "with_$ac_package=no" ;;
|
|
10302 |
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
|
|
10303 |
+ eval with_$ac_package=no ;;
|
|
10304 |
|
|
10305 |
--x)
|
|
10306 |
# Obsolete; use --with-x.
|
|
10307 |
@@ -634,8 +1120,7 @@ Try \`$0 --help' for more information."
|
|
10308 |
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
|
10309 |
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
|
10310 |
{ (exit 1); exit 1; }; }
|
|
10311 |
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
|
|
10312 |
- eval "$ac_envvar='$ac_optarg'"
|
|
10313 |
+ eval $ac_envvar=\$ac_optarg
|
|
10314 |
export $ac_envvar ;;
|
|
10315 |
|
|
10316 |
*)
|
|
10317 |
@@ -655,27 +1140,19 @@ if test -n "$ac_prev"; then
|
|
10318 |
{ (exit 1); exit 1; }; }
|
|
10319 |
fi
|
|
10320 |
|
|
10321 |
-# Be sure to have absolute paths.
|
|
10322 |
-for ac_var in exec_prefix prefix
|
|
10323 |
-do
|
|
10324 |
- eval ac_val=$`echo $ac_var`
|
|
10325 |
- case $ac_val in
|
|
10326 |
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
|
|
10327 |
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
10328 |
- { (exit 1); exit 1; }; };;
|
|
10329 |
- esac
|
|
10330 |
-done
|
|
10331 |
-
|
|
10332 |
-# Be sure to have absolute paths.
|
|
10333 |
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
|
|
10334 |
- localstatedir libdir includedir oldincludedir infodir mandir
|
|
10335 |
+# Be sure to have absolute directory names.
|
|
10336 |
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
10337 |
+ datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
10338 |
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
10339 |
+ libdir localedir mandir
|
|
10340 |
do
|
|
10341 |
- eval ac_val=$`echo $ac_var`
|
|
10342 |
+ eval ac_val=\$$ac_var
|
|
10343 |
case $ac_val in
|
|
10344 |
- [\\/$]* | ?:[\\/]* ) ;;
|
|
10345 |
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
10346 |
- { (exit 1); exit 1; }; };;
|
|
10347 |
+ [\\/$]* | ?:[\\/]* ) continue;;
|
|
10348 |
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
|
10349 |
esac
|
|
10350 |
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
10351 |
+ { (exit 1); exit 1; }; }
|
|
10352 |
done
|
|
10353 |
|
|
10354 |
# There might be people who depend on the old broken behavior: `$host'
|
|
10355 |
@@ -702,84 +1179,78 @@ test -n "$host_alias" && ac_tool_prefix=
|
|
10356 |
test "$silent" = yes && exec 6>/dev/null
|
|
10357 |
|
|
10358 |
|
|
10359 |
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
|
10360 |
+ac_ls_di=`ls -di .` &&
|
|
10361 |
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
|
10362 |
+ { echo "$as_me: error: Working directory cannot be determined" >&2
|
|
10363 |
+ { (exit 1); exit 1; }; }
|
|
10364 |
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
|
10365 |
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
|
|
10366 |
+ { (exit 1); exit 1; }; }
|
|
10367 |
+
|
|
10368 |
+
|
|
10369 |
# Find the source files, if location was not specified.
|
|
10370 |
if test -z "$srcdir"; then
|
|
10371 |
ac_srcdir_defaulted=yes
|
|
10372 |
- # Try the directory containing this script, then its parent.
|
|
10373 |
- ac_confdir=`(dirname "$0") 2>/dev/null ||
|
|
10374 |
+ # Try the directory containing this script, then the parent directory.
|
|
10375 |
+ ac_confdir=`$as_dirname -- "$0" ||
|
|
10376 |
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
10377 |
X"$0" : 'X\(//\)[^/]' \| \
|
|
10378 |
X"$0" : 'X\(//\)$' \| \
|
|
10379 |
- X"$0" : 'X\(/\)' \| \
|
|
10380 |
- . : '\(.\)' 2>/dev/null ||
|
|
10381 |
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
10382 |
echo X"$0" |
|
|
10383 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
10384 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
10385 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
10386 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
10387 |
- s/.*/./; q'`
|
|
10388 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
10389 |
+ s//\1/
|
|
10390 |
+ q
|
|
10391 |
+ }
|
|
10392 |
+ /^X\(\/\/\)[^/].*/{
|
|
10393 |
+ s//\1/
|
|
10394 |
+ q
|
|
10395 |
+ }
|
|
10396 |
+ /^X\(\/\/\)$/{
|
|
10397 |
+ s//\1/
|
|
10398 |
+ q
|
|
10399 |
+ }
|
|
10400 |
+ /^X\(\/\).*/{
|
|
10401 |
+ s//\1/
|
|
10402 |
+ q
|
|
10403 |
+ }
|
|
10404 |
+ s/.*/./; q'`
|
|
10405 |
srcdir=$ac_confdir
|
|
10406 |
- if test ! -r $srcdir/$ac_unique_file; then
|
|
10407 |
+ if test ! -r "$srcdir/$ac_unique_file"; then
|
|
10408 |
srcdir=..
|
|
10409 |
fi
|
|
10410 |
else
|
|
10411 |
ac_srcdir_defaulted=no
|
|
10412 |
fi
|
|
10413 |
-if test ! -r $srcdir/$ac_unique_file; then
|
|
10414 |
- if test "$ac_srcdir_defaulted" = yes; then
|
|
10415 |
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
|
|
10416 |
- { (exit 1); exit 1; }; }
|
|
10417 |
- else
|
|
10418 |
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
10419 |
- { (exit 1); exit 1; }; }
|
|
10420 |
- fi
|
|
10421 |
-fi
|
|
10422 |
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
|
|
10423 |
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
|
|
10424 |
- { (exit 1); exit 1; }; }
|
|
10425 |
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
|
|
10426 |
-ac_env_build_alias_set=${build_alias+set}
|
|
10427 |
-ac_env_build_alias_value=$build_alias
|
|
10428 |
-ac_cv_env_build_alias_set=${build_alias+set}
|
|
10429 |
-ac_cv_env_build_alias_value=$build_alias
|
|
10430 |
-ac_env_host_alias_set=${host_alias+set}
|
|
10431 |
-ac_env_host_alias_value=$host_alias
|
|
10432 |
-ac_cv_env_host_alias_set=${host_alias+set}
|
|
10433 |
-ac_cv_env_host_alias_value=$host_alias
|
|
10434 |
-ac_env_target_alias_set=${target_alias+set}
|
|
10435 |
-ac_env_target_alias_value=$target_alias
|
|
10436 |
-ac_cv_env_target_alias_set=${target_alias+set}
|
|
10437 |
-ac_cv_env_target_alias_value=$target_alias
|
|
10438 |
-ac_env_CC_set=${CC+set}
|
|
10439 |
-ac_env_CC_value=$CC
|
|
10440 |
-ac_cv_env_CC_set=${CC+set}
|
|
10441 |
-ac_cv_env_CC_value=$CC
|
|
10442 |
-ac_env_CFLAGS_set=${CFLAGS+set}
|
|
10443 |
-ac_env_CFLAGS_value=$CFLAGS
|
|
10444 |
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
|
10445 |
-ac_cv_env_CFLAGS_value=$CFLAGS
|
|
10446 |
-ac_env_LDFLAGS_set=${LDFLAGS+set}
|
|
10447 |
-ac_env_LDFLAGS_value=$LDFLAGS
|
|
10448 |
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
|
|
10449 |
-ac_cv_env_LDFLAGS_value=$LDFLAGS
|
|
10450 |
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
|
10451 |
-ac_env_CPPFLAGS_value=$CPPFLAGS
|
|
10452 |
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
|
10453 |
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
|
10454 |
-ac_env_CPP_set=${CPP+set}
|
|
10455 |
-ac_env_CPP_value=$CPP
|
|
10456 |
-ac_cv_env_CPP_set=${CPP+set}
|
|
10457 |
-ac_cv_env_CPP_value=$CPP
|
|
10458 |
-ac_env_CXX_set=${CXX+set}
|
|
10459 |
-ac_env_CXX_value=$CXX
|
|
10460 |
-ac_cv_env_CXX_set=${CXX+set}
|
|
10461 |
-ac_cv_env_CXX_value=$CXX
|
|
10462 |
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
|
|
10463 |
-ac_env_CXXFLAGS_value=$CXXFLAGS
|
|
10464 |
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
|
|
10465 |
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
|
|
10466 |
-
|
|
10467 |
-#
|
|
10468 |
+if test ! -r "$srcdir/$ac_unique_file"; then
|
|
10469 |
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
|
10470 |
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
10471 |
+ { (exit 1); exit 1; }; }
|
|
10472 |
+fi
|
|
10473 |
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
|
10474 |
+ac_abs_confdir=`(
|
|
10475 |
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
|
|
10476 |
+ { (exit 1); exit 1; }; }
|
|
10477 |
+ pwd)`
|
|
10478 |
+# When building in place, set srcdir=.
|
|
10479 |
+if test "$ac_abs_confdir" = "$ac_pwd"; then
|
|
10480 |
+ srcdir=.
|
|
10481 |
+fi
|
|
10482 |
+# Remove unnecessary trailing slashes from srcdir.
|
|
10483 |
+# Double slashes in file names in object file debugging info
|
|
10484 |
+# mess up M-x gdb in Emacs.
|
|
10485 |
+case $srcdir in
|
|
10486 |
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
|
|
10487 |
+esac
|
|
10488 |
+for ac_var in $ac_precious_vars; do
|
|
10489 |
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
|
|
10490 |
+ eval ac_env_${ac_var}_value=\$${ac_var}
|
|
10491 |
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
|
|
10492 |
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
|
|
10493 |
+done
|
|
10494 |
+
|
|
10495 |
+#
|
|
10496 |
# Report the --help message.
|
|
10497 |
#
|
|
10498 |
if test "$ac_init_help" = "long"; then
|
|
10499 |
@@ -806,9 +1277,6 @@ Configuration:
|
|
10500 |
-n, --no-create do not create output files
|
|
10501 |
--srcdir=DIR find the sources in DIR [configure dir or \`..']
|
|
10502 |
|
|
10503 |
-_ACEOF
|
|
10504 |
-
|
|
10505 |
- cat <<_ACEOF
|
|
10506 |
Installation directories:
|
|
10507 |
--prefix=PREFIX install architecture-independent files in PREFIX
|
|
10508 |
[$ac_default_prefix]
|
|
10509 |
@@ -826,15 +1294,22 @@ Fine tuning of the installation director
|
|
10510 |
--bindir=DIR user executables [EPREFIX/bin]
|
|
10511 |
--sbindir=DIR system admin executables [EPREFIX/sbin]
|
|
10512 |
--libexecdir=DIR program executables [EPREFIX/libexec]
|
|
10513 |
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
|
|
10514 |
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
10515 |
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
10516 |
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
10517 |
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
10518 |
--includedir=DIR C header files [PREFIX/include]
|
|
10519 |
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
10520 |
- --infodir=DIR info documentation [PREFIX/info]
|
|
10521 |
- --mandir=DIR man documentation [PREFIX/man]
|
|
10522 |
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
|
10523 |
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
|
10524 |
+ --infodir=DIR info documentation [DATAROOTDIR/info]
|
|
10525 |
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
10526 |
+ --mandir=DIR man documentation [DATAROOTDIR/man]
|
|
10527 |
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
|
|
10528 |
+ --htmldir=DIR html documentation [DOCDIR]
|
|
10529 |
+ --dvidir=DIR dvi documentation [DOCDIR]
|
|
10530 |
+ --pdfdir=DIR pdf documentation [DOCDIR]
|
|
10531 |
+ --psdir=DIR ps documentation [DOCDIR]
|
|
10532 |
_ACEOF
|
|
10533 |
|
|
10534 |
cat <<\_ACEOF
|
|
10535 |
@@ -862,6 +1337,8 @@ Optional Features:
|
|
10536 |
--enable-gprof Try to compile and run with profiling enabled
|
|
10537 |
--enable-insure Try to compile and run with Insure++
|
|
10538 |
--enable-ansi Try to compile and run with ANSI flags
|
|
10539 |
+ --disable-tabs Don't compile support for tabs
|
|
10540 |
+ --disable-anti-alias Don't compile support for anti-alias
|
|
10541 |
--enable-ipv6 Build with support for IPv6
|
|
10542 |
--enable-rtfl Build with rtfl messages
|
|
10543 |
--disable-cookies Don't compile support for cookies
|
|
10544 |
@@ -871,8 +1348,11 @@ Optional Features:
|
|
10545 |
--disable-ssl Disable ssl features (eg. https)
|
|
10546 |
--disable-dlgui Disable FLTK2 GUI for downloads
|
|
10547 |
--disable-threaded-dns Disable the advantage of a reentrant resolver library
|
|
10548 |
- --disable-dependency-tracking speeds up one-time build
|
|
10549 |
- --enable-dependency-tracking do not reject slow dependency extractors
|
|
10550 |
+ --enable-meta-refresh Allow meta refresh
|
|
10551 |
+ --disable-dependency-tracking Speeds up one-time builds
|
|
10552 |
+ --enable-dependency-tracking Do not reject slow dependency extractors
|
|
10553 |
+ --disable-rpath do not hardcode runtime library paths
|
|
10554 |
+ --disable-nls do not use Native Language Support
|
|
10555 |
--disable-glibtest Do not try to compile and run a test GLIB program
|
|
10556 |
--disable-gtktest Do not try to compile and run a test GTK program
|
|
10557 |
|
|
10558 |
@@ -881,6 +1361,11 @@ Optional Packages:
|
|
10559 |
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
|
10560 |
--with-jpeg-lib=DIR Specify where to find libjpeg
|
|
10561 |
--with-jpeg-inc=DIR Specify where to find libjpeg's headers
|
|
10562 |
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
|
|
10563 |
+ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib
|
|
10564 |
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
|
|
10565 |
+ --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib
|
|
10566 |
+ --without-libintl-prefix don't search for libintl in includedir and libdir
|
|
10567 |
--with-glib-prefix=PFX Prefix where GLIB is installed (optional)
|
|
10568 |
--with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)
|
|
10569 |
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)
|
|
10570 |
@@ -891,8 +1376,9 @@ Some influential environment variables:
|
|
10571 |
CFLAGS C compiler flags
|
|
10572 |
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
|
10573 |
nonstandard directory <lib dir>
|
|
10574 |
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
|
|
10575 |
- headers in a nonstandard directory <include dir>
|
|
10576 |
+ LIBS libraries to pass to the linker, e.g. -l<library>
|
|
10577 |
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
|
10578 |
+ you have headers in a nonstandard directory <include dir>
|
|
10579 |
CPP C preprocessor
|
|
10580 |
CXX C++ compiler command
|
|
10581 |
CXXFLAGS C++ compiler flags
|
|
10582 |
@@ -901,118 +1387,86 @@ Use these variables to override the choi
|
|
10583 |
it to find libraries and programs with nonstandard names/locations.
|
|
10584 |
|
|
10585 |
_ACEOF
|
|
10586 |
+ac_status=$?
|
|
10587 |
fi
|
|
10588 |
|
|
10589 |
if test "$ac_init_help" = "recursive"; then
|
|
10590 |
# If there are subdirs, report their specific --help.
|
|
10591 |
- ac_popdir=`pwd`
|
|
10592 |
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
|
10593 |
- test -d $ac_dir || continue
|
|
10594 |
+ test -d "$ac_dir" || continue
|
|
10595 |
ac_builddir=.
|
|
10596 |
|
|
10597 |
-if test "$ac_dir" != .; then
|
|
10598 |
+case "$ac_dir" in
|
|
10599 |
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
10600 |
+*)
|
|
10601 |
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
10602 |
- # A "../" for each directory in $ac_dir_suffix.
|
|
10603 |
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
10604 |
-else
|
|
10605 |
- ac_dir_suffix= ac_top_builddir=
|
|
10606 |
-fi
|
|
10607 |
+ # A ".." for each directory in $ac_dir_suffix.
|
|
10608 |
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
10609 |
+ case $ac_top_builddir_sub in
|
|
10610 |
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
10611 |
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
10612 |
+ esac ;;
|
|
10613 |
+esac
|
|
10614 |
+ac_abs_top_builddir=$ac_pwd
|
|
10615 |
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
|
|
10616 |
+# for backward compatibility:
|
|
10617 |
+ac_top_builddir=$ac_top_build_prefix
|
|
10618 |
|
|
10619 |
case $srcdir in
|
|
10620 |
- .) # No --srcdir option. We are building in place.
|
|
10621 |
+ .) # We are building in place.
|
|
10622 |
ac_srcdir=.
|
|
10623 |
- if test -z "$ac_top_builddir"; then
|
|
10624 |
- ac_top_srcdir=.
|
|
10625 |
- else
|
|
10626 |
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
10627 |
- fi ;;
|
|
10628 |
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
10629 |
+ ac_top_srcdir=$ac_top_builddir_sub
|
|
10630 |
+ ac_abs_top_srcdir=$ac_pwd ;;
|
|
10631 |
+ [\\/]* | ?:[\\/]* ) # Absolute name.
|
|
10632 |
ac_srcdir=$srcdir$ac_dir_suffix;
|
|
10633 |
- ac_top_srcdir=$srcdir ;;
|
|
10634 |
- *) # Relative path.
|
|
10635 |
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
10636 |
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
10637 |
-esac
|
|
10638 |
-
|
|
10639 |
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
10640 |
-# the directories may not exist.
|
|
10641 |
-case `pwd` in
|
|
10642 |
-.) ac_abs_builddir="$ac_dir";;
|
|
10643 |
-*)
|
|
10644 |
- case "$ac_dir" in
|
|
10645 |
- .) ac_abs_builddir=`pwd`;;
|
|
10646 |
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
10647 |
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
10648 |
- esac;;
|
|
10649 |
-esac
|
|
10650 |
-case $ac_abs_builddir in
|
|
10651 |
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
10652 |
-*)
|
|
10653 |
- case ${ac_top_builddir}. in
|
|
10654 |
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
10655 |
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
10656 |
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
10657 |
- esac;;
|
|
10658 |
-esac
|
|
10659 |
-case $ac_abs_builddir in
|
|
10660 |
-.) ac_abs_srcdir=$ac_srcdir;;
|
|
10661 |
-*)
|
|
10662 |
- case $ac_srcdir in
|
|
10663 |
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
10664 |
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
10665 |
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
10666 |
- esac;;
|
|
10667 |
-esac
|
|
10668 |
-case $ac_abs_builddir in
|
|
10669 |
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
10670 |
-*)
|
|
10671 |
- case $ac_top_srcdir in
|
|
10672 |
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
10673 |
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
10674 |
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
10675 |
- esac;;
|
|
10676 |
+ ac_top_srcdir=$srcdir
|
|
10677 |
+ ac_abs_top_srcdir=$srcdir ;;
|
|
10678 |
+ *) # Relative name.
|
|
10679 |
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
|
|
10680 |
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
|
|
10681 |
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
|
|
10682 |
esac
|
|
10683 |
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
|
10684 |
|
|
10685 |
- cd $ac_dir
|
|
10686 |
- # Check for guested configure; otherwise get Cygnus style configure.
|
|
10687 |
- if test -f $ac_srcdir/configure.gnu; then
|
|
10688 |
- echo
|
|
10689 |
- $SHELL $ac_srcdir/configure.gnu --help=recursive
|
|
10690 |
- elif test -f $ac_srcdir/configure; then
|
|
10691 |
- echo
|
|
10692 |
- $SHELL $ac_srcdir/configure --help=recursive
|
|
10693 |
- elif test -f $ac_srcdir/configure.ac ||
|
|
10694 |
- test -f $ac_srcdir/configure.in; then
|
|
10695 |
- echo
|
|
10696 |
- $ac_configure --help
|
|
10697 |
+ cd "$ac_dir" || { ac_status=$?; continue; }
|
|
10698 |
+ # Check for guested configure.
|
|
10699 |
+ if test -f "$ac_srcdir/configure.gnu"; then
|
|
10700 |
+ echo &&
|
|
10701 |
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
|
|
10702 |
+ elif test -f "$ac_srcdir/configure"; then
|
|
10703 |
+ echo &&
|
|
10704 |
+ $SHELL "$ac_srcdir/configure" --help=recursive
|
|
10705 |
else
|
|
10706 |
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
10707 |
- fi
|
|
10708 |
- cd $ac_popdir
|
|
10709 |
+ fi || ac_status=$?
|
|
10710 |
+ cd "$ac_pwd" || { ac_status=$?; break; }
|
|
10711 |
done
|
|
10712 |
fi
|
|
10713 |
|
|
10714 |
-test -n "$ac_init_help" && exit 0
|
|
10715 |
+test -n "$ac_init_help" && exit $ac_status
|
|
10716 |
if $ac_init_version; then
|
|
10717 |
cat <<\_ACEOF
|
|
10718 |
+configure
|
|
10719 |
+generated by GNU Autoconf 2.61
|
|
10720 |
|
|
10721 |
-Copyright (C) 2003 Free Software Foundation, Inc.
|
|
10722 |
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
10723 |
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
10724 |
This configure script is free software; the Free Software Foundation
|
|
10725 |
gives unlimited permission to copy, distribute and modify it.
|
|
10726 |
_ACEOF
|
|
10727 |
- exit 0
|
|
10728 |
+ exit
|
|
10729 |
fi
|
|
10730 |
-exec 5>config.log
|
|
10731 |
-cat >&5 <<_ACEOF
|
|
10732 |
+cat >config.log <<_ACEOF
|
|
10733 |
This file contains any messages produced by compilers while
|
|
10734 |
running configure, to aid debugging if configure makes a mistake.
|
|
10735 |
|
|
10736 |
It was created by $as_me, which was
|
|
10737 |
-generated by GNU Autoconf 2.59. Invocation command line was
|
|
10738 |
+generated by GNU Autoconf 2.61. Invocation command line was
|
|
10739 |
|
|
10740 |
$ $0 $@
|
|
10741 |
|
|
10742 |
_ACEOF
|
|
10743 |
+exec 5>>config.log
|
|
10744 |
{
|
|
10745 |
cat <<_ASUNAME
|
|
10746 |
## --------- ##
|
|
10747 |
@@ -1031,7 +1485,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
|
|
10748 |
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
|
|
10749 |
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
|
|
10750 |
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
|
|
10751 |
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
|
|
10752 |
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
|
|
10753 |
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
|
|
10754 |
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
|
|
10755 |
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
|
|
10756 |
@@ -1045,6 +1499,7 @@ do
|
|
10757 |
test -z "$as_dir" && as_dir=.
|
|
10758 |
echo "PATH: $as_dir"
|
|
10759 |
done
|
|
10760 |
+IFS=$as_save_IFS
|
|
10761 |
|
|
10762 |
} >&5
|
|
10763 |
|
|
10764 |
@@ -1066,7 +1521,6 @@ _ACEOF
|
|
10765 |
ac_configure_args=
|
|
10766 |
ac_configure_args0=
|
|
10767 |
ac_configure_args1=
|
|
10768 |
-ac_sep=
|
|
10769 |
ac_must_keep_next=false
|
|
10770 |
for ac_pass in 1 2
|
|
10771 |
do
|
|
10772 |
@@ -1077,7 +1531,7 @@ do
|
|
10773 |
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
10774 |
| -silent | --silent | --silen | --sile | --sil)
|
|
10775 |
continue ;;
|
|
10776 |
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
|
10777 |
+ *\'*)
|
|
10778 |
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
10779 |
esac
|
|
10780 |
case $ac_pass in
|
|
10781 |
@@ -1099,9 +1553,7 @@ do
|
|
10782 |
-* ) ac_must_keep_next=true ;;
|
|
10783 |
esac
|
|
10784 |
fi
|
|
10785 |
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
|
|
10786 |
- # Get rid of the leading space.
|
|
10787 |
- ac_sep=" "
|
|
10788 |
+ ac_configure_args="$ac_configure_args '$ac_arg'"
|
|
10789 |
;;
|
|
10790 |
esac
|
|
10791 |
done
|
|
10792 |
@@ -1112,8 +1564,8 @@ $as_unset ac_configure_args1 || test "${
|
|
10793 |
# When interrupted or exit'd, cleanup temporary files, and complete
|
|
10794 |
# config.log. We remove comments because anyway the quotes in there
|
|
10795 |
# would cause problems or look ugly.
|
|
10796 |
-# WARNING: Be sure not to use single quotes in there, as some shells,
|
|
10797 |
-# such as our DU 5.0 friend, will then `close' the trap.
|
|
10798 |
+# WARNING: Use '\'' to represent an apostrophe within the trap.
|
|
10799 |
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
|
|
10800 |
trap 'exit_status=$?
|
|
10801 |
# Save into config.log some information that might help in debugging.
|
|
10802 |
{
|
|
10803 |
@@ -1126,20 +1578,34 @@ trap 'exit_status=$?
|
|
10804 |
_ASBOX
|
|
10805 |
echo
|
|
10806 |
# The following way of writing the cache mishandles newlines in values,
|
|
10807 |
-{
|
|
10808 |
+(
|
|
10809 |
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
|
|
10810 |
+ eval ac_val=\$$ac_var
|
|
10811 |
+ case $ac_val in #(
|
|
10812 |
+ *${as_nl}*)
|
|
10813 |
+ case $ac_var in #(
|
|
10814 |
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
10815 |
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
10816 |
+ esac
|
|
10817 |
+ case $ac_var in #(
|
|
10818 |
+ _ | IFS | as_nl) ;; #(
|
|
10819 |
+ *) $as_unset $ac_var ;;
|
|
10820 |
+ esac ;;
|
|
10821 |
+ esac
|
|
10822 |
+ done
|
|
10823 |
(set) 2>&1 |
|
|
10824 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
|
|
10825 |
- *ac_space=\ *)
|
|
10826 |
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
|
|
10827 |
+ *${as_nl}ac_space=\ *)
|
|
10828 |
sed -n \
|
|
10829 |
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
|
|
10830 |
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
|
|
10831 |
- ;;
|
|
10832 |
+ "s/'\''/'\''\\\\'\'''\''/g;
|
|
10833 |
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
|
|
10834 |
+ ;; #(
|
|
10835 |
*)
|
|
10836 |
- sed -n \
|
|
10837 |
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
|
|
10838 |
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
|
|
10839 |
;;
|
|
10840 |
- esac;
|
|
10841 |
-}
|
|
10842 |
+ esac |
|
|
10843 |
+ sort
|
|
10844 |
+)
|
|
10845 |
echo
|
|
10846 |
|
|
10847 |
cat <<\_ASBOX
|
|
10848 |
@@ -1150,22 +1616,28 @@ _ASBOX
|
|
10849 |
echo
|
|
10850 |
for ac_var in $ac_subst_vars
|
|
10851 |
do
|
|
10852 |
- eval ac_val=$`echo $ac_var`
|
|
10853 |
- echo "$ac_var='"'"'$ac_val'"'"'"
|
|
10854 |
+ eval ac_val=\$$ac_var
|
|
10855 |
+ case $ac_val in
|
|
10856 |
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
10857 |
+ esac
|
|
10858 |
+ echo "$ac_var='\''$ac_val'\''"
|
|
10859 |
done | sort
|
|
10860 |
echo
|
|
10861 |
|
|
10862 |
if test -n "$ac_subst_files"; then
|
|
10863 |
cat <<\_ASBOX
|
|
10864 |
-## ------------- ##
|
|
10865 |
-## Output files. ##
|
|
10866 |
-## ------------- ##
|
|
10867 |
+## ------------------- ##
|
|
10868 |
+## File substitutions. ##
|
|
10869 |
+## ------------------- ##
|
|
10870 |
_ASBOX
|
|
10871 |
echo
|
|
10872 |
for ac_var in $ac_subst_files
|
|
10873 |
do
|
|
10874 |
- eval ac_val=$`echo $ac_var`
|
|
10875 |
- echo "$ac_var='"'"'$ac_val'"'"'"
|
|
10876 |
+ eval ac_val=\$$ac_var
|
|
10877 |
+ case $ac_val in
|
|
10878 |
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
|
10879 |
+ esac
|
|
10880 |
+ echo "$ac_var='\''$ac_val'\''"
|
|
10881 |
done | sort
|
|
10882 |
echo
|
|
10883 |
fi
|
|
10884 |
@@ -1177,26 +1649,24 @@ _ASBOX
|
|
10885 |
## ----------- ##
|
|
10886 |
_ASBOX
|
|
10887 |
echo
|
|
10888 |
- sed "/^$/d" confdefs.h | sort
|
|
10889 |
+ cat confdefs.h
|
|
10890 |
echo
|
|
10891 |
fi
|
|
10892 |
test "$ac_signal" != 0 &&
|
|
10893 |
echo "$as_me: caught signal $ac_signal"
|
|
10894 |
echo "$as_me: exit $exit_status"
|
|
10895 |
} >&5
|
|
10896 |
- rm -f core *.core &&
|
|
10897 |
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
|
|
10898 |
+ rm -f core *.core core.conftest.* &&
|
|
10899 |
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
|
|
10900 |
exit $exit_status
|
|
10901 |
- ' 0
|
|
10902 |
+' 0
|
|
10903 |
for ac_signal in 1 2 13 15; do
|
|
10904 |
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
|
|
10905 |
done
|
|
10906 |
ac_signal=0
|
|
10907 |
|
|
10908 |
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
|
10909 |
-rm -rf conftest* confdefs.h
|
|
10910 |
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
|
|
10911 |
-echo >confdefs.h
|
|
10912 |
+rm -f -r conftest* confdefs.h
|
|
10913 |
|
|
10914 |
# Predefined preprocessor variables.
|
|
10915 |
|
|
10916 |
@@ -1227,14 +1697,17 @@ _ACEOF
|
|
10917 |
|
|
10918 |
# Let the site file select an alternate cache file if it wants to.
|
|
10919 |
# Prefer explicitly selected file to automatically selected ones.
|
|
10920 |
-if test -z "$CONFIG_SITE"; then
|
|
10921 |
- if test "x$prefix" != xNONE; then
|
|
10922 |
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
|
|
10923 |
- else
|
|
10924 |
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
|
|
10925 |
- fi
|
|
10926 |
+if test -n "$CONFIG_SITE"; then
|
|
10927 |
+ set x "$CONFIG_SITE"
|
|
10928 |
+elif test "x$prefix" != xNONE; then
|
|
10929 |
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
|
10930 |
+else
|
|
10931 |
+ set x "$ac_default_prefix/share/config.site" \
|
|
10932 |
+ "$ac_default_prefix/etc/config.site"
|
|
10933 |
fi
|
|
10934 |
-for ac_site_file in $CONFIG_SITE; do
|
|
10935 |
+shift
|
|
10936 |
+for ac_site_file
|
|
10937 |
+do
|
|
10938 |
if test -r "$ac_site_file"; then
|
|
10939 |
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
|
10940 |
echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
10941 |
@@ -1250,8 +1723,8 @@ if test -r "$cache_file"; then
|
|
10942 |
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
|
10943 |
echo "$as_me: loading cache $cache_file" >&6;}
|
|
10944 |
case $cache_file in
|
|
10945 |
- [\\/]* | ?:[\\/]* ) . $cache_file;;
|
|
10946 |
- *) . ./$cache_file;;
|
|
10947 |
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
|
|
10948 |
+ *) . "./$cache_file";;
|
|
10949 |
esac
|
|
10950 |
fi
|
|
10951 |
else
|
|
10952 |
@@ -1263,12 +1736,11 @@ fi
|
|
10953 |
# Check that the precious variables saved in the cache have kept the same
|
|
10954 |
# value.
|
|
10955 |
ac_cache_corrupted=false
|
|
10956 |
-for ac_var in `(set) 2>&1 |
|
|
10957 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
|
|
10958 |
+for ac_var in $ac_precious_vars; do
|
|
10959 |
eval ac_old_set=\$ac_cv_env_${ac_var}_set
|
|
10960 |
eval ac_new_set=\$ac_env_${ac_var}_set
|
|
10961 |
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
|
|
10962 |
- eval ac_new_val="\$ac_env_${ac_var}_value"
|
|
10963 |
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
|
|
10964 |
+ eval ac_new_val=\$ac_env_${ac_var}_value
|
|
10965 |
case $ac_old_set,$ac_new_set in
|
|
10966 |
set,)
|
|
10967 |
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
10968 |
@@ -1293,8 +1765,7 @@ echo "$as_me: current value: $ac_new_v
|
|
10969 |
# Pass precious variables to config.status.
|
|
10970 |
if test "$ac_new_set" = set; then
|
|
10971 |
case $ac_new_val in
|
|
10972 |
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
|
10973 |
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
10974 |
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
10975 |
*) ac_arg=$ac_var=$ac_new_val ;;
|
|
10976 |
esac
|
|
10977 |
case " $ac_configure_args " in
|
|
10978 |
@@ -1311,12 +1782,6 @@ echo "$as_me: error: run \`make distclea
|
|
10979 |
{ (exit 1); exit 1; }; }
|
|
10980 |
fi
|
|
10981 |
|
|
10982 |
-ac_ext=c
|
|
10983 |
-ac_cpp='$CPP $CPPFLAGS'
|
|
10984 |
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
10985 |
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
10986 |
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
10987 |
-
|
|
10988 |
|
|
10989 |
|
|
10990 |
|
|
10991 |
@@ -1333,108 +1798,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
10992 |
|
|
10993 |
|
|
10994 |
|
|
10995 |
+ac_ext=c
|
|
10996 |
+ac_cpp='$CPP $CPPFLAGS'
|
|
10997 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
10998 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
10999 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
11000 |
|
|
11001 |
|
|
11002 |
|
|
11003 |
ac_aux_dir=
|
|
11004 |
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
|
11005 |
- if test -f $ac_dir/install-sh; then
|
|
11006 |
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
11007 |
+ if test -f "$ac_dir/install-sh"; then
|
|
11008 |
ac_aux_dir=$ac_dir
|
|
11009 |
ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
11010 |
break
|
|
11011 |
- elif test -f $ac_dir/install.sh; then
|
|
11012 |
+ elif test -f "$ac_dir/install.sh"; then
|
|
11013 |
ac_aux_dir=$ac_dir
|
|
11014 |
ac_install_sh="$ac_aux_dir/install.sh -c"
|
|
11015 |
break
|
|
11016 |
- elif test -f $ac_dir/shtool; then
|
|
11017 |
+ elif test -f "$ac_dir/shtool"; then
|
|
11018 |
ac_aux_dir=$ac_dir
|
|
11019 |
ac_install_sh="$ac_aux_dir/shtool install -c"
|
|
11020 |
break
|
|
11021 |
fi
|
|
11022 |
done
|
|
11023 |
if test -z "$ac_aux_dir"; then
|
|
11024 |
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
|
11025 |
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
|
11026 |
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
|
|
11027 |
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
|
|
11028 |
{ (exit 1); exit 1; }; }
|
|
11029 |
fi
|
|
11030 |
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
|
11031 |
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
|
11032 |
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|
11033 |
+
|
|
11034 |
+# These three variables are undocumented and unsupported,
|
|
11035 |
+# and are intended to be withdrawn in a future Autoconf release.
|
|
11036 |
+# They can cause serious problems if a builder's source tree is in a directory
|
|
11037 |
+# whose full name contains unusual characters.
|
|
11038 |
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
|
|
11039 |
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
|
|
11040 |
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|
11041 |
+
|
|
11042 |
|
|
11043 |
# Make sure we can run config.sub.
|
|
11044 |
-$ac_config_sub sun4 >/dev/null 2>&1 ||
|
|
11045 |
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
|
11046 |
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
|
11047 |
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
11048 |
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
|
11049 |
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
|
11050 |
{ (exit 1); exit 1; }; }
|
|
11051 |
|
|
11052 |
-echo "$as_me:$LINENO: checking build system type" >&5
|
|
11053 |
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
|
11054 |
+{ echo "$as_me:$LINENO: checking build system type" >&5
|
|
11055 |
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
|
11056 |
if test "${ac_cv_build+set}" = set; then
|
|
11057 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11058 |
else
|
|
11059 |
- ac_cv_build_alias=$build_alias
|
|
11060 |
-test -z "$ac_cv_build_alias" &&
|
|
11061 |
- ac_cv_build_alias=`$ac_config_guess`
|
|
11062 |
-test -z "$ac_cv_build_alias" &&
|
|
11063 |
+ ac_build_alias=$build_alias
|
|
11064 |
+test "x$ac_build_alias" = x &&
|
|
11065 |
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
11066 |
+test "x$ac_build_alias" = x &&
|
|
11067 |
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
11068 |
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
11069 |
{ (exit 1); exit 1; }; }
|
|
11070 |
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
|
11071 |
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
|
11072 |
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
|
11073 |
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
11074 |
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
|
11075 |
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
|
11076 |
{ (exit 1); exit 1; }; }
|
|
11077 |
|
|
11078 |
fi
|
|
11079 |
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
11080 |
-echo "${ECHO_T}$ac_cv_build" >&6
|
|
11081 |
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
11082 |
+echo "${ECHO_T}$ac_cv_build" >&6; }
|
|
11083 |
+case $ac_cv_build in
|
|
11084 |
+*-*-*) ;;
|
|
11085 |
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
|
11086 |
+echo "$as_me: error: invalid value of canonical build" >&2;}
|
|
11087 |
+ { (exit 1); exit 1; }; };;
|
|
11088 |
+esac
|
|
11089 |
build=$ac_cv_build
|
|
11090 |
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
11091 |
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
11092 |
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
11093 |
+ac_save_IFS=$IFS; IFS='-'
|
|
11094 |
+set x $ac_cv_build
|
|
11095 |
+shift
|
|
11096 |
+build_cpu=$1
|
|
11097 |
+build_vendor=$2
|
|
11098 |
+shift; shift
|
|
11099 |
+# Remember, the first character of IFS is used to create $*,
|
|
11100 |
+# except with old shells:
|
|
11101 |
+build_os=$*
|
|
11102 |
+IFS=$ac_save_IFS
|
|
11103 |
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
11104 |
|
|
11105 |
|
|
11106 |
-echo "$as_me:$LINENO: checking host system type" >&5
|
|
11107 |
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
|
11108 |
+{ echo "$as_me:$LINENO: checking host system type" >&5
|
|
11109 |
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
|
11110 |
if test "${ac_cv_host+set}" = set; then
|
|
11111 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11112 |
else
|
|
11113 |
- ac_cv_host_alias=$host_alias
|
|
11114 |
-test -z "$ac_cv_host_alias" &&
|
|
11115 |
- ac_cv_host_alias=$ac_cv_build_alias
|
|
11116 |
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
|
|
11117 |
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
|
|
11118 |
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
|
|
11119 |
+ if test "x$host_alias" = x; then
|
|
11120 |
+ ac_cv_host=$ac_cv_build
|
|
11121 |
+else
|
|
11122 |
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
11123 |
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
|
11124 |
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
|
11125 |
{ (exit 1); exit 1; }; }
|
|
11126 |
+fi
|
|
11127 |
|
|
11128 |
fi
|
|
11129 |
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
11130 |
-echo "${ECHO_T}$ac_cv_host" >&6
|
|
11131 |
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
11132 |
+echo "${ECHO_T}$ac_cv_host" >&6; }
|
|
11133 |
+case $ac_cv_host in
|
|
11134 |
+*-*-*) ;;
|
|
11135 |
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
|
11136 |
+echo "$as_me: error: invalid value of canonical host" >&2;}
|
|
11137 |
+ { (exit 1); exit 1; }; };;
|
|
11138 |
+esac
|
|
11139 |
host=$ac_cv_host
|
|
11140 |
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
11141 |
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
11142 |
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
11143 |
+ac_save_IFS=$IFS; IFS='-'
|
|
11144 |
+set x $ac_cv_host
|
|
11145 |
+shift
|
|
11146 |
+host_cpu=$1
|
|
11147 |
+host_vendor=$2
|
|
11148 |
+shift; shift
|
|
11149 |
+# Remember, the first character of IFS is used to create $*,
|
|
11150 |
+# except with old shells:
|
|
11151 |
+host_os=$*
|
|
11152 |
+IFS=$ac_save_IFS
|
|
11153 |
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
11154 |
|
|
11155 |
|
|
11156 |
-echo "$as_me:$LINENO: checking target system type" >&5
|
|
11157 |
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
|
|
11158 |
+{ echo "$as_me:$LINENO: checking target system type" >&5
|
|
11159 |
+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
|
|
11160 |
if test "${ac_cv_target+set}" = set; then
|
|
11161 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11162 |
else
|
|
11163 |
- ac_cv_target_alias=$target_alias
|
|
11164 |
-test "x$ac_cv_target_alias" = "x" &&
|
|
11165 |
- ac_cv_target_alias=$ac_cv_host_alias
|
|
11166 |
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
|
|
11167 |
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
|
|
11168 |
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
|
|
11169 |
+ if test "x$target_alias" = x; then
|
|
11170 |
+ ac_cv_target=$ac_cv_host
|
|
11171 |
+else
|
|
11172 |
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
|
11173 |
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
|
|
11174 |
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
|
|
11175 |
{ (exit 1); exit 1; }; }
|
|
11176 |
+fi
|
|
11177 |
|
|
11178 |
fi
|
|
11179 |
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
|
11180 |
-echo "${ECHO_T}$ac_cv_target" >&6
|
|
11181 |
+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
|
11182 |
+echo "${ECHO_T}$ac_cv_target" >&6; }
|
|
11183 |
+case $ac_cv_target in
|
|
11184 |
+*-*-*) ;;
|
|
11185 |
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
|
|
11186 |
+echo "$as_me: error: invalid value of canonical target" >&2;}
|
|
11187 |
+ { (exit 1); exit 1; }; };;
|
|
11188 |
+esac
|
|
11189 |
target=$ac_cv_target
|
|
11190 |
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
11191 |
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
11192 |
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
11193 |
+ac_save_IFS=$IFS; IFS='-'
|
|
11194 |
+set x $ac_cv_target
|
|
11195 |
+shift
|
|
11196 |
+target_cpu=$1
|
|
11197 |
+target_vendor=$2
|
|
11198 |
+shift; shift
|
|
11199 |
+# Remember, the first character of IFS is used to create $*,
|
|
11200 |
+# except with old shells:
|
|
11201 |
+target_os=$*
|
|
11202 |
+IFS=$ac_save_IFS
|
|
11203 |
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
|
|
11204 |
|
|
11205 |
|
|
11206 |
# The aliases save the names the user supplied, while $host etc.
|
|
11207 |
@@ -1444,7 +1964,7 @@ test -n "$target_alias" &&
|
|
11208 |
NONENONEs,x,x, &&
|
|
11209 |
program_prefix=${target_alias}-
|
|
11210 |
|
|
11211 |
-am__api_version="1.9"
|
|
11212 |
+am__api_version="1.7"
|
|
11213 |
# Find a good install program. We prefer a C program (faster),
|
|
11214 |
# so one script is as good as another. But avoid the broken or
|
|
11215 |
# incompatible versions:
|
|
11216 |
@@ -1458,8 +1978,8 @@ am__api_version="1.9"
|
|
11217 |
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
11218 |
# OS/2's system install, which has a completely different semantic
|
|
11219 |
# ./install, which can be erroneously created by make from ./install.sh.
|
|
11220 |
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
11221 |
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
|
|
11222 |
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
11223 |
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
|
11224 |
if test -z "$INSTALL"; then
|
|
11225 |
if test "${ac_cv_path_install+set}" = set; then
|
|
11226 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11227 |
@@ -1481,7 +2001,7 @@ case $as_dir/ in
|
|
11228 |
# by default.
|
|
11229 |
for ac_prog in ginstall scoinst install; do
|
|
11230 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11231 |
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
|
11232 |
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
|
11233 |
if test $ac_prog = install &&
|
|
11234 |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
11235 |
# AIX install. It has an incompatible calling convention.
|
|
11236 |
@@ -1500,21 +2020,22 @@ case $as_dir/ in
|
|
11237 |
;;
|
|
11238 |
esac
|
|
11239 |
done
|
|
11240 |
+IFS=$as_save_IFS
|
|
11241 |
|
|
11242 |
|
|
11243 |
fi
|
|
11244 |
if test "${ac_cv_path_install+set}" = set; then
|
|
11245 |
INSTALL=$ac_cv_path_install
|
|
11246 |
else
|
|
11247 |
- # As a last resort, use the slow shell script. We don't cache a
|
|
11248 |
- # path for INSTALL within a source directory, because that will
|
|
11249 |
+ # As a last resort, use the slow shell script. Don't cache a
|
|
11250 |
+ # value for INSTALL within a source directory, because that will
|
|
11251 |
# break other packages using the cache if that directory is
|
|
11252 |
- # removed, or if the path is relative.
|
|
11253 |
+ # removed, or if the value is a relative name.
|
|
11254 |
INSTALL=$ac_install_sh
|
|
11255 |
fi
|
|
11256 |
fi
|
|
11257 |
-echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
11258 |
-echo "${ECHO_T}$INSTALL" >&6
|
|
11259 |
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
11260 |
+echo "${ECHO_T}$INSTALL" >&6; }
|
|
11261 |
|
|
11262 |
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
|
11263 |
# It thinks the first close brace ends the variable substitution.
|
|
11264 |
@@ -1524,8 +2045,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
|
|
11265 |
|
|
11266 |
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
11267 |
|
|
11268 |
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
|
11269 |
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
|
|
11270 |
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
|
11271 |
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
|
|
11272 |
# Just in case
|
|
11273 |
sleep 1
|
|
11274 |
echo timestamp > conftest.file
|
|
11275 |
@@ -1567,20 +2088,21 @@ echo "$as_me: error: newly created file
|
|
11276 |
Check your system clock" >&2;}
|
|
11277 |
{ (exit 1); exit 1; }; }
|
|
11278 |
fi
|
|
11279 |
-echo "$as_me:$LINENO: result: yes" >&5
|
|
11280 |
-echo "${ECHO_T}yes" >&6
|
|
11281 |
+{ echo "$as_me:$LINENO: result: yes" >&5
|
|
11282 |
+echo "${ECHO_T}yes" >&6; }
|
|
11283 |
test "$program_prefix" != NONE &&
|
|
11284 |
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
|
|
11285 |
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
|
11286 |
# Use a double $ so make ignores it.
|
|
11287 |
test "$program_suffix" != NONE &&
|
|
11288 |
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
|
|
11289 |
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
|
|
11290 |
# Double any \ or $. echo might interpret backslashes.
|
|
11291 |
# By default was `s,x,x', remove it if useless.
|
|
11292 |
cat <<\_ACEOF >conftest.sed
|
|
11293 |
s/[\\$]/&&/g;s/;s,x,x,$//
|
|
11294 |
_ACEOF
|
|
11295 |
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
|
|
11296 |
-rm conftest.sed
|
|
11297 |
+rm -f conftest.sed
|
|
11298 |
+
|
|
11299 |
|
|
11300 |
# expand $ac_aux_dir to an absolute path
|
|
11301 |
am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
11302 |
@@ -1595,45 +2117,12 @@ else
|
|
11303 |
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
|
11304 |
fi
|
|
11305 |
|
|
11306 |
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
|
11307 |
- # We used to keeping the `.' as first argument, in order to
|
|
11308 |
- # allow $(mkdir_p) to be used without argument. As in
|
|
11309 |
- # $(mkdir_p) $(somedir)
|
|
11310 |
- # where $(somedir) is conditionally defined. However this is wrong
|
|
11311 |
- # for two reasons:
|
|
11312 |
- # 1. if the package is installed by a user who cannot write `.'
|
|
11313 |
- # make install will fail,
|
|
11314 |
- # 2. the above comment should most certainly read
|
|
11315 |
- # $(mkdir_p) $(DESTDIR)$(somedir)
|
|
11316 |
- # so it does not work when $(somedir) is undefined and
|
|
11317 |
- # $(DESTDIR) is not.
|
|
11318 |
- # To support the latter case, we have to write
|
|
11319 |
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
|
|
11320 |
- # so the `.' trick is pointless.
|
|
11321 |
- mkdir_p='mkdir -p --'
|
|
11322 |
-else
|
|
11323 |
- # On NextStep and OpenStep, the `mkdir' command does not
|
|
11324 |
- # recognize any option. It will interpret all options as
|
|
11325 |
- # directories to create, and then abort because `.' already
|
|
11326 |
- # exists.
|
|
11327 |
- for d in ./-p ./--version;
|
|
11328 |
- do
|
|
11329 |
- test -d $d && rmdir $d
|
|
11330 |
- done
|
|
11331 |
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
|
|
11332 |
- if test -f "$ac_aux_dir/mkinstalldirs"; then
|
|
11333 |
- mkdir_p='$(mkinstalldirs)'
|
|
11334 |
- else
|
|
11335 |
- mkdir_p='$(install_sh) -d'
|
|
11336 |
- fi
|
|
11337 |
-fi
|
|
11338 |
-
|
|
11339 |
for ac_prog in gawk mawk nawk awk
|
|
11340 |
do
|
|
11341 |
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
11342 |
set dummy $ac_prog; ac_word=$2
|
|
11343 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11344 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11345 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11346 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11347 |
if test "${ac_cv_prog_AWK+set}" = set; then
|
|
11348 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11349 |
else
|
|
11350 |
@@ -1646,54 +2135,57 @@ do
|
|
11351 |
IFS=$as_save_IFS
|
|
11352 |
test -z "$as_dir" && as_dir=.
|
|
11353 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11354 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11355 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11356 |
ac_cv_prog_AWK="$ac_prog"
|
|
11357 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11358 |
break 2
|
|
11359 |
fi
|
|
11360 |
done
|
|
11361 |
done
|
|
11362 |
+IFS=$as_save_IFS
|
|
11363 |
|
|
11364 |
fi
|
|
11365 |
fi
|
|
11366 |
AWK=$ac_cv_prog_AWK
|
|
11367 |
if test -n "$AWK"; then
|
|
11368 |
- echo "$as_me:$LINENO: result: $AWK" >&5
|
|
11369 |
-echo "${ECHO_T}$AWK" >&6
|
|
11370 |
+ { echo "$as_me:$LINENO: result: $AWK" >&5
|
|
11371 |
+echo "${ECHO_T}$AWK" >&6; }
|
|
11372 |
else
|
|
11373 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11374 |
-echo "${ECHO_T}no" >&6
|
|
11375 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11376 |
+echo "${ECHO_T}no" >&6; }
|
|
11377 |
fi
|
|
11378 |
|
|
11379 |
+
|
|
11380 |
test -n "$AWK" && break
|
|
11381 |
done
|
|
11382 |
|
|
11383 |
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
11384 |
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
|
|
11385 |
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
|
|
11386 |
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
|
|
11387 |
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
11388 |
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
|
|
11389 |
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
11390 |
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
11391 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11392 |
else
|
|
11393 |
cat >conftest.make <<\_ACEOF
|
|
11394 |
+SHELL = /bin/sh
|
|
11395 |
all:
|
|
11396 |
- @echo 'ac_maketemp="$(MAKE)"'
|
|
11397 |
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
|
|
11398 |
_ACEOF
|
|
11399 |
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
11400 |
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
|
|
11401 |
-if test -n "$ac_maketemp"; then
|
|
11402 |
- eval ac_cv_prog_make_${ac_make}_set=yes
|
|
11403 |
-else
|
|
11404 |
- eval ac_cv_prog_make_${ac_make}_set=no
|
|
11405 |
-fi
|
|
11406 |
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
|
11407 |
+ *@@@%%%=?*=@@@%%%*)
|
|
11408 |
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
|
|
11409 |
+ *)
|
|
11410 |
+ eval ac_cv_prog_make_${ac_make}_set=no;;
|
|
11411 |
+esac
|
|
11412 |
rm -f conftest.make
|
|
11413 |
fi
|
|
11414 |
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
|
|
11415 |
- echo "$as_me:$LINENO: result: yes" >&5
|
|
11416 |
-echo "${ECHO_T}yes" >&6
|
|
11417 |
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
|
11418 |
+ { echo "$as_me:$LINENO: result: yes" >&5
|
|
11419 |
+echo "${ECHO_T}yes" >&6; }
|
|
11420 |
SET_MAKE=
|
|
11421 |
else
|
|
11422 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11423 |
-echo "${ECHO_T}no" >&6
|
|
11424 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11425 |
+echo "${ECHO_T}no" >&6; }
|
|
11426 |
SET_MAKE="MAKE=${MAKE-make}"
|
|
11427 |
fi
|
|
11428 |
|
|
11429 |
@@ -1706,7 +2198,7 @@ else
|
|
11430 |
fi
|
|
11431 |
rmdir .tst 2>/dev/null
|
|
11432 |
|
|
11433 |
-# test to see if srcdir already configured
|
|
11434 |
+ # test to see if srcdir already configured
|
|
11435 |
if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
|
11436 |
test -f $srcdir/config.status; then
|
|
11437 |
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
|
|
11438 |
@@ -1726,7 +2218,7 @@ fi
|
|
11439 |
|
|
11440 |
# Define the identity of the package.
|
|
11441 |
PACKAGE=dillo
|
|
11442 |
- VERSION=0.8.6
|
|
11443 |
+ VERSION=0.8.6-i18n-misc
|
|
11444 |
|
|
11445 |
|
|
11446 |
cat >>confdefs.h <<_ACEOF
|
|
11447 |
@@ -1754,6 +2246,9 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
|
|
11448 |
|
|
11449 |
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
|
11450 |
|
|
11451 |
+
|
|
11452 |
+AMTAR=${AMTAR-"${am_missing_run}tar"}
|
|
11453 |
+
|
|
11454 |
install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
|
11455 |
|
|
11456 |
# Installed binaries are usually stripped using `strip' when the user
|
|
11457 |
@@ -1764,8 +2259,8 @@ if test "$cross_compiling" != no; then
|
|
11458 |
if test -n "$ac_tool_prefix"; then
|
|
11459 |
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
11460 |
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
11461 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11462 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11463 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11464 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11465 |
if test "${ac_cv_prog_STRIP+set}" = set; then
|
|
11466 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11467 |
else
|
|
11468 |
@@ -1778,32 +2273,34 @@ do
|
|
11469 |
IFS=$as_save_IFS
|
|
11470 |
test -z "$as_dir" && as_dir=.
|
|
11471 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11472 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11473 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11474 |
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
|
11475 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11476 |
break 2
|
|
11477 |
fi
|
|
11478 |
done
|
|
11479 |
done
|
|
11480 |
+IFS=$as_save_IFS
|
|
11481 |
|
|
11482 |
fi
|
|
11483 |
fi
|
|
11484 |
STRIP=$ac_cv_prog_STRIP
|
|
11485 |
if test -n "$STRIP"; then
|
|
11486 |
- echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
11487 |
-echo "${ECHO_T}$STRIP" >&6
|
|
11488 |
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
11489 |
+echo "${ECHO_T}$STRIP" >&6; }
|
|
11490 |
else
|
|
11491 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11492 |
-echo "${ECHO_T}no" >&6
|
|
11493 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11494 |
+echo "${ECHO_T}no" >&6; }
|
|
11495 |
fi
|
|
11496 |
|
|
11497 |
+
|
|
11498 |
fi
|
|
11499 |
if test -z "$ac_cv_prog_STRIP"; then
|
|
11500 |
ac_ct_STRIP=$STRIP
|
|
11501 |
# Extract the first word of "strip", so it can be a program name with args.
|
|
11502 |
set dummy strip; ac_word=$2
|
|
11503 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11504 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11505 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11506 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11507 |
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
|
|
11508 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11509 |
else
|
|
11510 |
@@ -1816,27 +2313,41 @@ do
|
|
11511 |
IFS=$as_save_IFS
|
|
11512 |
test -z "$as_dir" && as_dir=.
|
|
11513 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11514 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11515 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11516 |
ac_cv_prog_ac_ct_STRIP="strip"
|
|
11517 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11518 |
break 2
|
|
11519 |
fi
|
|
11520 |
done
|
|
11521 |
done
|
|
11522 |
+IFS=$as_save_IFS
|
|
11523 |
|
|
11524 |
- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
|
|
11525 |
fi
|
|
11526 |
fi
|
|
11527 |
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
11528 |
if test -n "$ac_ct_STRIP"; then
|
|
11529 |
- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
11530 |
-echo "${ECHO_T}$ac_ct_STRIP" >&6
|
|
11531 |
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
11532 |
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
|
|
11533 |
else
|
|
11534 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11535 |
-echo "${ECHO_T}no" >&6
|
|
11536 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11537 |
+echo "${ECHO_T}no" >&6; }
|
|
11538 |
fi
|
|
11539 |
|
|
11540 |
- STRIP=$ac_ct_STRIP
|
|
11541 |
+ if test "x$ac_ct_STRIP" = x; then
|
|
11542 |
+ STRIP=":"
|
|
11543 |
+ else
|
|
11544 |
+ case $cross_compiling:$ac_tool_warned in
|
|
11545 |
+yes:)
|
|
11546 |
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
11547 |
+whose name does not start with the host triplet. If you think this
|
|
11548 |
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
11549 |
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
11550 |
+whose name does not start with the host triplet. If you think this
|
|
11551 |
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
11552 |
+ac_tool_warned=yes ;;
|
|
11553 |
+esac
|
|
11554 |
+ STRIP=$ac_ct_STRIP
|
|
11555 |
+ fi
|
|
11556 |
else
|
|
11557 |
STRIP="$ac_cv_prog_STRIP"
|
|
11558 |
fi
|
|
11559 |
@@ -1846,120 +2357,129 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
|
|
11560 |
|
|
11561 |
# We need awk for the "check" target. The system "awk" is bad on
|
|
11562 |
# some platforms.
|
|
11563 |
-# Always define AMTAR for backward compatibility.
|
|
11564 |
-
|
|
11565 |
-AMTAR=${AMTAR-"${am_missing_run}tar"}
|
|
11566 |
-
|
|
11567 |
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
|
|
11568 |
-
|
|
11569 |
-
|
|
11570 |
|
|
11571 |
|
|
11572 |
|
|
11573 |
- ac_config_headers="$ac_config_headers config.h"
|
|
11574 |
+ac_config_headers="$ac_config_headers config.h"
|
|
11575 |
|
|
11576 |
|
|
11577 |
|
|
11578 |
|
|
11579 |
-# Check whether --with-jpeg-lib or --without-jpeg-lib was given.
|
|
11580 |
+# Check whether --with-jpeg-lib was given.
|
|
11581 |
if test "${with_jpeg_lib+set}" = set; then
|
|
11582 |
- withval="$with_jpeg_lib"
|
|
11583 |
- LIBJPEG_LIBDIR=$withval
|
|
11584 |
-fi;
|
|
11585 |
+ withval=$with_jpeg_lib; LIBJPEG_LIBDIR=$withval
|
|
11586 |
+fi
|
|
11587 |
+
|
|
11588 |
|
|
11589 |
-# Check whether --with-jpeg-inc or --without-jpeg-inc was given.
|
|
11590 |
+# Check whether --with-jpeg-inc was given.
|
|
11591 |
if test "${with_jpeg_inc+set}" = set; then
|
|
11592 |
- withval="$with_jpeg_inc"
|
|
11593 |
- LIBJPEG_INCDIR=$withval
|
|
11594 |
-fi;
|
|
11595 |
+ withval=$with_jpeg_inc; LIBJPEG_INCDIR=$withval
|
|
11596 |
+fi
|
|
11597 |
|
|
11598 |
-# Check whether --enable-efence or --disable-efence was given.
|
|
11599 |
-if test "${enable_efence+set}" = set; then
|
|
11600 |
- enableval="$enable_efence"
|
|
11601 |
|
|
11602 |
+# Check whether --enable-efence was given.
|
|
11603 |
+if test "${enable_efence+set}" = set; then
|
|
11604 |
+ enableval=$enable_efence;
|
|
11605 |
else
|
|
11606 |
enable_efence=no
|
|
11607 |
-fi;
|
|
11608 |
-# Check whether --enable-gprof or --disable-gprof was given.
|
|
11609 |
-if test "${enable_gprof+set}" = set; then
|
|
11610 |
- enableval="$enable_gprof"
|
|
11611 |
+fi
|
|
11612 |
|
|
11613 |
+# Check whether --enable-gprof was given.
|
|
11614 |
+if test "${enable_gprof+set}" = set; then
|
|
11615 |
+ enableval=$enable_gprof;
|
|
11616 |
else
|
|
11617 |
enable_gprof=no
|
|
11618 |
-fi;
|
|
11619 |
-# Check whether --enable-insure or --disable-insure was given.
|
|
11620 |
-if test "${enable_insure+set}" = set; then
|
|
11621 |
- enableval="$enable_insure"
|
|
11622 |
+fi
|
|
11623 |
|
|
11624 |
+# Check whether --enable-insure was given.
|
|
11625 |
+if test "${enable_insure+set}" = set; then
|
|
11626 |
+ enableval=$enable_insure;
|
|
11627 |
else
|
|
11628 |
enable_insure=no
|
|
11629 |
-fi;
|
|
11630 |
-# Check whether --enable-ansi or --disable-ansi was given.
|
|
11631 |
-if test "${enable_ansi+set}" = set; then
|
|
11632 |
- enableval="$enable_ansi"
|
|
11633 |
+fi
|
|
11634 |
|
|
11635 |
+# Check whether --enable-ansi was given.
|
|
11636 |
+if test "${enable_ansi+set}" = set; then
|
|
11637 |
+ enableval=$enable_ansi;
|
|
11638 |
else
|
|
11639 |
enable_ansi=no
|
|
11640 |
-fi;
|
|
11641 |
-# Check whether --enable-ipv6 or --disable-ipv6 was given.
|
|
11642 |
+fi
|
|
11643 |
+
|
|
11644 |
+# Check whether --enable-tabs was given.
|
|
11645 |
+if test "${enable_tabs+set}" = set; then
|
|
11646 |
+ enableval=$enable_tabs;
|
|
11647 |
+else
|
|
11648 |
+ enable_tabs=yes
|
|
11649 |
+fi
|
|
11650 |
+
|
|
11651 |
+# Check whether --enable-anti_alias was given.
|
|
11652 |
+if test "${enable_anti_alias+set}" = set; then
|
|
11653 |
+ enableval=$enable_anti_alias;
|
|
11654 |
+else
|
|
11655 |
+ enable_anti_alias=yes
|
|
11656 |
+fi
|
|
11657 |
+
|
|
11658 |
+# Check whether --enable-ipv6 was given.
|
|
11659 |
if test "${enable_ipv6+set}" = set; then
|
|
11660 |
- enableval="$enable_ipv6"
|
|
11661 |
+ enableval=$enable_ipv6;
|
|
11662 |
+fi
|
|
11663 |
|
|
11664 |
-fi;
|
|
11665 |
-# Check whether --enable-rtfl or --disable-rtfl was given.
|
|
11666 |
+# Check whether --enable-rtfl was given.
|
|
11667 |
if test "${enable_rtfl+set}" = set; then
|
|
11668 |
- enableval="$enable_rtfl"
|
|
11669 |
- enable_rtfl=yes
|
|
11670 |
-fi;
|
|
11671 |
-# Check whether --enable-cookies or --disable-cookies was given.
|
|
11672 |
-if test "${enable_cookies+set}" = set; then
|
|
11673 |
- enableval="$enable_cookies"
|
|
11674 |
+ enableval=$enable_rtfl;
|
|
11675 |
+else
|
|
11676 |
+ enable_rtfl=no
|
|
11677 |
+fi
|
|
11678 |
|
|
11679 |
+# Check whether --enable-cookies was given.
|
|
11680 |
+if test "${enable_cookies+set}" = set; then
|
|
11681 |
+ enableval=$enable_cookies;
|
|
11682 |
else
|
|
11683 |
enable_cookies=yes
|
|
11684 |
-fi;
|
|
11685 |
-# Check whether --enable-png or --disable-png was given.
|
|
11686 |
+fi
|
|
11687 |
+
|
|
11688 |
+# Check whether --enable-png was given.
|
|
11689 |
if test "${enable_png+set}" = set; then
|
|
11690 |
- enableval="$enable_png"
|
|
11691 |
- enable_png=$enableval
|
|
11692 |
+ enableval=$enable_png; enable_png=$enableval
|
|
11693 |
else
|
|
11694 |
enable_png=yes
|
|
11695 |
-fi;
|
|
11696 |
-# Check whether --enable-jpeg or --disable-jpeg was given.
|
|
11697 |
+fi
|
|
11698 |
+
|
|
11699 |
+# Check whether --enable-jpeg was given.
|
|
11700 |
if test "${enable_jpeg+set}" = set; then
|
|
11701 |
- enableval="$enable_jpeg"
|
|
11702 |
- enable_jpeg=$enableval
|
|
11703 |
+ enableval=$enable_jpeg; enable_jpeg=$enableval
|
|
11704 |
else
|
|
11705 |
enable_jpeg=yes
|
|
11706 |
-fi;
|
|
11707 |
-# Check whether --enable-gif or --disable-gif was given.
|
|
11708 |
+fi
|
|
11709 |
+
|
|
11710 |
+# Check whether --enable-gif was given.
|
|
11711 |
if test "${enable_gif+set}" = set; then
|
|
11712 |
- enableval="$enable_gif"
|
|
11713 |
- enable_gif=$enableval
|
|
11714 |
+ enableval=$enable_gif; enable_gif=$enableval
|
|
11715 |
else
|
|
11716 |
enable_gif=yes
|
|
11717 |
-fi;
|
|
11718 |
-# Check whether --enable-ssl or --disable-ssl was given.
|
|
11719 |
+fi
|
|
11720 |
+
|
|
11721 |
+# Check whether --enable-ssl was given.
|
|
11722 |
if test "${enable_ssl+set}" = set; then
|
|
11723 |
- enableval="$enable_ssl"
|
|
11724 |
- enable_ssl=$enableval
|
|
11725 |
+ enableval=$enable_ssl; enable_ssl=$enableval
|
|
11726 |
else
|
|
11727 |
enable_ssl=yes
|
|
11728 |
-fi;
|
|
11729 |
-# Check whether --enable-dlgui or --disable-dlgui was given.
|
|
11730 |
+fi
|
|
11731 |
+
|
|
11732 |
+# Check whether --enable-dlgui was given.
|
|
11733 |
if test "${enable_dlgui+set}" = set; then
|
|
11734 |
- enableval="$enable_dlgui"
|
|
11735 |
- enable_dlgui=$enableval
|
|
11736 |
+ enableval=$enable_dlgui; enable_dlgui=$enableval
|
|
11737 |
else
|
|
11738 |
enable_dlgui=yes
|
|
11739 |
-fi;
|
|
11740 |
-# Check whether --enable-threaded-dns or --disable-threaded-dns was given.
|
|
11741 |
+fi
|
|
11742 |
+
|
|
11743 |
+# Check whether --enable-threaded-dns was given.
|
|
11744 |
if test "${enable_threaded_dns+set}" = set; then
|
|
11745 |
- enableval="$enable_threaded_dns"
|
|
11746 |
- enable_threaded_dns=$enableval
|
|
11747 |
+ enableval=$enable_threaded_dns; enable_threaded_dns=$enableval
|
|
11748 |
else
|
|
11749 |
enable_threaded_dns=yes
|
|
11750 |
-fi;
|
|
11751 |
+fi
|
|
11752 |
+
|
|
11753 |
|
|
11754 |
|
|
11755 |
if test x$enable_dlgui = xyes; then
|
|
11756 |
@@ -1970,6 +2490,13 @@ else
|
|
11757 |
DLGUI_FALSE=
|
|
11758 |
fi
|
|
11759 |
|
|
11760 |
+# Check whether --enable-meta_refresh was given.
|
|
11761 |
+if test "${enable_meta_refresh+set}" = set; then
|
|
11762 |
+ enableval=$enable_meta_refresh;
|
|
11763 |
+else
|
|
11764 |
+ enable_meta_refresh=no
|
|
11765 |
+fi
|
|
11766 |
+
|
|
11767 |
|
|
11768 |
ac_ext=c
|
|
11769 |
ac_cpp='$CPP $CPPFLAGS'
|
|
11770 |
@@ -1979,8 +2506,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
11771 |
if test -n "$ac_tool_prefix"; then
|
|
11772 |
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
11773 |
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
|
11774 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11775 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11776 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11777 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11778 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
11779 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11780 |
else
|
|
11781 |
@@ -1993,32 +2520,34 @@ do
|
|
11782 |
IFS=$as_save_IFS
|
|
11783 |
test -z "$as_dir" && as_dir=.
|
|
11784 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11785 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11786 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11787 |
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
11788 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11789 |
break 2
|
|
11790 |
fi
|
|
11791 |
done
|
|
11792 |
done
|
|
11793 |
+IFS=$as_save_IFS
|
|
11794 |
|
|
11795 |
fi
|
|
11796 |
fi
|
|
11797 |
CC=$ac_cv_prog_CC
|
|
11798 |
if test -n "$CC"; then
|
|
11799 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
11800 |
-echo "${ECHO_T}$CC" >&6
|
|
11801 |
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
|
11802 |
+echo "${ECHO_T}$CC" >&6; }
|
|
11803 |
else
|
|
11804 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11805 |
-echo "${ECHO_T}no" >&6
|
|
11806 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11807 |
+echo "${ECHO_T}no" >&6; }
|
|
11808 |
fi
|
|
11809 |
|
|
11810 |
+
|
|
11811 |
fi
|
|
11812 |
if test -z "$ac_cv_prog_CC"; then
|
|
11813 |
ac_ct_CC=$CC
|
|
11814 |
# Extract the first word of "gcc", so it can be a program name with args.
|
|
11815 |
set dummy gcc; ac_word=$2
|
|
11816 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11817 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11818 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11819 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11820 |
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
11821 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11822 |
else
|
|
11823 |
@@ -2031,36 +2560,51 @@ do
|
|
11824 |
IFS=$as_save_IFS
|
|
11825 |
test -z "$as_dir" && as_dir=.
|
|
11826 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11827 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11828 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11829 |
ac_cv_prog_ac_ct_CC="gcc"
|
|
11830 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11831 |
break 2
|
|
11832 |
fi
|
|
11833 |
done
|
|
11834 |
done
|
|
11835 |
+IFS=$as_save_IFS
|
|
11836 |
|
|
11837 |
fi
|
|
11838 |
fi
|
|
11839 |
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
11840 |
if test -n "$ac_ct_CC"; then
|
|
11841 |
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
11842 |
-echo "${ECHO_T}$ac_ct_CC" >&6
|
|
11843 |
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
11844 |
+echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
11845 |
else
|
|
11846 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11847 |
-echo "${ECHO_T}no" >&6
|
|
11848 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11849 |
+echo "${ECHO_T}no" >&6; }
|
|
11850 |
fi
|
|
11851 |
|
|
11852 |
- CC=$ac_ct_CC
|
|
11853 |
+ if test "x$ac_ct_CC" = x; then
|
|
11854 |
+ CC=""
|
|
11855 |
+ else
|
|
11856 |
+ case $cross_compiling:$ac_tool_warned in
|
|
11857 |
+yes:)
|
|
11858 |
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
11859 |
+whose name does not start with the host triplet. If you think this
|
|
11860 |
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
11861 |
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
11862 |
+whose name does not start with the host triplet. If you think this
|
|
11863 |
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
11864 |
+ac_tool_warned=yes ;;
|
|
11865 |
+esac
|
|
11866 |
+ CC=$ac_ct_CC
|
|
11867 |
+ fi
|
|
11868 |
else
|
|
11869 |
CC="$ac_cv_prog_CC"
|
|
11870 |
fi
|
|
11871 |
|
|
11872 |
if test -z "$CC"; then
|
|
11873 |
- if test -n "$ac_tool_prefix"; then
|
|
11874 |
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
11875 |
+ if test -n "$ac_tool_prefix"; then
|
|
11876 |
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
11877 |
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
|
11878 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11879 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11880 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11881 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11882 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
11883 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11884 |
else
|
|
11885 |
@@ -2073,74 +2617,34 @@ do
|
|
11886 |
IFS=$as_save_IFS
|
|
11887 |
test -z "$as_dir" && as_dir=.
|
|
11888 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11889 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11890 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11891 |
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
11892 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11893 |
break 2
|
|
11894 |
fi
|
|
11895 |
done
|
|
11896 |
done
|
|
11897 |
+IFS=$as_save_IFS
|
|
11898 |
|
|
11899 |
fi
|
|
11900 |
fi
|
|
11901 |
CC=$ac_cv_prog_CC
|
|
11902 |
if test -n "$CC"; then
|
|
11903 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
11904 |
-echo "${ECHO_T}$CC" >&6
|
|
11905 |
-else
|
|
11906 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11907 |
-echo "${ECHO_T}no" >&6
|
|
11908 |
-fi
|
|
11909 |
-
|
|
11910 |
-fi
|
|
11911 |
-if test -z "$ac_cv_prog_CC"; then
|
|
11912 |
- ac_ct_CC=$CC
|
|
11913 |
- # Extract the first word of "cc", so it can be a program name with args.
|
|
11914 |
-set dummy cc; ac_word=$2
|
|
11915 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11916 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11917 |
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
11918 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11919 |
-else
|
|
11920 |
- if test -n "$ac_ct_CC"; then
|
|
11921 |
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
11922 |
-else
|
|
11923 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
11924 |
-for as_dir in $PATH
|
|
11925 |
-do
|
|
11926 |
- IFS=$as_save_IFS
|
|
11927 |
- test -z "$as_dir" && as_dir=.
|
|
11928 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11929 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11930 |
- ac_cv_prog_ac_ct_CC="cc"
|
|
11931 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
11932 |
- break 2
|
|
11933 |
- fi
|
|
11934 |
-done
|
|
11935 |
-done
|
|
11936 |
-
|
|
11937 |
-fi
|
|
11938 |
-fi
|
|
11939 |
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
11940 |
-if test -n "$ac_ct_CC"; then
|
|
11941 |
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
11942 |
-echo "${ECHO_T}$ac_ct_CC" >&6
|
|
11943 |
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
|
11944 |
+echo "${ECHO_T}$CC" >&6; }
|
|
11945 |
else
|
|
11946 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11947 |
-echo "${ECHO_T}no" >&6
|
|
11948 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11949 |
+echo "${ECHO_T}no" >&6; }
|
|
11950 |
fi
|
|
11951 |
|
|
11952 |
- CC=$ac_ct_CC
|
|
11953 |
-else
|
|
11954 |
- CC="$ac_cv_prog_CC"
|
|
11955 |
-fi
|
|
11956 |
|
|
11957 |
+ fi
|
|
11958 |
fi
|
|
11959 |
if test -z "$CC"; then
|
|
11960 |
# Extract the first word of "cc", so it can be a program name with args.
|
|
11961 |
set dummy cc; ac_word=$2
|
|
11962 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11963 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
11964 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
11965 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
11966 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
11967 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
11968 |
else
|
|
11969 |
@@ -2154,7 +2658,7 @@ do
|
|
11970 |
IFS=$as_save_IFS
|
|
11971 |
test -z "$as_dir" && as_dir=.
|
|
11972 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
11973 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
11974 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
11975 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
11976 |
ac_prog_rejected=yes
|
|
11977 |
continue
|
|
11978 |
@@ -2165,6 +2669,7 @@ do
|
|
11979 |
fi
|
|
11980 |
done
|
|
11981 |
done
|
|
11982 |
+IFS=$as_save_IFS
|
|
11983 |
|
|
11984 |
if test $ac_prog_rejected = yes; then
|
|
11985 |
# We found a bogon in the path, so make sure we never use it.
|
|
11986 |
@@ -2182,22 +2687,23 @@ fi
|
|
11987 |
fi
|
|
11988 |
CC=$ac_cv_prog_CC
|
|
11989 |
if test -n "$CC"; then
|
|
11990 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
11991 |
-echo "${ECHO_T}$CC" >&6
|
|
11992 |
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
|
11993 |
+echo "${ECHO_T}$CC" >&6; }
|
|
11994 |
else
|
|
11995 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
11996 |
-echo "${ECHO_T}no" >&6
|
|
11997 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
11998 |
+echo "${ECHO_T}no" >&6; }
|
|
11999 |
fi
|
|
12000 |
|
|
12001 |
+
|
|
12002 |
fi
|
|
12003 |
if test -z "$CC"; then
|
|
12004 |
if test -n "$ac_tool_prefix"; then
|
|
12005 |
- for ac_prog in cl
|
|
12006 |
+ for ac_prog in cl.exe
|
|
12007 |
do
|
|
12008 |
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
12009 |
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
12010 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
12011 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
12012 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
12013 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
12014 |
if test "${ac_cv_prog_CC+set}" = set; then
|
|
12015 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12016 |
else
|
|
12017 |
@@ -2210,36 +2716,38 @@ do
|
|
12018 |
IFS=$as_save_IFS
|
|
12019 |
test -z "$as_dir" && as_dir=.
|
|
12020 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
12021 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
12022 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
12023 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
12024 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
12025 |
break 2
|
|
12026 |
fi
|
|
12027 |
done
|
|
12028 |
done
|
|
12029 |
+IFS=$as_save_IFS
|
|
12030 |
|
|
12031 |
fi
|
|
12032 |
fi
|
|
12033 |
CC=$ac_cv_prog_CC
|
|
12034 |
if test -n "$CC"; then
|
|
12035 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
12036 |
-echo "${ECHO_T}$CC" >&6
|
|
12037 |
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
|
12038 |
+echo "${ECHO_T}$CC" >&6; }
|
|
12039 |
else
|
|
12040 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
12041 |
-echo "${ECHO_T}no" >&6
|
|
12042 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
12043 |
+echo "${ECHO_T}no" >&6; }
|
|
12044 |
fi
|
|
12045 |
|
|
12046 |
+
|
|
12047 |
test -n "$CC" && break
|
|
12048 |
done
|
|
12049 |
fi
|
|
12050 |
if test -z "$CC"; then
|
|
12051 |
ac_ct_CC=$CC
|
|
12052 |
- for ac_prog in cl
|
|
12053 |
+ for ac_prog in cl.exe
|
|
12054 |
do
|
|
12055 |
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
12056 |
set dummy $ac_prog; ac_word=$2
|
|
12057 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
12058 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
12059 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
12060 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
12061 |
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
12062 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12063 |
else
|
|
12064 |
@@ -2252,29 +2760,45 @@ do
|
|
12065 |
IFS=$as_save_IFS
|
|
12066 |
test -z "$as_dir" && as_dir=.
|
|
12067 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
12068 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
12069 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
12070 |
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
12071 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
12072 |
break 2
|
|
12073 |
fi
|
|
12074 |
done
|
|
12075 |
done
|
|
12076 |
+IFS=$as_save_IFS
|
|
12077 |
|
|
12078 |
fi
|
|
12079 |
fi
|
|
12080 |
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
12081 |
if test -n "$ac_ct_CC"; then
|
|
12082 |
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
12083 |
-echo "${ECHO_T}$ac_ct_CC" >&6
|
|
12084 |
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
12085 |
+echo "${ECHO_T}$ac_ct_CC" >&6; }
|
|
12086 |
else
|
|
12087 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
12088 |
-echo "${ECHO_T}no" >&6
|
|
12089 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
12090 |
+echo "${ECHO_T}no" >&6; }
|
|
12091 |
fi
|
|
12092 |
|
|
12093 |
+
|
|
12094 |
test -n "$ac_ct_CC" && break
|
|
12095 |
done
|
|
12096 |
|
|
12097 |
- CC=$ac_ct_CC
|
|
12098 |
+ if test "x$ac_ct_CC" = x; then
|
|
12099 |
+ CC=""
|
|
12100 |
+ else
|
|
12101 |
+ case $cross_compiling:$ac_tool_warned in
|
|
12102 |
+yes:)
|
|
12103 |
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
12104 |
+whose name does not start with the host triplet. If you think this
|
|
12105 |
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
12106 |
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
12107 |
+whose name does not start with the host triplet. If you think this
|
|
12108 |
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
12109 |
+ac_tool_warned=yes ;;
|
|
12110 |
+esac
|
|
12111 |
+ CC=$ac_ct_CC
|
|
12112 |
+ fi
|
|
12113 |
fi
|
|
12114 |
|
|
12115 |
fi
|
|
12116 |
@@ -2287,21 +2811,35 @@ See \`config.log' for more details." >&2
|
|
12117 |
{ (exit 1); exit 1; }; }
|
|
12118 |
|
|
12119 |
# Provide some information about the compiler.
|
|
12120 |
-echo "$as_me:$LINENO:" \
|
|
12121 |
- "checking for C compiler version" >&5
|
|
12122 |
+echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
12123 |
ac_compiler=`set X $ac_compile; echo $2`
|
|
12124 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
|
12125 |
- (eval $ac_compiler --version </dev/null >&5) 2>&5
|
|
12126 |
+{ (ac_try="$ac_compiler --version >&5"
|
|
12127 |
+case "(($ac_try" in
|
|
12128 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12129 |
+ *) ac_try_echo=$ac_try;;
|
|
12130 |
+esac
|
|
12131 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12132 |
+ (eval "$ac_compiler --version >&5") 2>&5
|
|
12133 |
ac_status=$?
|
|
12134 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12135 |
(exit $ac_status); }
|
|
12136 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
|
12137 |
- (eval $ac_compiler -v </dev/null >&5) 2>&5
|
|
12138 |
+{ (ac_try="$ac_compiler -v >&5"
|
|
12139 |
+case "(($ac_try" in
|
|
12140 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12141 |
+ *) ac_try_echo=$ac_try;;
|
|
12142 |
+esac
|
|
12143 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12144 |
+ (eval "$ac_compiler -v >&5") 2>&5
|
|
12145 |
ac_status=$?
|
|
12146 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12147 |
(exit $ac_status); }
|
|
12148 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
|
12149 |
- (eval $ac_compiler -V </dev/null >&5) 2>&5
|
|
12150 |
+{ (ac_try="$ac_compiler -V >&5"
|
|
12151 |
+case "(($ac_try" in
|
|
12152 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12153 |
+ *) ac_try_echo=$ac_try;;
|
|
12154 |
+esac
|
|
12155 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12156 |
+ (eval "$ac_compiler -V >&5") 2>&5
|
|
12157 |
ac_status=$?
|
|
12158 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12159 |
(exit $ac_status); }
|
|
12160 |
@@ -2326,47 +2864,77 @@ ac_clean_files="$ac_clean_files a.out a.
|
|
12161 |
# Try to create an executable without -o first, disregard a.out.
|
|
12162 |
# It will help us diagnose broken compilers, and finding out an intuition
|
|
12163 |
# of exeext.
|
|
12164 |
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
12165 |
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
|
|
12166 |
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
12167 |
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
|
12168 |
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
12169 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
|
|
12170 |
- (eval $ac_link_default) 2>&5
|
|
12171 |
+#
|
|
12172 |
+# List of possible output files, starting from the most likely.
|
|
12173 |
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
|
12174 |
+# only as a last resort. b.out is created by i960 compilers.
|
|
12175 |
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
|
12176 |
+#
|
|
12177 |
+# The IRIX 6 linker writes into existing files which may not be
|
|
12178 |
+# executable, retaining their permissions. Remove them first so a
|
|
12179 |
+# subsequent execution test works.
|
|
12180 |
+ac_rmfiles=
|
|
12181 |
+for ac_file in $ac_files
|
|
12182 |
+do
|
|
12183 |
+ case $ac_file in
|
|
12184 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
12185 |
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
|
12186 |
+ esac
|
|
12187 |
+done
|
|
12188 |
+rm -f $ac_rmfiles
|
|
12189 |
+
|
|
12190 |
+if { (ac_try="$ac_link_default"
|
|
12191 |
+case "(($ac_try" in
|
|
12192 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12193 |
+ *) ac_try_echo=$ac_try;;
|
|
12194 |
+esac
|
|
12195 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12196 |
+ (eval "$ac_link_default") 2>&5
|
|
12197 |
ac_status=$?
|
|
12198 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12199 |
(exit $ac_status); }; then
|
|
12200 |
- # Find the output, starting from the most likely. This scheme is
|
|
12201 |
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
|
|
12202 |
-# resort.
|
|
12203 |
-
|
|
12204 |
-# Be careful to initialize this variable, since it used to be cached.
|
|
12205 |
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
|
|
12206 |
-ac_cv_exeext=
|
|
12207 |
-# b.out is created by i960 compilers.
|
|
12208 |
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
|
|
12209 |
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
|
12210 |
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
|
12211 |
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
|
12212 |
+# so that the user can short-circuit this test for compilers unknown to
|
|
12213 |
+# Autoconf.
|
|
12214 |
+for ac_file in $ac_files ''
|
|
12215 |
do
|
|
12216 |
test -f "$ac_file" || continue
|
|
12217 |
case $ac_file in
|
|
12218 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
|
|
12219 |
- ;;
|
|
12220 |
- conftest.$ac_ext )
|
|
12221 |
- # This is the source file.
|
|
12222 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
|
12223 |
;;
|
|
12224 |
[ab].out )
|
|
12225 |
# We found the default executable, but exeext='' is most
|
|
12226 |
# certainly right.
|
|
12227 |
break;;
|
|
12228 |
*.* )
|
|
12229 |
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
12230 |
- # FIXME: I believe we export ac_cv_exeext for Libtool,
|
|
12231 |
- # but it would be cool to find out if it's true. Does anybody
|
|
12232 |
- # maintain Libtool? --akim.
|
|
12233 |
- export ac_cv_exeext
|
|
12234 |
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
12235 |
+ then :; else
|
|
12236 |
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
12237 |
+ fi
|
|
12238 |
+ # We set ac_cv_exeext here because the later test for it is not
|
|
12239 |
+ # safe: cross compilers may not add the suffix if given an `-o'
|
|
12240 |
+ # argument, so we may need to know it at that point already.
|
|
12241 |
+ # Even if this section looks crufty: it has the advantage of
|
|
12242 |
+ # actually working.
|
|
12243 |
break;;
|
|
12244 |
* )
|
|
12245 |
break;;
|
|
12246 |
esac
|
|
12247 |
done
|
|
12248 |
+test "$ac_cv_exeext" = no && ac_cv_exeext=
|
|
12249 |
+
|
|
12250 |
else
|
|
12251 |
+ ac_file=''
|
|
12252 |
+fi
|
|
12253 |
+
|
|
12254 |
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
12255 |
+echo "${ECHO_T}$ac_file" >&6; }
|
|
12256 |
+if test -z "$ac_file"; then
|
|
12257 |
echo "$as_me: failed program was:" >&5
|
|
12258 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
12259 |
|
|
12260 |
@@ -2378,19 +2946,21 @@ See \`config.log' for more details." >&2
|
|
12261 |
fi
|
|
12262 |
|
|
12263 |
ac_exeext=$ac_cv_exeext
|
|
12264 |
-echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
12265 |
-echo "${ECHO_T}$ac_file" >&6
|
|
12266 |
|
|
12267 |
-# Check the compiler produces executables we can run. If not, either
|
|
12268 |
+# Check that the compiler produces executables we can run. If not, either
|
|
12269 |
# the compiler is broken, or we cross compile.
|
|
12270 |
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
12271 |
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
|
|
12272 |
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
12273 |
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
|
12274 |
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
|
12275 |
# If not cross compiling, check that we can run a simple program.
|
|
12276 |
if test "$cross_compiling" != yes; then
|
|
12277 |
if { ac_try='./$ac_file'
|
|
12278 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12279 |
- (eval $ac_try) 2>&5
|
|
12280 |
+ { (case "(($ac_try" in
|
|
12281 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12282 |
+ *) ac_try_echo=$ac_try;;
|
|
12283 |
+esac
|
|
12284 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12285 |
+ (eval "$ac_try") 2>&5
|
|
12286 |
ac_status=$?
|
|
12287 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12288 |
(exit $ac_status); }; }; then
|
|
12289 |
@@ -2409,22 +2979,27 @@ See \`config.log' for more details." >&2
|
|
12290 |
fi
|
|
12291 |
fi
|
|
12292 |
fi
|
|
12293 |
-echo "$as_me:$LINENO: result: yes" >&5
|
|
12294 |
-echo "${ECHO_T}yes" >&6
|
|
12295 |
+{ echo "$as_me:$LINENO: result: yes" >&5
|
|
12296 |
+echo "${ECHO_T}yes" >&6; }
|
|
12297 |
|
|
12298 |
rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
|
12299 |
ac_clean_files=$ac_clean_files_save
|
|
12300 |
-# Check the compiler produces executables we can run. If not, either
|
|
12301 |
+# Check that the compiler produces executables we can run. If not, either
|
|
12302 |
# the compiler is broken, or we cross compile.
|
|
12303 |
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
12304 |
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
|
|
12305 |
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
12306 |
-echo "${ECHO_T}$cross_compiling" >&6
|
|
12307 |
-
|
|
12308 |
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
12309 |
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
|
|
12310 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
12311 |
- (eval $ac_link) 2>&5
|
|
12312 |
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
12313 |
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
|
12314 |
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
12315 |
+echo "${ECHO_T}$cross_compiling" >&6; }
|
|
12316 |
+
|
|
12317 |
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
12318 |
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
|
12319 |
+if { (ac_try="$ac_link"
|
|
12320 |
+case "(($ac_try" in
|
|
12321 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12322 |
+ *) ac_try_echo=$ac_try;;
|
|
12323 |
+esac
|
|
12324 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12325 |
+ (eval "$ac_link") 2>&5
|
|
12326 |
ac_status=$?
|
|
12327 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12328 |
(exit $ac_status); }; then
|
|
12329 |
@@ -2435,9 +3010,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
12330 |
for ac_file in conftest.exe conftest conftest.*; do
|
|
12331 |
test -f "$ac_file" || continue
|
|
12332 |
case $ac_file in
|
|
12333 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
|
|
12334 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
|
12335 |
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
12336 |
- export ac_cv_exeext
|
|
12337 |
break;;
|
|
12338 |
* ) break;;
|
|
12339 |
esac
|
|
12340 |
@@ -2451,14 +3025,14 @@ See \`config.log' for more details." >&2
|
|
12341 |
fi
|
|
12342 |
|
|
12343 |
rm -f conftest$ac_cv_exeext
|
|
12344 |
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
12345 |
-echo "${ECHO_T}$ac_cv_exeext" >&6
|
|
12346 |
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
12347 |
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
|
12348 |
|
|
12349 |
rm -f conftest.$ac_ext
|
|
12350 |
EXEEXT=$ac_cv_exeext
|
|
12351 |
ac_exeext=$EXEEXT
|
|
12352 |
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
12353 |
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
|
|
12354 |
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
12355 |
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
|
12356 |
if test "${ac_cv_objext+set}" = set; then
|
|
12357 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12358 |
else
|
|
12359 |
@@ -2478,14 +3052,20 @@ main ()
|
|
12360 |
}
|
|
12361 |
_ACEOF
|
|
12362 |
rm -f conftest.o conftest.obj
|
|
12363 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12364 |
- (eval $ac_compile) 2>&5
|
|
12365 |
+if { (ac_try="$ac_compile"
|
|
12366 |
+case "(($ac_try" in
|
|
12367 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12368 |
+ *) ac_try_echo=$ac_try;;
|
|
12369 |
+esac
|
|
12370 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12371 |
+ (eval "$ac_compile") 2>&5
|
|
12372 |
ac_status=$?
|
|
12373 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12374 |
(exit $ac_status); }; then
|
|
12375 |
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
|
|
12376 |
+ for ac_file in conftest.o conftest.obj conftest.*; do
|
|
12377 |
+ test -f "$ac_file" || continue;
|
|
12378 |
case $ac_file in
|
|
12379 |
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
|
|
12380 |
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
|
12381 |
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
|
12382 |
break;;
|
|
12383 |
esac
|
|
12384 |
@@ -2503,12 +3083,12 @@ fi
|
|
12385 |
|
|
12386 |
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
|
12387 |
fi
|
|
12388 |
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
12389 |
-echo "${ECHO_T}$ac_cv_objext" >&6
|
|
12390 |
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
12391 |
+echo "${ECHO_T}$ac_cv_objext" >&6; }
|
|
12392 |
OBJEXT=$ac_cv_objext
|
|
12393 |
ac_objext=$OBJEXT
|
|
12394 |
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
12395 |
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
|
|
12396 |
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
12397 |
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
|
12398 |
if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
12399 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12400 |
else
|
|
12401 |
@@ -2531,50 +3111,49 @@ main ()
|
|
12402 |
}
|
|
12403 |
_ACEOF
|
|
12404 |
rm -f conftest.$ac_objext
|
|
12405 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12406 |
- (eval $ac_compile) 2>conftest.er1
|
|
12407 |
+if { (ac_try="$ac_compile"
|
|
12408 |
+case "(($ac_try" in
|
|
12409 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12410 |
+ *) ac_try_echo=$ac_try;;
|
|
12411 |
+esac
|
|
12412 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12413 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
12414 |
ac_status=$?
|
|
12415 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
12416 |
rm -f conftest.er1
|
|
12417 |
cat conftest.err >&5
|
|
12418 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12419 |
- (exit $ac_status); } &&
|
|
12420 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
12421 |
- || test ! -s conftest.err'
|
|
12422 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12423 |
- (eval $ac_try) 2>&5
|
|
12424 |
- ac_status=$?
|
|
12425 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12426 |
- (exit $ac_status); }; } &&
|
|
12427 |
- { ac_try='test -s conftest.$ac_objext'
|
|
12428 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12429 |
- (eval $ac_try) 2>&5
|
|
12430 |
- ac_status=$?
|
|
12431 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12432 |
- (exit $ac_status); }; }; then
|
|
12433 |
+ (exit $ac_status); } && {
|
|
12434 |
+ test -z "$ac_c_werror_flag" ||
|
|
12435 |
+ test ! -s conftest.err
|
|
12436 |
+ } && test -s conftest.$ac_objext; then
|
|
12437 |
ac_compiler_gnu=yes
|
|
12438 |
else
|
|
12439 |
echo "$as_me: failed program was:" >&5
|
|
12440 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
12441 |
|
|
12442 |
-ac_compiler_gnu=no
|
|
12443 |
+ ac_compiler_gnu=no
|
|
12444 |
fi
|
|
12445 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12446 |
+
|
|
12447 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12448 |
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
12449 |
|
|
12450 |
fi
|
|
12451 |
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
12452 |
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
|
|
12453 |
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
12454 |
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
|
12455 |
GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
12456 |
ac_test_CFLAGS=${CFLAGS+set}
|
|
12457 |
ac_save_CFLAGS=$CFLAGS
|
|
12458 |
-CFLAGS="-g"
|
|
12459 |
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
12460 |
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
|
12461 |
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
12462 |
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
|
12463 |
if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
12464 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12465 |
else
|
|
12466 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
12467 |
+ ac_save_c_werror_flag=$ac_c_werror_flag
|
|
12468 |
+ ac_c_werror_flag=yes
|
|
12469 |
+ ac_cv_prog_cc_g=no
|
|
12470 |
+ CFLAGS="-g"
|
|
12471 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
12472 |
/* confdefs.h. */
|
|
12473 |
_ACEOF
|
|
12474 |
cat confdefs.h >>conftest.$ac_ext
|
|
12475 |
@@ -2590,311 +3169,248 @@ main ()
|
|
12476 |
}
|
|
12477 |
_ACEOF
|
|
12478 |
rm -f conftest.$ac_objext
|
|
12479 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12480 |
- (eval $ac_compile) 2>conftest.er1
|
|
12481 |
+if { (ac_try="$ac_compile"
|
|
12482 |
+case "(($ac_try" in
|
|
12483 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12484 |
+ *) ac_try_echo=$ac_try;;
|
|
12485 |
+esac
|
|
12486 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12487 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
12488 |
ac_status=$?
|
|
12489 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
12490 |
rm -f conftest.er1
|
|
12491 |
cat conftest.err >&5
|
|
12492 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12493 |
- (exit $ac_status); } &&
|
|
12494 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
12495 |
- || test ! -s conftest.err'
|
|
12496 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12497 |
- (eval $ac_try) 2>&5
|
|
12498 |
- ac_status=$?
|
|
12499 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12500 |
- (exit $ac_status); }; } &&
|
|
12501 |
- { ac_try='test -s conftest.$ac_objext'
|
|
12502 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12503 |
- (eval $ac_try) 2>&5
|
|
12504 |
- ac_status=$?
|
|
12505 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12506 |
- (exit $ac_status); }; }; then
|
|
12507 |
+ (exit $ac_status); } && {
|
|
12508 |
+ test -z "$ac_c_werror_flag" ||
|
|
12509 |
+ test ! -s conftest.err
|
|
12510 |
+ } && test -s conftest.$ac_objext; then
|
|
12511 |
ac_cv_prog_cc_g=yes
|
|
12512 |
else
|
|
12513 |
echo "$as_me: failed program was:" >&5
|
|
12514 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
12515 |
|
|
12516 |
-ac_cv_prog_cc_g=no
|
|
12517 |
-fi
|
|
12518 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12519 |
-fi
|
|
12520 |
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
12521 |
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
|
|
12522 |
-if test "$ac_test_CFLAGS" = set; then
|
|
12523 |
- CFLAGS=$ac_save_CFLAGS
|
|
12524 |
-elif test $ac_cv_prog_cc_g = yes; then
|
|
12525 |
- if test "$GCC" = yes; then
|
|
12526 |
- CFLAGS="-g -O2"
|
|
12527 |
- else
|
|
12528 |
- CFLAGS="-g"
|
|
12529 |
- fi
|
|
12530 |
-else
|
|
12531 |
- if test "$GCC" = yes; then
|
|
12532 |
- CFLAGS="-O2"
|
|
12533 |
- else
|
|
12534 |
- CFLAGS=
|
|
12535 |
- fi
|
|
12536 |
-fi
|
|
12537 |
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
|
|
12538 |
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
|
|
12539 |
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
|
|
12540 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12541 |
-else
|
|
12542 |
- ac_cv_prog_cc_stdc=no
|
|
12543 |
-ac_save_CC=$CC
|
|
12544 |
-cat >conftest.$ac_ext <<_ACEOF
|
|
12545 |
+ CFLAGS=""
|
|
12546 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
12547 |
/* confdefs.h. */
|
|
12548 |
_ACEOF
|
|
12549 |
cat confdefs.h >>conftest.$ac_ext
|
|
12550 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
12551 |
/* end confdefs.h. */
|
|
12552 |
-#include <stdarg.h>
|
|
12553 |
-#include <stdio.h>
|
|
12554 |
-#include <sys/types.h>
|
|
12555 |
-#include <sys/stat.h>
|
|
12556 |
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
12557 |
-struct buf { int x; };
|
|
12558 |
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
12559 |
-static char *e (p, i)
|
|
12560 |
- char **p;
|
|
12561 |
- int i;
|
|
12562 |
+
|
|
12563 |
+int
|
|
12564 |
+main ()
|
|
12565 |
{
|
|
12566 |
- return p[i];
|
|
12567 |
-}
|
|
12568 |
-static char *f (char * (*g) (char **, int), char **p, ...)
|
|
12569 |
-{
|
|
12570 |
- char *s;
|
|
12571 |
- va_list v;
|
|
12572 |
- va_start (v,p);
|
|
12573 |
- s = g (p, va_arg (v,int));
|
|
12574 |
- va_end (v);
|
|
12575 |
- return s;
|
|
12576 |
-}
|
|
12577 |
-
|
|
12578 |
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
|
12579 |
- function prototypes and stuff, but not '\xHH' hex character constants.
|
|
12580 |
- These don't provoke an error unfortunately, instead are silently treated
|
|
12581 |
- as 'x'. The following induces an error, until -std1 is added to get
|
|
12582 |
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
|
12583 |
- array size at least. It's necessary to write '\x00'==0 to get something
|
|
12584 |
- that's true only with -std1. */
|
|
12585 |
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
|
12586 |
-
|
|
12587 |
-int test (int i, double x);
|
|
12588 |
-struct s1 {int (*f) (int a);};
|
|
12589 |
-struct s2 {int (*f) (double a);};
|
|
12590 |
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
|
12591 |
-int argc;
|
|
12592 |
-char **argv;
|
|
12593 |
-int
|
|
12594 |
-main ()
|
|
12595 |
-{
|
|
12596 |
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
|
12597 |
- ;
|
|
12598 |
- return 0;
|
|
12599 |
+
|
|
12600 |
+ ;
|
|
12601 |
+ return 0;
|
|
12602 |
}
|
|
12603 |
_ACEOF
|
|
12604 |
-# Don't try gcc -ansi; that turns off useful extensions and
|
|
12605 |
-# breaks some systems' header files.
|
|
12606 |
-# AIX -qlanglvl=ansi
|
|
12607 |
-# Ultrix and OSF/1 -std1
|
|
12608 |
-# HP-UX 10.20 and later -Ae
|
|
12609 |
-# HP-UX older versions -Aa -D_HPUX_SOURCE
|
|
12610 |
-# SVR4 -Xc -D__EXTENSIONS__
|
|
12611 |
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
12612 |
-do
|
|
12613 |
- CC="$ac_save_CC $ac_arg"
|
|
12614 |
- rm -f conftest.$ac_objext
|
|
12615 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12616 |
- (eval $ac_compile) 2>conftest.er1
|
|
12617 |
+rm -f conftest.$ac_objext
|
|
12618 |
+if { (ac_try="$ac_compile"
|
|
12619 |
+case "(($ac_try" in
|
|
12620 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12621 |
+ *) ac_try_echo=$ac_try;;
|
|
12622 |
+esac
|
|
12623 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12624 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
12625 |
ac_status=$?
|
|
12626 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
12627 |
rm -f conftest.er1
|
|
12628 |
cat conftest.err >&5
|
|
12629 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12630 |
- (exit $ac_status); } &&
|
|
12631 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
12632 |
- || test ! -s conftest.err'
|
|
12633 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12634 |
- (eval $ac_try) 2>&5
|
|
12635 |
- ac_status=$?
|
|
12636 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12637 |
- (exit $ac_status); }; } &&
|
|
12638 |
- { ac_try='test -s conftest.$ac_objext'
|
|
12639 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12640 |
- (eval $ac_try) 2>&5
|
|
12641 |
- ac_status=$?
|
|
12642 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12643 |
- (exit $ac_status); }; }; then
|
|
12644 |
- ac_cv_prog_cc_stdc=$ac_arg
|
|
12645 |
-break
|
|
12646 |
+ (exit $ac_status); } && {
|
|
12647 |
+ test -z "$ac_c_werror_flag" ||
|
|
12648 |
+ test ! -s conftest.err
|
|
12649 |
+ } && test -s conftest.$ac_objext; then
|
|
12650 |
+ :
|
|
12651 |
else
|
|
12652 |
echo "$as_me: failed program was:" >&5
|
|
12653 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
12654 |
|
|
12655 |
-fi
|
|
12656 |
-rm -f conftest.err conftest.$ac_objext
|
|
12657 |
-done
|
|
12658 |
-rm -f conftest.$ac_ext conftest.$ac_objext
|
|
12659 |
-CC=$ac_save_CC
|
|
12660 |
-
|
|
12661 |
-fi
|
|
12662 |
-
|
|
12663 |
-case "x$ac_cv_prog_cc_stdc" in
|
|
12664 |
- x|xno)
|
|
12665 |
- echo "$as_me:$LINENO: result: none needed" >&5
|
|
12666 |
-echo "${ECHO_T}none needed" >&6 ;;
|
|
12667 |
- *)
|
|
12668 |
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
|
12669 |
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
|
|
12670 |
- CC="$CC $ac_cv_prog_cc_stdc" ;;
|
|
12671 |
-esac
|
|
12672 |
-
|
|
12673 |
-# Some people use a C++ compiler to compile C. Since we use `exit',
|
|
12674 |
-# in C++ we need to declare it. In case someone uses the same compiler
|
|
12675 |
-# for both compiling C and C++ we need to have the C++ compiler decide
|
|
12676 |
-# the declaration of exit, since it's the most demanding environment.
|
|
12677 |
-cat >conftest.$ac_ext <<_ACEOF
|
|
12678 |
-#ifndef __cplusplus
|
|
12679 |
- choke me
|
|
12680 |
-#endif
|
|
12681 |
-_ACEOF
|
|
12682 |
-rm -f conftest.$ac_objext
|
|
12683 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12684 |
- (eval $ac_compile) 2>conftest.er1
|
|
12685 |
- ac_status=$?
|
|
12686 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
12687 |
- rm -f conftest.er1
|
|
12688 |
- cat conftest.err >&5
|
|
12689 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12690 |
- (exit $ac_status); } &&
|
|
12691 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
12692 |
- || test ! -s conftest.err'
|
|
12693 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12694 |
- (eval $ac_try) 2>&5
|
|
12695 |
- ac_status=$?
|
|
12696 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12697 |
- (exit $ac_status); }; } &&
|
|
12698 |
- { ac_try='test -s conftest.$ac_objext'
|
|
12699 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12700 |
- (eval $ac_try) 2>&5
|
|
12701 |
- ac_status=$?
|
|
12702 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12703 |
- (exit $ac_status); }; }; then
|
|
12704 |
- for ac_declaration in \
|
|
12705 |
- '' \
|
|
12706 |
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
12707 |
- 'extern "C" void std::exit (int); using std::exit;' \
|
|
12708 |
- 'extern "C" void exit (int) throw ();' \
|
|
12709 |
- 'extern "C" void exit (int);' \
|
|
12710 |
- 'void exit (int);'
|
|
12711 |
-do
|
|
12712 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
12713 |
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
|
12714 |
+ CFLAGS="-g"
|
|
12715 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
12716 |
/* confdefs.h. */
|
|
12717 |
_ACEOF
|
|
12718 |
cat confdefs.h >>conftest.$ac_ext
|
|
12719 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
12720 |
/* end confdefs.h. */
|
|
12721 |
-$ac_declaration
|
|
12722 |
-#include <stdlib.h>
|
|
12723 |
+
|
|
12724 |
int
|
|
12725 |
main ()
|
|
12726 |
{
|
|
12727 |
-exit (42);
|
|
12728 |
+
|
|
12729 |
;
|
|
12730 |
return 0;
|
|
12731 |
}
|
|
12732 |
_ACEOF
|
|
12733 |
rm -f conftest.$ac_objext
|
|
12734 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12735 |
- (eval $ac_compile) 2>conftest.er1
|
|
12736 |
+if { (ac_try="$ac_compile"
|
|
12737 |
+case "(($ac_try" in
|
|
12738 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12739 |
+ *) ac_try_echo=$ac_try;;
|
|
12740 |
+esac
|
|
12741 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12742 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
12743 |
ac_status=$?
|
|
12744 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
12745 |
rm -f conftest.er1
|
|
12746 |
cat conftest.err >&5
|
|
12747 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12748 |
- (exit $ac_status); } &&
|
|
12749 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
12750 |
- || test ! -s conftest.err'
|
|
12751 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12752 |
- (eval $ac_try) 2>&5
|
|
12753 |
- ac_status=$?
|
|
12754 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12755 |
- (exit $ac_status); }; } &&
|
|
12756 |
- { ac_try='test -s conftest.$ac_objext'
|
|
12757 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12758 |
- (eval $ac_try) 2>&5
|
|
12759 |
- ac_status=$?
|
|
12760 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12761 |
- (exit $ac_status); }; }; then
|
|
12762 |
- :
|
|
12763 |
+ (exit $ac_status); } && {
|
|
12764 |
+ test -z "$ac_c_werror_flag" ||
|
|
12765 |
+ test ! -s conftest.err
|
|
12766 |
+ } && test -s conftest.$ac_objext; then
|
|
12767 |
+ ac_cv_prog_cc_g=yes
|
|
12768 |
else
|
|
12769 |
echo "$as_me: failed program was:" >&5
|
|
12770 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
12771 |
|
|
12772 |
-continue
|
|
12773 |
+
|
|
12774 |
fi
|
|
12775 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12776 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
12777 |
+
|
|
12778 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12779 |
+fi
|
|
12780 |
+
|
|
12781 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12782 |
+fi
|
|
12783 |
+
|
|
12784 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12785 |
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
|
12786 |
+fi
|
|
12787 |
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
12788 |
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
|
12789 |
+if test "$ac_test_CFLAGS" = set; then
|
|
12790 |
+ CFLAGS=$ac_save_CFLAGS
|
|
12791 |
+elif test $ac_cv_prog_cc_g = yes; then
|
|
12792 |
+ if test "$GCC" = yes; then
|
|
12793 |
+ CFLAGS="-g -O2"
|
|
12794 |
+ else
|
|
12795 |
+ CFLAGS="-g"
|
|
12796 |
+ fi
|
|
12797 |
+else
|
|
12798 |
+ if test "$GCC" = yes; then
|
|
12799 |
+ CFLAGS="-O2"
|
|
12800 |
+ else
|
|
12801 |
+ CFLAGS=
|
|
12802 |
+ fi
|
|
12803 |
+fi
|
|
12804 |
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
12805 |
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
|
12806 |
+if test "${ac_cv_prog_cc_c89+set}" = set; then
|
|
12807 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
12808 |
+else
|
|
12809 |
+ ac_cv_prog_cc_c89=no
|
|
12810 |
+ac_save_CC=$CC
|
|
12811 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
12812 |
/* confdefs.h. */
|
|
12813 |
_ACEOF
|
|
12814 |
cat confdefs.h >>conftest.$ac_ext
|
|
12815 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
12816 |
/* end confdefs.h. */
|
|
12817 |
-$ac_declaration
|
|
12818 |
+#include <stdarg.h>
|
|
12819 |
+#include <stdio.h>
|
|
12820 |
+#include <sys/types.h>
|
|
12821 |
+#include <sys/stat.h>
|
|
12822 |
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
12823 |
+struct buf { int x; };
|
|
12824 |
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
12825 |
+static char *e (p, i)
|
|
12826 |
+ char **p;
|
|
12827 |
+ int i;
|
|
12828 |
+{
|
|
12829 |
+ return p[i];
|
|
12830 |
+}
|
|
12831 |
+static char *f (char * (*g) (char **, int), char **p, ...)
|
|
12832 |
+{
|
|
12833 |
+ char *s;
|
|
12834 |
+ va_list v;
|
|
12835 |
+ va_start (v,p);
|
|
12836 |
+ s = g (p, va_arg (v,int));
|
|
12837 |
+ va_end (v);
|
|
12838 |
+ return s;
|
|
12839 |
+}
|
|
12840 |
+
|
|
12841 |
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
|
12842 |
+ function prototypes and stuff, but not '\xHH' hex character constants.
|
|
12843 |
+ These don't provoke an error unfortunately, instead are silently treated
|
|
12844 |
+ as 'x'. The following induces an error, until -std is added to get
|
|
12845 |
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
|
12846 |
+ array size at least. It's necessary to write '\x00'==0 to get something
|
|
12847 |
+ that's true only with -std. */
|
|
12848 |
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
|
12849 |
+
|
|
12850 |
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
|
|
12851 |
+ inside strings and character constants. */
|
|
12852 |
+#define FOO(x) 'x'
|
|
12853 |
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
|
|
12854 |
+
|
|
12855 |
+int test (int i, double x);
|
|
12856 |
+struct s1 {int (*f) (int a);};
|
|
12857 |
+struct s2 {int (*f) (double a);};
|
|
12858 |
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
|
12859 |
+int argc;
|
|
12860 |
+char **argv;
|
|
12861 |
int
|
|
12862 |
main ()
|
|
12863 |
{
|
|
12864 |
-exit (42);
|
|
12865 |
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
|
12866 |
;
|
|
12867 |
return 0;
|
|
12868 |
}
|
|
12869 |
_ACEOF
|
|
12870 |
-rm -f conftest.$ac_objext
|
|
12871 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
12872 |
- (eval $ac_compile) 2>conftest.er1
|
|
12873 |
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
|
|
12874 |
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
12875 |
+do
|
|
12876 |
+ CC="$ac_save_CC $ac_arg"
|
|
12877 |
+ rm -f conftest.$ac_objext
|
|
12878 |
+if { (ac_try="$ac_compile"
|
|
12879 |
+case "(($ac_try" in
|
|
12880 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
12881 |
+ *) ac_try_echo=$ac_try;;
|
|
12882 |
+esac
|
|
12883 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
12884 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
12885 |
ac_status=$?
|
|
12886 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
12887 |
rm -f conftest.er1
|
|
12888 |
cat conftest.err >&5
|
|
12889 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12890 |
- (exit $ac_status); } &&
|
|
12891 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
12892 |
- || test ! -s conftest.err'
|
|
12893 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12894 |
- (eval $ac_try) 2>&5
|
|
12895 |
- ac_status=$?
|
|
12896 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12897 |
- (exit $ac_status); }; } &&
|
|
12898 |
- { ac_try='test -s conftest.$ac_objext'
|
|
12899 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
12900 |
- (eval $ac_try) 2>&5
|
|
12901 |
- ac_status=$?
|
|
12902 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
12903 |
- (exit $ac_status); }; }; then
|
|
12904 |
- break
|
|
12905 |
+ (exit $ac_status); } && {
|
|
12906 |
+ test -z "$ac_c_werror_flag" ||
|
|
12907 |
+ test ! -s conftest.err
|
|
12908 |
+ } && test -s conftest.$ac_objext; then
|
|
12909 |
+ ac_cv_prog_cc_c89=$ac_arg
|
|
12910 |
else
|
|
12911 |
echo "$as_me: failed program was:" >&5
|
|
12912 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
12913 |
|
|
12914 |
+
|
|
12915 |
fi
|
|
12916 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12917 |
+
|
|
12918 |
+rm -f core conftest.err conftest.$ac_objext
|
|
12919 |
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
12920 |
done
|
|
12921 |
-rm -f conftest*
|
|
12922 |
-if test -n "$ac_declaration"; then
|
|
12923 |
- echo '#ifdef __cplusplus' >>confdefs.h
|
|
12924 |
- echo $ac_declaration >>confdefs.h
|
|
12925 |
- echo '#endif' >>confdefs.h
|
|
12926 |
+rm -f conftest.$ac_ext
|
|
12927 |
+CC=$ac_save_CC
|
|
12928 |
+
|
|
12929 |
fi
|
|
12930 |
+# AC_CACHE_VAL
|
|
12931 |
+case "x$ac_cv_prog_cc_c89" in
|
|
12932 |
+ x)
|
|
12933 |
+ { echo "$as_me:$LINENO: result: none needed" >&5
|
|
12934 |
+echo "${ECHO_T}none needed" >&6; } ;;
|
|
12935 |
+ xno)
|
|
12936 |
+ { echo "$as_me:$LINENO: result: unsupported" >&5
|
|
12937 |
+echo "${ECHO_T}unsupported" >&6; } ;;
|
|
12938 |
+ *)
|
|
12939 |
+ CC="$CC $ac_cv_prog_cc_c89"
|
|
12940 |
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
12941 |
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
|
12942 |
+esac
|
|
12943 |
|
|
12944 |
-else
|
|
12945 |
- echo "$as_me: failed program was:" >&5
|
|
12946 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
12947 |
|
|
12948 |
-fi
|
|
12949 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
12950 |
ac_ext=c
|
|
12951 |
ac_cpp='$CPP $CPPFLAGS'
|
|
12952 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
12953 |
@@ -2902,7 +3418,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
|
|
12954 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
12955 |
DEPDIR="${am__leading_dot}deps"
|
|
12956 |
|
|
12957 |
- ac_config_commands="$ac_config_commands depfiles"
|
|
12958 |
+ac_config_commands="$ac_config_commands depfiles"
|
|
12959 |
|
|
12960 |
|
|
12961 |
am_make=${MAKE-make}
|
|
12962 |
@@ -2912,8 +3428,8 @@ am__doit:
|
|
12963 |
.PHONY: am__doit
|
|
12964 |
END
|
|
12965 |
# If we don't find an include directive, just comment out the code.
|
|
12966 |
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
|
12967 |
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
|
|
12968 |
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
|
12969 |
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
|
|
12970 |
am__include="#"
|
|
12971 |
am__quote=
|
|
12972 |
_am_result=none
|
|
12973 |
@@ -2940,15 +3456,15 @@ if test "$am__include" = "#"; then
|
|
12974 |
fi
|
|
12975 |
|
|
12976 |
|
|
12977 |
-echo "$as_me:$LINENO: result: $_am_result" >&5
|
|
12978 |
-echo "${ECHO_T}$_am_result" >&6
|
|
12979 |
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
|
|
12980 |
+echo "${ECHO_T}$_am_result" >&6; }
|
|
12981 |
rm -f confinc confmf
|
|
12982 |
|
|
12983 |
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
|
|
12984 |
+# Check whether --enable-dependency-tracking was given.
|
|
12985 |
if test "${enable_dependency_tracking+set}" = set; then
|
|
12986 |
- enableval="$enable_dependency_tracking"
|
|
12987 |
+ enableval=$enable_dependency_tracking;
|
|
12988 |
+fi
|
|
12989 |
|
|
12990 |
-fi;
|
|
12991 |
if test "x$enable_dependency_tracking" != xno; then
|
|
12992 |
am_depcomp="$ac_aux_dir/depcomp"
|
|
12993 |
AMDEPBACKSLASH='\'
|
|
12994 |
@@ -2968,8 +3484,8 @@ fi
|
|
12995 |
|
|
12996 |
depcc="$CC" am_compiler_list=
|
|
12997 |
|
|
12998 |
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
12999 |
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
|
|
13000 |
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
13001 |
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
|
13002 |
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
13003 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13004 |
else
|
|
13005 |
@@ -3007,9 +3523,7 @@ else
|
|
13006 |
: > sub/conftest.c
|
|
13007 |
for i in 1 2 3 4 5 6; do
|
|
13008 |
echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
|
13009 |
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
|
13010 |
- # Solaris 8's {/usr,}/bin/sh.
|
|
13011 |
- touch sub/conftst$i.h
|
|
13012 |
+ : > sub/conftst$i.h
|
|
13013 |
done
|
|
13014 |
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
13015 |
|
|
13016 |
@@ -3037,14 +3551,9 @@ else
|
|
13017 |
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
13018 |
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
13019 |
# icc doesn't choke on unknown options, it will just issue warnings
|
|
13020 |
- # or remarks (even with -Werror). So we grep stderr for any message
|
|
13021 |
- # that says an option was ignored or not supported.
|
|
13022 |
- # When given -MP, icc 7.0 and 7.1 complain thusly:
|
|
13023 |
- # icc: Command line warning: ignoring option '-M'; no argument required
|
|
13024 |
- # The diagnosis changed in icc 8.0:
|
|
13025 |
- # icc: Command line remark: option '-MP' not supported
|
|
13026 |
- if (grep 'ignoring option' conftest.err ||
|
|
13027 |
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
|
13028 |
+ # (even with -Werror). So we grep stderr for any message
|
|
13029 |
+ # that says an option was ignored.
|
|
13030 |
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
|
|
13031 |
am_cv_CC_dependencies_compiler_type=$depmode
|
|
13032 |
break
|
|
13033 |
fi
|
|
13034 |
@@ -3058,8 +3567,8 @@ else
|
|
13035 |
fi
|
|
13036 |
|
|
13037 |
fi
|
|
13038 |
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
13039 |
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
|
|
13040 |
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
13041 |
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
13042 |
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
13043 |
|
|
13044 |
|
|
13045 |
@@ -3075,238 +3584,125 @@ else
|
|
13046 |
fi
|
|
13047 |
|
|
13048 |
|
|
13049 |
-ac_ext=c
|
|
13050 |
-ac_cpp='$CPP $CPPFLAGS'
|
|
13051 |
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
13052 |
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
13053 |
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
13054 |
-if test -n "$ac_tool_prefix"; then
|
|
13055 |
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
|
13056 |
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
|
13057 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13058 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13059 |
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
13060 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13061 |
-else
|
|
13062 |
- if test -n "$CC"; then
|
|
13063 |
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
13064 |
-else
|
|
13065 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13066 |
-for as_dir in $PATH
|
|
13067 |
-do
|
|
13068 |
- IFS=$as_save_IFS
|
|
13069 |
- test -z "$as_dir" && as_dir=.
|
|
13070 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13071 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13072 |
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
13073 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13074 |
- break 2
|
|
13075 |
- fi
|
|
13076 |
-done
|
|
13077 |
-done
|
|
13078 |
-
|
|
13079 |
-fi
|
|
13080 |
-fi
|
|
13081 |
-CC=$ac_cv_prog_CC
|
|
13082 |
-if test -n "$CC"; then
|
|
13083 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
13084 |
-echo "${ECHO_T}$CC" >&6
|
|
13085 |
-else
|
|
13086 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13087 |
-echo "${ECHO_T}no" >&6
|
|
13088 |
-fi
|
|
13089 |
|
|
13090 |
-fi
|
|
13091 |
-if test -z "$ac_cv_prog_CC"; then
|
|
13092 |
- ac_ct_CC=$CC
|
|
13093 |
- # Extract the first word of "gcc", so it can be a program name with args.
|
|
13094 |
-set dummy gcc; ac_word=$2
|
|
13095 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13096 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13097 |
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
13098 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13099 |
-else
|
|
13100 |
- if test -n "$ac_ct_CC"; then
|
|
13101 |
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
13102 |
-else
|
|
13103 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13104 |
-for as_dir in $PATH
|
|
13105 |
-do
|
|
13106 |
- IFS=$as_save_IFS
|
|
13107 |
- test -z "$as_dir" && as_dir=.
|
|
13108 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13109 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13110 |
- ac_cv_prog_ac_ct_CC="gcc"
|
|
13111 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13112 |
- break 2
|
|
13113 |
- fi
|
|
13114 |
-done
|
|
13115 |
-done
|
|
13116 |
|
|
13117 |
-fi
|
|
13118 |
-fi
|
|
13119 |
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
13120 |
-if test -n "$ac_ct_CC"; then
|
|
13121 |
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
13122 |
-echo "${ECHO_T}$ac_ct_CC" >&6
|
|
13123 |
-else
|
|
13124 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13125 |
-echo "${ECHO_T}no" >&6
|
|
13126 |
-fi
|
|
13127 |
|
|
13128 |
- CC=$ac_ct_CC
|
|
13129 |
-else
|
|
13130 |
- CC="$ac_cv_prog_CC"
|
|
13131 |
-fi
|
|
13132 |
|
|
13133 |
-if test -z "$CC"; then
|
|
13134 |
- if test -n "$ac_tool_prefix"; then
|
|
13135 |
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
|
13136 |
-set dummy ${ac_tool_prefix}cc; ac_word=$2
|
|
13137 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13138 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13139 |
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
13140 |
+{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
|
|
13141 |
+echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; }
|
|
13142 |
+if test "${am_cv_prog_cc_stdc+set}" = set; then
|
|
13143 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13144 |
else
|
|
13145 |
- if test -n "$CC"; then
|
|
13146 |
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
13147 |
-else
|
|
13148 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13149 |
-for as_dir in $PATH
|
|
13150 |
+ am_cv_prog_cc_stdc=no
|
|
13151 |
+ac_save_CC="$CC"
|
|
13152 |
+# Don't try gcc -ansi; that turns off useful extensions and
|
|
13153 |
+# breaks some systems' header files.
|
|
13154 |
+# AIX -qlanglvl=ansi
|
|
13155 |
+# Ultrix and OSF/1 -std1
|
|
13156 |
+# HP-UX 10.20 and later -Ae
|
|
13157 |
+# HP-UX older versions -Aa -D_HPUX_SOURCE
|
|
13158 |
+# SVR4 -Xc -D__EXTENSIONS__
|
|
13159 |
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
13160 |
do
|
|
13161 |
- IFS=$as_save_IFS
|
|
13162 |
- test -z "$as_dir" && as_dir=.
|
|
13163 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13164 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13165 |
- ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
13166 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13167 |
- break 2
|
|
13168 |
- fi
|
|
13169 |
-done
|
|
13170 |
-done
|
|
13171 |
+ CC="$ac_save_CC $ac_arg"
|
|
13172 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
13173 |
+/* confdefs.h. */
|
|
13174 |
+_ACEOF
|
|
13175 |
+cat confdefs.h >>conftest.$ac_ext
|
|
13176 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
13177 |
+/* end confdefs.h. */
|
|
13178 |
+#include <stdarg.h>
|
|
13179 |
+#include <stdio.h>
|
|
13180 |
+#include <sys/types.h>
|
|
13181 |
+#include <sys/stat.h>
|
|
13182 |
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
13183 |
+struct buf { int x; };
|
|
13184 |
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
13185 |
+static char *e (p, i)
|
|
13186 |
+ char **p;
|
|
13187 |
+ int i;
|
|
13188 |
+{
|
|
13189 |
+ return p[i];
|
|
13190 |
+}
|
|
13191 |
+static char *f (char * (*g) (char **, int), char **p, ...)
|
|
13192 |
+{
|
|
13193 |
+ char *s;
|
|
13194 |
+ va_list v;
|
|
13195 |
+ va_start (v,p);
|
|
13196 |
+ s = g (p, va_arg (v,int));
|
|
13197 |
+ va_end (v);
|
|
13198 |
+ return s;
|
|
13199 |
+}
|
|
13200 |
+int test (int i, double x);
|
|
13201 |
+struct s1 {int (*f) (int a);};
|
|
13202 |
+struct s2 {int (*f) (double a);};
|
|
13203 |
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
|
13204 |
+int argc;
|
|
13205 |
+char **argv;
|
|
13206 |
|
|
13207 |
-fi
|
|
13208 |
-fi
|
|
13209 |
-CC=$ac_cv_prog_CC
|
|
13210 |
-if test -n "$CC"; then
|
|
13211 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
13212 |
-echo "${ECHO_T}$CC" >&6
|
|
13213 |
-else
|
|
13214 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13215 |
-echo "${ECHO_T}no" >&6
|
|
13216 |
-fi
|
|
13217 |
+int
|
|
13218 |
+main ()
|
|
13219 |
+{
|
|
13220 |
|
|
13221 |
-fi
|
|
13222 |
-if test -z "$ac_cv_prog_CC"; then
|
|
13223 |
- ac_ct_CC=$CC
|
|
13224 |
- # Extract the first word of "cc", so it can be a program name with args.
|
|
13225 |
-set dummy cc; ac_word=$2
|
|
13226 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13227 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13228 |
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
13229 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13230 |
-else
|
|
13231 |
- if test -n "$ac_ct_CC"; then
|
|
13232 |
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
13233 |
-else
|
|
13234 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13235 |
-for as_dir in $PATH
|
|
13236 |
-do
|
|
13237 |
- IFS=$as_save_IFS
|
|
13238 |
- test -z "$as_dir" && as_dir=.
|
|
13239 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13240 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13241 |
- ac_cv_prog_ac_ct_CC="cc"
|
|
13242 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13243 |
- break 2
|
|
13244 |
- fi
|
|
13245 |
-done
|
|
13246 |
-done
|
|
13247 |
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
|
13248 |
|
|
13249 |
-fi
|
|
13250 |
-fi
|
|
13251 |
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
13252 |
-if test -n "$ac_ct_CC"; then
|
|
13253 |
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
13254 |
-echo "${ECHO_T}$ac_ct_CC" >&6
|
|
13255 |
+ ;
|
|
13256 |
+ return 0;
|
|
13257 |
+}
|
|
13258 |
+_ACEOF
|
|
13259 |
+rm -f conftest.$ac_objext
|
|
13260 |
+if { (ac_try="$ac_compile"
|
|
13261 |
+case "(($ac_try" in
|
|
13262 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
13263 |
+ *) ac_try_echo=$ac_try;;
|
|
13264 |
+esac
|
|
13265 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
13266 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
13267 |
+ ac_status=$?
|
|
13268 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
13269 |
+ rm -f conftest.er1
|
|
13270 |
+ cat conftest.err >&5
|
|
13271 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13272 |
+ (exit $ac_status); } && {
|
|
13273 |
+ test -z "$ac_c_werror_flag" ||
|
|
13274 |
+ test ! -s conftest.err
|
|
13275 |
+ } && test -s conftest.$ac_objext; then
|
|
13276 |
+ am_cv_prog_cc_stdc="$ac_arg"; break
|
|
13277 |
else
|
|
13278 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13279 |
-echo "${ECHO_T}no" >&6
|
|
13280 |
-fi
|
|
13281 |
+ echo "$as_me: failed program was:" >&5
|
|
13282 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
13283 |
|
|
13284 |
- CC=$ac_ct_CC
|
|
13285 |
-else
|
|
13286 |
- CC="$ac_cv_prog_CC"
|
|
13287 |
-fi
|
|
13288 |
|
|
13289 |
fi
|
|
13290 |
-if test -z "$CC"; then
|
|
13291 |
- # Extract the first word of "cc", so it can be a program name with args.
|
|
13292 |
-set dummy cc; ac_word=$2
|
|
13293 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13294 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13295 |
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
13296 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13297 |
-else
|
|
13298 |
- if test -n "$CC"; then
|
|
13299 |
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
13300 |
-else
|
|
13301 |
- ac_prog_rejected=no
|
|
13302 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13303 |
-for as_dir in $PATH
|
|
13304 |
-do
|
|
13305 |
- IFS=$as_save_IFS
|
|
13306 |
- test -z "$as_dir" && as_dir=.
|
|
13307 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13308 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13309 |
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
13310 |
- ac_prog_rejected=yes
|
|
13311 |
- continue
|
|
13312 |
- fi
|
|
13313 |
- ac_cv_prog_CC="cc"
|
|
13314 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13315 |
- break 2
|
|
13316 |
- fi
|
|
13317 |
-done
|
|
13318 |
+
|
|
13319 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
13320 |
done
|
|
13321 |
+CC="$ac_save_CC"
|
|
13322 |
|
|
13323 |
-if test $ac_prog_rejected = yes; then
|
|
13324 |
- # We found a bogon in the path, so make sure we never use it.
|
|
13325 |
- set dummy $ac_cv_prog_CC
|
|
13326 |
- shift
|
|
13327 |
- if test $# != 0; then
|
|
13328 |
- # We chose a different compiler from the bogus one.
|
|
13329 |
- # However, it has the same basename, so the bogon will be chosen
|
|
13330 |
- # first if we set CC to just the basename; use the full file name.
|
|
13331 |
- shift
|
|
13332 |
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
|
|
13333 |
- fi
|
|
13334 |
fi
|
|
13335 |
-fi
|
|
13336 |
-fi
|
|
13337 |
-CC=$ac_cv_prog_CC
|
|
13338 |
-if test -n "$CC"; then
|
|
13339 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
13340 |
-echo "${ECHO_T}$CC" >&6
|
|
13341 |
+
|
|
13342 |
+if test -z "$am_cv_prog_cc_stdc"; then
|
|
13343 |
+ { echo "$as_me:$LINENO: result: none needed" >&5
|
|
13344 |
+echo "${ECHO_T}none needed" >&6; }
|
|
13345 |
else
|
|
13346 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13347 |
-echo "${ECHO_T}no" >&6
|
|
13348 |
+ { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
|
|
13349 |
+echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; }
|
|
13350 |
fi
|
|
13351 |
+case "x$am_cv_prog_cc_stdc" in
|
|
13352 |
+ x|xno) ;;
|
|
13353 |
+ *) CC="$CC $am_cv_prog_cc_stdc" ;;
|
|
13354 |
+esac
|
|
13355 |
|
|
13356 |
-fi
|
|
13357 |
-if test -z "$CC"; then
|
|
13358 |
- if test -n "$ac_tool_prefix"; then
|
|
13359 |
- for ac_prog in cl
|
|
13360 |
- do
|
|
13361 |
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
13362 |
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
13363 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13364 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13365 |
-if test "${ac_cv_prog_CC+set}" = set; then
|
|
13366 |
+if test -n "$ac_tool_prefix"; then
|
|
13367 |
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
|
13368 |
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
|
13369 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13370 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
13371 |
+if test "${ac_cv_prog_RANLIB+set}" = set; then
|
|
13372 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13373 |
else
|
|
13374 |
- if test -n "$CC"; then
|
|
13375 |
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
13376 |
+ if test -n "$RANLIB"; then
|
|
13377 |
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
|
13378 |
else
|
|
13379 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13380 |
for as_dir in $PATH
|
|
13381 |
@@ -3314,41 +3710,39 @@ do
|
|
13382 |
IFS=$as_save_IFS
|
|
13383 |
test -z "$as_dir" && as_dir=.
|
|
13384 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13385 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13386 |
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
13387 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
13388 |
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
|
13389 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13390 |
break 2
|
|
13391 |
fi
|
|
13392 |
done
|
|
13393 |
done
|
|
13394 |
+IFS=$as_save_IFS
|
|
13395 |
|
|
13396 |
fi
|
|
13397 |
fi
|
|
13398 |
-CC=$ac_cv_prog_CC
|
|
13399 |
-if test -n "$CC"; then
|
|
13400 |
- echo "$as_me:$LINENO: result: $CC" >&5
|
|
13401 |
-echo "${ECHO_T}$CC" >&6
|
|
13402 |
+RANLIB=$ac_cv_prog_RANLIB
|
|
13403 |
+if test -n "$RANLIB"; then
|
|
13404 |
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
|
13405 |
+echo "${ECHO_T}$RANLIB" >&6; }
|
|
13406 |
else
|
|
13407 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13408 |
-echo "${ECHO_T}no" >&6
|
|
13409 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
13410 |
+echo "${ECHO_T}no" >&6; }
|
|
13411 |
fi
|
|
13412 |
|
|
13413 |
- test -n "$CC" && break
|
|
13414 |
- done
|
|
13415 |
+
|
|
13416 |
fi
|
|
13417 |
-if test -z "$CC"; then
|
|
13418 |
- ac_ct_CC=$CC
|
|
13419 |
- for ac_prog in cl
|
|
13420 |
-do
|
|
13421 |
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
13422 |
-set dummy $ac_prog; ac_word=$2
|
|
13423 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13424 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
13425 |
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
|
13426 |
+if test -z "$ac_cv_prog_RANLIB"; then
|
|
13427 |
+ ac_ct_RANLIB=$RANLIB
|
|
13428 |
+ # Extract the first word of "ranlib", so it can be a program name with args.
|
|
13429 |
+set dummy ranlib; ac_word=$2
|
|
13430 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
13431 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
13432 |
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
|
|
13433 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13434 |
else
|
|
13435 |
- if test -n "$ac_ct_CC"; then
|
|
13436 |
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
|
13437 |
+ if test -n "$ac_ct_RANLIB"; then
|
|
13438 |
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
|
13439 |
else
|
|
13440 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
13441 |
for as_dir in $PATH
|
|
13442 |
@@ -3356,576 +3750,296 @@ do
|
|
13443 |
IFS=$as_save_IFS
|
|
13444 |
test -z "$as_dir" && as_dir=.
|
|
13445 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
13446 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
13447 |
- ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
13448 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
13449 |
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
|
|
13450 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
13451 |
break 2
|
|
13452 |
fi
|
|
13453 |
done
|
|
13454 |
done
|
|
13455 |
+IFS=$as_save_IFS
|
|
13456 |
|
|
13457 |
fi
|
|
13458 |
fi
|
|
13459 |
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
13460 |
-if test -n "$ac_ct_CC"; then
|
|
13461 |
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
13462 |
-echo "${ECHO_T}$ac_ct_CC" >&6
|
|
13463 |
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
|
13464 |
+if test -n "$ac_ct_RANLIB"; then
|
|
13465 |
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
|
13466 |
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
|
|
13467 |
else
|
|
13468 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
13469 |
-echo "${ECHO_T}no" >&6
|
|
13470 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
13471 |
+echo "${ECHO_T}no" >&6; }
|
|
13472 |
fi
|
|
13473 |
|
|
13474 |
- test -n "$ac_ct_CC" && break
|
|
13475 |
-done
|
|
13476 |
-
|
|
13477 |
- CC=$ac_ct_CC
|
|
13478 |
+ if test "x$ac_ct_RANLIB" = x; then
|
|
13479 |
+ RANLIB=":"
|
|
13480 |
+ else
|
|
13481 |
+ case $cross_compiling:$ac_tool_warned in
|
|
13482 |
+yes:)
|
|
13483 |
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
13484 |
+whose name does not start with the host triplet. If you think this
|
|
13485 |
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
13486 |
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
13487 |
+whose name does not start with the host triplet. If you think this
|
|
13488 |
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
13489 |
+ac_tool_warned=yes ;;
|
|
13490 |
+esac
|
|
13491 |
+ RANLIB=$ac_ct_RANLIB
|
|
13492 |
+ fi
|
|
13493 |
+else
|
|
13494 |
+ RANLIB="$ac_cv_prog_RANLIB"
|
|
13495 |
fi
|
|
13496 |
|
|
13497 |
+ac_ext=c
|
|
13498 |
+ac_cpp='$CPP $CPPFLAGS'
|
|
13499 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
13500 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
13501 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
13502 |
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
|
13503 |
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
|
|
13504 |
+# On Suns, sometimes $CPP names a directory.
|
|
13505 |
+if test -n "$CPP" && test -d "$CPP"; then
|
|
13506 |
+ CPP=
|
|
13507 |
fi
|
|
13508 |
-
|
|
13509 |
-
|
|
13510 |
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
|
13511 |
-See \`config.log' for more details." >&5
|
|
13512 |
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
|
13513 |
-See \`config.log' for more details." >&2;}
|
|
13514 |
- { (exit 1); exit 1; }; }
|
|
13515 |
-
|
|
13516 |
-# Provide some information about the compiler.
|
|
13517 |
-echo "$as_me:$LINENO:" \
|
|
13518 |
- "checking for C compiler version" >&5
|
|
13519 |
-ac_compiler=`set X $ac_compile; echo $2`
|
|
13520 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
|
13521 |
- (eval $ac_compiler --version </dev/null >&5) 2>&5
|
|
13522 |
- ac_status=$?
|
|
13523 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13524 |
- (exit $ac_status); }
|
|
13525 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
|
13526 |
- (eval $ac_compiler -v </dev/null >&5) 2>&5
|
|
13527 |
- ac_status=$?
|
|
13528 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13529 |
- (exit $ac_status); }
|
|
13530 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
|
13531 |
- (eval $ac_compiler -V </dev/null >&5) 2>&5
|
|
13532 |
- ac_status=$?
|
|
13533 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13534 |
- (exit $ac_status); }
|
|
13535 |
-
|
|
13536 |
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
13537 |
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
|
|
13538 |
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
|
13539 |
+if test -z "$CPP"; then
|
|
13540 |
+ if test "${ac_cv_prog_CPP+set}" = set; then
|
|
13541 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13542 |
else
|
|
13543 |
+ # Double quotes because CPP needs to be expanded
|
|
13544 |
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
|
13545 |
+ do
|
|
13546 |
+ ac_preproc_ok=false
|
|
13547 |
+for ac_c_preproc_warn_flag in '' yes
|
|
13548 |
+do
|
|
13549 |
+ # Use a header file that comes with gcc, so configuring glibc
|
|
13550 |
+ # with a fresh cross-compiler works.
|
|
13551 |
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
13552 |
+ # <limits.h> exists even on freestanding compilers.
|
|
13553 |
+ # On the NeXT, cc -E runs the code through the compiler's parser,
|
|
13554 |
+ # not just through cpp. "Syntax error" is here to catch this case.
|
|
13555 |
cat >conftest.$ac_ext <<_ACEOF
|
|
13556 |
/* confdefs.h. */
|
|
13557 |
_ACEOF
|
|
13558 |
cat confdefs.h >>conftest.$ac_ext
|
|
13559 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
13560 |
/* end confdefs.h. */
|
|
13561 |
-
|
|
13562 |
-int
|
|
13563 |
-main ()
|
|
13564 |
-{
|
|
13565 |
-#ifndef __GNUC__
|
|
13566 |
- choke me
|
|
13567 |
+#ifdef __STDC__
|
|
13568 |
+# include <limits.h>
|
|
13569 |
+#else
|
|
13570 |
+# include <assert.h>
|
|
13571 |
#endif
|
|
13572 |
-
|
|
13573 |
- ;
|
|
13574 |
- return 0;
|
|
13575 |
-}
|
|
13576 |
+ Syntax error
|
|
13577 |
_ACEOF
|
|
13578 |
-rm -f conftest.$ac_objext
|
|
13579 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
13580 |
- (eval $ac_compile) 2>conftest.er1
|
|
13581 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
13582 |
+case "(($ac_try" in
|
|
13583 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
13584 |
+ *) ac_try_echo=$ac_try;;
|
|
13585 |
+esac
|
|
13586 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
13587 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
13588 |
ac_status=$?
|
|
13589 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
13590 |
rm -f conftest.er1
|
|
13591 |
cat conftest.err >&5
|
|
13592 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13593 |
- (exit $ac_status); } &&
|
|
13594 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
13595 |
- || test ! -s conftest.err'
|
|
13596 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13597 |
- (eval $ac_try) 2>&5
|
|
13598 |
- ac_status=$?
|
|
13599 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13600 |
- (exit $ac_status); }; } &&
|
|
13601 |
- { ac_try='test -s conftest.$ac_objext'
|
|
13602 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13603 |
- (eval $ac_try) 2>&5
|
|
13604 |
- ac_status=$?
|
|
13605 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13606 |
- (exit $ac_status); }; }; then
|
|
13607 |
- ac_compiler_gnu=yes
|
|
13608 |
+ (exit $ac_status); } >/dev/null && {
|
|
13609 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
13610 |
+ test ! -s conftest.err
|
|
13611 |
+ }; then
|
|
13612 |
+ :
|
|
13613 |
else
|
|
13614 |
echo "$as_me: failed program was:" >&5
|
|
13615 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
13616 |
|
|
13617 |
-ac_compiler_gnu=no
|
|
13618 |
+ # Broken: fails on valid input.
|
|
13619 |
+continue
|
|
13620 |
fi
|
|
13621 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
13622 |
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
13623 |
|
|
13624 |
-fi
|
|
13625 |
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
13626 |
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
|
|
13627 |
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
|
13628 |
-ac_test_CFLAGS=${CFLAGS+set}
|
|
13629 |
-ac_save_CFLAGS=$CFLAGS
|
|
13630 |
-CFLAGS="-g"
|
|
13631 |
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
13632 |
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
|
13633 |
-if test "${ac_cv_prog_cc_g+set}" = set; then
|
|
13634 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13635 |
-else
|
|
13636 |
+rm -f conftest.err conftest.$ac_ext
|
|
13637 |
+
|
|
13638 |
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
13639 |
+ # can be detected and how.
|
|
13640 |
cat >conftest.$ac_ext <<_ACEOF
|
|
13641 |
/* confdefs.h. */
|
|
13642 |
_ACEOF
|
|
13643 |
cat confdefs.h >>conftest.$ac_ext
|
|
13644 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
13645 |
/* end confdefs.h. */
|
|
13646 |
-
|
|
13647 |
-int
|
|
13648 |
-main ()
|
|
13649 |
-{
|
|
13650 |
-
|
|
13651 |
- ;
|
|
13652 |
- return 0;
|
|
13653 |
-}
|
|
13654 |
+#include <ac_nonexistent.h>
|
|
13655 |
_ACEOF
|
|
13656 |
-rm -f conftest.$ac_objext
|
|
13657 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
13658 |
- (eval $ac_compile) 2>conftest.er1
|
|
13659 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
13660 |
+case "(($ac_try" in
|
|
13661 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
13662 |
+ *) ac_try_echo=$ac_try;;
|
|
13663 |
+esac
|
|
13664 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
13665 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
13666 |
ac_status=$?
|
|
13667 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
13668 |
rm -f conftest.er1
|
|
13669 |
cat conftest.err >&5
|
|
13670 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13671 |
- (exit $ac_status); } &&
|
|
13672 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
13673 |
- || test ! -s conftest.err'
|
|
13674 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13675 |
- (eval $ac_try) 2>&5
|
|
13676 |
- ac_status=$?
|
|
13677 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13678 |
- (exit $ac_status); }; } &&
|
|
13679 |
- { ac_try='test -s conftest.$ac_objext'
|
|
13680 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13681 |
- (eval $ac_try) 2>&5
|
|
13682 |
- ac_status=$?
|
|
13683 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13684 |
- (exit $ac_status); }; }; then
|
|
13685 |
- ac_cv_prog_cc_g=yes
|
|
13686 |
+ (exit $ac_status); } >/dev/null && {
|
|
13687 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
13688 |
+ test ! -s conftest.err
|
|
13689 |
+ }; then
|
|
13690 |
+ # Broken: success on invalid input.
|
|
13691 |
+continue
|
|
13692 |
else
|
|
13693 |
echo "$as_me: failed program was:" >&5
|
|
13694 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
13695 |
|
|
13696 |
-ac_cv_prog_cc_g=no
|
|
13697 |
-fi
|
|
13698 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
13699 |
-fi
|
|
13700 |
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
13701 |
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
|
|
13702 |
-if test "$ac_test_CFLAGS" = set; then
|
|
13703 |
- CFLAGS=$ac_save_CFLAGS
|
|
13704 |
-elif test $ac_cv_prog_cc_g = yes; then
|
|
13705 |
- if test "$GCC" = yes; then
|
|
13706 |
- CFLAGS="-g -O2"
|
|
13707 |
- else
|
|
13708 |
- CFLAGS="-g"
|
|
13709 |
- fi
|
|
13710 |
-else
|
|
13711 |
- if test "$GCC" = yes; then
|
|
13712 |
- CFLAGS="-O2"
|
|
13713 |
- else
|
|
13714 |
- CFLAGS=
|
|
13715 |
- fi
|
|
13716 |
+ # Passes both tests.
|
|
13717 |
+ac_preproc_ok=:
|
|
13718 |
+break
|
|
13719 |
fi
|
|
13720 |
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
|
|
13721 |
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
|
|
13722 |
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
|
|
13723 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
13724 |
-else
|
|
13725 |
- ac_cv_prog_cc_stdc=no
|
|
13726 |
-ac_save_CC=$CC
|
|
13727 |
-cat >conftest.$ac_ext <<_ACEOF
|
|
13728 |
-/* confdefs.h. */
|
|
13729 |
-_ACEOF
|
|
13730 |
-cat confdefs.h >>conftest.$ac_ext
|
|
13731 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
13732 |
-/* end confdefs.h. */
|
|
13733 |
-#include <stdarg.h>
|
|
13734 |
-#include <stdio.h>
|
|
13735 |
-#include <sys/types.h>
|
|
13736 |
-#include <sys/stat.h>
|
|
13737 |
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
13738 |
-struct buf { int x; };
|
|
13739 |
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
13740 |
-static char *e (p, i)
|
|
13741 |
- char **p;
|
|
13742 |
- int i;
|
|
13743 |
-{
|
|
13744 |
- return p[i];
|
|
13745 |
-}
|
|
13746 |
-static char *f (char * (*g) (char **, int), char **p, ...)
|
|
13747 |
-{
|
|
13748 |
- char *s;
|
|
13749 |
- va_list v;
|
|
13750 |
- va_start (v,p);
|
|
13751 |
- s = g (p, va_arg (v,int));
|
|
13752 |
- va_end (v);
|
|
13753 |
- return s;
|
|
13754 |
-}
|
|
13755 |
-
|
|
13756 |
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
|
13757 |
- function prototypes and stuff, but not '\xHH' hex character constants.
|
|
13758 |
- These don't provoke an error unfortunately, instead are silently treated
|
|
13759 |
- as 'x'. The following induces an error, until -std1 is added to get
|
|
13760 |
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
|
13761 |
- array size at least. It's necessary to write '\x00'==0 to get something
|
|
13762 |
- that's true only with -std1. */
|
|
13763 |
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
|
13764 |
|
|
13765 |
-int test (int i, double x);
|
|
13766 |
-struct s1 {int (*f) (int a);};
|
|
13767 |
-struct s2 {int (*f) (double a);};
|
|
13768 |
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
|
13769 |
-int argc;
|
|
13770 |
-char **argv;
|
|
13771 |
-int
|
|
13772 |
-main ()
|
|
13773 |
-{
|
|
13774 |
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
|
13775 |
- ;
|
|
13776 |
- return 0;
|
|
13777 |
-}
|
|
13778 |
-_ACEOF
|
|
13779 |
-# Don't try gcc -ansi; that turns off useful extensions and
|
|
13780 |
-# breaks some systems' header files.
|
|
13781 |
-# AIX -qlanglvl=ansi
|
|
13782 |
-# Ultrix and OSF/1 -std1
|
|
13783 |
-# HP-UX 10.20 and later -Ae
|
|
13784 |
-# HP-UX older versions -Aa -D_HPUX_SOURCE
|
|
13785 |
-# SVR4 -Xc -D__EXTENSIONS__
|
|
13786 |
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
13787 |
-do
|
|
13788 |
- CC="$ac_save_CC $ac_arg"
|
|
13789 |
- rm -f conftest.$ac_objext
|
|
13790 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
13791 |
- (eval $ac_compile) 2>conftest.er1
|
|
13792 |
- ac_status=$?
|
|
13793 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
13794 |
- rm -f conftest.er1
|
|
13795 |
- cat conftest.err >&5
|
|
13796 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13797 |
- (exit $ac_status); } &&
|
|
13798 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
13799 |
- || test ! -s conftest.err'
|
|
13800 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13801 |
- (eval $ac_try) 2>&5
|
|
13802 |
- ac_status=$?
|
|
13803 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13804 |
- (exit $ac_status); }; } &&
|
|
13805 |
- { ac_try='test -s conftest.$ac_objext'
|
|
13806 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13807 |
- (eval $ac_try) 2>&5
|
|
13808 |
- ac_status=$?
|
|
13809 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13810 |
- (exit $ac_status); }; }; then
|
|
13811 |
- ac_cv_prog_cc_stdc=$ac_arg
|
|
13812 |
-break
|
|
13813 |
-else
|
|
13814 |
- echo "$as_me: failed program was:" >&5
|
|
13815 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
13816 |
+rm -f conftest.err conftest.$ac_ext
|
|
13817 |
|
|
13818 |
-fi
|
|
13819 |
-rm -f conftest.err conftest.$ac_objext
|
|
13820 |
done
|
|
13821 |
-rm -f conftest.$ac_ext conftest.$ac_objext
|
|
13822 |
-CC=$ac_save_CC
|
|
13823 |
-
|
|
13824 |
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
13825 |
+rm -f conftest.err conftest.$ac_ext
|
|
13826 |
+if $ac_preproc_ok; then
|
|
13827 |
+ break
|
|
13828 |
fi
|
|
13829 |
|
|
13830 |
-case "x$ac_cv_prog_cc_stdc" in
|
|
13831 |
- x|xno)
|
|
13832 |
- echo "$as_me:$LINENO: result: none needed" >&5
|
|
13833 |
-echo "${ECHO_T}none needed" >&6 ;;
|
|
13834 |
- *)
|
|
13835 |
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
|
13836 |
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
|
|
13837 |
- CC="$CC $ac_cv_prog_cc_stdc" ;;
|
|
13838 |
-esac
|
|
13839 |
+ done
|
|
13840 |
+ ac_cv_prog_CPP=$CPP
|
|
13841 |
|
|
13842 |
-# Some people use a C++ compiler to compile C. Since we use `exit',
|
|
13843 |
-# in C++ we need to declare it. In case someone uses the same compiler
|
|
13844 |
-# for both compiling C and C++ we need to have the C++ compiler decide
|
|
13845 |
-# the declaration of exit, since it's the most demanding environment.
|
|
13846 |
-cat >conftest.$ac_ext <<_ACEOF
|
|
13847 |
-#ifndef __cplusplus
|
|
13848 |
- choke me
|
|
13849 |
-#endif
|
|
13850 |
-_ACEOF
|
|
13851 |
-rm -f conftest.$ac_objext
|
|
13852 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
13853 |
- (eval $ac_compile) 2>conftest.er1
|
|
13854 |
- ac_status=$?
|
|
13855 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
13856 |
- rm -f conftest.er1
|
|
13857 |
- cat conftest.err >&5
|
|
13858 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13859 |
- (exit $ac_status); } &&
|
|
13860 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
13861 |
- || test ! -s conftest.err'
|
|
13862 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13863 |
- (eval $ac_try) 2>&5
|
|
13864 |
- ac_status=$?
|
|
13865 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13866 |
- (exit $ac_status); }; } &&
|
|
13867 |
- { ac_try='test -s conftest.$ac_objext'
|
|
13868 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13869 |
- (eval $ac_try) 2>&5
|
|
13870 |
- ac_status=$?
|
|
13871 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13872 |
- (exit $ac_status); }; }; then
|
|
13873 |
- for ac_declaration in \
|
|
13874 |
- '' \
|
|
13875 |
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
13876 |
- 'extern "C" void std::exit (int); using std::exit;' \
|
|
13877 |
- 'extern "C" void exit (int) throw ();' \
|
|
13878 |
- 'extern "C" void exit (int);' \
|
|
13879 |
- 'void exit (int);'
|
|
13880 |
+fi
|
|
13881 |
+ CPP=$ac_cv_prog_CPP
|
|
13882 |
+else
|
|
13883 |
+ ac_cv_prog_CPP=$CPP
|
|
13884 |
+fi
|
|
13885 |
+{ echo "$as_me:$LINENO: result: $CPP" >&5
|
|
13886 |
+echo "${ECHO_T}$CPP" >&6; }
|
|
13887 |
+ac_preproc_ok=false
|
|
13888 |
+for ac_c_preproc_warn_flag in '' yes
|
|
13889 |
do
|
|
13890 |
+ # Use a header file that comes with gcc, so configuring glibc
|
|
13891 |
+ # with a fresh cross-compiler works.
|
|
13892 |
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
13893 |
+ # <limits.h> exists even on freestanding compilers.
|
|
13894 |
+ # On the NeXT, cc -E runs the code through the compiler's parser,
|
|
13895 |
+ # not just through cpp. "Syntax error" is here to catch this case.
|
|
13896 |
cat >conftest.$ac_ext <<_ACEOF
|
|
13897 |
/* confdefs.h. */
|
|
13898 |
_ACEOF
|
|
13899 |
cat confdefs.h >>conftest.$ac_ext
|
|
13900 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
13901 |
/* end confdefs.h. */
|
|
13902 |
-$ac_declaration
|
|
13903 |
-#include <stdlib.h>
|
|
13904 |
-int
|
|
13905 |
-main ()
|
|
13906 |
-{
|
|
13907 |
-exit (42);
|
|
13908 |
- ;
|
|
13909 |
- return 0;
|
|
13910 |
-}
|
|
13911 |
+#ifdef __STDC__
|
|
13912 |
+# include <limits.h>
|
|
13913 |
+#else
|
|
13914 |
+# include <assert.h>
|
|
13915 |
+#endif
|
|
13916 |
+ Syntax error
|
|
13917 |
_ACEOF
|
|
13918 |
-rm -f conftest.$ac_objext
|
|
13919 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
13920 |
- (eval $ac_compile) 2>conftest.er1
|
|
13921 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
13922 |
+case "(($ac_try" in
|
|
13923 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
13924 |
+ *) ac_try_echo=$ac_try;;
|
|
13925 |
+esac
|
|
13926 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
13927 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
13928 |
ac_status=$?
|
|
13929 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
13930 |
rm -f conftest.er1
|
|
13931 |
cat conftest.err >&5
|
|
13932 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13933 |
- (exit $ac_status); } &&
|
|
13934 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
13935 |
- || test ! -s conftest.err'
|
|
13936 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13937 |
- (eval $ac_try) 2>&5
|
|
13938 |
- ac_status=$?
|
|
13939 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13940 |
- (exit $ac_status); }; } &&
|
|
13941 |
- { ac_try='test -s conftest.$ac_objext'
|
|
13942 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
13943 |
- (eval $ac_try) 2>&5
|
|
13944 |
- ac_status=$?
|
|
13945 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13946 |
- (exit $ac_status); }; }; then
|
|
13947 |
+ (exit $ac_status); } >/dev/null && {
|
|
13948 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
13949 |
+ test ! -s conftest.err
|
|
13950 |
+ }; then
|
|
13951 |
:
|
|
13952 |
else
|
|
13953 |
echo "$as_me: failed program was:" >&5
|
|
13954 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
13955 |
|
|
13956 |
+ # Broken: fails on valid input.
|
|
13957 |
continue
|
|
13958 |
fi
|
|
13959 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
13960 |
+
|
|
13961 |
+rm -f conftest.err conftest.$ac_ext
|
|
13962 |
+
|
|
13963 |
+ # OK, works on sane cases. Now check whether nonexistent headers
|
|
13964 |
+ # can be detected and how.
|
|
13965 |
cat >conftest.$ac_ext <<_ACEOF
|
|
13966 |
/* confdefs.h. */
|
|
13967 |
_ACEOF
|
|
13968 |
cat confdefs.h >>conftest.$ac_ext
|
|
13969 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
13970 |
/* end confdefs.h. */
|
|
13971 |
-$ac_declaration
|
|
13972 |
-int
|
|
13973 |
-main ()
|
|
13974 |
-{
|
|
13975 |
-exit (42);
|
|
13976 |
- ;
|
|
13977 |
- return 0;
|
|
13978 |
-}
|
|
13979 |
+#include <ac_nonexistent.h>
|
|
13980 |
_ACEOF
|
|
13981 |
-rm -f conftest.$ac_objext
|
|
13982 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
13983 |
- (eval $ac_compile) 2>conftest.er1
|
|
13984 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
13985 |
+case "(($ac_try" in
|
|
13986 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
13987 |
+ *) ac_try_echo=$ac_try;;
|
|
13988 |
+esac
|
|
13989 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
13990 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
13991 |
ac_status=$?
|
|
13992 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
13993 |
rm -f conftest.er1
|
|
13994 |
cat conftest.err >&5
|
|
13995 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
13996 |
- (exit $ac_status); } &&
|
|
13997 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
13998 |
- || test ! -s conftest.err'
|
|
13999 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
14000 |
- (eval $ac_try) 2>&5
|
|
14001 |
- ac_status=$?
|
|
14002 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14003 |
- (exit $ac_status); }; } &&
|
|
14004 |
- { ac_try='test -s conftest.$ac_objext'
|
|
14005 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
14006 |
- (eval $ac_try) 2>&5
|
|
14007 |
- ac_status=$?
|
|
14008 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14009 |
- (exit $ac_status); }; }; then
|
|
14010 |
- break
|
|
14011 |
+ (exit $ac_status); } >/dev/null && {
|
|
14012 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
14013 |
+ test ! -s conftest.err
|
|
14014 |
+ }; then
|
|
14015 |
+ # Broken: success on invalid input.
|
|
14016 |
+continue
|
|
14017 |
else
|
|
14018 |
echo "$as_me: failed program was:" >&5
|
|
14019 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
14020 |
|
|
14021 |
-fi
|
|
14022 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
14023 |
-done
|
|
14024 |
-rm -f conftest*
|
|
14025 |
-if test -n "$ac_declaration"; then
|
|
14026 |
- echo '#ifdef __cplusplus' >>confdefs.h
|
|
14027 |
- echo $ac_declaration >>confdefs.h
|
|
14028 |
- echo '#endif' >>confdefs.h
|
|
14029 |
+ # Passes both tests.
|
|
14030 |
+ac_preproc_ok=:
|
|
14031 |
+break
|
|
14032 |
fi
|
|
14033 |
|
|
14034 |
-else
|
|
14035 |
- echo "$as_me: failed program was:" >&5
|
|
14036 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
14037 |
+rm -f conftest.err conftest.$ac_ext
|
|
14038 |
|
|
14039 |
+done
|
|
14040 |
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
14041 |
+rm -f conftest.err conftest.$ac_ext
|
|
14042 |
+if $ac_preproc_ok; then
|
|
14043 |
+ :
|
|
14044 |
+else
|
|
14045 |
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
|
14046 |
+See \`config.log' for more details." >&5
|
|
14047 |
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
|
14048 |
+See \`config.log' for more details." >&2;}
|
|
14049 |
+ { (exit 1); exit 1; }; }
|
|
14050 |
fi
|
|
14051 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
14052 |
+
|
|
14053 |
ac_ext=c
|
|
14054 |
ac_cpp='$CPP $CPPFLAGS'
|
|
14055 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
14056 |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
14057 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
14058 |
|
|
14059 |
-depcc="$CC" am_compiler_list=
|
|
14060 |
-
|
|
14061 |
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
14062 |
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
|
|
14063 |
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
14064 |
+ac_ext=cpp
|
|
14065 |
+ac_cpp='$CXXCPP $CPPFLAGS'
|
|
14066 |
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
14067 |
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
14068 |
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
|
14069 |
+if test -z "$CXX"; then
|
|
14070 |
+ if test -n "$CCC"; then
|
|
14071 |
+ CXX=$CCC
|
|
14072 |
+ else
|
|
14073 |
+ if test -n "$ac_tool_prefix"; then
|
|
14074 |
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
|
|
14075 |
+ do
|
|
14076 |
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
14077 |
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
14078 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14079 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
14080 |
+if test "${ac_cv_prog_CXX+set}" = set; then
|
|
14081 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14082 |
else
|
|
14083 |
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
14084 |
- # We make a subdir and do the tests there. Otherwise we can end up
|
|
14085 |
- # making bogus files that we don't know about and never remove. For
|
|
14086 |
- # instance it was reported that on HP-UX the gcc test will end up
|
|
14087 |
- # making a dummy file named `D' -- because `-MD' means `put the output
|
|
14088 |
- # in D'.
|
|
14089 |
- mkdir conftest.dir
|
|
14090 |
- # Copy depcomp to subdir because otherwise we won't find it if we're
|
|
14091 |
- # using a relative directory.
|
|
14092 |
- cp "$am_depcomp" conftest.dir
|
|
14093 |
- cd conftest.dir
|
|
14094 |
- # We will build objects and dependencies in a subdirectory because
|
|
14095 |
- # it helps to detect inapplicable dependency modes. For instance
|
|
14096 |
- # both Tru64's cc and ICC support -MD to output dependencies as a
|
|
14097 |
- # side effect of compilation, but ICC will put the dependencies in
|
|
14098 |
- # the current directory while Tru64 will put them in the object
|
|
14099 |
- # directory.
|
|
14100 |
- mkdir sub
|
|
14101 |
-
|
|
14102 |
- am_cv_CC_dependencies_compiler_type=none
|
|
14103 |
- if test "$am_compiler_list" = ""; then
|
|
14104 |
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
|
14105 |
- fi
|
|
14106 |
- for depmode in $am_compiler_list; do
|
|
14107 |
- # Setup a source with many dependencies, because some compilers
|
|
14108 |
- # like to wrap large dependency lists on column 80 (with \), and
|
|
14109 |
- # we should not choose a depcomp mode which is confused by this.
|
|
14110 |
- #
|
|
14111 |
- # We need to recreate these files for each test, as the compiler may
|
|
14112 |
- # overwrite some of them when testing with obscure command lines.
|
|
14113 |
- # This happens at least with the AIX C compiler.
|
|
14114 |
- : > sub/conftest.c
|
|
14115 |
- for i in 1 2 3 4 5 6; do
|
|
14116 |
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
|
14117 |
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
|
14118 |
- # Solaris 8's {/usr,}/bin/sh.
|
|
14119 |
- touch sub/conftst$i.h
|
|
14120 |
- done
|
|
14121 |
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
14122 |
-
|
|
14123 |
- case $depmode in
|
|
14124 |
- nosideeffect)
|
|
14125 |
- # after this tag, mechanisms are not by side-effect, so they'll
|
|
14126 |
- # only be used when explicitly requested
|
|
14127 |
- if test "x$enable_dependency_tracking" = xyes; then
|
|
14128 |
- continue
|
|
14129 |
- else
|
|
14130 |
- break
|
|
14131 |
- fi
|
|
14132 |
- ;;
|
|
14133 |
- none) break ;;
|
|
14134 |
- esac
|
|
14135 |
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
14136 |
- # mode. It turns out that the SunPro C++ compiler does not properly
|
|
14137 |
- # handle `-M -o', and we need to detect this.
|
|
14138 |
- if depmode=$depmode \
|
|
14139 |
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
14140 |
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
14141 |
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
14142 |
- >/dev/null 2>conftest.err &&
|
|
14143 |
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
14144 |
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
14145 |
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
14146 |
- # icc doesn't choke on unknown options, it will just issue warnings
|
|
14147 |
- # or remarks (even with -Werror). So we grep stderr for any message
|
|
14148 |
- # that says an option was ignored or not supported.
|
|
14149 |
- # When given -MP, icc 7.0 and 7.1 complain thusly:
|
|
14150 |
- # icc: Command line warning: ignoring option '-M'; no argument required
|
|
14151 |
- # The diagnosis changed in icc 8.0:
|
|
14152 |
- # icc: Command line remark: option '-MP' not supported
|
|
14153 |
- if (grep 'ignoring option' conftest.err ||
|
|
14154 |
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
|
14155 |
- am_cv_CC_dependencies_compiler_type=$depmode
|
|
14156 |
- break
|
|
14157 |
- fi
|
|
14158 |
- fi
|
|
14159 |
- done
|
|
14160 |
-
|
|
14161 |
- cd ..
|
|
14162 |
- rm -rf conftest.dir
|
|
14163 |
-else
|
|
14164 |
- am_cv_CC_dependencies_compiler_type=none
|
|
14165 |
-fi
|
|
14166 |
-
|
|
14167 |
-fi
|
|
14168 |
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
14169 |
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
|
|
14170 |
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
14171 |
-
|
|
14172 |
-
|
|
14173 |
-
|
|
14174 |
-if
|
|
14175 |
- test "x$enable_dependency_tracking" != xno \
|
|
14176 |
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
|
|
14177 |
- am__fastdepCC_TRUE=
|
|
14178 |
- am__fastdepCC_FALSE='#'
|
|
14179 |
-else
|
|
14180 |
- am__fastdepCC_TRUE='#'
|
|
14181 |
- am__fastdepCC_FALSE=
|
|
14182 |
-fi
|
|
14183 |
-
|
|
14184 |
-
|
|
14185 |
-
|
|
14186 |
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
|
|
14187 |
-
|
|
14188 |
-if test -n "$ac_tool_prefix"; then
|
|
14189 |
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
|
14190 |
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
|
14191 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14192 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
14193 |
-if test "${ac_cv_prog_RANLIB+set}" = set; then
|
|
14194 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14195 |
-else
|
|
14196 |
- if test -n "$RANLIB"; then
|
|
14197 |
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
|
14198 |
+ if test -n "$CXX"; then
|
|
14199 |
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
|
14200 |
else
|
|
14201 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
14202 |
for as_dir in $PATH
|
|
14203 |
@@ -3933,37 +4047,43 @@ do
|
|
14204 |
IFS=$as_save_IFS
|
|
14205 |
test -z "$as_dir" && as_dir=.
|
|
14206 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
14207 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
14208 |
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
|
14209 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
14210 |
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
|
|
14211 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
14212 |
break 2
|
|
14213 |
fi
|
|
14214 |
done
|
|
14215 |
done
|
|
14216 |
+IFS=$as_save_IFS
|
|
14217 |
|
|
14218 |
fi
|
|
14219 |
fi
|
|
14220 |
-RANLIB=$ac_cv_prog_RANLIB
|
|
14221 |
-if test -n "$RANLIB"; then
|
|
14222 |
- echo "$as_me:$LINENO: result: $RANLIB" >&5
|
|
14223 |
-echo "${ECHO_T}$RANLIB" >&6
|
|
14224 |
+CXX=$ac_cv_prog_CXX
|
|
14225 |
+if test -n "$CXX"; then
|
|
14226 |
+ { echo "$as_me:$LINENO: result: $CXX" >&5
|
|
14227 |
+echo "${ECHO_T}$CXX" >&6; }
|
|
14228 |
else
|
|
14229 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
14230 |
-echo "${ECHO_T}no" >&6
|
|
14231 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
14232 |
+echo "${ECHO_T}no" >&6; }
|
|
14233 |
fi
|
|
14234 |
|
|
14235 |
+
|
|
14236 |
+ test -n "$CXX" && break
|
|
14237 |
+ done
|
|
14238 |
fi
|
|
14239 |
-if test -z "$ac_cv_prog_RANLIB"; then
|
|
14240 |
- ac_ct_RANLIB=$RANLIB
|
|
14241 |
- # Extract the first word of "ranlib", so it can be a program name with args.
|
|
14242 |
-set dummy ranlib; ac_word=$2
|
|
14243 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14244 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
14245 |
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
|
|
14246 |
+if test -z "$CXX"; then
|
|
14247 |
+ ac_ct_CXX=$CXX
|
|
14248 |
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
|
|
14249 |
+do
|
|
14250 |
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
14251 |
+set dummy $ac_prog; ac_word=$2
|
|
14252 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14253 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
14254 |
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
|
|
14255 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14256 |
else
|
|
14257 |
- if test -n "$ac_ct_RANLIB"; then
|
|
14258 |
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
|
14259 |
+ if test -n "$ac_ct_CXX"; then
|
|
14260 |
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
|
|
14261 |
else
|
|
14262 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
14263 |
for as_dir in $PATH
|
|
14264 |
@@ -3971,381 +4091,1173 @@ do
|
|
14265 |
IFS=$as_save_IFS
|
|
14266 |
test -z "$as_dir" && as_dir=.
|
|
14267 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
14268 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
14269 |
- ac_cv_prog_ac_ct_RANLIB="ranlib"
|
|
14270 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
14271 |
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
|
|
14272 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
14273 |
break 2
|
|
14274 |
fi
|
|
14275 |
done
|
|
14276 |
done
|
|
14277 |
+IFS=$as_save_IFS
|
|
14278 |
|
|
14279 |
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
|
|
14280 |
fi
|
|
14281 |
fi
|
|
14282 |
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
|
14283 |
-if test -n "$ac_ct_RANLIB"; then
|
|
14284 |
- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
|
14285 |
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
|
|
14286 |
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
|
|
14287 |
+if test -n "$ac_ct_CXX"; then
|
|
14288 |
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
|
|
14289 |
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
|
|
14290 |
else
|
|
14291 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
14292 |
-echo "${ECHO_T}no" >&6
|
|
14293 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
14294 |
+echo "${ECHO_T}no" >&6; }
|
|
14295 |
fi
|
|
14296 |
|
|
14297 |
- RANLIB=$ac_ct_RANLIB
|
|
14298 |
-else
|
|
14299 |
- RANLIB="$ac_cv_prog_RANLIB"
|
|
14300 |
+
|
|
14301 |
+ test -n "$ac_ct_CXX" && break
|
|
14302 |
+done
|
|
14303 |
+
|
|
14304 |
+ if test "x$ac_ct_CXX" = x; then
|
|
14305 |
+ CXX="g++"
|
|
14306 |
+ else
|
|
14307 |
+ case $cross_compiling:$ac_tool_warned in
|
|
14308 |
+yes:)
|
|
14309 |
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
14310 |
+whose name does not start with the host triplet. If you think this
|
|
14311 |
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
14312 |
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
14313 |
+whose name does not start with the host triplet. If you think this
|
|
14314 |
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
14315 |
+ac_tool_warned=yes ;;
|
|
14316 |
+esac
|
|
14317 |
+ CXX=$ac_ct_CXX
|
|
14318 |
+ fi
|
|
14319 |
fi
|
|
14320 |
|
|
14321 |
-ac_ext=c
|
|
14322 |
-ac_cpp='$CPP $CPPFLAGS'
|
|
14323 |
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
14324 |
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
14325 |
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
14326 |
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
|
14327 |
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
|
|
14328 |
-# On Suns, sometimes $CPP names a directory.
|
|
14329 |
-if test -n "$CPP" && test -d "$CPP"; then
|
|
14330 |
- CPP=
|
|
14331 |
+ fi
|
|
14332 |
fi
|
|
14333 |
-if test -z "$CPP"; then
|
|
14334 |
- if test "${ac_cv_prog_CPP+set}" = set; then
|
|
14335 |
+# Provide some information about the compiler.
|
|
14336 |
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
|
|
14337 |
+ac_compiler=`set X $ac_compile; echo $2`
|
|
14338 |
+{ (ac_try="$ac_compiler --version >&5"
|
|
14339 |
+case "(($ac_try" in
|
|
14340 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14341 |
+ *) ac_try_echo=$ac_try;;
|
|
14342 |
+esac
|
|
14343 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14344 |
+ (eval "$ac_compiler --version >&5") 2>&5
|
|
14345 |
+ ac_status=$?
|
|
14346 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14347 |
+ (exit $ac_status); }
|
|
14348 |
+{ (ac_try="$ac_compiler -v >&5"
|
|
14349 |
+case "(($ac_try" in
|
|
14350 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14351 |
+ *) ac_try_echo=$ac_try;;
|
|
14352 |
+esac
|
|
14353 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14354 |
+ (eval "$ac_compiler -v >&5") 2>&5
|
|
14355 |
+ ac_status=$?
|
|
14356 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14357 |
+ (exit $ac_status); }
|
|
14358 |
+{ (ac_try="$ac_compiler -V >&5"
|
|
14359 |
+case "(($ac_try" in
|
|
14360 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14361 |
+ *) ac_try_echo=$ac_try;;
|
|
14362 |
+esac
|
|
14363 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14364 |
+ (eval "$ac_compiler -V >&5") 2>&5
|
|
14365 |
+ ac_status=$?
|
|
14366 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14367 |
+ (exit $ac_status); }
|
|
14368 |
+
|
|
14369 |
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
|
|
14370 |
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
|
|
14371 |
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
|
|
14372 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14373 |
else
|
|
14374 |
- # Double quotes because CPP needs to be expanded
|
|
14375 |
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
|
14376 |
- do
|
|
14377 |
- ac_preproc_ok=false
|
|
14378 |
-for ac_c_preproc_warn_flag in '' yes
|
|
14379 |
-do
|
|
14380 |
- # Use a header file that comes with gcc, so configuring glibc
|
|
14381 |
- # with a fresh cross-compiler works.
|
|
14382 |
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
14383 |
- # <limits.h> exists even on freestanding compilers.
|
|
14384 |
- # On the NeXT, cc -E runs the code through the compiler's parser,
|
|
14385 |
- # not just through cpp. "Syntax error" is here to catch this case.
|
|
14386 |
cat >conftest.$ac_ext <<_ACEOF
|
|
14387 |
/* confdefs.h. */
|
|
14388 |
_ACEOF
|
|
14389 |
cat confdefs.h >>conftest.$ac_ext
|
|
14390 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
14391 |
/* end confdefs.h. */
|
|
14392 |
-#ifdef __STDC__
|
|
14393 |
-# include <limits.h>
|
|
14394 |
-#else
|
|
14395 |
-# include <assert.h>
|
|
14396 |
+
|
|
14397 |
+int
|
|
14398 |
+main ()
|
|
14399 |
+{
|
|
14400 |
+#ifndef __GNUC__
|
|
14401 |
+ choke me
|
|
14402 |
#endif
|
|
14403 |
- Syntax error
|
|
14404 |
+
|
|
14405 |
+ ;
|
|
14406 |
+ return 0;
|
|
14407 |
+}
|
|
14408 |
_ACEOF
|
|
14409 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
14410 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
14411 |
+rm -f conftest.$ac_objext
|
|
14412 |
+if { (ac_try="$ac_compile"
|
|
14413 |
+case "(($ac_try" in
|
|
14414 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14415 |
+ *) ac_try_echo=$ac_try;;
|
|
14416 |
+esac
|
|
14417 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14418 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
14419 |
ac_status=$?
|
|
14420 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
14421 |
rm -f conftest.er1
|
|
14422 |
cat conftest.err >&5
|
|
14423 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14424 |
- (exit $ac_status); } >/dev/null; then
|
|
14425 |
- if test -s conftest.err; then
|
|
14426 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
14427 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
14428 |
- else
|
|
14429 |
- ac_cpp_err=
|
|
14430 |
- fi
|
|
14431 |
-else
|
|
14432 |
- ac_cpp_err=yes
|
|
14433 |
-fi
|
|
14434 |
-if test -z "$ac_cpp_err"; then
|
|
14435 |
- :
|
|
14436 |
+ (exit $ac_status); } && {
|
|
14437 |
+ test -z "$ac_cxx_werror_flag" ||
|
|
14438 |
+ test ! -s conftest.err
|
|
14439 |
+ } && test -s conftest.$ac_objext; then
|
|
14440 |
+ ac_compiler_gnu=yes
|
|
14441 |
else
|
|
14442 |
echo "$as_me: failed program was:" >&5
|
|
14443 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
14444 |
|
|
14445 |
- # Broken: fails on valid input.
|
|
14446 |
-continue
|
|
14447 |
+ ac_compiler_gnu=no
|
|
14448 |
fi
|
|
14449 |
-rm -f conftest.err conftest.$ac_ext
|
|
14450 |
|
|
14451 |
- # OK, works on sane cases. Now check whether non-existent headers
|
|
14452 |
- # can be detected and how.
|
|
14453 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
14454 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
14455 |
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
|
|
14456 |
+
|
|
14457 |
+fi
|
|
14458 |
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
|
|
14459 |
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
|
|
14460 |
+GXX=`test $ac_compiler_gnu = yes && echo yes`
|
|
14461 |
+ac_test_CXXFLAGS=${CXXFLAGS+set}
|
|
14462 |
+ac_save_CXXFLAGS=$CXXFLAGS
|
|
14463 |
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
|
|
14464 |
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
|
|
14465 |
+if test "${ac_cv_prog_cxx_g+set}" = set; then
|
|
14466 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14467 |
+else
|
|
14468 |
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
|
|
14469 |
+ ac_cxx_werror_flag=yes
|
|
14470 |
+ ac_cv_prog_cxx_g=no
|
|
14471 |
+ CXXFLAGS="-g"
|
|
14472 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
14473 |
/* confdefs.h. */
|
|
14474 |
_ACEOF
|
|
14475 |
cat confdefs.h >>conftest.$ac_ext
|
|
14476 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
14477 |
/* end confdefs.h. */
|
|
14478 |
-#include <ac_nonexistent.h>
|
|
14479 |
+
|
|
14480 |
+int
|
|
14481 |
+main ()
|
|
14482 |
+{
|
|
14483 |
+
|
|
14484 |
+ ;
|
|
14485 |
+ return 0;
|
|
14486 |
+}
|
|
14487 |
_ACEOF
|
|
14488 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
14489 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
14490 |
+rm -f conftest.$ac_objext
|
|
14491 |
+if { (ac_try="$ac_compile"
|
|
14492 |
+case "(($ac_try" in
|
|
14493 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14494 |
+ *) ac_try_echo=$ac_try;;
|
|
14495 |
+esac
|
|
14496 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14497 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
14498 |
ac_status=$?
|
|
14499 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
14500 |
rm -f conftest.er1
|
|
14501 |
cat conftest.err >&5
|
|
14502 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14503 |
- (exit $ac_status); } >/dev/null; then
|
|
14504 |
- if test -s conftest.err; then
|
|
14505 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
14506 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
14507 |
- else
|
|
14508 |
- ac_cpp_err=
|
|
14509 |
- fi
|
|
14510 |
-else
|
|
14511 |
- ac_cpp_err=yes
|
|
14512 |
-fi
|
|
14513 |
-if test -z "$ac_cpp_err"; then
|
|
14514 |
- # Broken: success on invalid input.
|
|
14515 |
-continue
|
|
14516 |
+ (exit $ac_status); } && {
|
|
14517 |
+ test -z "$ac_cxx_werror_flag" ||
|
|
14518 |
+ test ! -s conftest.err
|
|
14519 |
+ } && test -s conftest.$ac_objext; then
|
|
14520 |
+ ac_cv_prog_cxx_g=yes
|
|
14521 |
else
|
|
14522 |
echo "$as_me: failed program was:" >&5
|
|
14523 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
14524 |
|
|
14525 |
- # Passes both tests.
|
|
14526 |
-ac_preproc_ok=:
|
|
14527 |
-break
|
|
14528 |
-fi
|
|
14529 |
-rm -f conftest.err conftest.$ac_ext
|
|
14530 |
-
|
|
14531 |
-done
|
|
14532 |
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
14533 |
-rm -f conftest.err conftest.$ac_ext
|
|
14534 |
-if $ac_preproc_ok; then
|
|
14535 |
- break
|
|
14536 |
-fi
|
|
14537 |
-
|
|
14538 |
- done
|
|
14539 |
- ac_cv_prog_CPP=$CPP
|
|
14540 |
-
|
|
14541 |
-fi
|
|
14542 |
- CPP=$ac_cv_prog_CPP
|
|
14543 |
-else
|
|
14544 |
- ac_cv_prog_CPP=$CPP
|
|
14545 |
-fi
|
|
14546 |
-echo "$as_me:$LINENO: result: $CPP" >&5
|
|
14547 |
-echo "${ECHO_T}$CPP" >&6
|
|
14548 |
-ac_preproc_ok=false
|
|
14549 |
-for ac_c_preproc_warn_flag in '' yes
|
|
14550 |
-do
|
|
14551 |
- # Use a header file that comes with gcc, so configuring glibc
|
|
14552 |
- # with a fresh cross-compiler works.
|
|
14553 |
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
14554 |
- # <limits.h> exists even on freestanding compilers.
|
|
14555 |
- # On the NeXT, cc -E runs the code through the compiler's parser,
|
|
14556 |
- # not just through cpp. "Syntax error" is here to catch this case.
|
|
14557 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
14558 |
+ CXXFLAGS=""
|
|
14559 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
14560 |
/* confdefs.h. */
|
|
14561 |
_ACEOF
|
|
14562 |
cat confdefs.h >>conftest.$ac_ext
|
|
14563 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
14564 |
/* end confdefs.h. */
|
|
14565 |
-#ifdef __STDC__
|
|
14566 |
-# include <limits.h>
|
|
14567 |
-#else
|
|
14568 |
-# include <assert.h>
|
|
14569 |
-#endif
|
|
14570 |
- Syntax error
|
|
14571 |
+
|
|
14572 |
+int
|
|
14573 |
+main ()
|
|
14574 |
+{
|
|
14575 |
+
|
|
14576 |
+ ;
|
|
14577 |
+ return 0;
|
|
14578 |
+}
|
|
14579 |
_ACEOF
|
|
14580 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
14581 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
14582 |
+rm -f conftest.$ac_objext
|
|
14583 |
+if { (ac_try="$ac_compile"
|
|
14584 |
+case "(($ac_try" in
|
|
14585 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14586 |
+ *) ac_try_echo=$ac_try;;
|
|
14587 |
+esac
|
|
14588 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14589 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
14590 |
ac_status=$?
|
|
14591 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
14592 |
rm -f conftest.er1
|
|
14593 |
cat conftest.err >&5
|
|
14594 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14595 |
- (exit $ac_status); } >/dev/null; then
|
|
14596 |
- if test -s conftest.err; then
|
|
14597 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
14598 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
14599 |
- else
|
|
14600 |
- ac_cpp_err=
|
|
14601 |
- fi
|
|
14602 |
-else
|
|
14603 |
- ac_cpp_err=yes
|
|
14604 |
-fi
|
|
14605 |
-if test -z "$ac_cpp_err"; then
|
|
14606 |
+ (exit $ac_status); } && {
|
|
14607 |
+ test -z "$ac_cxx_werror_flag" ||
|
|
14608 |
+ test ! -s conftest.err
|
|
14609 |
+ } && test -s conftest.$ac_objext; then
|
|
14610 |
:
|
|
14611 |
else
|
|
14612 |
echo "$as_me: failed program was:" >&5
|
|
14613 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
14614 |
|
|
14615 |
- # Broken: fails on valid input.
|
|
14616 |
-continue
|
|
14617 |
-fi
|
|
14618 |
-rm -f conftest.err conftest.$ac_ext
|
|
14619 |
-
|
|
14620 |
- # OK, works on sane cases. Now check whether non-existent headers
|
|
14621 |
- # can be detected and how.
|
|
14622 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
14623 |
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
|
|
14624 |
+ CXXFLAGS="-g"
|
|
14625 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
14626 |
/* confdefs.h. */
|
|
14627 |
_ACEOF
|
|
14628 |
cat confdefs.h >>conftest.$ac_ext
|
|
14629 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
14630 |
/* end confdefs.h. */
|
|
14631 |
-#include <ac_nonexistent.h>
|
|
14632 |
+
|
|
14633 |
+int
|
|
14634 |
+main ()
|
|
14635 |
+{
|
|
14636 |
+
|
|
14637 |
+ ;
|
|
14638 |
+ return 0;
|
|
14639 |
+}
|
|
14640 |
_ACEOF
|
|
14641 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
14642 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
14643 |
+rm -f conftest.$ac_objext
|
|
14644 |
+if { (ac_try="$ac_compile"
|
|
14645 |
+case "(($ac_try" in
|
|
14646 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
14647 |
+ *) ac_try_echo=$ac_try;;
|
|
14648 |
+esac
|
|
14649 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
14650 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
14651 |
ac_status=$?
|
|
14652 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
14653 |
rm -f conftest.er1
|
|
14654 |
cat conftest.err >&5
|
|
14655 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
14656 |
- (exit $ac_status); } >/dev/null; then
|
|
14657 |
- if test -s conftest.err; then
|
|
14658 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
14659 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
14660 |
- else
|
|
14661 |
- ac_cpp_err=
|
|
14662 |
- fi
|
|
14663 |
-else
|
|
14664 |
- ac_cpp_err=yes
|
|
14665 |
-fi
|
|
14666 |
-if test -z "$ac_cpp_err"; then
|
|
14667 |
- # Broken: success on invalid input.
|
|
14668 |
-continue
|
|
14669 |
+ (exit $ac_status); } && {
|
|
14670 |
+ test -z "$ac_cxx_werror_flag" ||
|
|
14671 |
+ test ! -s conftest.err
|
|
14672 |
+ } && test -s conftest.$ac_objext; then
|
|
14673 |
+ ac_cv_prog_cxx_g=yes
|
|
14674 |
else
|
|
14675 |
echo "$as_me: failed program was:" >&5
|
|
14676 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
14677 |
|
|
14678 |
- # Passes both tests.
|
|
14679 |
-ac_preproc_ok=:
|
|
14680 |
-break
|
|
14681 |
+
|
|
14682 |
fi
|
|
14683 |
-rm -f conftest.err conftest.$ac_ext
|
|
14684 |
|
|
14685 |
-done
|
|
14686 |
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
|
14687 |
-rm -f conftest.err conftest.$ac_ext
|
|
14688 |
-if $ac_preproc_ok; then
|
|
14689 |
- :
|
|
14690 |
-else
|
|
14691 |
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
|
14692 |
-See \`config.log' for more details." >&5
|
|
14693 |
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
|
14694 |
-See \`config.log' for more details." >&2;}
|
|
14695 |
- { (exit 1); exit 1; }; }
|
|
14696 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
14697 |
+fi
|
|
14698 |
+
|
|
14699 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
14700 |
fi
|
|
14701 |
|
|
14702 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
14703 |
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
|
|
14704 |
+fi
|
|
14705 |
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
|
|
14706 |
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
|
|
14707 |
+if test "$ac_test_CXXFLAGS" = set; then
|
|
14708 |
+ CXXFLAGS=$ac_save_CXXFLAGS
|
|
14709 |
+elif test $ac_cv_prog_cxx_g = yes; then
|
|
14710 |
+ if test "$GXX" = yes; then
|
|
14711 |
+ CXXFLAGS="-g -O2"
|
|
14712 |
+ else
|
|
14713 |
+ CXXFLAGS="-g"
|
|
14714 |
+ fi
|
|
14715 |
+else
|
|
14716 |
+ if test "$GXX" = yes; then
|
|
14717 |
+ CXXFLAGS="-O2"
|
|
14718 |
+ else
|
|
14719 |
+ CXXFLAGS=
|
|
14720 |
+ fi
|
|
14721 |
+fi
|
|
14722 |
ac_ext=c
|
|
14723 |
ac_cpp='$CPP $CPPFLAGS'
|
|
14724 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
14725 |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
14726 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
14727 |
|
|
14728 |
-ac_ext=cc
|
|
14729 |
-ac_cpp='$CXXCPP $CPPFLAGS'
|
|
14730 |
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
14731 |
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
14732 |
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
|
14733 |
-if test -n "$ac_tool_prefix"; then
|
|
14734 |
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
|
|
14735 |
- do
|
|
14736 |
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
14737 |
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
14738 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14739 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
14740 |
-if test "${ac_cv_prog_CXX+set}" = set; then
|
|
14741 |
+depcc="$CXX" am_compiler_list=
|
|
14742 |
+
|
|
14743 |
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
14744 |
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
|
|
14745 |
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
|
|
14746 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14747 |
else
|
|
14748 |
- if test -n "$CXX"; then
|
|
14749 |
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
|
14750 |
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
14751 |
+ # We make a subdir and do the tests there. Otherwise we can end up
|
|
14752 |
+ # making bogus files that we don't know about and never remove. For
|
|
14753 |
+ # instance it was reported that on HP-UX the gcc test will end up
|
|
14754 |
+ # making a dummy file named `D' -- because `-MD' means `put the output
|
|
14755 |
+ # in D'.
|
|
14756 |
+ mkdir conftest.dir
|
|
14757 |
+ # Copy depcomp to subdir because otherwise we won't find it if we're
|
|
14758 |
+ # using a relative directory.
|
|
14759 |
+ cp "$am_depcomp" conftest.dir
|
|
14760 |
+ cd conftest.dir
|
|
14761 |
+ # We will build objects and dependencies in a subdirectory because
|
|
14762 |
+ # it helps to detect inapplicable dependency modes. For instance
|
|
14763 |
+ # both Tru64's cc and ICC support -MD to output dependencies as a
|
|
14764 |
+ # side effect of compilation, but ICC will put the dependencies in
|
|
14765 |
+ # the current directory while Tru64 will put them in the object
|
|
14766 |
+ # directory.
|
|
14767 |
+ mkdir sub
|
|
14768 |
+
|
|
14769 |
+ am_cv_CXX_dependencies_compiler_type=none
|
|
14770 |
+ if test "$am_compiler_list" = ""; then
|
|
14771 |
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
|
14772 |
+ fi
|
|
14773 |
+ for depmode in $am_compiler_list; do
|
|
14774 |
+ # Setup a source with many dependencies, because some compilers
|
|
14775 |
+ # like to wrap large dependency lists on column 80 (with \), and
|
|
14776 |
+ # we should not choose a depcomp mode which is confused by this.
|
|
14777 |
+ #
|
|
14778 |
+ # We need to recreate these files for each test, as the compiler may
|
|
14779 |
+ # overwrite some of them when testing with obscure command lines.
|
|
14780 |
+ # This happens at least with the AIX C compiler.
|
|
14781 |
+ : > sub/conftest.c
|
|
14782 |
+ for i in 1 2 3 4 5 6; do
|
|
14783 |
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
|
14784 |
+ : > sub/conftst$i.h
|
|
14785 |
+ done
|
|
14786 |
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
14787 |
+
|
|
14788 |
+ case $depmode in
|
|
14789 |
+ nosideeffect)
|
|
14790 |
+ # after this tag, mechanisms are not by side-effect, so they'll
|
|
14791 |
+ # only be used when explicitly requested
|
|
14792 |
+ if test "x$enable_dependency_tracking" = xyes; then
|
|
14793 |
+ continue
|
|
14794 |
+ else
|
|
14795 |
+ break
|
|
14796 |
+ fi
|
|
14797 |
+ ;;
|
|
14798 |
+ none) break ;;
|
|
14799 |
+ esac
|
|
14800 |
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
14801 |
+ # mode. It turns out that the SunPro C++ compiler does not properly
|
|
14802 |
+ # handle `-M -o', and we need to detect this.
|
|
14803 |
+ if depmode=$depmode \
|
|
14804 |
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
14805 |
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
14806 |
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
14807 |
+ >/dev/null 2>conftest.err &&
|
|
14808 |
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
14809 |
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
14810 |
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
14811 |
+ # icc doesn't choke on unknown options, it will just issue warnings
|
|
14812 |
+ # (even with -Werror). So we grep stderr for any message
|
|
14813 |
+ # that says an option was ignored.
|
|
14814 |
+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
|
|
14815 |
+ am_cv_CXX_dependencies_compiler_type=$depmode
|
|
14816 |
+ break
|
|
14817 |
+ fi
|
|
14818 |
+ fi
|
|
14819 |
+ done
|
|
14820 |
+
|
|
14821 |
+ cd ..
|
|
14822 |
+ rm -rf conftest.dir
|
|
14823 |
else
|
|
14824 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
14825 |
+ am_cv_CXX_dependencies_compiler_type=none
|
|
14826 |
+fi
|
|
14827 |
+
|
|
14828 |
+fi
|
|
14829 |
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
|
|
14830 |
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
|
|
14831 |
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
|
|
14832 |
+
|
|
14833 |
+
|
|
14834 |
+
|
|
14835 |
+if
|
|
14836 |
+ test "x$enable_dependency_tracking" != xno \
|
|
14837 |
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
|
|
14838 |
+ am__fastdepCXX_TRUE=
|
|
14839 |
+ am__fastdepCXX_FALSE='#'
|
|
14840 |
+else
|
|
14841 |
+ am__fastdepCXX_TRUE='#'
|
|
14842 |
+ am__fastdepCXX_FALSE=
|
|
14843 |
+fi
|
|
14844 |
+
|
|
14845 |
+
|
|
14846 |
+
|
|
14847 |
+ALL_LINGUAS="de ja zh_CN zh_TW"
|
|
14848 |
+
|
|
14849 |
+ MKINSTALLDIRS=
|
|
14850 |
+ if test -n "$ac_aux_dir"; then
|
|
14851 |
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
14852 |
+ fi
|
|
14853 |
+ if test -z "$MKINSTALLDIRS"; then
|
|
14854 |
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
14855 |
+ fi
|
|
14856 |
+
|
|
14857 |
+
|
|
14858 |
+
|
|
14859 |
+
|
|
14860 |
+
|
|
14861 |
+ # Extract the first word of "msgfmt", so it can be a program name with args.
|
|
14862 |
+set dummy msgfmt; ac_word=$2
|
|
14863 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14864 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
14865 |
+if test "${ac_cv_path_MSGFMT+set}" = set; then
|
|
14866 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14867 |
+else
|
|
14868 |
+ case "$MSGFMT" in
|
|
14869 |
+ /*)
|
|
14870 |
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
|
|
14871 |
+ ;;
|
|
14872 |
+ *)
|
|
14873 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
14874 |
+ for ac_dir in $PATH; do
|
|
14875 |
+ test -z "$ac_dir" && ac_dir=.
|
|
14876 |
+ if test -f $ac_dir/$ac_word; then
|
|
14877 |
+ if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
|
|
14878 |
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
14879 |
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
|
|
14880 |
+ break
|
|
14881 |
+ fi
|
|
14882 |
+ fi
|
|
14883 |
+ done
|
|
14884 |
+ IFS="$ac_save_ifs"
|
|
14885 |
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
|
|
14886 |
+ ;;
|
|
14887 |
+esac
|
|
14888 |
+fi
|
|
14889 |
+MSGFMT="$ac_cv_path_MSGFMT"
|
|
14890 |
+if test "$MSGFMT" != ":"; then
|
|
14891 |
+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
|
|
14892 |
+echo "${ECHO_T}$MSGFMT" >&6; }
|
|
14893 |
+else
|
|
14894 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
14895 |
+echo "${ECHO_T}no" >&6; }
|
|
14896 |
+fi
|
|
14897 |
+
|
|
14898 |
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
|
|
14899 |
+set dummy gmsgfmt; ac_word=$2
|
|
14900 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14901 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
14902 |
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
|
|
14903 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14904 |
+else
|
|
14905 |
+ case $GMSGFMT in
|
|
14906 |
+ [\\/]* | ?:[\\/]*)
|
|
14907 |
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
|
|
14908 |
+ ;;
|
|
14909 |
+ *)
|
|
14910 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
14911 |
for as_dir in $PATH
|
|
14912 |
do
|
|
14913 |
IFS=$as_save_IFS
|
|
14914 |
test -z "$as_dir" && as_dir=.
|
|
14915 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
14916 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
14917 |
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
|
|
14918 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
14919 |
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
|
|
14920 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
14921 |
break 2
|
|
14922 |
fi
|
|
14923 |
done
|
|
14924 |
done
|
|
14925 |
+IFS=$as_save_IFS
|
|
14926 |
|
|
14927 |
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
|
|
14928 |
+ ;;
|
|
14929 |
+esac
|
|
14930 |
fi
|
|
14931 |
-fi
|
|
14932 |
-CXX=$ac_cv_prog_CXX
|
|
14933 |
-if test -n "$CXX"; then
|
|
14934 |
- echo "$as_me:$LINENO: result: $CXX" >&5
|
|
14935 |
-echo "${ECHO_T}$CXX" >&6
|
|
14936 |
+GMSGFMT=$ac_cv_path_GMSGFMT
|
|
14937 |
+if test -n "$GMSGFMT"; then
|
|
14938 |
+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
|
|
14939 |
+echo "${ECHO_T}$GMSGFMT" >&6; }
|
|
14940 |
else
|
|
14941 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
14942 |
-echo "${ECHO_T}no" >&6
|
|
14943 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
14944 |
+echo "${ECHO_T}no" >&6; }
|
|
14945 |
fi
|
|
14946 |
|
|
14947 |
- test -n "$CXX" && break
|
|
14948 |
+
|
|
14949 |
+
|
|
14950 |
+ # Extract the first word of "xgettext", so it can be a program name with args.
|
|
14951 |
+set dummy xgettext; ac_word=$2
|
|
14952 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14953 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
14954 |
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
|
|
14955 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
14956 |
+else
|
|
14957 |
+ case "$XGETTEXT" in
|
|
14958 |
+ /*)
|
|
14959 |
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
|
|
14960 |
+ ;;
|
|
14961 |
+ *)
|
|
14962 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
14963 |
+ for ac_dir in $PATH; do
|
|
14964 |
+ test -z "$ac_dir" && ac_dir=.
|
|
14965 |
+ if test -f $ac_dir/$ac_word; then
|
|
14966 |
+ if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
14967 |
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
14968 |
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
|
|
14969 |
+ break
|
|
14970 |
+ fi
|
|
14971 |
+ fi
|
|
14972 |
done
|
|
14973 |
+ IFS="$ac_save_ifs"
|
|
14974 |
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
|
|
14975 |
+ ;;
|
|
14976 |
+esac
|
|
14977 |
fi
|
|
14978 |
-if test -z "$CXX"; then
|
|
14979 |
- ac_ct_CXX=$CXX
|
|
14980 |
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
|
|
14981 |
-do
|
|
14982 |
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
14983 |
-set dummy $ac_prog; ac_word=$2
|
|
14984 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
14985 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
14986 |
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
|
|
14987 |
+XGETTEXT="$ac_cv_path_XGETTEXT"
|
|
14988 |
+if test "$XGETTEXT" != ":"; then
|
|
14989 |
+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
|
|
14990 |
+echo "${ECHO_T}$XGETTEXT" >&6; }
|
|
14991 |
+else
|
|
14992 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
14993 |
+echo "${ECHO_T}no" >&6; }
|
|
14994 |
+fi
|
|
14995 |
+
|
|
14996 |
+ rm -f messages.po
|
|
14997 |
+
|
|
14998 |
+ # Extract the first word of "msgmerge", so it can be a program name with args.
|
|
14999 |
+set dummy msgmerge; ac_word=$2
|
|
15000 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
15001 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
15002 |
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
|
|
15003 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
15004 |
else
|
|
15005 |
- if test -n "$ac_ct_CXX"; then
|
|
15006 |
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
|
|
15007 |
+ case "$MSGMERGE" in
|
|
15008 |
+ /*)
|
|
15009 |
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
|
|
15010 |
+ ;;
|
|
15011 |
+ *)
|
|
15012 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
15013 |
+ for ac_dir in $PATH; do
|
|
15014 |
+ test -z "$ac_dir" && ac_dir=.
|
|
15015 |
+ if test -f $ac_dir/$ac_word; then
|
|
15016 |
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
|
|
15017 |
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
|
|
15018 |
+ break
|
|
15019 |
+ fi
|
|
15020 |
+ fi
|
|
15021 |
+ done
|
|
15022 |
+ IFS="$ac_save_ifs"
|
|
15023 |
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
|
|
15024 |
+ ;;
|
|
15025 |
+esac
|
|
15026 |
+fi
|
|
15027 |
+MSGMERGE="$ac_cv_path_MSGMERGE"
|
|
15028 |
+if test "$MSGMERGE" != ":"; then
|
|
15029 |
+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
|
|
15030 |
+echo "${ECHO_T}$MSGMERGE" >&6; }
|
|
15031 |
else
|
|
15032 |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
15033 |
-for as_dir in $PATH
|
|
15034 |
-do
|
|
15035 |
- IFS=$as_save_IFS
|
|
15036 |
- test -z "$as_dir" && as_dir=.
|
|
15037 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
15038 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
15039 |
- ac_cv_prog_ac_ct_CXX="$ac_prog"
|
|
15040 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
15041 |
- break 2
|
|
15042 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
15043 |
+echo "${ECHO_T}no" >&6; }
|
|
15044 |
+fi
|
|
15045 |
+
|
|
15046 |
+
|
|
15047 |
+ if test "$GMSGFMT" != ":"; then
|
|
15048 |
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
|
|
15049 |
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
15050 |
+ : ;
|
|
15051 |
+ else
|
|
15052 |
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
|
|
15053 |
+ { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
|
|
15054 |
+echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
|
|
15055 |
+ GMSGFMT=":"
|
|
15056 |
+ fi
|
|
15057 |
fi
|
|
15058 |
-done
|
|
15059 |
-done
|
|
15060 |
|
|
15061 |
+ if test "$XGETTEXT" != ":"; then
|
|
15062 |
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
15063 |
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
15064 |
+ : ;
|
|
15065 |
+ else
|
|
15066 |
+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
|
|
15067 |
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
|
|
15068 |
+ XGETTEXT=":"
|
|
15069 |
+ fi
|
|
15070 |
+ rm -f messages.po
|
|
15071 |
+ fi
|
|
15072 |
+
|
|
15073 |
+ ac_config_commands="$ac_config_commands default-1"
|
|
15074 |
+
|
|
15075 |
+
|
|
15076 |
+
|
|
15077 |
+ if test "X$prefix" = "XNONE"; then
|
|
15078 |
+ acl_final_prefix="$ac_default_prefix"
|
|
15079 |
+ else
|
|
15080 |
+ acl_final_prefix="$prefix"
|
|
15081 |
+ fi
|
|
15082 |
+ if test "X$exec_prefix" = "XNONE"; then
|
|
15083 |
+ acl_final_exec_prefix='${prefix}'
|
|
15084 |
+ else
|
|
15085 |
+ acl_final_exec_prefix="$exec_prefix"
|
|
15086 |
+ fi
|
|
15087 |
+ acl_save_prefix="$prefix"
|
|
15088 |
+ prefix="$acl_final_prefix"
|
|
15089 |
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
|
15090 |
+ prefix="$acl_save_prefix"
|
|
15091 |
+
|
|
15092 |
+
|
|
15093 |
+# Check whether --with-gnu-ld was given.
|
|
15094 |
+if test "${with_gnu_ld+set}" = set; then
|
|
15095 |
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
|
|
15096 |
+else
|
|
15097 |
+ with_gnu_ld=no
|
|
15098 |
+fi
|
|
15099 |
+
|
|
15100 |
+ac_prog=ld
|
|
15101 |
+if test "$GCC" = yes; then
|
|
15102 |
+ # Check if gcc -print-prog-name=ld gives a path.
|
|
15103 |
+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
|
|
15104 |
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
|
|
15105 |
+ case $host in
|
|
15106 |
+ *-*-mingw*)
|
|
15107 |
+ # gcc leaves a trailing carriage return which upsets mingw
|
|
15108 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
15109 |
+ *)
|
|
15110 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
|
15111 |
+ esac
|
|
15112 |
+ case $ac_prog in
|
|
15113 |
+ # Accept absolute paths.
|
|
15114 |
+ [\\/]* | [A-Za-z]:[\\/]*)
|
|
15115 |
+ re_direlt='/[^/][^/]*/\.\./'
|
|
15116 |
+ # Canonicalize the path of ld
|
|
15117 |
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
|
15118 |
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
15119 |
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
15120 |
+ done
|
|
15121 |
+ test -z "$LD" && LD="$ac_prog"
|
|
15122 |
+ ;;
|
|
15123 |
+ "")
|
|
15124 |
+ # If it fails, then pretend we aren't using GCC.
|
|
15125 |
+ ac_prog=ld
|
|
15126 |
+ ;;
|
|
15127 |
+ *)
|
|
15128 |
+ # If it is relative, then search for the first ld in PATH.
|
|
15129 |
+ with_gnu_ld=unknown
|
|
15130 |
+ ;;
|
|
15131 |
+ esac
|
|
15132 |
+elif test "$with_gnu_ld" = yes; then
|
|
15133 |
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
|
|
15134 |
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
|
|
15135 |
+else
|
|
15136 |
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
|
|
15137 |
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
|
|
15138 |
+fi
|
|
15139 |
+if test "${acl_cv_path_LD+set}" = set; then
|
|
15140 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
15141 |
+else
|
|
15142 |
+ if test -z "$LD"; then
|
|
15143 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
15144 |
+ for ac_dir in $PATH; do
|
|
15145 |
+ test -z "$ac_dir" && ac_dir=.
|
|
15146 |
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
15147 |
+ acl_cv_path_LD="$ac_dir/$ac_prog"
|
|
15148 |
+ # Check to see if the program is GNU ld. I'd rather use --version,
|
|
15149 |
+ # but apparently some GNU ld's only accept -v.
|
|
15150 |
+ # Break only if it was the GNU/non-GNU ld that we prefer.
|
|
15151 |
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
|
15152 |
+ test "$with_gnu_ld" != no && break
|
|
15153 |
+ else
|
|
15154 |
+ test "$with_gnu_ld" != yes && break
|
|
15155 |
+ fi
|
|
15156 |
+ fi
|
|
15157 |
+ done
|
|
15158 |
+ IFS="$ac_save_ifs"
|
|
15159 |
+else
|
|
15160 |
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
15161 |
fi
|
|
15162 |
fi
|
|
15163 |
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
|
|
15164 |
-if test -n "$ac_ct_CXX"; then
|
|
15165 |
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
|
|
15166 |
-echo "${ECHO_T}$ac_ct_CXX" >&6
|
|
15167 |
+
|
|
15168 |
+LD="$acl_cv_path_LD"
|
|
15169 |
+if test -n "$LD"; then
|
|
15170 |
+ { echo "$as_me:$LINENO: result: $LD" >&5
|
|
15171 |
+echo "${ECHO_T}$LD" >&6; }
|
|
15172 |
else
|
|
15173 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
15174 |
-echo "${ECHO_T}no" >&6
|
|
15175 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
15176 |
+echo "${ECHO_T}no" >&6; }
|
|
15177 |
+fi
|
|
15178 |
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
|
|
15179 |
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
|
|
15180 |
+ { (exit 1); exit 1; }; }
|
|
15181 |
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
|
|
15182 |
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
|
|
15183 |
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
|
|
15184 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
15185 |
+else
|
|
15186 |
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
15187 |
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
|
15188 |
+ acl_cv_prog_gnu_ld=yes
|
|
15189 |
+else
|
|
15190 |
+ acl_cv_prog_gnu_ld=no
|
|
15191 |
+fi
|
|
15192 |
fi
|
|
15193 |
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
|
|
15194 |
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
|
|
15195 |
+with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
15196 |
+
|
|
15197 |
+
|
|
15198 |
+
|
|
15199 |
+ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
|
|
15200 |
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
|
|
15201 |
+if test "${acl_cv_rpath+set}" = set; then
|
|
15202 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
15203 |
+else
|
|
15204 |
+
|
|
15205 |
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
|
15206 |
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
|
15207 |
+ . ./conftest.sh
|
|
15208 |
+ rm -f ./conftest.sh
|
|
15209 |
+ acl_cv_rpath=done
|
|
15210 |
+
|
|
15211 |
+fi
|
|
15212 |
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
|
|
15213 |
+echo "${ECHO_T}$acl_cv_rpath" >&6; }
|
|
15214 |
+ wl="$acl_cv_wl"
|
|
15215 |
+ libext="$acl_cv_libext"
|
|
15216 |
+ shlibext="$acl_cv_shlibext"
|
|
15217 |
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
|
15218 |
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
|
15219 |
+ hardcode_direct="$acl_cv_hardcode_direct"
|
|
15220 |
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
|
15221 |
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
|
|
15222 |
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
|
|
15223 |
+ # Check whether --enable-rpath was given.
|
|
15224 |
+if test "${enable_rpath+set}" = set; then
|
|
15225 |
+ enableval=$enable_rpath; :
|
|
15226 |
+else
|
|
15227 |
+ enable_rpath=yes
|
|
15228 |
+fi
|
|
15229 |
+
|
|
15230 |
+
|
|
15231 |
+
|
|
15232 |
+
|
|
15233 |
+
|
|
15234 |
+
|
|
15235 |
+
|
|
15236 |
+
|
|
15237 |
+ use_additional=yes
|
|
15238 |
+
|
|
15239 |
+ acl_save_prefix="$prefix"
|
|
15240 |
+ prefix="$acl_final_prefix"
|
|
15241 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15242 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15243 |
+
|
|
15244 |
+ eval additional_includedir=\"$includedir\"
|
|
15245 |
+ eval additional_libdir=\"$libdir\"
|
|
15246 |
+
|
|
15247 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15248 |
+ prefix="$acl_save_prefix"
|
|
15249 |
+
|
|
15250 |
+
|
|
15251 |
+# Check whether --with-libiconv-prefix was given.
|
|
15252 |
+if test "${with_libiconv_prefix+set}" = set; then
|
|
15253 |
+ withval=$with_libiconv_prefix;
|
|
15254 |
+ if test "X$withval" = "Xno"; then
|
|
15255 |
+ use_additional=no
|
|
15256 |
+ else
|
|
15257 |
+ if test "X$withval" = "X"; then
|
|
15258 |
+
|
|
15259 |
+ acl_save_prefix="$prefix"
|
|
15260 |
+ prefix="$acl_final_prefix"
|
|
15261 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15262 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15263 |
+
|
|
15264 |
+ eval additional_includedir=\"$includedir\"
|
|
15265 |
+ eval additional_libdir=\"$libdir\"
|
|
15266 |
+
|
|
15267 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15268 |
+ prefix="$acl_save_prefix"
|
|
15269 |
+
|
|
15270 |
+ else
|
|
15271 |
+ additional_includedir="$withval/include"
|
|
15272 |
+ additional_libdir="$withval/lib"
|
|
15273 |
+ fi
|
|
15274 |
+ fi
|
|
15275 |
+
|
|
15276 |
+fi
|
|
15277 |
+
|
|
15278 |
+ LIBICONV=
|
|
15279 |
+ LTLIBICONV=
|
|
15280 |
+ INCICONV=
|
|
15281 |
+ rpathdirs=
|
|
15282 |
+ ltrpathdirs=
|
|
15283 |
+ names_already_handled=
|
|
15284 |
+ names_next_round='iconv '
|
|
15285 |
+ while test -n "$names_next_round"; do
|
|
15286 |
+ names_this_round="$names_next_round"
|
|
15287 |
+ names_next_round=
|
|
15288 |
+ for name in $names_this_round; do
|
|
15289 |
+ already_handled=
|
|
15290 |
+ for n in $names_already_handled; do
|
|
15291 |
+ if test "$n" = "$name"; then
|
|
15292 |
+ already_handled=yes
|
|
15293 |
+ break
|
|
15294 |
+ fi
|
|
15295 |
+ done
|
|
15296 |
+ if test -z "$already_handled"; then
|
|
15297 |
+ names_already_handled="$names_already_handled $name"
|
|
15298 |
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
|
15299 |
+ eval value=\"\$HAVE_LIB$uppername\"
|
|
15300 |
+ if test -n "$value"; then
|
|
15301 |
+ if test "$value" = yes; then
|
|
15302 |
+ eval value=\"\$LIB$uppername\"
|
|
15303 |
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
|
|
15304 |
+ eval value=\"\$LTLIB$uppername\"
|
|
15305 |
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
|
|
15306 |
+ else
|
|
15307 |
+ :
|
|
15308 |
+ fi
|
|
15309 |
+ else
|
|
15310 |
+ found_dir=
|
|
15311 |
+ found_la=
|
|
15312 |
+ found_so=
|
|
15313 |
+ found_a=
|
|
15314 |
+ if test $use_additional = yes; then
|
|
15315 |
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
|
|
15316 |
+ found_dir="$additional_libdir"
|
|
15317 |
+ found_so="$additional_libdir/lib$name.$shlibext"
|
|
15318 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
15319 |
+ found_la="$additional_libdir/lib$name.la"
|
|
15320 |
+ fi
|
|
15321 |
+ else
|
|
15322 |
+ if test -f "$additional_libdir/lib$name.$libext"; then
|
|
15323 |
+ found_dir="$additional_libdir"
|
|
15324 |
+ found_a="$additional_libdir/lib$name.$libext"
|
|
15325 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
15326 |
+ found_la="$additional_libdir/lib$name.la"
|
|
15327 |
+ fi
|
|
15328 |
+ fi
|
|
15329 |
+ fi
|
|
15330 |
+ fi
|
|
15331 |
+ if test "X$found_dir" = "X"; then
|
|
15332 |
+ for x in $LDFLAGS $LTLIBICONV; do
|
|
15333 |
+
|
|
15334 |
+ acl_save_prefix="$prefix"
|
|
15335 |
+ prefix="$acl_final_prefix"
|
|
15336 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15337 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15338 |
+ eval x=\"$x\"
|
|
15339 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15340 |
+ prefix="$acl_save_prefix"
|
|
15341 |
+
|
|
15342 |
+ case "$x" in
|
|
15343 |
+ -L*)
|
|
15344 |
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
|
|
15345 |
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
|
|
15346 |
+ found_dir="$dir"
|
|
15347 |
+ found_so="$dir/lib$name.$shlibext"
|
|
15348 |
+ if test -f "$dir/lib$name.la"; then
|
|
15349 |
+ found_la="$dir/lib$name.la"
|
|
15350 |
+ fi
|
|
15351 |
+ else
|
|
15352 |
+ if test -f "$dir/lib$name.$libext"; then
|
|
15353 |
+ found_dir="$dir"
|
|
15354 |
+ found_a="$dir/lib$name.$libext"
|
|
15355 |
+ if test -f "$dir/lib$name.la"; then
|
|
15356 |
+ found_la="$dir/lib$name.la"
|
|
15357 |
+ fi
|
|
15358 |
+ fi
|
|
15359 |
+ fi
|
|
15360 |
+ ;;
|
|
15361 |
+ esac
|
|
15362 |
+ if test "X$found_dir" != "X"; then
|
|
15363 |
+ break
|
|
15364 |
+ fi
|
|
15365 |
+ done
|
|
15366 |
+ fi
|
|
15367 |
+ if test "X$found_dir" != "X"; then
|
|
15368 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
|
|
15369 |
+ if test "X$found_so" != "X"; then
|
|
15370 |
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
|
|
15371 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
15372 |
+ else
|
|
15373 |
+ haveit=
|
|
15374 |
+ for x in $ltrpathdirs; do
|
|
15375 |
+ if test "X$x" = "X$found_dir"; then
|
|
15376 |
+ haveit=yes
|
|
15377 |
+ break
|
|
15378 |
+ fi
|
|
15379 |
+ done
|
|
15380 |
+ if test -z "$haveit"; then
|
|
15381 |
+ ltrpathdirs="$ltrpathdirs $found_dir"
|
|
15382 |
+ fi
|
|
15383 |
+ if test "$hardcode_direct" = yes; then
|
|
15384 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
15385 |
+ else
|
|
15386 |
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
|
15387 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
15388 |
+ haveit=
|
|
15389 |
+ for x in $rpathdirs; do
|
|
15390 |
+ if test "X$x" = "X$found_dir"; then
|
|
15391 |
+ haveit=yes
|
|
15392 |
+ break
|
|
15393 |
+ fi
|
|
15394 |
+ done
|
|
15395 |
+ if test -z "$haveit"; then
|
|
15396 |
+ rpathdirs="$rpathdirs $found_dir"
|
|
15397 |
+ fi
|
|
15398 |
+ else
|
|
15399 |
+ haveit=
|
|
15400 |
+ for x in $LDFLAGS $LIBICONV; do
|
|
15401 |
+
|
|
15402 |
+ acl_save_prefix="$prefix"
|
|
15403 |
+ prefix="$acl_final_prefix"
|
|
15404 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15405 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15406 |
+ eval x=\"$x\"
|
|
15407 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15408 |
+ prefix="$acl_save_prefix"
|
|
15409 |
+
|
|
15410 |
+ if test "X$x" = "X-L$found_dir"; then
|
|
15411 |
+ haveit=yes
|
|
15412 |
+ break
|
|
15413 |
+ fi
|
|
15414 |
+ done
|
|
15415 |
+ if test -z "$haveit"; then
|
|
15416 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
|
|
15417 |
+ fi
|
|
15418 |
+ if test "$hardcode_minus_L" != no; then
|
|
15419 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
15420 |
+ else
|
|
15421 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
|
|
15422 |
+ fi
|
|
15423 |
+ fi
|
|
15424 |
+ fi
|
|
15425 |
+ fi
|
|
15426 |
+ else
|
|
15427 |
+ if test "X$found_a" != "X"; then
|
|
15428 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
|
|
15429 |
+ else
|
|
15430 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
|
|
15431 |
+ fi
|
|
15432 |
+ fi
|
|
15433 |
+ additional_includedir=
|
|
15434 |
+ case "$found_dir" in
|
|
15435 |
+ */lib | */lib/)
|
|
15436 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
|
|
15437 |
+ additional_includedir="$basedir/include"
|
|
15438 |
+ ;;
|
|
15439 |
+ esac
|
|
15440 |
+ if test "X$additional_includedir" != "X"; then
|
|
15441 |
+ if test "X$additional_includedir" != "X/usr/include"; then
|
|
15442 |
+ haveit=
|
|
15443 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
15444 |
+ if test -n "$GCC"; then
|
|
15445 |
+ case $host_os in
|
|
15446 |
+ linux*) haveit=yes;;
|
|
15447 |
+ esac
|
|
15448 |
+ fi
|
|
15449 |
+ fi
|
|
15450 |
+ if test -z "$haveit"; then
|
|
15451 |
+ for x in $CPPFLAGS $INCICONV; do
|
|
15452 |
+
|
|
15453 |
+ acl_save_prefix="$prefix"
|
|
15454 |
+ prefix="$acl_final_prefix"
|
|
15455 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15456 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15457 |
+ eval x=\"$x\"
|
|
15458 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15459 |
+ prefix="$acl_save_prefix"
|
|
15460 |
+
|
|
15461 |
+ if test "X$x" = "X-I$additional_includedir"; then
|
|
15462 |
+ haveit=yes
|
|
15463 |
+ break
|
|
15464 |
+ fi
|
|
15465 |
+ done
|
|
15466 |
+ if test -z "$haveit"; then
|
|
15467 |
+ if test -d "$additional_includedir"; then
|
|
15468 |
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
|
|
15469 |
+ fi
|
|
15470 |
+ fi
|
|
15471 |
+ fi
|
|
15472 |
+ fi
|
|
15473 |
+ fi
|
|
15474 |
+ if test -n "$found_la"; then
|
|
15475 |
+ save_libdir="$libdir"
|
|
15476 |
+ case "$found_la" in
|
|
15477 |
+ */* | *\\*) . "$found_la" ;;
|
|
15478 |
+ *) . "./$found_la" ;;
|
|
15479 |
+ esac
|
|
15480 |
+ libdir="$save_libdir"
|
|
15481 |
+ for dep in $dependency_libs; do
|
|
15482 |
+ case "$dep" in
|
|
15483 |
+ -L*)
|
|
15484 |
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
|
15485 |
+ if test "X$additional_libdir" != "X/usr/lib"; then
|
|
15486 |
+ haveit=
|
|
15487 |
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
15488 |
+ if test -n "$GCC"; then
|
|
15489 |
+ case $host_os in
|
|
15490 |
+ linux*) haveit=yes;;
|
|
15491 |
+ esac
|
|
15492 |
+ fi
|
|
15493 |
+ fi
|
|
15494 |
+ if test -z "$haveit"; then
|
|
15495 |
+ haveit=
|
|
15496 |
+ for x in $LDFLAGS $LIBICONV; do
|
|
15497 |
+
|
|
15498 |
+ acl_save_prefix="$prefix"
|
|
15499 |
+ prefix="$acl_final_prefix"
|
|
15500 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15501 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15502 |
+ eval x=\"$x\"
|
|
15503 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15504 |
+ prefix="$acl_save_prefix"
|
|
15505 |
+
|
|
15506 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
15507 |
+ haveit=yes
|
|
15508 |
+ break
|
|
15509 |
+ fi
|
|
15510 |
+ done
|
|
15511 |
+ if test -z "$haveit"; then
|
|
15512 |
+ if test -d "$additional_libdir"; then
|
|
15513 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
|
|
15514 |
+ fi
|
|
15515 |
+ fi
|
|
15516 |
+ haveit=
|
|
15517 |
+ for x in $LDFLAGS $LTLIBICONV; do
|
|
15518 |
+
|
|
15519 |
+ acl_save_prefix="$prefix"
|
|
15520 |
+ prefix="$acl_final_prefix"
|
|
15521 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15522 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15523 |
+ eval x=\"$x\"
|
|
15524 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15525 |
+ prefix="$acl_save_prefix"
|
|
15526 |
+
|
|
15527 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
15528 |
+ haveit=yes
|
|
15529 |
+ break
|
|
15530 |
+ fi
|
|
15531 |
+ done
|
|
15532 |
+ if test -z "$haveit"; then
|
|
15533 |
+ if test -d "$additional_libdir"; then
|
|
15534 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
|
|
15535 |
+ fi
|
|
15536 |
+ fi
|
|
15537 |
+ fi
|
|
15538 |
+ fi
|
|
15539 |
+ ;;
|
|
15540 |
+ -R*)
|
|
15541 |
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
|
15542 |
+ if test "$enable_rpath" != no; then
|
|
15543 |
+ haveit=
|
|
15544 |
+ for x in $rpathdirs; do
|
|
15545 |
+ if test "X$x" = "X$dir"; then
|
|
15546 |
+ haveit=yes
|
|
15547 |
+ break
|
|
15548 |
+ fi
|
|
15549 |
+ done
|
|
15550 |
+ if test -z "$haveit"; then
|
|
15551 |
+ rpathdirs="$rpathdirs $dir"
|
|
15552 |
+ fi
|
|
15553 |
+ haveit=
|
|
15554 |
+ for x in $ltrpathdirs; do
|
|
15555 |
+ if test "X$x" = "X$dir"; then
|
|
15556 |
+ haveit=yes
|
|
15557 |
+ break
|
|
15558 |
+ fi
|
|
15559 |
+ done
|
|
15560 |
+ if test -z "$haveit"; then
|
|
15561 |
+ ltrpathdirs="$ltrpathdirs $dir"
|
|
15562 |
+ fi
|
|
15563 |
+ fi
|
|
15564 |
+ ;;
|
|
15565 |
+ -l*)
|
|
15566 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
|
15567 |
+ ;;
|
|
15568 |
+ *.la)
|
|
15569 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
|
15570 |
+ ;;
|
|
15571 |
+ *)
|
|
15572 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
|
|
15573 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
|
|
15574 |
+ ;;
|
|
15575 |
+ esac
|
|
15576 |
+ done
|
|
15577 |
+ fi
|
|
15578 |
+ else
|
|
15579 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
|
|
15580 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
|
|
15581 |
+ fi
|
|
15582 |
+ fi
|
|
15583 |
+ fi
|
|
15584 |
+ done
|
|
15585 |
+ done
|
|
15586 |
+ if test "X$rpathdirs" != "X"; then
|
|
15587 |
+ if test -n "$hardcode_libdir_separator"; then
|
|
15588 |
+ alldirs=
|
|
15589 |
+ for found_dir in $rpathdirs; do
|
|
15590 |
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
|
15591 |
+ done
|
|
15592 |
+ acl_save_libdir="$libdir"
|
|
15593 |
+ libdir="$alldirs"
|
|
15594 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
15595 |
+ libdir="$acl_save_libdir"
|
|
15596 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
|
|
15597 |
+ else
|
|
15598 |
+ for found_dir in $rpathdirs; do
|
|
15599 |
+ acl_save_libdir="$libdir"
|
|
15600 |
+ libdir="$found_dir"
|
|
15601 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
15602 |
+ libdir="$acl_save_libdir"
|
|
15603 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
|
|
15604 |
+ done
|
|
15605 |
+ fi
|
|
15606 |
+ fi
|
|
15607 |
+ if test "X$ltrpathdirs" != "X"; then
|
|
15608 |
+ for found_dir in $ltrpathdirs; do
|
|
15609 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
|
|
15610 |
+ done
|
|
15611 |
+ fi
|
|
15612 |
+
|
|
15613 |
+
|
|
15614 |
+
|
|
15615 |
+
|
|
15616 |
+
|
|
15617 |
+
|
|
15618 |
+
|
|
15619 |
+
|
|
15620 |
+
|
|
15621 |
+
|
|
15622 |
+
|
|
15623 |
+
|
|
15624 |
+
|
|
15625 |
+
|
|
15626 |
+
|
|
15627 |
+
|
|
15628 |
+
|
|
15629 |
+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
|
|
15630 |
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
|
|
15631 |
+ # Check whether --enable-nls was given.
|
|
15632 |
+if test "${enable_nls+set}" = set; then
|
|
15633 |
+ enableval=$enable_nls; USE_NLS=$enableval
|
|
15634 |
+else
|
|
15635 |
+ USE_NLS=yes
|
|
15636 |
+fi
|
|
15637 |
+
|
|
15638 |
+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
|
|
15639 |
+echo "${ECHO_T}$USE_NLS" >&6; }
|
|
15640 |
+
|
|
15641 |
+
|
|
15642 |
+
|
|
15643 |
+ LIBINTL=
|
|
15644 |
+ LTLIBINTL=
|
|
15645 |
+ POSUB=
|
|
15646 |
+
|
|
15647 |
+ if test "$USE_NLS" = "yes"; then
|
|
15648 |
+ gt_use_preinstalled_gnugettext=no
|
|
15649 |
|
|
15650 |
- test -n "$ac_ct_CXX" && break
|
|
15651 |
-done
|
|
15652 |
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
|
|
15653 |
|
|
15654 |
- CXX=$ac_ct_CXX
|
|
15655 |
-fi
|
|
15656 |
|
|
15657 |
|
|
15658 |
-# Provide some information about the compiler.
|
|
15659 |
-echo "$as_me:$LINENO:" \
|
|
15660 |
- "checking for C++ compiler version" >&5
|
|
15661 |
-ac_compiler=`set X $ac_compile; echo $2`
|
|
15662 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
|
15663 |
- (eval $ac_compiler --version </dev/null >&5) 2>&5
|
|
15664 |
- ac_status=$?
|
|
15665 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15666 |
- (exit $ac_status); }
|
|
15667 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
|
15668 |
- (eval $ac_compiler -v </dev/null >&5) 2>&5
|
|
15669 |
- ac_status=$?
|
|
15670 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15671 |
- (exit $ac_status); }
|
|
15672 |
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
|
15673 |
- (eval $ac_compiler -V </dev/null >&5) 2>&5
|
|
15674 |
- ac_status=$?
|
|
15675 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15676 |
- (exit $ac_status); }
|
|
15677 |
|
|
15678 |
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
|
|
15679 |
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
|
|
15680 |
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
|
|
15681 |
+
|
|
15682 |
+ { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
|
|
15683 |
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
|
|
15684 |
+if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
|
|
15685 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
15686 |
else
|
|
15687 |
cat >conftest.$ac_ext <<_ACEOF
|
|
15688 |
@@ -4354,345 +5266,865 @@ _ACEOF
|
|
15689 |
cat confdefs.h >>conftest.$ac_ext
|
|
15690 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
15691 |
/* end confdefs.h. */
|
|
15692 |
-
|
|
15693 |
+#include <libintl.h>
|
|
15694 |
+extern int _nl_msg_cat_cntr;
|
|
15695 |
+extern int *_nl_domain_bindings;
|
|
15696 |
int
|
|
15697 |
main ()
|
|
15698 |
{
|
|
15699 |
-#ifndef __GNUC__
|
|
15700 |
- choke me
|
|
15701 |
-#endif
|
|
15702 |
-
|
|
15703 |
+bindtextdomain ("", "");
|
|
15704 |
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
|
|
15705 |
;
|
|
15706 |
return 0;
|
|
15707 |
}
|
|
15708 |
_ACEOF
|
|
15709 |
-rm -f conftest.$ac_objext
|
|
15710 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
15711 |
- (eval $ac_compile) 2>conftest.er1
|
|
15712 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
15713 |
+if { (ac_try="$ac_link"
|
|
15714 |
+case "(($ac_try" in
|
|
15715 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
15716 |
+ *) ac_try_echo=$ac_try;;
|
|
15717 |
+esac
|
|
15718 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
15719 |
+ (eval "$ac_link") 2>conftest.er1
|
|
15720 |
ac_status=$?
|
|
15721 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
15722 |
rm -f conftest.er1
|
|
15723 |
cat conftest.err >&5
|
|
15724 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15725 |
- (exit $ac_status); } &&
|
|
15726 |
- { ac_try='test -z "$ac_cxx_werror_flag"
|
|
15727 |
- || test ! -s conftest.err'
|
|
15728 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
15729 |
- (eval $ac_try) 2>&5
|
|
15730 |
- ac_status=$?
|
|
15731 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15732 |
- (exit $ac_status); }; } &&
|
|
15733 |
- { ac_try='test -s conftest.$ac_objext'
|
|
15734 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
15735 |
- (eval $ac_try) 2>&5
|
|
15736 |
- ac_status=$?
|
|
15737 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15738 |
- (exit $ac_status); }; }; then
|
|
15739 |
- ac_compiler_gnu=yes
|
|
15740 |
+ (exit $ac_status); } && {
|
|
15741 |
+ test -z "$ac_c_werror_flag" ||
|
|
15742 |
+ test ! -s conftest.err
|
|
15743 |
+ } && test -s conftest$ac_exeext &&
|
|
15744 |
+ $as_test_x conftest$ac_exeext; then
|
|
15745 |
+ gt_cv_func_gnugettext1_libc=yes
|
|
15746 |
else
|
|
15747 |
echo "$as_me: failed program was:" >&5
|
|
15748 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
15749 |
|
|
15750 |
-ac_compiler_gnu=no
|
|
15751 |
+ gt_cv_func_gnugettext1_libc=no
|
|
15752 |
fi
|
|
15753 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
15754 |
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
|
|
15755 |
|
|
15756 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
15757 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
15758 |
fi
|
|
15759 |
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
|
|
15760 |
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
|
|
15761 |
-GXX=`test $ac_compiler_gnu = yes && echo yes`
|
|
15762 |
-ac_test_CXXFLAGS=${CXXFLAGS+set}
|
|
15763 |
-ac_save_CXXFLAGS=$CXXFLAGS
|
|
15764 |
-CXXFLAGS="-g"
|
|
15765 |
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
|
|
15766 |
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
|
|
15767 |
-if test "${ac_cv_prog_cxx_g+set}" = set; then
|
|
15768 |
+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
|
|
15769 |
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
|
|
15770 |
+
|
|
15771 |
+ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
|
|
15772 |
+
|
|
15773 |
+
|
|
15774 |
+
|
|
15775 |
+
|
|
15776 |
+
|
|
15777 |
+ am_save_CPPFLAGS="$CPPFLAGS"
|
|
15778 |
+
|
|
15779 |
+ for element in $INCICONV; do
|
|
15780 |
+ haveit=
|
|
15781 |
+ for x in $CPPFLAGS; do
|
|
15782 |
+
|
|
15783 |
+ acl_save_prefix="$prefix"
|
|
15784 |
+ prefix="$acl_final_prefix"
|
|
15785 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15786 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15787 |
+ eval x=\"$x\"
|
|
15788 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15789 |
+ prefix="$acl_save_prefix"
|
|
15790 |
+
|
|
15791 |
+ if test "X$x" = "X$element"; then
|
|
15792 |
+ haveit=yes
|
|
15793 |
+ break
|
|
15794 |
+ fi
|
|
15795 |
+ done
|
|
15796 |
+ if test -z "$haveit"; then
|
|
15797 |
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
|
|
15798 |
+ fi
|
|
15799 |
+ done
|
|
15800 |
+
|
|
15801 |
+
|
|
15802 |
+ { echo "$as_me:$LINENO: checking for iconv" >&5
|
|
15803 |
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
|
|
15804 |
+if test "${am_cv_func_iconv+set}" = set; then
|
|
15805 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
15806 |
else
|
|
15807 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
15808 |
+
|
|
15809 |
+ am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
15810 |
+ am_cv_lib_iconv=no
|
|
15811 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
15812 |
/* confdefs.h. */
|
|
15813 |
_ACEOF
|
|
15814 |
cat confdefs.h >>conftest.$ac_ext
|
|
15815 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
15816 |
/* end confdefs.h. */
|
|
15817 |
-
|
|
15818 |
+#include <stdlib.h>
|
|
15819 |
+#include <iconv.h>
|
|
15820 |
int
|
|
15821 |
main ()
|
|
15822 |
{
|
|
15823 |
-
|
|
15824 |
+iconv_t cd = iconv_open("","");
|
|
15825 |
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
15826 |
+ iconv_close(cd);
|
|
15827 |
;
|
|
15828 |
return 0;
|
|
15829 |
}
|
|
15830 |
_ACEOF
|
|
15831 |
-rm -f conftest.$ac_objext
|
|
15832 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
15833 |
- (eval $ac_compile) 2>conftest.er1
|
|
15834 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
15835 |
+if { (ac_try="$ac_link"
|
|
15836 |
+case "(($ac_try" in
|
|
15837 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
15838 |
+ *) ac_try_echo=$ac_try;;
|
|
15839 |
+esac
|
|
15840 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
15841 |
+ (eval "$ac_link") 2>conftest.er1
|
|
15842 |
ac_status=$?
|
|
15843 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
15844 |
rm -f conftest.er1
|
|
15845 |
cat conftest.err >&5
|
|
15846 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15847 |
- (exit $ac_status); } &&
|
|
15848 |
- { ac_try='test -z "$ac_cxx_werror_flag"
|
|
15849 |
- || test ! -s conftest.err'
|
|
15850 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
15851 |
- (eval $ac_try) 2>&5
|
|
15852 |
- ac_status=$?
|
|
15853 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15854 |
- (exit $ac_status); }; } &&
|
|
15855 |
- { ac_try='test -s conftest.$ac_objext'
|
|
15856 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
15857 |
- (eval $ac_try) 2>&5
|
|
15858 |
+ (exit $ac_status); } && {
|
|
15859 |
+ test -z "$ac_c_werror_flag" ||
|
|
15860 |
+ test ! -s conftest.err
|
|
15861 |
+ } && test -s conftest$ac_exeext &&
|
|
15862 |
+ $as_test_x conftest$ac_exeext; then
|
|
15863 |
+ am_cv_func_iconv=yes
|
|
15864 |
+else
|
|
15865 |
+ echo "$as_me: failed program was:" >&5
|
|
15866 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
15867 |
+
|
|
15868 |
+
|
|
15869 |
+fi
|
|
15870 |
+
|
|
15871 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
15872 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
15873 |
+ if test "$am_cv_func_iconv" != yes; then
|
|
15874 |
+ am_save_LIBS="$LIBS"
|
|
15875 |
+ LIBS="$LIBS $LIBICONV"
|
|
15876 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
15877 |
+/* confdefs.h. */
|
|
15878 |
+_ACEOF
|
|
15879 |
+cat confdefs.h >>conftest.$ac_ext
|
|
15880 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
15881 |
+/* end confdefs.h. */
|
|
15882 |
+#include <stdlib.h>
|
|
15883 |
+#include <iconv.h>
|
|
15884 |
+int
|
|
15885 |
+main ()
|
|
15886 |
+{
|
|
15887 |
+iconv_t cd = iconv_open("","");
|
|
15888 |
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
15889 |
+ iconv_close(cd);
|
|
15890 |
+ ;
|
|
15891 |
+ return 0;
|
|
15892 |
+}
|
|
15893 |
+_ACEOF
|
|
15894 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
15895 |
+if { (ac_try="$ac_link"
|
|
15896 |
+case "(($ac_try" in
|
|
15897 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
15898 |
+ *) ac_try_echo=$ac_try;;
|
|
15899 |
+esac
|
|
15900 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
15901 |
+ (eval "$ac_link") 2>conftest.er1
|
|
15902 |
ac_status=$?
|
|
15903 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
15904 |
+ rm -f conftest.er1
|
|
15905 |
+ cat conftest.err >&5
|
|
15906 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
15907 |
- (exit $ac_status); }; }; then
|
|
15908 |
- ac_cv_prog_cxx_g=yes
|
|
15909 |
+ (exit $ac_status); } && {
|
|
15910 |
+ test -z "$ac_c_werror_flag" ||
|
|
15911 |
+ test ! -s conftest.err
|
|
15912 |
+ } && test -s conftest$ac_exeext &&
|
|
15913 |
+ $as_test_x conftest$ac_exeext; then
|
|
15914 |
+ am_cv_lib_iconv=yes
|
|
15915 |
+ am_cv_func_iconv=yes
|
|
15916 |
else
|
|
15917 |
echo "$as_me: failed program was:" >&5
|
|
15918 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
15919 |
|
|
15920 |
-ac_cv_prog_cxx_g=no
|
|
15921 |
+
|
|
15922 |
fi
|
|
15923 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
15924 |
+
|
|
15925 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
15926 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
15927 |
+ LIBS="$am_save_LIBS"
|
|
15928 |
+ fi
|
|
15929 |
+
|
|
15930 |
fi
|
|
15931 |
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
|
|
15932 |
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
|
|
15933 |
-if test "$ac_test_CXXFLAGS" = set; then
|
|
15934 |
- CXXFLAGS=$ac_save_CXXFLAGS
|
|
15935 |
-elif test $ac_cv_prog_cxx_g = yes; then
|
|
15936 |
- if test "$GXX" = yes; then
|
|
15937 |
- CXXFLAGS="-g -O2"
|
|
15938 |
- else
|
|
15939 |
- CXXFLAGS="-g"
|
|
15940 |
+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
|
|
15941 |
+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
|
|
15942 |
+ if test "$am_cv_func_iconv" = yes; then
|
|
15943 |
+
|
|
15944 |
+cat >>confdefs.h <<\_ACEOF
|
|
15945 |
+#define HAVE_ICONV 1
|
|
15946 |
+_ACEOF
|
|
15947 |
+
|
|
15948 |
fi
|
|
15949 |
-else
|
|
15950 |
- if test "$GXX" = yes; then
|
|
15951 |
- CXXFLAGS="-O2"
|
|
15952 |
+ if test "$am_cv_lib_iconv" = yes; then
|
|
15953 |
+ { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
|
|
15954 |
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
|
|
15955 |
+ { echo "$as_me:$LINENO: result: $LIBICONV" >&5
|
|
15956 |
+echo "${ECHO_T}$LIBICONV" >&6; }
|
|
15957 |
else
|
|
15958 |
- CXXFLAGS=
|
|
15959 |
+ CPPFLAGS="$am_save_CPPFLAGS"
|
|
15960 |
+ LIBICONV=
|
|
15961 |
+ LTLIBICONV=
|
|
15962 |
fi
|
|
15963 |
+
|
|
15964 |
+
|
|
15965 |
+
|
|
15966 |
+
|
|
15967 |
+
|
|
15968 |
+
|
|
15969 |
+ use_additional=yes
|
|
15970 |
+
|
|
15971 |
+ acl_save_prefix="$prefix"
|
|
15972 |
+ prefix="$acl_final_prefix"
|
|
15973 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15974 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15975 |
+
|
|
15976 |
+ eval additional_includedir=\"$includedir\"
|
|
15977 |
+ eval additional_libdir=\"$libdir\"
|
|
15978 |
+
|
|
15979 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
15980 |
+ prefix="$acl_save_prefix"
|
|
15981 |
+
|
|
15982 |
+
|
|
15983 |
+# Check whether --with-libintl-prefix was given.
|
|
15984 |
+if test "${with_libintl_prefix+set}" = set; then
|
|
15985 |
+ withval=$with_libintl_prefix;
|
|
15986 |
+ if test "X$withval" = "Xno"; then
|
|
15987 |
+ use_additional=no
|
|
15988 |
+ else
|
|
15989 |
+ if test "X$withval" = "X"; then
|
|
15990 |
+
|
|
15991 |
+ acl_save_prefix="$prefix"
|
|
15992 |
+ prefix="$acl_final_prefix"
|
|
15993 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
15994 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
15995 |
+
|
|
15996 |
+ eval additional_includedir=\"$includedir\"
|
|
15997 |
+ eval additional_libdir=\"$libdir\"
|
|
15998 |
+
|
|
15999 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16000 |
+ prefix="$acl_save_prefix"
|
|
16001 |
+
|
|
16002 |
+ else
|
|
16003 |
+ additional_includedir="$withval/include"
|
|
16004 |
+ additional_libdir="$withval/lib"
|
|
16005 |
+ fi
|
|
16006 |
+ fi
|
|
16007 |
+
|
|
16008 |
fi
|
|
16009 |
-for ac_declaration in \
|
|
16010 |
- '' \
|
|
16011 |
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
|
16012 |
- 'extern "C" void std::exit (int); using std::exit;' \
|
|
16013 |
- 'extern "C" void exit (int) throw ();' \
|
|
16014 |
- 'extern "C" void exit (int);' \
|
|
16015 |
- 'void exit (int);'
|
|
16016 |
-do
|
|
16017 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
16018 |
+
|
|
16019 |
+ LIBINTL=
|
|
16020 |
+ LTLIBINTL=
|
|
16021 |
+ INCINTL=
|
|
16022 |
+ rpathdirs=
|
|
16023 |
+ ltrpathdirs=
|
|
16024 |
+ names_already_handled=
|
|
16025 |
+ names_next_round='intl '
|
|
16026 |
+ while test -n "$names_next_round"; do
|
|
16027 |
+ names_this_round="$names_next_round"
|
|
16028 |
+ names_next_round=
|
|
16029 |
+ for name in $names_this_round; do
|
|
16030 |
+ already_handled=
|
|
16031 |
+ for n in $names_already_handled; do
|
|
16032 |
+ if test "$n" = "$name"; then
|
|
16033 |
+ already_handled=yes
|
|
16034 |
+ break
|
|
16035 |
+ fi
|
|
16036 |
+ done
|
|
16037 |
+ if test -z "$already_handled"; then
|
|
16038 |
+ names_already_handled="$names_already_handled $name"
|
|
16039 |
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
|
16040 |
+ eval value=\"\$HAVE_LIB$uppername\"
|
|
16041 |
+ if test -n "$value"; then
|
|
16042 |
+ if test "$value" = yes; then
|
|
16043 |
+ eval value=\"\$LIB$uppername\"
|
|
16044 |
+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
|
|
16045 |
+ eval value=\"\$LTLIB$uppername\"
|
|
16046 |
+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
|
|
16047 |
+ else
|
|
16048 |
+ :
|
|
16049 |
+ fi
|
|
16050 |
+ else
|
|
16051 |
+ found_dir=
|
|
16052 |
+ found_la=
|
|
16053 |
+ found_so=
|
|
16054 |
+ found_a=
|
|
16055 |
+ if test $use_additional = yes; then
|
|
16056 |
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
|
|
16057 |
+ found_dir="$additional_libdir"
|
|
16058 |
+ found_so="$additional_libdir/lib$name.$shlibext"
|
|
16059 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
16060 |
+ found_la="$additional_libdir/lib$name.la"
|
|
16061 |
+ fi
|
|
16062 |
+ else
|
|
16063 |
+ if test -f "$additional_libdir/lib$name.$libext"; then
|
|
16064 |
+ found_dir="$additional_libdir"
|
|
16065 |
+ found_a="$additional_libdir/lib$name.$libext"
|
|
16066 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
16067 |
+ found_la="$additional_libdir/lib$name.la"
|
|
16068 |
+ fi
|
|
16069 |
+ fi
|
|
16070 |
+ fi
|
|
16071 |
+ fi
|
|
16072 |
+ if test "X$found_dir" = "X"; then
|
|
16073 |
+ for x in $LDFLAGS $LTLIBINTL; do
|
|
16074 |
+
|
|
16075 |
+ acl_save_prefix="$prefix"
|
|
16076 |
+ prefix="$acl_final_prefix"
|
|
16077 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
16078 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
16079 |
+ eval x=\"$x\"
|
|
16080 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16081 |
+ prefix="$acl_save_prefix"
|
|
16082 |
+
|
|
16083 |
+ case "$x" in
|
|
16084 |
+ -L*)
|
|
16085 |
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
|
|
16086 |
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
|
|
16087 |
+ found_dir="$dir"
|
|
16088 |
+ found_so="$dir/lib$name.$shlibext"
|
|
16089 |
+ if test -f "$dir/lib$name.la"; then
|
|
16090 |
+ found_la="$dir/lib$name.la"
|
|
16091 |
+ fi
|
|
16092 |
+ else
|
|
16093 |
+ if test -f "$dir/lib$name.$libext"; then
|
|
16094 |
+ found_dir="$dir"
|
|
16095 |
+ found_a="$dir/lib$name.$libext"
|
|
16096 |
+ if test -f "$dir/lib$name.la"; then
|
|
16097 |
+ found_la="$dir/lib$name.la"
|
|
16098 |
+ fi
|
|
16099 |
+ fi
|
|
16100 |
+ fi
|
|
16101 |
+ ;;
|
|
16102 |
+ esac
|
|
16103 |
+ if test "X$found_dir" != "X"; then
|
|
16104 |
+ break
|
|
16105 |
+ fi
|
|
16106 |
+ done
|
|
16107 |
+ fi
|
|
16108 |
+ if test "X$found_dir" != "X"; then
|
|
16109 |
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
|
|
16110 |
+ if test "X$found_so" != "X"; then
|
|
16111 |
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
|
|
16112 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
|
16113 |
+ else
|
|
16114 |
+ haveit=
|
|
16115 |
+ for x in $ltrpathdirs; do
|
|
16116 |
+ if test "X$x" = "X$found_dir"; then
|
|
16117 |
+ haveit=yes
|
|
16118 |
+ break
|
|
16119 |
+ fi
|
|
16120 |
+ done
|
|
16121 |
+ if test -z "$haveit"; then
|
|
16122 |
+ ltrpathdirs="$ltrpathdirs $found_dir"
|
|
16123 |
+ fi
|
|
16124 |
+ if test "$hardcode_direct" = yes; then
|
|
16125 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
|
16126 |
+ else
|
|
16127 |
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
|
16128 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
|
16129 |
+ haveit=
|
|
16130 |
+ for x in $rpathdirs; do
|
|
16131 |
+ if test "X$x" = "X$found_dir"; then
|
|
16132 |
+ haveit=yes
|
|
16133 |
+ break
|
|
16134 |
+ fi
|
|
16135 |
+ done
|
|
16136 |
+ if test -z "$haveit"; then
|
|
16137 |
+ rpathdirs="$rpathdirs $found_dir"
|
|
16138 |
+ fi
|
|
16139 |
+ else
|
|
16140 |
+ haveit=
|
|
16141 |
+ for x in $LDFLAGS $LIBINTL; do
|
|
16142 |
+
|
|
16143 |
+ acl_save_prefix="$prefix"
|
|
16144 |
+ prefix="$acl_final_prefix"
|
|
16145 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
16146 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
16147 |
+ eval x=\"$x\"
|
|
16148 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16149 |
+ prefix="$acl_save_prefix"
|
|
16150 |
+
|
|
16151 |
+ if test "X$x" = "X-L$found_dir"; then
|
|
16152 |
+ haveit=yes
|
|
16153 |
+ break
|
|
16154 |
+ fi
|
|
16155 |
+ done
|
|
16156 |
+ if test -z "$haveit"; then
|
|
16157 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
|
|
16158 |
+ fi
|
|
16159 |
+ if test "$hardcode_minus_L" != no; then
|
|
16160 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
|
|
16161 |
+ else
|
|
16162 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
|
|
16163 |
+ fi
|
|
16164 |
+ fi
|
|
16165 |
+ fi
|
|
16166 |
+ fi
|
|
16167 |
+ else
|
|
16168 |
+ if test "X$found_a" != "X"; then
|
|
16169 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
|
|
16170 |
+ else
|
|
16171 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
|
|
16172 |
+ fi
|
|
16173 |
+ fi
|
|
16174 |
+ additional_includedir=
|
|
16175 |
+ case "$found_dir" in
|
|
16176 |
+ */lib | */lib/)
|
|
16177 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
|
|
16178 |
+ additional_includedir="$basedir/include"
|
|
16179 |
+ ;;
|
|
16180 |
+ esac
|
|
16181 |
+ if test "X$additional_includedir" != "X"; then
|
|
16182 |
+ if test "X$additional_includedir" != "X/usr/include"; then
|
|
16183 |
+ haveit=
|
|
16184 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
16185 |
+ if test -n "$GCC"; then
|
|
16186 |
+ case $host_os in
|
|
16187 |
+ linux*) haveit=yes;;
|
|
16188 |
+ esac
|
|
16189 |
+ fi
|
|
16190 |
+ fi
|
|
16191 |
+ if test -z "$haveit"; then
|
|
16192 |
+ for x in $CPPFLAGS $INCINTL; do
|
|
16193 |
+
|
|
16194 |
+ acl_save_prefix="$prefix"
|
|
16195 |
+ prefix="$acl_final_prefix"
|
|
16196 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
16197 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
16198 |
+ eval x=\"$x\"
|
|
16199 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16200 |
+ prefix="$acl_save_prefix"
|
|
16201 |
+
|
|
16202 |
+ if test "X$x" = "X-I$additional_includedir"; then
|
|
16203 |
+ haveit=yes
|
|
16204 |
+ break
|
|
16205 |
+ fi
|
|
16206 |
+ done
|
|
16207 |
+ if test -z "$haveit"; then
|
|
16208 |
+ if test -d "$additional_includedir"; then
|
|
16209 |
+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
|
|
16210 |
+ fi
|
|
16211 |
+ fi
|
|
16212 |
+ fi
|
|
16213 |
+ fi
|
|
16214 |
+ fi
|
|
16215 |
+ if test -n "$found_la"; then
|
|
16216 |
+ save_libdir="$libdir"
|
|
16217 |
+ case "$found_la" in
|
|
16218 |
+ */* | *\\*) . "$found_la" ;;
|
|
16219 |
+ *) . "./$found_la" ;;
|
|
16220 |
+ esac
|
|
16221 |
+ libdir="$save_libdir"
|
|
16222 |
+ for dep in $dependency_libs; do
|
|
16223 |
+ case "$dep" in
|
|
16224 |
+ -L*)
|
|
16225 |
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
|
16226 |
+ if test "X$additional_libdir" != "X/usr/lib"; then
|
|
16227 |
+ haveit=
|
|
16228 |
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
16229 |
+ if test -n "$GCC"; then
|
|
16230 |
+ case $host_os in
|
|
16231 |
+ linux*) haveit=yes;;
|
|
16232 |
+ esac
|
|
16233 |
+ fi
|
|
16234 |
+ fi
|
|
16235 |
+ if test -z "$haveit"; then
|
|
16236 |
+ haveit=
|
|
16237 |
+ for x in $LDFLAGS $LIBINTL; do
|
|
16238 |
+
|
|
16239 |
+ acl_save_prefix="$prefix"
|
|
16240 |
+ prefix="$acl_final_prefix"
|
|
16241 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
16242 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
16243 |
+ eval x=\"$x\"
|
|
16244 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16245 |
+ prefix="$acl_save_prefix"
|
|
16246 |
+
|
|
16247 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
16248 |
+ haveit=yes
|
|
16249 |
+ break
|
|
16250 |
+ fi
|
|
16251 |
+ done
|
|
16252 |
+ if test -z "$haveit"; then
|
|
16253 |
+ if test -d "$additional_libdir"; then
|
|
16254 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
|
|
16255 |
+ fi
|
|
16256 |
+ fi
|
|
16257 |
+ haveit=
|
|
16258 |
+ for x in $LDFLAGS $LTLIBINTL; do
|
|
16259 |
+
|
|
16260 |
+ acl_save_prefix="$prefix"
|
|
16261 |
+ prefix="$acl_final_prefix"
|
|
16262 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
16263 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
16264 |
+ eval x=\"$x\"
|
|
16265 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16266 |
+ prefix="$acl_save_prefix"
|
|
16267 |
+
|
|
16268 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
16269 |
+ haveit=yes
|
|
16270 |
+ break
|
|
16271 |
+ fi
|
|
16272 |
+ done
|
|
16273 |
+ if test -z "$haveit"; then
|
|
16274 |
+ if test -d "$additional_libdir"; then
|
|
16275 |
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
|
|
16276 |
+ fi
|
|
16277 |
+ fi
|
|
16278 |
+ fi
|
|
16279 |
+ fi
|
|
16280 |
+ ;;
|
|
16281 |
+ -R*)
|
|
16282 |
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
|
16283 |
+ if test "$enable_rpath" != no; then
|
|
16284 |
+ haveit=
|
|
16285 |
+ for x in $rpathdirs; do
|
|
16286 |
+ if test "X$x" = "X$dir"; then
|
|
16287 |
+ haveit=yes
|
|
16288 |
+ break
|
|
16289 |
+ fi
|
|
16290 |
+ done
|
|
16291 |
+ if test -z "$haveit"; then
|
|
16292 |
+ rpathdirs="$rpathdirs $dir"
|
|
16293 |
+ fi
|
|
16294 |
+ haveit=
|
|
16295 |
+ for x in $ltrpathdirs; do
|
|
16296 |
+ if test "X$x" = "X$dir"; then
|
|
16297 |
+ haveit=yes
|
|
16298 |
+ break
|
|
16299 |
+ fi
|
|
16300 |
+ done
|
|
16301 |
+ if test -z "$haveit"; then
|
|
16302 |
+ ltrpathdirs="$ltrpathdirs $dir"
|
|
16303 |
+ fi
|
|
16304 |
+ fi
|
|
16305 |
+ ;;
|
|
16306 |
+ -l*)
|
|
16307 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
|
16308 |
+ ;;
|
|
16309 |
+ *.la)
|
|
16310 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
|
16311 |
+ ;;
|
|
16312 |
+ *)
|
|
16313 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
|
|
16314 |
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
|
|
16315 |
+ ;;
|
|
16316 |
+ esac
|
|
16317 |
+ done
|
|
16318 |
+ fi
|
|
16319 |
+ else
|
|
16320 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
|
|
16321 |
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
|
|
16322 |
+ fi
|
|
16323 |
+ fi
|
|
16324 |
+ fi
|
|
16325 |
+ done
|
|
16326 |
+ done
|
|
16327 |
+ if test "X$rpathdirs" != "X"; then
|
|
16328 |
+ if test -n "$hardcode_libdir_separator"; then
|
|
16329 |
+ alldirs=
|
|
16330 |
+ for found_dir in $rpathdirs; do
|
|
16331 |
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
|
16332 |
+ done
|
|
16333 |
+ acl_save_libdir="$libdir"
|
|
16334 |
+ libdir="$alldirs"
|
|
16335 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
16336 |
+ libdir="$acl_save_libdir"
|
|
16337 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
|
|
16338 |
+ else
|
|
16339 |
+ for found_dir in $rpathdirs; do
|
|
16340 |
+ acl_save_libdir="$libdir"
|
|
16341 |
+ libdir="$found_dir"
|
|
16342 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
16343 |
+ libdir="$acl_save_libdir"
|
|
16344 |
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
|
|
16345 |
+ done
|
|
16346 |
+ fi
|
|
16347 |
+ fi
|
|
16348 |
+ if test "X$ltrpathdirs" != "X"; then
|
|
16349 |
+ for found_dir in $ltrpathdirs; do
|
|
16350 |
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
|
|
16351 |
+ done
|
|
16352 |
+ fi
|
|
16353 |
+
|
|
16354 |
+ { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
|
|
16355 |
+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
|
|
16356 |
+if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
|
|
16357 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
16358 |
+else
|
|
16359 |
+ gt_save_CPPFLAGS="$CPPFLAGS"
|
|
16360 |
+ CPPFLAGS="$CPPFLAGS $INCINTL"
|
|
16361 |
+ gt_save_LIBS="$LIBS"
|
|
16362 |
+ LIBS="$LIBS $LIBINTL"
|
|
16363 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
16364 |
/* confdefs.h. */
|
|
16365 |
_ACEOF
|
|
16366 |
cat confdefs.h >>conftest.$ac_ext
|
|
16367 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
16368 |
/* end confdefs.h. */
|
|
16369 |
-$ac_declaration
|
|
16370 |
-#include <stdlib.h>
|
|
16371 |
+#include <libintl.h>
|
|
16372 |
+extern int _nl_msg_cat_cntr;
|
|
16373 |
+extern
|
|
16374 |
+#ifdef __cplusplus
|
|
16375 |
+"C"
|
|
16376 |
+#endif
|
|
16377 |
+const char *_nl_expand_alias ();
|
|
16378 |
int
|
|
16379 |
main ()
|
|
16380 |
{
|
|
16381 |
-exit (42);
|
|
16382 |
+bindtextdomain ("", "");
|
|
16383 |
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
|
|
16384 |
;
|
|
16385 |
return 0;
|
|
16386 |
}
|
|
16387 |
_ACEOF
|
|
16388 |
-rm -f conftest.$ac_objext
|
|
16389 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
16390 |
- (eval $ac_compile) 2>conftest.er1
|
|
16391 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
16392 |
+if { (ac_try="$ac_link"
|
|
16393 |
+case "(($ac_try" in
|
|
16394 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
16395 |
+ *) ac_try_echo=$ac_try;;
|
|
16396 |
+esac
|
|
16397 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
16398 |
+ (eval "$ac_link") 2>conftest.er1
|
|
16399 |
ac_status=$?
|
|
16400 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
16401 |
rm -f conftest.er1
|
|
16402 |
cat conftest.err >&5
|
|
16403 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16404 |
- (exit $ac_status); } &&
|
|
16405 |
- { ac_try='test -z "$ac_cxx_werror_flag"
|
|
16406 |
- || test ! -s conftest.err'
|
|
16407 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16408 |
- (eval $ac_try) 2>&5
|
|
16409 |
- ac_status=$?
|
|
16410 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16411 |
- (exit $ac_status); }; } &&
|
|
16412 |
- { ac_try='test -s conftest.$ac_objext'
|
|
16413 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16414 |
- (eval $ac_try) 2>&5
|
|
16415 |
- ac_status=$?
|
|
16416 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16417 |
- (exit $ac_status); }; }; then
|
|
16418 |
- :
|
|
16419 |
+ (exit $ac_status); } && {
|
|
16420 |
+ test -z "$ac_c_werror_flag" ||
|
|
16421 |
+ test ! -s conftest.err
|
|
16422 |
+ } && test -s conftest$ac_exeext &&
|
|
16423 |
+ $as_test_x conftest$ac_exeext; then
|
|
16424 |
+ gt_cv_func_gnugettext1_libintl=yes
|
|
16425 |
else
|
|
16426 |
echo "$as_me: failed program was:" >&5
|
|
16427 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
16428 |
|
|
16429 |
-continue
|
|
16430 |
+ gt_cv_func_gnugettext1_libintl=no
|
|
16431 |
fi
|
|
16432 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
16433 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
16434 |
+
|
|
16435 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
16436 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
16437 |
+ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
|
|
16438 |
+ LIBS="$LIBS $LIBICONV"
|
|
16439 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
16440 |
/* confdefs.h. */
|
|
16441 |
_ACEOF
|
|
16442 |
cat confdefs.h >>conftest.$ac_ext
|
|
16443 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
16444 |
/* end confdefs.h. */
|
|
16445 |
-$ac_declaration
|
|
16446 |
+#include <libintl.h>
|
|
16447 |
+extern int _nl_msg_cat_cntr;
|
|
16448 |
+extern
|
|
16449 |
+#ifdef __cplusplus
|
|
16450 |
+"C"
|
|
16451 |
+#endif
|
|
16452 |
+const char *_nl_expand_alias ();
|
|
16453 |
int
|
|
16454 |
main ()
|
|
16455 |
{
|
|
16456 |
-exit (42);
|
|
16457 |
+bindtextdomain ("", "");
|
|
16458 |
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
|
|
16459 |
;
|
|
16460 |
return 0;
|
|
16461 |
}
|
|
16462 |
_ACEOF
|
|
16463 |
-rm -f conftest.$ac_objext
|
|
16464 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
16465 |
- (eval $ac_compile) 2>conftest.er1
|
|
16466 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
16467 |
+if { (ac_try="$ac_link"
|
|
16468 |
+case "(($ac_try" in
|
|
16469 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
16470 |
+ *) ac_try_echo=$ac_try;;
|
|
16471 |
+esac
|
|
16472 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
16473 |
+ (eval "$ac_link") 2>conftest.er1
|
|
16474 |
ac_status=$?
|
|
16475 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
16476 |
rm -f conftest.er1
|
|
16477 |
cat conftest.err >&5
|
|
16478 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16479 |
- (exit $ac_status); } &&
|
|
16480 |
- { ac_try='test -z "$ac_cxx_werror_flag"
|
|
16481 |
- || test ! -s conftest.err'
|
|
16482 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16483 |
- (eval $ac_try) 2>&5
|
|
16484 |
- ac_status=$?
|
|
16485 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16486 |
- (exit $ac_status); }; } &&
|
|
16487 |
- { ac_try='test -s conftest.$ac_objext'
|
|
16488 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16489 |
- (eval $ac_try) 2>&5
|
|
16490 |
- ac_status=$?
|
|
16491 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16492 |
- (exit $ac_status); }; }; then
|
|
16493 |
- break
|
|
16494 |
+ (exit $ac_status); } && {
|
|
16495 |
+ test -z "$ac_c_werror_flag" ||
|
|
16496 |
+ test ! -s conftest.err
|
|
16497 |
+ } && test -s conftest$ac_exeext &&
|
|
16498 |
+ $as_test_x conftest$ac_exeext; then
|
|
16499 |
+ LIBINTL="$LIBINTL $LIBICONV"
|
|
16500 |
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
|
16501 |
+ gt_cv_func_gnugettext1_libintl=yes
|
|
16502 |
+
|
|
16503 |
else
|
|
16504 |
echo "$as_me: failed program was:" >&5
|
|
16505 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
16506 |
|
|
16507 |
-fi
|
|
16508 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
16509 |
-done
|
|
16510 |
-rm -f conftest*
|
|
16511 |
-if test -n "$ac_declaration"; then
|
|
16512 |
- echo '#ifdef __cplusplus' >>confdefs.h
|
|
16513 |
- echo $ac_declaration >>confdefs.h
|
|
16514 |
- echo '#endif' >>confdefs.h
|
|
16515 |
+
|
|
16516 |
fi
|
|
16517 |
|
|
16518 |
-ac_ext=c
|
|
16519 |
-ac_cpp='$CPP $CPPFLAGS'
|
|
16520 |
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
16521 |
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
16522 |
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
16523 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
16524 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
16525 |
+ fi
|
|
16526 |
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
16527 |
+ LIBS="$gt_save_LIBS"
|
|
16528 |
+fi
|
|
16529 |
+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
|
|
16530 |
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
|
|
16531 |
+ fi
|
|
16532 |
+
|
|
16533 |
+ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
|
|
16534 |
+ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
|
|
16535 |
+ && test "$PACKAGE" != gettext; }; then
|
|
16536 |
+ gt_use_preinstalled_gnugettext=yes
|
|
16537 |
+ else
|
|
16538 |
+ LIBINTL=
|
|
16539 |
+ LTLIBINTL=
|
|
16540 |
+ INCINTL=
|
|
16541 |
+ fi
|
|
16542 |
|
|
16543 |
-depcc="$CXX" am_compiler_list=
|
|
16544 |
|
|
16545 |
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
16546 |
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
|
|
16547 |
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
|
|
16548 |
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
16549 |
-else
|
|
16550 |
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
16551 |
- # We make a subdir and do the tests there. Otherwise we can end up
|
|
16552 |
- # making bogus files that we don't know about and never remove. For
|
|
16553 |
- # instance it was reported that on HP-UX the gcc test will end up
|
|
16554 |
- # making a dummy file named `D' -- because `-MD' means `put the output
|
|
16555 |
- # in D'.
|
|
16556 |
- mkdir conftest.dir
|
|
16557 |
- # Copy depcomp to subdir because otherwise we won't find it if we're
|
|
16558 |
- # using a relative directory.
|
|
16559 |
- cp "$am_depcomp" conftest.dir
|
|
16560 |
- cd conftest.dir
|
|
16561 |
- # We will build objects and dependencies in a subdirectory because
|
|
16562 |
- # it helps to detect inapplicable dependency modes. For instance
|
|
16563 |
- # both Tru64's cc and ICC support -MD to output dependencies as a
|
|
16564 |
- # side effect of compilation, but ICC will put the dependencies in
|
|
16565 |
- # the current directory while Tru64 will put them in the object
|
|
16566 |
- # directory.
|
|
16567 |
- mkdir sub
|
|
16568 |
|
|
16569 |
- am_cv_CXX_dependencies_compiler_type=none
|
|
16570 |
- if test "$am_compiler_list" = ""; then
|
|
16571 |
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
|
|
16572 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
16573 |
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
16574 |
+
|
|
16575 |
+cat >>confdefs.h <<\_ACEOF
|
|
16576 |
+#define ENABLE_NLS 1
|
|
16577 |
+_ACEOF
|
|
16578 |
+
|
|
16579 |
+ else
|
|
16580 |
+ USE_NLS=no
|
|
16581 |
+ fi
|
|
16582 |
fi
|
|
16583 |
- for depmode in $am_compiler_list; do
|
|
16584 |
- # Setup a source with many dependencies, because some compilers
|
|
16585 |
- # like to wrap large dependency lists on column 80 (with \), and
|
|
16586 |
- # we should not choose a depcomp mode which is confused by this.
|
|
16587 |
- #
|
|
16588 |
- # We need to recreate these files for each test, as the compiler may
|
|
16589 |
- # overwrite some of them when testing with obscure command lines.
|
|
16590 |
- # This happens at least with the AIX C compiler.
|
|
16591 |
- : > sub/conftest.c
|
|
16592 |
- for i in 1 2 3 4 5 6; do
|
|
16593 |
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
|
16594 |
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
|
16595 |
- # Solaris 8's {/usr,}/bin/sh.
|
|
16596 |
- touch sub/conftst$i.h
|
|
16597 |
- done
|
|
16598 |
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
16599 |
|
|
16600 |
- case $depmode in
|
|
16601 |
- nosideeffect)
|
|
16602 |
- # after this tag, mechanisms are not by side-effect, so they'll
|
|
16603 |
- # only be used when explicitly requested
|
|
16604 |
- if test "x$enable_dependency_tracking" = xyes; then
|
|
16605 |
- continue
|
|
16606 |
- else
|
|
16607 |
- break
|
|
16608 |
- fi
|
|
16609 |
- ;;
|
|
16610 |
- none) break ;;
|
|
16611 |
- esac
|
|
16612 |
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
|
16613 |
- # mode. It turns out that the SunPro C++ compiler does not properly
|
|
16614 |
- # handle `-M -o', and we need to detect this.
|
|
16615 |
- if depmode=$depmode \
|
|
16616 |
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
|
16617 |
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
|
16618 |
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
|
16619 |
- >/dev/null 2>conftest.err &&
|
|
16620 |
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
|
16621 |
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
|
16622 |
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
|
16623 |
- # icc doesn't choke on unknown options, it will just issue warnings
|
|
16624 |
- # or remarks (even with -Werror). So we grep stderr for any message
|
|
16625 |
- # that says an option was ignored or not supported.
|
|
16626 |
- # When given -MP, icc 7.0 and 7.1 complain thusly:
|
|
16627 |
- # icc: Command line warning: ignoring option '-M'; no argument required
|
|
16628 |
- # The diagnosis changed in icc 8.0:
|
|
16629 |
- # icc: Command line remark: option '-MP' not supported
|
|
16630 |
- if (grep 'ignoring option' conftest.err ||
|
|
16631 |
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
|
16632 |
- am_cv_CXX_dependencies_compiler_type=$depmode
|
|
16633 |
+ if test "$USE_NLS" = "yes"; then
|
|
16634 |
+
|
|
16635 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
|
16636 |
+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
|
|
16637 |
+ { echo "$as_me:$LINENO: checking how to link with libintl" >&5
|
|
16638 |
+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
|
|
16639 |
+ { echo "$as_me:$LINENO: result: $LIBINTL" >&5
|
|
16640 |
+echo "${ECHO_T}$LIBINTL" >&6; }
|
|
16641 |
+
|
|
16642 |
+ for element in $INCINTL; do
|
|
16643 |
+ haveit=
|
|
16644 |
+ for x in $CPPFLAGS; do
|
|
16645 |
+
|
|
16646 |
+ acl_save_prefix="$prefix"
|
|
16647 |
+ prefix="$acl_final_prefix"
|
|
16648 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
16649 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
16650 |
+ eval x=\"$x\"
|
|
16651 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
16652 |
+ prefix="$acl_save_prefix"
|
|
16653 |
+
|
|
16654 |
+ if test "X$x" = "X$element"; then
|
|
16655 |
+ haveit=yes
|
|
16656 |
break
|
|
16657 |
fi
|
|
16658 |
+ done
|
|
16659 |
+ if test -z "$haveit"; then
|
|
16660 |
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
|
|
16661 |
fi
|
|
16662 |
done
|
|
16663 |
|
|
16664 |
- cd ..
|
|
16665 |
- rm -rf conftest.dir
|
|
16666 |
-else
|
|
16667 |
- am_cv_CXX_dependencies_compiler_type=none
|
|
16668 |
-fi
|
|
16669 |
+ fi
|
|
16670 |
|
|
16671 |
-fi
|
|
16672 |
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
|
|
16673 |
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
|
|
16674 |
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
|
|
16675 |
|
|
16676 |
+cat >>confdefs.h <<\_ACEOF
|
|
16677 |
+#define HAVE_GETTEXT 1
|
|
16678 |
+_ACEOF
|
|
16679 |
|
|
16680 |
|
|
16681 |
-if
|
|
16682 |
- test "x$enable_dependency_tracking" != xno \
|
|
16683 |
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
|
|
16684 |
- am__fastdepCXX_TRUE=
|
|
16685 |
- am__fastdepCXX_FALSE='#'
|
|
16686 |
+cat >>confdefs.h <<\_ACEOF
|
|
16687 |
+#define HAVE_DCGETTEXT 1
|
|
16688 |
+_ACEOF
|
|
16689 |
+
|
|
16690 |
+ fi
|
|
16691 |
+
|
|
16692 |
+ POSUB=po
|
|
16693 |
+ fi
|
|
16694 |
+
|
|
16695 |
+
|
|
16696 |
+
|
|
16697 |
+ INTLLIBS="$LIBINTL"
|
|
16698 |
+
|
|
16699 |
+
|
|
16700 |
+
|
|
16701 |
+
|
|
16702 |
+
|
|
16703 |
+
|
|
16704 |
+LDFLAGS="$LDFLAGS $INTLLIBS"
|
|
16705 |
+{ echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
|
|
16706 |
+echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6; }
|
|
16707 |
+if test "${ac_cv_lib_iconv_iconv+set}" = set; then
|
|
16708 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
16709 |
else
|
|
16710 |
- am__fastdepCXX_TRUE='#'
|
|
16711 |
- am__fastdepCXX_FALSE=
|
|
16712 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
16713 |
+LIBS="-liconv $LIBS"
|
|
16714 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
16715 |
+/* confdefs.h. */
|
|
16716 |
+_ACEOF
|
|
16717 |
+cat confdefs.h >>conftest.$ac_ext
|
|
16718 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
16719 |
+/* end confdefs.h. */
|
|
16720 |
+
|
|
16721 |
+/* Override any GCC internal prototype to avoid an error.
|
|
16722 |
+ Use char because int might match the return type of a GCC
|
|
16723 |
+ builtin and then its argument prototype would still apply. */
|
|
16724 |
+#ifdef __cplusplus
|
|
16725 |
+extern "C"
|
|
16726 |
+#endif
|
|
16727 |
+char iconv ();
|
|
16728 |
+int
|
|
16729 |
+main ()
|
|
16730 |
+{
|
|
16731 |
+return iconv ();
|
|
16732 |
+ ;
|
|
16733 |
+ return 0;
|
|
16734 |
+}
|
|
16735 |
+_ACEOF
|
|
16736 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
16737 |
+if { (ac_try="$ac_link"
|
|
16738 |
+case "(($ac_try" in
|
|
16739 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
16740 |
+ *) ac_try_echo=$ac_try;;
|
|
16741 |
+esac
|
|
16742 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
16743 |
+ (eval "$ac_link") 2>conftest.er1
|
|
16744 |
+ ac_status=$?
|
|
16745 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
16746 |
+ rm -f conftest.er1
|
|
16747 |
+ cat conftest.err >&5
|
|
16748 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16749 |
+ (exit $ac_status); } && {
|
|
16750 |
+ test -z "$ac_c_werror_flag" ||
|
|
16751 |
+ test ! -s conftest.err
|
|
16752 |
+ } && test -s conftest$ac_exeext &&
|
|
16753 |
+ $as_test_x conftest$ac_exeext; then
|
|
16754 |
+ ac_cv_lib_iconv_iconv=yes
|
|
16755 |
+else
|
|
16756 |
+ echo "$as_me: failed program was:" >&5
|
|
16757 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
16758 |
+
|
|
16759 |
+ ac_cv_lib_iconv_iconv=no
|
|
16760 |
+fi
|
|
16761 |
+
|
|
16762 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
16763 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
16764 |
+LIBS=$ac_check_lib_save_LIBS
|
|
16765 |
+fi
|
|
16766 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
|
|
16767 |
+echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6; }
|
|
16768 |
+if test $ac_cv_lib_iconv_iconv = yes; then
|
|
16769 |
+ haslibiconv=yes
|
|
16770 |
+else
|
|
16771 |
+ haslibiconv=no
|
|
16772 |
fi
|
|
16773 |
|
|
16774 |
+if test "x$haslibiconv" = "xyes"; then
|
|
16775 |
+ LDFLAGS="$LDFLAGS $LIBICONV"
|
|
16776 |
+fi
|
|
16777 |
+localedir='${prefix}/share/locale'
|
|
16778 |
|
|
16779 |
|
|
16780 |
if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
|
|
16781 |
@@ -4701,13 +6133,12 @@ if test "`$CPP -v < /dev/null 2>&1 | gre
|
|
16782 |
fi
|
|
16783 |
|
|
16784 |
|
|
16785 |
-
|
|
16786 |
for ac_func in gethostbyname
|
|
16787 |
do
|
|
16788 |
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
16789 |
-echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
16790 |
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
|
16791 |
-if eval "test \"\${$as_ac_var+set}\" = set"; then
|
|
16792 |
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
16793 |
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
16794 |
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
16795 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
16796 |
else
|
|
16797 |
cat >conftest.$ac_ext <<_ACEOF
|
|
16798 |
@@ -4733,68 +6164,60 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
16799 |
|
|
16800 |
#undef $ac_func
|
|
16801 |
|
|
16802 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
16803 |
+/* Override any GCC internal prototype to avoid an error.
|
|
16804 |
+ Use char because int might match the return type of a GCC
|
|
16805 |
+ builtin and then its argument prototype would still apply. */
|
|
16806 |
#ifdef __cplusplus
|
|
16807 |
extern "C"
|
|
16808 |
-{
|
|
16809 |
#endif
|
|
16810 |
-/* We use char because int might match the return type of a gcc2
|
|
16811 |
- builtin and then its argument prototype would still apply. */
|
|
16812 |
char $ac_func ();
|
|
16813 |
/* The GNU C library defines this for functions which it implements
|
|
16814 |
to always fail with ENOSYS. Some functions are actually named
|
|
16815 |
something starting with __ and the normal name is an alias. */
|
|
16816 |
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
16817 |
+#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
16818 |
choke me
|
|
16819 |
-#else
|
|
16820 |
-char (*f) () = $ac_func;
|
|
16821 |
-#endif
|
|
16822 |
-#ifdef __cplusplus
|
|
16823 |
-}
|
|
16824 |
#endif
|
|
16825 |
|
|
16826 |
int
|
|
16827 |
main ()
|
|
16828 |
{
|
|
16829 |
-return f != $ac_func;
|
|
16830 |
+return $ac_func ();
|
|
16831 |
;
|
|
16832 |
return 0;
|
|
16833 |
}
|
|
16834 |
_ACEOF
|
|
16835 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
16836 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
16837 |
- (eval $ac_link) 2>conftest.er1
|
|
16838 |
+if { (ac_try="$ac_link"
|
|
16839 |
+case "(($ac_try" in
|
|
16840 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
16841 |
+ *) ac_try_echo=$ac_try;;
|
|
16842 |
+esac
|
|
16843 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
16844 |
+ (eval "$ac_link") 2>conftest.er1
|
|
16845 |
ac_status=$?
|
|
16846 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
16847 |
rm -f conftest.er1
|
|
16848 |
cat conftest.err >&5
|
|
16849 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16850 |
- (exit $ac_status); } &&
|
|
16851 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
16852 |
- || test ! -s conftest.err'
|
|
16853 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16854 |
- (eval $ac_try) 2>&5
|
|
16855 |
- ac_status=$?
|
|
16856 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16857 |
- (exit $ac_status); }; } &&
|
|
16858 |
- { ac_try='test -s conftest$ac_exeext'
|
|
16859 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16860 |
- (eval $ac_try) 2>&5
|
|
16861 |
- ac_status=$?
|
|
16862 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16863 |
- (exit $ac_status); }; }; then
|
|
16864 |
+ (exit $ac_status); } && {
|
|
16865 |
+ test -z "$ac_c_werror_flag" ||
|
|
16866 |
+ test ! -s conftest.err
|
|
16867 |
+ } && test -s conftest$ac_exeext &&
|
|
16868 |
+ $as_test_x conftest$ac_exeext; then
|
|
16869 |
eval "$as_ac_var=yes"
|
|
16870 |
else
|
|
16871 |
echo "$as_me: failed program was:" >&5
|
|
16872 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
16873 |
|
|
16874 |
-eval "$as_ac_var=no"
|
|
16875 |
+ eval "$as_ac_var=no"
|
|
16876 |
fi
|
|
16877 |
-rm -f conftest.err conftest.$ac_objext \
|
|
16878 |
+
|
|
16879 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
16880 |
conftest$ac_exeext conftest.$ac_ext
|
|
16881 |
fi
|
|
16882 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
|
16883 |
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
|
16884 |
+ac_res=`eval echo '${'$as_ac_var'}'`
|
|
16885 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
16886 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
16887 |
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
16888 |
cat >>confdefs.h <<_ACEOF
|
|
16889 |
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
16890 |
@@ -4802,8 +6225,8 @@ _ACEOF
|
|
16891 |
|
|
16892 |
else
|
|
16893 |
|
|
16894 |
-echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
|
|
16895 |
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
|
|
16896 |
+{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
|
|
16897 |
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
|
|
16898 |
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
|
|
16899 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
16900 |
else
|
|
16901 |
@@ -4816,56 +6239,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
16902 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
16903 |
/* end confdefs.h. */
|
|
16904 |
|
|
16905 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
16906 |
+/* Override any GCC internal prototype to avoid an error.
|
|
16907 |
+ Use char because int might match the return type of a GCC
|
|
16908 |
+ builtin and then its argument prototype would still apply. */
|
|
16909 |
#ifdef __cplusplus
|
|
16910 |
extern "C"
|
|
16911 |
#endif
|
|
16912 |
-/* We use char because int might match the return type of a gcc2
|
|
16913 |
- builtin and then its argument prototype would still apply. */
|
|
16914 |
char gethostbyname ();
|
|
16915 |
int
|
|
16916 |
main ()
|
|
16917 |
{
|
|
16918 |
-gethostbyname ();
|
|
16919 |
+return gethostbyname ();
|
|
16920 |
;
|
|
16921 |
return 0;
|
|
16922 |
}
|
|
16923 |
_ACEOF
|
|
16924 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
16925 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
16926 |
- (eval $ac_link) 2>conftest.er1
|
|
16927 |
+if { (ac_try="$ac_link"
|
|
16928 |
+case "(($ac_try" in
|
|
16929 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
16930 |
+ *) ac_try_echo=$ac_try;;
|
|
16931 |
+esac
|
|
16932 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
16933 |
+ (eval "$ac_link") 2>conftest.er1
|
|
16934 |
ac_status=$?
|
|
16935 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
16936 |
rm -f conftest.er1
|
|
16937 |
cat conftest.err >&5
|
|
16938 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16939 |
- (exit $ac_status); } &&
|
|
16940 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
16941 |
- || test ! -s conftest.err'
|
|
16942 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16943 |
- (eval $ac_try) 2>&5
|
|
16944 |
- ac_status=$?
|
|
16945 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16946 |
- (exit $ac_status); }; } &&
|
|
16947 |
- { ac_try='test -s conftest$ac_exeext'
|
|
16948 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
16949 |
- (eval $ac_try) 2>&5
|
|
16950 |
- ac_status=$?
|
|
16951 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
16952 |
- (exit $ac_status); }; }; then
|
|
16953 |
+ (exit $ac_status); } && {
|
|
16954 |
+ test -z "$ac_c_werror_flag" ||
|
|
16955 |
+ test ! -s conftest.err
|
|
16956 |
+ } && test -s conftest$ac_exeext &&
|
|
16957 |
+ $as_test_x conftest$ac_exeext; then
|
|
16958 |
ac_cv_lib_nsl_gethostbyname=yes
|
|
16959 |
else
|
|
16960 |
echo "$as_me: failed program was:" >&5
|
|
16961 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
16962 |
|
|
16963 |
-ac_cv_lib_nsl_gethostbyname=no
|
|
16964 |
+ ac_cv_lib_nsl_gethostbyname=no
|
|
16965 |
fi
|
|
16966 |
-rm -f conftest.err conftest.$ac_objext \
|
|
16967 |
+
|
|
16968 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
16969 |
conftest$ac_exeext conftest.$ac_ext
|
|
16970 |
LIBS=$ac_check_lib_save_LIBS
|
|
16971 |
fi
|
|
16972 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
16973 |
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
|
|
16974 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
|
16975 |
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
|
|
16976 |
if test $ac_cv_lib_nsl_gethostbyname = yes; then
|
|
16977 |
cat >>confdefs.h <<_ACEOF
|
|
16978 |
#define HAVE_LIBNSL 1
|
|
16979 |
@@ -4875,8 +6295,8 @@ _ACEOF
|
|
16980 |
|
|
16981 |
else
|
|
16982 |
|
|
16983 |
-echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5
|
|
16984 |
-echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6
|
|
16985 |
+{ echo "$as_me:$LINENO: checking for gethostbyname in -lsocket" >&5
|
|
16986 |
+echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6; }
|
|
16987 |
if test "${ac_cv_lib_socket_gethostbyname+set}" = set; then
|
|
16988 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
16989 |
else
|
|
16990 |
@@ -4889,56 +6309,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
16991 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
16992 |
/* end confdefs.h. */
|
|
16993 |
|
|
16994 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
16995 |
+/* Override any GCC internal prototype to avoid an error.
|
|
16996 |
+ Use char because int might match the return type of a GCC
|
|
16997 |
+ builtin and then its argument prototype would still apply. */
|
|
16998 |
#ifdef __cplusplus
|
|
16999 |
extern "C"
|
|
17000 |
#endif
|
|
17001 |
-/* We use char because int might match the return type of a gcc2
|
|
17002 |
- builtin and then its argument prototype would still apply. */
|
|
17003 |
char gethostbyname ();
|
|
17004 |
int
|
|
17005 |
main ()
|
|
17006 |
{
|
|
17007 |
-gethostbyname ();
|
|
17008 |
+return gethostbyname ();
|
|
17009 |
;
|
|
17010 |
return 0;
|
|
17011 |
}
|
|
17012 |
_ACEOF
|
|
17013 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
17014 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17015 |
- (eval $ac_link) 2>conftest.er1
|
|
17016 |
+if { (ac_try="$ac_link"
|
|
17017 |
+case "(($ac_try" in
|
|
17018 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17019 |
+ *) ac_try_echo=$ac_try;;
|
|
17020 |
+esac
|
|
17021 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17022 |
+ (eval "$ac_link") 2>conftest.er1
|
|
17023 |
ac_status=$?
|
|
17024 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17025 |
rm -f conftest.er1
|
|
17026 |
cat conftest.err >&5
|
|
17027 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17028 |
- (exit $ac_status); } &&
|
|
17029 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17030 |
- || test ! -s conftest.err'
|
|
17031 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17032 |
- (eval $ac_try) 2>&5
|
|
17033 |
- ac_status=$?
|
|
17034 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17035 |
- (exit $ac_status); }; } &&
|
|
17036 |
- { ac_try='test -s conftest$ac_exeext'
|
|
17037 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17038 |
- (eval $ac_try) 2>&5
|
|
17039 |
- ac_status=$?
|
|
17040 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17041 |
- (exit $ac_status); }; }; then
|
|
17042 |
+ (exit $ac_status); } && {
|
|
17043 |
+ test -z "$ac_c_werror_flag" ||
|
|
17044 |
+ test ! -s conftest.err
|
|
17045 |
+ } && test -s conftest$ac_exeext &&
|
|
17046 |
+ $as_test_x conftest$ac_exeext; then
|
|
17047 |
ac_cv_lib_socket_gethostbyname=yes
|
|
17048 |
else
|
|
17049 |
echo "$as_me: failed program was:" >&5
|
|
17050 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17051 |
|
|
17052 |
-ac_cv_lib_socket_gethostbyname=no
|
|
17053 |
+ ac_cv_lib_socket_gethostbyname=no
|
|
17054 |
fi
|
|
17055 |
-rm -f conftest.err conftest.$ac_objext \
|
|
17056 |
+
|
|
17057 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
17058 |
conftest$ac_exeext conftest.$ac_ext
|
|
17059 |
LIBS=$ac_check_lib_save_LIBS
|
|
17060 |
fi
|
|
17061 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gethostbyname" >&5
|
|
17062 |
-echo "${ECHO_T}$ac_cv_lib_socket_gethostbyname" >&6
|
|
17063 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gethostbyname" >&5
|
|
17064 |
+echo "${ECHO_T}$ac_cv_lib_socket_gethostbyname" >&6; }
|
|
17065 |
if test $ac_cv_lib_socket_gethostbyname = yes; then
|
|
17066 |
cat >>confdefs.h <<_ACEOF
|
|
17067 |
#define HAVE_LIBSOCKET 1
|
|
17068 |
@@ -4957,9 +6374,9 @@ done
|
|
17069 |
for ac_func in setsockopt
|
|
17070 |
do
|
|
17071 |
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
17072 |
-echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
17073 |
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
|
17074 |
-if eval "test \"\${$as_ac_var+set}\" = set"; then
|
|
17075 |
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
17076 |
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
|
17077 |
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
17078 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17079 |
else
|
|
17080 |
cat >conftest.$ac_ext <<_ACEOF
|
|
17081 |
@@ -4985,68 +6402,60 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
17082 |
|
|
17083 |
#undef $ac_func
|
|
17084 |
|
|
17085 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
17086 |
+/* Override any GCC internal prototype to avoid an error.
|
|
17087 |
+ Use char because int might match the return type of a GCC
|
|
17088 |
+ builtin and then its argument prototype would still apply. */
|
|
17089 |
#ifdef __cplusplus
|
|
17090 |
extern "C"
|
|
17091 |
-{
|
|
17092 |
#endif
|
|
17093 |
-/* We use char because int might match the return type of a gcc2
|
|
17094 |
- builtin and then its argument prototype would still apply. */
|
|
17095 |
char $ac_func ();
|
|
17096 |
/* The GNU C library defines this for functions which it implements
|
|
17097 |
to always fail with ENOSYS. Some functions are actually named
|
|
17098 |
something starting with __ and the normal name is an alias. */
|
|
17099 |
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
17100 |
+#if defined __stub_$ac_func || defined __stub___$ac_func
|
|
17101 |
choke me
|
|
17102 |
-#else
|
|
17103 |
-char (*f) () = $ac_func;
|
|
17104 |
-#endif
|
|
17105 |
-#ifdef __cplusplus
|
|
17106 |
-}
|
|
17107 |
#endif
|
|
17108 |
|
|
17109 |
int
|
|
17110 |
main ()
|
|
17111 |
{
|
|
17112 |
-return f != $ac_func;
|
|
17113 |
+return $ac_func ();
|
|
17114 |
;
|
|
17115 |
return 0;
|
|
17116 |
}
|
|
17117 |
_ACEOF
|
|
17118 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
17119 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17120 |
- (eval $ac_link) 2>conftest.er1
|
|
17121 |
+if { (ac_try="$ac_link"
|
|
17122 |
+case "(($ac_try" in
|
|
17123 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17124 |
+ *) ac_try_echo=$ac_try;;
|
|
17125 |
+esac
|
|
17126 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17127 |
+ (eval "$ac_link") 2>conftest.er1
|
|
17128 |
ac_status=$?
|
|
17129 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17130 |
rm -f conftest.er1
|
|
17131 |
cat conftest.err >&5
|
|
17132 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17133 |
- (exit $ac_status); } &&
|
|
17134 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17135 |
- || test ! -s conftest.err'
|
|
17136 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17137 |
- (eval $ac_try) 2>&5
|
|
17138 |
- ac_status=$?
|
|
17139 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17140 |
- (exit $ac_status); }; } &&
|
|
17141 |
- { ac_try='test -s conftest$ac_exeext'
|
|
17142 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17143 |
- (eval $ac_try) 2>&5
|
|
17144 |
- ac_status=$?
|
|
17145 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17146 |
- (exit $ac_status); }; }; then
|
|
17147 |
+ (exit $ac_status); } && {
|
|
17148 |
+ test -z "$ac_c_werror_flag" ||
|
|
17149 |
+ test ! -s conftest.err
|
|
17150 |
+ } && test -s conftest$ac_exeext &&
|
|
17151 |
+ $as_test_x conftest$ac_exeext; then
|
|
17152 |
eval "$as_ac_var=yes"
|
|
17153 |
else
|
|
17154 |
echo "$as_me: failed program was:" >&5
|
|
17155 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17156 |
|
|
17157 |
-eval "$as_ac_var=no"
|
|
17158 |
+ eval "$as_ac_var=no"
|
|
17159 |
fi
|
|
17160 |
-rm -f conftest.err conftest.$ac_objext \
|
|
17161 |
+
|
|
17162 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
17163 |
conftest$ac_exeext conftest.$ac_ext
|
|
17164 |
fi
|
|
17165 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
|
17166 |
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
|
17167 |
+ac_res=`eval echo '${'$as_ac_var'}'`
|
|
17168 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
17169 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
17170 |
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
|
17171 |
cat >>confdefs.h <<_ACEOF
|
|
17172 |
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
17173 |
@@ -5054,8 +6463,8 @@ _ACEOF
|
|
17174 |
|
|
17175 |
else
|
|
17176 |
|
|
17177 |
-echo "$as_me:$LINENO: checking for setsockopt in -lsocket" >&5
|
|
17178 |
-echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
|
|
17179 |
+{ echo "$as_me:$LINENO: checking for setsockopt in -lsocket" >&5
|
|
17180 |
+echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6; }
|
|
17181 |
if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
|
|
17182 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17183 |
else
|
|
17184 |
@@ -5068,56 +6477,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
17185 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
17186 |
/* end confdefs.h. */
|
|
17187 |
|
|
17188 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
17189 |
+/* Override any GCC internal prototype to avoid an error.
|
|
17190 |
+ Use char because int might match the return type of a GCC
|
|
17191 |
+ builtin and then its argument prototype would still apply. */
|
|
17192 |
#ifdef __cplusplus
|
|
17193 |
extern "C"
|
|
17194 |
#endif
|
|
17195 |
-/* We use char because int might match the return type of a gcc2
|
|
17196 |
- builtin and then its argument prototype would still apply. */
|
|
17197 |
char setsockopt ();
|
|
17198 |
int
|
|
17199 |
main ()
|
|
17200 |
{
|
|
17201 |
-setsockopt ();
|
|
17202 |
+return setsockopt ();
|
|
17203 |
;
|
|
17204 |
return 0;
|
|
17205 |
}
|
|
17206 |
_ACEOF
|
|
17207 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
17208 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17209 |
- (eval $ac_link) 2>conftest.er1
|
|
17210 |
+if { (ac_try="$ac_link"
|
|
17211 |
+case "(($ac_try" in
|
|
17212 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17213 |
+ *) ac_try_echo=$ac_try;;
|
|
17214 |
+esac
|
|
17215 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17216 |
+ (eval "$ac_link") 2>conftest.er1
|
|
17217 |
ac_status=$?
|
|
17218 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17219 |
rm -f conftest.er1
|
|
17220 |
cat conftest.err >&5
|
|
17221 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17222 |
- (exit $ac_status); } &&
|
|
17223 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17224 |
- || test ! -s conftest.err'
|
|
17225 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17226 |
- (eval $ac_try) 2>&5
|
|
17227 |
- ac_status=$?
|
|
17228 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17229 |
- (exit $ac_status); }; } &&
|
|
17230 |
- { ac_try='test -s conftest$ac_exeext'
|
|
17231 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17232 |
- (eval $ac_try) 2>&5
|
|
17233 |
- ac_status=$?
|
|
17234 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17235 |
- (exit $ac_status); }; }; then
|
|
17236 |
+ (exit $ac_status); } && {
|
|
17237 |
+ test -z "$ac_c_werror_flag" ||
|
|
17238 |
+ test ! -s conftest.err
|
|
17239 |
+ } && test -s conftest$ac_exeext &&
|
|
17240 |
+ $as_test_x conftest$ac_exeext; then
|
|
17241 |
ac_cv_lib_socket_setsockopt=yes
|
|
17242 |
else
|
|
17243 |
echo "$as_me: failed program was:" >&5
|
|
17244 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17245 |
|
|
17246 |
-ac_cv_lib_socket_setsockopt=no
|
|
17247 |
+ ac_cv_lib_socket_setsockopt=no
|
|
17248 |
fi
|
|
17249 |
-rm -f conftest.err conftest.$ac_objext \
|
|
17250 |
+
|
|
17251 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
17252 |
conftest$ac_exeext conftest.$ac_ext
|
|
17253 |
LIBS=$ac_check_lib_save_LIBS
|
|
17254 |
fi
|
|
17255 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5
|
|
17256 |
-echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
|
|
17257 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5
|
|
17258 |
+echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6; }
|
|
17259 |
if test $ac_cv_lib_socket_setsockopt = yes; then
|
|
17260 |
cat >>confdefs.h <<_ACEOF
|
|
17261 |
#define HAVE_LIBSOCKET 1
|
|
17262 |
@@ -5131,8 +6537,8 @@ fi
|
|
17263 |
done
|
|
17264 |
|
|
17265 |
|
|
17266 |
-echo "$as_me:$LINENO: checking for socklen_t" >&5
|
|
17267 |
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
|
|
17268 |
+{ echo "$as_me:$LINENO: checking for socklen_t" >&5
|
|
17269 |
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
|
|
17270 |
ac_cv_socklen_t=""
|
|
17271 |
cat >conftest.$ac_ext <<_ACEOF
|
|
17272 |
/* confdefs.h. */
|
|
17273 |
@@ -5156,33 +6562,28 @@ getsockname(0,(struct sockaddr*)0, &a);
|
|
17274 |
}
|
|
17275 |
_ACEOF
|
|
17276 |
rm -f conftest.$ac_objext
|
|
17277 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
17278 |
- (eval $ac_compile) 2>conftest.er1
|
|
17279 |
+if { (ac_try="$ac_compile"
|
|
17280 |
+case "(($ac_try" in
|
|
17281 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17282 |
+ *) ac_try_echo=$ac_try;;
|
|
17283 |
+esac
|
|
17284 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17285 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
17286 |
ac_status=$?
|
|
17287 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17288 |
rm -f conftest.er1
|
|
17289 |
cat conftest.err >&5
|
|
17290 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17291 |
- (exit $ac_status); } &&
|
|
17292 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17293 |
- || test ! -s conftest.err'
|
|
17294 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17295 |
- (eval $ac_try) 2>&5
|
|
17296 |
- ac_status=$?
|
|
17297 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17298 |
- (exit $ac_status); }; } &&
|
|
17299 |
- { ac_try='test -s conftest.$ac_objext'
|
|
17300 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17301 |
- (eval $ac_try) 2>&5
|
|
17302 |
- ac_status=$?
|
|
17303 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17304 |
- (exit $ac_status); }; }; then
|
|
17305 |
+ (exit $ac_status); } && {
|
|
17306 |
+ test -z "$ac_c_werror_flag" ||
|
|
17307 |
+ test ! -s conftest.err
|
|
17308 |
+ } && test -s conftest.$ac_objext; then
|
|
17309 |
ac_cv_socklen_t="socklen_t"
|
|
17310 |
else
|
|
17311 |
echo "$as_me: failed program was:" >&5
|
|
17312 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17313 |
|
|
17314 |
-cat >conftest.$ac_ext <<_ACEOF
|
|
17315 |
+ cat >conftest.$ac_ext <<_ACEOF
|
|
17316 |
/* confdefs.h. */
|
|
17317 |
_ACEOF
|
|
17318 |
cat confdefs.h >>conftest.$ac_ext
|
|
17319 |
@@ -5204,41 +6605,38 @@ getsockname(0,(struct sockaddr*)0, &a);
|
|
17320 |
}
|
|
17321 |
_ACEOF
|
|
17322 |
rm -f conftest.$ac_objext
|
|
17323 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
17324 |
- (eval $ac_compile) 2>conftest.er1
|
|
17325 |
+if { (ac_try="$ac_compile"
|
|
17326 |
+case "(($ac_try" in
|
|
17327 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17328 |
+ *) ac_try_echo=$ac_try;;
|
|
17329 |
+esac
|
|
17330 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17331 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
17332 |
ac_status=$?
|
|
17333 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17334 |
rm -f conftest.er1
|
|
17335 |
cat conftest.err >&5
|
|
17336 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17337 |
- (exit $ac_status); } &&
|
|
17338 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17339 |
- || test ! -s conftest.err'
|
|
17340 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17341 |
- (eval $ac_try) 2>&5
|
|
17342 |
- ac_status=$?
|
|
17343 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17344 |
- (exit $ac_status); }; } &&
|
|
17345 |
- { ac_try='test -s conftest.$ac_objext'
|
|
17346 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17347 |
- (eval $ac_try) 2>&5
|
|
17348 |
- ac_status=$?
|
|
17349 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17350 |
- (exit $ac_status); }; }; then
|
|
17351 |
+ (exit $ac_status); } && {
|
|
17352 |
+ test -z "$ac_c_werror_flag" ||
|
|
17353 |
+ test ! -s conftest.err
|
|
17354 |
+ } && test -s conftest.$ac_objext; then
|
|
17355 |
ac_cv_socklen_t="int"
|
|
17356 |
else
|
|
17357 |
echo "$as_me: failed program was:" >&5
|
|
17358 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17359 |
|
|
17360 |
-ac_cv_socklen_t="size_t"
|
|
17361 |
+ ac_cv_socklen_t="size_t"
|
|
17362 |
|
|
17363 |
fi
|
|
17364 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
17365 |
+
|
|
17366 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
17367 |
|
|
17368 |
fi
|
|
17369 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
17370 |
-echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
|
|
17371 |
-echo "${ECHO_T}$ac_cv_socklen_t" >&6
|
|
17372 |
+
|
|
17373 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
17374 |
+{ echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
|
|
17375 |
+echo "${ECHO_T}$ac_cv_socklen_t" >&6; }
|
|
17376 |
if test "$ac_cv_socklen_t" != "socklen_t"; then
|
|
17377 |
|
|
17378 |
cat >>confdefs.h <<_ACEOF
|
|
17379 |
@@ -5249,28 +6647,28 @@ fi
|
|
17380 |
|
|
17381 |
|
|
17382 |
|
|
17383 |
-# Check whether --with-glib-prefix or --without-glib-prefix was given.
|
|
17384 |
+# Check whether --with-glib-prefix was given.
|
|
17385 |
if test "${with_glib_prefix+set}" = set; then
|
|
17386 |
- withval="$with_glib_prefix"
|
|
17387 |
- glib_config_prefix="$withval"
|
|
17388 |
+ withval=$with_glib_prefix; glib_config_prefix="$withval"
|
|
17389 |
else
|
|
17390 |
glib_config_prefix=""
|
|
17391 |
-fi;
|
|
17392 |
+fi
|
|
17393 |
+
|
|
17394 |
|
|
17395 |
-# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given.
|
|
17396 |
+# Check whether --with-glib-exec-prefix was given.
|
|
17397 |
if test "${with_glib_exec_prefix+set}" = set; then
|
|
17398 |
- withval="$with_glib_exec_prefix"
|
|
17399 |
- glib_config_exec_prefix="$withval"
|
|
17400 |
+ withval=$with_glib_exec_prefix; glib_config_exec_prefix="$withval"
|
|
17401 |
else
|
|
17402 |
glib_config_exec_prefix=""
|
|
17403 |
-fi;
|
|
17404 |
-# Check whether --enable-glibtest or --disable-glibtest was given.
|
|
17405 |
-if test "${enable_glibtest+set}" = set; then
|
|
17406 |
- enableval="$enable_glibtest"
|
|
17407 |
+fi
|
|
17408 |
|
|
17409 |
+# Check whether --enable-glibtest was given.
|
|
17410 |
+if test "${enable_glibtest+set}" = set; then
|
|
17411 |
+ enableval=$enable_glibtest;
|
|
17412 |
else
|
|
17413 |
enable_glibtest=yes
|
|
17414 |
-fi;
|
|
17415 |
+fi
|
|
17416 |
+
|
|
17417 |
|
|
17418 |
if test x$glib_config_exec_prefix != x ; then
|
|
17419 |
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
|
|
17420 |
@@ -5299,8 +6697,8 @@ fi;
|
|
17421 |
|
|
17422 |
# Extract the first word of "glib-config", so it can be a program name with args.
|
|
17423 |
set dummy glib-config; ac_word=$2
|
|
17424 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
17425 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
17426 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
17427 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
17428 |
if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then
|
|
17429 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17430 |
else
|
|
17431 |
@@ -5315,31 +6713,32 @@ do
|
|
17432 |
IFS=$as_save_IFS
|
|
17433 |
test -z "$as_dir" && as_dir=.
|
|
17434 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
17435 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
17436 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
17437 |
ac_cv_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
17438 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
17439 |
break 2
|
|
17440 |
fi
|
|
17441 |
done
|
|
17442 |
done
|
|
17443 |
+IFS=$as_save_IFS
|
|
17444 |
|
|
17445 |
test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
|
|
17446 |
;;
|
|
17447 |
esac
|
|
17448 |
fi
|
|
17449 |
GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG
|
|
17450 |
-
|
|
17451 |
if test -n "$GLIB_CONFIG"; then
|
|
17452 |
- echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
|
|
17453 |
-echo "${ECHO_T}$GLIB_CONFIG" >&6
|
|
17454 |
+ { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
|
|
17455 |
+echo "${ECHO_T}$GLIB_CONFIG" >&6; }
|
|
17456 |
else
|
|
17457 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
17458 |
-echo "${ECHO_T}no" >&6
|
|
17459 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
17460 |
+echo "${ECHO_T}no" >&6; }
|
|
17461 |
fi
|
|
17462 |
|
|
17463 |
+
|
|
17464 |
min_glib_version=1.2.0
|
|
17465 |
- echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
|
|
17466 |
-echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6
|
|
17467 |
+ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
|
|
17468 |
+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
|
|
17469 |
no_glib=""
|
|
17470 |
if test "$GLIB_CONFIG" = "no" ; then
|
|
17471 |
no_glib=yes
|
|
17472 |
@@ -5442,13 +6841,22 @@ main ()
|
|
17473 |
|
|
17474 |
_ACEOF
|
|
17475 |
rm -f conftest$ac_exeext
|
|
17476 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17477 |
- (eval $ac_link) 2>&5
|
|
17478 |
+if { (ac_try="$ac_link"
|
|
17479 |
+case "(($ac_try" in
|
|
17480 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17481 |
+ *) ac_try_echo=$ac_try;;
|
|
17482 |
+esac
|
|
17483 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17484 |
+ (eval "$ac_link") 2>&5
|
|
17485 |
ac_status=$?
|
|
17486 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17487 |
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
17488 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17489 |
- (eval $ac_try) 2>&5
|
|
17490 |
+ { (case "(($ac_try" in
|
|
17491 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17492 |
+ *) ac_try_echo=$ac_try;;
|
|
17493 |
+esac
|
|
17494 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17495 |
+ (eval "$ac_try") 2>&5
|
|
17496 |
ac_status=$?
|
|
17497 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17498 |
(exit $ac_status); }; }; then
|
|
17499 |
@@ -5461,19 +6869,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
17500 |
( exit $ac_status )
|
|
17501 |
no_glib=yes
|
|
17502 |
fi
|
|
17503 |
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
17504 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
17505 |
fi
|
|
17506 |
+
|
|
17507 |
+
|
|
17508 |
CFLAGS="$ac_save_CFLAGS"
|
|
17509 |
LIBS="$ac_save_LIBS"
|
|
17510 |
fi
|
|
17511 |
fi
|
|
17512 |
if test "x$no_glib" = x ; then
|
|
17513 |
- echo "$as_me:$LINENO: result: yes" >&5
|
|
17514 |
-echo "${ECHO_T}yes" >&6
|
|
17515 |
+ { echo "$as_me:$LINENO: result: yes" >&5
|
|
17516 |
+echo "${ECHO_T}yes" >&6; }
|
|
17517 |
:
|
|
17518 |
else
|
|
17519 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
17520 |
-echo "${ECHO_T}no" >&6
|
|
17521 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
17522 |
+echo "${ECHO_T}no" >&6; }
|
|
17523 |
if test "$GLIB_CONFIG" = "no" ; then
|
|
17524 |
echo "*** The glib-config script installed by GLIB could not be found"
|
|
17525 |
echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
|
|
17526 |
@@ -5505,27 +6915,23 @@ main ()
|
|
17527 |
}
|
|
17528 |
_ACEOF
|
|
17529 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
17530 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17531 |
- (eval $ac_link) 2>conftest.er1
|
|
17532 |
+if { (ac_try="$ac_link"
|
|
17533 |
+case "(($ac_try" in
|
|
17534 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17535 |
+ *) ac_try_echo=$ac_try;;
|
|
17536 |
+esac
|
|
17537 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17538 |
+ (eval "$ac_link") 2>conftest.er1
|
|
17539 |
ac_status=$?
|
|
17540 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17541 |
rm -f conftest.er1
|
|
17542 |
cat conftest.err >&5
|
|
17543 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17544 |
- (exit $ac_status); } &&
|
|
17545 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17546 |
- || test ! -s conftest.err'
|
|
17547 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17548 |
- (eval $ac_try) 2>&5
|
|
17549 |
- ac_status=$?
|
|
17550 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17551 |
- (exit $ac_status); }; } &&
|
|
17552 |
- { ac_try='test -s conftest$ac_exeext'
|
|
17553 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17554 |
- (eval $ac_try) 2>&5
|
|
17555 |
- ac_status=$?
|
|
17556 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17557 |
- (exit $ac_status); }; }; then
|
|
17558 |
+ (exit $ac_status); } && {
|
|
17559 |
+ test -z "$ac_c_werror_flag" ||
|
|
17560 |
+ test ! -s conftest.err
|
|
17561 |
+ } && test -s conftest$ac_exeext &&
|
|
17562 |
+ $as_test_x conftest$ac_exeext; then
|
|
17563 |
echo "*** The test program compiled, but did not run. This usually means"
|
|
17564 |
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
|
17565 |
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
|
|
17566 |
@@ -5544,12 +6950,13 @@ else
|
|
17567 |
echo "$as_me: failed program was:" >&5
|
|
17568 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17569 |
|
|
17570 |
- echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
17571 |
+ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
17572 |
echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
|
|
17573 |
echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
|
|
17574 |
echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
|
|
17575 |
fi
|
|
17576 |
-rm -f conftest.err conftest.$ac_objext \
|
|
17577 |
+
|
|
17578 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
17579 |
conftest$ac_exeext conftest.$ac_ext
|
|
17580 |
CFLAGS="$ac_save_CFLAGS"
|
|
17581 |
LIBS="$ac_save_LIBS"
|
|
17582 |
@@ -5568,28 +6975,28 @@ echo "$as_me: error: Unable to find glib
|
|
17583 |
|
|
17584 |
|
|
17585 |
|
|
17586 |
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
|
|
17587 |
+# Check whether --with-gtk-prefix was given.
|
|
17588 |
if test "${with_gtk_prefix+set}" = set; then
|
|
17589 |
- withval="$with_gtk_prefix"
|
|
17590 |
- gtk_config_prefix="$withval"
|
|
17591 |
+ withval=$with_gtk_prefix; gtk_config_prefix="$withval"
|
|
17592 |
else
|
|
17593 |
gtk_config_prefix=""
|
|
17594 |
-fi;
|
|
17595 |
+fi
|
|
17596 |
+
|
|
17597 |
|
|
17598 |
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
|
|
17599 |
+# Check whether --with-gtk-exec-prefix was given.
|
|
17600 |
if test "${with_gtk_exec_prefix+set}" = set; then
|
|
17601 |
- withval="$with_gtk_exec_prefix"
|
|
17602 |
- gtk_config_exec_prefix="$withval"
|
|
17603 |
+ withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
|
|
17604 |
else
|
|
17605 |
gtk_config_exec_prefix=""
|
|
17606 |
-fi;
|
|
17607 |
-# Check whether --enable-gtktest or --disable-gtktest was given.
|
|
17608 |
-if test "${enable_gtktest+set}" = set; then
|
|
17609 |
- enableval="$enable_gtktest"
|
|
17610 |
+fi
|
|
17611 |
|
|
17612 |
+# Check whether --enable-gtktest was given.
|
|
17613 |
+if test "${enable_gtktest+set}" = set; then
|
|
17614 |
+ enableval=$enable_gtktest;
|
|
17615 |
else
|
|
17616 |
enable_gtktest=yes
|
|
17617 |
-fi;
|
|
17618 |
+fi
|
|
17619 |
+
|
|
17620 |
|
|
17621 |
for module in .
|
|
17622 |
do
|
|
17623 |
@@ -5615,8 +7022,8 @@ fi;
|
|
17624 |
|
|
17625 |
# Extract the first word of "gtk-config", so it can be a program name with args.
|
|
17626 |
set dummy gtk-config; ac_word=$2
|
|
17627 |
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
17628 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
17629 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
17630 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
17631 |
if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
|
|
17632 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17633 |
else
|
|
17634 |
@@ -5631,31 +7038,32 @@ do
|
|
17635 |
IFS=$as_save_IFS
|
|
17636 |
test -z "$as_dir" && as_dir=.
|
|
17637 |
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
17638 |
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
17639 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
17640 |
ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
17641 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
17642 |
break 2
|
|
17643 |
fi
|
|
17644 |
done
|
|
17645 |
done
|
|
17646 |
+IFS=$as_save_IFS
|
|
17647 |
|
|
17648 |
test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
|
|
17649 |
;;
|
|
17650 |
esac
|
|
17651 |
fi
|
|
17652 |
GTK_CONFIG=$ac_cv_path_GTK_CONFIG
|
|
17653 |
-
|
|
17654 |
if test -n "$GTK_CONFIG"; then
|
|
17655 |
- echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
|
|
17656 |
-echo "${ECHO_T}$GTK_CONFIG" >&6
|
|
17657 |
+ { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
|
|
17658 |
+echo "${ECHO_T}$GTK_CONFIG" >&6; }
|
|
17659 |
else
|
|
17660 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
17661 |
-echo "${ECHO_T}no" >&6
|
|
17662 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
17663 |
+echo "${ECHO_T}no" >&6; }
|
|
17664 |
fi
|
|
17665 |
|
|
17666 |
+
|
|
17667 |
min_gtk_version=1.2.0
|
|
17668 |
- echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
|
|
17669 |
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
|
|
17670 |
+ { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
|
|
17671 |
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
|
|
17672 |
no_gtk=""
|
|
17673 |
if test "$GTK_CONFIG" = "no" ; then
|
|
17674 |
no_gtk=yes
|
|
17675 |
@@ -5760,13 +7168,22 @@ main ()
|
|
17676 |
|
|
17677 |
_ACEOF
|
|
17678 |
rm -f conftest$ac_exeext
|
|
17679 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17680 |
- (eval $ac_link) 2>&5
|
|
17681 |
+if { (ac_try="$ac_link"
|
|
17682 |
+case "(($ac_try" in
|
|
17683 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17684 |
+ *) ac_try_echo=$ac_try;;
|
|
17685 |
+esac
|
|
17686 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17687 |
+ (eval "$ac_link") 2>&5
|
|
17688 |
ac_status=$?
|
|
17689 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17690 |
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
17691 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17692 |
- (eval $ac_try) 2>&5
|
|
17693 |
+ { (case "(($ac_try" in
|
|
17694 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17695 |
+ *) ac_try_echo=$ac_try;;
|
|
17696 |
+esac
|
|
17697 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17698 |
+ (eval "$ac_try") 2>&5
|
|
17699 |
ac_status=$?
|
|
17700 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17701 |
(exit $ac_status); }; }; then
|
|
17702 |
@@ -5779,19 +7196,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
17703 |
( exit $ac_status )
|
|
17704 |
no_gtk=yes
|
|
17705 |
fi
|
|
17706 |
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
17707 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
17708 |
fi
|
|
17709 |
+
|
|
17710 |
+
|
|
17711 |
CFLAGS="$ac_save_CFLAGS"
|
|
17712 |
LIBS="$ac_save_LIBS"
|
|
17713 |
fi
|
|
17714 |
fi
|
|
17715 |
if test "x$no_gtk" = x ; then
|
|
17716 |
- echo "$as_me:$LINENO: result: yes" >&5
|
|
17717 |
-echo "${ECHO_T}yes" >&6
|
|
17718 |
+ { echo "$as_me:$LINENO: result: yes" >&5
|
|
17719 |
+echo "${ECHO_T}yes" >&6; }
|
|
17720 |
:
|
|
17721 |
else
|
|
17722 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
17723 |
-echo "${ECHO_T}no" >&6
|
|
17724 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
17725 |
+echo "${ECHO_T}no" >&6; }
|
|
17726 |
if test "$GTK_CONFIG" = "no" ; then
|
|
17727 |
echo "*** The gtk-config script installed by GTK could not be found"
|
|
17728 |
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
|
17729 |
@@ -5823,27 +7242,23 @@ main ()
|
|
17730 |
}
|
|
17731 |
_ACEOF
|
|
17732 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
17733 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
17734 |
- (eval $ac_link) 2>conftest.er1
|
|
17735 |
+if { (ac_try="$ac_link"
|
|
17736 |
+case "(($ac_try" in
|
|
17737 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17738 |
+ *) ac_try_echo=$ac_try;;
|
|
17739 |
+esac
|
|
17740 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17741 |
+ (eval "$ac_link") 2>conftest.er1
|
|
17742 |
ac_status=$?
|
|
17743 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17744 |
rm -f conftest.er1
|
|
17745 |
cat conftest.err >&5
|
|
17746 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17747 |
- (exit $ac_status); } &&
|
|
17748 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17749 |
- || test ! -s conftest.err'
|
|
17750 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17751 |
- (eval $ac_try) 2>&5
|
|
17752 |
- ac_status=$?
|
|
17753 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17754 |
- (exit $ac_status); }; } &&
|
|
17755 |
- { ac_try='test -s conftest$ac_exeext'
|
|
17756 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17757 |
- (eval $ac_try) 2>&5
|
|
17758 |
- ac_status=$?
|
|
17759 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17760 |
- (exit $ac_status); }; }; then
|
|
17761 |
+ (exit $ac_status); } && {
|
|
17762 |
+ test -z "$ac_c_werror_flag" ||
|
|
17763 |
+ test ! -s conftest.err
|
|
17764 |
+ } && test -s conftest$ac_exeext &&
|
|
17765 |
+ $as_test_x conftest$ac_exeext; then
|
|
17766 |
echo "*** The test program compiled, but did not run. This usually means"
|
|
17767 |
echo "*** that the run-time linker is not finding GTK or finding the wrong"
|
|
17768 |
echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
|
|
17769 |
@@ -5862,12 +7277,13 @@ else
|
|
17770 |
echo "$as_me: failed program was:" >&5
|
|
17771 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
17772 |
|
|
17773 |
- echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
17774 |
+ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
17775 |
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
|
17776 |
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
|
17777 |
echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
|
|
17778 |
fi
|
|
17779 |
-rm -f conftest.err conftest.$ac_objext \
|
|
17780 |
+
|
|
17781 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
17782 |
conftest$ac_exeext conftest.$ac_ext
|
|
17783 |
CFLAGS="$ac_save_CFLAGS"
|
|
17784 |
LIBS="$ac_save_LIBS"
|
|
17785 |
@@ -5884,31 +7300,178 @@ echo "$as_me: error: Unable to find Gtk+
|
|
17786 |
rm -f conf.gtktest
|
|
17787 |
|
|
17788 |
|
|
17789 |
- echo "$as_me:$LINENO: checking Hackish check for FLTK" >&5
|
|
17790 |
-echo $ECHO_N "checking Hackish check for FLTK... $ECHO_C" >&6
|
|
17791 |
+ { echo "$as_me:$LINENO: checking Hackish check for FLTK" >&5
|
|
17792 |
+echo $ECHO_N "checking Hackish check for FLTK... $ECHO_C" >&6; }
|
|
17793 |
LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
|
|
17794 |
LIBFLTK_LIBS=`fltk-config --ldflags`
|
|
17795 |
|
|
17796 |
|
|
17797 |
if test "x$enable_jpeg" = "xyes"; then
|
|
17798 |
|
|
17799 |
-echo "$as_me:$LINENO: checking for egrep" >&5
|
|
17800 |
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
|
|
17801 |
-if test "${ac_cv_prog_egrep+set}" = set; then
|
|
17802 |
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
|
|
17803 |
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
|
|
17804 |
+if test "${ac_cv_path_GREP+set}" = set; then
|
|
17805 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17806 |
+else
|
|
17807 |
+ # Extract the first word of "grep ggrep" to use in msg output
|
|
17808 |
+if test -z "$GREP"; then
|
|
17809 |
+set dummy grep ggrep; ac_prog_name=$2
|
|
17810 |
+if test "${ac_cv_path_GREP+set}" = set; then
|
|
17811 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17812 |
+else
|
|
17813 |
+ ac_path_GREP_found=false
|
|
17814 |
+# Loop through the user's path and test for each of PROGNAME-LIST
|
|
17815 |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
17816 |
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
17817 |
+do
|
|
17818 |
+ IFS=$as_save_IFS
|
|
17819 |
+ test -z "$as_dir" && as_dir=.
|
|
17820 |
+ for ac_prog in grep ggrep; do
|
|
17821 |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
17822 |
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
17823 |
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
17824 |
+ # Check for GNU ac_path_GREP and select it if it is found.
|
|
17825 |
+ # Check for GNU $ac_path_GREP
|
|
17826 |
+case `"$ac_path_GREP" --version 2>&1` in
|
|
17827 |
+*GNU*)
|
|
17828 |
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
|
17829 |
+*)
|
|
17830 |
+ ac_count=0
|
|
17831 |
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
17832 |
+ while :
|
|
17833 |
+ do
|
|
17834 |
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
17835 |
+ mv "conftest.tmp" "conftest.in"
|
|
17836 |
+ cp "conftest.in" "conftest.nl"
|
|
17837 |
+ echo 'GREP' >> "conftest.nl"
|
|
17838 |
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
17839 |
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
17840 |
+ ac_count=`expr $ac_count + 1`
|
|
17841 |
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
|
17842 |
+ # Best one so far, save it but keep looking for a better one
|
|
17843 |
+ ac_cv_path_GREP="$ac_path_GREP"
|
|
17844 |
+ ac_path_GREP_max=$ac_count
|
|
17845 |
+ fi
|
|
17846 |
+ # 10*(2^10) chars as input seems more than enough
|
|
17847 |
+ test $ac_count -gt 10 && break
|
|
17848 |
+ done
|
|
17849 |
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
17850 |
+esac
|
|
17851 |
+
|
|
17852 |
+
|
|
17853 |
+ $ac_path_GREP_found && break 3
|
|
17854 |
+ done
|
|
17855 |
+done
|
|
17856 |
+
|
|
17857 |
+done
|
|
17858 |
+IFS=$as_save_IFS
|
|
17859 |
+
|
|
17860 |
+
|
|
17861 |
+fi
|
|
17862 |
+
|
|
17863 |
+GREP="$ac_cv_path_GREP"
|
|
17864 |
+if test -z "$GREP"; then
|
|
17865 |
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
17866 |
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
17867 |
+ { (exit 1); exit 1; }; }
|
|
17868 |
+fi
|
|
17869 |
+
|
|
17870 |
+else
|
|
17871 |
+ ac_cv_path_GREP=$GREP
|
|
17872 |
+fi
|
|
17873 |
+
|
|
17874 |
+
|
|
17875 |
+fi
|
|
17876 |
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
|
|
17877 |
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
|
|
17878 |
+ GREP="$ac_cv_path_GREP"
|
|
17879 |
+
|
|
17880 |
+
|
|
17881 |
+{ echo "$as_me:$LINENO: checking for egrep" >&5
|
|
17882 |
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
|
|
17883 |
+if test "${ac_cv_path_EGREP+set}" = set; then
|
|
17884 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17885 |
+else
|
|
17886 |
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
17887 |
+ then ac_cv_path_EGREP="$GREP -E"
|
|
17888 |
+ else
|
|
17889 |
+ # Extract the first word of "egrep" to use in msg output
|
|
17890 |
+if test -z "$EGREP"; then
|
|
17891 |
+set dummy egrep; ac_prog_name=$2
|
|
17892 |
+if test "${ac_cv_path_EGREP+set}" = set; then
|
|
17893 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17894 |
else
|
|
17895 |
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
|
|
17896 |
- then ac_cv_prog_egrep='grep -E'
|
|
17897 |
- else ac_cv_prog_egrep='egrep'
|
|
17898 |
+ ac_path_EGREP_found=false
|
|
17899 |
+# Loop through the user's path and test for each of PROGNAME-LIST
|
|
17900 |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
17901 |
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
17902 |
+do
|
|
17903 |
+ IFS=$as_save_IFS
|
|
17904 |
+ test -z "$as_dir" && as_dir=.
|
|
17905 |
+ for ac_prog in egrep; do
|
|
17906 |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
17907 |
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
17908 |
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
17909 |
+ # Check for GNU ac_path_EGREP and select it if it is found.
|
|
17910 |
+ # Check for GNU $ac_path_EGREP
|
|
17911 |
+case `"$ac_path_EGREP" --version 2>&1` in
|
|
17912 |
+*GNU*)
|
|
17913 |
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
|
17914 |
+*)
|
|
17915 |
+ ac_count=0
|
|
17916 |
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
|
|
17917 |
+ while :
|
|
17918 |
+ do
|
|
17919 |
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
17920 |
+ mv "conftest.tmp" "conftest.in"
|
|
17921 |
+ cp "conftest.in" "conftest.nl"
|
|
17922 |
+ echo 'EGREP' >> "conftest.nl"
|
|
17923 |
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
17924 |
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
17925 |
+ ac_count=`expr $ac_count + 1`
|
|
17926 |
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
|
17927 |
+ # Best one so far, save it but keep looking for a better one
|
|
17928 |
+ ac_cv_path_EGREP="$ac_path_EGREP"
|
|
17929 |
+ ac_path_EGREP_max=$ac_count
|
|
17930 |
fi
|
|
17931 |
+ # 10*(2^10) chars as input seems more than enough
|
|
17932 |
+ test $ac_count -gt 10 && break
|
|
17933 |
+ done
|
|
17934 |
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
17935 |
+esac
|
|
17936 |
+
|
|
17937 |
+
|
|
17938 |
+ $ac_path_EGREP_found && break 3
|
|
17939 |
+ done
|
|
17940 |
+done
|
|
17941 |
+
|
|
17942 |
+done
|
|
17943 |
+IFS=$as_save_IFS
|
|
17944 |
+
|
|
17945 |
+
|
|
17946 |
+fi
|
|
17947 |
+
|
|
17948 |
+EGREP="$ac_cv_path_EGREP"
|
|
17949 |
+if test -z "$EGREP"; then
|
|
17950 |
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
17951 |
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
17952 |
+ { (exit 1); exit 1; }; }
|
|
17953 |
fi
|
|
17954 |
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
|
|
17955 |
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
|
|
17956 |
- EGREP=$ac_cv_prog_egrep
|
|
17957 |
|
|
17958 |
+else
|
|
17959 |
+ ac_cv_path_EGREP=$EGREP
|
|
17960 |
+fi
|
|
17961 |
+
|
|
17962 |
+
|
|
17963 |
+ fi
|
|
17964 |
+fi
|
|
17965 |
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
|
17966 |
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
|
|
17967 |
+ EGREP="$ac_cv_path_EGREP"
|
|
17968 |
|
|
17969 |
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
17970 |
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
|
17971 |
+
|
|
17972 |
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
17973 |
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
|
17974 |
if test "${ac_cv_header_stdc+set}" = set; then
|
|
17975 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
17976 |
else
|
|
17977 |
@@ -5932,35 +7495,31 @@ main ()
|
|
17978 |
}
|
|
17979 |
_ACEOF
|
|
17980 |
rm -f conftest.$ac_objext
|
|
17981 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
17982 |
- (eval $ac_compile) 2>conftest.er1
|
|
17983 |
+if { (ac_try="$ac_compile"
|
|
17984 |
+case "(($ac_try" in
|
|
17985 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
17986 |
+ *) ac_try_echo=$ac_try;;
|
|
17987 |
+esac
|
|
17988 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
17989 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
17990 |
ac_status=$?
|
|
17991 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
17992 |
rm -f conftest.er1
|
|
17993 |
cat conftest.err >&5
|
|
17994 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
17995 |
- (exit $ac_status); } &&
|
|
17996 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
17997 |
- || test ! -s conftest.err'
|
|
17998 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
17999 |
- (eval $ac_try) 2>&5
|
|
18000 |
- ac_status=$?
|
|
18001 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18002 |
- (exit $ac_status); }; } &&
|
|
18003 |
- { ac_try='test -s conftest.$ac_objext'
|
|
18004 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18005 |
- (eval $ac_try) 2>&5
|
|
18006 |
- ac_status=$?
|
|
18007 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18008 |
- (exit $ac_status); }; }; then
|
|
18009 |
+ (exit $ac_status); } && {
|
|
18010 |
+ test -z "$ac_c_werror_flag" ||
|
|
18011 |
+ test ! -s conftest.err
|
|
18012 |
+ } && test -s conftest.$ac_objext; then
|
|
18013 |
ac_cv_header_stdc=yes
|
|
18014 |
else
|
|
18015 |
echo "$as_me: failed program was:" >&5
|
|
18016 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18017 |
|
|
18018 |
-ac_cv_header_stdc=no
|
|
18019 |
+ ac_cv_header_stdc=no
|
|
18020 |
fi
|
|
18021 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18022 |
+
|
|
18023 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18024 |
|
|
18025 |
if test $ac_cv_header_stdc = yes; then
|
|
18026 |
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
18027 |
@@ -6016,6 +7575,7 @@ cat confdefs.h >>conftest.$ac_ext
|
|
18028 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
18029 |
/* end confdefs.h. */
|
|
18030 |
#include <ctype.h>
|
|
18031 |
+#include <stdlib.h>
|
|
18032 |
#if ((' ' & 0x0FF) == 0x020)
|
|
18033 |
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
18034 |
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
18035 |
@@ -6035,18 +7595,27 @@ main ()
|
|
18036 |
for (i = 0; i < 256; i++)
|
|
18037 |
if (XOR (islower (i), ISLOWER (i))
|
|
18038 |
|| toupper (i) != TOUPPER (i))
|
|
18039 |
- exit(2);
|
|
18040 |
- exit (0);
|
|
18041 |
+ return 2;
|
|
18042 |
+ return 0;
|
|
18043 |
}
|
|
18044 |
_ACEOF
|
|
18045 |
rm -f conftest$ac_exeext
|
|
18046 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
18047 |
- (eval $ac_link) 2>&5
|
|
18048 |
+if { (ac_try="$ac_link"
|
|
18049 |
+case "(($ac_try" in
|
|
18050 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18051 |
+ *) ac_try_echo=$ac_try;;
|
|
18052 |
+esac
|
|
18053 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18054 |
+ (eval "$ac_link") 2>&5
|
|
18055 |
ac_status=$?
|
|
18056 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18057 |
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
18058 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18059 |
- (eval $ac_try) 2>&5
|
|
18060 |
+ { (case "(($ac_try" in
|
|
18061 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18062 |
+ *) ac_try_echo=$ac_try;;
|
|
18063 |
+esac
|
|
18064 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18065 |
+ (eval "$ac_try") 2>&5
|
|
18066 |
ac_status=$?
|
|
18067 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18068 |
(exit $ac_status); }; }; then
|
|
18069 |
@@ -6059,12 +7628,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
18070 |
( exit $ac_status )
|
|
18071 |
ac_cv_header_stdc=no
|
|
18072 |
fi
|
|
18073 |
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
18074 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
18075 |
fi
|
|
18076 |
+
|
|
18077 |
+
|
|
18078 |
fi
|
|
18079 |
fi
|
|
18080 |
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
18081 |
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
|
|
18082 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
18083 |
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
|
|
18084 |
if test $ac_cv_header_stdc = yes; then
|
|
18085 |
|
|
18086 |
cat >>confdefs.h <<\_ACEOF
|
|
18087 |
@@ -6087,9 +7658,9 @@ for ac_header in sys/types.h sys/stat.h
|
|
18088 |
inttypes.h stdint.h unistd.h
|
|
18089 |
do
|
|
18090 |
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
18091 |
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
18092 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
18093 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
18094 |
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
18095 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
18096 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
18097 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18098 |
else
|
|
18099 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18100 |
@@ -6103,38 +7674,35 @@ $ac_includes_default
|
|
18101 |
#include <$ac_header>
|
|
18102 |
_ACEOF
|
|
18103 |
rm -f conftest.$ac_objext
|
|
18104 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
18105 |
- (eval $ac_compile) 2>conftest.er1
|
|
18106 |
+if { (ac_try="$ac_compile"
|
|
18107 |
+case "(($ac_try" in
|
|
18108 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18109 |
+ *) ac_try_echo=$ac_try;;
|
|
18110 |
+esac
|
|
18111 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18112 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
18113 |
ac_status=$?
|
|
18114 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18115 |
rm -f conftest.er1
|
|
18116 |
cat conftest.err >&5
|
|
18117 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18118 |
- (exit $ac_status); } &&
|
|
18119 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18120 |
- || test ! -s conftest.err'
|
|
18121 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18122 |
- (eval $ac_try) 2>&5
|
|
18123 |
- ac_status=$?
|
|
18124 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18125 |
- (exit $ac_status); }; } &&
|
|
18126 |
- { ac_try='test -s conftest.$ac_objext'
|
|
18127 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18128 |
- (eval $ac_try) 2>&5
|
|
18129 |
- ac_status=$?
|
|
18130 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18131 |
- (exit $ac_status); }; }; then
|
|
18132 |
+ (exit $ac_status); } && {
|
|
18133 |
+ test -z "$ac_c_werror_flag" ||
|
|
18134 |
+ test ! -s conftest.err
|
|
18135 |
+ } && test -s conftest.$ac_objext; then
|
|
18136 |
eval "$as_ac_Header=yes"
|
|
18137 |
else
|
|
18138 |
echo "$as_me: failed program was:" >&5
|
|
18139 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18140 |
|
|
18141 |
-eval "$as_ac_Header=no"
|
|
18142 |
+ eval "$as_ac_Header=no"
|
|
18143 |
fi
|
|
18144 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18145 |
+
|
|
18146 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18147 |
fi
|
|
18148 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
18149 |
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
18150 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
18151 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
18152 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
18153 |
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
18154 |
cat >>confdefs.h <<_ACEOF
|
|
18155 |
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
18156 |
@@ -6146,17 +7714,17 @@ done
|
|
18157 |
|
|
18158 |
|
|
18159 |
if test "${ac_cv_header_jpeglib_h+set}" = set; then
|
|
18160 |
- echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
|
18161 |
-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
|
|
18162 |
+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
|
18163 |
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
|
|
18164 |
if test "${ac_cv_header_jpeglib_h+set}" = set; then
|
|
18165 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18166 |
fi
|
|
18167 |
-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
|
|
18168 |
-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
|
|
18169 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
|
|
18170 |
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
|
|
18171 |
else
|
|
18172 |
# Is the header compilable?
|
|
18173 |
-echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
|
|
18174 |
-echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6
|
|
18175 |
+{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
|
|
18176 |
+echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; }
|
|
18177 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18178 |
/* confdefs.h. */
|
|
18179 |
_ACEOF
|
|
18180 |
@@ -6167,41 +7735,37 @@ $ac_includes_default
|
|
18181 |
#include <jpeglib.h>
|
|
18182 |
_ACEOF
|
|
18183 |
rm -f conftest.$ac_objext
|
|
18184 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
18185 |
- (eval $ac_compile) 2>conftest.er1
|
|
18186 |
+if { (ac_try="$ac_compile"
|
|
18187 |
+case "(($ac_try" in
|
|
18188 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18189 |
+ *) ac_try_echo=$ac_try;;
|
|
18190 |
+esac
|
|
18191 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18192 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
18193 |
ac_status=$?
|
|
18194 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18195 |
rm -f conftest.er1
|
|
18196 |
cat conftest.err >&5
|
|
18197 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18198 |
- (exit $ac_status); } &&
|
|
18199 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18200 |
- || test ! -s conftest.err'
|
|
18201 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18202 |
- (eval $ac_try) 2>&5
|
|
18203 |
- ac_status=$?
|
|
18204 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18205 |
- (exit $ac_status); }; } &&
|
|
18206 |
- { ac_try='test -s conftest.$ac_objext'
|
|
18207 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18208 |
- (eval $ac_try) 2>&5
|
|
18209 |
- ac_status=$?
|
|
18210 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18211 |
- (exit $ac_status); }; }; then
|
|
18212 |
+ (exit $ac_status); } && {
|
|
18213 |
+ test -z "$ac_c_werror_flag" ||
|
|
18214 |
+ test ! -s conftest.err
|
|
18215 |
+ } && test -s conftest.$ac_objext; then
|
|
18216 |
ac_header_compiler=yes
|
|
18217 |
else
|
|
18218 |
echo "$as_me: failed program was:" >&5
|
|
18219 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18220 |
|
|
18221 |
-ac_header_compiler=no
|
|
18222 |
+ ac_header_compiler=no
|
|
18223 |
fi
|
|
18224 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18225 |
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
18226 |
-echo "${ECHO_T}$ac_header_compiler" >&6
|
|
18227 |
+
|
|
18228 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18229 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
18230 |
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
18231 |
|
|
18232 |
# Is the header present?
|
|
18233 |
-echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
|
|
18234 |
-echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6
|
|
18235 |
+{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
|
|
18236 |
+echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; }
|
|
18237 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18238 |
/* confdefs.h. */
|
|
18239 |
_ACEOF
|
|
18240 |
@@ -6210,24 +7774,22 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
18241 |
/* end confdefs.h. */
|
|
18242 |
#include <jpeglib.h>
|
|
18243 |
_ACEOF
|
|
18244 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
18245 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
18246 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
18247 |
+case "(($ac_try" in
|
|
18248 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18249 |
+ *) ac_try_echo=$ac_try;;
|
|
18250 |
+esac
|
|
18251 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18252 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
18253 |
ac_status=$?
|
|
18254 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18255 |
rm -f conftest.er1
|
|
18256 |
cat conftest.err >&5
|
|
18257 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18258 |
- (exit $ac_status); } >/dev/null; then
|
|
18259 |
- if test -s conftest.err; then
|
|
18260 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
18261 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
18262 |
- else
|
|
18263 |
- ac_cpp_err=
|
|
18264 |
- fi
|
|
18265 |
-else
|
|
18266 |
- ac_cpp_err=yes
|
|
18267 |
-fi
|
|
18268 |
-if test -z "$ac_cpp_err"; then
|
|
18269 |
+ (exit $ac_status); } >/dev/null && {
|
|
18270 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
18271 |
+ test ! -s conftest.err
|
|
18272 |
+ }; then
|
|
18273 |
ac_header_preproc=yes
|
|
18274 |
else
|
|
18275 |
echo "$as_me: failed program was:" >&5
|
|
18276 |
@@ -6235,9 +7797,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
18277 |
|
|
18278 |
ac_header_preproc=no
|
|
18279 |
fi
|
|
18280 |
+
|
|
18281 |
rm -f conftest.err conftest.$ac_ext
|
|
18282 |
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
18283 |
-echo "${ECHO_T}$ac_header_preproc" >&6
|
|
18284 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
18285 |
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
18286 |
|
|
18287 |
# So? What about this header?
|
|
18288 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
18289 |
@@ -6261,25 +7824,18 @@ echo "$as_me: WARNING: jpeglib.h: se
|
|
18290 |
echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
|
|
18291 |
{ echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
|
|
18292 |
echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
|
|
18293 |
- (
|
|
18294 |
- cat <<\_ASBOX
|
|
18295 |
-## ------------------------------------------ ##
|
|
18296 |
-## Report this to the AC_PACKAGE_NAME lists. ##
|
|
18297 |
-## ------------------------------------------ ##
|
|
18298 |
-_ASBOX
|
|
18299 |
- ) |
|
|
18300 |
- sed "s/^/$as_me: WARNING: /" >&2
|
|
18301 |
+
|
|
18302 |
;;
|
|
18303 |
esac
|
|
18304 |
-echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
|
18305 |
-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
|
|
18306 |
+{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
|
18307 |
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
|
|
18308 |
if test "${ac_cv_header_jpeglib_h+set}" = set; then
|
|
18309 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18310 |
else
|
|
18311 |
ac_cv_header_jpeglib_h=$ac_header_preproc
|
|
18312 |
fi
|
|
18313 |
-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
|
|
18314 |
-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
|
|
18315 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
|
|
18316 |
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
|
|
18317 |
|
|
18318 |
fi
|
|
18319 |
if test $ac_cv_header_jpeglib_h = yes; then
|
|
18320 |
@@ -6290,10 +7846,15 @@ fi
|
|
18321 |
|
|
18322 |
|
|
18323 |
|
|
18324 |
+ if test -e /usr/include/jpeglib.h || test -e /usr/local/include/jpeglib.h
|
|
18325 |
+ then
|
|
18326 |
+ jpeg_ok=yes
|
|
18327 |
+ fi
|
|
18328 |
+
|
|
18329 |
if test "x$jpeg_ok" = "xyes"; then
|
|
18330 |
old_libs="$LIBS"
|
|
18331 |
- echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
|
18332 |
-echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6
|
|
18333 |
+ { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
|
18334 |
+echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; }
|
|
18335 |
if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
|
|
18336 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18337 |
else
|
|
18338 |
@@ -6306,56 +7867,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
18339 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
18340 |
/* end confdefs.h. */
|
|
18341 |
|
|
18342 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
18343 |
+/* Override any GCC internal prototype to avoid an error.
|
|
18344 |
+ Use char because int might match the return type of a GCC
|
|
18345 |
+ builtin and then its argument prototype would still apply. */
|
|
18346 |
#ifdef __cplusplus
|
|
18347 |
extern "C"
|
|
18348 |
#endif
|
|
18349 |
-/* We use char because int might match the return type of a gcc2
|
|
18350 |
- builtin and then its argument prototype would still apply. */
|
|
18351 |
char jpeg_destroy_decompress ();
|
|
18352 |
int
|
|
18353 |
main ()
|
|
18354 |
{
|
|
18355 |
-jpeg_destroy_decompress ();
|
|
18356 |
+return jpeg_destroy_decompress ();
|
|
18357 |
;
|
|
18358 |
return 0;
|
|
18359 |
}
|
|
18360 |
_ACEOF
|
|
18361 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
18362 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
18363 |
- (eval $ac_link) 2>conftest.er1
|
|
18364 |
+if { (ac_try="$ac_link"
|
|
18365 |
+case "(($ac_try" in
|
|
18366 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18367 |
+ *) ac_try_echo=$ac_try;;
|
|
18368 |
+esac
|
|
18369 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18370 |
+ (eval "$ac_link") 2>conftest.er1
|
|
18371 |
ac_status=$?
|
|
18372 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18373 |
rm -f conftest.er1
|
|
18374 |
cat conftest.err >&5
|
|
18375 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18376 |
- (exit $ac_status); } &&
|
|
18377 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18378 |
- || test ! -s conftest.err'
|
|
18379 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18380 |
- (eval $ac_try) 2>&5
|
|
18381 |
- ac_status=$?
|
|
18382 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18383 |
- (exit $ac_status); }; } &&
|
|
18384 |
- { ac_try='test -s conftest$ac_exeext'
|
|
18385 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18386 |
- (eval $ac_try) 2>&5
|
|
18387 |
- ac_status=$?
|
|
18388 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18389 |
- (exit $ac_status); }; }; then
|
|
18390 |
+ (exit $ac_status); } && {
|
|
18391 |
+ test -z "$ac_c_werror_flag" ||
|
|
18392 |
+ test ! -s conftest.err
|
|
18393 |
+ } && test -s conftest$ac_exeext &&
|
|
18394 |
+ $as_test_x conftest$ac_exeext; then
|
|
18395 |
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
|
|
18396 |
else
|
|
18397 |
echo "$as_me: failed program was:" >&5
|
|
18398 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18399 |
|
|
18400 |
-ac_cv_lib_jpeg_jpeg_destroy_decompress=no
|
|
18401 |
+ ac_cv_lib_jpeg_jpeg_destroy_decompress=no
|
|
18402 |
fi
|
|
18403 |
-rm -f conftest.err conftest.$ac_objext \
|
|
18404 |
+
|
|
18405 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
18406 |
conftest$ac_exeext conftest.$ac_ext
|
|
18407 |
LIBS=$ac_check_lib_save_LIBS
|
|
18408 |
fi
|
|
18409 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
|
|
18410 |
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6
|
|
18411 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
|
|
18412 |
+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
|
|
18413 |
if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
|
|
18414 |
jpeg_ok=yes
|
|
18415 |
else
|
|
18416 |
@@ -6387,19 +7945,18 @@ _ACEOF
|
|
18417 |
|
|
18418 |
fi
|
|
18419 |
|
|
18420 |
-if test "x$enable_png" = "xyes"; then
|
|
18421 |
if test "${ac_cv_header_zlib_h+set}" = set; then
|
|
18422 |
- echo "$as_me:$LINENO: checking for zlib.h" >&5
|
|
18423 |
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
|
|
18424 |
+ { echo "$as_me:$LINENO: checking for zlib.h" >&5
|
|
18425 |
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
|
|
18426 |
if test "${ac_cv_header_zlib_h+set}" = set; then
|
|
18427 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18428 |
fi
|
|
18429 |
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
|
|
18430 |
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
|
|
18431 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
|
|
18432 |
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
|
|
18433 |
else
|
|
18434 |
# Is the header compilable?
|
|
18435 |
-echo "$as_me:$LINENO: checking zlib.h usability" >&5
|
|
18436 |
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
|
|
18437 |
+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
|
|
18438 |
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
|
|
18439 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18440 |
/* confdefs.h. */
|
|
18441 |
_ACEOF
|
|
18442 |
@@ -6410,41 +7967,37 @@ $ac_includes_default
|
|
18443 |
#include <zlib.h>
|
|
18444 |
_ACEOF
|
|
18445 |
rm -f conftest.$ac_objext
|
|
18446 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
18447 |
- (eval $ac_compile) 2>conftest.er1
|
|
18448 |
+if { (ac_try="$ac_compile"
|
|
18449 |
+case "(($ac_try" in
|
|
18450 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18451 |
+ *) ac_try_echo=$ac_try;;
|
|
18452 |
+esac
|
|
18453 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18454 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
18455 |
ac_status=$?
|
|
18456 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18457 |
rm -f conftest.er1
|
|
18458 |
cat conftest.err >&5
|
|
18459 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18460 |
- (exit $ac_status); } &&
|
|
18461 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18462 |
- || test ! -s conftest.err'
|
|
18463 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18464 |
- (eval $ac_try) 2>&5
|
|
18465 |
- ac_status=$?
|
|
18466 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18467 |
- (exit $ac_status); }; } &&
|
|
18468 |
- { ac_try='test -s conftest.$ac_objext'
|
|
18469 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18470 |
- (eval $ac_try) 2>&5
|
|
18471 |
- ac_status=$?
|
|
18472 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18473 |
- (exit $ac_status); }; }; then
|
|
18474 |
+ (exit $ac_status); } && {
|
|
18475 |
+ test -z "$ac_c_werror_flag" ||
|
|
18476 |
+ test ! -s conftest.err
|
|
18477 |
+ } && test -s conftest.$ac_objext; then
|
|
18478 |
ac_header_compiler=yes
|
|
18479 |
else
|
|
18480 |
echo "$as_me: failed program was:" >&5
|
|
18481 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18482 |
|
|
18483 |
-ac_header_compiler=no
|
|
18484 |
+ ac_header_compiler=no
|
|
18485 |
fi
|
|
18486 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18487 |
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
18488 |
-echo "${ECHO_T}$ac_header_compiler" >&6
|
|
18489 |
+
|
|
18490 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18491 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
18492 |
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
18493 |
|
|
18494 |
# Is the header present?
|
|
18495 |
-echo "$as_me:$LINENO: checking zlib.h presence" >&5
|
|
18496 |
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
|
|
18497 |
+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
|
|
18498 |
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
|
|
18499 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18500 |
/* confdefs.h. */
|
|
18501 |
_ACEOF
|
|
18502 |
@@ -6453,24 +8006,22 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
18503 |
/* end confdefs.h. */
|
|
18504 |
#include <zlib.h>
|
|
18505 |
_ACEOF
|
|
18506 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
18507 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
18508 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
18509 |
+case "(($ac_try" in
|
|
18510 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18511 |
+ *) ac_try_echo=$ac_try;;
|
|
18512 |
+esac
|
|
18513 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18514 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
18515 |
ac_status=$?
|
|
18516 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18517 |
rm -f conftest.er1
|
|
18518 |
cat conftest.err >&5
|
|
18519 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18520 |
- (exit $ac_status); } >/dev/null; then
|
|
18521 |
- if test -s conftest.err; then
|
|
18522 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
18523 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
18524 |
- else
|
|
18525 |
- ac_cpp_err=
|
|
18526 |
- fi
|
|
18527 |
-else
|
|
18528 |
- ac_cpp_err=yes
|
|
18529 |
-fi
|
|
18530 |
-if test -z "$ac_cpp_err"; then
|
|
18531 |
+ (exit $ac_status); } >/dev/null && {
|
|
18532 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
18533 |
+ test ! -s conftest.err
|
|
18534 |
+ }; then
|
|
18535 |
ac_header_preproc=yes
|
|
18536 |
else
|
|
18537 |
echo "$as_me: failed program was:" >&5
|
|
18538 |
@@ -6478,9 +8029,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
18539 |
|
|
18540 |
ac_header_preproc=no
|
|
18541 |
fi
|
|
18542 |
+
|
|
18543 |
rm -f conftest.err conftest.$ac_ext
|
|
18544 |
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
18545 |
-echo "${ECHO_T}$ac_header_preproc" >&6
|
|
18546 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
18547 |
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
18548 |
|
|
18549 |
# So? What about this header?
|
|
18550 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
18551 |
@@ -6504,25 +8056,18 @@ echo "$as_me: WARNING: zlib.h: secti
|
|
18552 |
echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
|
|
18553 |
{ echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
|
|
18554 |
echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
|
|
18555 |
- (
|
|
18556 |
- cat <<\_ASBOX
|
|
18557 |
-## ------------------------------------------ ##
|
|
18558 |
-## Report this to the AC_PACKAGE_NAME lists. ##
|
|
18559 |
-## ------------------------------------------ ##
|
|
18560 |
-_ASBOX
|
|
18561 |
- ) |
|
|
18562 |
- sed "s/^/$as_me: WARNING: /" >&2
|
|
18563 |
+
|
|
18564 |
;;
|
|
18565 |
esac
|
|
18566 |
-echo "$as_me:$LINENO: checking for zlib.h" >&5
|
|
18567 |
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
|
|
18568 |
+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
|
|
18569 |
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
|
|
18570 |
if test "${ac_cv_header_zlib_h+set}" = set; then
|
|
18571 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18572 |
else
|
|
18573 |
ac_cv_header_zlib_h=$ac_header_preproc
|
|
18574 |
fi
|
|
18575 |
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
|
|
18576 |
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
|
|
18577 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
|
|
18578 |
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
|
|
18579 |
|
|
18580 |
fi
|
|
18581 |
if test $ac_cv_header_zlib_h = yes; then
|
|
18582 |
@@ -6535,8 +8080,8 @@ fi
|
|
18583 |
|
|
18584 |
if test "x$libz_ok" = "xyes"; then
|
|
18585 |
old_libs="$LIBS"
|
|
18586 |
- echo "$as_me:$LINENO: checking for zlibVersion in -lz" >&5
|
|
18587 |
-echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6
|
|
18588 |
+ { echo "$as_me:$LINENO: checking for zlibVersion in -lz" >&5
|
|
18589 |
+echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6; }
|
|
18590 |
if test "${ac_cv_lib_z_zlibVersion+set}" = set; then
|
|
18591 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18592 |
else
|
|
18593 |
@@ -6549,56 +8094,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
18594 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
18595 |
/* end confdefs.h. */
|
|
18596 |
|
|
18597 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
18598 |
+/* Override any GCC internal prototype to avoid an error.
|
|
18599 |
+ Use char because int might match the return type of a GCC
|
|
18600 |
+ builtin and then its argument prototype would still apply. */
|
|
18601 |
#ifdef __cplusplus
|
|
18602 |
extern "C"
|
|
18603 |
#endif
|
|
18604 |
-/* We use char because int might match the return type of a gcc2
|
|
18605 |
- builtin and then its argument prototype would still apply. */
|
|
18606 |
char zlibVersion ();
|
|
18607 |
int
|
|
18608 |
main ()
|
|
18609 |
{
|
|
18610 |
-zlibVersion ();
|
|
18611 |
+return zlibVersion ();
|
|
18612 |
;
|
|
18613 |
return 0;
|
|
18614 |
}
|
|
18615 |
_ACEOF
|
|
18616 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
18617 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
18618 |
- (eval $ac_link) 2>conftest.er1
|
|
18619 |
+if { (ac_try="$ac_link"
|
|
18620 |
+case "(($ac_try" in
|
|
18621 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18622 |
+ *) ac_try_echo=$ac_try;;
|
|
18623 |
+esac
|
|
18624 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18625 |
+ (eval "$ac_link") 2>conftest.er1
|
|
18626 |
ac_status=$?
|
|
18627 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18628 |
rm -f conftest.er1
|
|
18629 |
cat conftest.err >&5
|
|
18630 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18631 |
- (exit $ac_status); } &&
|
|
18632 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18633 |
- || test ! -s conftest.err'
|
|
18634 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18635 |
- (eval $ac_try) 2>&5
|
|
18636 |
- ac_status=$?
|
|
18637 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18638 |
- (exit $ac_status); }; } &&
|
|
18639 |
- { ac_try='test -s conftest$ac_exeext'
|
|
18640 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18641 |
- (eval $ac_try) 2>&5
|
|
18642 |
- ac_status=$?
|
|
18643 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18644 |
- (exit $ac_status); }; }; then
|
|
18645 |
+ (exit $ac_status); } && {
|
|
18646 |
+ test -z "$ac_c_werror_flag" ||
|
|
18647 |
+ test ! -s conftest.err
|
|
18648 |
+ } && test -s conftest$ac_exeext &&
|
|
18649 |
+ $as_test_x conftest$ac_exeext; then
|
|
18650 |
ac_cv_lib_z_zlibVersion=yes
|
|
18651 |
else
|
|
18652 |
echo "$as_me: failed program was:" >&5
|
|
18653 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18654 |
|
|
18655 |
-ac_cv_lib_z_zlibVersion=no
|
|
18656 |
+ ac_cv_lib_z_zlibVersion=no
|
|
18657 |
fi
|
|
18658 |
-rm -f conftest.err conftest.$ac_objext \
|
|
18659 |
+
|
|
18660 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
18661 |
conftest$ac_exeext conftest.$ac_ext
|
|
18662 |
LIBS=$ac_check_lib_save_LIBS
|
|
18663 |
fi
|
|
18664 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_zlibVersion" >&5
|
|
18665 |
-echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6
|
|
18666 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_zlibVersion" >&5
|
|
18667 |
+echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6; }
|
|
18668 |
if test $ac_cv_lib_z_zlibVersion = yes; then
|
|
18669 |
libz_ok=yes
|
|
18670 |
else
|
|
18671 |
@@ -6614,11 +8156,10 @@ fi
|
|
18672 |
{ echo "$as_me:$LINENO: WARNING: *** No libz found. Disabling PNG images ***" >&5
|
|
18673 |
echo "$as_me: WARNING: *** No libz found. Disabling PNG images ***" >&2;}
|
|
18674 |
fi
|
|
18675 |
-fi
|
|
18676 |
|
|
18677 |
if test "x$enable_png" = "xyes" && test "x$libz_ok" = "xyes"; then
|
|
18678 |
- echo "$as_me:$LINENO: checking for libpng-config" >&5
|
|
18679 |
-echo $ECHO_N "checking for libpng-config... $ECHO_C" >&6
|
|
18680 |
+ { echo "$as_me:$LINENO: checking for libpng-config" >&5
|
|
18681 |
+echo $ECHO_N "checking for libpng-config... $ECHO_C" >&6; }
|
|
18682 |
|
|
18683 |
if test -z "$PNG_CONFIG"; then
|
|
18684 |
PNG_CONFIG=`which libpng12-config`
|
|
18685 |
@@ -6631,26 +8172,26 @@ echo $ECHO_N "checking for libpng-config
|
|
18686 |
fi
|
|
18687 |
|
|
18688 |
if test -n "$PNG_CONFIG" && test -x "$PNG_CONFIG"; then
|
|
18689 |
- echo "$as_me:$LINENO: result: $PNG_CONFIG" >&5
|
|
18690 |
-echo "${ECHO_T}$PNG_CONFIG" >&6
|
|
18691 |
+ { echo "$as_me:$LINENO: result: $PNG_CONFIG" >&5
|
|
18692 |
+echo "${ECHO_T}$PNG_CONFIG" >&6; }
|
|
18693 |
png_ok="yes"
|
|
18694 |
else
|
|
18695 |
- echo "$as_me:$LINENO: result: missing" >&5
|
|
18696 |
-echo "${ECHO_T}missing" >&6
|
|
18697 |
+ { echo "$as_me:$LINENO: result: missing" >&5
|
|
18698 |
+echo "${ECHO_T}missing" >&6; }
|
|
18699 |
png_ok="no"
|
|
18700 |
fi
|
|
18701 |
|
|
18702 |
if test "x$png_ok" = "xyes"; then
|
|
18703 |
- echo "$as_me:$LINENO: checking for libpng version" >&5
|
|
18704 |
-echo $ECHO_N "checking for libpng version... $ECHO_C" >&6
|
|
18705 |
+ { echo "$as_me:$LINENO: checking for libpng version" >&5
|
|
18706 |
+echo $ECHO_N "checking for libpng version... $ECHO_C" >&6; }
|
|
18707 |
png_version=`$PNG_CONFIG --version`
|
|
18708 |
case $png_version in
|
|
18709 |
- 1.2.*) echo "$as_me:$LINENO: result: $png_version (newer version)" >&5
|
|
18710 |
-echo "${ECHO_T}$png_version (newer version)" >&6 ;;
|
|
18711 |
- 1.0.*) echo "$as_me:$LINENO: result: $png_version (older version)" >&5
|
|
18712 |
-echo "${ECHO_T}$png_version (older version)" >&6 ;;
|
|
18713 |
- *) echo "$as_me:$LINENO: result: ERROR" >&5
|
|
18714 |
-echo "${ECHO_T}ERROR" >&6 ;;
|
|
18715 |
+ 1.2.*) { echo "$as_me:$LINENO: result: $png_version (newer version)" >&5
|
|
18716 |
+echo "${ECHO_T}$png_version (newer version)" >&6; } ;;
|
|
18717 |
+ 1.0.*) { echo "$as_me:$LINENO: result: $png_version (older version)" >&5
|
|
18718 |
+echo "${ECHO_T}$png_version (older version)" >&6; } ;;
|
|
18719 |
+ *) { echo "$as_me:$LINENO: result: ERROR" >&5
|
|
18720 |
+echo "${ECHO_T}ERROR" >&6; } ;;
|
|
18721 |
esac
|
|
18722 |
|
|
18723 |
LIBPNG_CFLAGS=`$PNG_CONFIG --cflags`
|
|
18724 |
@@ -6664,18 +8205,19 @@ echo "${ECHO_T}ERROR" >&6 ;;
|
|
18725 |
for ac_header in png.h libpng/png.h
|
|
18726 |
do
|
|
18727 |
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
18728 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
18729 |
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
18730 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
18731 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
18732 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
18733 |
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
18734 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
18735 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
18736 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18737 |
fi
|
|
18738 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
18739 |
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
18740 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
18741 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
18742 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
18743 |
else
|
|
18744 |
# Is the header compilable?
|
|
18745 |
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
18746 |
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
|
18747 |
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
18748 |
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
|
18749 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18750 |
/* confdefs.h. */
|
|
18751 |
_ACEOF
|
|
18752 |
@@ -6686,41 +8228,37 @@ $ac_includes_default
|
|
18753 |
#include <$ac_header>
|
|
18754 |
_ACEOF
|
|
18755 |
rm -f conftest.$ac_objext
|
|
18756 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
18757 |
- (eval $ac_compile) 2>conftest.er1
|
|
18758 |
+if { (ac_try="$ac_compile"
|
|
18759 |
+case "(($ac_try" in
|
|
18760 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18761 |
+ *) ac_try_echo=$ac_try;;
|
|
18762 |
+esac
|
|
18763 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18764 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
18765 |
ac_status=$?
|
|
18766 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18767 |
rm -f conftest.er1
|
|
18768 |
cat conftest.err >&5
|
|
18769 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18770 |
- (exit $ac_status); } &&
|
|
18771 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18772 |
- || test ! -s conftest.err'
|
|
18773 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18774 |
- (eval $ac_try) 2>&5
|
|
18775 |
- ac_status=$?
|
|
18776 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18777 |
- (exit $ac_status); }; } &&
|
|
18778 |
- { ac_try='test -s conftest.$ac_objext'
|
|
18779 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18780 |
- (eval $ac_try) 2>&5
|
|
18781 |
- ac_status=$?
|
|
18782 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18783 |
- (exit $ac_status); }; }; then
|
|
18784 |
+ (exit $ac_status); } && {
|
|
18785 |
+ test -z "$ac_c_werror_flag" ||
|
|
18786 |
+ test ! -s conftest.err
|
|
18787 |
+ } && test -s conftest.$ac_objext; then
|
|
18788 |
ac_header_compiler=yes
|
|
18789 |
else
|
|
18790 |
echo "$as_me: failed program was:" >&5
|
|
18791 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18792 |
|
|
18793 |
-ac_header_compiler=no
|
|
18794 |
+ ac_header_compiler=no
|
|
18795 |
fi
|
|
18796 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18797 |
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
18798 |
-echo "${ECHO_T}$ac_header_compiler" >&6
|
|
18799 |
+
|
|
18800 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
18801 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
18802 |
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
18803 |
|
|
18804 |
# Is the header present?
|
|
18805 |
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
18806 |
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
|
18807 |
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
18808 |
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
|
18809 |
cat >conftest.$ac_ext <<_ACEOF
|
|
18810 |
/* confdefs.h. */
|
|
18811 |
_ACEOF
|
|
18812 |
@@ -6729,24 +8267,22 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
18813 |
/* end confdefs.h. */
|
|
18814 |
#include <$ac_header>
|
|
18815 |
_ACEOF
|
|
18816 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
18817 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
18818 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
18819 |
+case "(($ac_try" in
|
|
18820 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18821 |
+ *) ac_try_echo=$ac_try;;
|
|
18822 |
+esac
|
|
18823 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18824 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
18825 |
ac_status=$?
|
|
18826 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18827 |
rm -f conftest.er1
|
|
18828 |
cat conftest.err >&5
|
|
18829 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18830 |
- (exit $ac_status); } >/dev/null; then
|
|
18831 |
- if test -s conftest.err; then
|
|
18832 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
18833 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
18834 |
- else
|
|
18835 |
- ac_cpp_err=
|
|
18836 |
- fi
|
|
18837 |
-else
|
|
18838 |
- ac_cpp_err=yes
|
|
18839 |
-fi
|
|
18840 |
-if test -z "$ac_cpp_err"; then
|
|
18841 |
+ (exit $ac_status); } >/dev/null && {
|
|
18842 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
18843 |
+ test ! -s conftest.err
|
|
18844 |
+ }; then
|
|
18845 |
ac_header_preproc=yes
|
|
18846 |
else
|
|
18847 |
echo "$as_me: failed program was:" >&5
|
|
18848 |
@@ -6754,9 +8290,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
18849 |
|
|
18850 |
ac_header_preproc=no
|
|
18851 |
fi
|
|
18852 |
+
|
|
18853 |
rm -f conftest.err conftest.$ac_ext
|
|
18854 |
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
18855 |
-echo "${ECHO_T}$ac_header_preproc" >&6
|
|
18856 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
18857 |
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
18858 |
|
|
18859 |
# So? What about this header?
|
|
18860 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
18861 |
@@ -6780,25 +8317,19 @@ echo "$as_me: WARNING: $ac_header: s
|
|
18862 |
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
18863 |
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
18864 |
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
18865 |
- (
|
|
18866 |
- cat <<\_ASBOX
|
|
18867 |
-## ------------------------------------------ ##
|
|
18868 |
-## Report this to the AC_PACKAGE_NAME lists. ##
|
|
18869 |
-## ------------------------------------------ ##
|
|
18870 |
-_ASBOX
|
|
18871 |
- ) |
|
|
18872 |
- sed "s/^/$as_me: WARNING: /" >&2
|
|
18873 |
+
|
|
18874 |
;;
|
|
18875 |
esac
|
|
18876 |
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
18877 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
18878 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
18879 |
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
18880 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
18881 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
18882 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18883 |
else
|
|
18884 |
eval "$as_ac_Header=\$ac_header_preproc"
|
|
18885 |
fi
|
|
18886 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
18887 |
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
18888 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
18889 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
18890 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
18891 |
|
|
18892 |
fi
|
|
18893 |
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
18894 |
@@ -6815,8 +8346,8 @@ done
|
|
18895 |
|
|
18896 |
if test "x$png_ok" = "xyes"; then
|
|
18897 |
old_libs="$LIBS"
|
|
18898 |
- echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
|
|
18899 |
-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
|
|
18900 |
+ { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
|
|
18901 |
+echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
|
|
18902 |
if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
|
|
18903 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18904 |
else
|
|
18905 |
@@ -6829,56 +8360,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
18906 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
18907 |
/* end confdefs.h. */
|
|
18908 |
|
|
18909 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
18910 |
+/* Override any GCC internal prototype to avoid an error.
|
|
18911 |
+ Use char because int might match the return type of a GCC
|
|
18912 |
+ builtin and then its argument prototype would still apply. */
|
|
18913 |
#ifdef __cplusplus
|
|
18914 |
extern "C"
|
|
18915 |
#endif
|
|
18916 |
-/* We use char because int might match the return type of a gcc2
|
|
18917 |
- builtin and then its argument prototype would still apply. */
|
|
18918 |
char png_check_sig ();
|
|
18919 |
int
|
|
18920 |
main ()
|
|
18921 |
{
|
|
18922 |
-png_check_sig ();
|
|
18923 |
+return png_check_sig ();
|
|
18924 |
;
|
|
18925 |
return 0;
|
|
18926 |
}
|
|
18927 |
_ACEOF
|
|
18928 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
18929 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
18930 |
- (eval $ac_link) 2>conftest.er1
|
|
18931 |
+if { (ac_try="$ac_link"
|
|
18932 |
+case "(($ac_try" in
|
|
18933 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
18934 |
+ *) ac_try_echo=$ac_try;;
|
|
18935 |
+esac
|
|
18936 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
18937 |
+ (eval "$ac_link") 2>conftest.er1
|
|
18938 |
ac_status=$?
|
|
18939 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
18940 |
rm -f conftest.er1
|
|
18941 |
cat conftest.err >&5
|
|
18942 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18943 |
- (exit $ac_status); } &&
|
|
18944 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
18945 |
- || test ! -s conftest.err'
|
|
18946 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18947 |
- (eval $ac_try) 2>&5
|
|
18948 |
- ac_status=$?
|
|
18949 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18950 |
- (exit $ac_status); }; } &&
|
|
18951 |
- { ac_try='test -s conftest$ac_exeext'
|
|
18952 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
18953 |
- (eval $ac_try) 2>&5
|
|
18954 |
- ac_status=$?
|
|
18955 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
18956 |
- (exit $ac_status); }; }; then
|
|
18957 |
+ (exit $ac_status); } && {
|
|
18958 |
+ test -z "$ac_c_werror_flag" ||
|
|
18959 |
+ test ! -s conftest.err
|
|
18960 |
+ } && test -s conftest$ac_exeext &&
|
|
18961 |
+ $as_test_x conftest$ac_exeext; then
|
|
18962 |
ac_cv_lib_png_png_check_sig=yes
|
|
18963 |
else
|
|
18964 |
echo "$as_me: failed program was:" >&5
|
|
18965 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
18966 |
|
|
18967 |
-ac_cv_lib_png_png_check_sig=no
|
|
18968 |
+ ac_cv_lib_png_png_check_sig=no
|
|
18969 |
fi
|
|
18970 |
-rm -f conftest.err conftest.$ac_objext \
|
|
18971 |
+
|
|
18972 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
18973 |
conftest$ac_exeext conftest.$ac_ext
|
|
18974 |
LIBS=$ac_check_lib_save_LIBS
|
|
18975 |
fi
|
|
18976 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
|
|
18977 |
-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
|
|
18978 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
|
|
18979 |
+echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
|
|
18980 |
if test $ac_cv_lib_png_png_check_sig = yes; then
|
|
18981 |
png_ok=yes
|
|
18982 |
else
|
|
18983 |
@@ -6917,17 +8445,17 @@ fi
|
|
18984 |
|
|
18985 |
if test "x$enable_ssl" = "xyes"; then
|
|
18986 |
if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
|
|
18987 |
- echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
|
|
18988 |
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
|
|
18989 |
+ { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
|
|
18990 |
+echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
|
|
18991 |
if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
|
|
18992 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
18993 |
fi
|
|
18994 |
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
|
|
18995 |
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
|
|
18996 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
|
|
18997 |
+echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
|
|
18998 |
else
|
|
18999 |
# Is the header compilable?
|
|
19000 |
-echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
|
|
19001 |
-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6
|
|
19002 |
+{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
|
|
19003 |
+echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; }
|
|
19004 |
cat >conftest.$ac_ext <<_ACEOF
|
|
19005 |
/* confdefs.h. */
|
|
19006 |
_ACEOF
|
|
19007 |
@@ -6938,41 +8466,37 @@ $ac_includes_default
|
|
19008 |
#include <openssl/ssl.h>
|
|
19009 |
_ACEOF
|
|
19010 |
rm -f conftest.$ac_objext
|
|
19011 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
19012 |
- (eval $ac_compile) 2>conftest.er1
|
|
19013 |
+if { (ac_try="$ac_compile"
|
|
19014 |
+case "(($ac_try" in
|
|
19015 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19016 |
+ *) ac_try_echo=$ac_try;;
|
|
19017 |
+esac
|
|
19018 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19019 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
19020 |
ac_status=$?
|
|
19021 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19022 |
rm -f conftest.er1
|
|
19023 |
cat conftest.err >&5
|
|
19024 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19025 |
- (exit $ac_status); } &&
|
|
19026 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19027 |
- || test ! -s conftest.err'
|
|
19028 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19029 |
- (eval $ac_try) 2>&5
|
|
19030 |
- ac_status=$?
|
|
19031 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19032 |
- (exit $ac_status); }; } &&
|
|
19033 |
- { ac_try='test -s conftest.$ac_objext'
|
|
19034 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19035 |
- (eval $ac_try) 2>&5
|
|
19036 |
- ac_status=$?
|
|
19037 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19038 |
- (exit $ac_status); }; }; then
|
|
19039 |
+ (exit $ac_status); } && {
|
|
19040 |
+ test -z "$ac_c_werror_flag" ||
|
|
19041 |
+ test ! -s conftest.err
|
|
19042 |
+ } && test -s conftest.$ac_objext; then
|
|
19043 |
ac_header_compiler=yes
|
|
19044 |
else
|
|
19045 |
echo "$as_me: failed program was:" >&5
|
|
19046 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
19047 |
|
|
19048 |
-ac_header_compiler=no
|
|
19049 |
+ ac_header_compiler=no
|
|
19050 |
fi
|
|
19051 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
19052 |
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
19053 |
-echo "${ECHO_T}$ac_header_compiler" >&6
|
|
19054 |
+
|
|
19055 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
19056 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
19057 |
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
19058 |
|
|
19059 |
# Is the header present?
|
|
19060 |
-echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
|
|
19061 |
-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6
|
|
19062 |
+{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
|
|
19063 |
+echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; }
|
|
19064 |
cat >conftest.$ac_ext <<_ACEOF
|
|
19065 |
/* confdefs.h. */
|
|
19066 |
_ACEOF
|
|
19067 |
@@ -6981,24 +8505,250 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
19068 |
/* end confdefs.h. */
|
|
19069 |
#include <openssl/ssl.h>
|
|
19070 |
_ACEOF
|
|
19071 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
19072 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
19073 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
19074 |
+case "(($ac_try" in
|
|
19075 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19076 |
+ *) ac_try_echo=$ac_try;;
|
|
19077 |
+esac
|
|
19078 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19079 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
19080 |
+ ac_status=$?
|
|
19081 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
19082 |
+ rm -f conftest.er1
|
|
19083 |
+ cat conftest.err >&5
|
|
19084 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19085 |
+ (exit $ac_status); } >/dev/null && {
|
|
19086 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
19087 |
+ test ! -s conftest.err
|
|
19088 |
+ }; then
|
|
19089 |
+ ac_header_preproc=yes
|
|
19090 |
+else
|
|
19091 |
+ echo "$as_me: failed program was:" >&5
|
|
19092 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
19093 |
+
|
|
19094 |
+ ac_header_preproc=no
|
|
19095 |
+fi
|
|
19096 |
+
|
|
19097 |
+rm -f conftest.err conftest.$ac_ext
|
|
19098 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
19099 |
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
19100 |
+
|
|
19101 |
+# So? What about this header?
|
|
19102 |
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
19103 |
+ yes:no: )
|
|
19104 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
19105 |
+echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
19106 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
|
|
19107 |
+echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
|
|
19108 |
+ ac_header_preproc=yes
|
|
19109 |
+ ;;
|
|
19110 |
+ no:yes:* )
|
|
19111 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
|
|
19112 |
+echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
|
|
19113 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5
|
|
19114 |
+echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;}
|
|
19115 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
|
|
19116 |
+echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
|
|
19117 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
19118 |
+echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
19119 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
|
|
19120 |
+echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
|
|
19121 |
+ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
|
|
19122 |
+echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
|
|
19123 |
+
|
|
19124 |
+ ;;
|
|
19125 |
+esac
|
|
19126 |
+{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
|
|
19127 |
+echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
|
|
19128 |
+if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
|
|
19129 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19130 |
+else
|
|
19131 |
+ ac_cv_header_openssl_ssl_h=$ac_header_preproc
|
|
19132 |
+fi
|
|
19133 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
|
|
19134 |
+echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
|
|
19135 |
+
|
|
19136 |
+fi
|
|
19137 |
+if test $ac_cv_header_openssl_ssl_h = yes; then
|
|
19138 |
+ ssl_ok=yes
|
|
19139 |
+else
|
|
19140 |
+ ssl_ok=no
|
|
19141 |
+fi
|
|
19142 |
+
|
|
19143 |
+
|
|
19144 |
+
|
|
19145 |
+ if test "x$ssl_ok" = "xyes"; then
|
|
19146 |
+ old_libs="$LIBS"
|
|
19147 |
+ { echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
|
|
19148 |
+echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6; }
|
|
19149 |
+if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
|
|
19150 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19151 |
+else
|
|
19152 |
+ ac_check_lib_save_LIBS=$LIBS
|
|
19153 |
+LIBS="-lssl -lcrypto $LIBS"
|
|
19154 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
19155 |
+/* confdefs.h. */
|
|
19156 |
+_ACEOF
|
|
19157 |
+cat confdefs.h >>conftest.$ac_ext
|
|
19158 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
19159 |
+/* end confdefs.h. */
|
|
19160 |
+
|
|
19161 |
+/* Override any GCC internal prototype to avoid an error.
|
|
19162 |
+ Use char because int might match the return type of a GCC
|
|
19163 |
+ builtin and then its argument prototype would still apply. */
|
|
19164 |
+#ifdef __cplusplus
|
|
19165 |
+extern "C"
|
|
19166 |
+#endif
|
|
19167 |
+char SSL_library_init ();
|
|
19168 |
+int
|
|
19169 |
+main ()
|
|
19170 |
+{
|
|
19171 |
+return SSL_library_init ();
|
|
19172 |
+ ;
|
|
19173 |
+ return 0;
|
|
19174 |
+}
|
|
19175 |
+_ACEOF
|
|
19176 |
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19177 |
+if { (ac_try="$ac_link"
|
|
19178 |
+case "(($ac_try" in
|
|
19179 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19180 |
+ *) ac_try_echo=$ac_try;;
|
|
19181 |
+esac
|
|
19182 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19183 |
+ (eval "$ac_link") 2>conftest.er1
|
|
19184 |
ac_status=$?
|
|
19185 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19186 |
rm -f conftest.er1
|
|
19187 |
cat conftest.err >&5
|
|
19188 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19189 |
- (exit $ac_status); } >/dev/null; then
|
|
19190 |
- if test -s conftest.err; then
|
|
19191 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
19192 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
19193 |
+ (exit $ac_status); } && {
|
|
19194 |
+ test -z "$ac_c_werror_flag" ||
|
|
19195 |
+ test ! -s conftest.err
|
|
19196 |
+ } && test -s conftest$ac_exeext &&
|
|
19197 |
+ $as_test_x conftest$ac_exeext; then
|
|
19198 |
+ ac_cv_lib_ssl_SSL_library_init=yes
|
|
19199 |
+else
|
|
19200 |
+ echo "$as_me: failed program was:" >&5
|
|
19201 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
19202 |
+
|
|
19203 |
+ ac_cv_lib_ssl_SSL_library_init=no
|
|
19204 |
+fi
|
|
19205 |
+
|
|
19206 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
19207 |
+ conftest$ac_exeext conftest.$ac_ext
|
|
19208 |
+LIBS=$ac_check_lib_save_LIBS
|
|
19209 |
+fi
|
|
19210 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
|
|
19211 |
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6; }
|
|
19212 |
+if test $ac_cv_lib_ssl_SSL_library_init = yes; then
|
|
19213 |
+ ssl_ok=yes
|
|
19214 |
+else
|
|
19215 |
+ ssl_ok=no
|
|
19216 |
+fi
|
|
19217 |
+
|
|
19218 |
+ LIBS="$old_libs"
|
|
19219 |
+ fi
|
|
19220 |
+
|
|
19221 |
+ if test "x$ssl_ok" = "xyes"; then
|
|
19222 |
+ LIBSSL_LIBS="-lcrypto -lssl"
|
|
19223 |
else
|
|
19224 |
- ac_cpp_err=
|
|
19225 |
+ { echo "$as_me:$LINENO: WARNING: *** No libssl found. Disabling ssl support.***" >&5
|
|
19226 |
+echo "$as_me: WARNING: *** No libssl found. Disabling ssl support.***" >&2;}
|
|
19227 |
fi
|
|
19228 |
+fi
|
|
19229 |
+
|
|
19230 |
+if test "x$ssl_ok" = "xyes"; then
|
|
19231 |
+
|
|
19232 |
+cat >>confdefs.h <<\_ACEOF
|
|
19233 |
+#define ENABLE_SSL
|
|
19234 |
+_ACEOF
|
|
19235 |
+
|
|
19236 |
+fi
|
|
19237 |
+
|
|
19238 |
+if test "x$enable_ssl" = "xyes" ; then
|
|
19239 |
+
|
|
19240 |
+
|
|
19241 |
+for ac_header in openssl/ssl.h openssl/err.h
|
|
19242 |
+do
|
|
19243 |
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
19244 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
19245 |
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
19246 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
19247 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
19248 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19249 |
+fi
|
|
19250 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
19251 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
19252 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
19253 |
+else
|
|
19254 |
+ # Is the header compilable?
|
|
19255 |
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
19256 |
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
|
19257 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
19258 |
+/* confdefs.h. */
|
|
19259 |
+_ACEOF
|
|
19260 |
+cat confdefs.h >>conftest.$ac_ext
|
|
19261 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
19262 |
+/* end confdefs.h. */
|
|
19263 |
+$ac_includes_default
|
|
19264 |
+#include <$ac_header>
|
|
19265 |
+_ACEOF
|
|
19266 |
+rm -f conftest.$ac_objext
|
|
19267 |
+if { (ac_try="$ac_compile"
|
|
19268 |
+case "(($ac_try" in
|
|
19269 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19270 |
+ *) ac_try_echo=$ac_try;;
|
|
19271 |
+esac
|
|
19272 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19273 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
19274 |
+ ac_status=$?
|
|
19275 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
19276 |
+ rm -f conftest.er1
|
|
19277 |
+ cat conftest.err >&5
|
|
19278 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19279 |
+ (exit $ac_status); } && {
|
|
19280 |
+ test -z "$ac_c_werror_flag" ||
|
|
19281 |
+ test ! -s conftest.err
|
|
19282 |
+ } && test -s conftest.$ac_objext; then
|
|
19283 |
+ ac_header_compiler=yes
|
|
19284 |
else
|
|
19285 |
- ac_cpp_err=yes
|
|
19286 |
+ echo "$as_me: failed program was:" >&5
|
|
19287 |
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
19288 |
+
|
|
19289 |
+ ac_header_compiler=no
|
|
19290 |
fi
|
|
19291 |
-if test -z "$ac_cpp_err"; then
|
|
19292 |
+
|
|
19293 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
19294 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
19295 |
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
19296 |
+
|
|
19297 |
+# Is the header present?
|
|
19298 |
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
19299 |
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
|
19300 |
+cat >conftest.$ac_ext <<_ACEOF
|
|
19301 |
+/* confdefs.h. */
|
|
19302 |
+_ACEOF
|
|
19303 |
+cat confdefs.h >>conftest.$ac_ext
|
|
19304 |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
19305 |
+/* end confdefs.h. */
|
|
19306 |
+#include <$ac_header>
|
|
19307 |
+_ACEOF
|
|
19308 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
19309 |
+case "(($ac_try" in
|
|
19310 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19311 |
+ *) ac_try_echo=$ac_try;;
|
|
19312 |
+esac
|
|
19313 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19314 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
19315 |
+ ac_status=$?
|
|
19316 |
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
19317 |
+ rm -f conftest.er1
|
|
19318 |
+ cat conftest.err >&5
|
|
19319 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19320 |
+ (exit $ac_status); } >/dev/null && {
|
|
19321 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
19322 |
+ test ! -s conftest.err
|
|
19323 |
+ }; then
|
|
19324 |
ac_header_preproc=yes
|
|
19325 |
else
|
|
19326 |
echo "$as_me: failed program was:" >&5
|
|
19327 |
@@ -7006,70 +8756,65 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
19328 |
|
|
19329 |
ac_header_preproc=no
|
|
19330 |
fi
|
|
19331 |
+
|
|
19332 |
rm -f conftest.err conftest.$ac_ext
|
|
19333 |
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
19334 |
-echo "${ECHO_T}$ac_header_preproc" >&6
|
|
19335 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
19336 |
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
19337 |
|
|
19338 |
# So? What about this header?
|
|
19339 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
19340 |
yes:no: )
|
|
19341 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
19342 |
-echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
19343 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
|
|
19344 |
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
|
|
19345 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
19346 |
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
19347 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
19348 |
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
19349 |
ac_header_preproc=yes
|
|
19350 |
;;
|
|
19351 |
no:yes:* )
|
|
19352 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
|
|
19353 |
-echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
|
|
19354 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5
|
|
19355 |
-echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;}
|
|
19356 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
|
|
19357 |
-echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
|
|
19358 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
19359 |
-echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
19360 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
|
|
19361 |
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
|
|
19362 |
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
|
|
19363 |
-echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
|
|
19364 |
- (
|
|
19365 |
- cat <<\_ASBOX
|
|
19366 |
-## ------------------------------------------ ##
|
|
19367 |
-## Report this to the AC_PACKAGE_NAME lists. ##
|
|
19368 |
-## ------------------------------------------ ##
|
|
19369 |
-_ASBOX
|
|
19370 |
- ) |
|
|
19371 |
- sed "s/^/$as_me: WARNING: /" >&2
|
|
19372 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
19373 |
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
19374 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
19375 |
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
19376 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
19377 |
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
19378 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
19379 |
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
19380 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
19381 |
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
19382 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
19383 |
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
19384 |
+
|
|
19385 |
;;
|
|
19386 |
esac
|
|
19387 |
-echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
|
|
19388 |
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
|
|
19389 |
-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
|
|
19390 |
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
19391 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
19392 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
19393 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19394 |
else
|
|
19395 |
- ac_cv_header_openssl_ssl_h=$ac_header_preproc
|
|
19396 |
+ eval "$as_ac_Header=\$ac_header_preproc"
|
|
19397 |
fi
|
|
19398 |
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
|
|
19399 |
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
|
|
19400 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
19401 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
19402 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
19403 |
|
|
19404 |
fi
|
|
19405 |
-if test $ac_cv_header_openssl_ssl_h = yes; then
|
|
19406 |
- ssl_ok=yes
|
|
19407 |
-else
|
|
19408 |
- ssl_ok=no
|
|
19409 |
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
19410 |
+ cat >>confdefs.h <<_ACEOF
|
|
19411 |
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
19412 |
+_ACEOF
|
|
19413 |
+
|
|
19414 |
fi
|
|
19415 |
|
|
19416 |
+done
|
|
19417 |
|
|
19418 |
|
|
19419 |
- if test "x$ssl_ok" = "xyes"; then
|
|
19420 |
- old_libs="$LIBS"
|
|
19421 |
- echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
|
|
19422 |
-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6
|
|
19423 |
-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
|
|
19424 |
+{ echo "$as_me:$LINENO: checking for SSL_connect in -lssl" >&5
|
|
19425 |
+echo $ECHO_N "checking for SSL_connect in -lssl... $ECHO_C" >&6; }
|
|
19426 |
+if test "${ac_cv_lib_ssl_SSL_connect+set}" = set; then
|
|
19427 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19428 |
else
|
|
19429 |
ac_check_lib_save_LIBS=$LIBS
|
|
19430 |
-LIBS="-lssl -lcrypto $LIBS"
|
|
19431 |
+LIBS="-lssl $LIBS"
|
|
19432 |
cat >conftest.$ac_ext <<_ACEOF
|
|
19433 |
/* confdefs.h. */
|
|
19434 |
_ACEOF
|
|
19435 |
@@ -7077,88 +8822,82 @@ cat confdefs.h >>conftest.$ac_ext
|
|
19436 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
19437 |
/* end confdefs.h. */
|
|
19438 |
|
|
19439 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
19440 |
+/* Override any GCC internal prototype to avoid an error.
|
|
19441 |
+ Use char because int might match the return type of a GCC
|
|
19442 |
+ builtin and then its argument prototype would still apply. */
|
|
19443 |
#ifdef __cplusplus
|
|
19444 |
extern "C"
|
|
19445 |
#endif
|
|
19446 |
-/* We use char because int might match the return type of a gcc2
|
|
19447 |
- builtin and then its argument prototype would still apply. */
|
|
19448 |
-char SSL_library_init ();
|
|
19449 |
+char SSL_connect ();
|
|
19450 |
int
|
|
19451 |
main ()
|
|
19452 |
{
|
|
19453 |
-SSL_library_init ();
|
|
19454 |
+return SSL_connect ();
|
|
19455 |
;
|
|
19456 |
return 0;
|
|
19457 |
}
|
|
19458 |
_ACEOF
|
|
19459 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19460 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
19461 |
- (eval $ac_link) 2>conftest.er1
|
|
19462 |
+if { (ac_try="$ac_link"
|
|
19463 |
+case "(($ac_try" in
|
|
19464 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19465 |
+ *) ac_try_echo=$ac_try;;
|
|
19466 |
+esac
|
|
19467 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19468 |
+ (eval "$ac_link") 2>conftest.er1
|
|
19469 |
ac_status=$?
|
|
19470 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19471 |
rm -f conftest.er1
|
|
19472 |
cat conftest.err >&5
|
|
19473 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19474 |
- (exit $ac_status); } &&
|
|
19475 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19476 |
- || test ! -s conftest.err'
|
|
19477 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19478 |
- (eval $ac_try) 2>&5
|
|
19479 |
- ac_status=$?
|
|
19480 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19481 |
- (exit $ac_status); }; } &&
|
|
19482 |
- { ac_try='test -s conftest$ac_exeext'
|
|
19483 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19484 |
- (eval $ac_try) 2>&5
|
|
19485 |
- ac_status=$?
|
|
19486 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19487 |
- (exit $ac_status); }; }; then
|
|
19488 |
- ac_cv_lib_ssl_SSL_library_init=yes
|
|
19489 |
+ (exit $ac_status); } && {
|
|
19490 |
+ test -z "$ac_c_werror_flag" ||
|
|
19491 |
+ test ! -s conftest.err
|
|
19492 |
+ } && test -s conftest$ac_exeext &&
|
|
19493 |
+ $as_test_x conftest$ac_exeext; then
|
|
19494 |
+ ac_cv_lib_ssl_SSL_connect=yes
|
|
19495 |
else
|
|
19496 |
echo "$as_me: failed program was:" >&5
|
|
19497 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
19498 |
|
|
19499 |
-ac_cv_lib_ssl_SSL_library_init=no
|
|
19500 |
+ ac_cv_lib_ssl_SSL_connect=no
|
|
19501 |
fi
|
|
19502 |
-rm -f conftest.err conftest.$ac_objext \
|
|
19503 |
+
|
|
19504 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
19505 |
conftest$ac_exeext conftest.$ac_ext
|
|
19506 |
LIBS=$ac_check_lib_save_LIBS
|
|
19507 |
fi
|
|
19508 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
|
|
19509 |
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6
|
|
19510 |
-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
|
|
19511 |
- ssl_ok=yes
|
|
19512 |
-else
|
|
19513 |
- ssl_ok=no
|
|
19514 |
-fi
|
|
19515 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_connect" >&5
|
|
19516 |
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_connect" >&6; }
|
|
19517 |
+if test $ac_cv_lib_ssl_SSL_connect = yes; then
|
|
19518 |
+ cat >>confdefs.h <<_ACEOF
|
|
19519 |
+#define HAVE_LIBSSL 1
|
|
19520 |
+_ACEOF
|
|
19521 |
|
|
19522 |
- LIBS="$old_libs"
|
|
19523 |
- fi
|
|
19524 |
+ LIBS="-lssl $LIBS"
|
|
19525 |
|
|
19526 |
- if test "x$ssl_ok" = "xyes"; then
|
|
19527 |
- LIBSSL_LIBS="-lcrypto -lssl"
|
|
19528 |
- else
|
|
19529 |
- { echo "$as_me:$LINENO: WARNING: *** No libssl found. Disabling ssl support.***" >&5
|
|
19530 |
-echo "$as_me: WARNING: *** No libssl found. Disabling ssl support.***" >&2;}
|
|
19531 |
- fi
|
|
19532 |
+else
|
|
19533 |
+ enable_ssl="no"
|
|
19534 |
fi
|
|
19535 |
|
|
19536 |
-if test "x$ssl_ok" = "xyes"; then
|
|
19537 |
+ if test "x$enable_ssl" = "xno" ; then
|
|
19538 |
+ { echo "$as_me:$LINENO: WARNING: *** No libssl found. Disabling ssl. ***" >&5
|
|
19539 |
+echo "$as_me: WARNING: *** No libssl found. Disabling ssl. ***" >&2;}
|
|
19540 |
+ else
|
|
19541 |
|
|
19542 |
cat >>confdefs.h <<\_ACEOF
|
|
19543 |
-#define ENABLE_SSL
|
|
19544 |
+#define DILLO_SSL 1
|
|
19545 |
_ACEOF
|
|
19546 |
|
|
19547 |
+ fi
|
|
19548 |
fi
|
|
19549 |
|
|
19550 |
-
|
|
19551 |
if test -z "$LIBPTHREAD_LIBS"; then
|
|
19552 |
case $target in
|
|
19553 |
*-*-linux*|*-*-solaris*)
|
|
19554 |
old_libs="$LIBS"
|
|
19555 |
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
|
19556 |
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
|
|
19557 |
+ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
|
19558 |
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
|
|
19559 |
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
|
19560 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19561 |
else
|
|
19562 |
@@ -7171,56 +8910,53 @@ cat confdefs.h >>conftest.$ac_ext
|
|
19563 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
19564 |
/* end confdefs.h. */
|
|
19565 |
|
|
19566 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
19567 |
+/* Override any GCC internal prototype to avoid an error.
|
|
19568 |
+ Use char because int might match the return type of a GCC
|
|
19569 |
+ builtin and then its argument prototype would still apply. */
|
|
19570 |
#ifdef __cplusplus
|
|
19571 |
extern "C"
|
|
19572 |
#endif
|
|
19573 |
-/* We use char because int might match the return type of a gcc2
|
|
19574 |
- builtin and then its argument prototype would still apply. */
|
|
19575 |
char pthread_create ();
|
|
19576 |
int
|
|
19577 |
main ()
|
|
19578 |
{
|
|
19579 |
-pthread_create ();
|
|
19580 |
+return pthread_create ();
|
|
19581 |
;
|
|
19582 |
return 0;
|
|
19583 |
}
|
|
19584 |
_ACEOF
|
|
19585 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19586 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
19587 |
- (eval $ac_link) 2>conftest.er1
|
|
19588 |
+if { (ac_try="$ac_link"
|
|
19589 |
+case "(($ac_try" in
|
|
19590 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19591 |
+ *) ac_try_echo=$ac_try;;
|
|
19592 |
+esac
|
|
19593 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19594 |
+ (eval "$ac_link") 2>conftest.er1
|
|
19595 |
ac_status=$?
|
|
19596 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19597 |
rm -f conftest.er1
|
|
19598 |
cat conftest.err >&5
|
|
19599 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19600 |
- (exit $ac_status); } &&
|
|
19601 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19602 |
- || test ! -s conftest.err'
|
|
19603 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19604 |
- (eval $ac_try) 2>&5
|
|
19605 |
- ac_status=$?
|
|
19606 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19607 |
- (exit $ac_status); }; } &&
|
|
19608 |
- { ac_try='test -s conftest$ac_exeext'
|
|
19609 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19610 |
- (eval $ac_try) 2>&5
|
|
19611 |
- ac_status=$?
|
|
19612 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19613 |
- (exit $ac_status); }; }; then
|
|
19614 |
+ (exit $ac_status); } && {
|
|
19615 |
+ test -z "$ac_c_werror_flag" ||
|
|
19616 |
+ test ! -s conftest.err
|
|
19617 |
+ } && test -s conftest$ac_exeext &&
|
|
19618 |
+ $as_test_x conftest$ac_exeext; then
|
|
19619 |
ac_cv_lib_pthread_pthread_create=yes
|
|
19620 |
else
|
|
19621 |
echo "$as_me: failed program was:" >&5
|
|
19622 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
19623 |
|
|
19624 |
-ac_cv_lib_pthread_pthread_create=no
|
|
19625 |
+ ac_cv_lib_pthread_pthread_create=no
|
|
19626 |
fi
|
|
19627 |
-rm -f conftest.err conftest.$ac_objext \
|
|
19628 |
+
|
|
19629 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
19630 |
conftest$ac_exeext conftest.$ac_ext
|
|
19631 |
LIBS=$ac_check_lib_save_LIBS
|
|
19632 |
fi
|
|
19633 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
|
|
19634 |
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
|
|
19635 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
|
|
19636 |
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
|
|
19637 |
if test $ac_cv_lib_pthread_pthread_create = yes; then
|
|
19638 |
LIBPTHREAD_LIBS="-lpthread"
|
|
19639 |
fi
|
|
19640 |
@@ -7229,16 +8965,16 @@ fi
|
|
19641 |
;;
|
|
19642 |
|
|
19643 |
*-*-osf1*)
|
|
19644 |
- echo "$as_me:$LINENO: checking whether pthreads work" >&5
|
|
19645 |
-echo $ECHO_N "checking whether pthreads work... $ECHO_C" >&6
|
|
19646 |
+ { echo "$as_me:$LINENO: checking whether pthreads work" >&5
|
|
19647 |
+echo $ECHO_N "checking whether pthreads work... $ECHO_C" >&6; }
|
|
19648 |
LIBPTHREAD_LIBS="-lpthread -lexc -ldb"
|
|
19649 |
{ echo "$as_me:$LINENO: WARNING: *** _Untested pthreads_ try setting LIBPTHREAD_LIBS manually if it doesn't work ***" >&5
|
|
19650 |
echo "$as_me: WARNING: *** _Untested pthreads_ try setting LIBPTHREAD_LIBS manually if it doesn't work ***" >&2;}
|
|
19651 |
;;
|
|
19652 |
|
|
19653 |
*)
|
|
19654 |
- echo "$as_me:$LINENO: checking whether threads work with -pthread" >&5
|
|
19655 |
-echo $ECHO_N "checking whether threads work with -pthread... $ECHO_C" >&6
|
|
19656 |
+ { echo "$as_me:$LINENO: checking whether threads work with -pthread" >&5
|
|
19657 |
+echo $ECHO_N "checking whether threads work with -pthread... $ECHO_C" >&6; }
|
|
19658 |
LDSAVEFLAGS=$LDFLAGS
|
|
19659 |
LDFLAGS="$LDFLAGS -pthread"
|
|
19660 |
cat >conftest.$ac_ext <<_ACEOF
|
|
19661 |
@@ -7248,69 +8984,65 @@ cat confdefs.h >>conftest.$ac_ext
|
|
19662 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
19663 |
/* end confdefs.h. */
|
|
19664 |
|
|
19665 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
19666 |
+/* Override any GCC internal prototype to avoid an error.
|
|
19667 |
+ Use char because int might match the return type of a GCC
|
|
19668 |
+ builtin and then its argument prototype would still apply. */
|
|
19669 |
#ifdef __cplusplus
|
|
19670 |
extern "C"
|
|
19671 |
#endif
|
|
19672 |
-/* We use char because int might match the return type of a gcc2
|
|
19673 |
- builtin and then its argument prototype would still apply. */
|
|
19674 |
char pthread_create ();
|
|
19675 |
int
|
|
19676 |
main ()
|
|
19677 |
{
|
|
19678 |
-pthread_create ();
|
|
19679 |
+return pthread_create ();
|
|
19680 |
;
|
|
19681 |
return 0;
|
|
19682 |
}
|
|
19683 |
_ACEOF
|
|
19684 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19685 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
19686 |
- (eval $ac_link) 2>conftest.er1
|
|
19687 |
+if { (ac_try="$ac_link"
|
|
19688 |
+case "(($ac_try" in
|
|
19689 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19690 |
+ *) ac_try_echo=$ac_try;;
|
|
19691 |
+esac
|
|
19692 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19693 |
+ (eval "$ac_link") 2>conftest.er1
|
|
19694 |
ac_status=$?
|
|
19695 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19696 |
rm -f conftest.er1
|
|
19697 |
cat conftest.err >&5
|
|
19698 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19699 |
- (exit $ac_status); } &&
|
|
19700 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19701 |
- || test ! -s conftest.err'
|
|
19702 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19703 |
- (eval $ac_try) 2>&5
|
|
19704 |
- ac_status=$?
|
|
19705 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19706 |
- (exit $ac_status); }; } &&
|
|
19707 |
- { ac_try='test -s conftest$ac_exeext'
|
|
19708 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19709 |
- (eval $ac_try) 2>&5
|
|
19710 |
- ac_status=$?
|
|
19711 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19712 |
- (exit $ac_status); }; }; then
|
|
19713 |
+ (exit $ac_status); } && {
|
|
19714 |
+ test -z "$ac_c_werror_flag" ||
|
|
19715 |
+ test ! -s conftest.err
|
|
19716 |
+ } && test -s conftest$ac_exeext &&
|
|
19717 |
+ $as_test_x conftest$ac_exeext; then
|
|
19718 |
pthread_ok=yes
|
|
19719 |
else
|
|
19720 |
echo "$as_me: failed program was:" >&5
|
|
19721 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
19722 |
|
|
19723 |
-pthread_ok=no
|
|
19724 |
+ pthread_ok=no
|
|
19725 |
fi
|
|
19726 |
-rm -f conftest.err conftest.$ac_objext \
|
|
19727 |
+
|
|
19728 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
19729 |
conftest$ac_exeext conftest.$ac_ext
|
|
19730 |
LDFLAGS=$LDSAVEFLAGS
|
|
19731 |
|
|
19732 |
if test "x$pthread_ok" = "xyes"; then
|
|
19733 |
- echo "$as_me:$LINENO: result: yes" >&5
|
|
19734 |
-echo "${ECHO_T}yes" >&6
|
|
19735 |
+ { echo "$as_me:$LINENO: result: yes" >&5
|
|
19736 |
+echo "${ECHO_T}yes" >&6; }
|
|
19737 |
LIBPTHREAD_LDFLAGS="-pthread"
|
|
19738 |
else
|
|
19739 |
- echo "$as_me:$LINENO: result: no. Now we will try some libraries." >&5
|
|
19740 |
-echo "${ECHO_T}no. Now we will try some libraries." >&6
|
|
19741 |
+ { echo "$as_me:$LINENO: result: no. Now we will try some libraries." >&5
|
|
19742 |
+echo "${ECHO_T}no. Now we will try some libraries." >&6; }
|
|
19743 |
|
|
19744 |
- echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
|
|
19745 |
-echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6
|
|
19746 |
+ { echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
|
|
19747 |
+echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; }
|
|
19748 |
if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
19749 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19750 |
else
|
|
19751 |
ac_func_search_save_LIBS=$LIBS
|
|
19752 |
-ac_cv_search_pthread_create=no
|
|
19753 |
cat >conftest.$ac_ext <<_ACEOF
|
|
19754 |
/* confdefs.h. */
|
|
19755 |
_ACEOF
|
|
19756 |
@@ -7318,124 +9050,81 @@ cat confdefs.h >>conftest.$ac_ext
|
|
19757 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
19758 |
/* end confdefs.h. */
|
|
19759 |
|
|
19760 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
19761 |
+/* Override any GCC internal prototype to avoid an error.
|
|
19762 |
+ Use char because int might match the return type of a GCC
|
|
19763 |
+ builtin and then its argument prototype would still apply. */
|
|
19764 |
#ifdef __cplusplus
|
|
19765 |
extern "C"
|
|
19766 |
#endif
|
|
19767 |
-/* We use char because int might match the return type of a gcc2
|
|
19768 |
- builtin and then its argument prototype would still apply. */
|
|
19769 |
char pthread_create ();
|
|
19770 |
int
|
|
19771 |
main ()
|
|
19772 |
{
|
|
19773 |
-pthread_create ();
|
|
19774 |
+return pthread_create ();
|
|
19775 |
;
|
|
19776 |
return 0;
|
|
19777 |
}
|
|
19778 |
_ACEOF
|
|
19779 |
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19780 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
19781 |
- (eval $ac_link) 2>conftest.er1
|
|
19782 |
+for ac_lib in '' pthread; do
|
|
19783 |
+ if test -z "$ac_lib"; then
|
|
19784 |
+ ac_res="none required"
|
|
19785 |
+ else
|
|
19786 |
+ ac_res=-l$ac_lib
|
|
19787 |
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
19788 |
+ fi
|
|
19789 |
+ rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19790 |
+if { (ac_try="$ac_link"
|
|
19791 |
+case "(($ac_try" in
|
|
19792 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19793 |
+ *) ac_try_echo=$ac_try;;
|
|
19794 |
+esac
|
|
19795 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19796 |
+ (eval "$ac_link") 2>conftest.er1
|
|
19797 |
ac_status=$?
|
|
19798 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19799 |
rm -f conftest.er1
|
|
19800 |
cat conftest.err >&5
|
|
19801 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19802 |
- (exit $ac_status); } &&
|
|
19803 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19804 |
- || test ! -s conftest.err'
|
|
19805 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19806 |
- (eval $ac_try) 2>&5
|
|
19807 |
- ac_status=$?
|
|
19808 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19809 |
- (exit $ac_status); }; } &&
|
|
19810 |
- { ac_try='test -s conftest$ac_exeext'
|
|
19811 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19812 |
- (eval $ac_try) 2>&5
|
|
19813 |
- ac_status=$?
|
|
19814 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19815 |
- (exit $ac_status); }; }; then
|
|
19816 |
- ac_cv_search_pthread_create="none required"
|
|
19817 |
+ (exit $ac_status); } && {
|
|
19818 |
+ test -z "$ac_c_werror_flag" ||
|
|
19819 |
+ test ! -s conftest.err
|
|
19820 |
+ } && test -s conftest$ac_exeext &&
|
|
19821 |
+ $as_test_x conftest$ac_exeext; then
|
|
19822 |
+ ac_cv_search_pthread_create=$ac_res
|
|
19823 |
else
|
|
19824 |
echo "$as_me: failed program was:" >&5
|
|
19825 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
19826 |
|
|
19827 |
-fi
|
|
19828 |
-rm -f conftest.err conftest.$ac_objext \
|
|
19829 |
- conftest$ac_exeext conftest.$ac_ext
|
|
19830 |
-if test "$ac_cv_search_pthread_create" = no; then
|
|
19831 |
- for ac_lib in pthread; do
|
|
19832 |
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
19833 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
19834 |
-/* confdefs.h. */
|
|
19835 |
-_ACEOF
|
|
19836 |
-cat confdefs.h >>conftest.$ac_ext
|
|
19837 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
19838 |
-/* end confdefs.h. */
|
|
19839 |
|
|
19840 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
19841 |
-#ifdef __cplusplus
|
|
19842 |
-extern "C"
|
|
19843 |
-#endif
|
|
19844 |
-/* We use char because int might match the return type of a gcc2
|
|
19845 |
- builtin and then its argument prototype would still apply. */
|
|
19846 |
-char pthread_create ();
|
|
19847 |
-int
|
|
19848 |
-main ()
|
|
19849 |
-{
|
|
19850 |
-pthread_create ();
|
|
19851 |
- ;
|
|
19852 |
- return 0;
|
|
19853 |
-}
|
|
19854 |
-_ACEOF
|
|
19855 |
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19856 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
19857 |
- (eval $ac_link) 2>conftest.er1
|
|
19858 |
- ac_status=$?
|
|
19859 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
19860 |
- rm -f conftest.er1
|
|
19861 |
- cat conftest.err >&5
|
|
19862 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19863 |
- (exit $ac_status); } &&
|
|
19864 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19865 |
- || test ! -s conftest.err'
|
|
19866 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19867 |
- (eval $ac_try) 2>&5
|
|
19868 |
- ac_status=$?
|
|
19869 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19870 |
- (exit $ac_status); }; } &&
|
|
19871 |
- { ac_try='test -s conftest$ac_exeext'
|
|
19872 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19873 |
- (eval $ac_try) 2>&5
|
|
19874 |
- ac_status=$?
|
|
19875 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19876 |
- (exit $ac_status); }; }; then
|
|
19877 |
- ac_cv_search_pthread_create="-l$ac_lib"
|
|
19878 |
-break
|
|
19879 |
-else
|
|
19880 |
- echo "$as_me: failed program was:" >&5
|
|
19881 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
19882 |
+fi
|
|
19883 |
|
|
19884 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
19885 |
+ conftest$ac_exeext
|
|
19886 |
+ if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
19887 |
+ break
|
|
19888 |
fi
|
|
19889 |
-rm -f conftest.err conftest.$ac_objext \
|
|
19890 |
- conftest$ac_exeext conftest.$ac_ext
|
|
19891 |
- done
|
|
19892 |
+done
|
|
19893 |
+if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
19894 |
+ :
|
|
19895 |
+else
|
|
19896 |
+ ac_cv_search_pthread_create=no
|
|
19897 |
fi
|
|
19898 |
+rm conftest.$ac_ext
|
|
19899 |
LIBS=$ac_func_search_save_LIBS
|
|
19900 |
fi
|
|
19901 |
-echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
|
|
19902 |
-echo "${ECHO_T}$ac_cv_search_pthread_create" >&6
|
|
19903 |
-if test "$ac_cv_search_pthread_create" != no; then
|
|
19904 |
- test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS"
|
|
19905 |
+{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
|
|
19906 |
+echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; }
|
|
19907 |
+ac_res=$ac_cv_search_pthread_create
|
|
19908 |
+if test "$ac_res" != no; then
|
|
19909 |
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
19910 |
LIBPTHREADS_LIBS="-lpthread"
|
|
19911 |
else
|
|
19912 |
- echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
|
|
19913 |
-echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6
|
|
19914 |
+ { echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
|
|
19915 |
+echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; }
|
|
19916 |
if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
19917 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
19918 |
else
|
|
19919 |
ac_func_search_save_LIBS=$LIBS
|
|
19920 |
-ac_cv_search_pthread_create=no
|
|
19921 |
cat >conftest.$ac_ext <<_ACEOF
|
|
19922 |
/* confdefs.h. */
|
|
19923 |
_ACEOF
|
|
19924 |
@@ -7443,124 +9132,81 @@ cat confdefs.h >>conftest.$ac_ext
|
|
19925 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
19926 |
/* end confdefs.h. */
|
|
19927 |
|
|
19928 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
19929 |
+/* Override any GCC internal prototype to avoid an error.
|
|
19930 |
+ Use char because int might match the return type of a GCC
|
|
19931 |
+ builtin and then its argument prototype would still apply. */
|
|
19932 |
#ifdef __cplusplus
|
|
19933 |
extern "C"
|
|
19934 |
#endif
|
|
19935 |
-/* We use char because int might match the return type of a gcc2
|
|
19936 |
- builtin and then its argument prototype would still apply. */
|
|
19937 |
char pthread_create ();
|
|
19938 |
int
|
|
19939 |
main ()
|
|
19940 |
{
|
|
19941 |
-pthread_create ();
|
|
19942 |
+return pthread_create ();
|
|
19943 |
;
|
|
19944 |
return 0;
|
|
19945 |
}
|
|
19946 |
_ACEOF
|
|
19947 |
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19948 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
19949 |
- (eval $ac_link) 2>conftest.er1
|
|
19950 |
+for ac_lib in '' pthreads; do
|
|
19951 |
+ if test -z "$ac_lib"; then
|
|
19952 |
+ ac_res="none required"
|
|
19953 |
+ else
|
|
19954 |
+ ac_res=-l$ac_lib
|
|
19955 |
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
19956 |
+ fi
|
|
19957 |
+ rm -f conftest.$ac_objext conftest$ac_exeext
|
|
19958 |
+if { (ac_try="$ac_link"
|
|
19959 |
+case "(($ac_try" in
|
|
19960 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
19961 |
+ *) ac_try_echo=$ac_try;;
|
|
19962 |
+esac
|
|
19963 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
19964 |
+ (eval "$ac_link") 2>conftest.er1
|
|
19965 |
ac_status=$?
|
|
19966 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
19967 |
rm -f conftest.er1
|
|
19968 |
cat conftest.err >&5
|
|
19969 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19970 |
- (exit $ac_status); } &&
|
|
19971 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
19972 |
- || test ! -s conftest.err'
|
|
19973 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19974 |
- (eval $ac_try) 2>&5
|
|
19975 |
- ac_status=$?
|
|
19976 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19977 |
- (exit $ac_status); }; } &&
|
|
19978 |
- { ac_try='test -s conftest$ac_exeext'
|
|
19979 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
19980 |
- (eval $ac_try) 2>&5
|
|
19981 |
- ac_status=$?
|
|
19982 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
19983 |
- (exit $ac_status); }; }; then
|
|
19984 |
- ac_cv_search_pthread_create="none required"
|
|
19985 |
+ (exit $ac_status); } && {
|
|
19986 |
+ test -z "$ac_c_werror_flag" ||
|
|
19987 |
+ test ! -s conftest.err
|
|
19988 |
+ } && test -s conftest$ac_exeext &&
|
|
19989 |
+ $as_test_x conftest$ac_exeext; then
|
|
19990 |
+ ac_cv_search_pthread_create=$ac_res
|
|
19991 |
else
|
|
19992 |
echo "$as_me: failed program was:" >&5
|
|
19993 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
19994 |
|
|
19995 |
-fi
|
|
19996 |
-rm -f conftest.err conftest.$ac_objext \
|
|
19997 |
- conftest$ac_exeext conftest.$ac_ext
|
|
19998 |
-if test "$ac_cv_search_pthread_create" = no; then
|
|
19999 |
- for ac_lib in pthreads; do
|
|
20000 |
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
20001 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
20002 |
-/* confdefs.h. */
|
|
20003 |
-_ACEOF
|
|
20004 |
-cat confdefs.h >>conftest.$ac_ext
|
|
20005 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
20006 |
-/* end confdefs.h. */
|
|
20007 |
|
|
20008 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
20009 |
-#ifdef __cplusplus
|
|
20010 |
-extern "C"
|
|
20011 |
-#endif
|
|
20012 |
-/* We use char because int might match the return type of a gcc2
|
|
20013 |
- builtin and then its argument prototype would still apply. */
|
|
20014 |
-char pthread_create ();
|
|
20015 |
-int
|
|
20016 |
-main ()
|
|
20017 |
-{
|
|
20018 |
-pthread_create ();
|
|
20019 |
- ;
|
|
20020 |
- return 0;
|
|
20021 |
-}
|
|
20022 |
-_ACEOF
|
|
20023 |
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
20024 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
20025 |
- (eval $ac_link) 2>conftest.er1
|
|
20026 |
- ac_status=$?
|
|
20027 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
20028 |
- rm -f conftest.er1
|
|
20029 |
- cat conftest.err >&5
|
|
20030 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20031 |
- (exit $ac_status); } &&
|
|
20032 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20033 |
- || test ! -s conftest.err'
|
|
20034 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20035 |
- (eval $ac_try) 2>&5
|
|
20036 |
- ac_status=$?
|
|
20037 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20038 |
- (exit $ac_status); }; } &&
|
|
20039 |
- { ac_try='test -s conftest$ac_exeext'
|
|
20040 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20041 |
- (eval $ac_try) 2>&5
|
|
20042 |
- ac_status=$?
|
|
20043 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20044 |
- (exit $ac_status); }; }; then
|
|
20045 |
- ac_cv_search_pthread_create="-l$ac_lib"
|
|
20046 |
-break
|
|
20047 |
-else
|
|
20048 |
- echo "$as_me: failed program was:" >&5
|
|
20049 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
20050 |
+fi
|
|
20051 |
|
|
20052 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
20053 |
+ conftest$ac_exeext
|
|
20054 |
+ if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
20055 |
+ break
|
|
20056 |
fi
|
|
20057 |
-rm -f conftest.err conftest.$ac_objext \
|
|
20058 |
- conftest$ac_exeext conftest.$ac_ext
|
|
20059 |
- done
|
|
20060 |
+done
|
|
20061 |
+if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
20062 |
+ :
|
|
20063 |
+else
|
|
20064 |
+ ac_cv_search_pthread_create=no
|
|
20065 |
fi
|
|
20066 |
+rm conftest.$ac_ext
|
|
20067 |
LIBS=$ac_func_search_save_LIBS
|
|
20068 |
fi
|
|
20069 |
-echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
|
|
20070 |
-echo "${ECHO_T}$ac_cv_search_pthread_create" >&6
|
|
20071 |
-if test "$ac_cv_search_pthread_create" != no; then
|
|
20072 |
- test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS"
|
|
20073 |
+{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
|
|
20074 |
+echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; }
|
|
20075 |
+ac_res=$ac_cv_search_pthread_create
|
|
20076 |
+if test "$ac_res" != no; then
|
|
20077 |
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
20078 |
LIBPTHREADS_LIBS="-lpthreads"
|
|
20079 |
else
|
|
20080 |
- echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
|
|
20081 |
-echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6
|
|
20082 |
+ { echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
|
|
20083 |
+echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; }
|
|
20084 |
if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
20085 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20086 |
else
|
|
20087 |
ac_func_search_save_LIBS=$LIBS
|
|
20088 |
-ac_cv_search_pthread_create=no
|
|
20089 |
cat >conftest.$ac_ext <<_ACEOF
|
|
20090 |
/* confdefs.h. */
|
|
20091 |
_ACEOF
|
|
20092 |
@@ -7568,115 +9214,73 @@ cat confdefs.h >>conftest.$ac_ext
|
|
20093 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
20094 |
/* end confdefs.h. */
|
|
20095 |
|
|
20096 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
20097 |
-#ifdef __cplusplus
|
|
20098 |
-extern "C"
|
|
20099 |
-#endif
|
|
20100 |
-/* We use char because int might match the return type of a gcc2
|
|
20101 |
+/* Override any GCC internal prototype to avoid an error.
|
|
20102 |
+ Use char because int might match the return type of a GCC
|
|
20103 |
builtin and then its argument prototype would still apply. */
|
|
20104 |
-char pthread_create ();
|
|
20105 |
-int
|
|
20106 |
-main ()
|
|
20107 |
-{
|
|
20108 |
-pthread_create ();
|
|
20109 |
- ;
|
|
20110 |
- return 0;
|
|
20111 |
-}
|
|
20112 |
-_ACEOF
|
|
20113 |
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
20114 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
20115 |
- (eval $ac_link) 2>conftest.er1
|
|
20116 |
- ac_status=$?
|
|
20117 |
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
20118 |
- rm -f conftest.er1
|
|
20119 |
- cat conftest.err >&5
|
|
20120 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20121 |
- (exit $ac_status); } &&
|
|
20122 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20123 |
- || test ! -s conftest.err'
|
|
20124 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20125 |
- (eval $ac_try) 2>&5
|
|
20126 |
- ac_status=$?
|
|
20127 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20128 |
- (exit $ac_status); }; } &&
|
|
20129 |
- { ac_try='test -s conftest$ac_exeext'
|
|
20130 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20131 |
- (eval $ac_try) 2>&5
|
|
20132 |
- ac_status=$?
|
|
20133 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20134 |
- (exit $ac_status); }; }; then
|
|
20135 |
- ac_cv_search_pthread_create="none required"
|
|
20136 |
-else
|
|
20137 |
- echo "$as_me: failed program was:" >&5
|
|
20138 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
20139 |
-
|
|
20140 |
-fi
|
|
20141 |
-rm -f conftest.err conftest.$ac_objext \
|
|
20142 |
- conftest$ac_exeext conftest.$ac_ext
|
|
20143 |
-if test "$ac_cv_search_pthread_create" = no; then
|
|
20144 |
- for ac_lib in c_r; do
|
|
20145 |
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
20146 |
- cat >conftest.$ac_ext <<_ACEOF
|
|
20147 |
-/* confdefs.h. */
|
|
20148 |
-_ACEOF
|
|
20149 |
-cat confdefs.h >>conftest.$ac_ext
|
|
20150 |
-cat >>conftest.$ac_ext <<_ACEOF
|
|
20151 |
-/* end confdefs.h. */
|
|
20152 |
-
|
|
20153 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
20154 |
#ifdef __cplusplus
|
|
20155 |
extern "C"
|
|
20156 |
#endif
|
|
20157 |
-/* We use char because int might match the return type of a gcc2
|
|
20158 |
- builtin and then its argument prototype would still apply. */
|
|
20159 |
char pthread_create ();
|
|
20160 |
int
|
|
20161 |
main ()
|
|
20162 |
{
|
|
20163 |
-pthread_create ();
|
|
20164 |
+return pthread_create ();
|
|
20165 |
;
|
|
20166 |
return 0;
|
|
20167 |
}
|
|
20168 |
_ACEOF
|
|
20169 |
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
20170 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
20171 |
- (eval $ac_link) 2>conftest.er1
|
|
20172 |
+for ac_lib in '' c_r; do
|
|
20173 |
+ if test -z "$ac_lib"; then
|
|
20174 |
+ ac_res="none required"
|
|
20175 |
+ else
|
|
20176 |
+ ac_res=-l$ac_lib
|
|
20177 |
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
|
20178 |
+ fi
|
|
20179 |
+ rm -f conftest.$ac_objext conftest$ac_exeext
|
|
20180 |
+if { (ac_try="$ac_link"
|
|
20181 |
+case "(($ac_try" in
|
|
20182 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20183 |
+ *) ac_try_echo=$ac_try;;
|
|
20184 |
+esac
|
|
20185 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20186 |
+ (eval "$ac_link") 2>conftest.er1
|
|
20187 |
ac_status=$?
|
|
20188 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
20189 |
rm -f conftest.er1
|
|
20190 |
cat conftest.err >&5
|
|
20191 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20192 |
- (exit $ac_status); } &&
|
|
20193 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20194 |
- || test ! -s conftest.err'
|
|
20195 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20196 |
- (eval $ac_try) 2>&5
|
|
20197 |
- ac_status=$?
|
|
20198 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20199 |
- (exit $ac_status); }; } &&
|
|
20200 |
- { ac_try='test -s conftest$ac_exeext'
|
|
20201 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20202 |
- (eval $ac_try) 2>&5
|
|
20203 |
- ac_status=$?
|
|
20204 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20205 |
- (exit $ac_status); }; }; then
|
|
20206 |
- ac_cv_search_pthread_create="-l$ac_lib"
|
|
20207 |
-break
|
|
20208 |
+ (exit $ac_status); } && {
|
|
20209 |
+ test -z "$ac_c_werror_flag" ||
|
|
20210 |
+ test ! -s conftest.err
|
|
20211 |
+ } && test -s conftest$ac_exeext &&
|
|
20212 |
+ $as_test_x conftest$ac_exeext; then
|
|
20213 |
+ ac_cv_search_pthread_create=$ac_res
|
|
20214 |
else
|
|
20215 |
echo "$as_me: failed program was:" >&5
|
|
20216 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
20217 |
|
|
20218 |
+
|
|
20219 |
fi
|
|
20220 |
-rm -f conftest.err conftest.$ac_objext \
|
|
20221 |
- conftest$ac_exeext conftest.$ac_ext
|
|
20222 |
- done
|
|
20223 |
+
|
|
20224 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
20225 |
+ conftest$ac_exeext
|
|
20226 |
+ if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
20227 |
+ break
|
|
20228 |
+fi
|
|
20229 |
+done
|
|
20230 |
+if test "${ac_cv_search_pthread_create+set}" = set; then
|
|
20231 |
+ :
|
|
20232 |
+else
|
|
20233 |
+ ac_cv_search_pthread_create=no
|
|
20234 |
fi
|
|
20235 |
+rm conftest.$ac_ext
|
|
20236 |
LIBS=$ac_func_search_save_LIBS
|
|
20237 |
fi
|
|
20238 |
-echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
|
|
20239 |
-echo "${ECHO_T}$ac_cv_search_pthread_create" >&6
|
|
20240 |
-if test "$ac_cv_search_pthread_create" != no; then
|
|
20241 |
- test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS"
|
|
20242 |
+{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
|
|
20243 |
+echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; }
|
|
20244 |
+ac_res=$ac_cv_search_pthread_create
|
|
20245 |
+if test "$ac_res" != no; then
|
|
20246 |
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
20247 |
LIBPTHREADS_LIBS="-lc_r"
|
|
20248 |
else
|
|
20249 |
thread_ok=no
|
|
20250 |
@@ -7706,8 +9310,8 @@ fi
|
|
20251 |
|
|
20252 |
case $target in
|
|
20253 |
*-*-solaris*)
|
|
20254 |
- echo "$as_me:$LINENO: checking whether SunOS has -lrt " >&5
|
|
20255 |
-echo $ECHO_N "checking whether SunOS has -lrt ... $ECHO_C" >&6
|
|
20256 |
+ { echo "$as_me:$LINENO: checking whether SunOS has -lrt " >&5
|
|
20257 |
+echo $ECHO_N "checking whether SunOS has -lrt ... $ECHO_C" >&6; }
|
|
20258 |
LDSAVEFLAGS="$LDFLAGS"
|
|
20259 |
LDFLAGS="$LDFLAGS -lrt"
|
|
20260 |
cat >conftest.$ac_ext <<_ACEOF
|
|
20261 |
@@ -7717,60 +9321,57 @@ cat confdefs.h >>conftest.$ac_ext
|
|
20262 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
20263 |
/* end confdefs.h. */
|
|
20264 |
|
|
20265 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
20266 |
+/* Override any GCC internal prototype to avoid an error.
|
|
20267 |
+ Use char because int might match the return type of a GCC
|
|
20268 |
+ builtin and then its argument prototype would still apply. */
|
|
20269 |
#ifdef __cplusplus
|
|
20270 |
extern "C"
|
|
20271 |
#endif
|
|
20272 |
-/* We use char because int might match the return type of a gcc2
|
|
20273 |
- builtin and then its argument prototype would still apply. */
|
|
20274 |
char nanosleep ();
|
|
20275 |
int
|
|
20276 |
main ()
|
|
20277 |
{
|
|
20278 |
-nanosleep ();
|
|
20279 |
+return nanosleep ();
|
|
20280 |
;
|
|
20281 |
return 0;
|
|
20282 |
}
|
|
20283 |
_ACEOF
|
|
20284 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
20285 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
20286 |
- (eval $ac_link) 2>conftest.er1
|
|
20287 |
+if { (ac_try="$ac_link"
|
|
20288 |
+case "(($ac_try" in
|
|
20289 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20290 |
+ *) ac_try_echo=$ac_try;;
|
|
20291 |
+esac
|
|
20292 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20293 |
+ (eval "$ac_link") 2>conftest.er1
|
|
20294 |
ac_status=$?
|
|
20295 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
20296 |
rm -f conftest.er1
|
|
20297 |
cat conftest.err >&5
|
|
20298 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20299 |
- (exit $ac_status); } &&
|
|
20300 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20301 |
- || test ! -s conftest.err'
|
|
20302 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20303 |
- (eval $ac_try) 2>&5
|
|
20304 |
- ac_status=$?
|
|
20305 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20306 |
- (exit $ac_status); }; } &&
|
|
20307 |
- { ac_try='test -s conftest$ac_exeext'
|
|
20308 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20309 |
- (eval $ac_try) 2>&5
|
|
20310 |
- ac_status=$?
|
|
20311 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20312 |
- (exit $ac_status); }; }; then
|
|
20313 |
+ (exit $ac_status); } && {
|
|
20314 |
+ test -z "$ac_c_werror_flag" ||
|
|
20315 |
+ test ! -s conftest.err
|
|
20316 |
+ } && test -s conftest$ac_exeext &&
|
|
20317 |
+ $as_test_x conftest$ac_exeext; then
|
|
20318 |
rt_ok=yes
|
|
20319 |
else
|
|
20320 |
echo "$as_me: failed program was:" >&5
|
|
20321 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
20322 |
|
|
20323 |
-rt_ok=no
|
|
20324 |
+ rt_ok=no
|
|
20325 |
fi
|
|
20326 |
-rm -f conftest.err conftest.$ac_objext \
|
|
20327 |
+
|
|
20328 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
20329 |
conftest$ac_exeext conftest.$ac_ext
|
|
20330 |
if test "x$rt_ok" = "xyes"; then
|
|
20331 |
- echo "$as_me:$LINENO: result: yes" >&5
|
|
20332 |
-echo "${ECHO_T}yes" >&6
|
|
20333 |
+ { echo "$as_me:$LINENO: result: yes" >&5
|
|
20334 |
+echo "${ECHO_T}yes" >&6; }
|
|
20335 |
else
|
|
20336 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
20337 |
-echo "${ECHO_T}no" >&6
|
|
20338 |
- echo "$as_me:$LINENO: checking whether SunOS has -lposix4 " >&5
|
|
20339 |
-echo $ECHO_N "checking whether SunOS has -lposix4 ... $ECHO_C" >&6
|
|
20340 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
20341 |
+echo "${ECHO_T}no" >&6; }
|
|
20342 |
+ { echo "$as_me:$LINENO: checking whether SunOS has -lposix4 " >&5
|
|
20343 |
+echo $ECHO_N "checking whether SunOS has -lposix4 ... $ECHO_C" >&6; }
|
|
20344 |
LDFLAGS="$LDSAVEFLAGS -lposix4"
|
|
20345 |
cat >conftest.$ac_ext <<_ACEOF
|
|
20346 |
/* confdefs.h. */
|
|
20347 |
@@ -7779,59 +9380,56 @@ cat confdefs.h >>conftest.$ac_ext
|
|
20348 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
20349 |
/* end confdefs.h. */
|
|
20350 |
|
|
20351 |
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
20352 |
+/* Override any GCC internal prototype to avoid an error.
|
|
20353 |
+ Use char because int might match the return type of a GCC
|
|
20354 |
+ builtin and then its argument prototype would still apply. */
|
|
20355 |
#ifdef __cplusplus
|
|
20356 |
extern "C"
|
|
20357 |
#endif
|
|
20358 |
-/* We use char because int might match the return type of a gcc2
|
|
20359 |
- builtin and then its argument prototype would still apply. */
|
|
20360 |
char nanosleep ();
|
|
20361 |
int
|
|
20362 |
main ()
|
|
20363 |
{
|
|
20364 |
-nanosleep ();
|
|
20365 |
+return nanosleep ();
|
|
20366 |
;
|
|
20367 |
return 0;
|
|
20368 |
}
|
|
20369 |
_ACEOF
|
|
20370 |
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
20371 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
20372 |
- (eval $ac_link) 2>conftest.er1
|
|
20373 |
+if { (ac_try="$ac_link"
|
|
20374 |
+case "(($ac_try" in
|
|
20375 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20376 |
+ *) ac_try_echo=$ac_try;;
|
|
20377 |
+esac
|
|
20378 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20379 |
+ (eval "$ac_link") 2>conftest.er1
|
|
20380 |
ac_status=$?
|
|
20381 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
20382 |
rm -f conftest.er1
|
|
20383 |
cat conftest.err >&5
|
|
20384 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20385 |
- (exit $ac_status); } &&
|
|
20386 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20387 |
- || test ! -s conftest.err'
|
|
20388 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20389 |
- (eval $ac_try) 2>&5
|
|
20390 |
- ac_status=$?
|
|
20391 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20392 |
- (exit $ac_status); }; } &&
|
|
20393 |
- { ac_try='test -s conftest$ac_exeext'
|
|
20394 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20395 |
- (eval $ac_try) 2>&5
|
|
20396 |
- ac_status=$?
|
|
20397 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20398 |
- (exit $ac_status); }; }; then
|
|
20399 |
+ (exit $ac_status); } && {
|
|
20400 |
+ test -z "$ac_c_werror_flag" ||
|
|
20401 |
+ test ! -s conftest.err
|
|
20402 |
+ } && test -s conftest$ac_exeext &&
|
|
20403 |
+ $as_test_x conftest$ac_exeext; then
|
|
20404 |
posix_ok=yes
|
|
20405 |
else
|
|
20406 |
echo "$as_me: failed program was:" >&5
|
|
20407 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
20408 |
|
|
20409 |
-posix_ok=no
|
|
20410 |
+ posix_ok=no
|
|
20411 |
fi
|
|
20412 |
-rm -f conftest.err conftest.$ac_objext \
|
|
20413 |
+
|
|
20414 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
20415 |
conftest$ac_exeext conftest.$ac_ext
|
|
20416 |
if test "x$posix_ok" = "xyes"; then
|
|
20417 |
- echo "$as_me:$LINENO: result: yes" >&5
|
|
20418 |
-echo "${ECHO_T}yes" >&6
|
|
20419 |
+ { echo "$as_me:$LINENO: result: yes" >&5
|
|
20420 |
+echo "${ECHO_T}yes" >&6; }
|
|
20421 |
else
|
|
20422 |
LDFLAGS=$LDSAVEFLAGS
|
|
20423 |
- echo "$as_me:$LINENO: result: no" >&5
|
|
20424 |
-echo "${ECHO_T}no" >&6
|
|
20425 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
20426 |
+echo "${ECHO_T}no" >&6; }
|
|
20427 |
{ echo "$as_me:$LINENO: WARNING: *** Try setting LIBS or LDFLAGS manually to point to the library with nanosleep()***" >&5
|
|
20428 |
echo "$as_me: WARNING: *** Try setting LIBS or LDFLAGS manually to point to the library with nanosleep()***" >&2;}
|
|
20429 |
fi
|
|
20430 |
@@ -7839,6 +9437,134 @@ echo "$as_me: WARNING: *** Try setting L
|
|
20431 |
;;
|
|
20432 |
esac
|
|
20433 |
|
|
20434 |
+if test "x$enable_tabs" = "xno" ; then
|
|
20435 |
+ CFLAGS="$CFLAGS -DDISABLE_TABS"
|
|
20436 |
+fi
|
|
20437 |
+if test "x$enable_anti_alias" = "xno" ; then
|
|
20438 |
+ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
|
|
20439 |
+else
|
|
20440 |
+ # Extract the first word of "xft-config", so it can be a program name with args.
|
|
20441 |
+set dummy xft-config; ac_word=$2
|
|
20442 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
20443 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
20444 |
+if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
|
|
20445 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20446 |
+else
|
|
20447 |
+ case $XFT_CONFIG in
|
|
20448 |
+ [\\/]* | ?:[\\/]*)
|
|
20449 |
+ ac_cv_path_XFT_CONFIG="$XFT_CONFIG" # Let the user override the test with a path.
|
|
20450 |
+ ;;
|
|
20451 |
+ *)
|
|
20452 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
20453 |
+as_dummy="$PATH:/usr/local/bin"
|
|
20454 |
+for as_dir in $as_dummy
|
|
20455 |
+do
|
|
20456 |
+ IFS=$as_save_IFS
|
|
20457 |
+ test -z "$as_dir" && as_dir=.
|
|
20458 |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
20459 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
20460 |
+ ac_cv_path_XFT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
20461 |
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
20462 |
+ break 2
|
|
20463 |
+ fi
|
|
20464 |
+done
|
|
20465 |
+done
|
|
20466 |
+IFS=$as_save_IFS
|
|
20467 |
+
|
|
20468 |
+ test -z "$ac_cv_path_XFT_CONFIG" && ac_cv_path_XFT_CONFIG="no"
|
|
20469 |
+ ;;
|
|
20470 |
+esac
|
|
20471 |
+fi
|
|
20472 |
+XFT_CONFIG=$ac_cv_path_XFT_CONFIG
|
|
20473 |
+if test -n "$XFT_CONFIG"; then
|
|
20474 |
+ { echo "$as_me:$LINENO: result: $XFT_CONFIG" >&5
|
|
20475 |
+echo "${ECHO_T}$XFT_CONFIG" >&6; }
|
|
20476 |
+else
|
|
20477 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
20478 |
+echo "${ECHO_T}no" >&6; }
|
|
20479 |
+fi
|
|
20480 |
+
|
|
20481 |
+
|
|
20482 |
+ if test "$XFT_CONFIG" = "no" ; then
|
|
20483 |
+ # Extract the first word of "pkg-config", so it can be a program name with args.
|
|
20484 |
+set dummy pkg-config; ac_word=$2
|
|
20485 |
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
20486 |
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
|
20487 |
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
|
20488 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20489 |
+else
|
|
20490 |
+ case $PKG_CONFIG in
|
|
20491 |
+ [\\/]* | ?:[\\/]*)
|
|
20492 |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
20493 |
+ ;;
|
|
20494 |
+ *)
|
|
20495 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
20496 |
+as_dummy="$PATH:/usr/local/bin"
|
|
20497 |
+for as_dir in $as_dummy
|
|
20498 |
+do
|
|
20499 |
+ IFS=$as_save_IFS
|
|
20500 |
+ test -z "$as_dir" && as_dir=.
|
|
20501 |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
20502 |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
20503 |
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
20504 |
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
20505 |
+ break 2
|
|
20506 |
+ fi
|
|
20507 |
+done
|
|
20508 |
+done
|
|
20509 |
+IFS=$as_save_IFS
|
|
20510 |
+
|
|
20511 |
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
20512 |
+ ;;
|
|
20513 |
+esac
|
|
20514 |
+fi
|
|
20515 |
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
20516 |
+if test -n "$PKG_CONFIG"; then
|
|
20517 |
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
20518 |
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
|
|
20519 |
+else
|
|
20520 |
+ { echo "$as_me:$LINENO: result: no" >&5
|
|
20521 |
+echo "${ECHO_T}no" >&6; }
|
|
20522 |
+fi
|
|
20523 |
+
|
|
20524 |
+
|
|
20525 |
+ if test "$PKG_CONFIG" = "no" ; then
|
|
20526 |
+ if test -d "/usr/include/freetype2" ; then
|
|
20527 |
+ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
|
|
20528 |
+ elif test -d "/usr/include/freetype1" ; then
|
|
20529 |
+ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype1"
|
|
20530 |
+ fi
|
|
20531 |
+ if test -e "/usr/X11R6/include/X11/Xft/Xft.h" ; then
|
|
20532 |
+ { echo "$as_me:$LINENO: checking checking for Xft" >&5
|
|
20533 |
+echo $ECHO_N "checking checking for Xft... $ECHO_C" >&6; }
|
|
20534 |
+ if test -e "/usr/X11R6/lib/libXft.so.2" ; then
|
|
20535 |
+ { echo "$as_me:$LINENO: result: Xft2" >&5
|
|
20536 |
+echo "${ECHO_T}Xft2" >&6; }
|
|
20537 |
+ LIBS="/usr/X11R6/lib/libXft.so.2 $LIBS"
|
|
20538 |
+ elif test -e "/usr/lib/libXft.so.2" ; then
|
|
20539 |
+ { echo "$as_me:$LINENO: result: Xft2" >&5
|
|
20540 |
+echo "${ECHO_T}Xft2" >&6; }
|
|
20541 |
+ LIBS="/usr/lib/libXft.so.2 $LIBS"
|
|
20542 |
+ else
|
|
20543 |
+ { echo "$as_me:$LINENO: result: Xft" >&5
|
|
20544 |
+echo "${ECHO_T}Xft" >&6; }
|
|
20545 |
+ LIBS="-lXft $LIBS"
|
|
20546 |
+ fi
|
|
20547 |
+ else
|
|
20548 |
+ { echo "$as_me:$LINENO: WARNING: *** Xft not found. Disabling anti-alias.***" >&5
|
|
20549 |
+echo "$as_me: WARNING: *** Xft not found. Disabling anti-alias.***" >&2;}
|
|
20550 |
+ enable_anti_alias="no"
|
|
20551 |
+ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
|
|
20552 |
+ fi
|
|
20553 |
+ else
|
|
20554 |
+ CFLAGS="$CFLAGS `$PKG_CONFIG xft --cflags`"
|
|
20555 |
+ LDFLAGS="$LDFLAGS `$PKG_CONFIG xft --libs`"
|
|
20556 |
+ fi
|
|
20557 |
+ else
|
|
20558 |
+ CFLAGS="$CFLAGS `$XFT_CONFIG --cflags`"
|
|
20559 |
+ LDFLAGS="$LDFLAGS `$XFT_CONFIG --libs`"
|
|
20560 |
+ fi
|
|
20561 |
+fi
|
|
20562 |
if test "x$enable_cookies" = "xno" ; then
|
|
20563 |
CFLAGS="$CFLAGS -DDISABLE_COOKIES"
|
|
20564 |
fi
|
|
20565 |
@@ -7861,9 +9587,12 @@ fi
|
|
20566 |
if test "x$enable_threaded_dns" = "xyes" ; then
|
|
20567 |
CFLAGS="$CFLAGS -DD_DNS_THREADED"
|
|
20568 |
fi
|
|
20569 |
+if test "x$enable_meta_refresh" = "xyes" ; then
|
|
20570 |
+ CFLAGS="$CFLAGS -DENABLE_META_REFRESH"
|
|
20571 |
+fi
|
|
20572 |
|
|
20573 |
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
20574 |
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
|
20575 |
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
20576 |
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
|
|
20577 |
if test "${ac_cv_header_stdc+set}" = set; then
|
|
20578 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20579 |
else
|
|
20580 |
@@ -7887,35 +9616,31 @@ main ()
|
|
20581 |
}
|
|
20582 |
_ACEOF
|
|
20583 |
rm -f conftest.$ac_objext
|
|
20584 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
20585 |
- (eval $ac_compile) 2>conftest.er1
|
|
20586 |
+if { (ac_try="$ac_compile"
|
|
20587 |
+case "(($ac_try" in
|
|
20588 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20589 |
+ *) ac_try_echo=$ac_try;;
|
|
20590 |
+esac
|
|
20591 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20592 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
20593 |
ac_status=$?
|
|
20594 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
20595 |
rm -f conftest.er1
|
|
20596 |
cat conftest.err >&5
|
|
20597 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20598 |
- (exit $ac_status); } &&
|
|
20599 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20600 |
- || test ! -s conftest.err'
|
|
20601 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20602 |
- (eval $ac_try) 2>&5
|
|
20603 |
- ac_status=$?
|
|
20604 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20605 |
- (exit $ac_status); }; } &&
|
|
20606 |
- { ac_try='test -s conftest.$ac_objext'
|
|
20607 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20608 |
- (eval $ac_try) 2>&5
|
|
20609 |
- ac_status=$?
|
|
20610 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20611 |
- (exit $ac_status); }; }; then
|
|
20612 |
+ (exit $ac_status); } && {
|
|
20613 |
+ test -z "$ac_c_werror_flag" ||
|
|
20614 |
+ test ! -s conftest.err
|
|
20615 |
+ } && test -s conftest.$ac_objext; then
|
|
20616 |
ac_cv_header_stdc=yes
|
|
20617 |
else
|
|
20618 |
echo "$as_me: failed program was:" >&5
|
|
20619 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
20620 |
|
|
20621 |
-ac_cv_header_stdc=no
|
|
20622 |
+ ac_cv_header_stdc=no
|
|
20623 |
fi
|
|
20624 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
20625 |
+
|
|
20626 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
20627 |
|
|
20628 |
if test $ac_cv_header_stdc = yes; then
|
|
20629 |
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
20630 |
@@ -7971,6 +9696,7 @@ cat confdefs.h >>conftest.$ac_ext
|
|
20631 |
cat >>conftest.$ac_ext <<_ACEOF
|
|
20632 |
/* end confdefs.h. */
|
|
20633 |
#include <ctype.h>
|
|
20634 |
+#include <stdlib.h>
|
|
20635 |
#if ((' ' & 0x0FF) == 0x020)
|
|
20636 |
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
20637 |
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
20638 |
@@ -7990,18 +9716,27 @@ main ()
|
|
20639 |
for (i = 0; i < 256; i++)
|
|
20640 |
if (XOR (islower (i), ISLOWER (i))
|
|
20641 |
|| toupper (i) != TOUPPER (i))
|
|
20642 |
- exit(2);
|
|
20643 |
- exit (0);
|
|
20644 |
+ return 2;
|
|
20645 |
+ return 0;
|
|
20646 |
}
|
|
20647 |
_ACEOF
|
|
20648 |
rm -f conftest$ac_exeext
|
|
20649 |
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
20650 |
- (eval $ac_link) 2>&5
|
|
20651 |
+if { (ac_try="$ac_link"
|
|
20652 |
+case "(($ac_try" in
|
|
20653 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20654 |
+ *) ac_try_echo=$ac_try;;
|
|
20655 |
+esac
|
|
20656 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20657 |
+ (eval "$ac_link") 2>&5
|
|
20658 |
ac_status=$?
|
|
20659 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20660 |
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
20661 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20662 |
- (eval $ac_try) 2>&5
|
|
20663 |
+ { (case "(($ac_try" in
|
|
20664 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20665 |
+ *) ac_try_echo=$ac_try;;
|
|
20666 |
+esac
|
|
20667 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20668 |
+ (eval "$ac_try") 2>&5
|
|
20669 |
ac_status=$?
|
|
20670 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20671 |
(exit $ac_status); }; }; then
|
|
20672 |
@@ -8014,12 +9749,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
20673 |
( exit $ac_status )
|
|
20674 |
ac_cv_header_stdc=no
|
|
20675 |
fi
|
|
20676 |
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
20677 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
20678 |
fi
|
|
20679 |
+
|
|
20680 |
+
|
|
20681 |
fi
|
|
20682 |
fi
|
|
20683 |
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
20684 |
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
|
|
20685 |
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
20686 |
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
|
|
20687 |
if test $ac_cv_header_stdc = yes; then
|
|
20688 |
|
|
20689 |
cat >>confdefs.h <<\_ACEOF
|
|
20690 |
@@ -8034,18 +9771,19 @@ fi
|
|
20691 |
for ac_header in fcntl.h unistd.h sys/uio.h
|
|
20692 |
do
|
|
20693 |
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
20694 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
20695 |
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
20696 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
20697 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
20698 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
20699 |
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
20700 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
20701 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
20702 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20703 |
fi
|
|
20704 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
20705 |
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
20706 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
20707 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
20708 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
20709 |
else
|
|
20710 |
# Is the header compilable?
|
|
20711 |
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
20712 |
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
|
20713 |
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
20714 |
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
|
|
20715 |
cat >conftest.$ac_ext <<_ACEOF
|
|
20716 |
/* confdefs.h. */
|
|
20717 |
_ACEOF
|
|
20718 |
@@ -8056,41 +9794,37 @@ $ac_includes_default
|
|
20719 |
#include <$ac_header>
|
|
20720 |
_ACEOF
|
|
20721 |
rm -f conftest.$ac_objext
|
|
20722 |
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
20723 |
- (eval $ac_compile) 2>conftest.er1
|
|
20724 |
+if { (ac_try="$ac_compile"
|
|
20725 |
+case "(($ac_try" in
|
|
20726 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20727 |
+ *) ac_try_echo=$ac_try;;
|
|
20728 |
+esac
|
|
20729 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20730 |
+ (eval "$ac_compile") 2>conftest.er1
|
|
20731 |
ac_status=$?
|
|
20732 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
20733 |
rm -f conftest.er1
|
|
20734 |
cat conftest.err >&5
|
|
20735 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20736 |
- (exit $ac_status); } &&
|
|
20737 |
- { ac_try='test -z "$ac_c_werror_flag"
|
|
20738 |
- || test ! -s conftest.err'
|
|
20739 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20740 |
- (eval $ac_try) 2>&5
|
|
20741 |
- ac_status=$?
|
|
20742 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20743 |
- (exit $ac_status); }; } &&
|
|
20744 |
- { ac_try='test -s conftest.$ac_objext'
|
|
20745 |
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
20746 |
- (eval $ac_try) 2>&5
|
|
20747 |
- ac_status=$?
|
|
20748 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20749 |
- (exit $ac_status); }; }; then
|
|
20750 |
+ (exit $ac_status); } && {
|
|
20751 |
+ test -z "$ac_c_werror_flag" ||
|
|
20752 |
+ test ! -s conftest.err
|
|
20753 |
+ } && test -s conftest.$ac_objext; then
|
|
20754 |
ac_header_compiler=yes
|
|
20755 |
else
|
|
20756 |
echo "$as_me: failed program was:" >&5
|
|
20757 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
20758 |
|
|
20759 |
-ac_header_compiler=no
|
|
20760 |
+ ac_header_compiler=no
|
|
20761 |
fi
|
|
20762 |
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
20763 |
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
20764 |
-echo "${ECHO_T}$ac_header_compiler" >&6
|
|
20765 |
+
|
|
20766 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
20767 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
20768 |
+echo "${ECHO_T}$ac_header_compiler" >&6; }
|
|
20769 |
|
|
20770 |
# Is the header present?
|
|
20771 |
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
20772 |
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
|
20773 |
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
20774 |
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
|
|
20775 |
cat >conftest.$ac_ext <<_ACEOF
|
|
20776 |
/* confdefs.h. */
|
|
20777 |
_ACEOF
|
|
20778 |
@@ -8099,24 +9833,22 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
20779 |
/* end confdefs.h. */
|
|
20780 |
#include <$ac_header>
|
|
20781 |
_ACEOF
|
|
20782 |
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
|
20783 |
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
|
20784 |
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
20785 |
+case "(($ac_try" in
|
|
20786 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
20787 |
+ *) ac_try_echo=$ac_try;;
|
|
20788 |
+esac
|
|
20789 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
20790 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
20791 |
ac_status=$?
|
|
20792 |
grep -v '^ *+' conftest.er1 >conftest.err
|
|
20793 |
rm -f conftest.er1
|
|
20794 |
cat conftest.err >&5
|
|
20795 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
20796 |
- (exit $ac_status); } >/dev/null; then
|
|
20797 |
- if test -s conftest.err; then
|
|
20798 |
- ac_cpp_err=$ac_c_preproc_warn_flag
|
|
20799 |
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
|
20800 |
- else
|
|
20801 |
- ac_cpp_err=
|
|
20802 |
- fi
|
|
20803 |
-else
|
|
20804 |
- ac_cpp_err=yes
|
|
20805 |
-fi
|
|
20806 |
-if test -z "$ac_cpp_err"; then
|
|
20807 |
+ (exit $ac_status); } >/dev/null && {
|
|
20808 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
20809 |
+ test ! -s conftest.err
|
|
20810 |
+ }; then
|
|
20811 |
ac_header_preproc=yes
|
|
20812 |
else
|
|
20813 |
echo "$as_me: failed program was:" >&5
|
|
20814 |
@@ -8124,9 +9856,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|
20815 |
|
|
20816 |
ac_header_preproc=no
|
|
20817 |
fi
|
|
20818 |
+
|
|
20819 |
rm -f conftest.err conftest.$ac_ext
|
|
20820 |
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
20821 |
-echo "${ECHO_T}$ac_header_preproc" >&6
|
|
20822 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
20823 |
+echo "${ECHO_T}$ac_header_preproc" >&6; }
|
|
20824 |
|
|
20825 |
# So? What about this header?
|
|
20826 |
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
20827 |
@@ -8150,25 +9883,19 @@ echo "$as_me: WARNING: $ac_header: s
|
|
20828 |
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
20829 |
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
20830 |
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
20831 |
- (
|
|
20832 |
- cat <<\_ASBOX
|
|
20833 |
-## ------------------------------------------ ##
|
|
20834 |
-## Report this to the AC_PACKAGE_NAME lists. ##
|
|
20835 |
-## ------------------------------------------ ##
|
|
20836 |
-_ASBOX
|
|
20837 |
- ) |
|
|
20838 |
- sed "s/^/$as_me: WARNING: /" >&2
|
|
20839 |
+
|
|
20840 |
;;
|
|
20841 |
esac
|
|
20842 |
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
20843 |
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
|
20844 |
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
|
20845 |
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
20846 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
|
|
20847 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
20848 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20849 |
else
|
|
20850 |
eval "$as_ac_Header=\$ac_header_preproc"
|
|
20851 |
fi
|
|
20852 |
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
|
20853 |
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
|
20854 |
+ac_res=`eval echo '${'$as_ac_Header'}'`
|
|
20855 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
20856 |
+echo "${ECHO_T}$ac_res" >&6; }
|
|
20857 |
|
|
20858 |
fi
|
|
20859 |
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
|
20860 |
@@ -8225,7 +9952,8 @@ fi
|
|
20861 |
|
|
20862 |
|
|
20863 |
|
|
20864 |
- ac_config_files="$ac_config_files Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile src/Makefile src/IO/Makefile"
|
|
20865 |
+ac_config_files="$ac_config_files Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile config/Makefile src/Makefile src/IO/Makefile po/Makefile.in m4/Makefile"
|
|
20866 |
+
|
|
20867 |
cat >confcache <<\_ACEOF
|
|
20868 |
# This file is a shell script that caches the results of configure
|
|
20869 |
# tests run on this system so they can be shared between configure
|
|
20870 |
@@ -8244,39 +9972,58 @@ _ACEOF
|
|
20871 |
|
|
20872 |
# The following way of writing the cache mishandles newlines in values,
|
|
20873 |
# but we know of no workaround that is simple, portable, and efficient.
|
|
20874 |
-# So, don't put newlines in cache variables' values.
|
|
20875 |
+# So, we kill variables containing newlines.
|
|
20876 |
# Ultrix sh set writes to stderr and can't be redirected directly,
|
|
20877 |
# and sets the high bit in the cache file unless we assign to the vars.
|
|
20878 |
-{
|
|
20879 |
+(
|
|
20880 |
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
|
|
20881 |
+ eval ac_val=\$$ac_var
|
|
20882 |
+ case $ac_val in #(
|
|
20883 |
+ *${as_nl}*)
|
|
20884 |
+ case $ac_var in #(
|
|
20885 |
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
|
|
20886 |
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
|
|
20887 |
+ esac
|
|
20888 |
+ case $ac_var in #(
|
|
20889 |
+ _ | IFS | as_nl) ;; #(
|
|
20890 |
+ *) $as_unset $ac_var ;;
|
|
20891 |
+ esac ;;
|
|
20892 |
+ esac
|
|
20893 |
+ done
|
|
20894 |
+
|
|
20895 |
(set) 2>&1 |
|
|
20896 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
|
|
20897 |
- *ac_space=\ *)
|
|
20898 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
|
|
20899 |
+ *${as_nl}ac_space=\ *)
|
|
20900 |
# `set' does not quote correctly, so add quotes (double-quote
|
|
20901 |
# substitution turns \\\\ into \\, and sed turns \\ into \).
|
|
20902 |
sed -n \
|
|
20903 |
"s/'/'\\\\''/g;
|
|
20904 |
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
|
|
20905 |
- ;;
|
|
20906 |
+ ;; #(
|
|
20907 |
*)
|
|
20908 |
# `set' quotes correctly as required by POSIX, so do not add quotes.
|
|
20909 |
- sed -n \
|
|
20910 |
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
|
|
20911 |
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
|
|
20912 |
;;
|
|
20913 |
- esac;
|
|
20914 |
-} |
|
|
20915 |
+ esac |
|
|
20916 |
+ sort
|
|
20917 |
+) |
|
|
20918 |
sed '
|
|
20919 |
+ /^ac_cv_env_/b end
|
|
20920 |
t clear
|
|
20921 |
- : clear
|
|
20922 |
+ :clear
|
|
20923 |
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
|
|
20924 |
t end
|
|
20925 |
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
|
|
20926 |
- : end' >>confcache
|
|
20927 |
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
|
|
20928 |
- if test -w $cache_file; then
|
|
20929 |
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
|
|
20930 |
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
|
|
20931 |
+ :end' >>confcache
|
|
20932 |
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
|
20933 |
+ if test -w "$cache_file"; then
|
|
20934 |
+ test "x$cache_file" != "x/dev/null" &&
|
|
20935 |
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
|
20936 |
+echo "$as_me: updating cache $cache_file" >&6;}
|
|
20937 |
cat confcache >$cache_file
|
|
20938 |
else
|
|
20939 |
- echo "not updating unwritable cache $cache_file"
|
|
20940 |
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
|
20941 |
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
|
20942 |
fi
|
|
20943 |
fi
|
|
20944 |
rm -f confcache
|
|
20945 |
@@ -8285,32 +10032,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
|
|
20946 |
# Let make expand exec_prefix.
|
|
20947 |
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
|
20948 |
|
|
20949 |
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
20950 |
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
20951 |
-# trailing colons and then remove the whole line if VPATH becomes empty
|
|
20952 |
-# (actually we leave an empty line to preserve line numbers).
|
|
20953 |
-if test "x$srcdir" = x.; then
|
|
20954 |
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
|
20955 |
-s/:*\$(srcdir):*/:/;
|
|
20956 |
-s/:*\${srcdir}:*/:/;
|
|
20957 |
-s/:*@srcdir@:*/:/;
|
|
20958 |
-s/^\([^=]*=[ ]*\):*/\1/;
|
|
20959 |
-s/:*$//;
|
|
20960 |
-s/^[^=]*=[ ]*$//;
|
|
20961 |
-}'
|
|
20962 |
-fi
|
|
20963 |
-
|
|
20964 |
DEFS=-DHAVE_CONFIG_H
|
|
20965 |
|
|
20966 |
ac_libobjs=
|
|
20967 |
ac_ltlibobjs=
|
|
20968 |
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|
20969 |
# 1. Remove the extension, and $U if already installed.
|
|
20970 |
- ac_i=`echo "$ac_i" |
|
|
20971 |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
|
|
20972 |
- # 2. Add them.
|
|
20973 |
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
|
|
20974 |
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
|
|
20975 |
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
|
20976 |
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
|
|
20977 |
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
|
20978 |
+ # will be set to the directory where LIBOBJS objects are built.
|
|
20979 |
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
20980 |
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
20981 |
done
|
|
20982 |
LIBOBJS=$ac_libobjs
|
|
20983 |
|
|
20984 |
@@ -8338,13 +10071,6 @@ echo "$as_me: error: conditional \"am__f
|
|
20985 |
Usually this means the macro was only invoked conditionally." >&2;}
|
|
20986 |
{ (exit 1); exit 1; }; }
|
|
20987 |
fi
|
|
20988 |
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
|
20989 |
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
|
|
20990 |
-Usually this means the macro was only invoked conditionally." >&5
|
|
20991 |
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
|
20992 |
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
20993 |
- { (exit 1); exit 1; }; }
|
|
20994 |
-fi
|
|
20995 |
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
|
|
20996 |
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
|
|
20997 |
Usually this means the macro was only invoked conditionally." >&5
|
|
20998 |
@@ -8376,17 +10102,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
|
|
20999 |
## M4sh Initialization. ##
|
|
21000 |
## --------------------- ##
|
|
21001 |
|
|
21002 |
-# Be Bourne compatible
|
|
21003 |
+# Be more Bourne compatible
|
|
21004 |
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
21005 |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
21006 |
emulate sh
|
|
21007 |
NULLCMD=:
|
|
21008 |
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
21009 |
# is contrary to our usage. Disable this feature.
|
|
21010 |
alias -g '${1+"$@"}'='"$@"'
|
|
21011 |
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
21012 |
- set -o posix
|
|
21013 |
+ setopt NO_GLOB_SUBST
|
|
21014 |
+else
|
|
21015 |
+ case `(set -o) 2>/dev/null` in
|
|
21016 |
+ *posix*) set -o posix ;;
|
|
21017 |
+esac
|
|
21018 |
+
|
|
21019 |
+fi
|
|
21020 |
+
|
|
21021 |
+
|
|
21022 |
+
|
|
21023 |
+
|
|
21024 |
+# PATH needs CR
|
|
21025 |
+# Avoid depending upon Character Ranges.
|
|
21026 |
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
21027 |
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
21028 |
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
21029 |
+as_cr_digits='0123456789'
|
|
21030 |
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
21031 |
+
|
|
21032 |
+# The user is always right.
|
|
21033 |
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
21034 |
+ echo "#! /bin/sh" >conf$$.sh
|
|
21035 |
+ echo "exit 0" >>conf$$.sh
|
|
21036 |
+ chmod +x conf$$.sh
|
|
21037 |
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
21038 |
+ PATH_SEPARATOR=';'
|
|
21039 |
+ else
|
|
21040 |
+ PATH_SEPARATOR=:
|
|
21041 |
+ fi
|
|
21042 |
+ rm -f conf$$.sh
|
|
21043 |
fi
|
|
21044 |
-DUALCASE=1; export DUALCASE # for MKS sh
|
|
21045 |
|
|
21046 |
# Support unset when possible.
|
|
21047 |
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
21048 |
@@ -8396,8 +10150,43 @@ else
|
|
21049 |
fi
|
|
21050 |
|
|
21051 |
|
|
21052 |
+# IFS
|
|
21053 |
+# We need space, tab and new line, in precisely that order. Quoting is
|
|
21054 |
+# there to prevent editors from complaining about space-tab.
|
|
21055 |
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
|
21056 |
+# splitting by setting IFS to empty value.)
|
|
21057 |
+as_nl='
|
|
21058 |
+'
|
|
21059 |
+IFS=" "" $as_nl"
|
|
21060 |
+
|
|
21061 |
+# Find who we are. Look in the path if we contain no directory separator.
|
|
21062 |
+case $0 in
|
|
21063 |
+ *[\\/]* ) as_myself=$0 ;;
|
|
21064 |
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
21065 |
+for as_dir in $PATH
|
|
21066 |
+do
|
|
21067 |
+ IFS=$as_save_IFS
|
|
21068 |
+ test -z "$as_dir" && as_dir=.
|
|
21069 |
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
21070 |
+done
|
|
21071 |
+IFS=$as_save_IFS
|
|
21072 |
+
|
|
21073 |
+ ;;
|
|
21074 |
+esac
|
|
21075 |
+# We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
21076 |
+# in which case we are not to be found in the path.
|
|
21077 |
+if test "x$as_myself" = x; then
|
|
21078 |
+ as_myself=$0
|
|
21079 |
+fi
|
|
21080 |
+if test ! -f "$as_myself"; then
|
|
21081 |
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
21082 |
+ { (exit 1); exit 1; }
|
|
21083 |
+fi
|
|
21084 |
+
|
|
21085 |
# Work around bugs in pre-3.0 UWIN ksh.
|
|
21086 |
-$as_unset ENV MAIL MAILPATH
|
|
21087 |
+for as_var in ENV MAIL MAILPATH
|
|
21088 |
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
21089 |
+done
|
|
21090 |
PS1='$ '
|
|
21091 |
PS2='> '
|
|
21092 |
PS4='+ '
|
|
21093 |
@@ -8411,18 +10200,19 @@ do
|
|
21094 |
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
21095 |
eval $as_var=C; export $as_var
|
|
21096 |
else
|
|
21097 |
- $as_unset $as_var
|
|
21098 |
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
21099 |
fi
|
|
21100 |
done
|
|
21101 |
|
|
21102 |
# Required to use basename.
|
|
21103 |
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
21104 |
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
21105 |
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
21106 |
as_expr=expr
|
|
21107 |
else
|
|
21108 |
as_expr=false
|
|
21109 |
fi
|
|
21110 |
|
|
21111 |
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
|
21112 |
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
21113 |
as_basename=basename
|
|
21114 |
else
|
|
21115 |
as_basename=false
|
|
21116 |
@@ -8430,159 +10220,120 @@ fi
|
|
21117 |
|
|
21118 |
|
|
21119 |
# Name of the executable.
|
|
21120 |
-as_me=`$as_basename "$0" ||
|
|
21121 |
+as_me=`$as_basename -- "$0" ||
|
|
21122 |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
21123 |
X"$0" : 'X\(//\)$' \| \
|
|
21124 |
- X"$0" : 'X\(/\)$' \| \
|
|
21125 |
- . : '\(.\)' 2>/dev/null ||
|
|
21126 |
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
21127 |
echo X/"$0" |
|
|
21128 |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
|
21129 |
- /^X\/\(\/\/\)$/{ s//\1/; q; }
|
|
21130 |
- /^X\/\(\/\).*/{ s//\1/; q; }
|
|
21131 |
- s/.*/./; q'`
|
|
21132 |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
21133 |
+ s//\1/
|
|
21134 |
+ q
|
|
21135 |
+ }
|
|
21136 |
+ /^X\/\(\/\/\)$/{
|
|
21137 |
+ s//\1/
|
|
21138 |
+ q
|
|
21139 |
+ }
|
|
21140 |
+ /^X\/\(\/\).*/{
|
|
21141 |
+ s//\1/
|
|
21142 |
+ q
|
|
21143 |
+ }
|
|
21144 |
+ s/.*/./; q'`
|
|
21145 |
|
|
21146 |
-
|
|
21147 |
-# PATH needs CR, and LINENO needs CR and PATH.
|
|
21148 |
-# Avoid depending upon Character Ranges.
|
|
21149 |
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
21150 |
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
21151 |
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
21152 |
-as_cr_digits='0123456789'
|
|
21153 |
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
21154 |
-
|
|
21155 |
-# The user is always right.
|
|
21156 |
-if test "${PATH_SEPARATOR+set}" != set; then
|
|
21157 |
- echo "#! /bin/sh" >conf$$.sh
|
|
21158 |
- echo "exit 0" >>conf$$.sh
|
|
21159 |
- chmod +x conf$$.sh
|
|
21160 |
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
21161 |
- PATH_SEPARATOR=';'
|
|
21162 |
- else
|
|
21163 |
- PATH_SEPARATOR=:
|
|
21164 |
- fi
|
|
21165 |
- rm -f conf$$.sh
|
|
21166 |
-fi
|
|
21167 |
+# CDPATH.
|
|
21168 |
+$as_unset CDPATH
|
|
21169 |
|
|
21170 |
|
|
21171 |
- as_lineno_1=$LINENO
|
|
21172 |
- as_lineno_2=$LINENO
|
|
21173 |
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
21174 |
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
21175 |
- test "x$as_lineno_3" = "x$as_lineno_2" || {
|
|
21176 |
- # Find who we are. Look in the path if we contain no path at all
|
|
21177 |
- # relative or not.
|
|
21178 |
- case $0 in
|
|
21179 |
- *[\\/]* ) as_myself=$0 ;;
|
|
21180 |
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
21181 |
-for as_dir in $PATH
|
|
21182 |
-do
|
|
21183 |
- IFS=$as_save_IFS
|
|
21184 |
- test -z "$as_dir" && as_dir=.
|
|
21185 |
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
21186 |
-done
|
|
21187 |
|
|
21188 |
- ;;
|
|
21189 |
- esac
|
|
21190 |
- # We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
21191 |
- # in which case we are not to be found in the path.
|
|
21192 |
- if test "x$as_myself" = x; then
|
|
21193 |
- as_myself=$0
|
|
21194 |
- fi
|
|
21195 |
- if test ! -f "$as_myself"; then
|
|
21196 |
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
|
|
21197 |
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
|
|
21198 |
- { (exit 1); exit 1; }; }
|
|
21199 |
- fi
|
|
21200 |
- case $CONFIG_SHELL in
|
|
21201 |
- '')
|
|
21202 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
21203 |
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
21204 |
-do
|
|
21205 |
- IFS=$as_save_IFS
|
|
21206 |
- test -z "$as_dir" && as_dir=.
|
|
21207 |
- for as_base in sh bash ksh sh5; do
|
|
21208 |
- case $as_dir in
|
|
21209 |
- /*)
|
|
21210 |
- if ("$as_dir/$as_base" -c '
|
|
21211 |
as_lineno_1=$LINENO
|
|
21212 |
as_lineno_2=$LINENO
|
|
21213 |
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
21214 |
test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
21215 |
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
|
21216 |
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
|
21217 |
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
|
21218 |
- CONFIG_SHELL=$as_dir/$as_base
|
|
21219 |
- export CONFIG_SHELL
|
|
21220 |
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
|
21221 |
- fi;;
|
|
21222 |
- esac
|
|
21223 |
- done
|
|
21224 |
-done
|
|
21225 |
-;;
|
|
21226 |
- esac
|
|
21227 |
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
21228 |
|
|
21229 |
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
21230 |
# uniformly replaced by the line number. The first 'sed' inserts a
|
|
21231 |
- # line-number line before each line; the second 'sed' does the real
|
|
21232 |
- # work. The second script uses 'N' to pair each line-number line
|
|
21233 |
- # with the numbered line, and appends trailing '-' during
|
|
21234 |
- # substitution so that $LINENO is not a special case at line end.
|
|
21235 |
+ # line-number line after each line using $LINENO; the second 'sed'
|
|
21236 |
+ # does the real work. The second script uses 'N' to pair each
|
|
21237 |
+ # line-number line with the line containing $LINENO, and appends
|
|
21238 |
+ # trailing '-' during substitution so that $LINENO is not a special
|
|
21239 |
+ # case at line end.
|
|
21240 |
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
21241 |
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
|
21242 |
- sed '=' <$as_myself |
|
|
21243 |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
21244 |
+ # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
21245 |
+ sed -n '
|
|
21246 |
+ p
|
|
21247 |
+ /[$]LINENO/=
|
|
21248 |
+ ' <$as_myself |
|
|
21249 |
sed '
|
|
21250 |
+ s/[$]LINENO.*/&-/
|
|
21251 |
+ t lineno
|
|
21252 |
+ b
|
|
21253 |
+ :lineno
|
|
21254 |
N
|
|
21255 |
- s,$,-,
|
|
21256 |
- : loop
|
|
21257 |
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
|
21258 |
+ :loop
|
|
21259 |
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
21260 |
t loop
|
|
21261 |
- s,-$,,
|
|
21262 |
- s,^['$as_cr_digits']*\n,,
|
|
21263 |
+ s/-\n.*//
|
|
21264 |
' >$as_me.lineno &&
|
|
21265 |
- chmod +x $as_me.lineno ||
|
|
21266 |
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
|
|
21267 |
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
|
|
21268 |
+ chmod +x "$as_me.lineno" ||
|
|
21269 |
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
21270 |
{ (exit 1); exit 1; }; }
|
|
21271 |
|
|
21272 |
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
21273 |
# (the dirname of $[0] is not the place where we might find the
|
|
21274 |
- # original and so on. Autoconf is especially sensible to this).
|
|
21275 |
- . ./$as_me.lineno
|
|
21276 |
+ # original and so on. Autoconf is especially sensitive to this).
|
|
21277 |
+ . "./$as_me.lineno"
|
|
21278 |
# Exit status is that of the last command.
|
|
21279 |
exit
|
|
21280 |
}
|
|
21281 |
|
|
21282 |
|
|
21283 |
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
|
|
21284 |
- *c*,-n*) ECHO_N= ECHO_C='
|
|
21285 |
-' ECHO_T=' ' ;;
|
|
21286 |
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
|
|
21287 |
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
|
|
21288 |
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
21289 |
+ as_dirname=dirname
|
|
21290 |
+else
|
|
21291 |
+ as_dirname=false
|
|
21292 |
+fi
|
|
21293 |
+
|
|
21294 |
+ECHO_C= ECHO_N= ECHO_T=
|
|
21295 |
+case `echo -n x` in
|
|
21296 |
+-n*)
|
|
21297 |
+ case `echo 'x\c'` in
|
|
21298 |
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
21299 |
+ *) ECHO_C='\c';;
|
|
21300 |
+ esac;;
|
|
21301 |
+*)
|
|
21302 |
+ ECHO_N='-n';;
|
|
21303 |
esac
|
|
21304 |
|
|
21305 |
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
21306 |
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
|
21307 |
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
21308 |
as_expr=expr
|
|
21309 |
else
|
|
21310 |
as_expr=false
|
|
21311 |
fi
|
|
21312 |
|
|
21313 |
rm -f conf$$ conf$$.exe conf$$.file
|
|
21314 |
+if test -d conf$$.dir; then
|
|
21315 |
+ rm -f conf$$.dir/conf$$.file
|
|
21316 |
+else
|
|
21317 |
+ rm -f conf$$.dir
|
|
21318 |
+ mkdir conf$$.dir
|
|
21319 |
+fi
|
|
21320 |
echo >conf$$.file
|
|
21321 |
if ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
21322 |
- # We could just check for DJGPP; but this test a) works b) is more generic
|
|
21323 |
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
|
|
21324 |
- if test -f conf$$.exe; then
|
|
21325 |
- # Don't use ln at all; we don't have any links
|
|
21326 |
+ as_ln_s='ln -s'
|
|
21327 |
+ # ... but there are two gotchas:
|
|
21328 |
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
21329 |
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
21330 |
+ # In both cases, we have to default to `cp -p'.
|
|
21331 |
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
21332 |
as_ln_s='cp -p'
|
|
21333 |
- else
|
|
21334 |
- as_ln_s='ln -s'
|
|
21335 |
- fi
|
|
21336 |
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
21337 |
as_ln_s=ln
|
|
21338 |
else
|
|
21339 |
as_ln_s='cp -p'
|
|
21340 |
fi
|
|
21341 |
-rm -f conf$$ conf$$.exe conf$$.file
|
|
21342 |
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
21343 |
+rmdir conf$$.dir 2>/dev/null
|
|
21344 |
|
|
21345 |
if mkdir -p . 2>/dev/null; then
|
|
21346 |
as_mkdir_p=:
|
|
21347 |
@@ -8591,40 +10342,44 @@ else
|
|
21348 |
as_mkdir_p=false
|
|
21349 |
fi
|
|
21350 |
|
|
21351 |
-as_executable_p="test -f"
|
|
21352 |
+if test -x / >/dev/null 2>&1; then
|
|
21353 |
+ as_test_x='test -x'
|
|
21354 |
+else
|
|
21355 |
+ if ls -dL / >/dev/null 2>&1; then
|
|
21356 |
+ as_ls_L_option=L
|
|
21357 |
+ else
|
|
21358 |
+ as_ls_L_option=
|
|
21359 |
+ fi
|
|
21360 |
+ as_test_x='
|
|
21361 |
+ eval sh -c '\''
|
|
21362 |
+ if test -d "$1"; then
|
|
21363 |
+ test -d "$1/.";
|
|
21364 |
+ else
|
|
21365 |
+ case $1 in
|
|
21366 |
+ -*)set "./$1";;
|
|
21367 |
+ esac;
|
|
21368 |
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
21369 |
+ ???[sx]*):;;*)false;;esac;fi
|
|
21370 |
+ '\'' sh
|
|
21371 |
+ '
|
|
21372 |
+fi
|
|
21373 |
+as_executable_p=$as_test_x
|
|
21374 |
|
|
21375 |
# Sed expression to map a string onto a valid CPP name.
|
|
21376 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
21377 |
|
|
21378 |
# Sed expression to map a string onto a valid variable name.
|
|
21379 |
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
21380 |
-
|
|
21381 |
-
|
|
21382 |
-# IFS
|
|
21383 |
-# We need space, tab and new line, in precisely that order.
|
|
21384 |
-as_nl='
|
|
21385 |
-'
|
|
21386 |
-IFS=" $as_nl"
|
|
21387 |
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
21388 |
|
|
21389 |
-# CDPATH.
|
|
21390 |
-$as_unset CDPATH
|
|
21391 |
|
|
21392 |
exec 6>&1
|
|
21393 |
|
|
21394 |
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
|
|
21395 |
+# Save the log message, to keep $[0] and so on meaningful, and to
|
|
21396 |
# report actual input values of CONFIG_FILES etc. instead of their
|
|
21397 |
-# values after options handling. Logging --version etc. is OK.
|
|
21398 |
-exec 5>>config.log
|
|
21399 |
-{
|
|
21400 |
- echo
|
|
21401 |
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
21402 |
-## Running $as_me. ##
|
|
21403 |
-_ASBOX
|
|
21404 |
-} >&5
|
|
21405 |
-cat >&5 <<_CSEOF
|
|
21406 |
-
|
|
21407 |
+# values after options handling.
|
|
21408 |
+ac_log="
|
|
21409 |
This file was extended by $as_me, which was
|
|
21410 |
-generated by GNU Autoconf 2.59. Invocation command line was
|
|
21411 |
+generated by GNU Autoconf 2.61. Invocation command line was
|
|
21412 |
|
|
21413 |
CONFIG_FILES = $CONFIG_FILES
|
|
21414 |
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
21415 |
@@ -8632,30 +10387,20 @@ generated by GNU Autoconf 2.59. Invocat
|
|
21416 |
CONFIG_COMMANDS = $CONFIG_COMMANDS
|
|
21417 |
$ $0 $@
|
|
21418 |
|
|
21419 |
-_CSEOF
|
|
21420 |
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
|
|
21421 |
-echo >&5
|
|
21422 |
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
|
|
21423 |
+"
|
|
21424 |
+
|
|
21425 |
_ACEOF
|
|
21426 |
|
|
21427 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
21428 |
# Files that config.status was made for.
|
|
21429 |
-if test -n "$ac_config_files"; then
|
|
21430 |
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
|
|
21431 |
-fi
|
|
21432 |
-
|
|
21433 |
-if test -n "$ac_config_headers"; then
|
|
21434 |
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
|
|
21435 |
-fi
|
|
21436 |
+config_files="$ac_config_files"
|
|
21437 |
+config_headers="$ac_config_headers"
|
|
21438 |
+config_commands="$ac_config_commands"
|
|
21439 |
|
|
21440 |
-if test -n "$ac_config_links"; then
|
|
21441 |
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
|
|
21442 |
-fi
|
|
21443 |
-
|
|
21444 |
-if test -n "$ac_config_commands"; then
|
|
21445 |
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
|
|
21446 |
-fi
|
|
21447 |
+_ACEOF
|
|
21448 |
|
|
21449 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
21450 |
-
|
|
21451 |
ac_cs_usage="\
|
|
21452 |
\`$as_me' instantiates files from templates according to the
|
|
21453 |
current configuration.
|
|
21454 |
@@ -8663,7 +10408,7 @@ current configuration.
|
|
21455 |
Usage: $0 [OPTIONS] [FILE]...
|
|
21456 |
|
|
21457 |
-h, --help print this help, then exit
|
|
21458 |
- -V, --version print version number, then exit
|
|
21459 |
+ -V, --version print version number and configuration settings, then exit
|
|
21460 |
-q, --quiet do not print progress messages
|
|
21461 |
-d, --debug don't remove temporary files
|
|
21462 |
--recheck update $as_me by reconfiguring in the same conditions
|
|
21463 |
@@ -8682,19 +10427,21 @@ Configuration commands:
|
|
21464 |
$config_commands
|
|
21465 |
|
|
21466 |
Report bugs to <bug-autoconf@gnu.org>."
|
|
21467 |
-_ACEOF
|
|
21468 |
|
|
21469 |
+_ACEOF
|
|
21470 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
21471 |
ac_cs_version="\\
|
|
21472 |
config.status
|
|
21473 |
-configured by $0, generated by GNU Autoconf 2.59,
|
|
21474 |
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
|
21475 |
+configured by $0, generated by GNU Autoconf 2.61,
|
|
21476 |
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
21477 |
|
|
21478 |
-Copyright (C) 2003 Free Software Foundation, Inc.
|
|
21479 |
+Copyright (C) 2006 Free Software Foundation, Inc.
|
|
21480 |
This config.status script is free software; the Free Software Foundation
|
|
21481 |
gives unlimited permission to copy, distribute and modify it."
|
|
21482 |
-srcdir=$srcdir
|
|
21483 |
-INSTALL="$INSTALL"
|
|
21484 |
+
|
|
21485 |
+ac_pwd='$ac_pwd'
|
|
21486 |
+srcdir='$srcdir'
|
|
21487 |
+INSTALL='$INSTALL'
|
|
21488 |
_ACEOF
|
|
21489 |
|
|
21490 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
21491 |
@@ -8705,39 +10452,24 @@ while test $# != 0
|
|
21492 |
do
|
|
21493 |
case $1 in
|
|
21494 |
--*=*)
|
|
21495 |
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
|
|
21496 |
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
|
|
21497 |
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
|
21498 |
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
|
21499 |
ac_shift=:
|
|
21500 |
;;
|
|
21501 |
- -*)
|
|
21502 |
+ *)
|
|
21503 |
ac_option=$1
|
|
21504 |
ac_optarg=$2
|
|
21505 |
ac_shift=shift
|
|
21506 |
;;
|
|
21507 |
- *) # This is not an option, so the user has probably given explicit
|
|
21508 |
- # arguments.
|
|
21509 |
- ac_option=$1
|
|
21510 |
- ac_need_defaults=false;;
|
|
21511 |
esac
|
|
21512 |
|
|
21513 |
case $ac_option in
|
|
21514 |
# Handling of the options.
|
|
21515 |
-_ACEOF
|
|
21516 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
21517 |
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
|
21518 |
ac_cs_recheck=: ;;
|
|
21519 |
- --version | --vers* | -V )
|
|
21520 |
- echo "$ac_cs_version"; exit 0 ;;
|
|
21521 |
- --he | --h)
|
|
21522 |
- # Conflict between --help and --header
|
|
21523 |
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
|
|
21524 |
-Try \`$0 --help' for more information." >&5
|
|
21525 |
-echo "$as_me: error: ambiguous option: $1
|
|
21526 |
-Try \`$0 --help' for more information." >&2;}
|
|
21527 |
- { (exit 1); exit 1; }; };;
|
|
21528 |
- --help | --hel | -h )
|
|
21529 |
- echo "$ac_cs_usage"; exit 0 ;;
|
|
21530 |
- --debug | --d* | -d )
|
|
21531 |
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
|
21532 |
+ echo "$ac_cs_version"; exit ;;
|
|
21533 |
+ --debug | --debu | --deb | --de | --d | -d )
|
|
21534 |
debug=: ;;
|
|
21535 |
--file | --fil | --fi | --f )
|
|
21536 |
$ac_shift
|
|
21537 |
@@ -8747,18 +10479,24 @@ Try \`$0 --help' for more information."
|
|
21538 |
$ac_shift
|
|
21539 |
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
|
|
21540 |
ac_need_defaults=false;;
|
|
21541 |
+ --he | --h)
|
|
21542 |
+ # Conflict between --help and --header
|
|
21543 |
+ { echo "$as_me: error: ambiguous option: $1
|
|
21544 |
+Try \`$0 --help' for more information." >&2
|
|
21545 |
+ { (exit 1); exit 1; }; };;
|
|
21546 |
+ --help | --hel | -h )
|
|
21547 |
+ echo "$ac_cs_usage"; exit ;;
|
|
21548 |
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
21549 |
| -silent | --silent | --silen | --sile | --sil | --si | --s)
|
|
21550 |
ac_cs_silent=: ;;
|
|
21551 |
|
|
21552 |
# This is an error.
|
|
21553 |
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
|
|
21554 |
-Try \`$0 --help' for more information." >&5
|
|
21555 |
-echo "$as_me: error: unrecognized option: $1
|
|
21556 |
-Try \`$0 --help' for more information." >&2;}
|
|
21557 |
+ -*) { echo "$as_me: error: unrecognized option: $1
|
|
21558 |
+Try \`$0 --help' for more information." >&2
|
|
21559 |
{ (exit 1); exit 1; }; } ;;
|
|
21560 |
|
|
21561 |
- *) ac_config_targets="$ac_config_targets $1" ;;
|
|
21562 |
+ *) ac_config_targets="$ac_config_targets $1"
|
|
21563 |
+ ac_need_defaults=false ;;
|
|
21564 |
|
|
21565 |
esac
|
|
21566 |
shift
|
|
21567 |
@@ -8774,43 +10512,66 @@ fi
|
|
21568 |
_ACEOF
|
|
21569 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
21570 |
if \$ac_cs_recheck; then
|
|
21571 |
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
21572 |
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
21573 |
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
21574 |
+ CONFIG_SHELL=$SHELL
|
|
21575 |
+ export CONFIG_SHELL
|
|
21576 |
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
21577 |
fi
|
|
21578 |
|
|
21579 |
_ACEOF
|
|
21580 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
21581 |
+exec 5>>config.log
|
|
21582 |
+{
|
|
21583 |
+ echo
|
|
21584 |
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
21585 |
+## Running $as_me. ##
|
|
21586 |
+_ASBOX
|
|
21587 |
+ echo "$ac_log"
|
|
21588 |
+} >&5
|
|
21589 |
|
|
21590 |
+_ACEOF
|
|
21591 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
21592 |
#
|
|
21593 |
-# INIT-COMMANDS section.
|
|
21594 |
+# INIT-COMMANDS
|
|
21595 |
#
|
|
21596 |
-
|
|
21597 |
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
|
21598 |
-
|
|
21599 |
-_ACEOF
|
|
21600 |
+# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
|
|
21601 |
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
|
|
21602 |
+ # from automake.
|
|
21603 |
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
|
|
21604 |
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
|
|
21605 |
+ LINGUAS="${LINGUAS-%UNSET%}"
|
|
21606 |
|
|
21607 |
|
|
21608 |
+_ACEOF
|
|
21609 |
|
|
21610 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
21611 |
+
|
|
21612 |
+# Handling of arguments.
|
|
21613 |
for ac_config_target in $ac_config_targets
|
|
21614 |
do
|
|
21615 |
- case "$ac_config_target" in
|
|
21616 |
- # Handling of arguments.
|
|
21617 |
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
21618 |
- "dpip/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpip/Makefile" ;;
|
|
21619 |
- "dpid/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpid/Makefile" ;;
|
|
21620 |
- "dpi/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpi/Makefile" ;;
|
|
21621 |
- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
|
21622 |
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
|
21623 |
- "src/IO/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/IO/Makefile" ;;
|
|
21624 |
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
|
21625 |
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
|
21626 |
+ case $ac_config_target in
|
|
21627 |
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
|
21628 |
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
|
21629 |
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
|
|
21630 |
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
21631 |
+ "dpip/Makefile") CONFIG_FILES="$CONFIG_FILES dpip/Makefile" ;;
|
|
21632 |
+ "dpid/Makefile") CONFIG_FILES="$CONFIG_FILES dpid/Makefile" ;;
|
|
21633 |
+ "dpi/Makefile") CONFIG_FILES="$CONFIG_FILES dpi/Makefile" ;;
|
|
21634 |
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
|
21635 |
+ "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
|
|
21636 |
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
|
21637 |
+ "src/IO/Makefile") CONFIG_FILES="$CONFIG_FILES src/IO/Makefile" ;;
|
|
21638 |
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
|
|
21639 |
+ "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
|
|
21640 |
+
|
|
21641 |
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
|
21642 |
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
|
21643 |
{ (exit 1); exit 1; }; };;
|
|
21644 |
esac
|
|
21645 |
done
|
|
21646 |
|
|
21647 |
+
|
|
21648 |
# If the user did not use the arguments to specify the items to instantiate,
|
|
21649 |
# then the envvar interface is used. Set only those that are not.
|
|
21650 |
# We use the long form for the default assignment because of an extremely
|
|
21651 |
@@ -8822,370 +10583,488 @@ if $ac_need_defaults; then
|
|
21652 |
fi
|
|
21653 |
|
|
21654 |
# Have a temporary directory for convenience. Make it in the build tree
|
|
21655 |
-# simply because there is no reason to put it here, and in addition,
|
|
21656 |
+# simply because there is no reason against having it here, and in addition,
|
|
21657 |
# creating and moving files from /tmp can sometimes cause problems.
|
|
21658 |
-# Create a temporary directory, and hook for its removal unless debugging.
|
|
21659 |
+# Hook for its removal unless debugging.
|
|
21660 |
+# Note that there is a small window in which the directory will not be cleaned:
|
|
21661 |
+# after its creation but before its name has been assigned to `$tmp'.
|
|
21662 |
$debug ||
|
|
21663 |
{
|
|
21664 |
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
|
|
21665 |
+ tmp=
|
|
21666 |
+ trap 'exit_status=$?
|
|
21667 |
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
|
21668 |
+' 0
|
|
21669 |
trap '{ (exit 1); exit 1; }' 1 2 13 15
|
|
21670 |
}
|
|
21671 |
-
|
|
21672 |
# Create a (secure) tmp directory for tmp files.
|
|
21673 |
|
|
21674 |
{
|
|
21675 |
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
|
|
21676 |
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
|
|
21677 |
test -n "$tmp" && test -d "$tmp"
|
|
21678 |
} ||
|
|
21679 |
{
|
|
21680 |
- tmp=./confstat$$-$RANDOM
|
|
21681 |
- (umask 077 && mkdir $tmp)
|
|
21682 |
+ tmp=./conf$$-$RANDOM
|
|
21683 |
+ (umask 077 && mkdir "$tmp")
|
|
21684 |
} ||
|
|
21685 |
{
|
|
21686 |
echo "$me: cannot create a temporary directory in ." >&2
|
|
21687 |
{ (exit 1); exit 1; }
|
|
21688 |
}
|
|
21689 |
|
|
21690 |
-_ACEOF
|
|
21691 |
-
|
|
21692 |
-cat >>$CONFIG_STATUS <<_ACEOF
|
|
21693 |
-
|
|
21694 |
#
|
|
21695 |
-# CONFIG_FILES section.
|
|
21696 |
+# Set up the sed scripts for CONFIG_FILES section.
|
|
21697 |
#
|
|
21698 |
|
|
21699 |
# No need to generate the scripts if there are no CONFIG_FILES.
|
|
21700 |
# This happens for instance when ./config.status config.h
|
|
21701 |
-if test -n "\$CONFIG_FILES"; then
|
|
21702 |
- # Protect against being on the right side of a sed subst in config.status.
|
|
21703 |
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
|
|
21704 |
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
|
|
21705 |
-s,@SHELL@,$SHELL,;t t
|
|
21706 |
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
|
|
21707 |
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
|
|
21708 |
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
|
|
21709 |
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
|
|
21710 |
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
|
|
21711 |
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
|
|
21712 |
-s,@exec_prefix@,$exec_prefix,;t t
|
|
21713 |
-s,@prefix@,$prefix,;t t
|
|
21714 |
-s,@program_transform_name@,$program_transform_name,;t t
|
|
21715 |
-s,@bindir@,$bindir,;t t
|
|
21716 |
-s,@sbindir@,$sbindir,;t t
|
|
21717 |
-s,@libexecdir@,$libexecdir,;t t
|
|
21718 |
-s,@datadir@,$datadir,;t t
|
|
21719 |
-s,@sysconfdir@,$sysconfdir,;t t
|
|
21720 |
-s,@sharedstatedir@,$sharedstatedir,;t t
|
|
21721 |
-s,@localstatedir@,$localstatedir,;t t
|
|
21722 |
-s,@libdir@,$libdir,;t t
|
|
21723 |
-s,@includedir@,$includedir,;t t
|
|
21724 |
-s,@oldincludedir@,$oldincludedir,;t t
|
|
21725 |
-s,@infodir@,$infodir,;t t
|
|
21726 |
-s,@mandir@,$mandir,;t t
|
|
21727 |
-s,@build_alias@,$build_alias,;t t
|
|
21728 |
-s,@host_alias@,$host_alias,;t t
|
|
21729 |
-s,@target_alias@,$target_alias,;t t
|
|
21730 |
-s,@DEFS@,$DEFS,;t t
|
|
21731 |
-s,@ECHO_C@,$ECHO_C,;t t
|
|
21732 |
-s,@ECHO_N@,$ECHO_N,;t t
|
|
21733 |
-s,@ECHO_T@,$ECHO_T,;t t
|
|
21734 |
-s,@LIBS@,$LIBS,;t t
|
|
21735 |
-s,@build@,$build,;t t
|
|
21736 |
-s,@build_cpu@,$build_cpu,;t t
|
|
21737 |
-s,@build_vendor@,$build_vendor,;t t
|
|
21738 |
-s,@build_os@,$build_os,;t t
|
|
21739 |
-s,@host@,$host,;t t
|
|
21740 |
-s,@host_cpu@,$host_cpu,;t t
|
|
21741 |
-s,@host_vendor@,$host_vendor,;t t
|
|
21742 |
-s,@host_os@,$host_os,;t t
|
|
21743 |
-s,@target@,$target,;t t
|
|
21744 |
-s,@target_cpu@,$target_cpu,;t t
|
|
21745 |
-s,@target_vendor@,$target_vendor,;t t
|
|
21746 |
-s,@target_os@,$target_os,;t t
|
|
21747 |
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
|
21748 |
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
|
21749 |
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
|
21750 |
-s,@CYGPATH_W@,$CYGPATH_W,;t t
|
|
21751 |
-s,@PACKAGE@,$PACKAGE,;t t
|
|
21752 |
-s,@VERSION@,$VERSION,;t t
|
|
21753 |
-s,@ACLOCAL@,$ACLOCAL,;t t
|
|
21754 |
-s,@AUTOCONF@,$AUTOCONF,;t t
|
|
21755 |
-s,@AUTOMAKE@,$AUTOMAKE,;t t
|
|
21756 |
-s,@AUTOHEADER@,$AUTOHEADER,;t t
|
|
21757 |
-s,@MAKEINFO@,$MAKEINFO,;t t
|
|
21758 |
-s,@install_sh@,$install_sh,;t t
|
|
21759 |
-s,@STRIP@,$STRIP,;t t
|
|
21760 |
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
|
|
21761 |
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
|
|
21762 |
-s,@mkdir_p@,$mkdir_p,;t t
|
|
21763 |
-s,@AWK@,$AWK,;t t
|
|
21764 |
-s,@SET_MAKE@,$SET_MAKE,;t t
|
|
21765 |
-s,@am__leading_dot@,$am__leading_dot,;t t
|
|
21766 |
-s,@AMTAR@,$AMTAR,;t t
|
|
21767 |
-s,@am__tar@,$am__tar,;t t
|
|
21768 |
-s,@am__untar@,$am__untar,;t t
|
|
21769 |
-s,@DLGUI_TRUE@,$DLGUI_TRUE,;t t
|
|
21770 |
-s,@DLGUI_FALSE@,$DLGUI_FALSE,;t t
|
|
21771 |
-s,@CC@,$CC,;t t
|
|
21772 |
-s,@CFLAGS@,$CFLAGS,;t t
|
|
21773 |
-s,@LDFLAGS@,$LDFLAGS,;t t
|
|
21774 |
-s,@CPPFLAGS@,$CPPFLAGS,;t t
|
|
21775 |
-s,@ac_ct_CC@,$ac_ct_CC,;t t
|
|
21776 |
-s,@EXEEXT@,$EXEEXT,;t t
|
|
21777 |
-s,@OBJEXT@,$OBJEXT,;t t
|
|
21778 |
-s,@DEPDIR@,$DEPDIR,;t t
|
|
21779 |
-s,@am__include@,$am__include,;t t
|
|
21780 |
-s,@am__quote@,$am__quote,;t t
|
|
21781 |
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
|
|
21782 |
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
|
|
21783 |
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
|
|
21784 |
-s,@CCDEPMODE@,$CCDEPMODE,;t t
|
|
21785 |
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
|
|
21786 |
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
|
|
21787 |
-s,@RANLIB@,$RANLIB,;t t
|
|
21788 |
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
|
|
21789 |
-s,@CPP@,$CPP,;t t
|
|
21790 |
-s,@CXX@,$CXX,;t t
|
|
21791 |
-s,@CXXFLAGS@,$CXXFLAGS,;t t
|
|
21792 |
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
|
|
21793 |
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
|
|
21794 |
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
|
|
21795 |
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
|
|
21796 |
-s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
|
|
21797 |
-s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
|
|
21798 |
-s,@GLIB_LIBS@,$GLIB_LIBS,;t t
|
|
21799 |
-s,@GTK_CONFIG@,$GTK_CONFIG,;t t
|
|
21800 |
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
|
|
21801 |
-s,@GTK_LIBS@,$GTK_LIBS,;t t
|
|
21802 |
-s,@EGREP@,$EGREP,;t t
|
|
21803 |
-s,@LIBJPEG_LIBS@,$LIBJPEG_LIBS,;t t
|
|
21804 |
-s,@LIBJPEG_LDFLAGS@,$LIBJPEG_LDFLAGS,;t t
|
|
21805 |
-s,@LIBJPEG_CPPFLAGS@,$LIBJPEG_CPPFLAGS,;t t
|
|
21806 |
-s,@LIBPNG_LIBS@,$LIBPNG_LIBS,;t t
|
|
21807 |
-s,@LIBPNG_CFLAGS@,$LIBPNG_CFLAGS,;t t
|
|
21808 |
-s,@LIBZ_LIBS@,$LIBZ_LIBS,;t t
|
|
21809 |
-s,@LIBSSL_LIBS@,$LIBSSL_LIBS,;t t
|
|
21810 |
-s,@LIBPTHREAD_LIBS@,$LIBPTHREAD_LIBS,;t t
|
|
21811 |
-s,@LIBPTHREAD_LDFLAGS@,$LIBPTHREAD_LDFLAGS,;t t
|
|
21812 |
-s,@LIBFLTK_CXXFLAGS@,$LIBFLTK_CXXFLAGS,;t t
|
|
21813 |
-s,@LIBFLTK_LIBS@,$LIBFLTK_LIBS,;t t
|
|
21814 |
-s,@src@,$src,;t t
|
|
21815 |
-s,@doc@,$doc,;t t
|
|
21816 |
-s,@bin@,$bin,;t t
|
|
21817 |
-s,@util@,$util,;t t
|
|
21818 |
-s,@lib@,$lib,;t t
|
|
21819 |
-s,@LIBOBJS@,$LIBOBJS,;t t
|
|
21820 |
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
|
21821 |
-CEOF
|
|
21822 |
-
|
|
21823 |
-_ACEOF
|
|
21824 |
-
|
|
21825 |
- cat >>$CONFIG_STATUS <<\_ACEOF
|
|
21826 |
- # Split the substitutions into bite-sized pieces for seds with
|
|
21827 |
- # small command number limits, like on Digital OSF/1 and HP-UX.
|
|
21828 |
- ac_max_sed_lines=48
|
|
21829 |
- ac_sed_frag=1 # Number of current file.
|
|
21830 |
- ac_beg=1 # First line for current file.
|
|
21831 |
- ac_end=$ac_max_sed_lines # Line after last line for current file.
|
|
21832 |
- ac_more_lines=:
|
|
21833 |
- ac_sed_cmds=
|
|
21834 |
- while $ac_more_lines; do
|
|
21835 |
- if test $ac_beg -gt 1; then
|
|
21836 |
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
|
|
21837 |
- else
|
|
21838 |
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
|
|
21839 |
- fi
|
|
21840 |
- if test ! -s $tmp/subs.frag; then
|
|
21841 |
- ac_more_lines=false
|
|
21842 |
- else
|
|
21843 |
- # The purpose of the label and of the branching condition is to
|
|
21844 |
- # speed up the sed processing (if there are no `@' at all, there
|
|
21845 |
- # is no need to browse any of the substitutions).
|
|
21846 |
- # These are the two extra sed commands mentioned above.
|
|
21847 |
- (echo ':t
|
|
21848 |
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
|
|
21849 |
- if test -z "$ac_sed_cmds"; then
|
|
21850 |
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
|
|
21851 |
- else
|
|
21852 |
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
|
|
21853 |
- fi
|
|
21854 |
- ac_sed_frag=`expr $ac_sed_frag + 1`
|
|
21855 |
- ac_beg=$ac_end
|
|
21856 |
- ac_end=`expr $ac_end + $ac_max_sed_lines`
|
|
21857 |
- fi
|
|
21858 |
- done
|
|
21859 |
- if test -z "$ac_sed_cmds"; then
|
|
21860 |
- ac_sed_cmds=cat
|
|
21861 |
+if test -n "$CONFIG_FILES"; then
|
|
21862 |
+
|
|
21863 |
+_ACEOF
|
|
21864 |
+
|
|
21865 |
+
|
|
21866 |
+
|
|
21867 |
+ac_delim='%!_!# '
|
|
21868 |
+for ac_last_try in false false false false false :; do
|
|
21869 |
+ cat >conf$$subs.sed <<_ACEOF
|
|
21870 |
+SHELL!$SHELL$ac_delim
|
|
21871 |
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
|
|
21872 |
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
|
|
21873 |
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
|
|
21874 |
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
|
|
21875 |
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
|
|
21876 |
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
|
|
21877 |
+exec_prefix!$exec_prefix$ac_delim
|
|
21878 |
+prefix!$prefix$ac_delim
|
|
21879 |
+program_transform_name!$program_transform_name$ac_delim
|
|
21880 |
+bindir!$bindir$ac_delim
|
|
21881 |
+sbindir!$sbindir$ac_delim
|
|
21882 |
+libexecdir!$libexecdir$ac_delim
|
|
21883 |
+datarootdir!$datarootdir$ac_delim
|
|
21884 |
+datadir!$datadir$ac_delim
|
|
21885 |
+sysconfdir!$sysconfdir$ac_delim
|
|
21886 |
+sharedstatedir!$sharedstatedir$ac_delim
|
|
21887 |
+localstatedir!$localstatedir$ac_delim
|
|
21888 |
+includedir!$includedir$ac_delim
|
|
21889 |
+oldincludedir!$oldincludedir$ac_delim
|
|
21890 |
+docdir!$docdir$ac_delim
|
|
21891 |
+infodir!$infodir$ac_delim
|
|
21892 |
+htmldir!$htmldir$ac_delim
|
|
21893 |
+dvidir!$dvidir$ac_delim
|
|
21894 |
+pdfdir!$pdfdir$ac_delim
|
|
21895 |
+psdir!$psdir$ac_delim
|
|
21896 |
+libdir!$libdir$ac_delim
|
|
21897 |
+localedir!$localedir$ac_delim
|
|
21898 |
+mandir!$mandir$ac_delim
|
|
21899 |
+DEFS!$DEFS$ac_delim
|
|
21900 |
+ECHO_C!$ECHO_C$ac_delim
|
|
21901 |
+ECHO_N!$ECHO_N$ac_delim
|
|
21902 |
+ECHO_T!$ECHO_T$ac_delim
|
|
21903 |
+LIBS!$LIBS$ac_delim
|
|
21904 |
+build_alias!$build_alias$ac_delim
|
|
21905 |
+host_alias!$host_alias$ac_delim
|
|
21906 |
+target_alias!$target_alias$ac_delim
|
|
21907 |
+build!$build$ac_delim
|
|
21908 |
+build_cpu!$build_cpu$ac_delim
|
|
21909 |
+build_vendor!$build_vendor$ac_delim
|
|
21910 |
+build_os!$build_os$ac_delim
|
|
21911 |
+host!$host$ac_delim
|
|
21912 |
+host_cpu!$host_cpu$ac_delim
|
|
21913 |
+host_vendor!$host_vendor$ac_delim
|
|
21914 |
+host_os!$host_os$ac_delim
|
|
21915 |
+target!$target$ac_delim
|
|
21916 |
+target_cpu!$target_cpu$ac_delim
|
|
21917 |
+target_vendor!$target_vendor$ac_delim
|
|
21918 |
+target_os!$target_os$ac_delim
|
|
21919 |
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
|
21920 |
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
|
21921 |
+INSTALL_DATA!$INSTALL_DATA$ac_delim
|
|
21922 |
+CYGPATH_W!$CYGPATH_W$ac_delim
|
|
21923 |
+PACKAGE!$PACKAGE$ac_delim
|
|
21924 |
+VERSION!$VERSION$ac_delim
|
|
21925 |
+ACLOCAL!$ACLOCAL$ac_delim
|
|
21926 |
+AUTOCONF!$AUTOCONF$ac_delim
|
|
21927 |
+AUTOMAKE!$AUTOMAKE$ac_delim
|
|
21928 |
+AUTOHEADER!$AUTOHEADER$ac_delim
|
|
21929 |
+MAKEINFO!$MAKEINFO$ac_delim
|
|
21930 |
+AMTAR!$AMTAR$ac_delim
|
|
21931 |
+install_sh!$install_sh$ac_delim
|
|
21932 |
+STRIP!$STRIP$ac_delim
|
|
21933 |
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
|
|
21934 |
+AWK!$AWK$ac_delim
|
|
21935 |
+SET_MAKE!$SET_MAKE$ac_delim
|
|
21936 |
+am__leading_dot!$am__leading_dot$ac_delim
|
|
21937 |
+DLGUI_TRUE!$DLGUI_TRUE$ac_delim
|
|
21938 |
+DLGUI_FALSE!$DLGUI_FALSE$ac_delim
|
|
21939 |
+CC!$CC$ac_delim
|
|
21940 |
+CFLAGS!$CFLAGS$ac_delim
|
|
21941 |
+LDFLAGS!$LDFLAGS$ac_delim
|
|
21942 |
+CPPFLAGS!$CPPFLAGS$ac_delim
|
|
21943 |
+ac_ct_CC!$ac_ct_CC$ac_delim
|
|
21944 |
+EXEEXT!$EXEEXT$ac_delim
|
|
21945 |
+OBJEXT!$OBJEXT$ac_delim
|
|
21946 |
+DEPDIR!$DEPDIR$ac_delim
|
|
21947 |
+am__include!$am__include$ac_delim
|
|
21948 |
+am__quote!$am__quote$ac_delim
|
|
21949 |
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
|
|
21950 |
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
|
|
21951 |
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
|
|
21952 |
+CCDEPMODE!$CCDEPMODE$ac_delim
|
|
21953 |
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
|
|
21954 |
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
|
|
21955 |
+RANLIB!$RANLIB$ac_delim
|
|
21956 |
+CPP!$CPP$ac_delim
|
|
21957 |
+CXX!$CXX$ac_delim
|
|
21958 |
+CXXFLAGS!$CXXFLAGS$ac_delim
|
|
21959 |
+ac_ct_CXX!$ac_ct_CXX$ac_delim
|
|
21960 |
+CXXDEPMODE!$CXXDEPMODE$ac_delim
|
|
21961 |
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
|
|
21962 |
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
|
|
21963 |
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
|
|
21964 |
+MSGFMT!$MSGFMT$ac_delim
|
|
21965 |
+GMSGFMT!$GMSGFMT$ac_delim
|
|
21966 |
+XGETTEXT!$XGETTEXT$ac_delim
|
|
21967 |
+_ACEOF
|
|
21968 |
+
|
|
21969 |
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
|
21970 |
+ break
|
|
21971 |
+ elif $ac_last_try; then
|
|
21972 |
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
21973 |
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
21974 |
+ { (exit 1); exit 1; }; }
|
|
21975 |
+ else
|
|
21976 |
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
21977 |
fi
|
|
21978 |
-fi # test -n "$CONFIG_FILES"
|
|
21979 |
+done
|
|
21980 |
+
|
|
21981 |
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
21982 |
+if test -n "$ac_eof"; then
|
|
21983 |
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
21984 |
+ ac_eof=`expr $ac_eof + 1`
|
|
21985 |
+fi
|
|
21986 |
+
|
|
21987 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
21988 |
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
|
|
21989 |
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
21990 |
+_ACEOF
|
|
21991 |
+sed '
|
|
21992 |
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
21993 |
+s/^/s,@/; s/!/@,|#_!!_#|/
|
|
21994 |
+:n
|
|
21995 |
+t n
|
|
21996 |
+s/'"$ac_delim"'$/,g/; t
|
|
21997 |
+s/$/\\/; p
|
|
21998 |
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
21999 |
+' >>$CONFIG_STATUS <conf$$subs.sed
|
|
22000 |
+rm -f conf$$subs.sed
|
|
22001 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
22002 |
+CEOF$ac_eof
|
|
22003 |
+_ACEOF
|
|
22004 |
+
|
|
22005 |
+
|
|
22006 |
+ac_delim='%!_!# '
|
|
22007 |
+for ac_last_try in false false false false false :; do
|
|
22008 |
+ cat >conf$$subs.sed <<_ACEOF
|
|
22009 |
+MSGMERGE!$MSGMERGE$ac_delim
|
|
22010 |
+USE_NLS!$USE_NLS$ac_delim
|
|
22011 |
+LIBICONV!$LIBICONV$ac_delim
|
|
22012 |
+LTLIBICONV!$LTLIBICONV$ac_delim
|
|
22013 |
+INTLLIBS!$INTLLIBS$ac_delim
|
|
22014 |
+LIBINTL!$LIBINTL$ac_delim
|
|
22015 |
+LTLIBINTL!$LTLIBINTL$ac_delim
|
|
22016 |
+POSUB!$POSUB$ac_delim
|
|
22017 |
+GLIB_CONFIG!$GLIB_CONFIG$ac_delim
|
|
22018 |
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
|
|
22019 |
+GLIB_LIBS!$GLIB_LIBS$ac_delim
|
|
22020 |
+GTK_CONFIG!$GTK_CONFIG$ac_delim
|
|
22021 |
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
|
|
22022 |
+GTK_LIBS!$GTK_LIBS$ac_delim
|
|
22023 |
+GREP!$GREP$ac_delim
|
|
22024 |
+EGREP!$EGREP$ac_delim
|
|
22025 |
+XFT_CONFIG!$XFT_CONFIG$ac_delim
|
|
22026 |
+PKG_CONFIG!$PKG_CONFIG$ac_delim
|
|
22027 |
+LIBJPEG_LIBS!$LIBJPEG_LIBS$ac_delim
|
|
22028 |
+LIBJPEG_LDFLAGS!$LIBJPEG_LDFLAGS$ac_delim
|
|
22029 |
+LIBJPEG_CPPFLAGS!$LIBJPEG_CPPFLAGS$ac_delim
|
|
22030 |
+LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim
|
|
22031 |
+LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim
|
|
22032 |
+LIBZ_LIBS!$LIBZ_LIBS$ac_delim
|
|
22033 |
+LIBSSL_LIBS!$LIBSSL_LIBS$ac_delim
|
|
22034 |
+LIBPTHREAD_LIBS!$LIBPTHREAD_LIBS$ac_delim
|
|
22035 |
+LIBPTHREAD_LDFLAGS!$LIBPTHREAD_LDFLAGS$ac_delim
|
|
22036 |
+LIBFLTK_CXXFLAGS!$LIBFLTK_CXXFLAGS$ac_delim
|
|
22037 |
+LIBFLTK_LIBS!$LIBFLTK_LIBS$ac_delim
|
|
22038 |
+src!$src$ac_delim
|
|
22039 |
+doc!$doc$ac_delim
|
|
22040 |
+bin!$bin$ac_delim
|
|
22041 |
+util!$util$ac_delim
|
|
22042 |
+lib!$lib$ac_delim
|
|
22043 |
+LIBOBJS!$LIBOBJS$ac_delim
|
|
22044 |
+LTLIBOBJS!$LTLIBOBJS$ac_delim
|
|
22045 |
+_ACEOF
|
|
22046 |
+
|
|
22047 |
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
|
|
22048 |
+ break
|
|
22049 |
+ elif $ac_last_try; then
|
|
22050 |
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
22051 |
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
22052 |
+ { (exit 1); exit 1; }; }
|
|
22053 |
+ else
|
|
22054 |
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
22055 |
+ fi
|
|
22056 |
+done
|
|
22057 |
+
|
|
22058 |
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
|
22059 |
+if test -n "$ac_eof"; then
|
|
22060 |
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
|
22061 |
+ ac_eof=`expr $ac_eof + 1`
|
|
22062 |
+fi
|
|
22063 |
|
|
22064 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
22065 |
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
|
|
22066 |
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
|
22067 |
+_ACEOF
|
|
22068 |
+sed '
|
|
22069 |
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
|
22070 |
+s/^/s,@/; s/!/@,|#_!!_#|/
|
|
22071 |
+:n
|
|
22072 |
+t n
|
|
22073 |
+s/'"$ac_delim"'$/,g/; t
|
|
22074 |
+s/$/\\/; p
|
|
22075 |
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
|
22076 |
+' >>$CONFIG_STATUS <conf$$subs.sed
|
|
22077 |
+rm -f conf$$subs.sed
|
|
22078 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
22079 |
+:end
|
|
22080 |
+s/|#_!!_#|//g
|
|
22081 |
+CEOF$ac_eof
|
|
22082 |
_ACEOF
|
|
22083 |
+
|
|
22084 |
+
|
|
22085 |
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
22086 |
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
|
22087 |
+# trailing colons and then remove the whole line if VPATH becomes empty
|
|
22088 |
+# (actually we leave an empty line to preserve line numbers).
|
|
22089 |
+if test "x$srcdir" = x.; then
|
|
22090 |
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
|
22091 |
+s/:*\$(srcdir):*/:/
|
|
22092 |
+s/:*\${srcdir}:*/:/
|
|
22093 |
+s/:*@srcdir@:*/:/
|
|
22094 |
+s/^\([^=]*=[ ]*\):*/\1/
|
|
22095 |
+s/:*$//
|
|
22096 |
+s/^[^=]*=[ ]*$//
|
|
22097 |
+}'
|
|
22098 |
+fi
|
|
22099 |
+
|
|
22100 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
22101 |
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
|
|
22102 |
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
22103 |
- case $ac_file in
|
|
22104 |
- - | *:- | *:-:* ) # input from stdin
|
|
22105 |
- cat >$tmp/stdin
|
|
22106 |
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
22107 |
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
22108 |
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
22109 |
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
22110 |
- * ) ac_file_in=$ac_file.in ;;
|
|
22111 |
+fi # test -n "$CONFIG_FILES"
|
|
22112 |
+
|
|
22113 |
+
|
|
22114 |
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
|
|
22115 |
+do
|
|
22116 |
+ case $ac_tag in
|
|
22117 |
+ :[FHLC]) ac_mode=$ac_tag; continue;;
|
|
22118 |
+ esac
|
|
22119 |
+ case $ac_mode$ac_tag in
|
|
22120 |
+ :[FHL]*:*);;
|
|
22121 |
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
|
|
22122 |
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
|
|
22123 |
+ { (exit 1); exit 1; }; };;
|
|
22124 |
+ :[FH]-) ac_tag=-:-;;
|
|
22125 |
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
|
22126 |
+ esac
|
|
22127 |
+ ac_save_IFS=$IFS
|
|
22128 |
+ IFS=:
|
|
22129 |
+ set x $ac_tag
|
|
22130 |
+ IFS=$ac_save_IFS
|
|
22131 |
+ shift
|
|
22132 |
+ ac_file=$1
|
|
22133 |
+ shift
|
|
22134 |
+
|
|
22135 |
+ case $ac_mode in
|
|
22136 |
+ :L) ac_source=$1;;
|
|
22137 |
+ :[FH])
|
|
22138 |
+ ac_file_inputs=
|
|
22139 |
+ for ac_f
|
|
22140 |
+ do
|
|
22141 |
+ case $ac_f in
|
|
22142 |
+ -) ac_f="$tmp/stdin";;
|
|
22143 |
+ *) # Look for the file first in the build tree, then in the source tree
|
|
22144 |
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
|
|
22145 |
+ # because $ac_f cannot contain `:'.
|
|
22146 |
+ test -f "$ac_f" ||
|
|
22147 |
+ case $ac_f in
|
|
22148 |
+ [\\/$]*) false;;
|
|
22149 |
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
|
22150 |
+ esac ||
|
|
22151 |
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
|
22152 |
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
|
22153 |
+ { (exit 1); exit 1; }; };;
|
|
22154 |
+ esac
|
|
22155 |
+ ac_file_inputs="$ac_file_inputs $ac_f"
|
|
22156 |
+ done
|
|
22157 |
+
|
|
22158 |
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
22159 |
+ # use $as_me), people would be surprised to read:
|
|
22160 |
+ # /* config.h. Generated by config.status. */
|
|
22161 |
+ configure_input="Generated from "`IFS=:
|
|
22162 |
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
|
|
22163 |
+ if test x"$ac_file" != x-; then
|
|
22164 |
+ configure_input="$ac_file. $configure_input"
|
|
22165 |
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
22166 |
+echo "$as_me: creating $ac_file" >&6;}
|
|
22167 |
+ fi
|
|
22168 |
+
|
|
22169 |
+ case $ac_tag in
|
|
22170 |
+ *:-:* | *:-) cat >"$tmp/stdin";;
|
|
22171 |
+ esac
|
|
22172 |
+ ;;
|
|
22173 |
esac
|
|
22174 |
|
|
22175 |
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
|
|
22176 |
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
|
22177 |
+ ac_dir=`$as_dirname -- "$ac_file" ||
|
|
22178 |
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22179 |
X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
22180 |
X"$ac_file" : 'X\(//\)$' \| \
|
|
22181 |
- X"$ac_file" : 'X\(/\)' \| \
|
|
22182 |
- . : '\(.\)' 2>/dev/null ||
|
|
22183 |
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
22184 |
echo X"$ac_file" |
|
|
22185 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22186 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22187 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22188 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22189 |
- s/.*/./; q'`
|
|
22190 |
- { if $as_mkdir_p; then
|
|
22191 |
- mkdir -p "$ac_dir"
|
|
22192 |
- else
|
|
22193 |
- as_dir="$ac_dir"
|
|
22194 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
22195 |
+ s//\1/
|
|
22196 |
+ q
|
|
22197 |
+ }
|
|
22198 |
+ /^X\(\/\/\)[^/].*/{
|
|
22199 |
+ s//\1/
|
|
22200 |
+ q
|
|
22201 |
+ }
|
|
22202 |
+ /^X\(\/\/\)$/{
|
|
22203 |
+ s//\1/
|
|
22204 |
+ q
|
|
22205 |
+ }
|
|
22206 |
+ /^X\(\/\).*/{
|
|
22207 |
+ s//\1/
|
|
22208 |
+ q
|
|
22209 |
+ }
|
|
22210 |
+ s/.*/./; q'`
|
|
22211 |
+ { as_dir="$ac_dir"
|
|
22212 |
+ case $as_dir in #(
|
|
22213 |
+ -*) as_dir=./$as_dir;;
|
|
22214 |
+ esac
|
|
22215 |
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
22216 |
as_dirs=
|
|
22217 |
- while test ! -d "$as_dir"; do
|
|
22218 |
- as_dirs="$as_dir $as_dirs"
|
|
22219 |
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
22220 |
+ while :; do
|
|
22221 |
+ case $as_dir in #(
|
|
22222 |
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
22223 |
+ *) as_qdir=$as_dir;;
|
|
22224 |
+ esac
|
|
22225 |
+ as_dirs="'$as_qdir' $as_dirs"
|
|
22226 |
+ as_dir=`$as_dirname -- "$as_dir" ||
|
|
22227 |
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22228 |
X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
22229 |
X"$as_dir" : 'X\(//\)$' \| \
|
|
22230 |
- X"$as_dir" : 'X\(/\)' \| \
|
|
22231 |
- . : '\(.\)' 2>/dev/null ||
|
|
22232 |
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
22233 |
echo X"$as_dir" |
|
|
22234 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22235 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22236 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22237 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22238 |
- s/.*/./; q'`
|
|
22239 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
22240 |
+ s//\1/
|
|
22241 |
+ q
|
|
22242 |
+ }
|
|
22243 |
+ /^X\(\/\/\)[^/].*/{
|
|
22244 |
+ s//\1/
|
|
22245 |
+ q
|
|
22246 |
+ }
|
|
22247 |
+ /^X\(\/\/\)$/{
|
|
22248 |
+ s//\1/
|
|
22249 |
+ q
|
|
22250 |
+ }
|
|
22251 |
+ /^X\(\/\).*/{
|
|
22252 |
+ s//\1/
|
|
22253 |
+ q
|
|
22254 |
+ }
|
|
22255 |
+ s/.*/./; q'`
|
|
22256 |
+ test -d "$as_dir" && break
|
|
22257 |
done
|
|
22258 |
- test ! -n "$as_dirs" || mkdir $as_dirs
|
|
22259 |
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
22260 |
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
22261 |
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
22262 |
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
22263 |
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
22264 |
{ (exit 1); exit 1; }; }; }
|
|
22265 |
-
|
|
22266 |
ac_builddir=.
|
|
22267 |
|
|
22268 |
-if test "$ac_dir" != .; then
|
|
22269 |
+case "$ac_dir" in
|
|
22270 |
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
22271 |
+*)
|
|
22272 |
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
22273 |
- # A "../" for each directory in $ac_dir_suffix.
|
|
22274 |
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
22275 |
-else
|
|
22276 |
- ac_dir_suffix= ac_top_builddir=
|
|
22277 |
-fi
|
|
22278 |
+ # A ".." for each directory in $ac_dir_suffix.
|
|
22279 |
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
|
|
22280 |
+ case $ac_top_builddir_sub in
|
|
22281 |
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
|
22282 |
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
|
22283 |
+ esac ;;
|
|
22284 |
+esac
|
|
22285 |
+ac_abs_top_builddir=$ac_pwd
|
|
22286 |
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
|
|
22287 |
+# for backward compatibility:
|
|
22288 |
+ac_top_builddir=$ac_top_build_prefix
|
|
22289 |
|
|
22290 |
case $srcdir in
|
|
22291 |
- .) # No --srcdir option. We are building in place.
|
|
22292 |
+ .) # We are building in place.
|
|
22293 |
ac_srcdir=.
|
|
22294 |
- if test -z "$ac_top_builddir"; then
|
|
22295 |
- ac_top_srcdir=.
|
|
22296 |
- else
|
|
22297 |
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
22298 |
- fi ;;
|
|
22299 |
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
22300 |
+ ac_top_srcdir=$ac_top_builddir_sub
|
|
22301 |
+ ac_abs_top_srcdir=$ac_pwd ;;
|
|
22302 |
+ [\\/]* | ?:[\\/]* ) # Absolute name.
|
|
22303 |
ac_srcdir=$srcdir$ac_dir_suffix;
|
|
22304 |
- ac_top_srcdir=$srcdir ;;
|
|
22305 |
- *) # Relative path.
|
|
22306 |
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
22307 |
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
22308 |
+ ac_top_srcdir=$srcdir
|
|
22309 |
+ ac_abs_top_srcdir=$srcdir ;;
|
|
22310 |
+ *) # Relative name.
|
|
22311 |
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
|
|
22312 |
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
|
|
22313 |
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
|
|
22314 |
esac
|
|
22315 |
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
|
22316 |
|
|
22317 |
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
22318 |
-# the directories may not exist.
|
|
22319 |
-case `pwd` in
|
|
22320 |
-.) ac_abs_builddir="$ac_dir";;
|
|
22321 |
-*)
|
|
22322 |
- case "$ac_dir" in
|
|
22323 |
- .) ac_abs_builddir=`pwd`;;
|
|
22324 |
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
22325 |
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
22326 |
- esac;;
|
|
22327 |
-esac
|
|
22328 |
-case $ac_abs_builddir in
|
|
22329 |
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
22330 |
-*)
|
|
22331 |
- case ${ac_top_builddir}. in
|
|
22332 |
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
22333 |
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
22334 |
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
22335 |
- esac;;
|
|
22336 |
-esac
|
|
22337 |
-case $ac_abs_builddir in
|
|
22338 |
-.) ac_abs_srcdir=$ac_srcdir;;
|
|
22339 |
-*)
|
|
22340 |
- case $ac_srcdir in
|
|
22341 |
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
22342 |
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
22343 |
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
22344 |
- esac;;
|
|
22345 |
-esac
|
|
22346 |
-case $ac_abs_builddir in
|
|
22347 |
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
22348 |
-*)
|
|
22349 |
- case $ac_top_srcdir in
|
|
22350 |
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
22351 |
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
22352 |
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
22353 |
- esac;;
|
|
22354 |
-esac
|
|
22355 |
|
|
22356 |
+ case $ac_mode in
|
|
22357 |
+ :F)
|
|
22358 |
+ #
|
|
22359 |
+ # CONFIG_FILE
|
|
22360 |
+ #
|
|
22361 |
|
|
22362 |
case $INSTALL in
|
|
22363 |
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
|
22364 |
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
|
|
22365 |
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
|
|
22366 |
esac
|
|
22367 |
+_ACEOF
|
|
22368 |
|
|
22369 |
- if test x"$ac_file" != x-; then
|
|
22370 |
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
22371 |
-echo "$as_me: creating $ac_file" >&6;}
|
|
22372 |
- rm -f "$ac_file"
|
|
22373 |
- fi
|
|
22374 |
- # Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
22375 |
- # use $as_me), people would be surprised to read:
|
|
22376 |
- # /* config.h. Generated by config.status. */
|
|
22377 |
- if test x"$ac_file" = x-; then
|
|
22378 |
- configure_input=
|
|
22379 |
- else
|
|
22380 |
- configure_input="$ac_file. "
|
|
22381 |
- fi
|
|
22382 |
- configure_input=$configure_input"Generated from `echo $ac_file_in |
|
|
22383 |
- sed 's,.*/,,'` by configure."
|
|
22384 |
-
|
|
22385 |
- # First look for the input files in the build tree, otherwise in the
|
|
22386 |
- # src tree.
|
|
22387 |
- ac_file_inputs=`IFS=:
|
|
22388 |
- for f in $ac_file_in; do
|
|
22389 |
- case $f in
|
|
22390 |
- -) echo $tmp/stdin ;;
|
|
22391 |
- [\\/$]*)
|
|
22392 |
- # Absolute (can't be DOS-style, as IFS=:)
|
|
22393 |
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
22394 |
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
22395 |
- { (exit 1); exit 1; }; }
|
|
22396 |
- echo "$f";;
|
|
22397 |
- *) # Relative
|
|
22398 |
- if test -f "$f"; then
|
|
22399 |
- # Build tree
|
|
22400 |
- echo "$f"
|
|
22401 |
- elif test -f "$srcdir/$f"; then
|
|
22402 |
- # Source tree
|
|
22403 |
- echo "$srcdir/$f"
|
|
22404 |
- else
|
|
22405 |
- # /dev/null tree
|
|
22406 |
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
22407 |
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
22408 |
- { (exit 1); exit 1; }; }
|
|
22409 |
- fi;;
|
|
22410 |
- esac
|
|
22411 |
- done` || { (exit 1); exit 1; }
|
|
22412 |
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
22413 |
+# If the template does not know about datarootdir, expand it.
|
|
22414 |
+# FIXME: This hack should be removed a few years after 2.60.
|
|
22415 |
+ac_datarootdir_hack=; ac_datarootdir_seen=
|
|
22416 |
+
|
|
22417 |
+case `sed -n '/datarootdir/ {
|
|
22418 |
+ p
|
|
22419 |
+ q
|
|
22420 |
+}
|
|
22421 |
+/@datadir@/p
|
|
22422 |
+/@docdir@/p
|
|
22423 |
+/@infodir@/p
|
|
22424 |
+/@localedir@/p
|
|
22425 |
+/@mandir@/p
|
|
22426 |
+' $ac_file_inputs` in
|
|
22427 |
+*datarootdir*) ac_datarootdir_seen=yes;;
|
|
22428 |
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
|
22429 |
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
22430 |
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
22431 |
+_ACEOF
|
|
22432 |
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
22433 |
+ ac_datarootdir_hack='
|
|
22434 |
+ s&@datadir@&$datadir&g
|
|
22435 |
+ s&@docdir@&$docdir&g
|
|
22436 |
+ s&@infodir@&$infodir&g
|
|
22437 |
+ s&@localedir@&$localedir&g
|
|
22438 |
+ s&@mandir@&$mandir&g
|
|
22439 |
+ s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
22440 |
+esac
|
|
22441 |
_ACEOF
|
|
22442 |
+
|
|
22443 |
+# Neutralize VPATH when `$srcdir' = `.'.
|
|
22444 |
+# Shell code in configure.ac might set extrasub.
|
|
22445 |
+# FIXME: do we really want to maintain this feature?
|
|
22446 |
cat >>$CONFIG_STATUS <<_ACEOF
|
|
22447 |
sed "$ac_vpsub
|
|
22448 |
$extrasub
|
|
22449 |
@@ -9193,248 +11072,130 @@ _ACEOF
|
|
22450 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
22451 |
:t
|
|
22452 |
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
22453 |
-s,@configure_input@,$configure_input,;t t
|
|
22454 |
-s,@srcdir@,$ac_srcdir,;t t
|
|
22455 |
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
|
|
22456 |
-s,@top_srcdir@,$ac_top_srcdir,;t t
|
|
22457 |
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
|
|
22458 |
-s,@builddir@,$ac_builddir,;t t
|
|
22459 |
-s,@abs_builddir@,$ac_abs_builddir,;t t
|
|
22460 |
-s,@top_builddir@,$ac_top_builddir,;t t
|
|
22461 |
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
|
|
22462 |
-s,@INSTALL@,$ac_INSTALL,;t t
|
|
22463 |
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
|
|
22464 |
- rm -f $tmp/stdin
|
|
22465 |
- if test x"$ac_file" != x-; then
|
|
22466 |
- mv $tmp/out $ac_file
|
|
22467 |
- else
|
|
22468 |
- cat $tmp/out
|
|
22469 |
- rm -f $tmp/out
|
|
22470 |
- fi
|
|
22471 |
-
|
|
22472 |
-done
|
|
22473 |
-_ACEOF
|
|
22474 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
22475 |
-
|
|
22476 |
-#
|
|
22477 |
-# CONFIG_HEADER section.
|
|
22478 |
-#
|
|
22479 |
-
|
|
22480 |
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
|
|
22481 |
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
|
|
22482 |
-#
|
|
22483 |
-# ac_d sets the value in "#define NAME VALUE" lines.
|
|
22484 |
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
|
|
22485 |
-ac_dB='[ ].*$,\1#\2'
|
|
22486 |
-ac_dC=' '
|
|
22487 |
-ac_dD=',;t'
|
|
22488 |
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
|
|
22489 |
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
|
|
22490 |
-ac_uB='$,\1#\2define\3'
|
|
22491 |
-ac_uC=' '
|
|
22492 |
-ac_uD=',;t'
|
|
22493 |
+s&@configure_input@&$configure_input&;t t
|
|
22494 |
+s&@top_builddir@&$ac_top_builddir_sub&;t t
|
|
22495 |
+s&@srcdir@&$ac_srcdir&;t t
|
|
22496 |
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
|
22497 |
+s&@top_srcdir@&$ac_top_srcdir&;t t
|
|
22498 |
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
|
22499 |
+s&@builddir@&$ac_builddir&;t t
|
|
22500 |
+s&@abs_builddir@&$ac_abs_builddir&;t t
|
|
22501 |
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
|
22502 |
+s&@INSTALL@&$ac_INSTALL&;t t
|
|
22503 |
+$ac_datarootdir_hack
|
|
22504 |
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
|
|
22505 |
+
|
|
22506 |
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
|
22507 |
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
|
22508 |
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
|
22509 |
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
22510 |
+which seems to be undefined. Please make sure it is defined." >&5
|
|
22511 |
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
22512 |
+which seems to be undefined. Please make sure it is defined." >&2;}
|
|
22513 |
|
|
22514 |
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
|
|
22515 |
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
22516 |
+ rm -f "$tmp/stdin"
|
|
22517 |
case $ac_file in
|
|
22518 |
- - | *:- | *:-:* ) # input from stdin
|
|
22519 |
- cat >$tmp/stdin
|
|
22520 |
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
22521 |
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
22522 |
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
22523 |
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
22524 |
- * ) ac_file_in=$ac_file.in ;;
|
|
22525 |
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
|
|
22526 |
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
|
|
22527 |
esac
|
|
22528 |
+ ;;
|
|
22529 |
+ :H)
|
|
22530 |
+ #
|
|
22531 |
+ # CONFIG_HEADER
|
|
22532 |
+ #
|
|
22533 |
+_ACEOF
|
|
22534 |
+
|
|
22535 |
+# Transform confdefs.h into a sed script `conftest.defines', that
|
|
22536 |
+# substitutes the proper values into config.h.in to produce config.h.
|
|
22537 |
+rm -f conftest.defines conftest.tail
|
|
22538 |
+# First, append a space to every undef/define line, to ease matching.
|
|
22539 |
+echo 's/$/ /' >conftest.defines
|
|
22540 |
+# Then, protect against being on the right side of a sed subst, or in
|
|
22541 |
+# an unquoted here document, in config.status. If some macros were
|
|
22542 |
+# called several times there might be several #defines for the same
|
|
22543 |
+# symbol, which is useless. But do not sort them, since the last
|
|
22544 |
+# AC_DEFINE must be honored.
|
|
22545 |
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
|
|
22546 |
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
|
|
22547 |
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
|
|
22548 |
+# PARAMS is the parameter list in the macro definition--in most cases, it's
|
|
22549 |
+# just an empty string.
|
|
22550 |
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
|
|
22551 |
+ac_dB='\\)[ (].*,\\1define\\2'
|
|
22552 |
+ac_dC=' '
|
|
22553 |
+ac_dD=' ,'
|
|
22554 |
|
|
22555 |
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
22556 |
-echo "$as_me: creating $ac_file" >&6;}
|
|
22557 |
-
|
|
22558 |
- # First look for the input files in the build tree, otherwise in the
|
|
22559 |
- # src tree.
|
|
22560 |
- ac_file_inputs=`IFS=:
|
|
22561 |
- for f in $ac_file_in; do
|
|
22562 |
- case $f in
|
|
22563 |
- -) echo $tmp/stdin ;;
|
|
22564 |
- [\\/$]*)
|
|
22565 |
- # Absolute (can't be DOS-style, as IFS=:)
|
|
22566 |
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
22567 |
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
22568 |
- { (exit 1); exit 1; }; }
|
|
22569 |
- # Do quote $f, to prevent DOS paths from being IFS'd.
|
|
22570 |
- echo "$f";;
|
|
22571 |
- *) # Relative
|
|
22572 |
- if test -f "$f"; then
|
|
22573 |
- # Build tree
|
|
22574 |
- echo "$f"
|
|
22575 |
- elif test -f "$srcdir/$f"; then
|
|
22576 |
- # Source tree
|
|
22577 |
- echo "$srcdir/$f"
|
|
22578 |
- else
|
|
22579 |
- # /dev/null tree
|
|
22580 |
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
22581 |
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
22582 |
- { (exit 1); exit 1; }; }
|
|
22583 |
- fi;;
|
|
22584 |
- esac
|
|
22585 |
- done` || { (exit 1); exit 1; }
|
|
22586 |
- # Remove the trailing spaces.
|
|
22587 |
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
|
|
22588 |
-
|
|
22589 |
-_ACEOF
|
|
22590 |
-
|
|
22591 |
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
|
|
22592 |
-# `conftest.undefs', that substitutes the proper values into
|
|
22593 |
-# config.h.in to produce config.h. The first handles `#define'
|
|
22594 |
-# templates, and the second `#undef' templates.
|
|
22595 |
-# And first: Protect against being on the right side of a sed subst in
|
|
22596 |
-# config.status. Protect against being in an unquoted here document
|
|
22597 |
-# in config.status.
|
|
22598 |
-rm -f conftest.defines conftest.undefs
|
|
22599 |
-# Using a here document instead of a string reduces the quoting nightmare.
|
|
22600 |
-# Putting comments in sed scripts is not portable.
|
|
22601 |
-#
|
|
22602 |
-# `end' is used to avoid that the second main sed command (meant for
|
|
22603 |
-# 0-ary CPP macros) applies to n-ary macro definitions.
|
|
22604 |
-# See the Autoconf documentation for `clear'.
|
|
22605 |
-cat >confdef2sed.sed <<\_ACEOF
|
|
22606 |
-s/[\\&,]/\\&/g
|
|
22607 |
-s,[\\$`],\\&,g
|
|
22608 |
-t clear
|
|
22609 |
-: clear
|
|
22610 |
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
|
|
22611 |
-t end
|
|
22612 |
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
|
|
22613 |
-: end
|
|
22614 |
-_ACEOF
|
|
22615 |
-# If some macros were called several times there might be several times
|
|
22616 |
-# the same #defines, which is useless. Nevertheless, we may not want to
|
|
22617 |
-# sort them, since we want the *last* AC-DEFINE to be honored.
|
|
22618 |
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
|
|
22619 |
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
|
|
22620 |
-rm -f confdef2sed.sed
|
|
22621 |
+uniq confdefs.h |
|
|
22622 |
+ sed -n '
|
|
22623 |
+ t rset
|
|
22624 |
+ :rset
|
|
22625 |
+ s/^[ ]*#[ ]*define[ ][ ]*//
|
|
22626 |
+ t ok
|
|
22627 |
+ d
|
|
22628 |
+ :ok
|
|
22629 |
+ s/[\\&,]/\\&/g
|
|
22630 |
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
|
|
22631 |
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
|
|
22632 |
+ ' >>conftest.defines
|
|
22633 |
|
|
22634 |
-# This sed command replaces #undef with comments. This is necessary, for
|
|
22635 |
+# Remove the space that was appended to ease matching.
|
|
22636 |
+# Then replace #undef with comments. This is necessary, for
|
|
22637 |
# example, in the case of _POSIX_SOURCE, which is predefined and required
|
|
22638 |
# on some systems where configure will not decide to define it.
|
|
22639 |
-cat >>conftest.undefs <<\_ACEOF
|
|
22640 |
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
|
|
22641 |
+# (The regexp can be short, since the line contains either #define or #undef.)
|
|
22642 |
+echo 's/ $//
|
|
22643 |
+s,^[ #]*u.*,/* & */,' >>conftest.defines
|
|
22644 |
+
|
|
22645 |
+# Break up conftest.defines:
|
|
22646 |
+ac_max_sed_lines=50
|
|
22647 |
+
|
|
22648 |
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
|
|
22649 |
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
|
|
22650 |
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
|
|
22651 |
+# et cetera.
|
|
22652 |
+ac_in='$ac_file_inputs'
|
|
22653 |
+ac_out='"$tmp/out1"'
|
|
22654 |
+ac_nxt='"$tmp/out2"'
|
|
22655 |
+
|
|
22656 |
+while :
|
|
22657 |
+do
|
|
22658 |
+ # Write a here document:
|
|
22659 |
+ cat >>$CONFIG_STATUS <<_ACEOF
|
|
22660 |
+ # First, check the format of the line:
|
|
22661 |
+ cat >"\$tmp/defines.sed" <<\\CEOF
|
|
22662 |
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
|
|
22663 |
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
|
|
22664 |
+b
|
|
22665 |
+:def
|
|
22666 |
_ACEOF
|
|
22667 |
-
|
|
22668 |
-# Break up conftest.defines because some shells have a limit on the size
|
|
22669 |
-# of here documents, and old seds have small limits too (100 cmds).
|
|
22670 |
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
|
|
22671 |
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
|
|
22672 |
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
|
|
22673 |
-echo ' :' >>$CONFIG_STATUS
|
|
22674 |
-rm -f conftest.tail
|
|
22675 |
-while grep . conftest.defines >/dev/null
|
|
22676 |
-do
|
|
22677 |
- # Write a limited-size here document to $tmp/defines.sed.
|
|
22678 |
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
|
|
22679 |
- # Speed up: don't consider the non `#define' lines.
|
|
22680 |
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
|
|
22681 |
- # Work around the forget-to-reset-the-flag bug.
|
|
22682 |
- echo 't clr' >>$CONFIG_STATUS
|
|
22683 |
- echo ': clr' >>$CONFIG_STATUS
|
|
22684 |
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
|
|
22685 |
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
|
|
22686 |
echo 'CEOF
|
|
22687 |
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
|
|
22688 |
- rm -f $tmp/in
|
|
22689 |
- mv $tmp/out $tmp/in
|
|
22690 |
-' >>$CONFIG_STATUS
|
|
22691 |
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
|
|
22692 |
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
|
|
22693 |
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
|
|
22694 |
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
|
|
22695 |
+ grep . conftest.tail >/dev/null || break
|
|
22696 |
rm -f conftest.defines
|
|
22697 |
mv conftest.tail conftest.defines
|
|
22698 |
done
|
|
22699 |
-rm -f conftest.defines
|
|
22700 |
-echo ' fi # grep' >>$CONFIG_STATUS
|
|
22701 |
-echo >>$CONFIG_STATUS
|
|
22702 |
-
|
|
22703 |
-# Break up conftest.undefs because some shells have a limit on the size
|
|
22704 |
-# of here documents, and old seds have small limits too (100 cmds).
|
|
22705 |
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
|
|
22706 |
-rm -f conftest.tail
|
|
22707 |
-while grep . conftest.undefs >/dev/null
|
|
22708 |
-do
|
|
22709 |
- # Write a limited-size here document to $tmp/undefs.sed.
|
|
22710 |
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
|
|
22711 |
- # Speed up: don't consider the non `#undef'
|
|
22712 |
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
|
|
22713 |
- # Work around the forget-to-reset-the-flag bug.
|
|
22714 |
- echo 't clr' >>$CONFIG_STATUS
|
|
22715 |
- echo ': clr' >>$CONFIG_STATUS
|
|
22716 |
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
|
|
22717 |
- echo 'CEOF
|
|
22718 |
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
|
|
22719 |
- rm -f $tmp/in
|
|
22720 |
- mv $tmp/out $tmp/in
|
|
22721 |
-' >>$CONFIG_STATUS
|
|
22722 |
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
|
|
22723 |
- rm -f conftest.undefs
|
|
22724 |
- mv conftest.tail conftest.undefs
|
|
22725 |
-done
|
|
22726 |
-rm -f conftest.undefs
|
|
22727 |
+rm -f conftest.defines conftest.tail
|
|
22728 |
|
|
22729 |
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
|
|
22730 |
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
22731 |
- # Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
22732 |
- # use $as_me), people would be surprised to read:
|
|
22733 |
- # /* config.h. Generated by config.status. */
|
|
22734 |
- if test x"$ac_file" = x-; then
|
|
22735 |
- echo "/* Generated by configure. */" >$tmp/config.h
|
|
22736 |
- else
|
|
22737 |
- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
|
|
22738 |
- fi
|
|
22739 |
- cat $tmp/in >>$tmp/config.h
|
|
22740 |
- rm -f $tmp/in
|
|
22741 |
if test x"$ac_file" != x-; then
|
|
22742 |
- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
|
|
22743 |
+ echo "/* $configure_input */" >"$tmp/config.h"
|
|
22744 |
+ cat "$ac_result" >>"$tmp/config.h"
|
|
22745 |
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
|
|
22746 |
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
|
|
22747 |
echo "$as_me: $ac_file is unchanged" >&6;}
|
|
22748 |
else
|
|
22749 |
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
|
22750 |
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22751 |
- X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
22752 |
- X"$ac_file" : 'X\(//\)$' \| \
|
|
22753 |
- X"$ac_file" : 'X\(/\)' \| \
|
|
22754 |
- . : '\(.\)' 2>/dev/null ||
|
|
22755 |
-echo X"$ac_file" |
|
|
22756 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22757 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22758 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22759 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22760 |
- s/.*/./; q'`
|
|
22761 |
- { if $as_mkdir_p; then
|
|
22762 |
- mkdir -p "$ac_dir"
|
|
22763 |
- else
|
|
22764 |
- as_dir="$ac_dir"
|
|
22765 |
- as_dirs=
|
|
22766 |
- while test ! -d "$as_dir"; do
|
|
22767 |
- as_dirs="$as_dir $as_dirs"
|
|
22768 |
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
22769 |
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22770 |
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
22771 |
- X"$as_dir" : 'X\(//\)$' \| \
|
|
22772 |
- X"$as_dir" : 'X\(/\)' \| \
|
|
22773 |
- . : '\(.\)' 2>/dev/null ||
|
|
22774 |
-echo X"$as_dir" |
|
|
22775 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22776 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22777 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22778 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22779 |
- s/.*/./; q'`
|
|
22780 |
- done
|
|
22781 |
- test ! -n "$as_dirs" || mkdir $as_dirs
|
|
22782 |
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
22783 |
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
22784 |
- { (exit 1); exit 1; }; }; }
|
|
22785 |
-
|
|
22786 |
rm -f $ac_file
|
|
22787 |
- mv $tmp/config.h $ac_file
|
|
22788 |
+ mv "$tmp/config.h" $ac_file
|
|
22789 |
fi
|
|
22790 |
else
|
|
22791 |
- cat $tmp/config.h
|
|
22792 |
- rm -f $tmp/config.h
|
|
22793 |
+ echo "/* $configure_input */"
|
|
22794 |
+ cat "$ac_result"
|
|
22795 |
fi
|
|
22796 |
+ rm -f "$tmp/out12"
|
|
22797 |
# Compute $ac_file's index in $config_headers.
|
|
22798 |
_am_stamp_count=1
|
|
22799 |
for _am_header in $config_headers :; do
|
|
22800 |
@@ -9445,135 +11206,39 @@ for _am_header in $config_headers :; do
|
|
22801 |
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
|
22802 |
esac
|
|
22803 |
done
|
|
22804 |
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
|
|
22805 |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
|
|
22806 |
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22807 |
X$ac_file : 'X\(//\)[^/]' \| \
|
|
22808 |
X$ac_file : 'X\(//\)$' \| \
|
|
22809 |
- X$ac_file : 'X\(/\)' \| \
|
|
22810 |
- . : '\(.\)' 2>/dev/null ||
|
|
22811 |
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
|
|
22812 |
echo X$ac_file |
|
|
22813 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22814 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22815 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22816 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22817 |
- s/.*/./; q'`/stamp-h$_am_stamp_count
|
|
22818 |
-done
|
|
22819 |
-_ACEOF
|
|
22820 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
22821 |
-
|
|
22822 |
-#
|
|
22823 |
-# CONFIG_COMMANDS section.
|
|
22824 |
-#
|
|
22825 |
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
|
|
22826 |
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
|
|
22827 |
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
22828 |
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
|
|
22829 |
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22830 |
- X"$ac_dest" : 'X\(//\)[^/]' \| \
|
|
22831 |
- X"$ac_dest" : 'X\(//\)$' \| \
|
|
22832 |
- X"$ac_dest" : 'X\(/\)' \| \
|
|
22833 |
- . : '\(.\)' 2>/dev/null ||
|
|
22834 |
-echo X"$ac_dest" |
|
|
22835 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22836 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22837 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22838 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22839 |
- s/.*/./; q'`
|
|
22840 |
- { if $as_mkdir_p; then
|
|
22841 |
- mkdir -p "$ac_dir"
|
|
22842 |
- else
|
|
22843 |
- as_dir="$ac_dir"
|
|
22844 |
- as_dirs=
|
|
22845 |
- while test ! -d "$as_dir"; do
|
|
22846 |
- as_dirs="$as_dir $as_dirs"
|
|
22847 |
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
22848 |
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22849 |
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
22850 |
- X"$as_dir" : 'X\(//\)$' \| \
|
|
22851 |
- X"$as_dir" : 'X\(/\)' \| \
|
|
22852 |
- . : '\(.\)' 2>/dev/null ||
|
|
22853 |
-echo X"$as_dir" |
|
|
22854 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22855 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22856 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22857 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22858 |
- s/.*/./; q'`
|
|
22859 |
- done
|
|
22860 |
- test ! -n "$as_dirs" || mkdir $as_dirs
|
|
22861 |
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
22862 |
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
22863 |
- { (exit 1); exit 1; }; }; }
|
|
22864 |
-
|
|
22865 |
- ac_builddir=.
|
|
22866 |
-
|
|
22867 |
-if test "$ac_dir" != .; then
|
|
22868 |
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
22869 |
- # A "../" for each directory in $ac_dir_suffix.
|
|
22870 |
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
22871 |
-else
|
|
22872 |
- ac_dir_suffix= ac_top_builddir=
|
|
22873 |
-fi
|
|
22874 |
-
|
|
22875 |
-case $srcdir in
|
|
22876 |
- .) # No --srcdir option. We are building in place.
|
|
22877 |
- ac_srcdir=.
|
|
22878 |
- if test -z "$ac_top_builddir"; then
|
|
22879 |
- ac_top_srcdir=.
|
|
22880 |
- else
|
|
22881 |
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
22882 |
- fi ;;
|
|
22883 |
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
22884 |
- ac_srcdir=$srcdir$ac_dir_suffix;
|
|
22885 |
- ac_top_srcdir=$srcdir ;;
|
|
22886 |
- *) # Relative path.
|
|
22887 |
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
22888 |
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
22889 |
-esac
|
|
22890 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
22891 |
+ s//\1/
|
|
22892 |
+ q
|
|
22893 |
+ }
|
|
22894 |
+ /^X\(\/\/\)[^/].*/{
|
|
22895 |
+ s//\1/
|
|
22896 |
+ q
|
|
22897 |
+ }
|
|
22898 |
+ /^X\(\/\/\)$/{
|
|
22899 |
+ s//\1/
|
|
22900 |
+ q
|
|
22901 |
+ }
|
|
22902 |
+ /^X\(\/\).*/{
|
|
22903 |
+ s//\1/
|
|
22904 |
+ q
|
|
22905 |
+ }
|
|
22906 |
+ s/.*/./; q'`/stamp-h$_am_stamp_count
|
|
22907 |
+ ;;
|
|
22908 |
|
|
22909 |
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
22910 |
-# the directories may not exist.
|
|
22911 |
-case `pwd` in
|
|
22912 |
-.) ac_abs_builddir="$ac_dir";;
|
|
22913 |
-*)
|
|
22914 |
- case "$ac_dir" in
|
|
22915 |
- .) ac_abs_builddir=`pwd`;;
|
|
22916 |
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
22917 |
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
22918 |
- esac;;
|
|
22919 |
-esac
|
|
22920 |
-case $ac_abs_builddir in
|
|
22921 |
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
22922 |
-*)
|
|
22923 |
- case ${ac_top_builddir}. in
|
|
22924 |
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
22925 |
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
22926 |
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
22927 |
- esac;;
|
|
22928 |
-esac
|
|
22929 |
-case $ac_abs_builddir in
|
|
22930 |
-.) ac_abs_srcdir=$ac_srcdir;;
|
|
22931 |
-*)
|
|
22932 |
- case $ac_srcdir in
|
|
22933 |
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
22934 |
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
22935 |
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
22936 |
- esac;;
|
|
22937 |
-esac
|
|
22938 |
-case $ac_abs_builddir in
|
|
22939 |
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
22940 |
-*)
|
|
22941 |
- case $ac_top_srcdir in
|
|
22942 |
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
22943 |
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
22944 |
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
22945 |
- esac;;
|
|
22946 |
-esac
|
|
22947 |
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
|
|
22948 |
+echo "$as_me: executing $ac_file commands" >&6;}
|
|
22949 |
+ ;;
|
|
22950 |
+ esac
|
|
22951 |
|
|
22952 |
|
|
22953 |
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
|
|
22954 |
-echo "$as_me: executing $ac_dest commands" >&6;}
|
|
22955 |
- case $ac_dest in
|
|
22956 |
- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
|
|
22957 |
+ case $ac_file$ac_mode in
|
|
22958 |
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
|
|
22959 |
# Strip MF so we end up with the name of the file.
|
|
22960 |
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
22961 |
# Check whether this is an Automake generated Makefile or not.
|
|
22962 |
@@ -9583,86 +11248,225 @@ echo "$as_me: executing $ac_dest command
|
|
22963 |
# each Makefile.in and add a new line on top of each file to say so.
|
|
22964 |
# So let's grep whole file.
|
|
22965 |
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
|
22966 |
- dirpart=`(dirname "$mf") 2>/dev/null ||
|
|
22967 |
+ dirpart=`$as_dirname -- "$mf" ||
|
|
22968 |
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
22969 |
X"$mf" : 'X\(//\)[^/]' \| \
|
|
22970 |
X"$mf" : 'X\(//\)$' \| \
|
|
22971 |
- X"$mf" : 'X\(/\)' \| \
|
|
22972 |
- . : '\(.\)' 2>/dev/null ||
|
|
22973 |
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
|
|
22974 |
echo X"$mf" |
|
|
22975 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
22976 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
22977 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
22978 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
22979 |
- s/.*/./; q'`
|
|
22980 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
22981 |
+ s//\1/
|
|
22982 |
+ q
|
|
22983 |
+ }
|
|
22984 |
+ /^X\(\/\/\)[^/].*/{
|
|
22985 |
+ s//\1/
|
|
22986 |
+ q
|
|
22987 |
+ }
|
|
22988 |
+ /^X\(\/\/\)$/{
|
|
22989 |
+ s//\1/
|
|
22990 |
+ q
|
|
22991 |
+ }
|
|
22992 |
+ /^X\(\/\).*/{
|
|
22993 |
+ s//\1/
|
|
22994 |
+ q
|
|
22995 |
+ }
|
|
22996 |
+ s/.*/./; q'`
|
|
22997 |
else
|
|
22998 |
continue
|
|
22999 |
fi
|
|
23000 |
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
23001 |
- # from the Makefile without running `make'.
|
|
23002 |
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
23003 |
+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
|
|
23004 |
+ # Extract the definition of DEP_FILES from the Makefile without
|
|
23005 |
+ # running `make'.
|
|
23006 |
+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
|
|
23007 |
test -z "$DEPDIR" && continue
|
|
23008 |
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
23009 |
- test -z "am__include" && continue
|
|
23010 |
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
23011 |
# When using ansi2knr, U may be empty or an underscore; expand it
|
|
23012 |
- U=`sed -n 's/^U = //p' < "$mf"`
|
|
23013 |
- # Find all dependency output files, they are included files with
|
|
23014 |
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
23015 |
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
23016 |
- # expansion.
|
|
23017 |
- for file in `sed -n "
|
|
23018 |
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
23019 |
+ U=`sed -n -e '/^U = / s///p' < "$mf"`
|
|
23020 |
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
|
|
23021 |
+ # We invoke sed twice because it is the simplest approach to
|
|
23022 |
+ # changing $(DEPDIR) to its actual value in the expansion.
|
|
23023 |
+ for file in `sed -n -e '
|
|
23024 |
+ /^DEP_FILES = .*\\\\$/ {
|
|
23025 |
+ s/^DEP_FILES = //
|
|
23026 |
+ :loop
|
|
23027 |
+ s/\\\\$//
|
|
23028 |
+ p
|
|
23029 |
+ n
|
|
23030 |
+ /\\\\$/ b loop
|
|
23031 |
+ p
|
|
23032 |
+ }
|
|
23033 |
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
|
|
23034 |
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
|
23035 |
# Make sure the directory exists.
|
|
23036 |
test -f "$dirpart/$file" && continue
|
|
23037 |
- fdir=`(dirname "$file") 2>/dev/null ||
|
|
23038 |
+ fdir=`$as_dirname -- "$file" ||
|
|
23039 |
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
23040 |
X"$file" : 'X\(//\)[^/]' \| \
|
|
23041 |
X"$file" : 'X\(//\)$' \| \
|
|
23042 |
- X"$file" : 'X\(/\)' \| \
|
|
23043 |
- . : '\(.\)' 2>/dev/null ||
|
|
23044 |
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
23045 |
echo X"$file" |
|
|
23046 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
23047 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
23048 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
23049 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
23050 |
- s/.*/./; q'`
|
|
23051 |
- { if $as_mkdir_p; then
|
|
23052 |
- mkdir -p $dirpart/$fdir
|
|
23053 |
- else
|
|
23054 |
- as_dir=$dirpart/$fdir
|
|
23055 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
23056 |
+ s//\1/
|
|
23057 |
+ q
|
|
23058 |
+ }
|
|
23059 |
+ /^X\(\/\/\)[^/].*/{
|
|
23060 |
+ s//\1/
|
|
23061 |
+ q
|
|
23062 |
+ }
|
|
23063 |
+ /^X\(\/\/\)$/{
|
|
23064 |
+ s//\1/
|
|
23065 |
+ q
|
|
23066 |
+ }
|
|
23067 |
+ /^X\(\/\).*/{
|
|
23068 |
+ s//\1/
|
|
23069 |
+ q
|
|
23070 |
+ }
|
|
23071 |
+ s/.*/./; q'`
|
|
23072 |
+ { as_dir=$dirpart/$fdir
|
|
23073 |
+ case $as_dir in #(
|
|
23074 |
+ -*) as_dir=./$as_dir;;
|
|
23075 |
+ esac
|
|
23076 |
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
23077 |
as_dirs=
|
|
23078 |
- while test ! -d "$as_dir"; do
|
|
23079 |
- as_dirs="$as_dir $as_dirs"
|
|
23080 |
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
23081 |
+ while :; do
|
|
23082 |
+ case $as_dir in #(
|
|
23083 |
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
|
|
23084 |
+ *) as_qdir=$as_dir;;
|
|
23085 |
+ esac
|
|
23086 |
+ as_dirs="'$as_qdir' $as_dirs"
|
|
23087 |
+ as_dir=`$as_dirname -- "$as_dir" ||
|
|
23088 |
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
23089 |
X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
23090 |
X"$as_dir" : 'X\(//\)$' \| \
|
|
23091 |
- X"$as_dir" : 'X\(/\)' \| \
|
|
23092 |
- . : '\(.\)' 2>/dev/null ||
|
|
23093 |
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
|
23094 |
echo X"$as_dir" |
|
|
23095 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
23096 |
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
23097 |
- /^X\(\/\/\)$/{ s//\1/; q; }
|
|
23098 |
- /^X\(\/\).*/{ s//\1/; q; }
|
|
23099 |
- s/.*/./; q'`
|
|
23100 |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
23101 |
+ s//\1/
|
|
23102 |
+ q
|
|
23103 |
+ }
|
|
23104 |
+ /^X\(\/\/\)[^/].*/{
|
|
23105 |
+ s//\1/
|
|
23106 |
+ q
|
|
23107 |
+ }
|
|
23108 |
+ /^X\(\/\/\)$/{
|
|
23109 |
+ s//\1/
|
|
23110 |
+ q
|
|
23111 |
+ }
|
|
23112 |
+ /^X\(\/\).*/{
|
|
23113 |
+ s//\1/
|
|
23114 |
+ q
|
|
23115 |
+ }
|
|
23116 |
+ s/.*/./; q'`
|
|
23117 |
+ test -d "$as_dir" && break
|
|
23118 |
done
|
|
23119 |
- test ! -n "$as_dirs" || mkdir $as_dirs
|
|
23120 |
- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
|
|
23121 |
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
|
|
23122 |
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
|
23123 |
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
23124 |
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
23125 |
{ (exit 1); exit 1; }; }; }
|
|
23126 |
-
|
|
23127 |
# echo "creating $dirpart/$file"
|
|
23128 |
echo '# dummy' > "$dirpart/$file"
|
|
23129 |
done
|
|
23130 |
done
|
|
23131 |
;;
|
|
23132 |
+ "default-1":C)
|
|
23133 |
+ for ac_file in $CONFIG_FILES; do
|
|
23134 |
+ # Support "outfile[:infile[:infile...]]"
|
|
23135 |
+ case "$ac_file" in
|
|
23136 |
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
23137 |
+ esac
|
|
23138 |
+ # PO directories have a Makefile.in generated from Makefile.in.in.
|
|
23139 |
+ case "$ac_file" in */Makefile.in)
|
|
23140 |
+ # Adjust a relative srcdir.
|
|
23141 |
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
23142 |
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
23143 |
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
23144 |
+ # In autoconf-2.13 it is called $ac_given_srcdir.
|
|
23145 |
+ # In autoconf-2.50 it is called $srcdir.
|
|
23146 |
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
|
23147 |
+ case "$ac_given_srcdir" in
|
|
23148 |
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
23149 |
+ /*) top_srcdir="$ac_given_srcdir" ;;
|
|
23150 |
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
23151 |
+ esac
|
|
23152 |
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
|
23153 |
+ rm -f "$ac_dir/POTFILES"
|
|
23154 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
|
23155 |
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
|
|
23156 |
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
|
|
23157 |
+ # on $ac_dir but don't depend on user-specified configuration
|
|
23158 |
+ # parameters.
|
|
23159 |
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
|
23160 |
+ # The LINGUAS file contains the set of available languages.
|
|
23161 |
+ if test -n "$ALL_LINGUAS"; then
|
|
23162 |
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
|
23163 |
+ fi
|
|
23164 |
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
|
23165 |
+ # Hide the ALL_LINGUAS assigment from automake.
|
|
23166 |
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
|
23167 |
+ fi
|
|
23168 |
+ case "$ac_given_srcdir" in
|
|
23169 |
+ .) srcdirpre= ;;
|
|
23170 |
+ *) srcdirpre='$(srcdir)/' ;;
|
|
23171 |
+ esac
|
|
23172 |
+ POFILES=
|
|
23173 |
+ GMOFILES=
|
|
23174 |
+ UPDATEPOFILES=
|
|
23175 |
+ DUMMYPOFILES=
|
|
23176 |
+ for lang in $ALL_LINGUAS; do
|
|
23177 |
+ POFILES="$POFILES $srcdirpre$lang.po"
|
|
23178 |
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
|
23179 |
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
|
23180 |
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
|
23181 |
+ done
|
|
23182 |
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
23183 |
+ # environment variable.
|
|
23184 |
+ INST_LINGUAS=
|
|
23185 |
+ if test -n "$ALL_LINGUAS"; then
|
|
23186 |
+ for presentlang in $ALL_LINGUAS; do
|
|
23187 |
+ useit=no
|
|
23188 |
+ if test "%UNSET%" != "$LINGUAS"; then
|
|
23189 |
+ desiredlanguages="$LINGUAS"
|
|
23190 |
+ else
|
|
23191 |
+ desiredlanguages="$ALL_LINGUAS"
|
|
23192 |
+ fi
|
|
23193 |
+ for desiredlang in $desiredlanguages; do
|
|
23194 |
+ # Use the presentlang catalog if desiredlang is
|
|
23195 |
+ # a. equal to presentlang, or
|
|
23196 |
+ # b. a variant of presentlang (because in this case,
|
|
23197 |
+ # presentlang can be used as a fallback for messages
|
|
23198 |
+ # which are not translated in the desiredlang catalog).
|
|
23199 |
+ case "$desiredlang" in
|
|
23200 |
+ "$presentlang"*) useit=yes;;
|
|
23201 |
+ esac
|
|
23202 |
+ done
|
|
23203 |
+ if test $useit = yes; then
|
|
23204 |
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
|
|
23205 |
+ fi
|
|
23206 |
+ done
|
|
23207 |
+ fi
|
|
23208 |
+ CATALOGS=
|
|
23209 |
+ if test -n "$INST_LINGUAS"; then
|
|
23210 |
+ for lang in $INST_LINGUAS; do
|
|
23211 |
+ CATALOGS="$CATALOGS $lang.gmo"
|
|
23212 |
+ done
|
|
23213 |
+ fi
|
|
23214 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
|
|
23215 |
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
|
23216 |
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
|
|
23217 |
+ if test -f "$f"; then
|
|
23218 |
+ case "$f" in
|
|
23219 |
+ *.orig | *.bak | *~) ;;
|
|
23220 |
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
|
|
23221 |
+ esac
|
|
23222 |
+ fi
|
|
23223 |
+ done
|
|
23224 |
+ fi
|
|
23225 |
+ ;;
|
|
23226 |
+ esac
|
|
23227 |
+ done ;;
|
|
23228 |
+
|
|
23229 |
esac
|
|
23230 |
-done
|
|
23231 |
-_ACEOF
|
|
23232 |
+done # for ac_tag
|
|
23233 |
|
|
23234 |
-cat >>$CONFIG_STATUS <<\_ACEOF
|
|
23235 |
|
|
23236 |
{ (exit 0); exit 0; }
|
|
23237 |
_ACEOF
|
|
23238 |
@@ -9692,3 +11496,19 @@ if test "$no_create" != yes; then
|
|
23239 |
fi
|
|
23240 |
|
|
23241 |
|
|
23242 |
+echo ""
|
|
23243 |
+echo "Finished configure:"
|
|
23244 |
+echo " tabs: $enable_tabs";
|
|
23245 |
+echo " cookies: $enable_cookies";
|
|
23246 |
+echo " anti-alias: $enable_anti_alias";
|
|
23247 |
+echo " ssl: $enable_ssl";
|
|
23248 |
+echo " meta refresh: $enable_meta_refresh";
|
|
23249 |
+echo " efence: $enable_efence";
|
|
23250 |
+echo " gprof: $enable_gprof";
|
|
23251 |
+echo " insure: $enable_insure";
|
|
23252 |
+echo " rftl: $enable_rtfl";
|
|
23253 |
+echo " prefix: $prefix";
|
|
23254 |
+
|
|
23255 |
+echo ""
|
|
23256 |
+echo "Run configure --help for explanation of these options,"
|
|
23257 |
+echo "otherwise type 'make' to build Dillo."
|
|
23258 |
diff -pruN dillo-0.8.6/configure.in dillo-0.8.6-i18n-misc-20070916/configure.in
|
|
23259 |
--- dillo-0.8.6/configure.in 2006-04-27 01:05:29.000000000 +0900
|
|
23260 |
+++ dillo-0.8.6-i18n-misc-20070916/configure.in 2007-09-07 00:59:33.000000000 +0900
|
|
23261 |
@@ -5,7 +5,7 @@ AC_INIT(src/dillo.c)
|
|
23262 |
dnl Detect the canonical host and target build environment
|
|
23263 |
AC_CANONICAL_SYSTEM
|
|
23264 |
|
|
23265 |
-AM_INIT_AUTOMAKE(dillo, 0.8.6)
|
|
23266 |
+AM_INIT_AUTOMAKE(dillo, 0.8.6-i18n-misc)
|
|
23267 |
AM_CONFIG_HEADER(config.h)
|
|
23268 |
|
|
23269 |
dnl Options
|
|
23270 |
@@ -21,8 +21,13 @@ AC_ARG_ENABLE(insure, [ --enable-insure
|
|
23271 |
, enable_insure=no)
|
|
23272 |
AC_ARG_ENABLE(ansi, [ --enable-ansi Try to compile and run with ANSI flags],
|
|
23273 |
, enable_ansi=no)
|
|
23274 |
+AC_ARG_ENABLE(tabs, [ --disable-tabs Don't compile support for tabs],
|
|
23275 |
+ , enable_tabs=yes)
|
|
23276 |
+AC_ARG_ENABLE(anti_alias,[ --disable-anti-alias Don't compile support for anti-alias],
|
|
23277 |
+ , enable_anti_alias=yes)
|
|
23278 |
AC_ARG_ENABLE(ipv6, [ --enable-ipv6 Build with support for IPv6], , )
|
|
23279 |
-AC_ARG_ENABLE(rtfl, [ --enable-rtfl Build with rtfl messages], enable_rtfl=yes)
|
|
23280 |
+AC_ARG_ENABLE(rtfl, [ --enable-rtfl Build with rtfl messages],
|
|
23281 |
+ , enable_rtfl=no)
|
|
23282 |
AC_ARG_ENABLE(cookies,[ --disable-cookies Don't compile support for cookies],
|
|
23283 |
, enable_cookies=yes)
|
|
23284 |
AC_ARG_ENABLE(png, [ --disable-png Disable support for PNG images],
|
|
23285 |
@@ -38,6 +43,8 @@ AC_ARG_ENABLE(dlgui, [ --disable-dlgui
|
|
23286 |
AC_ARG_ENABLE(threaded-dns,[ --disable-threaded-dns Disable the advantage of a reentrant resolver library],
|
|
23287 |
enable_threaded_dns=$enableval, enable_threaded_dns=yes)
|
|
23288 |
AM_CONDITIONAL(DLGUI, test x$enable_dlgui = xyes)
|
|
23289 |
+AC_ARG_ENABLE(meta_refresh, [ --enable-meta-refresh Allow meta refresh],
|
|
23290 |
+ , enable_meta_refresh=no)
|
|
23291 |
|
|
23292 |
AC_PROG_CC
|
|
23293 |
AM_PROG_CC_STDC
|
|
23294 |
@@ -46,6 +53,20 @@ AC_PROG_CPP
|
|
23295 |
AC_PROG_CXX
|
|
23296 |
|
|
23297 |
dnl --------------------------------------
|
|
23298 |
+dnl Check for Gettext
|
|
23299 |
+dnl --------------------------------------
|
|
23300 |
+dnl
|
|
23301 |
+ALL_LINGUAS="de ja zh_CN zh_TW"
|
|
23302 |
+AM_GNU_GETTEXT([external])
|
|
23303 |
+LDFLAGS="$LDFLAGS $INTLLIBS"
|
|
23304 |
+AC_CHECK_LIB(iconv, iconv, haslibiconv=yes, haslibiconv=no)
|
|
23305 |
+if test "x$haslibiconv" = "xyes"; then
|
|
23306 |
+ LDFLAGS="$LDFLAGS $LIBICONV"
|
|
23307 |
+fi
|
|
23308 |
+localedir='${prefix}/share/locale'
|
|
23309 |
+AC_SUBST(localedir)
|
|
23310 |
+
|
|
23311 |
+dnl --------------------------------------
|
|
23312 |
dnl Check whether to add /usr/local or not
|
|
23313 |
dnl (this is somewhat a religious problem)
|
|
23314 |
dnl --------------------------------------
|
|
23315 |
@@ -128,6 +149,11 @@ dnl
|
|
23316 |
if test "x$enable_jpeg" = "xyes"; then
|
|
23317 |
AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)
|
|
23318 |
|
|
23319 |
+ if test -e /usr/include/jpeglib.h || test -e /usr/local/include/jpeglib.h
|
|
23320 |
+ then
|
|
23321 |
+ jpeg_ok=yes
|
|
23322 |
+ fi
|
|
23323 |
+
|
|
23324 |
if test "x$jpeg_ok" = "xyes"; then
|
|
23325 |
old_libs="$LIBS"
|
|
23326 |
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no)
|
|
23327 |
@@ -155,7 +181,7 @@ dnl ------------------------------
|
|
23328 |
dnl Test for zlib (libpng uses it)
|
|
23329 |
dnl ------------------------------
|
|
23330 |
dnl
|
|
23331 |
-if test "x$enable_png" = "xyes"; then
|
|
23332 |
+dnl if test "x$enable_png" = "xyes"; then
|
|
23333 |
AC_CHECK_HEADER(zlib.h, libz_ok=yes, libz_ok=no)
|
|
23334 |
|
|
23335 |
if test "x$libz_ok" = "xyes"; then
|
|
23336 |
@@ -169,7 +195,7 @@ if test "x$enable_png" = "xyes"; then
|
|
23337 |
else
|
|
23338 |
AC_MSG_WARN([*** No libz found. Disabling PNG images ***])
|
|
23339 |
fi
|
|
23340 |
-fi
|
|
23341 |
+dnl fi
|
|
23342 |
|
|
23343 |
dnl ---------------
|
|
23344 |
dnl Test for libpng
|
|
23345 |
@@ -267,6 +293,19 @@ if test "x$ssl_ok" = "xyes"; then
|
|
23346 |
AC_DEFINE([ENABLE_SSL], [], [Enable SSL support])
|
|
23347 |
fi
|
|
23348 |
|
|
23349 |
+dnl ----------------------
|
|
23350 |
+dnl Test for libssl
|
|
23351 |
+dnl ----------------------
|
|
23352 |
+dnl
|
|
23353 |
+if test "x$enable_ssl" = "xyes" ; then
|
|
23354 |
+ AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h)
|
|
23355 |
+ AC_CHECK_LIB(ssl, SSL_connect, , enable_ssl="no")
|
|
23356 |
+ if test "x$enable_ssl" = "xno" ; then
|
|
23357 |
+ AC_MSG_WARN(*** No libssl found. Disabling ssl. ***)
|
|
23358 |
+ else
|
|
23359 |
+ AC_DEFINE(DILLO_SSL, 1, [Enable SSL Processing])
|
|
23360 |
+ fi
|
|
23361 |
+fi
|
|
23362 |
|
|
23363 |
dnl ----------------------
|
|
23364 |
dnl Test for POSIX threads
|
|
23365 |
@@ -351,6 +390,47 @@ dnl --------------------
|
|
23366 |
dnl Command line options
|
|
23367 |
dnl --------------------
|
|
23368 |
dnl
|
|
23369 |
+if test "x$enable_tabs" = "xno" ; then
|
|
23370 |
+ CFLAGS="$CFLAGS -DDISABLE_TABS"
|
|
23371 |
+fi
|
|
23372 |
+if test "x$enable_anti_alias" = "xno" ; then
|
|
23373 |
+ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
|
|
23374 |
+else
|
|
23375 |
+ AC_PATH_PROG(XFT_CONFIG, xft-config, no, $PATH:/usr/local/bin)
|
|
23376 |
+ if test "$XFT_CONFIG" = "no" ; then
|
|
23377 |
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no, $PATH:/usr/local/bin)
|
|
23378 |
+ if test "$PKG_CONFIG" = "no" ; then
|
|
23379 |
+ if test -d "/usr/include/freetype2" ; then
|
|
23380 |
+ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
|
|
23381 |
+ elif test -d "/usr/include/freetype1" ; then
|
|
23382 |
+ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype1"
|
|
23383 |
+ fi
|
|
23384 |
+ if test -e "/usr/X11R6/include/X11/Xft/Xft.h" ; then
|
|
23385 |
+ AC_MSG_CHECKING(checking for Xft)
|
|
23386 |
+ if test -e "/usr/X11R6/lib/libXft.so.2" ; then
|
|
23387 |
+ AC_MSG_RESULT(Xft2)
|
|
23388 |
+ LIBS="/usr/X11R6/lib/libXft.so.2 $LIBS"
|
|
23389 |
+ elif test -e "/usr/lib/libXft.so.2" ; then
|
|
23390 |
+ AC_MSG_RESULT(Xft2)
|
|
23391 |
+ LIBS="/usr/lib/libXft.so.2 $LIBS"
|
|
23392 |
+ else
|
|
23393 |
+ AC_MSG_RESULT(Xft)
|
|
23394 |
+ LIBS="-lXft $LIBS"
|
|
23395 |
+ fi
|
|
23396 |
+ else
|
|
23397 |
+ AC_MSG_WARN(*** Xft not found. Disabling anti-alias.***)
|
|
23398 |
+ enable_anti_alias="no"
|
|
23399 |
+ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
|
|
23400 |
+ fi
|
|
23401 |
+ else
|
|
23402 |
+ CFLAGS="$CFLAGS `$PKG_CONFIG xft --cflags`"
|
|
23403 |
+ LDFLAGS="$LDFLAGS `$PKG_CONFIG xft --libs`"
|
|
23404 |
+ fi
|
|
23405 |
+ else
|
|
23406 |
+ CFLAGS="$CFLAGS `$XFT_CONFIG --cflags`"
|
|
23407 |
+ LDFLAGS="$LDFLAGS `$XFT_CONFIG --libs`"
|
|
23408 |
+ fi
|
|
23409 |
+fi
|
|
23410 |
if test "x$enable_cookies" = "xno" ; then
|
|
23411 |
CFLAGS="$CFLAGS -DDISABLE_COOKIES"
|
|
23412 |
fi
|
|
23413 |
@@ -373,7 +453,10 @@ fi
|
|
23414 |
if test "x$enable_threaded_dns" = "xyes" ; then
|
|
23415 |
CFLAGS="$CFLAGS -DD_DNS_THREADED"
|
|
23416 |
fi
|
|
23417 |
-
|
|
23418 |
+if test "x$enable_meta_refresh" = "xyes" ; then
|
|
23419 |
+ CFLAGS="$CFLAGS -DENABLE_META_REFRESH"
|
|
23420 |
+fi
|
|
23421 |
+
|
|
23422 |
dnl -----------------------
|
|
23423 |
dnl Checks for header files
|
|
23424 |
dnl -----------------------
|
|
23425 |
@@ -429,5 +512,25 @@ AC_SUBST(LIBFLTK_LIBS)
|
|
23426 |
AC_SUBST(datadir)
|
|
23427 |
AC_SUBST(src doc bin util lib)
|
|
23428 |
|
|
23429 |
-AC_OUTPUT(Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile src/Makefile src/IO/Makefile)
|
|
23430 |
+AC_OUTPUT(Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile config/Makefile src/Makefile src/IO/Makefile po/Makefile.in m4/Makefile)
|
|
23431 |
|
|
23432 |
+dnl ----------------------
|
|
23433 |
+dnl Show configure summary
|
|
23434 |
+dnl ----------------------
|
|
23435 |
+echo ""
|
|
23436 |
+echo "Finished configure:"
|
|
23437 |
+echo " tabs: $enable_tabs";
|
|
23438 |
+echo " cookies: $enable_cookies";
|
|
23439 |
+echo " anti-alias: $enable_anti_alias";
|
|
23440 |
+echo " ssl: $enable_ssl";
|
|
23441 |
+echo " meta refresh: $enable_meta_refresh";
|
|
23442 |
+dnl echo " ipv6: $enable_ipv6";
|
|
23443 |
+echo " efence: $enable_efence";
|
|
23444 |
+echo " gprof: $enable_gprof";
|
|
23445 |
+echo " insure: $enable_insure";
|
|
23446 |
+echo " rftl: $enable_rtfl";
|
|
23447 |
+echo " prefix: $prefix";
|
|
23448 |
+
|
|
23449 |
+echo ""
|
|
23450 |
+echo "Run configure --help for explanation of these options,"
|
|
23451 |
+echo "otherwise type 'make' to build Dillo."
|
|
23452 |
diff -pruN dillo-0.8.6/depcomp dillo-0.8.6-i18n-misc-20070916/depcomp
|
|
23453 |
--- dillo-0.8.6/depcomp 2005-03-22 16:17:05.000000000 +0900
|
|
23454 |
+++ dillo-0.8.6-i18n-misc-20070916/depcomp 2006-05-16 01:21:07.000000000 +0900
|
|
23455 |
@@ -1,9 +1,9 @@
|
|
23456 |
#! /bin/sh
|
|
23457 |
# depcomp - compile a program generating dependencies as side-effects
|
|
23458 |
|
|
23459 |
-scriptversion=2005-02-09.22
|
|
23460 |
+scriptversion=2004-04-25.13
|
|
23461 |
|
|
23462 |
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
23463 |
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
|
|
23464 |
|
|
23465 |
# This program is free software; you can redistribute it and/or modify
|
|
23466 |
# it under the terms of the GNU General Public License as published by
|
|
23467 |
@@ -43,18 +43,17 @@ Environment variables:
|
|
23468 |
depmode Dependency tracking mode.
|
|
23469 |
source Source file read by `PROGRAMS ARGS'.
|
|
23470 |
object Object file output by `PROGRAMS ARGS'.
|
|
23471 |
- DEPDIR directory where to store dependencies.
|
|
23472 |
depfile Dependency file to output.
|
|
23473 |
tmpdepfile Temporary file to use when outputing dependencies.
|
|
23474 |
libtool Whether libtool is used (yes/no).
|
|
23475 |
|
|
23476 |
Report bugs to <bug-automake@gnu.org>.
|
|
23477 |
EOF
|
|
23478 |
- exit $?
|
|
23479 |
+ exit 0
|
|
23480 |
;;
|
|
23481 |
-v | --v*)
|
|
23482 |
echo "depcomp $scriptversion"
|
|
23483 |
- exit $?
|
|
23484 |
+ exit 0
|
|
23485 |
;;
|
|
23486 |
esac
|
|
23487 |
|
|
23488 |
@@ -62,10 +61,18 @@ if test -z "$depmode" || test -z "$sourc
|
|
23489 |
echo "depcomp: Variables source, object and depmode must be set" 1>&2
|
|
23490 |
exit 1
|
|
23491 |
fi
|
|
23492 |
+# `libtool' can also be set to `yes' or `no'.
|
|
23493 |
+
|
|
23494 |
+if test -z "$depfile"; then
|
|
23495 |
+ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
|
|
23496 |
+ dir=`echo "$object" | sed 's,/.*$,/,'`
|
|
23497 |
+ if test "$dir" = "$object"; then
|
|
23498 |
+ dir=
|
|
23499 |
+ fi
|
|
23500 |
+ # FIXME: should be _deps on DOS.
|
|
23501 |
+ depfile="$dir.deps/$base"
|
|
23502 |
+fi
|
|
23503 |
|
|
23504 |
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
|
|
23505 |
-depfile=${depfile-`echo "$object" |
|
|
23506 |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
|
|
23507 |
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
|
|
23508 |
|
|
23509 |
rm -f "$tmpdepfile"
|
|
23510 |
@@ -197,25 +204,19 @@ sgi)
|
|
23511 |
|
|
23512 |
aix)
|
|
23513 |
# The C for AIX Compiler uses -M and outputs the dependencies
|
|
23514 |
- # in a .u file. In older versions, this file always lives in the
|
|
23515 |
- # current directory. Also, the AIX compiler puts `$object:' at the
|
|
23516 |
- # start of each line; $object doesn't have directory information.
|
|
23517 |
- # Version 6 uses the directory in both cases.
|
|
23518 |
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
|
|
23519 |
+ # in a .u file. This file always lives in the current directory.
|
|
23520 |
+ # Also, the AIX compiler puts `$object:' at the start of each line;
|
|
23521 |
+ # $object doesn't have directory information.
|
|
23522 |
+ stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
|
|
23523 |
tmpdepfile="$stripped.u"
|
|
23524 |
+ outname="$stripped.o"
|
|
23525 |
if test "$libtool" = yes; then
|
|
23526 |
"$@" -Wc,-M
|
|
23527 |
else
|
|
23528 |
"$@" -M
|
|
23529 |
fi
|
|
23530 |
- stat=$?
|
|
23531 |
-
|
|
23532 |
- if test -f "$tmpdepfile"; then :
|
|
23533 |
- else
|
|
23534 |
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
|
|
23535 |
- tmpdepfile="$stripped.u"
|
|
23536 |
- fi
|
|
23537 |
|
|
23538 |
+ stat=$?
|
|
23539 |
if test $stat -eq 0; then :
|
|
23540 |
else
|
|
23541 |
rm -f "$tmpdepfile"
|
|
23542 |
@@ -223,7 +224,6 @@ aix)
|
|
23543 |
fi
|
|
23544 |
|
|
23545 |
if test -f "$tmpdepfile"; then
|
|
23546 |
- outname="$stripped.o"
|
|
23547 |
# Each line is of the form `foo.o: dependent.h'.
|
|
23548 |
# Do two passes, one to just change these to
|
|
23549 |
# `$object: dependent.h' and one to simply `dependent.h:'.
|
|
23550 |
@@ -239,9 +239,11 @@ aix)
|
|
23551 |
;;
|
|
23552 |
|
|
23553 |
icc)
|
|
23554 |
- # Intel's C compiler understands `-MD -MF file'. However on
|
|
23555 |
+ # Must come before tru64.
|
|
23556 |
+
|
|
23557 |
+ # Intel's C compiler understands `-MD -MF file'. However
|
|
23558 |
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
|
23559 |
- # ICC 7.0 will fill foo.d with something like
|
|
23560 |
+ # will fill foo.d with something like
|
|
23561 |
# foo.o: sub/foo.c
|
|
23562 |
# foo.o: sub/foo.h
|
|
23563 |
# which is wrong. We want:
|
|
23564 |
@@ -249,12 +251,6 @@ icc)
|
|
23565 |
# sub/foo.o: sub/foo.h
|
|
23566 |
# sub/foo.c:
|
|
23567 |
# sub/foo.h:
|
|
23568 |
- # ICC 7.1 will output
|
|
23569 |
- # foo.o: sub/foo.c sub/foo.h
|
|
23570 |
- # and will wrap long lines using \ :
|
|
23571 |
- # foo.o: sub/foo.c ... \
|
|
23572 |
- # sub/foo.h ... \
|
|
23573 |
- # ...
|
|
23574 |
|
|
23575 |
"$@" -MD -MF "$tmpdepfile"
|
|
23576 |
stat=$?
|
|
23577 |
@@ -264,15 +260,11 @@ icc)
|
|
23578 |
exit $stat
|
|
23579 |
fi
|
|
23580 |
rm -f "$depfile"
|
|
23581 |
- # Each line is of the form `foo.o: dependent.h',
|
|
23582 |
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
|
|
23583 |
+ # Each line is of the form `foo.o: dependent.h'.
|
|
23584 |
# Do two passes, one to just change these to
|
|
23585 |
# `$object: dependent.h' and one to simply `dependent.h:'.
|
|
23586 |
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
|
23587 |
- # Some versions of the HPUX 10.20 sed can't process this invocation
|
|
23588 |
- # correctly. Breaking it into two sed invocations is a workaround.
|
|
23589 |
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
|
|
23590 |
- sed -e 's/$/ :/' >> "$depfile"
|
|
23591 |
+ sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
|
23592 |
+ sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
|
23593 |
rm -f "$tmpdepfile"
|
|
23594 |
;;
|
|
23595 |
|
|
23596 |
@@ -287,47 +279,37 @@ tru64)
|
|
23597 |
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
|
23598 |
|
|
23599 |
if test "$libtool" = yes; then
|
|
23600 |
- # With Tru64 cc, shared objects can also be used to make a
|
|
23601 |
- # static library. This mecanism is used in libtool 1.4 series to
|
|
23602 |
- # handle both shared and static libraries in a single compilation.
|
|
23603 |
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
|
|
23604 |
- #
|
|
23605 |
- # With libtool 1.5 this exception was removed, and libtool now
|
|
23606 |
- # generates 2 separate objects for the 2 libraries. These two
|
|
23607 |
- # compilations output dependencies in in $dir.libs/$base.o.d and
|
|
23608 |
- # in $dir$base.o.d. We have to check for both files, because
|
|
23609 |
- # one of the two compilations can be disabled. We should prefer
|
|
23610 |
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
|
|
23611 |
- # automatically cleaned when .libs/ is deleted, while ignoring
|
|
23612 |
- # the former would cause a distcleancheck panic.
|
|
23613 |
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
|
|
23614 |
- tmpdepfile2=$dir$base.o.d # libtool 1.5
|
|
23615 |
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
|
|
23616 |
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
|
|
23617 |
+ # Dependencies are output in .lo.d with libtool 1.4.
|
|
23618 |
+ # They are output in .o.d with libtool 1.5.
|
|
23619 |
+ tmpdepfile1="$dir.libs/$base.lo.d"
|
|
23620 |
+ tmpdepfile2="$dir.libs/$base.o.d"
|
|
23621 |
+ tmpdepfile3="$dir.libs/$base.d"
|
|
23622 |
"$@" -Wc,-MD
|
|
23623 |
else
|
|
23624 |
- tmpdepfile1=$dir$base.o.d
|
|
23625 |
- tmpdepfile2=$dir$base.d
|
|
23626 |
- tmpdepfile3=$dir$base.d
|
|
23627 |
- tmpdepfile4=$dir$base.d
|
|
23628 |
+ tmpdepfile1="$dir$base.o.d"
|
|
23629 |
+ tmpdepfile2="$dir$base.d"
|
|
23630 |
+ tmpdepfile3="$dir$base.d"
|
|
23631 |
"$@" -MD
|
|
23632 |
fi
|
|
23633 |
|
|
23634 |
stat=$?
|
|
23635 |
if test $stat -eq 0; then :
|
|
23636 |
else
|
|
23637 |
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
|
|
23638 |
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
|
23639 |
exit $stat
|
|
23640 |
fi
|
|
23641 |
|
|
23642 |
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
|
|
23643 |
- do
|
|
23644 |
- test -f "$tmpdepfile" && break
|
|
23645 |
- done
|
|
23646 |
+ if test -f "$tmpdepfile1"; then
|
|
23647 |
+ tmpdepfile="$tmpdepfile1"
|
|
23648 |
+ elif test -f "$tmpdepfile2"; then
|
|
23649 |
+ tmpdepfile="$tmpdepfile2"
|
|
23650 |
+ else
|
|
23651 |
+ tmpdepfile="$tmpdepfile3"
|
|
23652 |
+ fi
|
|
23653 |
if test -f "$tmpdepfile"; then
|
|
23654 |
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
|
23655 |
- # That's a tab and a space in the [].
|
|
23656 |
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
23657 |
+ # That's a space and a tab in the [].
|
|
23658 |
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
23659 |
else
|
|
23660 |
echo "#dummy" > "$depfile"
|
|
23661 |
fi
|
|
23662 |
@@ -340,7 +322,7 @@ tru64)
|
|
23663 |
|
|
23664 |
dashmstdout)
|
|
23665 |
# Important note: in order to support this mode, a compiler *must*
|
|
23666 |
- # always write the preprocessed file to stdout, regardless of -o.
|
|
23667 |
+ # always write the proprocessed file to stdout, regardless of -o.
|
|
23668 |
"$@" || exit $?
|
|
23669 |
|
|
23670 |
# Remove the call to Libtool.
|
|
23671 |
@@ -436,7 +418,7 @@ makedepend)
|
|
23672 |
|
|
23673 |
cpp)
|
|
23674 |
# Important note: in order to support this mode, a compiler *must*
|
|
23675 |
- # always write the preprocessed file to stdout.
|
|
23676 |
+ # always write the proprocessed file to stdout.
|
|
23677 |
"$@" || exit $?
|
|
23678 |
|
|
23679 |
# Remove the call to Libtool.
|
|
23680 |
@@ -478,7 +460,7 @@ cpp)
|
|
23681 |
|
|
23682 |
msvisualcpp)
|
|
23683 |
# Important note: in order to support this mode, a compiler *must*
|
|
23684 |
- # always write the preprocessed file to stdout, regardless of -o,
|
|
23685 |
+ # always write the proprocessed file to stdout, regardless of -o,
|
|
23686 |
# because we must use -o when running libtool.
|
|
23687 |
"$@" || exit $?
|
|
23688 |
IFS=" "
|
|
23689 |
diff -pruN dillo-0.8.6/dillorc dillo-0.8.6-i18n-misc-20070916/dillorc
|
|
23690 |
--- dillo-0.8.6/dillorc 2005-01-13 22:30:00.000000000 +0900
|
|
23691 |
+++ dillo-0.8.6-i18n-misc-20070916/dillorc 2006-05-16 01:21:07.000000000 +0900
|
|
23692 |
@@ -3,7 +3,6 @@
|
|
23693 |
# Copy this file to ~/.dillo/dillorc and edit to your taste.
|
|
23694 |
# Lines that start with a '#' are comments.
|
|
23695 |
|
|
23696 |
-
|
|
23697 |
#-------------------------------------------------------------------------
|
|
23698 |
# FIRST SECTION :)
|
|
23699 |
#-------------------------------------------------------------------------
|
|
23700 |
@@ -22,18 +21,29 @@ use_dicache=NO
|
|
23701 |
|
|
23702 |
# Fontname for variable width rendering (most of the text).
|
|
23703 |
# - some fonts may slow down rendering, some others not!
|
|
23704 |
-# - try to tune a fontname/font_factor combination.
|
|
23705 |
-# Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...}
|
|
23706 |
-vw_fontname=helvetica
|
|
23707 |
+# - try to tune a fontname/font_sizes combination.
|
|
23708 |
+# format is "fndry-fmly" (fndry and fmly is XLFD's item.)
|
|
23709 |
+# Ex. {"*-*", "*-gothic", "misc-fixed" ...}
|
|
23710 |
+vw_fontname="*-gothic"
|
|
23711 |
|
|
23712 |
# Fontname for fixed width rendering (mainly <pre> quoted text)
|
|
23713 |
-fw_fontname=courier
|
|
23714 |
+fw_fontname="*-gothic"
|
|
23715 |
+
|
|
23716 |
+# If Anti-Alias is enable, These options will be applied.
|
|
23717 |
+# format is the same as family of Xft.
|
|
23718 |
+# Ex. {"sans-serif", "monospace" ...}
|
|
23719 |
+vw_aafontname="*"
|
|
23720 |
+fw_aafontname="*"
|
|
23721 |
+
|
|
23722 |
+# Fontsizes
|
|
23723 |
+# The 3rd value is used for plain text
|
|
23724 |
+# font_sizes="10 12 14 16 18 20"
|
|
23725 |
|
|
23726 |
# All fontsizes are scaled by this value (default is 1.0)
|
|
23727 |
#font_factor=1.2
|
|
23728 |
|
|
23729 |
# If you prefer oblique over italic fonts, uncoment next line
|
|
23730 |
-#use_oblique=YES
|
|
23731 |
+use_oblique=NO
|
|
23732 |
|
|
23733 |
# Show tooltip popup for images?
|
|
23734 |
# Note: We use the "title" attribute and not "alt".
|
|
23735 |
@@ -68,10 +78,16 @@ home="http://www.dillo.org/"
|
|
23736 |
|
|
23737 |
# Set search url to use with the search dialog.
|
|
23738 |
# %s is replaced with urlencoded keywords, and %% by '%'.
|
|
23739 |
-search_url="http://www.google.com/search?q=%s"
|
|
23740 |
+search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
|
|
23741 |
+#search_url="http://www.google.co.jp/search?ie=UTF-8&oe=UTF-8&q=%s"
|
|
23742 |
+#search_url="http://www.excite.co.jp/dictionary/english_japanese/?match=beginswith&dictionary=NEW_EJJE&search=%s"
|
|
23743 |
#search_url="http://search.lycos.com/default.asp?query=%s"
|
|
23744 |
#search_url="http://www.alltheweb.com/search?cat=web&query=%s"
|
|
23745 |
|
|
23746 |
+# Search engine's charset
|
|
23747 |
+#search_charset=EUC-JP
|
|
23748 |
+search_charset=UTF-8
|
|
23749 |
+
|
|
23750 |
# Set the proxy information for http
|
|
23751 |
#http_proxy=http://localhost:8080/
|
|
23752 |
|
|
23753 |
@@ -84,6 +100,12 @@ search_url="http://www.google.com/search
|
|
23754 |
#no_proxy = ".mynet.com"
|
|
23755 |
#no_proxy = ".mynet.com .other.net .foo.bar.org"
|
|
23756 |
|
|
23757 |
+# Set the User-Agent
|
|
23758 |
+# (%v = Version)
|
|
23759 |
+#user_agent = "Dillo/%v"
|
|
23760 |
+
|
|
23761 |
+# Disable sending referer header
|
|
23762 |
+#send_referer=NO
|
|
23763 |
|
|
23764 |
#-------------------------------------------------------------------------
|
|
23765 |
# COLORS SECTION
|
|
23766 |
@@ -94,7 +116,8 @@ search_url="http://www.google.com/search
|
|
23767 |
# Set the background color
|
|
23768 |
# bg_color=gray
|
|
23769 |
# bg_color=0xd6d6c0
|
|
23770 |
-bg_color=0xdcd1ba
|
|
23771 |
+#bg_color=0xdcd1ba
|
|
23772 |
+bg_color=white
|
|
23773 |
|
|
23774 |
# Set the text color
|
|
23775 |
text_color=black
|
|
23776 |
@@ -123,8 +146,8 @@ contrast_visited_color=YES
|
|
23777 |
# small : very nice! (it's "medium" without icon titles)
|
|
23778 |
# medium : nice!
|
|
23779 |
# large : Traditional
|
|
23780 |
-panel_size=medium
|
|
23781 |
-small_icons=NO
|
|
23782 |
+panel_size=tiny
|
|
23783 |
+small_icons=YES
|
|
23784 |
|
|
23785 |
# Here you can choose to hide some widgets of the dillo panel...
|
|
23786 |
#show_back=NO
|
|
23787 |
@@ -137,16 +160,69 @@ small_icons=NO
|
|
23788 |
#show_menubar=NO
|
|
23789 |
#show_clear_url=NO
|
|
23790 |
#show_url=NO
|
|
23791 |
-#show_search=NO
|
|
23792 |
+#show_search=YES
|
|
23793 |
#show_progress_box=NO
|
|
23794 |
|
|
23795 |
+# Show or hide navigation controls (back, forward, etc) in popup menu...
|
|
23796 |
+show_popup_navigation=YES
|
|
23797 |
+
|
|
23798 |
# Start dillo windows with a hidden panel?
|
|
23799 |
fullwindow_start=NO
|
|
23800 |
|
|
23801 |
+# Use popup dialogs (YES/NO, default YES). Disable this to use the status
|
|
23802 |
+# bar and location bar instead of popup dialogs for several functions
|
|
23803 |
+popup_dialogs=NO
|
|
23804 |
+
|
|
23805 |
# Enabling this will restrain OpenUrl and FindText, but may be required
|
|
23806 |
# for the ION window manager.
|
|
23807 |
transient_dialogs=NO
|
|
23808 |
|
|
23809 |
+# Forcus location bar on new window.
|
|
23810 |
+# focus_location_on_new=YES
|
|
23811 |
+
|
|
23812 |
+# Enabling this will make 'load link in new tab' be executed in the
|
|
23813 |
+# background, leaving the focus on the current tab
|
|
23814 |
+tab_load_in_background=YES
|
|
23815 |
+
|
|
23816 |
+# Enabling this will open a new tab (instead of a new window)
|
|
23817 |
+# on link-middle-click (button 2) and for the "_blank" url target
|
|
23818 |
+tab_instead_of_window=YES
|
|
23819 |
+
|
|
23820 |
+# Show the tab bar (sometimes called the 'gutter') even when there is
|
|
23821 |
+# only a single tab (document) loaded in the browser window?
|
|
23822 |
+# tab_bar_show_single_tab=NO
|
|
23823 |
+
|
|
23824 |
+# Show the tab bar even in full screen mode?
|
|
23825 |
+# tab_bar_show_fullscreen=NO
|
|
23826 |
+
|
|
23827 |
+# Make all tabs the same width?
|
|
23828 |
+# tab_bar_homogeneous=YES
|
|
23829 |
+
|
|
23830 |
+# When there are more tabs than fit on the tab bar, add scrolling arrows
|
|
23831 |
+# to the tab bar.
|
|
23832 |
+# tab_bar_scroller=NO
|
|
23833 |
+
|
|
23834 |
+# Enabling this will close a tab by middle click
|
|
23835 |
+# tab_close_middle_click=YES
|
|
23836 |
+
|
|
23837 |
+# Compress titles in tabs by removing vowels? If this is set to NO,
|
|
23838 |
+# tabs will be shortened instead. This is what it looks like:
|
|
23839 |
+#
|
|
23840 |
+# Normal Compressed Shortened
|
|
23841 |
+# The Quick Brown Fox Th Qck Brwn Fx The Q...Fox
|
|
23842 |
+# tab_title_compress=YES
|
|
23843 |
+
|
|
23844 |
+# This defines which vowels are considered 'expendable' by the tab
|
|
23845 |
+# title compression algorithm. The tab title will be shortened by
|
|
23846 |
+# removing characters matching this pattern, starting from the end
|
|
23847 |
+# of the tab title. Adjust this to taste or language if needed.
|
|
23848 |
+# compress_vowels="aeiouyAEIOUY"
|
|
23849 |
+
|
|
23850 |
+# A semicolon-separated string of common prefixes. The compression
|
|
23851 |
+# algorithm begins by trying to discard anything from the title
|
|
23852 |
+# which matches this pattern.
|
|
23853 |
+# compress_common_prefixes="index of ;re: ;fwd: ;www.;welcome to ;the "
|
|
23854 |
+
|
|
23855 |
# When filling forms, our default behaviour is to submit on enterpress,
|
|
23856 |
# but only when there's a single text entry (to avoid incomplete submits).
|
|
23857 |
# OTOH, if you have to fill the same form lots of times, you may find
|
|
23858 |
@@ -156,7 +232,7 @@ enterpress_forces_submit=NO
|
|
23859 |
# Some forms lack a submit button, and dillo can generate a custom one
|
|
23860 |
# internally. Unfortunately there's no guarantee for it to work. :(
|
|
23861 |
# (my experience is that forms that lack a submit rely on Javascript)
|
|
23862 |
-generate_submit=NO
|
|
23863 |
+generate_submit=YES
|
|
23864 |
|
|
23865 |
#-------------------------------------------------------------------------
|
|
23866 |
# DEBUG MESSAGES SECTION
|
|
23867 |
diff -pruN dillo-0.8.6/doc/Adblock.txt dillo-0.8.6-i18n-misc-20070916/doc/Adblock.txt
|
|
23868 |
--- dillo-0.8.6/doc/Adblock.txt 1970-01-01 09:00:00.000000000 +0900
|
|
23869 |
+++ dillo-0.8.6-i18n-misc-20070916/doc/Adblock.txt 2006-05-16 01:21:08.000000000 +0900
|
|
23870 |
@@ -0,0 +1,9 @@
|
|
23871 |
+==================
|
|
23872 |
+ Adblock in Dillo
|
|
23873 |
+==================
|
|
23874 |
+compatible with Firefox Adblock.
|
|
23875 |
+
|
|
23876 |
+~/.dillo/adblock.txt contains a list of URLs.
|
|
23877 |
+Please add URL which you want to disregard to it.
|
|
23878 |
+it ignores any lines starting with [
|
|
23879 |
+(not that they would have a chance to match anyway).
|
|
23880 |
diff -pruN dillo-0.8.6/doc/Makefile.am dillo-0.8.6-i18n-misc-20070916/doc/Makefile.am
|
|
23881 |
--- dillo-0.8.6/doc/Makefile.am 2003-08-09 04:25:19.000000000 +0900
|
|
23882 |
+++ dillo-0.8.6-i18n-misc-20070916/doc/Makefile.am 2006-05-16 01:21:08.000000000 +0900
|
|
23883 |
@@ -1,4 +1,5 @@
|
|
23884 |
EXTRA_DIST = \
|
|
23885 |
+ Adblock.txt \
|
|
23886 |
Cache.txt \
|
|
23887 |
Cookies.txt \
|
|
23888 |
Dillo.txt \
|
|
23889 |
diff -pruN dillo-0.8.6/doc/Makefile.in dillo-0.8.6-i18n-misc-20070916/doc/Makefile.in
|
|
23890 |
--- dillo-0.8.6/doc/Makefile.in 2006-04-27 01:07:11.000000000 +0900
|
|
23891 |
+++ dillo-0.8.6-i18n-misc-20070916/doc/Makefile.in 2007-09-07 01:02:33.000000000 +0900
|
|
23892 |
@@ -1,8 +1,8 @@
|
|
23893 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
23894 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
23895 |
# @configure_input@
|
|
23896 |
|
|
23897 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
23898 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
23899 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
23900 |
+# Free Software Foundation, Inc.
|
|
23901 |
# This Makefile.in is free software; the Free Software Foundation
|
|
23902 |
# gives unlimited permission to copy and/or distribute it,
|
|
23903 |
# with or without modifications, as long as this notice is preserved.
|
|
23904 |
@@ -13,6 +13,7 @@
|
|
23905 |
# PARTICULAR PURPOSE.
|
|
23906 |
|
|
23907 |
@SET_MAKE@
|
|
23908 |
+
|
|
23909 |
srcdir = @srcdir@
|
|
23910 |
top_srcdir = @top_srcdir@
|
|
23911 |
VPATH = @srcdir@
|
|
23912 |
@@ -20,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
23913 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
23914 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
23915 |
top_builddir = ..
|
|
23916 |
+
|
|
23917 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
23918 |
INSTALL = @INSTALL@
|
|
23919 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
23920 |
@@ -36,18 +38,6 @@ POST_UNINSTALL = :
|
|
23921 |
build_triplet = @build@
|
|
23922 |
host_triplet = @host@
|
|
23923 |
target_triplet = @target@
|
|
23924 |
-subdir = doc
|
|
23925 |
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
23926 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
23927 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
23928 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
23929 |
- $(ACLOCAL_M4)
|
|
23930 |
-mkinstalldirs = $(install_sh) -d
|
|
23931 |
-CONFIG_HEADER = $(top_builddir)/config.h
|
|
23932 |
-CONFIG_CLEAN_FILES =
|
|
23933 |
-SOURCES =
|
|
23934 |
-DIST_SOURCES =
|
|
23935 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
23936 |
ACLOCAL = @ACLOCAL@
|
|
23937 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
23938 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
23939 |
@@ -77,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
23940 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
23941 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
23942 |
GLIB_LIBS = @GLIB_LIBS@
|
|
23943 |
+GMSGFMT = @GMSGFMT@
|
|
23944 |
+GREP = @GREP@
|
|
23945 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
23946 |
GTK_CONFIG = @GTK_CONFIG@
|
|
23947 |
GTK_LIBS = @GTK_LIBS@
|
|
23948 |
@@ -84,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
23949 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
23950 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
23951 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
23952 |
+INTLLIBS = @INTLLIBS@
|
|
23953 |
LDFLAGS = @LDFLAGS@
|
|
23954 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
23955 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
23956 |
+LIBICONV = @LIBICONV@
|
|
23957 |
+LIBINTL = @LIBINTL@
|
|
23958 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
23959 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
23960 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
23961 |
@@ -98,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
23962 |
LIBS = @LIBS@
|
|
23963 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
23964 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
23965 |
+LTLIBICONV = @LTLIBICONV@
|
|
23966 |
+LTLIBINTL = @LTLIBINTL@
|
|
23967 |
LTLIBOBJS = @LTLIBOBJS@
|
|
23968 |
MAKEINFO = @MAKEINFO@
|
|
23969 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
23970 |
+MSGFMT = @MSGFMT@
|
|
23971 |
+MSGMERGE = @MSGMERGE@
|
|
23972 |
OBJEXT = @OBJEXT@
|
|
23973 |
PACKAGE = @PACKAGE@
|
|
23974 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
23975 |
@@ -108,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
23976 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
23977 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
23978 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
23979 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
23980 |
+POSUB = @POSUB@
|
|
23981 |
RANLIB = @RANLIB@
|
|
23982 |
SET_MAKE = @SET_MAKE@
|
|
23983 |
SHELL = @SHELL@
|
|
23984 |
STRIP = @STRIP@
|
|
23985 |
+USE_NLS = @USE_NLS@
|
|
23986 |
VERSION = @VERSION@
|
|
23987 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
23988 |
+XGETTEXT = @XGETTEXT@
|
|
23989 |
ac_ct_CC = @ac_ct_CC@
|
|
23990 |
ac_ct_CXX = @ac_ct_CXX@
|
|
23991 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
23992 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
23993 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
23994 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
23995 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
23996 |
@@ -124,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
23997 |
am__include = @am__include@
|
|
23998 |
am__leading_dot = @am__leading_dot@
|
|
23999 |
am__quote = @am__quote@
|
|
24000 |
-am__tar = @am__tar@
|
|
24001 |
-am__untar = @am__untar@
|
|
24002 |
bindir = @bindir@
|
|
24003 |
build = @build@
|
|
24004 |
build_alias = @build_alias@
|
|
24005 |
@@ -133,23 +134,29 @@ build_cpu = @build_cpu@
|
|
24006 |
build_os = @build_os@
|
|
24007 |
build_vendor = @build_vendor@
|
|
24008 |
datadir = @datadir@
|
|
24009 |
+datarootdir = @datarootdir@
|
|
24010 |
+docdir = @docdir@
|
|
24011 |
+dvidir = @dvidir@
|
|
24012 |
exec_prefix = @exec_prefix@
|
|
24013 |
host = @host@
|
|
24014 |
host_alias = @host_alias@
|
|
24015 |
host_cpu = @host_cpu@
|
|
24016 |
host_os = @host_os@
|
|
24017 |
host_vendor = @host_vendor@
|
|
24018 |
+htmldir = @htmldir@
|
|
24019 |
includedir = @includedir@
|
|
24020 |
infodir = @infodir@
|
|
24021 |
install_sh = @install_sh@
|
|
24022 |
libdir = @libdir@
|
|
24023 |
libexecdir = @libexecdir@
|
|
24024 |
+localedir = @localedir@
|
|
24025 |
localstatedir = @localstatedir@
|
|
24026 |
mandir = @mandir@
|
|
24027 |
-mkdir_p = @mkdir_p@
|
|
24028 |
oldincludedir = @oldincludedir@
|
|
24029 |
+pdfdir = @pdfdir@
|
|
24030 |
prefix = @prefix@
|
|
24031 |
program_transform_name = @program_transform_name@
|
|
24032 |
+psdir = @psdir@
|
|
24033 |
sbindir = @sbindir@
|
|
24034 |
sharedstatedir = @sharedstatedir@
|
|
24035 |
sysconfdir = @sysconfdir@
|
|
24036 |
@@ -159,6 +166,7 @@ target_cpu = @target_cpu@
|
|
24037 |
target_os = @target_os@
|
|
24038 |
target_vendor = @target_vendor@
|
|
24039 |
EXTRA_DIST = \
|
|
24040 |
+ Adblock.txt \
|
|
24041 |
Cache.txt \
|
|
24042 |
Cookies.txt \
|
|
24043 |
Dillo.txt \
|
|
24044 |
@@ -176,38 +184,21 @@ EXTRA_DIST = \
|
|
24045 |
Dpid.txt \
|
|
24046 |
README
|
|
24047 |
|
|
24048 |
+subdir = doc
|
|
24049 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
24050 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
24051 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
24052 |
+CONFIG_CLEAN_FILES =
|
|
24053 |
+DIST_SOURCES =
|
|
24054 |
+DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
|
|
24055 |
all: all-am
|
|
24056 |
|
|
24057 |
.SUFFIXES:
|
|
24058 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
24059 |
- @for dep in $?; do \
|
|
24060 |
- case '$(am__configure_deps)' in \
|
|
24061 |
- *$$dep*) \
|
|
24062 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
|
24063 |
- && exit 0; \
|
|
24064 |
- exit 1;; \
|
|
24065 |
- esac; \
|
|
24066 |
- done; \
|
|
24067 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
|
|
24068 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
24069 |
cd $(top_srcdir) && \
|
|
24070 |
$(AUTOMAKE) --gnu doc/Makefile
|
|
24071 |
-.PRECIOUS: Makefile
|
|
24072 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
24073 |
- @case '$?' in \
|
|
24074 |
- *config.status*) \
|
|
24075 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
|
24076 |
- *) \
|
|
24077 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
|
24078 |
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
|
24079 |
- esac;
|
|
24080 |
-
|
|
24081 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
24082 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
24083 |
-
|
|
24084 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
24085 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
24086 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
24087 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
24088 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
24089 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
24090 |
uninstall-info-am:
|
|
24091 |
tags: TAGS
|
|
24092 |
TAGS:
|
|
24093 |
@@ -215,6 +206,10 @@ TAGS:
|
|
24094 |
ctags: CTAGS
|
|
24095 |
CTAGS:
|
|
24096 |
|
|
24097 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
24098 |
+
|
|
24099 |
+top_distdir = ..
|
|
24100 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
24101 |
|
|
24102 |
distdir: $(DISTFILES)
|
|
24103 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
24104 |
@@ -228,7 +223,7 @@ distdir: $(DISTFILES)
|
|
24105 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
24106 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
24107 |
dir="/$$dir"; \
|
|
24108 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
24109 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
24110 |
else \
|
|
24111 |
dir=''; \
|
|
24112 |
fi; \
|
|
24113 |
@@ -246,6 +241,7 @@ distdir: $(DISTFILES)
|
|
24114 |
check-am: all-am
|
|
24115 |
check: check-am
|
|
24116 |
all-am: Makefile
|
|
24117 |
+
|
|
24118 |
installdirs:
|
|
24119 |
install: install-am
|
|
24120 |
install-exec: install-exec-am
|
|
24121 |
@@ -266,7 +262,7 @@ mostlyclean-generic:
|
|
24122 |
clean-generic:
|
|
24123 |
|
|
24124 |
distclean-generic:
|
|
24125 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
24126 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
24127 |
|
|
24128 |
maintainer-clean-generic:
|
|
24129 |
@echo "This command is intended for maintainers to use"
|
|
24130 |
@@ -283,8 +279,6 @@ dvi: dvi-am
|
|
24131 |
|
|
24132 |
dvi-am:
|
|
24133 |
|
|
24134 |
-html: html-am
|
|
24135 |
-
|
|
24136 |
info: info-am
|
|
24137 |
|
|
24138 |
info-am:
|
|
24139 |
@@ -318,8 +312,8 @@ ps-am:
|
|
24140 |
uninstall-am: uninstall-info-am
|
|
24141 |
|
|
24142 |
.PHONY: all all-am check check-am clean clean-generic distclean \
|
|
24143 |
- distclean-generic distdir dvi dvi-am html html-am info info-am \
|
|
24144 |
- install install-am install-data install-data-am install-exec \
|
|
24145 |
+ distclean-generic distdir dvi dvi-am info info-am install \
|
|
24146 |
+ install-am install-data install-data-am install-exec \
|
|
24147 |
install-exec-am install-info install-info-am install-man \
|
|
24148 |
install-strip installcheck installcheck-am installdirs \
|
|
24149 |
maintainer-clean maintainer-clean-generic mostlyclean \
|
|
24150 |
diff -pruN dillo-0.8.6/doc/README dillo-0.8.6-i18n-misc-20070916/doc/README
|
|
24151 |
--- dillo-0.8.6/doc/README 2003-08-09 04:25:19.000000000 +0900
|
|
24152 |
+++ dillo-0.8.6-i18n-misc-20070916/doc/README 2006-05-16 01:21:07.000000000 +0900
|
|
24153 |
@@ -18,8 +18,6 @@
|
|
24154 |
DwPage.txt Dillo Widget page (shortly) Incomplete
|
|
24155 |
DwStyle.txt Styles of Dillo Widgets Pending
|
|
24156 |
DwTable.txt Tables in dillo Current
|
|
24157 |
- Selection.txt Selections, and link activation Current (?)
|
|
24158 |
- Cookies.txt Explains how to enable cookies Current
|
|
24159 |
Dpid.txt Dillo plugin daemon Current
|
|
24160 |
--------------------------------------------------------------------------
|
|
24161 |
[This documents cover dillo's internal working. They're NOT a user manual]
|
|
24162 |
diff -pruN dillo-0.8.6/dpi/Makefile.am dillo-0.8.6-i18n-misc-20070916/dpi/Makefile.am
|
|
24163 |
--- dillo-0.8.6/dpi/Makefile.am 2006-01-04 05:16:10.000000000 +0900
|
|
24164 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/Makefile.am 2006-05-16 01:21:15.000000000 +0900
|
|
24165 |
@@ -1,3 +1,4 @@
|
|
24166 |
+AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"'
|
|
24167 |
AM_CFLAGS = @GLIB_CFLAGS@
|
|
24168 |
AM_CXXFLAGS = @GLIB_CFLAGS@
|
|
24169 |
|
|
24170 |
diff -pruN dillo-0.8.6/dpi/Makefile.in dillo-0.8.6-i18n-misc-20070916/dpi/Makefile.in
|
|
24171 |
--- dillo-0.8.6/dpi/Makefile.in 2006-04-27 01:07:15.000000000 +0900
|
|
24172 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/Makefile.in 2007-09-07 01:05:41.000000000 +0900
|
|
24173 |
@@ -1,8 +1,8 @@
|
|
24174 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
24175 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
24176 |
# @configure_input@
|
|
24177 |
|
|
24178 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
24179 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
24180 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
24181 |
+# Free Software Foundation, Inc.
|
|
24182 |
# This Makefile.in is free software; the Free Software Foundation
|
|
24183 |
# gives unlimited permission to copy and/or distribute it,
|
|
24184 |
# with or without modifications, as long as this notice is preserved.
|
|
24185 |
@@ -14,8 +14,6 @@
|
|
24186 |
|
|
24187 |
@SET_MAKE@
|
|
24188 |
|
|
24189 |
-SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
|
|
24190 |
-
|
|
24191 |
srcdir = @srcdir@
|
|
24192 |
top_srcdir = @top_srcdir@
|
|
24193 |
VPATH = @srcdir@
|
|
24194 |
@@ -23,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
24195 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
24196 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
24197 |
top_builddir = ..
|
|
24198 |
+
|
|
24199 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
24200 |
INSTALL = @INSTALL@
|
|
24201 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
24202 |
@@ -39,93 +38,6 @@ POST_UNINSTALL = :
|
|
24203 |
build_triplet = @build@
|
|
24204 |
host_triplet = @host@
|
|
24205 |
target_triplet = @target@
|
|
24206 |
-bookmarks_PROGRAMS = bookmarks.dpi$(EXEEXT)
|
|
24207 |
-downloads_PROGRAMS = downloads.dpi$(EXEEXT)
|
|
24208 |
-ftp_PROGRAMS = ftp.filter.dpi$(EXEEXT)
|
|
24209 |
-https_PROGRAMS = https.filter.dpi$(EXEEXT)
|
|
24210 |
-hello_PROGRAMS = hello.filter.dpi$(EXEEXT)
|
|
24211 |
-file_PROGRAMS = file.dpi$(EXEEXT)
|
|
24212 |
-cookies_PROGRAMS = cookies.dpi$(EXEEXT)
|
|
24213 |
-datauri_PROGRAMS = datauri.filter.dpi$(EXEEXT)
|
|
24214 |
-subdir = dpi
|
|
24215 |
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
24216 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
24217 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
24218 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
24219 |
- $(ACLOCAL_M4)
|
|
24220 |
-mkinstalldirs = $(install_sh) -d
|
|
24221 |
-CONFIG_HEADER = $(top_builddir)/config.h
|
|
24222 |
-CONFIG_CLEAN_FILES =
|
|
24223 |
-am__installdirs = "$(DESTDIR)$(bookmarksdir)" \
|
|
24224 |
- "$(DESTDIR)$(cookiesdir)" "$(DESTDIR)$(datauridir)" \
|
|
24225 |
- "$(DESTDIR)$(downloadsdir)" "$(DESTDIR)$(filedir)" \
|
|
24226 |
- "$(DESTDIR)$(ftpdir)" "$(DESTDIR)$(hellodir)" \
|
|
24227 |
- "$(DESTDIR)$(httpsdir)"
|
|
24228 |
-bookmarksPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24229 |
-cookiesPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24230 |
-datauriPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24231 |
-downloadsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24232 |
-filePROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24233 |
-ftpPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24234 |
-helloPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24235 |
-httpsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24236 |
-PROGRAMS = $(bookmarks_PROGRAMS) $(cookies_PROGRAMS) \
|
|
24237 |
- $(datauri_PROGRAMS) $(downloads_PROGRAMS) $(file_PROGRAMS) \
|
|
24238 |
- $(ftp_PROGRAMS) $(hello_PROGRAMS) $(https_PROGRAMS)
|
|
24239 |
-am_bookmarks_dpi_OBJECTS = bookmarks.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24240 |
-bookmarks_dpi_OBJECTS = $(am_bookmarks_dpi_OBJECTS)
|
|
24241 |
-bookmarks_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24242 |
-am_cookies_dpi_OBJECTS = cookies.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24243 |
-cookies_dpi_OBJECTS = $(am_cookies_dpi_OBJECTS)
|
|
24244 |
-cookies_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24245 |
-am_datauri_filter_dpi_OBJECTS = datauri.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24246 |
-datauri_filter_dpi_OBJECTS = $(am_datauri_filter_dpi_OBJECTS)
|
|
24247 |
-datauri_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24248 |
-am__downloads_dpi_SOURCES_DIST = downloads-old.c dpiutil.c dpiutil.h \
|
|
24249 |
- downloads.cc
|
|
24250 |
-@DLGUI_FALSE@am_downloads_dpi_OBJECTS = downloads-old.$(OBJEXT) \
|
|
24251 |
-@DLGUI_FALSE@ dpiutil.$(OBJEXT)
|
|
24252 |
-@DLGUI_TRUE@am_downloads_dpi_OBJECTS = downloads.$(OBJEXT) \
|
|
24253 |
-@DLGUI_TRUE@ dpiutil.$(OBJEXT)
|
|
24254 |
-downloads_dpi_OBJECTS = $(am_downloads_dpi_OBJECTS)
|
|
24255 |
-@DLGUI_FALSE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24256 |
-@DLGUI_TRUE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24257 |
-am_file_dpi_OBJECTS = file.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24258 |
-file_dpi_OBJECTS = $(am_file_dpi_OBJECTS)
|
|
24259 |
-file_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24260 |
-am_ftp_filter_dpi_OBJECTS = ftp.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24261 |
-ftp_filter_dpi_OBJECTS = $(am_ftp_filter_dpi_OBJECTS)
|
|
24262 |
-ftp_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24263 |
-am_hello_filter_dpi_OBJECTS = hello.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24264 |
-hello_filter_dpi_OBJECTS = $(am_hello_filter_dpi_OBJECTS)
|
|
24265 |
-hello_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24266 |
-am_https_filter_dpi_OBJECTS = https.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24267 |
-https_filter_dpi_OBJECTS = $(am_https_filter_dpi_OBJECTS)
|
|
24268 |
-https_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24269 |
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
24270 |
-depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
24271 |
-am__depfiles_maybe = depfiles
|
|
24272 |
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
24273 |
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
24274 |
-CCLD = $(CC)
|
|
24275 |
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
24276 |
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
24277 |
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
24278 |
-CXXLD = $(CXX)
|
|
24279 |
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
|
|
24280 |
- -o $@
|
|
24281 |
-SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
|
|
24282 |
- $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) \
|
|
24283 |
- $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) \
|
|
24284 |
- $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
|
|
24285 |
-DIST_SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
|
|
24286 |
- $(datauri_filter_dpi_SOURCES) \
|
|
24287 |
- $(am__downloads_dpi_SOURCES_DIST) $(file_dpi_SOURCES) \
|
|
24288 |
- $(ftp_filter_dpi_SOURCES) $(hello_filter_dpi_SOURCES) \
|
|
24289 |
- $(https_filter_dpi_SOURCES)
|
|
24290 |
-ETAGS = etags
|
|
24291 |
-CTAGS = ctags
|
|
24292 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
24293 |
ACLOCAL = @ACLOCAL@
|
|
24294 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
24295 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
24296 |
@@ -155,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
24297 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
24298 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
24299 |
GLIB_LIBS = @GLIB_LIBS@
|
|
24300 |
+GMSGFMT = @GMSGFMT@
|
|
24301 |
+GREP = @GREP@
|
|
24302 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
24303 |
GTK_CONFIG = @GTK_CONFIG@
|
|
24304 |
GTK_LIBS = @GTK_LIBS@
|
|
24305 |
@@ -162,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
24306 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
24307 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
24308 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
24309 |
+INTLLIBS = @INTLLIBS@
|
|
24310 |
LDFLAGS = @LDFLAGS@
|
|
24311 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
24312 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
24313 |
+LIBICONV = @LIBICONV@
|
|
24314 |
+LIBINTL = @LIBINTL@
|
|
24315 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
24316 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
24317 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
24318 |
@@ -176,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
24319 |
LIBS = @LIBS@
|
|
24320 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
24321 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
24322 |
+LTLIBICONV = @LTLIBICONV@
|
|
24323 |
+LTLIBINTL = @LTLIBINTL@
|
|
24324 |
LTLIBOBJS = @LTLIBOBJS@
|
|
24325 |
MAKEINFO = @MAKEINFO@
|
|
24326 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
24327 |
+MSGFMT = @MSGFMT@
|
|
24328 |
+MSGMERGE = @MSGMERGE@
|
|
24329 |
OBJEXT = @OBJEXT@
|
|
24330 |
PACKAGE = @PACKAGE@
|
|
24331 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
24332 |
@@ -186,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
24333 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
24334 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
24335 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
24336 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
24337 |
+POSUB = @POSUB@
|
|
24338 |
RANLIB = @RANLIB@
|
|
24339 |
SET_MAKE = @SET_MAKE@
|
|
24340 |
SHELL = @SHELL@
|
|
24341 |
STRIP = @STRIP@
|
|
24342 |
+USE_NLS = @USE_NLS@
|
|
24343 |
VERSION = @VERSION@
|
|
24344 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
24345 |
+XGETTEXT = @XGETTEXT@
|
|
24346 |
ac_ct_CC = @ac_ct_CC@
|
|
24347 |
ac_ct_CXX = @ac_ct_CXX@
|
|
24348 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
24349 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
24350 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
24351 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
24352 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
24353 |
@@ -202,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
24354 |
am__include = @am__include@
|
|
24355 |
am__leading_dot = @am__leading_dot@
|
|
24356 |
am__quote = @am__quote@
|
|
24357 |
-am__tar = @am__tar@
|
|
24358 |
-am__untar = @am__untar@
|
|
24359 |
bindir = @bindir@
|
|
24360 |
build = @build@
|
|
24361 |
build_alias = @build_alias@
|
|
24362 |
@@ -211,23 +134,29 @@ build_cpu = @build_cpu@
|
|
24363 |
build_os = @build_os@
|
|
24364 |
build_vendor = @build_vendor@
|
|
24365 |
datadir = @datadir@
|
|
24366 |
+datarootdir = @datarootdir@
|
|
24367 |
+docdir = @docdir@
|
|
24368 |
+dvidir = @dvidir@
|
|
24369 |
exec_prefix = @exec_prefix@
|
|
24370 |
host = @host@
|
|
24371 |
host_alias = @host_alias@
|
|
24372 |
host_cpu = @host_cpu@
|
|
24373 |
host_os = @host_os@
|
|
24374 |
host_vendor = @host_vendor@
|
|
24375 |
+htmldir = @htmldir@
|
|
24376 |
includedir = @includedir@
|
|
24377 |
infodir = @infodir@
|
|
24378 |
install_sh = @install_sh@
|
|
24379 |
libdir = @libdir@
|
|
24380 |
libexecdir = @libexecdir@
|
|
24381 |
+localedir = @localedir@
|
|
24382 |
localstatedir = @localstatedir@
|
|
24383 |
mandir = @mandir@
|
|
24384 |
-mkdir_p = @mkdir_p@
|
|
24385 |
oldincludedir = @oldincludedir@
|
|
24386 |
+pdfdir = @pdfdir@
|
|
24387 |
prefix = @prefix@
|
|
24388 |
program_transform_name = @program_transform_name@
|
|
24389 |
+psdir = @psdir@
|
|
24390 |
sbindir = @sbindir@
|
|
24391 |
sharedstatedir = @sharedstatedir@
|
|
24392 |
sysconfdir = @sysconfdir@
|
|
24393 |
@@ -236,8 +165,10 @@ target_alias = @target_alias@
|
|
24394 |
target_cpu = @target_cpu@
|
|
24395 |
target_os = @target_os@
|
|
24396 |
target_vendor = @target_vendor@
|
|
24397 |
+AM_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
|
|
24398 |
AM_CFLAGS = @GLIB_CFLAGS@
|
|
24399 |
AM_CXXFLAGS = @GLIB_CFLAGS@
|
|
24400 |
+
|
|
24401 |
bookmarksdir = $(libdir)/dillo/dpi/bookmarks
|
|
24402 |
downloadsdir = $(libdir)/dillo/dpi/downloads
|
|
24403 |
ftpdir = $(libdir)/dillo/dpi/ftp
|
|
24404 |
@@ -246,68 +177,135 @@ hellodir = $(libdir)/dillo/dpi/hello
|
|
24405 |
filedir = $(libdir)/dillo/dpi/file
|
|
24406 |
cookiesdir = $(libdir)/dillo/dpi/cookies
|
|
24407 |
datauridir = $(libdir)/dillo/dpi/datauri
|
|
24408 |
+bookmarks_PROGRAMS = bookmarks.dpi
|
|
24409 |
+downloads_PROGRAMS = downloads.dpi
|
|
24410 |
+ftp_PROGRAMS = ftp.filter.dpi
|
|
24411 |
+https_PROGRAMS = https.filter.dpi
|
|
24412 |
+hello_PROGRAMS = hello.filter.dpi
|
|
24413 |
+file_PROGRAMS = file.dpi
|
|
24414 |
+cookies_PROGRAMS = cookies.dpi
|
|
24415 |
+datauri_PROGRAMS = datauri.filter.dpi
|
|
24416 |
+
|
|
24417 |
bookmarks_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24418 |
-@DLGUI_FALSE@downloads_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24419 |
@DLGUI_TRUE@downloads_dpi_LDADD = @GLIB_LIBS@ @LIBFLTK_LIBS@ ../dpip/libDpip.a
|
|
24420 |
+@DLGUI_FALSE@downloads_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24421 |
ftp_filter_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24422 |
https_filter_dpi_LDADD = @GLIB_LIBS@ @LIBSSL_LIBS@ ../dpip/libDpip.a
|
|
24423 |
hello_filter_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24424 |
file_dpi_LDADD = @GLIB_LIBS@ @LIBPTHREAD_LIBS@ ../dpip/libDpip.a
|
|
24425 |
cookies_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24426 |
datauri_filter_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
24427 |
+
|
|
24428 |
file_dpi_LDFLAGS = @LIBPTHREAD_LDFLAGS@
|
|
24429 |
+
|
|
24430 |
bookmarks_dpi_SOURCES = bookmarks.c dpiutil.c dpiutil.h
|
|
24431 |
-@DLGUI_FALSE@downloads_dpi_SOURCES = downloads-old.c dpiutil.c dpiutil.h
|
|
24432 |
@DLGUI_TRUE@downloads_dpi_SOURCES = downloads.cc dpiutil.c dpiutil.h
|
|
24433 |
+@DLGUI_FALSE@downloads_dpi_SOURCES = downloads-old.c dpiutil.c dpiutil.h
|
|
24434 |
ftp_filter_dpi_SOURCES = ftp.c dpiutil.c dpiutil.h
|
|
24435 |
https_filter_dpi_SOURCES = https.c dpiutil.c dpiutil.h
|
|
24436 |
hello_filter_dpi_SOURCES = hello.c dpiutil.c dpiutil.h
|
|
24437 |
file_dpi_SOURCES = file.c dpiutil.c dpiutil.h
|
|
24438 |
cookies_dpi_SOURCES = cookies.c dpiutil.c dpiutil.h
|
|
24439 |
datauri_filter_dpi_SOURCES = datauri.c dpiutil.c dpiutil.h
|
|
24440 |
+subdir = dpi
|
|
24441 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
24442 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
24443 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
24444 |
+CONFIG_CLEAN_FILES =
|
|
24445 |
+bookmarks_PROGRAMS = bookmarks.dpi$(EXEEXT)
|
|
24446 |
+cookies_PROGRAMS = cookies.dpi$(EXEEXT)
|
|
24447 |
+datauri_PROGRAMS = datauri.filter.dpi$(EXEEXT)
|
|
24448 |
+downloads_PROGRAMS = downloads.dpi$(EXEEXT)
|
|
24449 |
+file_PROGRAMS = file.dpi$(EXEEXT)
|
|
24450 |
+ftp_PROGRAMS = ftp.filter.dpi$(EXEEXT)
|
|
24451 |
+hello_PROGRAMS = hello.filter.dpi$(EXEEXT)
|
|
24452 |
+https_PROGRAMS = https.filter.dpi$(EXEEXT)
|
|
24453 |
+PROGRAMS = $(bookmarks_PROGRAMS) $(cookies_PROGRAMS) $(datauri_PROGRAMS) \
|
|
24454 |
+ $(downloads_PROGRAMS) $(file_PROGRAMS) $(ftp_PROGRAMS) \
|
|
24455 |
+ $(hello_PROGRAMS) $(https_PROGRAMS)
|
|
24456 |
+
|
|
24457 |
+am_bookmarks_dpi_OBJECTS = bookmarks.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24458 |
+bookmarks_dpi_OBJECTS = $(am_bookmarks_dpi_OBJECTS)
|
|
24459 |
+bookmarks_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24460 |
+bookmarks_dpi_LDFLAGS =
|
|
24461 |
+am_cookies_dpi_OBJECTS = cookies.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24462 |
+cookies_dpi_OBJECTS = $(am_cookies_dpi_OBJECTS)
|
|
24463 |
+cookies_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24464 |
+cookies_dpi_LDFLAGS =
|
|
24465 |
+am_datauri_filter_dpi_OBJECTS = datauri.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24466 |
+datauri_filter_dpi_OBJECTS = $(am_datauri_filter_dpi_OBJECTS)
|
|
24467 |
+datauri_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24468 |
+datauri_filter_dpi_LDFLAGS =
|
|
24469 |
+am__downloads_dpi_SOURCES_DIST = downloads.cc dpiutil.c dpiutil.h \
|
|
24470 |
+ downloads-old.c
|
|
24471 |
+@DLGUI_TRUE@am_downloads_dpi_OBJECTS = downloads.$(OBJEXT) \
|
|
24472 |
+@DLGUI_TRUE@ dpiutil.$(OBJEXT)
|
|
24473 |
+@DLGUI_FALSE@am_downloads_dpi_OBJECTS = downloads-old.$(OBJEXT) \
|
|
24474 |
+@DLGUI_FALSE@ dpiutil.$(OBJEXT)
|
|
24475 |
+downloads_dpi_OBJECTS = $(am_downloads_dpi_OBJECTS)
|
|
24476 |
+@DLGUI_TRUE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24477 |
+@DLGUI_FALSE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24478 |
+downloads_dpi_LDFLAGS =
|
|
24479 |
+am_file_dpi_OBJECTS = file.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24480 |
+file_dpi_OBJECTS = $(am_file_dpi_OBJECTS)
|
|
24481 |
+file_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24482 |
+am_ftp_filter_dpi_OBJECTS = ftp.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24483 |
+ftp_filter_dpi_OBJECTS = $(am_ftp_filter_dpi_OBJECTS)
|
|
24484 |
+ftp_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24485 |
+ftp_filter_dpi_LDFLAGS =
|
|
24486 |
+am_hello_filter_dpi_OBJECTS = hello.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24487 |
+hello_filter_dpi_OBJECTS = $(am_hello_filter_dpi_OBJECTS)
|
|
24488 |
+hello_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24489 |
+hello_filter_dpi_LDFLAGS =
|
|
24490 |
+am_https_filter_dpi_OBJECTS = https.$(OBJEXT) dpiutil.$(OBJEXT)
|
|
24491 |
+https_filter_dpi_OBJECTS = $(am_https_filter_dpi_OBJECTS)
|
|
24492 |
+https_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
|
|
24493 |
+https_filter_dpi_LDFLAGS =
|
|
24494 |
+
|
|
24495 |
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
24496 |
+depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
24497 |
+am__depfiles_maybe = depfiles
|
|
24498 |
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bookmarks.Po ./$(DEPDIR)/cookies.Po \
|
|
24499 |
+@AMDEP_TRUE@ ./$(DEPDIR)/datauri.Po ./$(DEPDIR)/downloads-old.Po \
|
|
24500 |
+@AMDEP_TRUE@ ./$(DEPDIR)/downloads.Po ./$(DEPDIR)/dpiutil.Po \
|
|
24501 |
+@AMDEP_TRUE@ ./$(DEPDIR)/file.Po ./$(DEPDIR)/ftp.Po \
|
|
24502 |
+@AMDEP_TRUE@ ./$(DEPDIR)/hello.Po ./$(DEPDIR)/https.Po
|
|
24503 |
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
24504 |
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
24505 |
+CCLD = $(CC)
|
|
24506 |
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
24507 |
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
24508 |
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
24509 |
+CXXLD = $(CXX)
|
|
24510 |
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
|
|
24511 |
+ -o $@
|
|
24512 |
+DIST_SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
|
|
24513 |
+ $(datauri_filter_dpi_SOURCES) $(am__downloads_dpi_SOURCES_DIST) \
|
|
24514 |
+ $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) \
|
|
24515 |
+ $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
|
|
24516 |
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
|
|
24517 |
+SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
|
|
24518 |
+
|
|
24519 |
all: all-am
|
|
24520 |
|
|
24521 |
.SUFFIXES:
|
|
24522 |
.SUFFIXES: .c .cc .o .obj
|
|
24523 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
24524 |
- @for dep in $?; do \
|
|
24525 |
- case '$(am__configure_deps)' in \
|
|
24526 |
- *$$dep*) \
|
|
24527 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
|
24528 |
- && exit 0; \
|
|
24529 |
- exit 1;; \
|
|
24530 |
- esac; \
|
|
24531 |
- done; \
|
|
24532 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpi/Makefile'; \
|
|
24533 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
24534 |
cd $(top_srcdir) && \
|
|
24535 |
$(AUTOMAKE) --gnu dpi/Makefile
|
|
24536 |
-.PRECIOUS: Makefile
|
|
24537 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
24538 |
- @case '$?' in \
|
|
24539 |
- *config.status*) \
|
|
24540 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
|
24541 |
- *) \
|
|
24542 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
|
24543 |
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
|
24544 |
- esac;
|
|
24545 |
-
|
|
24546 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
24547 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
24548 |
-
|
|
24549 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
24550 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
24551 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
24552 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
24553 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
24554 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
24555 |
+bookmarksPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24556 |
install-bookmarksPROGRAMS: $(bookmarks_PROGRAMS)
|
|
24557 |
@$(NORMAL_INSTALL)
|
|
24558 |
- test -z "$(bookmarksdir)" || $(mkdir_p) "$(DESTDIR)$(bookmarksdir)"
|
|
24559 |
+ $(mkinstalldirs) $(DESTDIR)$(bookmarksdir)
|
|
24560 |
@list='$(bookmarks_PROGRAMS)'; for p in $$list; do \
|
|
24561 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24562 |
if test -f $$p \
|
|
24563 |
; then \
|
|
24564 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24565 |
- echo " $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bookmarksdir)/$$f'"; \
|
|
24566 |
- $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bookmarksdir)/$$f" || exit 1; \
|
|
24567 |
+ echo " $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) $$p $(DESTDIR)$(bookmarksdir)/$$f"; \
|
|
24568 |
+ $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) $$p $(DESTDIR)$(bookmarksdir)/$$f || exit 1; \
|
|
24569 |
else :; fi; \
|
|
24570 |
done
|
|
24571 |
|
|
24572 |
@@ -315,22 +313,23 @@ uninstall-bookmarksPROGRAMS:
|
|
24573 |
@$(NORMAL_UNINSTALL)
|
|
24574 |
@list='$(bookmarks_PROGRAMS)'; for p in $$list; do \
|
|
24575 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24576 |
- echo " rm -f '$(DESTDIR)$(bookmarksdir)/$$f'"; \
|
|
24577 |
- rm -f "$(DESTDIR)$(bookmarksdir)/$$f"; \
|
|
24578 |
+ echo " rm -f $(DESTDIR)$(bookmarksdir)/$$f"; \
|
|
24579 |
+ rm -f $(DESTDIR)$(bookmarksdir)/$$f; \
|
|
24580 |
done
|
|
24581 |
|
|
24582 |
clean-bookmarksPROGRAMS:
|
|
24583 |
-test -z "$(bookmarks_PROGRAMS)" || rm -f $(bookmarks_PROGRAMS)
|
|
24584 |
+cookiesPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24585 |
install-cookiesPROGRAMS: $(cookies_PROGRAMS)
|
|
24586 |
@$(NORMAL_INSTALL)
|
|
24587 |
- test -z "$(cookiesdir)" || $(mkdir_p) "$(DESTDIR)$(cookiesdir)"
|
|
24588 |
+ $(mkinstalldirs) $(DESTDIR)$(cookiesdir)
|
|
24589 |
@list='$(cookies_PROGRAMS)'; for p in $$list; do \
|
|
24590 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24591 |
if test -f $$p \
|
|
24592 |
; then \
|
|
24593 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24594 |
- echo " $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cookiesdir)/$$f'"; \
|
|
24595 |
- $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cookiesdir)/$$f" || exit 1; \
|
|
24596 |
+ echo " $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) $$p $(DESTDIR)$(cookiesdir)/$$f"; \
|
|
24597 |
+ $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) $$p $(DESTDIR)$(cookiesdir)/$$f || exit 1; \
|
|
24598 |
else :; fi; \
|
|
24599 |
done
|
|
24600 |
|
|
24601 |
@@ -338,22 +337,23 @@ uninstall-cookiesPROGRAMS:
|
|
24602 |
@$(NORMAL_UNINSTALL)
|
|
24603 |
@list='$(cookies_PROGRAMS)'; for p in $$list; do \
|
|
24604 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24605 |
- echo " rm -f '$(DESTDIR)$(cookiesdir)/$$f'"; \
|
|
24606 |
- rm -f "$(DESTDIR)$(cookiesdir)/$$f"; \
|
|
24607 |
+ echo " rm -f $(DESTDIR)$(cookiesdir)/$$f"; \
|
|
24608 |
+ rm -f $(DESTDIR)$(cookiesdir)/$$f; \
|
|
24609 |
done
|
|
24610 |
|
|
24611 |
clean-cookiesPROGRAMS:
|
|
24612 |
-test -z "$(cookies_PROGRAMS)" || rm -f $(cookies_PROGRAMS)
|
|
24613 |
+datauriPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24614 |
install-datauriPROGRAMS: $(datauri_PROGRAMS)
|
|
24615 |
@$(NORMAL_INSTALL)
|
|
24616 |
- test -z "$(datauridir)" || $(mkdir_p) "$(DESTDIR)$(datauridir)"
|
|
24617 |
+ $(mkinstalldirs) $(DESTDIR)$(datauridir)
|
|
24618 |
@list='$(datauri_PROGRAMS)'; for p in $$list; do \
|
|
24619 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24620 |
if test -f $$p \
|
|
24621 |
; then \
|
|
24622 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24623 |
- echo " $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(datauridir)/$$f'"; \
|
|
24624 |
- $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(datauridir)/$$f" || exit 1; \
|
|
24625 |
+ echo " $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) $$p $(DESTDIR)$(datauridir)/$$f"; \
|
|
24626 |
+ $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) $$p $(DESTDIR)$(datauridir)/$$f || exit 1; \
|
|
24627 |
else :; fi; \
|
|
24628 |
done
|
|
24629 |
|
|
24630 |
@@ -361,22 +361,23 @@ uninstall-datauriPROGRAMS:
|
|
24631 |
@$(NORMAL_UNINSTALL)
|
|
24632 |
@list='$(datauri_PROGRAMS)'; for p in $$list; do \
|
|
24633 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24634 |
- echo " rm -f '$(DESTDIR)$(datauridir)/$$f'"; \
|
|
24635 |
- rm -f "$(DESTDIR)$(datauridir)/$$f"; \
|
|
24636 |
+ echo " rm -f $(DESTDIR)$(datauridir)/$$f"; \
|
|
24637 |
+ rm -f $(DESTDIR)$(datauridir)/$$f; \
|
|
24638 |
done
|
|
24639 |
|
|
24640 |
clean-datauriPROGRAMS:
|
|
24641 |
-test -z "$(datauri_PROGRAMS)" || rm -f $(datauri_PROGRAMS)
|
|
24642 |
+downloadsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24643 |
install-downloadsPROGRAMS: $(downloads_PROGRAMS)
|
|
24644 |
@$(NORMAL_INSTALL)
|
|
24645 |
- test -z "$(downloadsdir)" || $(mkdir_p) "$(DESTDIR)$(downloadsdir)"
|
|
24646 |
+ $(mkinstalldirs) $(DESTDIR)$(downloadsdir)
|
|
24647 |
@list='$(downloads_PROGRAMS)'; for p in $$list; do \
|
|
24648 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24649 |
if test -f $$p \
|
|
24650 |
; then \
|
|
24651 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24652 |
- echo " $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(downloadsdir)/$$f'"; \
|
|
24653 |
- $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(downloadsdir)/$$f" || exit 1; \
|
|
24654 |
+ echo " $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) $$p $(DESTDIR)$(downloadsdir)/$$f"; \
|
|
24655 |
+ $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) $$p $(DESTDIR)$(downloadsdir)/$$f || exit 1; \
|
|
24656 |
else :; fi; \
|
|
24657 |
done
|
|
24658 |
|
|
24659 |
@@ -384,22 +385,23 @@ uninstall-downloadsPROGRAMS:
|
|
24660 |
@$(NORMAL_UNINSTALL)
|
|
24661 |
@list='$(downloads_PROGRAMS)'; for p in $$list; do \
|
|
24662 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24663 |
- echo " rm -f '$(DESTDIR)$(downloadsdir)/$$f'"; \
|
|
24664 |
- rm -f "$(DESTDIR)$(downloadsdir)/$$f"; \
|
|
24665 |
+ echo " rm -f $(DESTDIR)$(downloadsdir)/$$f"; \
|
|
24666 |
+ rm -f $(DESTDIR)$(downloadsdir)/$$f; \
|
|
24667 |
done
|
|
24668 |
|
|
24669 |
clean-downloadsPROGRAMS:
|
|
24670 |
-test -z "$(downloads_PROGRAMS)" || rm -f $(downloads_PROGRAMS)
|
|
24671 |
+filePROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24672 |
install-filePROGRAMS: $(file_PROGRAMS)
|
|
24673 |
@$(NORMAL_INSTALL)
|
|
24674 |
- test -z "$(filedir)" || $(mkdir_p) "$(DESTDIR)$(filedir)"
|
|
24675 |
+ $(mkinstalldirs) $(DESTDIR)$(filedir)
|
|
24676 |
@list='$(file_PROGRAMS)'; for p in $$list; do \
|
|
24677 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24678 |
if test -f $$p \
|
|
24679 |
; then \
|
|
24680 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24681 |
- echo " $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(filedir)/$$f'"; \
|
|
24682 |
- $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(filedir)/$$f" || exit 1; \
|
|
24683 |
+ echo " $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) $$p $(DESTDIR)$(filedir)/$$f"; \
|
|
24684 |
+ $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) $$p $(DESTDIR)$(filedir)/$$f || exit 1; \
|
|
24685 |
else :; fi; \
|
|
24686 |
done
|
|
24687 |
|
|
24688 |
@@ -407,22 +409,23 @@ uninstall-filePROGRAMS:
|
|
24689 |
@$(NORMAL_UNINSTALL)
|
|
24690 |
@list='$(file_PROGRAMS)'; for p in $$list; do \
|
|
24691 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24692 |
- echo " rm -f '$(DESTDIR)$(filedir)/$$f'"; \
|
|
24693 |
- rm -f "$(DESTDIR)$(filedir)/$$f"; \
|
|
24694 |
+ echo " rm -f $(DESTDIR)$(filedir)/$$f"; \
|
|
24695 |
+ rm -f $(DESTDIR)$(filedir)/$$f; \
|
|
24696 |
done
|
|
24697 |
|
|
24698 |
clean-filePROGRAMS:
|
|
24699 |
-test -z "$(file_PROGRAMS)" || rm -f $(file_PROGRAMS)
|
|
24700 |
+ftpPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24701 |
install-ftpPROGRAMS: $(ftp_PROGRAMS)
|
|
24702 |
@$(NORMAL_INSTALL)
|
|
24703 |
- test -z "$(ftpdir)" || $(mkdir_p) "$(DESTDIR)$(ftpdir)"
|
|
24704 |
+ $(mkinstalldirs) $(DESTDIR)$(ftpdir)
|
|
24705 |
@list='$(ftp_PROGRAMS)'; for p in $$list; do \
|
|
24706 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24707 |
if test -f $$p \
|
|
24708 |
; then \
|
|
24709 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24710 |
- echo " $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ftpdir)/$$f'"; \
|
|
24711 |
- $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ftpdir)/$$f" || exit 1; \
|
|
24712 |
+ echo " $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) $$p $(DESTDIR)$(ftpdir)/$$f"; \
|
|
24713 |
+ $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) $$p $(DESTDIR)$(ftpdir)/$$f || exit 1; \
|
|
24714 |
else :; fi; \
|
|
24715 |
done
|
|
24716 |
|
|
24717 |
@@ -430,22 +433,23 @@ uninstall-ftpPROGRAMS:
|
|
24718 |
@$(NORMAL_UNINSTALL)
|
|
24719 |
@list='$(ftp_PROGRAMS)'; for p in $$list; do \
|
|
24720 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24721 |
- echo " rm -f '$(DESTDIR)$(ftpdir)/$$f'"; \
|
|
24722 |
- rm -f "$(DESTDIR)$(ftpdir)/$$f"; \
|
|
24723 |
+ echo " rm -f $(DESTDIR)$(ftpdir)/$$f"; \
|
|
24724 |
+ rm -f $(DESTDIR)$(ftpdir)/$$f; \
|
|
24725 |
done
|
|
24726 |
|
|
24727 |
clean-ftpPROGRAMS:
|
|
24728 |
-test -z "$(ftp_PROGRAMS)" || rm -f $(ftp_PROGRAMS)
|
|
24729 |
+helloPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24730 |
install-helloPROGRAMS: $(hello_PROGRAMS)
|
|
24731 |
@$(NORMAL_INSTALL)
|
|
24732 |
- test -z "$(hellodir)" || $(mkdir_p) "$(DESTDIR)$(hellodir)"
|
|
24733 |
+ $(mkinstalldirs) $(DESTDIR)$(hellodir)
|
|
24734 |
@list='$(hello_PROGRAMS)'; for p in $$list; do \
|
|
24735 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24736 |
if test -f $$p \
|
|
24737 |
; then \
|
|
24738 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24739 |
- echo " $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hellodir)/$$f'"; \
|
|
24740 |
- $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hellodir)/$$f" || exit 1; \
|
|
24741 |
+ echo " $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) $$p $(DESTDIR)$(hellodir)/$$f"; \
|
|
24742 |
+ $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) $$p $(DESTDIR)$(hellodir)/$$f || exit 1; \
|
|
24743 |
else :; fi; \
|
|
24744 |
done
|
|
24745 |
|
|
24746 |
@@ -453,22 +457,23 @@ uninstall-helloPROGRAMS:
|
|
24747 |
@$(NORMAL_UNINSTALL)
|
|
24748 |
@list='$(hello_PROGRAMS)'; for p in $$list; do \
|
|
24749 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24750 |
- echo " rm -f '$(DESTDIR)$(hellodir)/$$f'"; \
|
|
24751 |
- rm -f "$(DESTDIR)$(hellodir)/$$f"; \
|
|
24752 |
+ echo " rm -f $(DESTDIR)$(hellodir)/$$f"; \
|
|
24753 |
+ rm -f $(DESTDIR)$(hellodir)/$$f; \
|
|
24754 |
done
|
|
24755 |
|
|
24756 |
clean-helloPROGRAMS:
|
|
24757 |
-test -z "$(hello_PROGRAMS)" || rm -f $(hello_PROGRAMS)
|
|
24758 |
+httpsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
24759 |
install-httpsPROGRAMS: $(https_PROGRAMS)
|
|
24760 |
@$(NORMAL_INSTALL)
|
|
24761 |
- test -z "$(httpsdir)" || $(mkdir_p) "$(DESTDIR)$(httpsdir)"
|
|
24762 |
+ $(mkinstalldirs) $(DESTDIR)$(httpsdir)
|
|
24763 |
@list='$(https_PROGRAMS)'; for p in $$list; do \
|
|
24764 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
24765 |
if test -f $$p \
|
|
24766 |
; then \
|
|
24767 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24768 |
- echo " $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(httpsdir)/$$f'"; \
|
|
24769 |
- $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(httpsdir)/$$f" || exit 1; \
|
|
24770 |
+ echo " $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) $$p $(DESTDIR)$(httpsdir)/$$f"; \
|
|
24771 |
+ $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) $$p $(DESTDIR)$(httpsdir)/$$f || exit 1; \
|
|
24772 |
else :; fi; \
|
|
24773 |
done
|
|
24774 |
|
|
24775 |
@@ -476,8 +481,8 @@ uninstall-httpsPROGRAMS:
|
|
24776 |
@$(NORMAL_UNINSTALL)
|
|
24777 |
@list='$(https_PROGRAMS)'; for p in $$list; do \
|
|
24778 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
24779 |
- echo " rm -f '$(DESTDIR)$(httpsdir)/$$f'"; \
|
|
24780 |
- rm -f "$(DESTDIR)$(httpsdir)/$$f"; \
|
|
24781 |
+ echo " rm -f $(DESTDIR)$(httpsdir)/$$f"; \
|
|
24782 |
+ rm -f $(DESTDIR)$(httpsdir)/$$f; \
|
|
24783 |
done
|
|
24784 |
|
|
24785 |
clean-httpsPROGRAMS:
|
|
24786 |
@@ -508,7 +513,7 @@ https.filter.dpi$(EXEEXT): $(https_filte
|
|
24787 |
$(LINK) $(https_filter_dpi_LDFLAGS) $(https_filter_dpi_OBJECTS) $(https_filter_dpi_LDADD) $(LIBS)
|
|
24788 |
|
|
24789 |
mostlyclean-compile:
|
|
24790 |
- -rm -f *.$(OBJEXT)
|
|
24791 |
+ -rm -f *.$(OBJEXT) core *.core
|
|
24792 |
|
|
24793 |
distclean-compile:
|
|
24794 |
-rm -f *.tab.c
|
|
24795 |
@@ -525,34 +530,58 @@ distclean-compile:
|
|
24796 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/https.Po@am__quote@
|
|
24797 |
|
|
24798 |
.c.o:
|
|
24799 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
|
24800 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
24801 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
24802 |
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
24803 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
24804 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
24805 |
+@am__fastdepCC_TRUE@ fi
|
|
24806 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
24807 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24808 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
24809 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
24810 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24811 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
|
|
24812 |
|
|
24813 |
.c.obj:
|
|
24814 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
|
24815 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
24816 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
24817 |
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
24818 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
24819 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
24820 |
+@am__fastdepCC_TRUE@ fi
|
|
24821 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
24822 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24823 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
24824 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
24825 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24826 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
24827 |
|
|
24828 |
.cc.o:
|
|
24829 |
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
|
24830 |
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
24831 |
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
24832 |
+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
24833 |
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
24834 |
+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
24835 |
+@am__fastdepCXX_TRUE@ fi
|
|
24836 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
24837 |
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24838 |
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
|
|
24839 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
24840 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24841 |
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
|
|
24842 |
|
|
24843 |
.cc.obj:
|
|
24844 |
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
|
24845 |
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
24846 |
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
24847 |
+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
24848 |
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
24849 |
+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
24850 |
+@am__fastdepCXX_TRUE@ fi
|
|
24851 |
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
24852 |
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24853 |
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
|
24854 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
24855 |
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
24856 |
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
24857 |
uninstall-info-am:
|
|
24858 |
|
|
24859 |
+ETAGS = etags
|
|
24860 |
+ETAGSFLAGS =
|
|
24861 |
+
|
|
24862 |
+CTAGS = ctags
|
|
24863 |
+CTAGSFLAGS =
|
|
24864 |
+
|
|
24865 |
+tags: TAGS
|
|
24866 |
+
|
|
24867 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
24868 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
24869 |
unique=`for i in $$list; do \
|
|
24870 |
@@ -561,7 +590,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
|
|
24871 |
$(AWK) ' { files[$$0] = 1; } \
|
|
24872 |
END { for (i in files) print i; }'`; \
|
|
24873 |
mkid -fID $$unique
|
|
24874 |
-tags: TAGS
|
|
24875 |
|
|
24876 |
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
24877 |
$(TAGS_FILES) $(LISP)
|
|
24878 |
@@ -573,11 +601,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
24879 |
done | \
|
|
24880 |
$(AWK) ' { files[$$0] = 1; } \
|
|
24881 |
END { for (i in files) print i; }'`; \
|
|
24882 |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
24883 |
- test -n "$$unique" || unique=$$empty_fix; \
|
|
24884 |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
24885 |
- $$tags $$unique; \
|
|
24886 |
- fi
|
|
24887 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
24888 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
24889 |
+ $$tags $$unique
|
|
24890 |
+
|
|
24891 |
ctags: CTAGS
|
|
24892 |
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
24893 |
$(TAGS_FILES) $(LISP)
|
|
24894 |
@@ -600,6 +627,10 @@ GTAGS:
|
|
24895 |
|
|
24896 |
distclean-tags:
|
|
24897 |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
24898 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
24899 |
+
|
|
24900 |
+top_distdir = ..
|
|
24901 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
24902 |
|
|
24903 |
distdir: $(DISTFILES)
|
|
24904 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
24905 |
@@ -613,7 +644,7 @@ distdir: $(DISTFILES)
|
|
24906 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
24907 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
24908 |
dir="/$$dir"; \
|
|
24909 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
24910 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
24911 |
else \
|
|
24912 |
dir=''; \
|
|
24913 |
fi; \
|
|
24914 |
@@ -631,10 +662,9 @@ distdir: $(DISTFILES)
|
|
24915 |
check-am: all-am
|
|
24916 |
check: check-am
|
|
24917 |
all-am: Makefile $(PROGRAMS)
|
|
24918 |
+
|
|
24919 |
installdirs:
|
|
24920 |
- for dir in "$(DESTDIR)$(bookmarksdir)" "$(DESTDIR)$(cookiesdir)" "$(DESTDIR)$(datauridir)" "$(DESTDIR)$(downloadsdir)" "$(DESTDIR)$(filedir)" "$(DESTDIR)$(ftpdir)" "$(DESTDIR)$(hellodir)" "$(DESTDIR)$(httpsdir)"; do \
|
|
24921 |
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
|
24922 |
- done
|
|
24923 |
+ $(mkinstalldirs) $(DESTDIR)$(bookmarksdir) $(DESTDIR)$(cookiesdir) $(DESTDIR)$(datauridir) $(DESTDIR)$(downloadsdir) $(DESTDIR)$(filedir) $(DESTDIR)$(ftpdir) $(DESTDIR)$(hellodir) $(DESTDIR)$(httpsdir)
|
|
24924 |
install: install-am
|
|
24925 |
install-exec: install-exec-am
|
|
24926 |
install-data: install-data-am
|
|
24927 |
@@ -654,7 +684,7 @@ mostlyclean-generic:
|
|
24928 |
clean-generic:
|
|
24929 |
|
|
24930 |
distclean-generic:
|
|
24931 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
24932 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
24933 |
|
|
24934 |
maintainer-clean-generic:
|
|
24935 |
@echo "This command is intended for maintainers to use"
|
|
24936 |
@@ -676,8 +706,6 @@ dvi: dvi-am
|
|
24937 |
|
|
24938 |
dvi-am:
|
|
24939 |
|
|
24940 |
-html: html-am
|
|
24941 |
-
|
|
24942 |
info: info-am
|
|
24943 |
|
|
24944 |
info-am:
|
|
24945 |
@@ -724,7 +752,7 @@ uninstall-am: uninstall-bookmarksPROGRAM
|
|
24946 |
clean-filePROGRAMS clean-ftpPROGRAMS clean-generic \
|
|
24947 |
clean-helloPROGRAMS clean-httpsPROGRAMS ctags distclean \
|
|
24948 |
distclean-compile distclean-generic distclean-tags distdir dvi \
|
|
24949 |
- dvi-am html html-am info info-am install install-am \
|
|
24950 |
+ dvi-am info info-am install install-am \
|
|
24951 |
install-bookmarksPROGRAMS install-cookiesPROGRAMS install-data \
|
|
24952 |
install-data-am install-datauriPROGRAMS \
|
|
24953 |
install-downloadsPROGRAMS install-exec install-exec-am \
|
|
24954 |
diff -pruN dillo-0.8.6/dpi/bookmarks.c dillo-0.8.6-i18n-misc-20070916/dpi/bookmarks.c
|
|
24955 |
--- dillo-0.8.6/dpi/bookmarks.c 2006-01-21 10:27:22.000000000 +0900
|
|
24956 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/bookmarks.c 2006-07-08 21:17:17.000000000 +0900
|
|
24957 |
@@ -19,6 +19,7 @@
|
|
24958 |
* final '>' of a tag.
|
|
24959 |
*/
|
|
24960 |
|
|
24961 |
+#include <config.h>
|
|
24962 |
#include <stdio.h>
|
|
24963 |
#include <stdlib.h>
|
|
24964 |
#include <stddef.h>
|
|
24965 |
@@ -38,6 +39,7 @@
|
|
24966 |
#include "dpiutil.h"
|
|
24967 |
|
|
24968 |
#include <glib.h>
|
|
24969 |
+#include "src/intl.h"
|
|
24970 |
|
|
24971 |
/* This one is tricky, some sources state it should include the byte
|
|
24972 |
* for the terminating NULL, and others say it shouldn't. */
|
|
24973 |
@@ -71,7 +73,7 @@ typedef struct {
|
|
24974 |
/*
|
|
24975 |
* Local data
|
|
24976 |
*/
|
|
24977 |
-static char *Header = "Content-type: text/html\n\n";
|
|
24978 |
+static char *Header = "Content-type: text/html charset=UTF-8\n\n";
|
|
24979 |
static char *BmFile = NULL;
|
|
24980 |
static time_t BmFileTimeStamp = 0;
|
|
24981 |
static GSList *B_bms = NULL;
|
|
24982 |
@@ -91,7 +93,7 @@ static int MODIFY_PAGE_NUM = 1;
|
|
24983 |
/* -- HTML templates ------------------------------------------------------- */
|
|
24984 |
|
|
24985 |
char *mainpage_header =
|
|
24986 |
-DOCTYPE
|
|
24987 |
+N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
24988 |
"<html>\n"
|
|
24989 |
"<head>\n"
|
|
24990 |
"<title>Bookmarks</title>\n"
|
|
24991 |
@@ -107,10 +109,10 @@ DOCTYPE
|
|
24992 |
" </td></tr>\n"
|
|
24993 |
" </table></td></tr>\n"
|
|
24994 |
"</table>\n"
|
|
24995 |
-"<br>\n";
|
|
24996 |
+"<br>\n");
|
|
24997 |
|
|
24998 |
char *modifypage_header =
|
|
24999 |
-DOCTYPE
|
|
25000 |
+N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
25001 |
"<html>\n"
|
|
25002 |
"<head>\n"
|
|
25003 |
"<title>Bookmarks</title>\n"
|
|
25004 |
@@ -143,25 +145,25 @@ DOCTYPE
|
|
25005 |
" <td width='100%'></td>\n"
|
|
25006 |
" </tr>\n"
|
|
25007 |
" </table></td></tr>\n"
|
|
25008 |
-"</table>\n";
|
|
25009 |
+"</table>\n");
|
|
25010 |
|
|
25011 |
char *mainpage_sections_header =
|
|
25012 |
-"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
25013 |
+N_("<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
25014 |
" <tr valign='top'>\n"
|
|
25015 |
" <td>\n"
|
|
25016 |
" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
25017 |
" <tr><td>\n"
|
|
25018 |
" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
25019 |
-" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n";
|
|
25020 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n");
|
|
25021 |
|
|
25022 |
char *modifypage_sections_header =
|
|
25023 |
-"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
25024 |
+N_("<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
25025 |
" <tr valign='top'>\n"
|
|
25026 |
" <td>\n"
|
|
25027 |
" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
25028 |
" <tr><td>\n"
|
|
25029 |
" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
25030 |
-" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n";
|
|
25031 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n");
|
|
25032 |
|
|
25033 |
char *mainpage_sections_item =
|
|
25034 |
" <tr><td align='center'>\n"
|
|
25035 |
@@ -192,7 +194,7 @@ char *mainpage_section_card_header =
|
|
25036 |
" <a name='s%d'></a>\n"
|
|
25037 |
" <table bgcolor='#bfbfbf' width='100%%' cellspacing='2'>\n"
|
|
25038 |
" <tr>\n"
|
|
25039 |
-" <td bgcolor='#bf0c0c'><font color='white'><b>\n"
|
|
25040 |
+" <td bgcolor='#bf0c0c' width='100%%'><font color='white'><b>\n"
|
|
25041 |
" %s </b></font></td>\n"
|
|
25042 |
" <td bgcolor='white' width='100%%'> </td></tr>\n";
|
|
25043 |
|
|
25044 |
@@ -200,7 +202,7 @@ char *modifypage_section_card_header =
|
|
25045 |
" <a name='s%d'></a>\n"
|
|
25046 |
" <table bgcolor='#bfbfbf' width='100%%' cellspacing='2'>\n"
|
|
25047 |
" <tr>\n"
|
|
25048 |
-" <td bgcolor='#bf0c0c'><font color='white'><b>\n"
|
|
25049 |
+" <td bgcolor='#bf0c0c' width='100%%'><font color='white'><b>\n"
|
|
25050 |
" %s </b></font></td>\n"
|
|
25051 |
" <td bgcolor='white' width='100%%'> </td></tr>\n";
|
|
25052 |
|
|
25053 |
@@ -238,7 +240,7 @@ char *modifypage_footer =
|
|
25054 |
|
|
25055 |
/* ------------------------------------------------------------------------- */
|
|
25056 |
char *modifypage_add_section_page =
|
|
25057 |
-DOCTYPE
|
|
25058 |
+N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
25059 |
"<html>\n"
|
|
25060 |
"<head>\n"
|
|
25061 |
"<title>Bookmarks</title>\n"
|
|
25062 |
@@ -274,11 +276,11 @@ DOCTYPE
|
|
25063 |
"</form>\n"
|
|
25064 |
"</body>\n"
|
|
25065 |
"</html>\n"
|
|
25066 |
-"\n";
|
|
25067 |
+"\n");
|
|
25068 |
|
|
25069 |
/* ------------------------------------------------------------------------- */
|
|
25070 |
char *modifypage_update_header =
|
|
25071 |
-DOCTYPE
|
|
25072 |
+N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
25073 |
"<html>\n"
|
|
25074 |
"<head>\n"
|
|
25075 |
"<title>Bookmarks</title>\n"
|
|
25076 |
@@ -292,7 +294,7 @@ DOCTYPE
|
|
25077 |
"</table>\n"
|
|
25078 |
"<br>\n"
|
|
25079 |
"<form>\n"
|
|
25080 |
-"<input type='hidden' name='operation' value='modify2'>\n";
|
|
25081 |
+"<input type='hidden' name='operation' value='modify2'>\n");
|
|
25082 |
|
|
25083 |
char *modifypage_update_title =
|
|
25084 |
"<table border='1' width='100%%'>\n"
|
|
25085 |
@@ -305,7 +307,7 @@ char *modifypage_update_item_header =
|
|
25086 |
"<table width='100%' cellpadding='10'>\n";
|
|
25087 |
|
|
25088 |
char *modifypage_update_item =
|
|
25089 |
-"<tr><td>\n"
|
|
25090 |
+N_("<tr><td>\n"
|
|
25091 |
" <table width='100%%' bgcolor='teal'>\n"
|
|
25092 |
" <tr>\n"
|
|
25093 |
" <td>Title:</td>\n"
|
|
25094 |
@@ -315,33 +317,33 @@ char *modifypage_update_item =
|
|
25095 |
" <td>URL:</td>\n"
|
|
25096 |
" <td>%s</td></tr>\n"
|
|
25097 |
" </table>\n"
|
|
25098 |
-" </td></tr>\n";
|
|
25099 |
+" </td></tr>\n");
|
|
25100 |
|
|
25101 |
char *modifypage_update_item2 =
|
|
25102 |
-"<tr><td>\n"
|
|
25103 |
+N_("<tr><td>\n"
|
|
25104 |
" <table width='100%%' bgcolor='teal'>\n"
|
|
25105 |
" <tr>\n"
|
|
25106 |
" <td>Title:</td>\n"
|
|
25107 |
" <td><input type='text' name='s%d' size='64'\n"
|
|
25108 |
" value='%s'></td></tr>\n"
|
|
25109 |
" </table>\n"
|
|
25110 |
-" </td></tr>\n";
|
|
25111 |
+" </td></tr>\n");
|
|
25112 |
|
|
25113 |
char *modifypage_update_item_footer =
|
|
25114 |
"</table>\n";
|
|
25115 |
|
|
25116 |
char *modifypage_update_footer =
|
|
25117 |
-"<table width='100%' cellpadding='4' border='0'>\n"
|
|
25118 |
+N_("<table width='100%' cellpadding='4' border='0'>\n"
|
|
25119 |
"<tr><td bgcolor='#a0a0a0'>\n"
|
|
25120 |
" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
25121 |
"</table>\n"
|
|
25122 |
"</form>\n"
|
|
25123 |
"</body>\n"
|
|
25124 |
-"</html>\n";
|
|
25125 |
+"</html>\n");
|
|
25126 |
|
|
25127 |
/* ------------------------------------------------------------------------- */
|
|
25128 |
char *modifypage_add_url =
|
|
25129 |
-DOCTYPE
|
|
25130 |
+N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
25131 |
"<html>\n"
|
|
25132 |
"<head>\n"
|
|
25133 |
"<title>Bookmarks</title>\n"
|
|
25134 |
@@ -379,7 +381,7 @@ DOCTYPE
|
|
25135 |
"</table>\n"
|
|
25136 |
"</form>\n"
|
|
25137 |
"</body>\n"
|
|
25138 |
-"</html>\n";
|
|
25139 |
+"</html>\n");
|
|
25140 |
|
|
25141 |
|
|
25142 |
/* ------------------------------------------------------------------------- */
|
|
25143 |
@@ -686,7 +688,7 @@ static void Bms_normalize(void)
|
|
25144 |
|
|
25145 |
/* we need at least one section */
|
|
25146 |
if (!B_secs)
|
|
25147 |
- Bms_sec_add("Unclassified");
|
|
25148 |
+ Bms_sec_add(_("Unclassified"));
|
|
25149 |
|
|
25150 |
/* make correlative section numbers */
|
|
25151 |
n = 0;
|
|
25152 |
@@ -719,7 +721,7 @@ static void Bms_check_import(void)
|
|
25153 |
{
|
|
25154 |
gchar *OldBmFile;
|
|
25155 |
char *cmd1 =
|
|
25156 |
- "echo \":s0: Unclassified\" > %s";
|
|
25157 |
+ _("echo \":s0: Unclassified\" > %s");
|
|
25158 |
char *cmd2 =
|
|
25159 |
"grep -i \"href\" %s | "
|
|
25160 |
"sed -e 's/<li><A HREF=\"/s0 /' -e 's/\">/ /' -e 's/<.*$//' >> %s";
|
|
25161 |
@@ -781,7 +783,7 @@ static int Bms_load(void)
|
|
25162 |
Bms_sec_add(title);
|
|
25163 |
|
|
25164 |
} else {
|
|
25165 |
- g_print("Syntax error in bookmarks file:\n %s", buf);
|
|
25166 |
+ g_print(_("Syntax error in bookmarks file:\n %s"), buf);
|
|
25167 |
}
|
|
25168 |
g_free(buf);
|
|
25169 |
}
|
|
25170 |
@@ -893,7 +895,7 @@ static int Bms_save(void)
|
|
25171 |
static int Bmsrv_add_bm(SockHandler *sh, char *url, char *title)
|
|
25172 |
{
|
|
25173 |
char *u_title;
|
|
25174 |
- char *msg="Added bookmark!";
|
|
25175 |
+ char *msg=_("Added bookmark!");
|
|
25176 |
int section = 0;
|
|
25177 |
|
|
25178 |
/* Add in memory */
|
|
25179 |
@@ -942,7 +944,7 @@ static int Bmsrv_send_reload_request(Soc
|
|
25180 |
{
|
|
25181 |
gint st;
|
|
25182 |
char *d_cmd;
|
|
25183 |
-
|
|
25184 |
+
|
|
25185 |
d_cmd = a_Dpip_build_cmd("cmd=%s url=%s", "reload_request", url);
|
|
25186 |
st = sock_handler_write_str(sh, d_cmd, 1) ? 1 : 0;
|
|
25187 |
g_free(d_cmd);
|
|
25188 |
@@ -965,11 +967,11 @@ static int Bmsrv_send_modify_page(SockHa
|
|
25189 |
gstr = g_string_new("");
|
|
25190 |
|
|
25191 |
/* send modify page header */
|
|
25192 |
- if (sock_handler_write_str(sh, modifypage_header, 0))
|
|
25193 |
+ if (sock_handler_write_str(sh, _(modifypage_header), 0))
|
|
25194 |
return 1;
|
|
25195 |
|
|
25196 |
/* write sections header */
|
|
25197 |
- if (sock_handler_write_str(sh, modifypage_sections_header, 0))
|
|
25198 |
+ if (sock_handler_write_str(sh, _(modifypage_sections_header), 0))
|
|
25199 |
return 1;
|
|
25200 |
/* write sections */
|
|
25201 |
for (list1 = B_secs; list1; list1 = list1->next) {
|
|
25202 |
@@ -993,7 +995,7 @@ static int Bmsrv_send_modify_page(SockHa
|
|
25203 |
|
|
25204 |
/* send card header */
|
|
25205 |
l_title = make_one_line_str(sec_node->title);
|
|
25206 |
- g_string_sprintf(gstr, modifypage_section_card_header,
|
|
25207 |
+ g_string_sprintf(gstr, _(modifypage_section_card_header),
|
|
25208 |
sec_node->section, l_title);
|
|
25209 |
g_free(l_title);
|
|
25210 |
if (sock_handler_write_str(sh, gstr->str, 0))
|
|
25211 |
@@ -1029,7 +1031,7 @@ static int Bmsrv_send_modify_page(SockHa
|
|
25212 |
static int Bmsrv_send_modify_page_add_section(SockHandler *sh)
|
|
25213 |
{
|
|
25214 |
/* send modify page2 */
|
|
25215 |
- if (sock_handler_write_str(sh, modifypage_add_section_page, 1))
|
|
25216 |
+ if (sock_handler_write_str(sh, _(modifypage_add_section_page), 1))
|
|
25217 |
return 1;
|
|
25218 |
|
|
25219 |
return 2;
|
|
25220 |
@@ -1041,7 +1043,7 @@ static int Bmsrv_send_modify_page_add_se
|
|
25221 |
*/
|
|
25222 |
static int Bmsrv_send_modify_page_add_url(SockHandler *sh)
|
|
25223 |
{
|
|
25224 |
- if (sock_handler_write_str(sh, modifypage_add_url, 1))
|
|
25225 |
+ if (sock_handler_write_str(sh, _(modifypage_add_url), 1))
|
|
25226 |
return 1;
|
|
25227 |
return 2;
|
|
25228 |
}
|
|
25229 |
@@ -1075,14 +1077,14 @@ static int Bmsrv_send_modify_update(Sock
|
|
25230 |
}
|
|
25231 |
|
|
25232 |
/* send HTML here */
|
|
25233 |
- if (sock_handler_write_str(sh, modifypage_update_header, 0))
|
|
25234 |
+ if (sock_handler_write_str(sh, _(modifypage_update_header), 0))
|
|
25235 |
return 1;
|
|
25236 |
|
|
25237 |
/* Count number of marked urls and sections */
|
|
25238 |
Bmsrv_count_urls_and_sections(url1, &n_sec, &n_url);
|
|
25239 |
|
|
25240 |
if (n_sec) {
|
|
25241 |
- g_string_sprintf(gstr, modifypage_update_title, "Update sections:");
|
|
25242 |
+ g_string_sprintf(gstr, modifypage_update_title, _("Update sections:"));
|
|
25243 |
sock_handler_write_str(sh, gstr->str, 0);
|
|
25244 |
sock_handler_write_str(sh, modifypage_update_item_header, 0);
|
|
25245 |
/* send items here */
|
|
25246 |
@@ -1092,7 +1094,7 @@ static int Bmsrv_send_modify_update(Sock
|
|
25247 |
if (q[2+i] == '=') {
|
|
25248 |
key = strtol(q + 2, NULL, 10);
|
|
25249 |
if ((sec_node = Bms_get_sec(key))) {
|
|
25250 |
- g_string_sprintf(gstr, modifypage_update_item2,
|
|
25251 |
+ g_string_sprintf(gstr, _(modifypage_update_item2),
|
|
25252 |
sec_node->section, sec_node->title);
|
|
25253 |
sock_handler_write_str(sh, gstr->str, 0);
|
|
25254 |
}
|
|
25255 |
@@ -1102,7 +1104,7 @@ static int Bmsrv_send_modify_update(Sock
|
|
25256 |
}
|
|
25257 |
|
|
25258 |
if (n_url) {
|
|
25259 |
- g_string_sprintf(gstr, modifypage_update_title, "Update titles:");
|
|
25260 |
+ g_string_sprintf(gstr, modifypage_update_title, _("Update titles:"));
|
|
25261 |
sock_handler_write_str(sh, gstr->str, 0);
|
|
25262 |
sock_handler_write_str(sh, modifypage_update_item_header, 0);
|
|
25263 |
/* send items here */
|
|
25264 |
@@ -1112,7 +1114,7 @@ static int Bmsrv_send_modify_update(Sock
|
|
25265 |
if (q[4+i] == '=') {
|
|
25266 |
key = strtol(q + 4, NULL, 10);
|
|
25267 |
bm_node = Bms_get(key);
|
|
25268 |
- g_string_sprintf(gstr, modifypage_update_item,
|
|
25269 |
+ g_string_sprintf(gstr, _(modifypage_update_item),
|
|
25270 |
bm_node->key, bm_node->title, bm_node->url);
|
|
25271 |
sock_handler_write_str(sh, gstr->str, 0);
|
|
25272 |
}
|
|
25273 |
@@ -1120,7 +1122,7 @@ static int Bmsrv_send_modify_update(Sock
|
|
25274 |
sock_handler_write_str(sh, modifypage_update_item_footer, 0);
|
|
25275 |
}
|
|
25276 |
|
|
25277 |
- sock_handler_write_str(sh, modifypage_update_footer, 1);
|
|
25278 |
+ sock_handler_write_str(sh, _(modifypage_update_footer), 1);
|
|
25279 |
|
|
25280 |
return 2;
|
|
25281 |
}
|
|
25282 |
@@ -1399,22 +1401,22 @@ static int Bmsrv_check_modify_request(So
|
|
25283 |
if (strstr(p, "operation=delete&")) {
|
|
25284 |
if (n_url || n_sec)
|
|
25285 |
return 0;
|
|
25286 |
- msg = "Delete: you must mark what to delete!";
|
|
25287 |
+ msg = _("Delete: you must mark what to delete!");
|
|
25288 |
|
|
25289 |
} else if (strstr(url, "operation=move&")) {
|
|
25290 |
if (n_url && n_sec)
|
|
25291 |
return 0;
|
|
25292 |
else if (n_url)
|
|
25293 |
- msg = "Move: you must mark a target section!";
|
|
25294 |
+ msg = _("Move: you must mark a target section!");
|
|
25295 |
else if (n_sec)
|
|
25296 |
- msg = "Move: can not move a section (yet).";
|
|
25297 |
+ msg = _("Move: can not move a section (yet).");
|
|
25298 |
else
|
|
25299 |
- msg = "Move: you must mark some urls, and a target section!";
|
|
25300 |
+ msg = _("Move: you must mark some urls, and a target section!");
|
|
25301 |
|
|
25302 |
} else if (strstr(url, "operation=modify&")) {
|
|
25303 |
if (n_url || n_sec)
|
|
25304 |
return 0;
|
|
25305 |
- msg = "Modify: you must mark what to update!";
|
|
25306 |
+ msg = _("Modify: you must mark what to update!");
|
|
25307 |
|
|
25308 |
} else if (strstr(url, "operation=modify2&")) {
|
|
25309 |
/* nothing to check here */
|
|
25310 |
@@ -1431,17 +1433,17 @@ static int Bmsrv_check_modify_request(So
|
|
25311 |
} else if (strstr(url, "operation=add_url&")) {
|
|
25312 |
if (n_sec <= 1)
|
|
25313 |
return 0;
|
|
25314 |
- msg = "Add url: only one target section is allowed!";
|
|
25315 |
+ msg = _("Add url: only one target section is allowed!");
|
|
25316 |
|
|
25317 |
} else if (strstr(url, "operation=add_url2&")) {
|
|
25318 |
/* nothing to check here */
|
|
25319 |
return 0;
|
|
25320 |
|
|
25321 |
} else if (strstr(url, "operation=none&")) {
|
|
25322 |
- msg = "No operation, just do nothing!";
|
|
25323 |
+ msg = _("No operation, just do nothing!");
|
|
25324 |
|
|
25325 |
} else {
|
|
25326 |
- msg = "Sorry, not implemented yet.";
|
|
25327 |
+ msg = _("Sorry, not implemented yet.");
|
|
25328 |
}
|
|
25329 |
|
|
25330 |
Bmsrv_dpi_send_status_msg(sh, msg);
|
|
25331 |
@@ -1529,11 +1531,11 @@ static int send_bm_page(SockHandler *sh)
|
|
25332 |
if (!gstr)
|
|
25333 |
gstr = g_string_new("");
|
|
25334 |
|
|
25335 |
- if (sock_handler_write_str(sh, mainpage_header, 0))
|
|
25336 |
+ if (sock_handler_write_str(sh, _(mainpage_header), 0))
|
|
25337 |
return 1;
|
|
25338 |
|
|
25339 |
/* write sections header */
|
|
25340 |
- if (sock_handler_write_str(sh, mainpage_sections_header, 0))
|
|
25341 |
+ if (sock_handler_write_str(sh, _(mainpage_sections_header), 0))
|
|
25342 |
return 1;
|
|
25343 |
/* write sections */
|
|
25344 |
for (list1 = B_secs; list1; list1 = list1->next) {
|
|
25345 |
@@ -1557,7 +1559,7 @@ static int send_bm_page(SockHandler *sh)
|
|
25346 |
|
|
25347 |
/* send card header */
|
|
25348 |
l_title = make_one_line_str(sec_node->title);
|
|
25349 |
- g_string_sprintf(gstr, mainpage_section_card_header,
|
|
25350 |
+ g_string_sprintf(gstr, _(mainpage_section_card_header),
|
|
25351 |
sec_node->section, l_title);
|
|
25352 |
g_free(l_title);
|
|
25353 |
if (sock_handler_write_str(sh, gstr->str, 0))
|
|
25354 |
@@ -1609,7 +1611,7 @@ static int Bmsrv_parse_buf(SockHandler *
|
|
25355 |
|
|
25356 |
if (!(p = strchr(Buf, '>'))) {
|
|
25357 |
/* Haven't got a full tag */
|
|
25358 |
- g_print("Haven't got a full tag!\n");
|
|
25359 |
+ g_print(_("Haven't got a full tag!\n"));
|
|
25360 |
return 1;
|
|
25361 |
}
|
|
25362 |
|
|
25363 |
@@ -1648,7 +1650,7 @@ static int Bmsrv_parse_buf(SockHandler *
|
|
25364 |
title = a_Dpip_get_attr(Buf, BufSize, "title");
|
|
25365 |
if (strlen(title) == 0) {
|
|
25366 |
g_free(title);
|
|
25367 |
- title = g_strdup("(Untitled)");
|
|
25368 |
+ title = g_strdup(_("(Untitled)"));
|
|
25369 |
}
|
|
25370 |
if (url && title)
|
|
25371 |
Bmsrv_add_bm(sh, url, title);
|
|
25372 |
@@ -1685,8 +1687,8 @@ static int Bmsrv_parse_buf(SockHandler *
|
|
25373 |
st = send_bm_page(sh);
|
|
25374 |
if (st != 0) {
|
|
25375 |
char *err =
|
|
25376 |
- DOCTYPE
|
|
25377 |
- "<HTML><body> Error on the bookmarks server...</body></html>";
|
|
25378 |
+ _("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
25379 |
+ "<HTML><body> Error on the bookmarks server...</body></html>");
|
|
25380 |
if (sock_handler_write(sh, err, strlen(err), 1) != 0) {
|
|
25381 |
return 1;
|
|
25382 |
}
|
|
25383 |
@@ -1727,6 +1729,14 @@ int main (void) {
|
|
25384 |
int code;
|
|
25385 |
SockHandler *sh;
|
|
25386 |
|
|
25387 |
+ /* Initialize Gettext */
|
|
25388 |
+#ifdef ENABLE_NLS
|
|
25389 |
+ setlocale(LC_ALL, "");
|
|
25390 |
+ bindtextdomain (PACKAGE, LOCALEDIR);
|
|
25391 |
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
|
|
25392 |
+ textdomain (PACKAGE);
|
|
25393 |
+#endif
|
|
25394 |
+
|
|
25395 |
/* Arrange the cleanup function for terminations via exit() */
|
|
25396 |
atexit(cleanup);
|
|
25397 |
|
|
25398 |
@@ -1740,7 +1750,7 @@ int main (void) {
|
|
25399 |
|
|
25400 |
BmFile = g_strconcat(g_get_home_dir(), "/", ".dillo/bm.txt", NULL);
|
|
25401 |
|
|
25402 |
- g_print("bookmarks.dpi (v.13): accepting connections...\n");
|
|
25403 |
+ //g_print(_("bookmarks.dpi (v.13): accepting connections...\n"));
|
|
25404 |
|
|
25405 |
/* some OSes may need this... */
|
|
25406 |
address_size = sizeof(struct sockaddr_un);
|
|
25407 |
@@ -1768,6 +1778,7 @@ int main (void) {
|
|
25408 |
break;
|
|
25409 |
}
|
|
25410 |
|
|
25411 |
+ //g_print("Closing SockHandler\n");
|
|
25412 |
sock_handler_close(sh);
|
|
25413 |
sock_handler_free(sh);
|
|
25414 |
|
|
25415 |
diff -pruN dillo-0.8.6/dpi/cookies.c dillo-0.8.6-i18n-misc-20070916/dpi/cookies.c
|
|
25416 |
--- dillo-0.8.6/dpi/cookies.c 2006-02-15 22:27:27.000000000 +0900
|
|
25417 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/cookies.c 2006-05-16 01:21:15.000000000 +0900
|
|
25418 |
@@ -187,7 +187,7 @@ static FILE *Cookies_fopen(const char *f
|
|
25419 |
write(fd, init_str, strlen(init_str));
|
|
25420 |
close(fd);
|
|
25421 |
|
|
25422 |
- MSG("Created file: %s\n", filename);
|
|
25423 |
+ _MSG("Created file: %s\n", filename);
|
|
25424 |
F_in = Cookies_fopen(filename, NULL);
|
|
25425 |
} else {
|
|
25426 |
MSG("Could not create file: %s!\n", filename);
|
|
25427 |
@@ -263,7 +263,7 @@ void Cookies_init()
|
|
25428 |
return;
|
|
25429 |
}
|
|
25430 |
|
|
25431 |
- MSG("Enabling cookies as from cookiesrc...\n");
|
|
25432 |
+ _MSG("Enabling cookies as from cookiesrc...\n");
|
|
25433 |
|
|
25434 |
cookies = g_hash_table_new(g_str_hash, g_str_equal);
|
|
25435 |
|
|
25436 |
@@ -574,7 +574,7 @@ static time_t Cookies_create_timestamp(c
|
|
25437 |
(minutes * 60) +
|
|
25438 |
seconds);
|
|
25439 |
|
|
25440 |
- MSG("Expires in %ld seconds, at %s",
|
|
25441 |
+ _MSG("Expires in %ld seconds, at %s",
|
|
25442 |
(long)ret - time(NULL), ctime(&ret));
|
|
25443 |
|
|
25444 |
return ret;
|
|
25445 |
@@ -717,7 +717,7 @@ static char *Cookies_parse_attr(char **c
|
|
25446 |
{
|
|
25447 |
char *str = *cookie_str;
|
|
25448 |
guint i, end = 0;
|
|
25449 |
- gboolean got_attr = FALSE;
|
|
25450 |
+ gboolean got_attr = FALSE, have_value = TRUE;;
|
|
25451 |
|
|
25452 |
for (i = 0; ; i++) {
|
|
25453 |
switch (str[i]) {
|
|
25454 |
@@ -726,6 +726,10 @@ static char *Cookies_parse_attr(char **c
|
|
25455 |
case '=':
|
|
25456 |
case ';':
|
|
25457 |
got_attr = TRUE;
|
|
25458 |
+ if(str[i] == '=' && str[i+1] == ';'){
|
|
25459 |
+ _MSG("no value\n");
|
|
25460 |
+ have_value = FALSE;
|
|
25461 |
+ }
|
|
25462 |
if (end == 0)
|
|
25463 |
end = i;
|
|
25464 |
break;
|
|
25465 |
@@ -741,6 +745,7 @@ static char *Cookies_parse_attr(char **c
|
|
25466 |
/* fall through! */
|
|
25467 |
default:
|
|
25468 |
if (got_attr) {
|
|
25469 |
+ if(!have_value) i--;
|
|
25470 |
*cookie_str = str + i;
|
|
25471 |
return g_strndup(str, end);
|
|
25472 |
}
|
|
25473 |
@@ -762,6 +767,11 @@ static char *Cookies_parse_value(char **
|
|
25474 |
guint i, end;
|
|
25475 |
char *str = *cookie_str;
|
|
25476 |
|
|
25477 |
+ if (str[0] == ';') {
|
|
25478 |
+ cookie_str += 1;
|
|
25479 |
+ return strdup("");
|
|
25480 |
+ }
|
|
25481 |
+
|
|
25482 |
for (i = end = 0; !end; ++i) {
|
|
25483 |
switch (str[i]) {
|
|
25484 |
case ' ':
|
|
25485 |
@@ -880,7 +890,7 @@ static CookieData_t *Cookies_parse_one(g
|
|
25486 |
}
|
|
25487 |
} else if (g_strcasecmp(attr, "Expires") == 0) {
|
|
25488 |
if (!max_age && !discard) {
|
|
25489 |
- MSG("Old netscape-style cookie...\n");
|
|
25490 |
+ _MSG("Old netscape-style cookie...\n");
|
|
25491 |
value = Cookies_parse_value(&str, TRUE, FALSE);
|
|
25492 |
if (value) {
|
|
25493 |
cookie->expires_at = Cookies_create_timestamp(value);
|
|
25494 |
@@ -1225,7 +1235,7 @@ static int Cookie_control_init(void)
|
|
25495 |
|
|
25496 |
/* Get a file pointer */
|
|
25497 |
filename = g_strconcat(g_get_home_dir(), "/", ".dillo/cookiesrc", NULL);
|
|
25498 |
- stream = Cookies_fopen(filename, "DEFAULT DENY\n");
|
|
25499 |
+ stream = Cookies_fopen(filename, "DEFAULT ACCEPT\n");
|
|
25500 |
g_free(filename);
|
|
25501 |
|
|
25502 |
if (!stream)
|
|
25503 |
@@ -1341,7 +1351,7 @@ static int srv_parse_buf(SockHandler *sh
|
|
25504 |
|
|
25505 |
if (cmd && strcmp(cmd, "DpiBye") == 0) {
|
|
25506 |
g_free(cmd);
|
|
25507 |
- MSG("Cookies dpi (pid %d): Got DpiBye.\n", (gint)getpid());
|
|
25508 |
+ _MSG("Cookies dpi (pid %d): Got DpiBye.\n", (gint)getpid());
|
|
25509 |
exit(0);
|
|
25510 |
|
|
25511 |
} else if (cmd && strcmp(cmd, "set_cookie") == 0) {
|
|
25512 |
@@ -1398,7 +1408,7 @@ static int srv_parse_buf(SockHandler *sh
|
|
25513 |
static void cleanup(void)
|
|
25514 |
{
|
|
25515 |
Cookies_freeall();
|
|
25516 |
- MSG("cleanup\n");
|
|
25517 |
+ _MSG("cleanup\n");
|
|
25518 |
/* no more cleanup required */
|
|
25519 |
}
|
|
25520 |
|
|
25521 |
@@ -1434,7 +1444,7 @@ int main (void) {
|
|
25522 |
signal (SIGTERM, SIG_IGN);
|
|
25523 |
|
|
25524 |
Cookies_init();
|
|
25525 |
- MSG("(v.1) accepting connections...\n");
|
|
25526 |
+ _MSG("(v.1) accepting connections...\n");
|
|
25527 |
|
|
25528 |
if (disabled)
|
|
25529 |
exit(1);
|
|
25530 |
diff -pruN dillo-0.8.6/dpi/dpiutil.c dillo-0.8.6-i18n-misc-20070916/dpi/dpiutil.c
|
|
25531 |
--- dillo-0.8.6/dpi/dpiutil.c 2006-01-21 05:06:55.000000000 +0900
|
|
25532 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/dpiutil.c 2006-05-16 01:21:15.000000000 +0900
|
|
25533 |
@@ -95,8 +95,8 @@ gchar *Unescape_html_str(const gchar *st
|
|
25534 |
if (!g_strncasecmp(str + i, unsafe_rep[k], unsafe_rep_len[k])) {
|
|
25535 |
i += unsafe_rep_len[k] - 1;
|
|
25536 |
break;
|
|
25537 |
- }
|
|
25538 |
- }
|
|
25539 |
+ }
|
|
25540 |
+ }
|
|
25541 |
u_str[j++] = (k < 5) ? unsafe_chars[k] : str[i];
|
|
25542 |
} else {
|
|
25543 |
u_str[j++] = str[i];
|
|
25544 |
@@ -139,7 +139,7 @@ char *Filter_smtp_hack(char *url)
|
|
25545 |
|
|
25546 |
/*
|
|
25547 |
* Create and initialize the SockHandler structure
|
|
25548 |
- */
|
|
25549 |
+ */
|
|
25550 |
SockHandler *sock_handler_new(int fd_in, int fd_out, int flush_sz)
|
|
25551 |
{
|
|
25552 |
SockHandler *sh = g_new(SockHandler, 1);
|
|
25553 |
@@ -232,7 +232,7 @@ gchar *sock_handler_read(SockHandler *sh
|
|
25554 |
do
|
|
25555 |
st = read(sh->fd_in, buf, 16384);
|
|
25556 |
while (st < 0 && errno == EINTR);
|
|
25557 |
-
|
|
25558 |
+
|
|
25559 |
if (st == -1)
|
|
25560 |
perror("[sock_handler_read]");
|
|
25561 |
|
|
25562 |
diff -pruN dillo-0.8.6/dpi/file.c dillo-0.8.6-i18n-misc-20070916/dpi/file.c
|
|
25563 |
--- dillo-0.8.6/dpi/file.c 2006-04-12 02:50:23.000000000 +0900
|
|
25564 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/file.c 2006-05-16 01:21:15.000000000 +0900
|
|
25565 |
@@ -525,7 +525,7 @@ static const char *File_content_type(con
|
|
25566 |
/*
|
|
25567 |
* Try to stat the file and determine if it's readable.
|
|
25568 |
*/
|
|
25569 |
-static void File_get(ClientInfo *Client, const char *filename,
|
|
25570 |
+static void File_get(ClientInfo *Client, const char *filename,
|
|
25571 |
const char *orig_url)
|
|
25572 |
{
|
|
25573 |
int res;
|
|
25574 |
@@ -545,7 +545,7 @@ static void File_get(ClientInfo *Client,
|
|
25575 |
|
|
25576 |
if (res == FILE_NOT_FOUND) {
|
|
25577 |
msg = g_strdup_printf("%s Not Found: %s",
|
|
25578 |
- S_ISDIR(sb.st_mode) ? "Directory" : "File", filename);
|
|
25579 |
+ S_ISDIR(sb.st_mode) ? "Directory" : "File", filename);
|
|
25580 |
} else if (res == FILE_NO_ACCESS) {
|
|
25581 |
msg = g_strdup_printf("Access denied to %s: %s",
|
|
25582 |
S_ISDIR(sb.st_mode) ? "Directory" : "File", filename);
|
|
25583 |
@@ -715,7 +715,7 @@ static char *File_normalize_path(const c
|
|
25584 |
if (str[1] == '\0' || str[1] == '/') {
|
|
25585 |
/* User wants the CWD */
|
|
25586 |
basename = g_get_current_dir();
|
|
25587 |
- str++;
|
|
25588 |
+ str++;
|
|
25589 |
} else if (str[1] == '.') {
|
|
25590 |
/* One level down from the CWD */
|
|
25591 |
char *tmp1 = g_get_current_dir();
|
|
25592 |
@@ -941,11 +941,11 @@ int main(void)
|
|
25593 |
|
|
25594 |
/* Arrange the cleanup function for abnormal terminations */
|
|
25595 |
if (signal (SIGINT, termination_handler) == SIG_IGN)
|
|
25596 |
- signal (SIGINT, SIG_IGN);
|
|
25597 |
+ signal (SIGINT, SIG_IGN);
|
|
25598 |
if (signal (SIGHUP, termination_handler) == SIG_IGN)
|
|
25599 |
- signal (SIGHUP, SIG_IGN);
|
|
25600 |
+ signal (SIGHUP, SIG_IGN);
|
|
25601 |
if (signal (SIGTERM, termination_handler) == SIG_IGN)
|
|
25602 |
- signal (SIGTERM, SIG_IGN);
|
|
25603 |
+ signal (SIGTERM, SIG_IGN);
|
|
25604 |
|
|
25605 |
MSG("(v.1) accepting connections...\n");
|
|
25606 |
|
|
25607 |
@@ -972,7 +972,7 @@ int main(void)
|
|
25608 |
accept(STDIN_FILENO, (struct sockaddr *)&spun, &address_size);
|
|
25609 |
|
|
25610 |
if (temp_sock_descriptor == -1) {
|
|
25611 |
- perror("[accept]");
|
|
25612 |
+ perror("[accept]");
|
|
25613 |
break;
|
|
25614 |
}
|
|
25615 |
|
|
25616 |
diff -pruN dillo-0.8.6/dpi/ftp.c dillo-0.8.6-i18n-misc-20070916/dpi/ftp.c
|
|
25617 |
--- dillo-0.8.6/dpi/ftp.c 2006-04-04 21:48:45.000000000 +0900
|
|
25618 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/ftp.c 2006-05-16 01:21:15.000000000 +0900
|
|
25619 |
@@ -248,7 +248,7 @@ static gint try_ftp_transfer(gchar *url)
|
|
25620 |
}
|
|
25621 |
|
|
25622 |
if (!aborted)
|
|
25623 |
- sock_handler_write(sh, buf, n, 0);
|
|
25624 |
+ sock_handler_write(sh, buf, n, 0);
|
|
25625 |
}
|
|
25626 |
|
|
25627 |
return nb;
|
|
25628 |
diff -pruN dillo-0.8.6/dpi/hello.c dillo-0.8.6-i18n-misc-20070916/dpi/hello.c
|
|
25629 |
--- dillo-0.8.6/dpi/hello.c 2006-01-18 00:21:53.000000000 +0900
|
|
25630 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/hello.c 2006-05-16 01:21:15.000000000 +0900
|
|
25631 |
@@ -131,7 +131,7 @@ int main(void)
|
|
25632 |
/* Read/Write */
|
|
25633 |
while ((n = fread (buf, 1, 4096, in_stream)) > 0) {
|
|
25634 |
sock_handler_write(sh, buf, n, 0);
|
|
25635 |
- }
|
|
25636 |
+ }
|
|
25637 |
|
|
25638 |
sock_handler_printf(sh, 0, "</pre>\n");
|
|
25639 |
|
|
25640 |
diff -pruN dillo-0.8.6/dpi/https.c dillo-0.8.6-i18n-misc-20070916/dpi/https.c
|
|
25641 |
--- dillo-0.8.6/dpi/https.c 2006-03-25 00:52:23.000000000 +0900
|
|
25642 |
+++ dillo-0.8.6-i18n-misc-20070916/dpi/https.c 2006-05-16 01:21:15.000000000 +0900
|
|
25643 |
@@ -134,7 +134,7 @@ static void yes_ssl_support(void)
|
|
25644 |
/*Insufficient entropy. Deal with it?*/
|
|
25645 |
g_printerr("Insufficient random entropy\n");
|
|
25646 |
}
|
|
25647 |
-
|
|
25648 |
+
|
|
25649 |
/*Create context and SSL object*/
|
|
25650 |
if (exit_error == 0){
|
|
25651 |
ssl_context = SSL_CTX_new(SSLv23_client_method());
|
|
25652 |
@@ -171,7 +171,7 @@ static void yes_ssl_support(void)
|
|
25653 |
}
|
|
25654 |
|
|
25655 |
if (exit_error == 0){
|
|
25656 |
- /* Need to do the following if we want to deal with all
|
|
25657 |
+ /* Need to do the following if we want to deal with all
|
|
25658 |
* possible ciphers
|
|
25659 |
*/
|
|
25660 |
SSL_set_cipher_list(ssl_connection, "ALL");
|
|
25661 |
@@ -268,7 +268,7 @@ static void yes_ssl_support(void)
|
|
25662 |
}
|
|
25663 |
|
|
25664 |
/*
|
|
25665 |
- * The following function attempts to open up a connection to the
|
|
25666 |
+ * The following function attempts to open up a connection to the
|
|
25667 |
* remote server and return the file descriptor number of the
|
|
25668 |
* socket. Returns -1 in the event of an error
|
|
25669 |
*/
|
|
25670 |
@@ -302,7 +302,7 @@ static int get_network_connection(gchar
|
|
25671 |
} else {
|
|
25672 |
url_look_up = url + url_offset;
|
|
25673 |
}
|
|
25674 |
-
|
|
25675 |
+
|
|
25676 |
root_url = g_strdup(url_look_up);
|
|
25677 |
hp=gethostbyname(url_look_up);
|
|
25678 |
|
|
25679 |
@@ -331,7 +331,7 @@ static int get_network_connection(gchar
|
|
25680 |
}
|
|
25681 |
|
|
25682 |
|
|
25683 |
-/* This function is run only when the certificate cannot
|
|
25684 |
+/* This function is run only when the certificate cannot
|
|
25685 |
* be completely trusted. This will notify the user and
|
|
25686 |
* allow the user to decide what to do. It may save the
|
|
25687 |
* certificate to the user's .dillo directory if it is
|
|
25688 |
@@ -363,7 +363,7 @@ static int handle_certificate_problem(SS
|
|
25689 |
|
|
25690 |
/*Read the user's response*/
|
|
25691 |
response_number = dialog_get_answer_number();
|
|
25692 |
-
|
|
25693 |
+
|
|
25694 |
/*Abort on anything but "Continue"*/
|
|
25695 |
if (response_number == 1){
|
|
25696 |
retval = 0;
|
|
25697 |
@@ -423,8 +423,8 @@ static int handle_certificate_problem(SS
|
|
25698 |
d_cmd = a_Dpip_build_cmd(
|
|
25699 |
"cmd=%s msg=%s alt1=%s alt2=%s",
|
|
25700 |
"dialog",
|
|
25701 |
- "The issuer for the remote certificate cannot be found\n"
|
|
25702 |
- "The authenticity of the remote certificate cannot be trusted",
|
|
25703 |
+ "The issuer for the remote certificate cannot be found\n"
|
|
25704 |
+ "The authenticity of the remote certificate cannot be trusted",
|
|
25705 |
"Continue", "Cancel");
|
|
25706 |
sock_handler_write_str(sh, d_cmd, 1);
|
|
25707 |
g_free(d_cmd);
|
|
25708 |
@@ -684,7 +684,7 @@ static void no_ssl_support(void)
|
|
25709 |
/*---------------------------------------------------------------------------*/
|
|
25710 |
int main(void)
|
|
25711 |
{
|
|
25712 |
- /* Initialize the SockHandler for this filter dpi */
|
|
25713 |
+ /* Initialize the SockHandler for this filter dpi */
|
|
25714 |
sh = sock_handler_new(STDIN_FILENO, STDOUT_FILENO, 8*1024);
|
|
25715 |
|
|
25716 |
#ifdef ENABLE_SSL
|
|
25717 |
diff -pruN dillo-0.8.6/dpid/Makefile.am dillo-0.8.6-i18n-misc-20070916/dpid/Makefile.am
|
|
25718 |
--- dillo-0.8.6/dpid/Makefile.am 2005-05-08 04:28:00.000000000 +0900
|
|
25719 |
+++ dillo-0.8.6-i18n-misc-20070916/dpid/Makefile.am 2006-05-16 01:21:14.000000000 +0900
|
|
25720 |
@@ -1,4 +1,4 @@
|
|
25721 |
-AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"'
|
|
25722 |
+AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' -DLOCALEDIR='"$(localedir)"'
|
|
25723 |
AM_CFLAGS = @GLIB_CFLAGS@
|
|
25724 |
|
|
25725 |
bin_PROGRAMS = dpid
|
|
25726 |
diff -pruN dillo-0.8.6/dpid/Makefile.in dillo-0.8.6-i18n-misc-20070916/dpid/Makefile.in
|
|
25727 |
--- dillo-0.8.6/dpid/Makefile.in 2006-04-27 01:07:18.000000000 +0900
|
|
25728 |
+++ dillo-0.8.6-i18n-misc-20070916/dpid/Makefile.in 2007-09-07 01:05:07.000000000 +0900
|
|
25729 |
@@ -1,8 +1,8 @@
|
|
25730 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
25731 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
25732 |
# @configure_input@
|
|
25733 |
|
|
25734 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
25735 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
25736 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
25737 |
+# Free Software Foundation, Inc.
|
|
25738 |
# This Makefile.in is free software; the Free Software Foundation
|
|
25739 |
# gives unlimited permission to copy and/or distribute it,
|
|
25740 |
# with or without modifications, as long as this notice is preserved.
|
|
25741 |
@@ -14,9 +14,6 @@
|
|
25742 |
|
|
25743 |
@SET_MAKE@
|
|
25744 |
|
|
25745 |
-
|
|
25746 |
-SOURCES = $(dpid_SOURCES)
|
|
25747 |
-
|
|
25748 |
srcdir = @srcdir@
|
|
25749 |
top_srcdir = @top_srcdir@
|
|
25750 |
VPATH = @srcdir@
|
|
25751 |
@@ -24,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
25752 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
25753 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
25754 |
top_builddir = ..
|
|
25755 |
+
|
|
25756 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
25757 |
INSTALL = @INSTALL@
|
|
25758 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
25759 |
@@ -40,38 +38,6 @@ POST_UNINSTALL = :
|
|
25760 |
build_triplet = @build@
|
|
25761 |
host_triplet = @host@
|
|
25762 |
target_triplet = @target@
|
|
25763 |
-bin_PROGRAMS = dpid$(EXEEXT)
|
|
25764 |
-subdir = dpid
|
|
25765 |
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
|
|
25766 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
25767 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
25768 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
25769 |
- $(ACLOCAL_M4)
|
|
25770 |
-mkinstalldirs = $(install_sh) -d
|
|
25771 |
-CONFIG_HEADER = $(top_builddir)/config.h
|
|
25772 |
-CONFIG_CLEAN_FILES =
|
|
25773 |
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
|
|
25774 |
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
25775 |
-PROGRAMS = $(bin_PROGRAMS)
|
|
25776 |
-am_dpid_OBJECTS = dpi.$(OBJEXT) dpi_service.$(OBJEXT) \
|
|
25777 |
- dpi_socket_dir.$(OBJEXT) dpid.$(OBJEXT) dpid_common.$(OBJEXT) \
|
|
25778 |
- main.$(OBJEXT) misc_new.$(OBJEXT)
|
|
25779 |
-dpid_OBJECTS = $(am_dpid_OBJECTS)
|
|
25780 |
-dpid_DEPENDENCIES = ../dpip/libDpip.a
|
|
25781 |
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
|
25782 |
-SCRIPTS = $(bin_SCRIPTS)
|
|
25783 |
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
25784 |
-depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
25785 |
-am__depfiles_maybe = depfiles
|
|
25786 |
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
25787 |
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
25788 |
-CCLD = $(CC)
|
|
25789 |
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
25790 |
-SOURCES = $(dpid_SOURCES)
|
|
25791 |
-DIST_SOURCES = $(dpid_SOURCES)
|
|
25792 |
-ETAGS = etags
|
|
25793 |
-CTAGS = ctags
|
|
25794 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
25795 |
ACLOCAL = @ACLOCAL@
|
|
25796 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
25797 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
25798 |
@@ -101,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
25799 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
25800 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
25801 |
GLIB_LIBS = @GLIB_LIBS@
|
|
25802 |
+GMSGFMT = @GMSGFMT@
|
|
25803 |
+GREP = @GREP@
|
|
25804 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
25805 |
GTK_CONFIG = @GTK_CONFIG@
|
|
25806 |
GTK_LIBS = @GTK_LIBS@
|
|
25807 |
@@ -108,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
25808 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
25809 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
25810 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
25811 |
+INTLLIBS = @INTLLIBS@
|
|
25812 |
LDFLAGS = @LDFLAGS@
|
|
25813 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
25814 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
25815 |
+LIBICONV = @LIBICONV@
|
|
25816 |
+LIBINTL = @LIBINTL@
|
|
25817 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
25818 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
25819 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
25820 |
@@ -122,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
25821 |
LIBS = @LIBS@
|
|
25822 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
25823 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
25824 |
+LTLIBICONV = @LTLIBICONV@
|
|
25825 |
+LTLIBINTL = @LTLIBINTL@
|
|
25826 |
LTLIBOBJS = @LTLIBOBJS@
|
|
25827 |
MAKEINFO = @MAKEINFO@
|
|
25828 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
25829 |
+MSGFMT = @MSGFMT@
|
|
25830 |
+MSGMERGE = @MSGMERGE@
|
|
25831 |
OBJEXT = @OBJEXT@
|
|
25832 |
PACKAGE = @PACKAGE@
|
|
25833 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
25834 |
@@ -132,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
25835 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
25836 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
25837 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
25838 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
25839 |
+POSUB = @POSUB@
|
|
25840 |
RANLIB = @RANLIB@
|
|
25841 |
SET_MAKE = @SET_MAKE@
|
|
25842 |
SHELL = @SHELL@
|
|
25843 |
STRIP = @STRIP@
|
|
25844 |
+USE_NLS = @USE_NLS@
|
|
25845 |
VERSION = @VERSION@
|
|
25846 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
25847 |
+XGETTEXT = @XGETTEXT@
|
|
25848 |
ac_ct_CC = @ac_ct_CC@
|
|
25849 |
ac_ct_CXX = @ac_ct_CXX@
|
|
25850 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
25851 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
25852 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
25853 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
25854 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
25855 |
@@ -148,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
25856 |
am__include = @am__include@
|
|
25857 |
am__leading_dot = @am__leading_dot@
|
|
25858 |
am__quote = @am__quote@
|
|
25859 |
-am__tar = @am__tar@
|
|
25860 |
-am__untar = @am__untar@
|
|
25861 |
bindir = @bindir@
|
|
25862 |
build = @build@
|
|
25863 |
build_alias = @build_alias@
|
|
25864 |
@@ -157,23 +134,29 @@ build_cpu = @build_cpu@
|
|
25865 |
build_os = @build_os@
|
|
25866 |
build_vendor = @build_vendor@
|
|
25867 |
datadir = @datadir@
|
|
25868 |
+datarootdir = @datarootdir@
|
|
25869 |
+docdir = @docdir@
|
|
25870 |
+dvidir = @dvidir@
|
|
25871 |
exec_prefix = @exec_prefix@
|
|
25872 |
host = @host@
|
|
25873 |
host_alias = @host_alias@
|
|
25874 |
host_cpu = @host_cpu@
|
|
25875 |
host_os = @host_os@
|
|
25876 |
host_vendor = @host_vendor@
|
|
25877 |
+htmldir = @htmldir@
|
|
25878 |
includedir = @includedir@
|
|
25879 |
infodir = @infodir@
|
|
25880 |
install_sh = @install_sh@
|
|
25881 |
libdir = @libdir@
|
|
25882 |
libexecdir = @libexecdir@
|
|
25883 |
+localedir = @localedir@
|
|
25884 |
localstatedir = @localstatedir@
|
|
25885 |
mandir = @mandir@
|
|
25886 |
-mkdir_p = @mkdir_p@
|
|
25887 |
oldincludedir = @oldincludedir@
|
|
25888 |
+pdfdir = @pdfdir@
|
|
25889 |
prefix = @prefix@
|
|
25890 |
program_transform_name = @program_transform_name@
|
|
25891 |
+psdir = @psdir@
|
|
25892 |
sbindir = @sbindir@
|
|
25893 |
sharedstatedir = @sharedstatedir@
|
|
25894 |
sysconfdir = @sysconfdir@
|
|
25895 |
@@ -182,11 +165,15 @@ target_alias = @target_alias@
|
|
25896 |
target_cpu = @target_cpu@
|
|
25897 |
target_os = @target_os@
|
|
25898 |
target_vendor = @target_vendor@
|
|
25899 |
-AM_CPPFLAGS = -DDPIDRC_SYS='"$(sysconfdir)/dpidrc"'
|
|
25900 |
+AM_CPPFLAGS = -DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' -DLOCALEDIR='"$(localedir)"'
|
|
25901 |
AM_CFLAGS = @GLIB_CFLAGS@
|
|
25902 |
+
|
|
25903 |
+bin_PROGRAMS = dpid
|
|
25904 |
dpid_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
|
|
25905 |
+
|
|
25906 |
EXTRA_DIST = dpidc
|
|
25907 |
bin_SCRIPTS = dpidc
|
|
25908 |
+
|
|
25909 |
dpid_SOURCES = \
|
|
25910 |
dpi.h \
|
|
25911 |
dpi_service.h \
|
|
25912 |
@@ -202,49 +189,58 @@ dpid_SOURCES = \
|
|
25913 |
main.c \
|
|
25914 |
misc_new.c
|
|
25915 |
|
|
25916 |
+subdir = dpid
|
|
25917 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
25918 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
25919 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
25920 |
+CONFIG_CLEAN_FILES =
|
|
25921 |
+bin_PROGRAMS = dpid$(EXEEXT)
|
|
25922 |
+PROGRAMS = $(bin_PROGRAMS)
|
|
25923 |
+
|
|
25924 |
+am_dpid_OBJECTS = dpi.$(OBJEXT) dpi_service.$(OBJEXT) \
|
|
25925 |
+ dpi_socket_dir.$(OBJEXT) dpid.$(OBJEXT) dpid_common.$(OBJEXT) \
|
|
25926 |
+ main.$(OBJEXT) misc_new.$(OBJEXT)
|
|
25927 |
+dpid_OBJECTS = $(am_dpid_OBJECTS)
|
|
25928 |
+dpid_DEPENDENCIES = ../dpip/libDpip.a
|
|
25929 |
+dpid_LDFLAGS =
|
|
25930 |
+SCRIPTS = $(bin_SCRIPTS)
|
|
25931 |
+
|
|
25932 |
+
|
|
25933 |
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
25934 |
+depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
25935 |
+am__depfiles_maybe = depfiles
|
|
25936 |
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dpi.Po ./$(DEPDIR)/dpi_service.Po \
|
|
25937 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dpi_socket_dir.Po ./$(DEPDIR)/dpid.Po \
|
|
25938 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dpid_common.Po ./$(DEPDIR)/main.Po \
|
|
25939 |
+@AMDEP_TRUE@ ./$(DEPDIR)/misc_new.Po
|
|
25940 |
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
25941 |
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
25942 |
+CCLD = $(CC)
|
|
25943 |
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
25944 |
+DIST_SOURCES = $(dpid_SOURCES)
|
|
25945 |
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
|
|
25946 |
+SOURCES = $(dpid_SOURCES)
|
|
25947 |
+
|
|
25948 |
all: all-am
|
|
25949 |
|
|
25950 |
.SUFFIXES:
|
|
25951 |
.SUFFIXES: .c .o .obj
|
|
25952 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
25953 |
- @for dep in $?; do \
|
|
25954 |
- case '$(am__configure_deps)' in \
|
|
25955 |
- *$$dep*) \
|
|
25956 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
|
25957 |
- && exit 0; \
|
|
25958 |
- exit 1;; \
|
|
25959 |
- esac; \
|
|
25960 |
- done; \
|
|
25961 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpid/Makefile'; \
|
|
25962 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
25963 |
cd $(top_srcdir) && \
|
|
25964 |
$(AUTOMAKE) --gnu dpid/Makefile
|
|
25965 |
-.PRECIOUS: Makefile
|
|
25966 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
25967 |
- @case '$?' in \
|
|
25968 |
- *config.status*) \
|
|
25969 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
|
25970 |
- *) \
|
|
25971 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
|
25972 |
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
|
25973 |
- esac;
|
|
25974 |
-
|
|
25975 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
25976 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
25977 |
-
|
|
25978 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
25979 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
25980 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
25981 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
25982 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
25983 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
25984 |
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
25985 |
install-binPROGRAMS: $(bin_PROGRAMS)
|
|
25986 |
@$(NORMAL_INSTALL)
|
|
25987 |
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
|
25988 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
25989 |
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
25990 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
25991 |
if test -f $$p \
|
|
25992 |
; then \
|
|
25993 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
25994 |
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
|
25995 |
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
|
|
25996 |
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
|
|
25997 |
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
|
|
25998 |
else :; fi; \
|
|
25999 |
done
|
|
26000 |
|
|
26001 |
@@ -252,8 +248,8 @@ uninstall-binPROGRAMS:
|
|
26002 |
@$(NORMAL_UNINSTALL)
|
|
26003 |
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
26004 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
26005 |
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
|
26006 |
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
|
26007 |
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
|
|
26008 |
+ rm -f $(DESTDIR)$(bindir)/$$f; \
|
|
26009 |
done
|
|
26010 |
|
|
26011 |
clean-binPROGRAMS:
|
|
26012 |
@@ -261,15 +257,16 @@ clean-binPROGRAMS:
|
|
26013 |
dpid$(EXEEXT): $(dpid_OBJECTS) $(dpid_DEPENDENCIES)
|
|
26014 |
@rm -f dpid$(EXEEXT)
|
|
26015 |
$(LINK) $(dpid_LDFLAGS) $(dpid_OBJECTS) $(dpid_LDADD) $(LIBS)
|
|
26016 |
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
|
26017 |
install-binSCRIPTS: $(bin_SCRIPTS)
|
|
26018 |
@$(NORMAL_INSTALL)
|
|
26019 |
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
|
26020 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
26021 |
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
|
26022 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
26023 |
if test -f $$d$$p; then \
|
|
26024 |
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
|
26025 |
- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
|
26026 |
- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
|
|
26027 |
+ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
|
|
26028 |
+ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
|
|
26029 |
else :; fi; \
|
|
26030 |
done
|
|
26031 |
|
|
26032 |
@@ -277,12 +274,12 @@ uninstall-binSCRIPTS:
|
|
26033 |
@$(NORMAL_UNINSTALL)
|
|
26034 |
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
|
26035 |
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
|
26036 |
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
|
26037 |
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
|
26038 |
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
|
|
26039 |
+ rm -f $(DESTDIR)$(bindir)/$$f; \
|
|
26040 |
done
|
|
26041 |
|
|
26042 |
mostlyclean-compile:
|
|
26043 |
- -rm -f *.$(OBJEXT)
|
|
26044 |
+ -rm -f *.$(OBJEXT) core *.core
|
|
26045 |
|
|
26046 |
distclean-compile:
|
|
26047 |
-rm -f *.tab.c
|
|
26048 |
@@ -296,20 +293,36 @@ distclean-compile:
|
|
26049 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc_new.Po@am__quote@
|
|
26050 |
|
|
26051 |
.c.o:
|
|
26052 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
|
26053 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
26054 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
26055 |
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
26056 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
26057 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
26058 |
+@am__fastdepCC_TRUE@ fi
|
|
26059 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
26060 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26061 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
26062 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
26063 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26064 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
|
|
26065 |
|
|
26066 |
.c.obj:
|
|
26067 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
|
26068 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
26069 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
26070 |
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
26071 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
26072 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
26073 |
+@am__fastdepCC_TRUE@ fi
|
|
26074 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
26075 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26076 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
26077 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
26078 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26079 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
26080 |
uninstall-info-am:
|
|
26081 |
|
|
26082 |
+ETAGS = etags
|
|
26083 |
+ETAGSFLAGS =
|
|
26084 |
+
|
|
26085 |
+CTAGS = ctags
|
|
26086 |
+CTAGSFLAGS =
|
|
26087 |
+
|
|
26088 |
+tags: TAGS
|
|
26089 |
+
|
|
26090 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
26091 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
26092 |
unique=`for i in $$list; do \
|
|
26093 |
@@ -318,7 +331,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
|
|
26094 |
$(AWK) ' { files[$$0] = 1; } \
|
|
26095 |
END { for (i in files) print i; }'`; \
|
|
26096 |
mkid -fID $$unique
|
|
26097 |
-tags: TAGS
|
|
26098 |
|
|
26099 |
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
26100 |
$(TAGS_FILES) $(LISP)
|
|
26101 |
@@ -330,11 +342,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
26102 |
done | \
|
|
26103 |
$(AWK) ' { files[$$0] = 1; } \
|
|
26104 |
END { for (i in files) print i; }'`; \
|
|
26105 |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
26106 |
- test -n "$$unique" || unique=$$empty_fix; \
|
|
26107 |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
26108 |
- $$tags $$unique; \
|
|
26109 |
- fi
|
|
26110 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
26111 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
26112 |
+ $$tags $$unique
|
|
26113 |
+
|
|
26114 |
ctags: CTAGS
|
|
26115 |
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
26116 |
$(TAGS_FILES) $(LISP)
|
|
26117 |
@@ -357,6 +368,10 @@ GTAGS:
|
|
26118 |
|
|
26119 |
distclean-tags:
|
|
26120 |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
26121 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
26122 |
+
|
|
26123 |
+top_distdir = ..
|
|
26124 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
26125 |
|
|
26126 |
distdir: $(DISTFILES)
|
|
26127 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
26128 |
@@ -370,7 +385,7 @@ distdir: $(DISTFILES)
|
|
26129 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
26130 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
26131 |
dir="/$$dir"; \
|
|
26132 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
26133 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
26134 |
else \
|
|
26135 |
dir=''; \
|
|
26136 |
fi; \
|
|
26137 |
@@ -388,10 +403,9 @@ distdir: $(DISTFILES)
|
|
26138 |
check-am: all-am
|
|
26139 |
check: check-am
|
|
26140 |
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
|
|
26141 |
+
|
|
26142 |
installdirs:
|
|
26143 |
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
|
|
26144 |
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
|
26145 |
- done
|
|
26146 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)
|
|
26147 |
install: install-am
|
|
26148 |
install-exec: install-exec-am
|
|
26149 |
install-data: install-data-am
|
|
26150 |
@@ -411,7 +425,7 @@ mostlyclean-generic:
|
|
26151 |
clean-generic:
|
|
26152 |
|
|
26153 |
distclean-generic:
|
|
26154 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
26155 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
26156 |
|
|
26157 |
maintainer-clean-generic:
|
|
26158 |
@echo "This command is intended for maintainers to use"
|
|
26159 |
@@ -430,8 +444,6 @@ dvi: dvi-am
|
|
26160 |
|
|
26161 |
dvi-am:
|
|
26162 |
|
|
26163 |
-html: html-am
|
|
26164 |
-
|
|
26165 |
info: info-am
|
|
26166 |
|
|
26167 |
info-am:
|
|
26168 |
@@ -468,8 +480,8 @@ uninstall-am: uninstall-binPROGRAMS unin
|
|
26169 |
|
|
26170 |
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
|
|
26171 |
clean-generic ctags distclean distclean-compile \
|
|
26172 |
- distclean-generic distclean-tags distdir dvi dvi-am html \
|
|
26173 |
- html-am info info-am install install-am install-binPROGRAMS \
|
|
26174 |
+ distclean-generic distclean-tags distdir dvi dvi-am info \
|
|
26175 |
+ info-am install install-am install-binPROGRAMS \
|
|
26176 |
install-binSCRIPTS install-data install-data-am \
|
|
26177 |
install-data-local install-exec install-exec-am install-info \
|
|
26178 |
install-info-am install-man install-strip installcheck \
|
|
26179 |
diff -pruN dillo-0.8.6/dpid/dpi_socket_dir.c dillo-0.8.6-i18n-misc-20070916/dpid/dpi_socket_dir.c
|
|
26180 |
--- dillo-0.8.6/dpid/dpi_socket_dir.c 2005-10-28 01:19:53.000000000 +0900
|
|
26181 |
+++ dillo-0.8.6-i18n-misc-20070916/dpid/dpi_socket_dir.c 2006-05-16 01:21:14.000000000 +0900
|
|
26182 |
@@ -23,6 +23,7 @@
|
|
26183 |
#include <errno.h>
|
|
26184 |
#include "dpid_common.h"
|
|
26185 |
#include "dpi.h"
|
|
26186 |
+#include "../src/intl.h"
|
|
26187 |
#include "misc_new.h"
|
|
26188 |
#include "dpi_socket_dir.h" /* for function prototypes */
|
|
26189 |
|
|
26190 |
@@ -102,16 +103,16 @@ char *init_sockdir(char *dpi_socket_dir)
|
|
26191 |
|
|
26192 |
if ((sockdir = a_Dpi_rd_dpi_socket_dir(dpi_socket_dir)) == NULL) {
|
|
26193 |
fprintf(stderr, "debug_msg - init_sockdir: ");
|
|
26194 |
- fprintf(stderr, "The dpi_socket_dir file does not exist\n");
|
|
26195 |
+ fprintf(stderr, _("The dpi_socket_dir file does not exist\n"));
|
|
26196 |
} else {
|
|
26197 |
if ((dir_ok = tst_dir(sockdir)) == 1) {
|
|
26198 |
fprintf(stderr,
|
|
26199 |
- "debug_msg - init_sockdir: The socket directory ");
|
|
26200 |
- fprintf(stderr, "%s exists and is OK\n", sockdir);
|
|
26201 |
+ _("debug_msg - init_sockdir: The socket directory "));
|
|
26202 |
+ fprintf(stderr, _("%s exists and is OK\n"), sockdir);
|
|
26203 |
} else {
|
|
26204 |
fprintf(stderr,
|
|
26205 |
- "debug_msg - init_sockdir: The socket directory ");
|
|
26206 |
- fprintf(stderr, "%s does not exist or is not a directory\n",
|
|
26207 |
+ _("debug_msg - init_sockdir: The socket directory "));
|
|
26208 |
+ fprintf(stderr, _("%s does not exist or is not a directory\n"),
|
|
26209 |
sockdir);
|
|
26210 |
g_free(sockdir);
|
|
26211 |
}
|
|
26212 |
@@ -120,10 +121,10 @@ char *init_sockdir(char *dpi_socket_dir)
|
|
26213 |
sockdir = mk_sockdir();
|
|
26214 |
if (sockdir == NULL) {
|
|
26215 |
ERRMSG("init_sockdir", "mk_sockdir", 0);
|
|
26216 |
- fprintf(stderr, " - Failed to create dpi socket directory\n");
|
|
26217 |
+ fprintf(stderr, _(" - Failed to create dpi socket directory\n"));
|
|
26218 |
} else if ((w_dpi_socket_dir(dpi_socket_dir, sockdir)) == -1) {
|
|
26219 |
ERRMSG("init_sockdir", "w_dpi_socket_dir", 0);
|
|
26220 |
- fprintf(stderr, " - failed to save %s\n", sockdir);
|
|
26221 |
+ fprintf(stderr, _(" - failed to save %s\n"), sockdir);
|
|
26222 |
g_free(sockdir);
|
|
26223 |
sockdir = NULL;
|
|
26224 |
}
|
|
26225 |
diff -pruN dillo-0.8.6/dpid/main.c dillo-0.8.6-i18n-misc-20070916/dpid/main.c
|
|
26226 |
--- dillo-0.8.6/dpid/main.c 2006-01-03 03:34:18.000000000 +0900
|
|
26227 |
+++ dillo-0.8.6-i18n-misc-20070916/dpid/main.c 2006-05-16 01:21:14.000000000 +0900
|
|
26228 |
@@ -22,6 +22,9 @@
|
|
26229 |
#include <sys/stat.h>
|
|
26230 |
#include <sys/time.h>
|
|
26231 |
#include <glib.h>
|
|
26232 |
+#include <locale.h>
|
|
26233 |
+#include "config.h"
|
|
26234 |
+#include "../src/intl.h"
|
|
26235 |
#include "dpid_common.h"
|
|
26236 |
#include "dpid.h"
|
|
26237 |
#include "dpi.h"
|
|
26238 |
@@ -53,14 +56,14 @@ static int start_filter_plugin(struct dp
|
|
26239 |
dup2(STDIN_FILENO, old_stdin);
|
|
26240 |
if (dup2(newsock, STDIN_FILENO) == -1) {
|
|
26241 |
ERRMSG("start_plugin", "dup2", errno);
|
|
26242 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26243 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26244 |
exit(1);
|
|
26245 |
}
|
|
26246 |
|
|
26247 |
dup2(STDOUT_FILENO, old_stdout);
|
|
26248 |
if (dup2(newsock, STDOUT_FILENO) == -1) {
|
|
26249 |
ERRMSG("start_plugin", "dup2", errno);
|
|
26250 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26251 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26252 |
exit(1);
|
|
26253 |
}
|
|
26254 |
if ((pid = fork()) == -1) {
|
|
26255 |
@@ -71,7 +74,7 @@ static int start_filter_plugin(struct dp
|
|
26256 |
/* Child, start plugin */
|
|
26257 |
if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
|
|
26258 |
ERRMSG("start_plugin", "execl", errno);
|
|
26259 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26260 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26261 |
exit(1);
|
|
26262 |
}
|
|
26263 |
}
|
|
26264 |
@@ -79,7 +82,7 @@ static int start_filter_plugin(struct dp
|
|
26265 |
/* Parent, Close sockets fix stdio and return pid */
|
|
26266 |
if (a_Misc_close_fd(newsock) == -1) {
|
|
26267 |
ERRMSG("start_plugin", "close", errno);
|
|
26268 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26269 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26270 |
exit(1);
|
|
26271 |
}
|
|
26272 |
a_Misc_close_fd(STDIN_FILENO);
|
|
26273 |
@@ -93,17 +96,17 @@ static void start_server_plugin(struct d
|
|
26274 |
{
|
|
26275 |
if (dup2(dpi_attr.socket, STDIN_FILENO) == -1) {
|
|
26276 |
ERRMSG("start_plugin", "dup2", errno);
|
|
26277 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26278 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26279 |
exit(1);
|
|
26280 |
}
|
|
26281 |
if (a_Misc_close_fd(dpi_attr.socket) == -1) {
|
|
26282 |
ERRMSG("start_plugin", "close", errno);
|
|
26283 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26284 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26285 |
exit(1);
|
|
26286 |
}
|
|
26287 |
if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
|
|
26288 |
ERRMSG("start_plugin", "execl", errno);
|
|
26289 |
- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
|
|
26290 |
+ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
|
|
26291 |
exit(1);
|
|
26292 |
}
|
|
26293 |
}
|
|
26294 |
@@ -152,7 +155,7 @@ static int get_command(int sock, char *d
|
|
26295 |
int COMMAND;
|
|
26296 |
|
|
26297 |
if (dpi_tag == NULL) {
|
|
26298 |
- ERRMSG("get_command", "dpid tag is NULL\n", 0);
|
|
26299 |
+ //ERRMSG("get_command", _("dpid tag is NULL\n"), 0);
|
|
26300 |
return (-1);
|
|
26301 |
}
|
|
26302 |
|
|
26303 |
@@ -160,7 +163,7 @@ static int get_command(int sock, char *d
|
|
26304 |
|
|
26305 |
if (cmd == NULL) {
|
|
26306 |
ERRMSG("get_command", "a_Dpip_get_attr", 0);
|
|
26307 |
- fprintf(stderr, ": dpid failed to parse cmd in %s\n", dpi_tag);
|
|
26308 |
+ fprintf(stderr, _(": dpid failed to parse cmd in %s\n"), dpi_tag);
|
|
26309 |
d_cmd = a_Dpip_build_cmd("cmd=%s msg=%s",
|
|
26310 |
"DpiError", "Failed to parse request");
|
|
26311 |
(void) CKD_WRITE(sock, d_cmd);
|
|
26312 |
@@ -227,6 +230,11 @@ int main(void)
|
|
26313 |
sigset_t mask_none;
|
|
26314 |
fd_set selected_set;
|
|
26315 |
|
|
26316 |
+ /* Initialize Gettext */
|
|
26317 |
+ setlocale(LC_ALL, "");
|
|
26318 |
+ bindtextdomain (PACKAGE, LOCALEDIR);
|
|
26319 |
+ textdomain (PACKAGE);
|
|
26320 |
+
|
|
26321 |
dpi_attr_list = NULL;
|
|
26322 |
/* daemon(0,0); */ /* Use 0,1 for feedback */
|
|
26323 |
/* todo: call setsid() ?? */
|
|
26324 |
@@ -254,7 +262,7 @@ int main(void)
|
|
26325 |
dirname = a_Dpi_sockdir_file();
|
|
26326 |
if ((sockdir = init_sockdir(dirname)) == NULL) {
|
|
26327 |
ERRMSG("main", "init_sockdir", 0);
|
|
26328 |
- fprintf(stderr, "Failed to create socket directory\n");
|
|
26329 |
+ fprintf(stderr, _("Failed to create socket directory\n"));
|
|
26330 |
exit(1);
|
|
26331 |
}
|
|
26332 |
|
|
26333 |
@@ -264,12 +272,12 @@ int main(void)
|
|
26334 |
if ((numsocks = init_srs_socket(sockdir)) == -1) {
|
|
26335 |
switch (dpi_errno) {
|
|
26336 |
case dpid_srs_addrinuse:
|
|
26337 |
- fprintf(stderr, "dpid refuses to start, possibly because:\n");
|
|
26338 |
- fprintf(stderr, "\t1) An instance of dpid is already running.\n");
|
|
26339 |
- fprintf(stderr, "\t2) A previous dpid didn't clean up on exit.\n");
|
|
26340 |
+ fprintf(stderr, _("dpid refuses to start, possibly because:\n"));
|
|
26341 |
+ fprintf(stderr, _("\t1) An instance of dpid is already running.\n"));
|
|
26342 |
+ fprintf(stderr, _("\t2) A previous dpid didn't clean up on exit.\n"));
|
|
26343 |
exit(1);
|
|
26344 |
default:
|
|
26345 |
- ERRMSG("main", "init_srs_sockets failed\n", 0);
|
|
26346 |
+ ERRMSG("main", _("init_srs_sockets failed\n"), 0);
|
|
26347 |
exit(1);
|
|
26348 |
}
|
|
26349 |
}
|
|
26350 |
@@ -283,7 +291,7 @@ int main(void)
|
|
26351 |
(void) sigemptyset(&mask_none);
|
|
26352 |
(void) sigprocmask(SIG_SETMASK, &mask_none, NULL);
|
|
26353 |
|
|
26354 |
- printf("dpid started\n");
|
|
26355 |
+ printf(_("dpid started\n"));
|
|
26356 |
/* Start main loop */
|
|
26357 |
while (1) {
|
|
26358 |
do {
|
|
26359 |
@@ -329,8 +337,8 @@ int main(void)
|
|
26360 |
sock = accept(srs, (struct sockaddr *) &clnt_addr, &csz);
|
|
26361 |
if (sock == -1) {
|
|
26362 |
ERRMSG("main", "accept", errno);
|
|
26363 |
- fprintf(stderr, "accept on srs socket failed\n");
|
|
26364 |
- fprintf(stderr, "service pending connections, and continue\n");
|
|
26365 |
+ fprintf(stderr, _("accept on srs socket failed\n"));
|
|
26366 |
+ fprintf(stderr, _("service pending connections, and continue\n"));
|
|
26367 |
} else {
|
|
26368 |
int command;
|
|
26369 |
|
|
26370 |
@@ -359,7 +367,7 @@ int main(void)
|
|
26371 |
break;
|
|
26372 |
}
|
|
26373 |
case -1:
|
|
26374 |
- ERRMSG("main", "get_command failed\n", 0);
|
|
26375 |
+ //ERRMSG("main", _("get_command failed\n"), 0);
|
|
26376 |
break;
|
|
26377 |
}
|
|
26378 |
if (req)
|
|
26379 |
diff -pruN dillo-0.8.6/dpip/Makefile.in dillo-0.8.6-i18n-misc-20070916/dpip/Makefile.in
|
|
26380 |
--- dillo-0.8.6/dpip/Makefile.in 2006-04-27 01:07:20.000000000 +0900
|
|
26381 |
+++ dillo-0.8.6-i18n-misc-20070916/dpip/Makefile.in 2007-09-07 01:03:05.000000000 +0900
|
|
26382 |
@@ -1,8 +1,8 @@
|
|
26383 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
26384 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
26385 |
# @configure_input@
|
|
26386 |
|
|
26387 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
26388 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
26389 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
26390 |
+# Free Software Foundation, Inc.
|
|
26391 |
# This Makefile.in is free software; the Free Software Foundation
|
|
26392 |
# gives unlimited permission to copy and/or distribute it,
|
|
26393 |
# with or without modifications, as long as this notice is preserved.
|
|
26394 |
@@ -14,8 +14,6 @@
|
|
26395 |
|
|
26396 |
@SET_MAKE@
|
|
26397 |
|
|
26398 |
-SOURCES = $(libDpip_a_SOURCES)
|
|
26399 |
-
|
|
26400 |
srcdir = @srcdir@
|
|
26401 |
top_srcdir = @top_srcdir@
|
|
26402 |
VPATH = @srcdir@
|
|
26403 |
@@ -23,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
26404 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
26405 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
26406 |
top_builddir = ..
|
|
26407 |
+
|
|
26408 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
26409 |
INSTALL = @INSTALL@
|
|
26410 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
26411 |
@@ -39,34 +38,6 @@ POST_UNINSTALL = :
|
|
26412 |
build_triplet = @build@
|
|
26413 |
host_triplet = @host@
|
|
26414 |
target_triplet = @target@
|
|
26415 |
-subdir = dpip
|
|
26416 |
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
26417 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
26418 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
26419 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
26420 |
- $(ACLOCAL_M4)
|
|
26421 |
-mkinstalldirs = $(install_sh) -d
|
|
26422 |
-CONFIG_HEADER = $(top_builddir)/config.h
|
|
26423 |
-CONFIG_CLEAN_FILES =
|
|
26424 |
-LIBRARIES = $(noinst_LIBRARIES)
|
|
26425 |
-AR = ar
|
|
26426 |
-ARFLAGS = cru
|
|
26427 |
-libDpip_a_AR = $(AR) $(ARFLAGS)
|
|
26428 |
-libDpip_a_LIBADD =
|
|
26429 |
-am_libDpip_a_OBJECTS = dpip.$(OBJEXT)
|
|
26430 |
-libDpip_a_OBJECTS = $(am_libDpip_a_OBJECTS)
|
|
26431 |
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
26432 |
-depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
26433 |
-am__depfiles_maybe = depfiles
|
|
26434 |
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
26435 |
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
26436 |
-CCLD = $(CC)
|
|
26437 |
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
26438 |
-SOURCES = $(libDpip_a_SOURCES)
|
|
26439 |
-DIST_SOURCES = $(libDpip_a_SOURCES)
|
|
26440 |
-ETAGS = etags
|
|
26441 |
-CTAGS = ctags
|
|
26442 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
26443 |
ACLOCAL = @ACLOCAL@
|
|
26444 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
26445 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
26446 |
@@ -96,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
26447 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
26448 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
26449 |
GLIB_LIBS = @GLIB_LIBS@
|
|
26450 |
+GMSGFMT = @GMSGFMT@
|
|
26451 |
+GREP = @GREP@
|
|
26452 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
26453 |
GTK_CONFIG = @GTK_CONFIG@
|
|
26454 |
GTK_LIBS = @GTK_LIBS@
|
|
26455 |
@@ -103,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
26456 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
26457 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
26458 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
26459 |
+INTLLIBS = @INTLLIBS@
|
|
26460 |
LDFLAGS = @LDFLAGS@
|
|
26461 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
26462 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
26463 |
+LIBICONV = @LIBICONV@
|
|
26464 |
+LIBINTL = @LIBINTL@
|
|
26465 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
26466 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
26467 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
26468 |
@@ -117,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
26469 |
LIBS = @LIBS@
|
|
26470 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
26471 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
26472 |
+LTLIBICONV = @LTLIBICONV@
|
|
26473 |
+LTLIBINTL = @LTLIBINTL@
|
|
26474 |
LTLIBOBJS = @LTLIBOBJS@
|
|
26475 |
MAKEINFO = @MAKEINFO@
|
|
26476 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
26477 |
+MSGFMT = @MSGFMT@
|
|
26478 |
+MSGMERGE = @MSGMERGE@
|
|
26479 |
OBJEXT = @OBJEXT@
|
|
26480 |
PACKAGE = @PACKAGE@
|
|
26481 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
26482 |
@@ -127,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
26483 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
26484 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
26485 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
26486 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
26487 |
+POSUB = @POSUB@
|
|
26488 |
RANLIB = @RANLIB@
|
|
26489 |
SET_MAKE = @SET_MAKE@
|
|
26490 |
SHELL = @SHELL@
|
|
26491 |
STRIP = @STRIP@
|
|
26492 |
+USE_NLS = @USE_NLS@
|
|
26493 |
VERSION = @VERSION@
|
|
26494 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
26495 |
+XGETTEXT = @XGETTEXT@
|
|
26496 |
ac_ct_CC = @ac_ct_CC@
|
|
26497 |
ac_ct_CXX = @ac_ct_CXX@
|
|
26498 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
26499 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
26500 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
26501 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
26502 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
26503 |
@@ -143,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
26504 |
am__include = @am__include@
|
|
26505 |
am__leading_dot = @am__leading_dot@
|
|
26506 |
am__quote = @am__quote@
|
|
26507 |
-am__tar = @am__tar@
|
|
26508 |
-am__untar = @am__untar@
|
|
26509 |
bindir = @bindir@
|
|
26510 |
build = @build@
|
|
26511 |
build_alias = @build_alias@
|
|
26512 |
@@ -152,23 +134,29 @@ build_cpu = @build_cpu@
|
|
26513 |
build_os = @build_os@
|
|
26514 |
build_vendor = @build_vendor@
|
|
26515 |
datadir = @datadir@
|
|
26516 |
+datarootdir = @datarootdir@
|
|
26517 |
+docdir = @docdir@
|
|
26518 |
+dvidir = @dvidir@
|
|
26519 |
exec_prefix = @exec_prefix@
|
|
26520 |
host = @host@
|
|
26521 |
host_alias = @host_alias@
|
|
26522 |
host_cpu = @host_cpu@
|
|
26523 |
host_os = @host_os@
|
|
26524 |
host_vendor = @host_vendor@
|
|
26525 |
+htmldir = @htmldir@
|
|
26526 |
includedir = @includedir@
|
|
26527 |
infodir = @infodir@
|
|
26528 |
install_sh = @install_sh@
|
|
26529 |
libdir = @libdir@
|
|
26530 |
libexecdir = @libexecdir@
|
|
26531 |
+localedir = @localedir@
|
|
26532 |
localstatedir = @localstatedir@
|
|
26533 |
mandir = @mandir@
|
|
26534 |
-mkdir_p = @mkdir_p@
|
|
26535 |
oldincludedir = @oldincludedir@
|
|
26536 |
+pdfdir = @pdfdir@
|
|
26537 |
prefix = @prefix@
|
|
26538 |
program_transform_name = @program_transform_name@
|
|
26539 |
+psdir = @psdir@
|
|
26540 |
sbindir = @sbindir@
|
|
26541 |
sharedstatedir = @sharedstatedir@
|
|
26542 |
sysconfdir = @sysconfdir@
|
|
26543 |
@@ -179,44 +167,48 @@ target_os = @target_os@
|
|
26544 |
target_vendor = @target_vendor@
|
|
26545 |
AM_CFLAGS = @GLIB_CFLAGS@
|
|
26546 |
AM_LIBS = @GLIB_LIBS@
|
|
26547 |
+
|
|
26548 |
noinst_LIBRARIES = libDpip.a
|
|
26549 |
+
|
|
26550 |
libDpip_a_SOURCES = \
|
|
26551 |
dpip.h \
|
|
26552 |
dpip.c
|
|
26553 |
|
|
26554 |
+subdir = dpip
|
|
26555 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
26556 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
26557 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
26558 |
+CONFIG_CLEAN_FILES =
|
|
26559 |
+LIBRARIES = $(noinst_LIBRARIES)
|
|
26560 |
+
|
|
26561 |
+libDpip_a_AR = $(AR) cru
|
|
26562 |
+libDpip_a_LIBADD =
|
|
26563 |
+am_libDpip_a_OBJECTS = dpip.$(OBJEXT)
|
|
26564 |
+libDpip_a_OBJECTS = $(am_libDpip_a_OBJECTS)
|
|
26565 |
+
|
|
26566 |
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
26567 |
+depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
26568 |
+am__depfiles_maybe = depfiles
|
|
26569 |
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dpip.Po
|
|
26570 |
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
26571 |
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
26572 |
+CCLD = $(CC)
|
|
26573 |
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
26574 |
+DIST_SOURCES = $(libDpip_a_SOURCES)
|
|
26575 |
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
|
|
26576 |
+SOURCES = $(libDpip_a_SOURCES)
|
|
26577 |
+
|
|
26578 |
all: all-am
|
|
26579 |
|
|
26580 |
.SUFFIXES:
|
|
26581 |
.SUFFIXES: .c .o .obj
|
|
26582 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
26583 |
- @for dep in $?; do \
|
|
26584 |
- case '$(am__configure_deps)' in \
|
|
26585 |
- *$$dep*) \
|
|
26586 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
|
26587 |
- && exit 0; \
|
|
26588 |
- exit 1;; \
|
|
26589 |
- esac; \
|
|
26590 |
- done; \
|
|
26591 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpip/Makefile'; \
|
|
26592 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
26593 |
cd $(top_srcdir) && \
|
|
26594 |
$(AUTOMAKE) --gnu dpip/Makefile
|
|
26595 |
-.PRECIOUS: Makefile
|
|
26596 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
26597 |
- @case '$?' in \
|
|
26598 |
- *config.status*) \
|
|
26599 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
|
26600 |
- *) \
|
|
26601 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
|
26602 |
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
|
26603 |
- esac;
|
|
26604 |
-
|
|
26605 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
26606 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
26607 |
-
|
|
26608 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
26609 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
26610 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
26611 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
26612 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
26613 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
26614 |
+
|
|
26615 |
+AR = ar
|
|
26616 |
|
|
26617 |
clean-noinstLIBRARIES:
|
|
26618 |
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
|
|
26619 |
@@ -226,7 +218,7 @@ libDpip.a: $(libDpip_a_OBJECTS) $(libDpi
|
|
26620 |
$(RANLIB) libDpip.a
|
|
26621 |
|
|
26622 |
mostlyclean-compile:
|
|
26623 |
- -rm -f *.$(OBJEXT)
|
|
26624 |
+ -rm -f *.$(OBJEXT) core *.core
|
|
26625 |
|
|
26626 |
distclean-compile:
|
|
26627 |
-rm -f *.tab.c
|
|
26628 |
@@ -234,20 +226,36 @@ distclean-compile:
|
|
26629 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpip.Po@am__quote@
|
|
26630 |
|
|
26631 |
.c.o:
|
|
26632 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
|
26633 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
26634 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
26635 |
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
26636 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
26637 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
26638 |
+@am__fastdepCC_TRUE@ fi
|
|
26639 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
26640 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26641 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
26642 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
26643 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26644 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
|
|
26645 |
|
|
26646 |
.c.obj:
|
|
26647 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
|
26648 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
26649 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
26650 |
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
26651 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
26652 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
26653 |
+@am__fastdepCC_TRUE@ fi
|
|
26654 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
26655 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26656 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
26657 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
26658 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
26659 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
26660 |
uninstall-info-am:
|
|
26661 |
|
|
26662 |
+ETAGS = etags
|
|
26663 |
+ETAGSFLAGS =
|
|
26664 |
+
|
|
26665 |
+CTAGS = ctags
|
|
26666 |
+CTAGSFLAGS =
|
|
26667 |
+
|
|
26668 |
+tags: TAGS
|
|
26669 |
+
|
|
26670 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
26671 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
26672 |
unique=`for i in $$list; do \
|
|
26673 |
@@ -256,7 +264,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
|
|
26674 |
$(AWK) ' { files[$$0] = 1; } \
|
|
26675 |
END { for (i in files) print i; }'`; \
|
|
26676 |
mkid -fID $$unique
|
|
26677 |
-tags: TAGS
|
|
26678 |
|
|
26679 |
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
26680 |
$(TAGS_FILES) $(LISP)
|
|
26681 |
@@ -268,11 +275,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
26682 |
done | \
|
|
26683 |
$(AWK) ' { files[$$0] = 1; } \
|
|
26684 |
END { for (i in files) print i; }'`; \
|
|
26685 |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
26686 |
- test -n "$$unique" || unique=$$empty_fix; \
|
|
26687 |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
26688 |
- $$tags $$unique; \
|
|
26689 |
- fi
|
|
26690 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
26691 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
26692 |
+ $$tags $$unique
|
|
26693 |
+
|
|
26694 |
ctags: CTAGS
|
|
26695 |
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
26696 |
$(TAGS_FILES) $(LISP)
|
|
26697 |
@@ -295,6 +301,10 @@ GTAGS:
|
|
26698 |
|
|
26699 |
distclean-tags:
|
|
26700 |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
26701 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
26702 |
+
|
|
26703 |
+top_distdir = ..
|
|
26704 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
26705 |
|
|
26706 |
distdir: $(DISTFILES)
|
|
26707 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
26708 |
@@ -308,7 +318,7 @@ distdir: $(DISTFILES)
|
|
26709 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
26710 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
26711 |
dir="/$$dir"; \
|
|
26712 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
26713 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
26714 |
else \
|
|
26715 |
dir=''; \
|
|
26716 |
fi; \
|
|
26717 |
@@ -326,6 +336,7 @@ distdir: $(DISTFILES)
|
|
26718 |
check-am: all-am
|
|
26719 |
check: check-am
|
|
26720 |
all-am: Makefile $(LIBRARIES)
|
|
26721 |
+
|
|
26722 |
installdirs:
|
|
26723 |
install: install-am
|
|
26724 |
install-exec: install-exec-am
|
|
26725 |
@@ -346,7 +357,7 @@ mostlyclean-generic:
|
|
26726 |
clean-generic:
|
|
26727 |
|
|
26728 |
distclean-generic:
|
|
26729 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
26730 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
26731 |
|
|
26732 |
maintainer-clean-generic:
|
|
26733 |
@echo "This command is intended for maintainers to use"
|
|
26734 |
@@ -365,8 +376,6 @@ dvi: dvi-am
|
|
26735 |
|
|
26736 |
dvi-am:
|
|
26737 |
|
|
26738 |
-html: html-am
|
|
26739 |
-
|
|
26740 |
info: info-am
|
|
26741 |
|
|
26742 |
info-am:
|
|
26743 |
@@ -402,14 +411,13 @@ uninstall-am: uninstall-info-am
|
|
26744 |
|
|
26745 |
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
|
26746 |
clean-noinstLIBRARIES ctags distclean distclean-compile \
|
|
26747 |
- distclean-generic distclean-tags distdir dvi dvi-am html \
|
|
26748 |
- html-am info info-am install install-am install-data \
|
|
26749 |
- install-data-am install-exec install-exec-am install-info \
|
|
26750 |
- install-info-am install-man install-strip installcheck \
|
|
26751 |
- installcheck-am installdirs maintainer-clean \
|
|
26752 |
- maintainer-clean-generic mostlyclean mostlyclean-compile \
|
|
26753 |
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
|
26754 |
- uninstall-am uninstall-info-am
|
|
26755 |
+ distclean-generic distclean-tags distdir dvi dvi-am info \
|
|
26756 |
+ info-am install install-am install-data install-data-am \
|
|
26757 |
+ install-exec install-exec-am install-info install-info-am \
|
|
26758 |
+ install-man install-strip installcheck installcheck-am \
|
|
26759 |
+ installdirs maintainer-clean maintainer-clean-generic \
|
|
26760 |
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
|
|
26761 |
+ ps ps-am tags uninstall uninstall-am uninstall-info-am
|
|
26762 |
|
|
26763 |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
26764 |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
26765 |
diff -pruN dillo-0.8.6/install-sh dillo-0.8.6-i18n-misc-20070916/install-sh
|
|
26766 |
--- dillo-0.8.6/install-sh 2005-03-22 16:17:05.000000000 +0900
|
|
26767 |
+++ dillo-0.8.6-i18n-misc-20070916/install-sh 2006-05-16 01:21:07.000000000 +0900
|
|
26768 |
@@ -1,7 +1,7 @@
|
|
26769 |
#!/bin/sh
|
|
26770 |
# install - install a program, script, or datafile
|
|
26771 |
|
|
26772 |
-scriptversion=2005-02-02.21
|
|
26773 |
+scriptversion=2004-04-01.17
|
|
26774 |
|
|
26775 |
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
|
26776 |
# later released in X11R6 (xc/config/util/install.sh) with the
|
|
26777 |
@@ -58,6 +58,9 @@ stripprog="${STRIPPROG-strip}"
|
|
26778 |
rmprog="${RMPROG-rm}"
|
|
26779 |
mkdirprog="${MKDIRPROG-mkdir}"
|
|
26780 |
|
|
26781 |
+transformbasename=
|
|
26782 |
+transform_arg=
|
|
26783 |
+instcmd="$mvprog"
|
|
26784 |
chmodcmd="$chmodprog 0755"
|
|
26785 |
chowncmd=
|
|
26786 |
chgrpcmd=
|
|
26787 |
@@ -67,27 +70,23 @@ mvcmd="$mvprog"
|
|
26788 |
src=
|
|
26789 |
dst=
|
|
26790 |
dir_arg=
|
|
26791 |
-dstarg=
|
|
26792 |
-no_target_directory=
|
|
26793 |
|
|
26794 |
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
|
26795 |
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
|
|
26796 |
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
|
26797 |
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
|
26798 |
- or: $0 [OPTION]... -d DIRECTORIES...
|
|
26799 |
+ or: $0 -d DIRECTORIES...
|
|
26800 |
|
|
26801 |
-In the 1st form, copy SRCFILE to DSTFILE.
|
|
26802 |
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
|
26803 |
-In the 4th, create DIRECTORIES.
|
|
26804 |
+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
|
|
26805 |
+In the second, create the directory path DIR.
|
|
26806 |
|
|
26807 |
Options:
|
|
26808 |
--c (ignored)
|
|
26809 |
+-b=TRANSFORMBASENAME
|
|
26810 |
+-c copy source (using $cpprog) instead of moving (using $mvprog).
|
|
26811 |
-d create directories instead of installing files.
|
|
26812 |
--g GROUP $chgrpprog installed files to GROUP.
|
|
26813 |
--m MODE $chmodprog installed files to MODE.
|
|
26814 |
--o USER $chownprog installed files to USER.
|
|
26815 |
--s $stripprog installed files.
|
|
26816 |
--t DIRECTORY install into DIRECTORY.
|
|
26817 |
--T report an error if DSTFILE is a directory.
|
|
26818 |
+-g GROUP $chgrp installed files to GROUP.
|
|
26819 |
+-m MODE $chmod installed files to MODE.
|
|
26820 |
+-o USER $chown installed files to USER.
|
|
26821 |
+-s strip installed files (using $stripprog).
|
|
26822 |
+-t=TRANSFORM
|
|
26823 |
--help display this help and exit.
|
|
26824 |
--version display version info and exit.
|
|
26825 |
|
|
26826 |
@@ -97,7 +96,12 @@ Environment variables override the defau
|
|
26827 |
|
|
26828 |
while test -n "$1"; do
|
|
26829 |
case $1 in
|
|
26830 |
- -c) shift
|
|
26831 |
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
|
|
26832 |
+ shift
|
|
26833 |
+ continue;;
|
|
26834 |
+
|
|
26835 |
+ -c) instcmd=$cpprog
|
|
26836 |
+ shift
|
|
26837 |
continue;;
|
|
26838 |
|
|
26839 |
-d) dir_arg=true
|
|
26840 |
@@ -109,7 +113,7 @@ while test -n "$1"; do
|
|
26841 |
shift
|
|
26842 |
continue;;
|
|
26843 |
|
|
26844 |
- --help) echo "$usage"; exit $?;;
|
|
26845 |
+ --help) echo "$usage"; exit 0;;
|
|
26846 |
|
|
26847 |
-m) chmodcmd="$chmodprog $2"
|
|
26848 |
shift
|
|
26849 |
@@ -125,20 +129,14 @@ while test -n "$1"; do
|
|
26850 |
shift
|
|
26851 |
continue;;
|
|
26852 |
|
|
26853 |
- -t) dstarg=$2
|
|
26854 |
- shift
|
|
26855 |
- shift
|
|
26856 |
- continue;;
|
|
26857 |
-
|
|
26858 |
- -T) no_target_directory=true
|
|
26859 |
- shift
|
|
26860 |
- continue;;
|
|
26861 |
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
|
|
26862 |
+ shift
|
|
26863 |
+ continue;;
|
|
26864 |
|
|
26865 |
- --version) echo "$0 $scriptversion"; exit $?;;
|
|
26866 |
+ --version) echo "$0 $scriptversion"; exit 0;;
|
|
26867 |
|
|
26868 |
*) # When -d is used, all remaining arguments are directories to create.
|
|
26869 |
- # When -t is used, the destination is already specified.
|
|
26870 |
- test -n "$dir_arg$dstarg" && break
|
|
26871 |
+ test -n "$dir_arg" && break
|
|
26872 |
# Otherwise, the last argument is the destination. Remove it from $@.
|
|
26873 |
for arg
|
|
26874 |
do
|
|
26875 |
@@ -176,13 +174,13 @@ do
|
|
26876 |
src=
|
|
26877 |
|
|
26878 |
if test -d "$dst"; then
|
|
26879 |
- mkdircmd=:
|
|
26880 |
+ instcmd=:
|
|
26881 |
chmodcmd=
|
|
26882 |
else
|
|
26883 |
- mkdircmd=$mkdirprog
|
|
26884 |
+ instcmd=$mkdirprog
|
|
26885 |
fi
|
|
26886 |
else
|
|
26887 |
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
|
26888 |
+ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
|
|
26889 |
# might cause directories to be created, which would be especially bad
|
|
26890 |
# if $src (and thus $dsttmp) contains '*'.
|
|
26891 |
if test ! -f "$src" && test ! -d "$src"; then
|
|
26892 |
@@ -204,16 +202,12 @@ do
|
|
26893 |
# If destination is a directory, append the input filename; won't work
|
|
26894 |
# if double slashes aren't ignored.
|
|
26895 |
if test -d "$dst"; then
|
|
26896 |
- if test -n "$no_target_directory"; then
|
|
26897 |
- echo "$0: $dstarg: Is a directory" >&2
|
|
26898 |
- exit 1
|
|
26899 |
- fi
|
|
26900 |
dst=$dst/`basename "$src"`
|
|
26901 |
fi
|
|
26902 |
fi
|
|
26903 |
|
|
26904 |
# This sed command emulates the dirname command.
|
|
26905 |
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
|
|
26906 |
+ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
|
26907 |
|
|
26908 |
# Make sure that the destination directory exists.
|
|
26909 |
|
|
26910 |
@@ -226,8 +220,7 @@ do
|
|
26911 |
oIFS=$IFS
|
|
26912 |
# Some sh's can't handle IFS=/ for some reason.
|
|
26913 |
IFS='%'
|
|
26914 |
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
|
|
26915 |
- shift
|
|
26916 |
+ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
|
|
26917 |
IFS=$oIFS
|
|
26918 |
|
|
26919 |
pathcomp=
|
|
26920 |
@@ -236,42 +229,51 @@ do
|
|
26921 |
pathcomp=$pathcomp$1
|
|
26922 |
shift
|
|
26923 |
if test ! -d "$pathcomp"; then
|
|
26924 |
- $mkdirprog "$pathcomp"
|
|
26925 |
+ $mkdirprog "$pathcomp" || lasterr=$?
|
|
26926 |
# mkdir can fail with a `File exist' error in case several
|
|
26927 |
# install-sh are creating the directory concurrently. This
|
|
26928 |
# is OK.
|
|
26929 |
- test -d "$pathcomp" || exit
|
|
26930 |
+ test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
|
|
26931 |
fi
|
|
26932 |
pathcomp=$pathcomp/
|
|
26933 |
done
|
|
26934 |
fi
|
|
26935 |
|
|
26936 |
if test -n "$dir_arg"; then
|
|
26937 |
- $doit $mkdircmd "$dst" \
|
|
26938 |
+ $doit $instcmd "$dst" \
|
|
26939 |
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
|
|
26940 |
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
|
|
26941 |
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
|
|
26942 |
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
|
|
26943 |
|
|
26944 |
else
|
|
26945 |
- dstfile=`basename "$dst"`
|
|
26946 |
+ # If we're going to rename the final executable, determine the name now.
|
|
26947 |
+ if test -z "$transformarg"; then
|
|
26948 |
+ dstfile=`basename "$dst"`
|
|
26949 |
+ else
|
|
26950 |
+ dstfile=`basename "$dst" $transformbasename \
|
|
26951 |
+ | sed $transformarg`$transformbasename
|
|
26952 |
+ fi
|
|
26953 |
+
|
|
26954 |
+ # don't allow the sed command to completely eliminate the filename.
|
|
26955 |
+ test -z "$dstfile" && dstfile=`basename "$dst"`
|
|
26956 |
|
|
26957 |
# Make a couple of temp file names in the proper directory.
|
|
26958 |
dsttmp=$dstdir/_inst.$$_
|
|
26959 |
rmtmp=$dstdir/_rm.$$_
|
|
26960 |
|
|
26961 |
# Trap to clean up those temp files at exit.
|
|
26962 |
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
|
26963 |
+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
|
|
26964 |
trap '(exit $?); exit' 1 2 13 15
|
|
26965 |
|
|
26966 |
- # Copy the file name to the temp name.
|
|
26967 |
- $doit $cpprog "$src" "$dsttmp" &&
|
|
26968 |
+ # Move or copy the file name to the temp name
|
|
26969 |
+ $doit $instcmd "$src" "$dsttmp" &&
|
|
26970 |
|
|
26971 |
# and set any options; do chmod last to preserve setuid bits.
|
|
26972 |
#
|
|
26973 |
# If any of these fail, we abort the whole thing. If we want to
|
|
26974 |
# ignore errors from any of these, just make sure not to ignore
|
|
26975 |
- # errors from the above "$doit $cpprog $src $dsttmp" command.
|
|
26976 |
+ # errors from the above "$doit $instcmd $src $dsttmp" command.
|
|
26977 |
#
|
|
26978 |
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
|
|
26979 |
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
|
|
26980 |
@@ -296,7 +298,7 @@ do
|
|
26981 |
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|
|
26982 |
|| {
|
|
26983 |
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
|
|
26984 |
- (exit 1); exit 1
|
|
26985 |
+ (exit 1); exit
|
|
26986 |
}
|
|
26987 |
else
|
|
26988 |
:
|
|
26989 |
@@ -307,12 +309,12 @@ do
|
|
26990 |
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
|
|
26991 |
}
|
|
26992 |
}
|
|
26993 |
- fi || { (exit 1); exit 1; }
|
|
26994 |
+ fi || { (exit 1); exit; }
|
|
26995 |
done
|
|
26996 |
|
|
26997 |
# The final little trick to "correctly" pass the exit status to the exit trap.
|
|
26998 |
{
|
|
26999 |
- (exit 0); exit 0
|
|
27000 |
+ (exit 0); exit
|
|
27001 |
}
|
|
27002 |
|
|
27003 |
# Local variables:
|
|
27004 |
diff -pruN dillo-0.8.6/m4/ChangeLog dillo-0.8.6-i18n-misc-20070916/m4/ChangeLog
|
|
27005 |
--- dillo-0.8.6/m4/ChangeLog 1970-01-01 09:00:00.000000000 +0900
|
|
27006 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/ChangeLog 2006-05-16 01:21:07.000000000 +0900
|
|
27007 |
@@ -0,0 +1,31 @@
|
|
27008 |
+2004-11-23 gettextize <bug-gnu-gettext@gnu.org>
|
|
27009 |
+
|
|
27010 |
+ * gettext.m4: Upgrade to gettext-0.11.4.
|
|
27011 |
+ * inttypes_h.m4: Upgrade to gettext-0.11.4.
|
|
27012 |
+ * lib-ld.m4: Upgrade to gettext-0.11.4.
|
|
27013 |
+ * lib-link.m4: Upgrade to gettext-0.11.4.
|
|
27014 |
+ * lib-prefix.m4: Upgrade to gettext-0.11.4.
|
|
27015 |
+ * progtest.m4: Upgrade to gettext-0.11.4.
|
|
27016 |
+ * stdint_h.m4: Upgrade to gettext-0.11.4.
|
|
27017 |
+ * uintmax_t.m4: Upgrade to gettext-0.11.4.
|
|
27018 |
+
|
|
27019 |
+2003-10-01 gettextize <bug-gnu-gettext@gnu.org>
|
|
27020 |
+
|
|
27021 |
+ * codeset.m4: New file, from gettext-0.11.4.
|
|
27022 |
+ * gettext.m4: New file, from gettext-0.11.4.
|
|
27023 |
+ * glibc21.m4: New file, from gettext-0.11.4.
|
|
27024 |
+ * iconv.m4: New file, from gettext-0.11.4.
|
|
27025 |
+ * intdiv0.m4: New file, from gettext-0.11.4.
|
|
27026 |
+ * inttypes.m4: New file, from gettext-0.11.4.
|
|
27027 |
+ * inttypes_h.m4: New file, from gettext-0.11.4.
|
|
27028 |
+ * inttypes-pri.m4: New file, from gettext-0.11.4.
|
|
27029 |
+ * isc-posix.m4: New file, from gettext-0.11.4.
|
|
27030 |
+ * lcmessage.m4: New file, from gettext-0.11.4.
|
|
27031 |
+ * lib-ld.m4: New file, from gettext-0.11.4.
|
|
27032 |
+ * lib-link.m4: New file, from gettext-0.11.4.
|
|
27033 |
+ * lib-prefix.m4: New file, from gettext-0.11.4.
|
|
27034 |
+ * progtest.m4: New file, from gettext-0.11.4.
|
|
27035 |
+ * stdint_h.m4: New file, from gettext-0.11.4.
|
|
27036 |
+ * uintmax_t.m4: New file, from gettext-0.11.4.
|
|
27037 |
+ * Makefile.am: New file.
|
|
27038 |
+
|
|
27039 |
diff -pruN dillo-0.8.6/m4/Makefile.am dillo-0.8.6-i18n-misc-20070916/m4/Makefile.am
|
|
27040 |
--- dillo-0.8.6/m4/Makefile.am 1970-01-01 09:00:00.000000000 +0900
|
|
27041 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/Makefile.am 2006-05-16 01:21:07.000000000 +0900
|
|
27042 |
@@ -0,0 +1 @@
|
|
27043 |
+EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4
|
|
27044 |
diff -pruN dillo-0.8.6/m4/Makefile.in dillo-0.8.6-i18n-misc-20070916/m4/Makefile.in
|
|
27045 |
--- dillo-0.8.6/m4/Makefile.in 1970-01-01 09:00:00.000000000 +0900
|
|
27046 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/Makefile.in 2007-09-07 01:02:02.000000000 +0900
|
|
27047 |
@@ -0,0 +1,307 @@
|
|
27048 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
27049 |
+# @configure_input@
|
|
27050 |
+
|
|
27051 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
27052 |
+# Free Software Foundation, Inc.
|
|
27053 |
+# This Makefile.in is free software; the Free Software Foundation
|
|
27054 |
+# gives unlimited permission to copy and/or distribute it,
|
|
27055 |
+# with or without modifications, as long as this notice is preserved.
|
|
27056 |
+
|
|
27057 |
+# This program is distributed in the hope that it will be useful,
|
|
27058 |
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|
27059 |
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
27060 |
+# PARTICULAR PURPOSE.
|
|
27061 |
+
|
|
27062 |
+@SET_MAKE@
|
|
27063 |
+
|
|
27064 |
+srcdir = @srcdir@
|
|
27065 |
+top_srcdir = @top_srcdir@
|
|
27066 |
+VPATH = @srcdir@
|
|
27067 |
+pkgdatadir = $(datadir)/@PACKAGE@
|
|
27068 |
+pkglibdir = $(libdir)/@PACKAGE@
|
|
27069 |
+pkgincludedir = $(includedir)/@PACKAGE@
|
|
27070 |
+top_builddir = ..
|
|
27071 |
+
|
|
27072 |
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
27073 |
+INSTALL = @INSTALL@
|
|
27074 |
+install_sh_DATA = $(install_sh) -c -m 644
|
|
27075 |
+install_sh_PROGRAM = $(install_sh) -c
|
|
27076 |
+install_sh_SCRIPT = $(install_sh) -c
|
|
27077 |
+INSTALL_HEADER = $(INSTALL_DATA)
|
|
27078 |
+transform = $(program_transform_name)
|
|
27079 |
+NORMAL_INSTALL = :
|
|
27080 |
+PRE_INSTALL = :
|
|
27081 |
+POST_INSTALL = :
|
|
27082 |
+NORMAL_UNINSTALL = :
|
|
27083 |
+PRE_UNINSTALL = :
|
|
27084 |
+POST_UNINSTALL = :
|
|
27085 |
+build_triplet = @build@
|
|
27086 |
+host_triplet = @host@
|
|
27087 |
+target_triplet = @target@
|
|
27088 |
+ACLOCAL = @ACLOCAL@
|
|
27089 |
+AMDEP_FALSE = @AMDEP_FALSE@
|
|
27090 |
+AMDEP_TRUE = @AMDEP_TRUE@
|
|
27091 |
+AMTAR = @AMTAR@
|
|
27092 |
+AUTOCONF = @AUTOCONF@
|
|
27093 |
+AUTOHEADER = @AUTOHEADER@
|
|
27094 |
+AUTOMAKE = @AUTOMAKE@
|
|
27095 |
+AWK = @AWK@
|
|
27096 |
+CC = @CC@
|
|
27097 |
+CCDEPMODE = @CCDEPMODE@
|
|
27098 |
+CFLAGS = @CFLAGS@
|
|
27099 |
+CPP = @CPP@
|
|
27100 |
+CPPFLAGS = @CPPFLAGS@
|
|
27101 |
+CXX = @CXX@
|
|
27102 |
+CXXDEPMODE = @CXXDEPMODE@
|
|
27103 |
+CXXFLAGS = @CXXFLAGS@
|
|
27104 |
+CYGPATH_W = @CYGPATH_W@
|
|
27105 |
+DEFS = @DEFS@
|
|
27106 |
+DEPDIR = @DEPDIR@
|
|
27107 |
+DLGUI_FALSE = @DLGUI_FALSE@
|
|
27108 |
+DLGUI_TRUE = @DLGUI_TRUE@
|
|
27109 |
+ECHO_C = @ECHO_C@
|
|
27110 |
+ECHO_N = @ECHO_N@
|
|
27111 |
+ECHO_T = @ECHO_T@
|
|
27112 |
+EGREP = @EGREP@
|
|
27113 |
+EXEEXT = @EXEEXT@
|
|
27114 |
+GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
27115 |
+GLIB_CONFIG = @GLIB_CONFIG@
|
|
27116 |
+GLIB_LIBS = @GLIB_LIBS@
|
|
27117 |
+GMSGFMT = @GMSGFMT@
|
|
27118 |
+GREP = @GREP@
|
|
27119 |
+GTK_CFLAGS = @GTK_CFLAGS@
|
|
27120 |
+GTK_CONFIG = @GTK_CONFIG@
|
|
27121 |
+GTK_LIBS = @GTK_LIBS@
|
|
27122 |
+INSTALL_DATA = @INSTALL_DATA@
|
|
27123 |
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
27124 |
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
27125 |
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
27126 |
+INTLLIBS = @INTLLIBS@
|
|
27127 |
+LDFLAGS = @LDFLAGS@
|
|
27128 |
+LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
27129 |
+LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
27130 |
+LIBICONV = @LIBICONV@
|
|
27131 |
+LIBINTL = @LIBINTL@
|
|
27132 |
+LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
27133 |
+LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
27134 |
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
27135 |
+LIBOBJS = @LIBOBJS@
|
|
27136 |
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
|
|
27137 |
+LIBPNG_LIBS = @LIBPNG_LIBS@
|
|
27138 |
+LIBPTHREAD_LDFLAGS = @LIBPTHREAD_LDFLAGS@
|
|
27139 |
+LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
27140 |
+LIBS = @LIBS@
|
|
27141 |
+LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
27142 |
+LIBZ_LIBS = @LIBZ_LIBS@
|
|
27143 |
+LTLIBICONV = @LTLIBICONV@
|
|
27144 |
+LTLIBINTL = @LTLIBINTL@
|
|
27145 |
+LTLIBOBJS = @LTLIBOBJS@
|
|
27146 |
+MAKEINFO = @MAKEINFO@
|
|
27147 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
27148 |
+MSGFMT = @MSGFMT@
|
|
27149 |
+MSGMERGE = @MSGMERGE@
|
|
27150 |
+OBJEXT = @OBJEXT@
|
|
27151 |
+PACKAGE = @PACKAGE@
|
|
27152 |
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
27153 |
+PACKAGE_NAME = @PACKAGE_NAME@
|
|
27154 |
+PACKAGE_STRING = @PACKAGE_STRING@
|
|
27155 |
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
27156 |
+PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
27157 |
+PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
27158 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
27159 |
+POSUB = @POSUB@
|
|
27160 |
+RANLIB = @RANLIB@
|
|
27161 |
+SET_MAKE = @SET_MAKE@
|
|
27162 |
+SHELL = @SHELL@
|
|
27163 |
+STRIP = @STRIP@
|
|
27164 |
+USE_NLS = @USE_NLS@
|
|
27165 |
+VERSION = @VERSION@
|
|
27166 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
27167 |
+XGETTEXT = @XGETTEXT@
|
|
27168 |
+ac_ct_CC = @ac_ct_CC@
|
|
27169 |
+ac_ct_CXX = @ac_ct_CXX@
|
|
27170 |
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
27171 |
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
27172 |
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
27173 |
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
|
27174 |
+am__include = @am__include@
|
|
27175 |
+am__leading_dot = @am__leading_dot@
|
|
27176 |
+am__quote = @am__quote@
|
|
27177 |
+bindir = @bindir@
|
|
27178 |
+build = @build@
|
|
27179 |
+build_alias = @build_alias@
|
|
27180 |
+build_cpu = @build_cpu@
|
|
27181 |
+build_os = @build_os@
|
|
27182 |
+build_vendor = @build_vendor@
|
|
27183 |
+datadir = @datadir@
|
|
27184 |
+datarootdir = @datarootdir@
|
|
27185 |
+docdir = @docdir@
|
|
27186 |
+dvidir = @dvidir@
|
|
27187 |
+exec_prefix = @exec_prefix@
|
|
27188 |
+host = @host@
|
|
27189 |
+host_alias = @host_alias@
|
|
27190 |
+host_cpu = @host_cpu@
|
|
27191 |
+host_os = @host_os@
|
|
27192 |
+host_vendor = @host_vendor@
|
|
27193 |
+htmldir = @htmldir@
|
|
27194 |
+includedir = @includedir@
|
|
27195 |
+infodir = @infodir@
|
|
27196 |
+install_sh = @install_sh@
|
|
27197 |
+libdir = @libdir@
|
|
27198 |
+libexecdir = @libexecdir@
|
|
27199 |
+localedir = @localedir@
|
|
27200 |
+localstatedir = @localstatedir@
|
|
27201 |
+mandir = @mandir@
|
|
27202 |
+oldincludedir = @oldincludedir@
|
|
27203 |
+pdfdir = @pdfdir@
|
|
27204 |
+prefix = @prefix@
|
|
27205 |
+program_transform_name = @program_transform_name@
|
|
27206 |
+psdir = @psdir@
|
|
27207 |
+sbindir = @sbindir@
|
|
27208 |
+sharedstatedir = @sharedstatedir@
|
|
27209 |
+sysconfdir = @sysconfdir@
|
|
27210 |
+target = @target@
|
|
27211 |
+target_alias = @target_alias@
|
|
27212 |
+target_cpu = @target_cpu@
|
|
27213 |
+target_os = @target_os@
|
|
27214 |
+target_vendor = @target_vendor@
|
|
27215 |
+EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4
|
|
27216 |
+subdir = m4
|
|
27217 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
27218 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
27219 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
27220 |
+CONFIG_CLEAN_FILES =
|
|
27221 |
+DIST_SOURCES =
|
|
27222 |
+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
|
|
27223 |
+all: all-am
|
|
27224 |
+
|
|
27225 |
+.SUFFIXES:
|
|
27226 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
27227 |
+ cd $(top_srcdir) && \
|
|
27228 |
+ $(AUTOMAKE) --gnu m4/Makefile
|
|
27229 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
27230 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
27231 |
+uninstall-info-am:
|
|
27232 |
+tags: TAGS
|
|
27233 |
+TAGS:
|
|
27234 |
+
|
|
27235 |
+ctags: CTAGS
|
|
27236 |
+CTAGS:
|
|
27237 |
+
|
|
27238 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
27239 |
+
|
|
27240 |
+top_distdir = ..
|
|
27241 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
27242 |
+
|
|
27243 |
+distdir: $(DISTFILES)
|
|
27244 |
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
27245 |
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
|
27246 |
+ list='$(DISTFILES)'; for file in $$list; do \
|
|
27247 |
+ case $$file in \
|
|
27248 |
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
|
27249 |
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
|
27250 |
+ esac; \
|
|
27251 |
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
|
27252 |
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
27253 |
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
27254 |
+ dir="/$$dir"; \
|
|
27255 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
27256 |
+ else \
|
|
27257 |
+ dir=''; \
|
|
27258 |
+ fi; \
|
|
27259 |
+ if test -d $$d/$$file; then \
|
|
27260 |
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
|
27261 |
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
|
27262 |
+ fi; \
|
|
27263 |
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
|
27264 |
+ else \
|
|
27265 |
+ test -f $(distdir)/$$file \
|
|
27266 |
+ || cp -p $$d/$$file $(distdir)/$$file \
|
|
27267 |
+ || exit 1; \
|
|
27268 |
+ fi; \
|
|
27269 |
+ done
|
|
27270 |
+check-am: all-am
|
|
27271 |
+check: check-am
|
|
27272 |
+all-am: Makefile
|
|
27273 |
+
|
|
27274 |
+installdirs:
|
|
27275 |
+install: install-am
|
|
27276 |
+install-exec: install-exec-am
|
|
27277 |
+install-data: install-data-am
|
|
27278 |
+uninstall: uninstall-am
|
|
27279 |
+
|
|
27280 |
+install-am: all-am
|
|
27281 |
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
|
27282 |
+
|
|
27283 |
+installcheck: installcheck-am
|
|
27284 |
+install-strip:
|
|
27285 |
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
|
27286 |
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
|
27287 |
+ `test -z '$(STRIP)' || \
|
|
27288 |
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
|
27289 |
+mostlyclean-generic:
|
|
27290 |
+
|
|
27291 |
+clean-generic:
|
|
27292 |
+
|
|
27293 |
+distclean-generic:
|
|
27294 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
27295 |
+
|
|
27296 |
+maintainer-clean-generic:
|
|
27297 |
+ @echo "This command is intended for maintainers to use"
|
|
27298 |
+ @echo "it deletes files that may require special tools to rebuild."
|
|
27299 |
+clean: clean-am
|
|
27300 |
+
|
|
27301 |
+clean-am: clean-generic mostlyclean-am
|
|
27302 |
+
|
|
27303 |
+distclean: distclean-am
|
|
27304 |
+ -rm -f Makefile
|
|
27305 |
+distclean-am: clean-am distclean-generic
|
|
27306 |
+
|
|
27307 |
+dvi: dvi-am
|
|
27308 |
+
|
|
27309 |
+dvi-am:
|
|
27310 |
+
|
|
27311 |
+info: info-am
|
|
27312 |
+
|
|
27313 |
+info-am:
|
|
27314 |
+
|
|
27315 |
+install-data-am:
|
|
27316 |
+
|
|
27317 |
+install-exec-am:
|
|
27318 |
+
|
|
27319 |
+install-info: install-info-am
|
|
27320 |
+
|
|
27321 |
+install-man:
|
|
27322 |
+
|
|
27323 |
+installcheck-am:
|
|
27324 |
+
|
|
27325 |
+maintainer-clean: maintainer-clean-am
|
|
27326 |
+ -rm -f Makefile
|
|
27327 |
+maintainer-clean-am: distclean-am maintainer-clean-generic
|
|
27328 |
+
|
|
27329 |
+mostlyclean: mostlyclean-am
|
|
27330 |
+
|
|
27331 |
+mostlyclean-am: mostlyclean-generic
|
|
27332 |
+
|
|
27333 |
+pdf: pdf-am
|
|
27334 |
+
|
|
27335 |
+pdf-am:
|
|
27336 |
+
|
|
27337 |
+ps: ps-am
|
|
27338 |
+
|
|
27339 |
+ps-am:
|
|
27340 |
+
|
|
27341 |
+uninstall-am: uninstall-info-am
|
|
27342 |
+
|
|
27343 |
+.PHONY: all all-am check check-am clean clean-generic distclean \
|
|
27344 |
+ distclean-generic distdir dvi dvi-am info info-am install \
|
|
27345 |
+ install-am install-data install-data-am install-exec \
|
|
27346 |
+ install-exec-am install-info install-info-am install-man \
|
|
27347 |
+ install-strip installcheck installcheck-am installdirs \
|
|
27348 |
+ maintainer-clean maintainer-clean-generic mostlyclean \
|
|
27349 |
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
|
|
27350 |
+ uninstall-info-am
|
|
27351 |
+
|
|
27352 |
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
27353 |
+# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
27354 |
+.NOEXPORT:
|
|
27355 |
diff -pruN dillo-0.8.6/m4/codeset.m4 dillo-0.8.6-i18n-misc-20070916/m4/codeset.m4
|
|
27356 |
--- dillo-0.8.6/m4/codeset.m4 1970-01-01 09:00:00.000000000 +0900
|
|
27357 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/codeset.m4 2006-05-16 01:21:07.000000000 +0900
|
|
27358 |
@@ -0,0 +1,23 @@
|
|
27359 |
+# codeset.m4 serial AM1 (gettext-0.10.40)
|
|
27360 |
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
27361 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
27362 |
+dnl General Public License. As a special exception to the GNU General
|
|
27363 |
+dnl Public License, this file may be distributed as part of a program
|
|
27364 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
27365 |
+dnl the same distribution terms as the rest of that program.
|
|
27366 |
+
|
|
27367 |
+dnl From Bruno Haible.
|
|
27368 |
+
|
|
27369 |
+AC_DEFUN([AM_LANGINFO_CODESET],
|
|
27370 |
+[
|
|
27371 |
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
|
|
27372 |
+ [AC_TRY_LINK([#include <langinfo.h>],
|
|
27373 |
+ [char* cs = nl_langinfo(CODESET);],
|
|
27374 |
+ am_cv_langinfo_codeset=yes,
|
|
27375 |
+ am_cv_langinfo_codeset=no)
|
|
27376 |
+ ])
|
|
27377 |
+ if test $am_cv_langinfo_codeset = yes; then
|
|
27378 |
+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
|
27379 |
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
|
27380 |
+ fi
|
|
27381 |
+])
|
|
27382 |
diff -pruN dillo-0.8.6/m4/gettext.m4 dillo-0.8.6-i18n-misc-20070916/m4/gettext.m4
|
|
27383 |
--- dillo-0.8.6/m4/gettext.m4 1970-01-01 09:00:00.000000000 +0900
|
|
27384 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/gettext.m4 2006-05-16 01:21:07.000000000 +0900
|
|
27385 |
@@ -0,0 +1,587 @@
|
|
27386 |
+# gettext.m4 serial 16 (gettext-0.11.4)
|
|
27387 |
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
27388 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
27389 |
+dnl General Public License. As a special exception to the GNU General
|
|
27390 |
+dnl Public License, this file may be distributed as part of a program
|
|
27391 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
27392 |
+dnl the same distribution terms as the rest of that program.
|
|
27393 |
+dnl
|
|
27394 |
+dnl This file can can be used in projects which are not available under
|
|
27395 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
27396 |
+dnl License but which still want to provide support for the GNU gettext
|
|
27397 |
+dnl functionality.
|
|
27398 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
27399 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
27400 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
27401 |
+dnl They are *not* in the public domain.
|
|
27402 |
+
|
|
27403 |
+dnl Authors:
|
|
27404 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
27405 |
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
|
|
27406 |
+
|
|
27407 |
+dnl Macro to add for using GNU gettext.
|
|
27408 |
+
|
|
27409 |
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
|
|
27410 |
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
|
|
27411 |
+dnl default (if it is not specified or empty) is 'no-libtool'.
|
|
27412 |
+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
|
|
27413 |
+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
|
|
27414 |
+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
|
|
27415 |
+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
|
|
27416 |
+dnl depending on --{enable,disable}-{shared,static} and on the presence of
|
|
27417 |
+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
|
|
27418 |
+dnl $(top_builddir)/intl/libintl.a will be created.
|
|
27419 |
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
|
|
27420 |
+dnl implementations (in libc or libintl) without the ngettext() function
|
|
27421 |
+dnl will be ignored. If NEEDSYMBOL is specified and is
|
|
27422 |
+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
|
|
27423 |
+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
|
|
27424 |
+dnl INTLDIR is used to find the intl libraries. If empty,
|
|
27425 |
+dnl the value `$(top_builddir)/intl/' is used.
|
|
27426 |
+dnl
|
|
27427 |
+dnl The result of the configuration is one of three cases:
|
|
27428 |
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
|
|
27429 |
+dnl and used.
|
|
27430 |
+dnl Catalog format: GNU --> install in $(datadir)
|
|
27431 |
+dnl Catalog extension: .mo after installation, .gmo in source tree
|
|
27432 |
+dnl 2) GNU gettext has been found in the system's C library.
|
|
27433 |
+dnl Catalog format: GNU --> install in $(datadir)
|
|
27434 |
+dnl Catalog extension: .mo after installation, .gmo in source tree
|
|
27435 |
+dnl 3) No internationalization, always use English msgid.
|
|
27436 |
+dnl Catalog format: none
|
|
27437 |
+dnl Catalog extension: none
|
|
27438 |
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
|
|
27439 |
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
|
|
27440 |
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
|
|
27441 |
+dnl but we keep it in order not to force irrelevant filename changes on the
|
|
27442 |
+dnl maintainers.
|
|
27443 |
+dnl
|
|
27444 |
+AC_DEFUN([AM_GNU_GETTEXT],
|
|
27445 |
+[
|
|
27446 |
+ dnl Argument checking.
|
|
27447 |
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
|
|
27448 |
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
|
|
27449 |
+])])])])])
|
|
27450 |
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
|
|
27451 |
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
|
|
27452 |
+])])])])
|
|
27453 |
+ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
|
|
27454 |
+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
|
|
27455 |
+
|
|
27456 |
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
|
|
27457 |
+ ifelse(gt_included_intl, yes, [
|
|
27458 |
+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
|
|
27459 |
+ ])
|
|
27460 |
+
|
|
27461 |
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
|
27462 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
27463 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
27464 |
+
|
|
27465 |
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
|
|
27466 |
+ dnl Ideally we would do this search only after the
|
|
27467 |
+ dnl if test "$USE_NLS" = "yes"; then
|
|
27468 |
+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
|
|
27469 |
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
|
|
27470 |
+ dnl the configure script would need to contain the same shell code
|
|
27471 |
+ dnl again, outside any 'if'. There are two solutions:
|
|
27472 |
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
|
|
27473 |
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
|
|
27474 |
+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
|
|
27475 |
+ dnl documented, we avoid it.
|
|
27476 |
+ ifelse(gt_included_intl, yes, , [
|
|
27477 |
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
27478 |
+ ])
|
|
27479 |
+
|
|
27480 |
+ AC_MSG_CHECKING([whether NLS is requested])
|
|
27481 |
+ dnl Default is enabled NLS
|
|
27482 |
+ AC_ARG_ENABLE(nls,
|
|
27483 |
+ [ --disable-nls do not use Native Language Support],
|
|
27484 |
+ USE_NLS=$enableval, USE_NLS=yes)
|
|
27485 |
+ AC_MSG_RESULT($USE_NLS)
|
|
27486 |
+ AC_SUBST(USE_NLS)
|
|
27487 |
+
|
|
27488 |
+ ifelse(gt_included_intl, yes, [
|
|
27489 |
+ BUILD_INCLUDED_LIBINTL=no
|
|
27490 |
+ USE_INCLUDED_LIBINTL=no
|
|
27491 |
+ ])
|
|
27492 |
+ LIBINTL=
|
|
27493 |
+ LTLIBINTL=
|
|
27494 |
+ POSUB=
|
|
27495 |
+
|
|
27496 |
+ dnl If we use NLS figure out what method
|
|
27497 |
+ if test "$USE_NLS" = "yes"; then
|
|
27498 |
+ gt_use_preinstalled_gnugettext=no
|
|
27499 |
+ ifelse(gt_included_intl, yes, [
|
|
27500 |
+ AC_MSG_CHECKING([whether included gettext is requested])
|
|
27501 |
+ AC_ARG_WITH(included-gettext,
|
|
27502 |
+ [ --with-included-gettext use the GNU gettext library included here],
|
|
27503 |
+ nls_cv_force_use_gnu_gettext=$withval,
|
|
27504 |
+ nls_cv_force_use_gnu_gettext=no)
|
|
27505 |
+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
|
|
27506 |
+
|
|
27507 |
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
|
27508 |
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
|
27509 |
+ ])
|
|
27510 |
+ dnl User does not insist on using GNU NLS library. Figure out what
|
|
27511 |
+ dnl to use. If GNU gettext is available we use this. Else we have
|
|
27512 |
+ dnl to fall back to GNU NLS library.
|
|
27513 |
+
|
|
27514 |
+ dnl Add a version number to the cache macros.
|
|
27515 |
+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
|
|
27516 |
+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
|
|
27517 |
+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
|
|
27518 |
+
|
|
27519 |
+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
|
|
27520 |
+ [AC_TRY_LINK([#include <libintl.h>
|
|
27521 |
+]ifelse([$2], [need-formatstring-macros],
|
|
27522 |
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
|
27523 |
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
|
27524 |
+#endif
|
|
27525 |
+changequote(,)dnl
|
|
27526 |
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
|
27527 |
+changequote([,])dnl
|
|
27528 |
+], [])[extern int _nl_msg_cat_cntr;
|
|
27529 |
+extern int *_nl_domain_bindings;],
|
|
27530 |
+ [bindtextdomain ("", "");
|
|
27531 |
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
|
|
27532 |
+ gt_cv_func_gnugettext_libc=yes,
|
|
27533 |
+ gt_cv_func_gnugettext_libc=no)])
|
|
27534 |
+
|
|
27535 |
+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
|
|
27536 |
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
|
|
27537 |
+ ifelse(gt_included_intl, yes, , [
|
|
27538 |
+ AM_ICONV_LINK
|
|
27539 |
+ ])
|
|
27540 |
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
|
|
27541 |
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
|
|
27542 |
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
|
|
27543 |
+ dnl even if libiconv doesn't exist.
|
|
27544 |
+ AC_LIB_LINKFLAGS_BODY([intl])
|
|
27545 |
+ AC_CACHE_CHECK([for GNU gettext in libintl],
|
|
27546 |
+ gt_cv_func_gnugettext_libintl,
|
|
27547 |
+ [gt_save_CPPFLAGS="$CPPFLAGS"
|
|
27548 |
+ CPPFLAGS="$CPPFLAGS $INCINTL"
|
|
27549 |
+ gt_save_LIBS="$LIBS"
|
|
27550 |
+ LIBS="$LIBS $LIBINTL"
|
|
27551 |
+ dnl Now see whether libintl exists and does not depend on libiconv.
|
|
27552 |
+ AC_TRY_LINK([#include <libintl.h>
|
|
27553 |
+]ifelse([$2], [need-formatstring-macros],
|
|
27554 |
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
|
27555 |
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
|
27556 |
+#endif
|
|
27557 |
+changequote(,)dnl
|
|
27558 |
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
|
27559 |
+changequote([,])dnl
|
|
27560 |
+], [])[extern int _nl_msg_cat_cntr;
|
|
27561 |
+extern
|
|
27562 |
+#ifdef __cplusplus
|
|
27563 |
+"C"
|
|
27564 |
+#endif
|
|
27565 |
+const char *_nl_expand_alias ();],
|
|
27566 |
+ [bindtextdomain ("", "");
|
|
27567 |
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
27568 |
+ gt_cv_func_gnugettext_libintl=yes,
|
|
27569 |
+ gt_cv_func_gnugettext_libintl=no)
|
|
27570 |
+ dnl Now see whether libintl exists and depends on libiconv.
|
|
27571 |
+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
|
|
27572 |
+ LIBS="$LIBS $LIBICONV"
|
|
27573 |
+ AC_TRY_LINK([#include <libintl.h>
|
|
27574 |
+]ifelse([$2], [need-formatstring-macros],
|
|
27575 |
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
|
27576 |
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
|
27577 |
+#endif
|
|
27578 |
+changequote(,)dnl
|
|
27579 |
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
|
27580 |
+changequote([,])dnl
|
|
27581 |
+], [])[extern int _nl_msg_cat_cntr;
|
|
27582 |
+extern
|
|
27583 |
+#ifdef __cplusplus
|
|
27584 |
+"C"
|
|
27585 |
+#endif
|
|
27586 |
+const char *_nl_expand_alias ();],
|
|
27587 |
+ [bindtextdomain ("", "");
|
|
27588 |
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
27589 |
+ [LIBINTL="$LIBINTL $LIBICONV"
|
|
27590 |
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
|
27591 |
+ gt_cv_func_gnugettext_libintl=yes
|
|
27592 |
+ ])
|
|
27593 |
+ fi
|
|
27594 |
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
27595 |
+ LIBS="$gt_save_LIBS"])
|
|
27596 |
+ fi
|
|
27597 |
+
|
|
27598 |
+ dnl If an already present or preinstalled GNU gettext() is found,
|
|
27599 |
+ dnl use it. But if this macro is used in GNU gettext, and GNU
|
|
27600 |
+ dnl gettext is already preinstalled in libintl, we update this
|
|
27601 |
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
|
|
27602 |
+ if test "$gt_cv_func_gnugettext_libc" = "yes" \
|
|
27603 |
+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
|
|
27604 |
+ && test "$PACKAGE" != gettext; }; then
|
|
27605 |
+ gt_use_preinstalled_gnugettext=yes
|
|
27606 |
+ else
|
|
27607 |
+ dnl Reset the values set by searching for libintl.
|
|
27608 |
+ LIBINTL=
|
|
27609 |
+ LTLIBINTL=
|
|
27610 |
+ INCINTL=
|
|
27611 |
+ fi
|
|
27612 |
+
|
|
27613 |
+ ifelse(gt_included_intl, yes, [
|
|
27614 |
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
|
|
27615 |
+ dnl GNU gettext is not found in the C library.
|
|
27616 |
+ dnl Fall back on included GNU gettext library.
|
|
27617 |
+ nls_cv_use_gnu_gettext=yes
|
|
27618 |
+ fi
|
|
27619 |
+ fi
|
|
27620 |
+
|
|
27621 |
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
27622 |
+ dnl Mark actions used to generate GNU NLS library.
|
|
27623 |
+ INTLOBJS="\$(GETTOBJS)"
|
|
27624 |
+ BUILD_INCLUDED_LIBINTL=yes
|
|
27625 |
+ USE_INCLUDED_LIBINTL=yes
|
|
27626 |
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
|
|
27627 |
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
|
|
27628 |
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
|
27629 |
+ fi
|
|
27630 |
+
|
|
27631 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
27632 |
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
27633 |
+ dnl Mark actions to use GNU gettext tools.
|
|
27634 |
+ CATOBJEXT=.gmo
|
|
27635 |
+ fi
|
|
27636 |
+ ])
|
|
27637 |
+
|
|
27638 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
27639 |
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
27640 |
+ AC_DEFINE(ENABLE_NLS, 1,
|
|
27641 |
+ [Define to 1 if translation of program messages to the user's native language
|
|
27642 |
+ is requested.])
|
|
27643 |
+ else
|
|
27644 |
+ USE_NLS=no
|
|
27645 |
+ fi
|
|
27646 |
+ fi
|
|
27647 |
+
|
|
27648 |
+ if test "$USE_NLS" = "yes"; then
|
|
27649 |
+
|
|
27650 |
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
|
27651 |
+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
|
|
27652 |
+ AC_MSG_CHECKING([how to link with libintl])
|
|
27653 |
+ AC_MSG_RESULT([$LIBINTL])
|
|
27654 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
|
|
27655 |
+ fi
|
|
27656 |
+
|
|
27657 |
+ dnl For backward compatibility. Some packages may be using this.
|
|
27658 |
+ AC_DEFINE(HAVE_GETTEXT, 1,
|
|
27659 |
+ [Define if the GNU gettext() function is already present or preinstalled.])
|
|
27660 |
+ AC_DEFINE(HAVE_DCGETTEXT, 1,
|
|
27661 |
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
|
|
27662 |
+ fi
|
|
27663 |
+
|
|
27664 |
+ dnl We need to process the po/ directory.
|
|
27665 |
+ POSUB=po
|
|
27666 |
+ fi
|
|
27667 |
+
|
|
27668 |
+ ifelse(gt_included_intl, yes, [
|
|
27669 |
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
|
|
27670 |
+ dnl to 'yes' because some of the testsuite requires it.
|
|
27671 |
+ if test "$PACKAGE" = gettext; then
|
|
27672 |
+ BUILD_INCLUDED_LIBINTL=yes
|
|
27673 |
+ fi
|
|
27674 |
+
|
|
27675 |
+ dnl Make all variables we use known to autoconf.
|
|
27676 |
+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
|
27677 |
+ AC_SUBST(USE_INCLUDED_LIBINTL)
|
|
27678 |
+ AC_SUBST(CATOBJEXT)
|
|
27679 |
+ AC_SUBST(INTLOBJS)
|
|
27680 |
+
|
|
27681 |
+ dnl For backward compatibility. Some configure.ins may be using this.
|
|
27682 |
+ nls_cv_header_intl=
|
|
27683 |
+ nls_cv_header_libgt=
|
|
27684 |
+
|
|
27685 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
27686 |
+ DATADIRNAME=share
|
|
27687 |
+ AC_SUBST(DATADIRNAME)
|
|
27688 |
+
|
|
27689 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
27690 |
+ INSTOBJEXT=.mo
|
|
27691 |
+ AC_SUBST(INSTOBJEXT)
|
|
27692 |
+
|
|
27693 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
27694 |
+ GENCAT=gencat
|
|
27695 |
+ AC_SUBST(GENCAT)
|
|
27696 |
+
|
|
27697 |
+ dnl Enable libtool support if the surrounding package wishes it.
|
|
27698 |
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
|
|
27699 |
+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
|
|
27700 |
+ ])
|
|
27701 |
+
|
|
27702 |
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
27703 |
+ INTLLIBS="$LIBINTL"
|
|
27704 |
+ AC_SUBST(INTLLIBS)
|
|
27705 |
+
|
|
27706 |
+ dnl Make all documented variables known to autoconf.
|
|
27707 |
+ AC_SUBST(LIBINTL)
|
|
27708 |
+ AC_SUBST(LTLIBINTL)
|
|
27709 |
+ AC_SUBST(POSUB)
|
|
27710 |
+])
|
|
27711 |
+
|
|
27712 |
+
|
|
27713 |
+dnl Checks for all prerequisites of the po subdirectory,
|
|
27714 |
+dnl except for USE_NLS.
|
|
27715 |
+AC_DEFUN([AM_PO_SUBDIRS],
|
|
27716 |
+[
|
|
27717 |
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
27718 |
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
27719 |
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
27720 |
+
|
|
27721 |
+ dnl Perform the following tests also if --disable-nls has been given,
|
|
27722 |
+ dnl because they are needed for "make dist" to work.
|
|
27723 |
+
|
|
27724 |
+ dnl Search for GNU msgfmt in the PATH.
|
|
27725 |
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
|
27726 |
+ dnl The second test excludes FreeBSD msgfmt.
|
|
27727 |
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
|
27728 |
+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
|
|
27729 |
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
27730 |
+ :)
|
|
27731 |
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
27732 |
+
|
|
27733 |
+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
|
|
27734 |
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
|
27735 |
+ dnl The second test excludes FreeBSD xgettext.
|
|
27736 |
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
27737 |
+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
27738 |
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
27739 |
+ :)
|
|
27740 |
+ dnl Remove leftover from FreeBSD xgettext call.
|
|
27741 |
+ rm -f messages.po
|
|
27742 |
+
|
|
27743 |
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
|
27744 |
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
|
27745 |
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
|
|
27746 |
+
|
|
27747 |
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
27748 |
+ dnl Test whether we really found GNU msgfmt.
|
|
27749 |
+ if test "$GMSGFMT" != ":"; then
|
|
27750 |
+ dnl If it is no GNU msgfmt we define it as : so that the
|
|
27751 |
+ dnl Makefiles still can work.
|
|
27752 |
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
|
|
27753 |
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
27754 |
+ : ;
|
|
27755 |
+ else
|
|
27756 |
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
|
|
27757 |
+ AC_MSG_RESULT(
|
|
27758 |
+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
|
|
27759 |
+ GMSGFMT=":"
|
|
27760 |
+ fi
|
|
27761 |
+ fi
|
|
27762 |
+
|
|
27763 |
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
27764 |
+ dnl Test whether we really found GNU xgettext.
|
|
27765 |
+ if test "$XGETTEXT" != ":"; then
|
|
27766 |
+ dnl If it is no GNU xgettext we define it as : so that the
|
|
27767 |
+ dnl Makefiles still can work.
|
|
27768 |
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
27769 |
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
27770 |
+ : ;
|
|
27771 |
+ else
|
|
27772 |
+ AC_MSG_RESULT(
|
|
27773 |
+ [found xgettext program is not GNU xgettext; ignore it])
|
|
27774 |
+ XGETTEXT=":"
|
|
27775 |
+ fi
|
|
27776 |
+ dnl Remove leftover from FreeBSD xgettext call.
|
|
27777 |
+ rm -f messages.po
|
|
27778 |
+ fi
|
|
27779 |
+
|
|
27780 |
+ AC_OUTPUT_COMMANDS([
|
|
27781 |
+ for ac_file in $CONFIG_FILES; do
|
|
27782 |
+ # Support "outfile[:infile[:infile...]]"
|
|
27783 |
+ case "$ac_file" in
|
|
27784 |
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
27785 |
+ esac
|
|
27786 |
+ # PO directories have a Makefile.in generated from Makefile.in.in.
|
|
27787 |
+ case "$ac_file" in */Makefile.in)
|
|
27788 |
+ # Adjust a relative srcdir.
|
|
27789 |
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
27790 |
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
27791 |
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
27792 |
+ # In autoconf-2.13 it is called $ac_given_srcdir.
|
|
27793 |
+ # In autoconf-2.50 it is called $srcdir.
|
|
27794 |
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
|
27795 |
+ case "$ac_given_srcdir" in
|
|
27796 |
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
27797 |
+ /*) top_srcdir="$ac_given_srcdir" ;;
|
|
27798 |
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
27799 |
+ esac
|
|
27800 |
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
|
27801 |
+ rm -f "$ac_dir/POTFILES"
|
|
27802 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
|
27803 |
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
|
|
27804 |
+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
|
|
27805 |
+ # on $ac_dir but don't depend on user-specified configuration
|
|
27806 |
+ # parameters.
|
|
27807 |
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
|
27808 |
+ # The LINGUAS file contains the set of available languages.
|
|
27809 |
+ if test -n "$ALL_LINGUAS"; then
|
|
27810 |
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
|
27811 |
+ fi
|
|
27812 |
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
|
27813 |
+ # Hide the ALL_LINGUAS assigment from automake.
|
|
27814 |
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
|
27815 |
+ fi
|
|
27816 |
+ case "$ac_given_srcdir" in
|
|
27817 |
+ .) srcdirpre= ;;
|
|
27818 |
+ *) srcdirpre='$(srcdir)/' ;;
|
|
27819 |
+ esac
|
|
27820 |
+ POFILES=
|
|
27821 |
+ GMOFILES=
|
|
27822 |
+ UPDATEPOFILES=
|
|
27823 |
+ DUMMYPOFILES=
|
|
27824 |
+ for lang in $ALL_LINGUAS; do
|
|
27825 |
+ POFILES="$POFILES $srcdirpre$lang.po"
|
|
27826 |
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
|
27827 |
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
|
27828 |
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
|
27829 |
+ done
|
|
27830 |
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
27831 |
+ # environment variable.
|
|
27832 |
+ INST_LINGUAS=
|
|
27833 |
+ if test -n "$ALL_LINGUAS"; then
|
|
27834 |
+ for presentlang in $ALL_LINGUAS; do
|
|
27835 |
+ useit=no
|
|
27836 |
+ if test "%UNSET%" != "$LINGUAS"; then
|
|
27837 |
+ desiredlanguages="$LINGUAS"
|
|
27838 |
+ else
|
|
27839 |
+ desiredlanguages="$ALL_LINGUAS"
|
|
27840 |
+ fi
|
|
27841 |
+ for desiredlang in $desiredlanguages; do
|
|
27842 |
+ # Use the presentlang catalog if desiredlang is
|
|
27843 |
+ # a. equal to presentlang, or
|
|
27844 |
+ # b. a variant of presentlang (because in this case,
|
|
27845 |
+ # presentlang can be used as a fallback for messages
|
|
27846 |
+ # which are not translated in the desiredlang catalog).
|
|
27847 |
+ case "$desiredlang" in
|
|
27848 |
+ "$presentlang"*) useit=yes;;
|
|
27849 |
+ esac
|
|
27850 |
+ done
|
|
27851 |
+ if test $useit = yes; then
|
|
27852 |
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
|
|
27853 |
+ fi
|
|
27854 |
+ done
|
|
27855 |
+ fi
|
|
27856 |
+ CATALOGS=
|
|
27857 |
+ if test -n "$INST_LINGUAS"; then
|
|
27858 |
+ for lang in $INST_LINGUAS; do
|
|
27859 |
+ CATALOGS="$CATALOGS $lang.gmo"
|
|
27860 |
+ done
|
|
27861 |
+ fi
|
|
27862 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
|
|
27863 |
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
|
27864 |
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
|
|
27865 |
+ if test -f "$f"; then
|
|
27866 |
+ case "$f" in
|
|
27867 |
+ *.orig | *.bak | *~) ;;
|
|
27868 |
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
|
|
27869 |
+ esac
|
|
27870 |
+ fi
|
|
27871 |
+ done
|
|
27872 |
+ fi
|
|
27873 |
+ ;;
|
|
27874 |
+ esac
|
|
27875 |
+ done],
|
|
27876 |
+ [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
|
|
27877 |
+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
|
|
27878 |
+ # from automake.
|
|
27879 |
+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
|
|
27880 |
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
|
|
27881 |
+ LINGUAS="${LINGUAS-%UNSET%}"
|
|
27882 |
+ ])
|
|
27883 |
+])
|
|
27884 |
+
|
|
27885 |
+
|
|
27886 |
+dnl Checks for all prerequisites of the intl subdirectory,
|
|
27887 |
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
|
|
27888 |
+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
|
|
27889 |
+AC_DEFUN([AM_INTL_SUBDIR],
|
|
27890 |
+[
|
|
27891 |
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
27892 |
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
27893 |
+ AC_REQUIRE([AC_PROG_CC])dnl
|
|
27894 |
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
27895 |
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
27896 |
+ AC_REQUIRE([AC_ISC_POSIX])dnl
|
|
27897 |
+ AC_REQUIRE([AC_HEADER_STDC])dnl
|
|
27898 |
+ AC_REQUIRE([AC_C_CONST])dnl
|
|
27899 |
+ AC_REQUIRE([AC_C_INLINE])dnl
|
|
27900 |
+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
|
27901 |
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
|
27902 |
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
|
27903 |
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
|
|
27904 |
+ AC_REQUIRE([jm_GLIBC21])dnl
|
|
27905 |
+ AC_REQUIRE([gt_INTDIV0])dnl
|
|
27906 |
+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
|
|
27907 |
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
|
|
27908 |
+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
|
|
27909 |
+
|
|
27910 |
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
|
|
27911 |
+stdlib.h string.h unistd.h sys/param.h])
|
|
27912 |
+ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
|
|
27913 |
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
|
|
27914 |
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
|
27915 |
+
|
|
27916 |
+ AM_ICONV
|
|
27917 |
+ AM_LANGINFO_CODESET
|
|
27918 |
+ if test $ac_cv_header_locale_h = yes; then
|
|
27919 |
+ AM_LC_MESSAGES
|
|
27920 |
+ fi
|
|
27921 |
+
|
|
27922 |
+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
|
27923 |
+ dnl because plural.y uses bison specific features. It requires at least
|
|
27924 |
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
|
|
27925 |
+ dnl compile.
|
|
27926 |
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
|
|
27927 |
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
|
|
27928 |
+ dnl the rule in general Makefile. Now, some people carelessly touch the
|
|
27929 |
+ dnl files or have a broken "make" program, hence the plural.c rule will
|
|
27930 |
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
|
|
27931 |
+ dnl present or too old.
|
|
27932 |
+ AC_CHECK_PROGS([INTLBISON], [bison])
|
|
27933 |
+ if test -z "$INTLBISON"; then
|
|
27934 |
+ ac_verc_fail=yes
|
|
27935 |
+ else
|
|
27936 |
+ dnl Found it, now check the version.
|
|
27937 |
+ AC_MSG_CHECKING([version of bison])
|
|
27938 |
+changequote(<<,>>)dnl
|
|
27939 |
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
27940 |
+ case $ac_prog_version in
|
|
27941 |
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
27942 |
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
|
|
27943 |
+changequote([,])dnl
|
|
27944 |
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
27945 |
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
27946 |
+ esac
|
|
27947 |
+ AC_MSG_RESULT([$ac_prog_version])
|
|
27948 |
+ fi
|
|
27949 |
+ if test $ac_verc_fail = yes; then
|
|
27950 |
+ INTLBISON=:
|
|
27951 |
+ fi
|
|
27952 |
+])
|
|
27953 |
+
|
|
27954 |
+
|
|
27955 |
+AC_DEFUN([AM_MKINSTALLDIRS],
|
|
27956 |
+[
|
|
27957 |
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
|
27958 |
+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
|
27959 |
+ dnl Try to locate is.
|
|
27960 |
+ MKINSTALLDIRS=
|
|
27961 |
+ if test -n "$ac_aux_dir"; then
|
|
27962 |
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
27963 |
+ fi
|
|
27964 |
+ if test -z "$MKINSTALLDIRS"; then
|
|
27965 |
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
27966 |
+ fi
|
|
27967 |
+ AC_SUBST(MKINSTALLDIRS)
|
|
27968 |
+])
|
|
27969 |
+
|
|
27970 |
+
|
|
27971 |
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
|
|
27972 |
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
|
|
27973 |
diff -pruN dillo-0.8.6/m4/glibc21.m4 dillo-0.8.6-i18n-misc-20070916/m4/glibc21.m4
|
|
27974 |
--- dillo-0.8.6/m4/glibc21.m4 1970-01-01 09:00:00.000000000 +0900
|
|
27975 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/glibc21.m4 2006-05-16 01:21:07.000000000 +0900
|
|
27976 |
@@ -0,0 +1,32 @@
|
|
27977 |
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
|
|
27978 |
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
27979 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
27980 |
+dnl General Public License. As a special exception to the GNU General
|
|
27981 |
+dnl Public License, this file may be distributed as part of a program
|
|
27982 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
27983 |
+dnl the same distribution terms as the rest of that program.
|
|
27984 |
+
|
|
27985 |
+# Test for the GNU C Library, version 2.1 or newer.
|
|
27986 |
+# From Bruno Haible.
|
|
27987 |
+
|
|
27988 |
+AC_DEFUN([jm_GLIBC21],
|
|
27989 |
+ [
|
|
27990 |
+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
|
27991 |
+ ac_cv_gnu_library_2_1,
|
|
27992 |
+ [AC_EGREP_CPP([Lucky GNU user],
|
|
27993 |
+ [
|
|
27994 |
+#include <features.h>
|
|
27995 |
+#ifdef __GNU_LIBRARY__
|
|
27996 |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
|
|
27997 |
+ Lucky GNU user
|
|
27998 |
+ #endif
|
|
27999 |
+#endif
|
|
28000 |
+ ],
|
|
28001 |
+ ac_cv_gnu_library_2_1=yes,
|
|
28002 |
+ ac_cv_gnu_library_2_1=no)
|
|
28003 |
+ ]
|
|
28004 |
+ )
|
|
28005 |
+ AC_SUBST(GLIBC21)
|
|
28006 |
+ GLIBC21="$ac_cv_gnu_library_2_1"
|
|
28007 |
+ ]
|
|
28008 |
+)
|
|
28009 |
diff -pruN dillo-0.8.6/m4/iconv.m4 dillo-0.8.6-i18n-misc-20070916/m4/iconv.m4
|
|
28010 |
--- dillo-0.8.6/m4/iconv.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28011 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/iconv.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28012 |
@@ -0,0 +1,103 @@
|
|
28013 |
+# iconv.m4 serial AM4 (gettext-0.11.3)
|
|
28014 |
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
|
28015 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28016 |
+dnl General Public License. As a special exception to the GNU General
|
|
28017 |
+dnl Public License, this file may be distributed as part of a program
|
|
28018 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28019 |
+dnl the same distribution terms as the rest of that program.
|
|
28020 |
+
|
|
28021 |
+dnl From Bruno Haible.
|
|
28022 |
+
|
|
28023 |
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
|
28024 |
+[
|
|
28025 |
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
|
28026 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
28027 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
28028 |
+
|
|
28029 |
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
28030 |
+ dnl accordingly.
|
|
28031 |
+ AC_LIB_LINKFLAGS_BODY([iconv])
|
|
28032 |
+])
|
|
28033 |
+
|
|
28034 |
+AC_DEFUN([AM_ICONV_LINK],
|
|
28035 |
+[
|
|
28036 |
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
|
28037 |
+ dnl those with the standalone portable GNU libiconv installed).
|
|
28038 |
+
|
|
28039 |
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
28040 |
+ dnl accordingly.
|
|
28041 |
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
28042 |
+
|
|
28043 |
+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
|
28044 |
+ dnl because if the user has installed libiconv and not disabled its use
|
|
28045 |
+ dnl via --without-libiconv-prefix, he wants to use it. The first
|
|
28046 |
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
|
|
28047 |
+ am_save_CPPFLAGS="$CPPFLAGS"
|
|
28048 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
|
28049 |
+
|
|
28050 |
+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
|
|
28051 |
+ am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
28052 |
+ am_cv_lib_iconv=no
|
|
28053 |
+ AC_TRY_LINK([#include <stdlib.h>
|
|
28054 |
+#include <iconv.h>],
|
|
28055 |
+ [iconv_t cd = iconv_open("","");
|
|
28056 |
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
28057 |
+ iconv_close(cd);],
|
|
28058 |
+ am_cv_func_iconv=yes)
|
|
28059 |
+ if test "$am_cv_func_iconv" != yes; then
|
|
28060 |
+ am_save_LIBS="$LIBS"
|
|
28061 |
+ LIBS="$LIBS $LIBICONV"
|
|
28062 |
+ AC_TRY_LINK([#include <stdlib.h>
|
|
28063 |
+#include <iconv.h>],
|
|
28064 |
+ [iconv_t cd = iconv_open("","");
|
|
28065 |
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
28066 |
+ iconv_close(cd);],
|
|
28067 |
+ am_cv_lib_iconv=yes
|
|
28068 |
+ am_cv_func_iconv=yes)
|
|
28069 |
+ LIBS="$am_save_LIBS"
|
|
28070 |
+ fi
|
|
28071 |
+ ])
|
|
28072 |
+ if test "$am_cv_func_iconv" = yes; then
|
|
28073 |
+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
|
|
28074 |
+ fi
|
|
28075 |
+ if test "$am_cv_lib_iconv" = yes; then
|
|
28076 |
+ AC_MSG_CHECKING([how to link with libiconv])
|
|
28077 |
+ AC_MSG_RESULT([$LIBICONV])
|
|
28078 |
+ else
|
|
28079 |
+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
|
|
28080 |
+ dnl either.
|
|
28081 |
+ CPPFLAGS="$am_save_CPPFLAGS"
|
|
28082 |
+ LIBICONV=
|
|
28083 |
+ LTLIBICONV=
|
|
28084 |
+ fi
|
|
28085 |
+ AC_SUBST(LIBICONV)
|
|
28086 |
+ AC_SUBST(LTLIBICONV)
|
|
28087 |
+])
|
|
28088 |
+
|
|
28089 |
+AC_DEFUN([AM_ICONV],
|
|
28090 |
+[
|
|
28091 |
+ AM_ICONV_LINK
|
|
28092 |
+ if test "$am_cv_func_iconv" = yes; then
|
|
28093 |
+ AC_MSG_CHECKING([for iconv declaration])
|
|
28094 |
+ AC_CACHE_VAL(am_cv_proto_iconv, [
|
|
28095 |
+ AC_TRY_COMPILE([
|
|
28096 |
+#include <stdlib.h>
|
|
28097 |
+#include <iconv.h>
|
|
28098 |
+extern
|
|
28099 |
+#ifdef __cplusplus
|
|
28100 |
+"C"
|
|
28101 |
+#endif
|
|
28102 |
+#if defined(__STDC__) || defined(__cplusplus)
|
|
28103 |
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
28104 |
+#else
|
|
28105 |
+size_t iconv();
|
|
28106 |
+#endif
|
|
28107 |
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
|
28108 |
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
28109 |
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
28110 |
+ AC_MSG_RESULT([$]{ac_t:-
|
|
28111 |
+ }[$]am_cv_proto_iconv)
|
|
28112 |
+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
|
28113 |
+ [Define as const if the declaration of iconv() needs const.])
|
|
28114 |
+ fi
|
|
28115 |
+])
|
|
28116 |
diff -pruN dillo-0.8.6/m4/intdiv0.m4 dillo-0.8.6-i18n-misc-20070916/m4/intdiv0.m4
|
|
28117 |
--- dillo-0.8.6/m4/intdiv0.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28118 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/intdiv0.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28119 |
@@ -0,0 +1,72 @@
|
|
28120 |
+# intdiv0.m4 serial 1 (gettext-0.11.3)
|
|
28121 |
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
|
|
28122 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28123 |
+dnl General Public License. As a special exception to the GNU General
|
|
28124 |
+dnl Public License, this file may be distributed as part of a program
|
|
28125 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28126 |
+dnl the same distribution terms as the rest of that program.
|
|
28127 |
+
|
|
28128 |
+dnl From Bruno Haible.
|
|
28129 |
+
|
|
28130 |
+AC_DEFUN([gt_INTDIV0],
|
|
28131 |
+[
|
|
28132 |
+ AC_REQUIRE([AC_PROG_CC])dnl
|
|
28133 |
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
28134 |
+
|
|
28135 |
+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
|
|
28136 |
+ gt_cv_int_divbyzero_sigfpe,
|
|
28137 |
+ [
|
|
28138 |
+ AC_TRY_RUN([
|
|
28139 |
+#include <stdlib.h>
|
|
28140 |
+#include <signal.h>
|
|
28141 |
+
|
|
28142 |
+static void
|
|
28143 |
+#ifdef __cplusplus
|
|
28144 |
+sigfpe_handler (int sig)
|
|
28145 |
+#else
|
|
28146 |
+sigfpe_handler (sig) int sig;
|
|
28147 |
+#endif
|
|
28148 |
+{
|
|
28149 |
+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
|
|
28150 |
+ exit (sig != SIGFPE);
|
|
28151 |
+}
|
|
28152 |
+
|
|
28153 |
+int x = 1;
|
|
28154 |
+int y = 0;
|
|
28155 |
+int z;
|
|
28156 |
+int nan;
|
|
28157 |
+
|
|
28158 |
+int main ()
|
|
28159 |
+{
|
|
28160 |
+ signal (SIGFPE, sigfpe_handler);
|
|
28161 |
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
|
|
28162 |
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
|
|
28163 |
+ signal (SIGTRAP, sigfpe_handler);
|
|
28164 |
+#endif
|
|
28165 |
+/* Linux/SPARC yields signal SIGILL. */
|
|
28166 |
+#if defined (__sparc__) && defined (__linux__)
|
|
28167 |
+ signal (SIGILL, sigfpe_handler);
|
|
28168 |
+#endif
|
|
28169 |
+
|
|
28170 |
+ z = x / y;
|
|
28171 |
+ nan = y / y;
|
|
28172 |
+ exit (1);
|
|
28173 |
+}
|
|
28174 |
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
|
|
28175 |
+ [
|
|
28176 |
+ # Guess based on the CPU.
|
|
28177 |
+ case "$host_cpu" in
|
|
28178 |
+ alpha* | i[34567]86 | m68k | s390*)
|
|
28179 |
+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
|
|
28180 |
+ *)
|
|
28181 |
+ gt_cv_int_divbyzero_sigfpe="guessing no";;
|
|
28182 |
+ esac
|
|
28183 |
+ ])
|
|
28184 |
+ ])
|
|
28185 |
+ case "$gt_cv_int_divbyzero_sigfpe" in
|
|
28186 |
+ *yes) value=1;;
|
|
28187 |
+ *) value=0;;
|
|
28188 |
+ esac
|
|
28189 |
+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
|
|
28190 |
+ [Define if integer division by zero raises signal SIGFPE.])
|
|
28191 |
+])
|
|
28192 |
diff -pruN dillo-0.8.6/m4/intmax.m4 dillo-0.8.6-i18n-misc-20070916/m4/intmax.m4
|
|
28193 |
--- dillo-0.8.6/m4/intmax.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28194 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/intmax.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28195 |
@@ -0,0 +1,32 @@
|
|
28196 |
+# intmax.m4 serial 1 (gettext-0.12)
|
|
28197 |
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
|
28198 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28199 |
+dnl General Public License. As a special exception to the GNU General
|
|
28200 |
+dnl Public License, this file may be distributed as part of a program
|
|
28201 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28202 |
+dnl the same distribution terms as the rest of that program.
|
|
28203 |
+
|
|
28204 |
+dnl From Bruno Haible.
|
|
28205 |
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
|
|
28206 |
+dnl find a replacement if it is lacking.
|
|
28207 |
+
|
|
28208 |
+AC_DEFUN([gt_TYPE_INTMAX_T],
|
|
28209 |
+[
|
|
28210 |
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
|
28211 |
+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
|
28212 |
+ AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
|
|
28213 |
+ [AC_TRY_COMPILE([
|
|
28214 |
+#include <stddef.h>
|
|
28215 |
+#include <stdlib.h>
|
|
28216 |
+#if HAVE_STDINT_H_WITH_UINTMAX
|
|
28217 |
+#include <stdint.h>
|
|
28218 |
+#endif
|
|
28219 |
+#if HAVE_INTTYPES_H_WITH_UINTMAX
|
|
28220 |
+#include <inttypes.h>
|
|
28221 |
+#endif
|
|
28222 |
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
|
|
28223 |
+ if test $gt_cv_c_intmax_t = yes; then
|
|
28224 |
+ AC_DEFINE(HAVE_INTMAX_T, 1,
|
|
28225 |
+ [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
|
|
28226 |
+ fi
|
|
28227 |
+])
|
|
28228 |
diff -pruN dillo-0.8.6/m4/inttypes-pri.m4 dillo-0.8.6-i18n-misc-20070916/m4/inttypes-pri.m4
|
|
28229 |
--- dillo-0.8.6/m4/inttypes-pri.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28230 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/inttypes-pri.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28231 |
@@ -0,0 +1,32 @@
|
|
28232 |
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
|
|
28233 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
28234 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28235 |
+dnl General Public License. As a special exception to the GNU General
|
|
28236 |
+dnl Public License, this file may be distributed as part of a program
|
|
28237 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28238 |
+dnl the same distribution terms as the rest of that program.
|
|
28239 |
+
|
|
28240 |
+dnl From Bruno Haible.
|
|
28241 |
+
|
|
28242 |
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
|
|
28243 |
+# macros to non-string values. This is the case on AIX 4.3.3.
|
|
28244 |
+
|
|
28245 |
+AC_DEFUN([gt_INTTYPES_PRI],
|
|
28246 |
+[
|
|
28247 |
+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
|
|
28248 |
+ if test $gt_cv_header_inttypes_h = yes; then
|
|
28249 |
+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
|
|
28250 |
+ gt_cv_inttypes_pri_broken,
|
|
28251 |
+ [
|
|
28252 |
+ AC_TRY_COMPILE([#include <inttypes.h>
|
|
28253 |
+#ifdef PRId32
|
|
28254 |
+char *p = PRId32;
|
|
28255 |
+#endif
|
|
28256 |
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
|
|
28257 |
+ ])
|
|
28258 |
+ fi
|
|
28259 |
+ if test "$gt_cv_inttypes_pri_broken" = yes; then
|
|
28260 |
+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
|
|
28261 |
+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
|
|
28262 |
+ fi
|
|
28263 |
+])
|
|
28264 |
diff -pruN dillo-0.8.6/m4/inttypes.m4 dillo-0.8.6-i18n-misc-20070916/m4/inttypes.m4
|
|
28265 |
--- dillo-0.8.6/m4/inttypes.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28266 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/inttypes.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28267 |
@@ -0,0 +1,27 @@
|
|
28268 |
+# inttypes.m4 serial 1 (gettext-0.11.4)
|
|
28269 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
28270 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28271 |
+dnl General Public License. As a special exception to the GNU General
|
|
28272 |
+dnl Public License, this file may be distributed as part of a program
|
|
28273 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28274 |
+dnl the same distribution terms as the rest of that program.
|
|
28275 |
+
|
|
28276 |
+dnl From Paul Eggert.
|
|
28277 |
+
|
|
28278 |
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
|
|
28279 |
+# <sys/types.h>.
|
|
28280 |
+
|
|
28281 |
+AC_DEFUN([gt_HEADER_INTTYPES_H],
|
|
28282 |
+[
|
|
28283 |
+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
|
|
28284 |
+ [
|
|
28285 |
+ AC_TRY_COMPILE(
|
|
28286 |
+ [#include <sys/types.h>
|
|
28287 |
+#include <inttypes.h>],
|
|
28288 |
+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
|
|
28289 |
+ ])
|
|
28290 |
+ if test $gt_cv_header_inttypes_h = yes; then
|
|
28291 |
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
|
|
28292 |
+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
|
|
28293 |
+ fi
|
|
28294 |
+])
|
|
28295 |
diff -pruN dillo-0.8.6/m4/inttypes_h.m4 dillo-0.8.6-i18n-misc-20070916/m4/inttypes_h.m4
|
|
28296 |
--- dillo-0.8.6/m4/inttypes_h.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28297 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/inttypes_h.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28298 |
@@ -0,0 +1,28 @@
|
|
28299 |
+# inttypes_h.m4 serial 4 (gettext-0.11.4)
|
|
28300 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
28301 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28302 |
+dnl General Public License. As a special exception to the GNU General
|
|
28303 |
+dnl Public License, this file may be distributed as part of a program
|
|
28304 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28305 |
+dnl the same distribution terms as the rest of that program.
|
|
28306 |
+
|
|
28307 |
+dnl From Paul Eggert.
|
|
28308 |
+
|
|
28309 |
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
|
|
28310 |
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
|
28311 |
+
|
|
28312 |
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
|
|
28313 |
+[
|
|
28314 |
+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
|
|
28315 |
+ [AC_TRY_COMPILE(
|
|
28316 |
+ [#include <sys/types.h>
|
|
28317 |
+#include <inttypes.h>],
|
|
28318 |
+ [uintmax_t i = (uintmax_t) -1;],
|
|
28319 |
+ jm_ac_cv_header_inttypes_h=yes,
|
|
28320 |
+ jm_ac_cv_header_inttypes_h=no)])
|
|
28321 |
+ if test $jm_ac_cv_header_inttypes_h = yes; then
|
|
28322 |
+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
|
|
28323 |
+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
|
|
28324 |
+ and declares uintmax_t. ])
|
|
28325 |
+ fi
|
|
28326 |
+])
|
|
28327 |
diff -pruN dillo-0.8.6/m4/isc-posix.m4 dillo-0.8.6-i18n-misc-20070916/m4/isc-posix.m4
|
|
28328 |
--- dillo-0.8.6/m4/isc-posix.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28329 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/isc-posix.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28330 |
@@ -0,0 +1,26 @@
|
|
28331 |
+# isc-posix.m4 serial 2 (gettext-0.11.2)
|
|
28332 |
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
28333 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28334 |
+dnl General Public License. As a special exception to the GNU General
|
|
28335 |
+dnl Public License, this file may be distributed as part of a program
|
|
28336 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28337 |
+dnl the same distribution terms as the rest of that program.
|
|
28338 |
+
|
|
28339 |
+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
|
|
28340 |
+
|
|
28341 |
+# This test replaces the one in autoconf.
|
|
28342 |
+# Currently this macro should have the same name as the autoconf macro
|
|
28343 |
+# because gettext's gettext.m4 (distributed in the automake package)
|
|
28344 |
+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
|
28345 |
+# give these diagnostics:
|
|
28346 |
+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
|
28347 |
+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
|
28348 |
+
|
|
28349 |
+undefine([AC_ISC_POSIX])
|
|
28350 |
+
|
|
28351 |
+AC_DEFUN([AC_ISC_POSIX],
|
|
28352 |
+ [
|
|
28353 |
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
|
28354 |
+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
|
28355 |
+ ]
|
|
28356 |
+)
|
|
28357 |
diff -pruN dillo-0.8.6/m4/lcmessage.m4 dillo-0.8.6-i18n-misc-20070916/m4/lcmessage.m4
|
|
28358 |
--- dillo-0.8.6/m4/lcmessage.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28359 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/lcmessage.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28360 |
@@ -0,0 +1,32 @@
|
|
28361 |
+# lcmessage.m4 serial 3 (gettext-0.11.3)
|
|
28362 |
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
28363 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28364 |
+dnl General Public License. As a special exception to the GNU General
|
|
28365 |
+dnl Public License, this file may be distributed as part of a program
|
|
28366 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28367 |
+dnl the same distribution terms as the rest of that program.
|
|
28368 |
+dnl
|
|
28369 |
+dnl This file can can be used in projects which are not available under
|
|
28370 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
28371 |
+dnl License but which still want to provide support for the GNU gettext
|
|
28372 |
+dnl functionality.
|
|
28373 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
28374 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
28375 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
28376 |
+dnl They are *not* in the public domain.
|
|
28377 |
+
|
|
28378 |
+dnl Authors:
|
|
28379 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
28380 |
+
|
|
28381 |
+# Check whether LC_MESSAGES is available in <locale.h>.
|
|
28382 |
+
|
|
28383 |
+AC_DEFUN([AM_LC_MESSAGES],
|
|
28384 |
+[
|
|
28385 |
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
|
28386 |
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
|
28387 |
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
|
28388 |
+ if test $am_cv_val_LC_MESSAGES = yes; then
|
|
28389 |
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
|
28390 |
+ [Define if your <locale.h> file defines LC_MESSAGES.])
|
|
28391 |
+ fi
|
|
28392 |
+])
|
|
28393 |
diff -pruN dillo-0.8.6/m4/lib-ld.m4 dillo-0.8.6-i18n-misc-20070916/m4/lib-ld.m4
|
|
28394 |
--- dillo-0.8.6/m4/lib-ld.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28395 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/lib-ld.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28396 |
@@ -0,0 +1,97 @@
|
|
28397 |
+# lib-ld.m4 serial 1 (gettext-0.11)
|
|
28398 |
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
|
|
28399 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28400 |
+dnl General Public License. As a special exception to the GNU General
|
|
28401 |
+dnl Public License, this file may be distributed as part of a program
|
|
28402 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28403 |
+dnl the same distribution terms as the rest of that program.
|
|
28404 |
+
|
|
28405 |
+dnl Subroutines of libtool.m4,
|
|
28406 |
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
|
28407 |
+dnl with libtool.m4.
|
|
28408 |
+
|
|
28409 |
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
|
28410 |
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
|
28411 |
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
|
|
28412 |
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
28413 |
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
|
28414 |
+ acl_cv_prog_gnu_ld=yes
|
|
28415 |
+else
|
|
28416 |
+ acl_cv_prog_gnu_ld=no
|
|
28417 |
+fi])
|
|
28418 |
+with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
28419 |
+])
|
|
28420 |
+
|
|
28421 |
+dnl From libtool-1.4. Sets the variable LD.
|
|
28422 |
+AC_DEFUN([AC_LIB_PROG_LD],
|
|
28423 |
+[AC_ARG_WITH(gnu-ld,
|
|
28424 |
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
|
28425 |
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
|
28426 |
+AC_REQUIRE([AC_PROG_CC])dnl
|
|
28427 |
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
28428 |
+ac_prog=ld
|
|
28429 |
+if test "$GCC" = yes; then
|
|
28430 |
+ # Check if gcc -print-prog-name=ld gives a path.
|
|
28431 |
+ AC_MSG_CHECKING([for ld used by GCC])
|
|
28432 |
+ case $host in
|
|
28433 |
+ *-*-mingw*)
|
|
28434 |
+ # gcc leaves a trailing carriage return which upsets mingw
|
|
28435 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
28436 |
+ *)
|
|
28437 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
|
28438 |
+ esac
|
|
28439 |
+ case $ac_prog in
|
|
28440 |
+ # Accept absolute paths.
|
|
28441 |
+ [[\\/]* | [A-Za-z]:[\\/]*)]
|
|
28442 |
+ [re_direlt='/[^/][^/]*/\.\./']
|
|
28443 |
+ # Canonicalize the path of ld
|
|
28444 |
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
|
28445 |
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
28446 |
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
28447 |
+ done
|
|
28448 |
+ test -z "$LD" && LD="$ac_prog"
|
|
28449 |
+ ;;
|
|
28450 |
+ "")
|
|
28451 |
+ # If it fails, then pretend we aren't using GCC.
|
|
28452 |
+ ac_prog=ld
|
|
28453 |
+ ;;
|
|
28454 |
+ *)
|
|
28455 |
+ # If it is relative, then search for the first ld in PATH.
|
|
28456 |
+ with_gnu_ld=unknown
|
|
28457 |
+ ;;
|
|
28458 |
+ esac
|
|
28459 |
+elif test "$with_gnu_ld" = yes; then
|
|
28460 |
+ AC_MSG_CHECKING([for GNU ld])
|
|
28461 |
+else
|
|
28462 |
+ AC_MSG_CHECKING([for non-GNU ld])
|
|
28463 |
+fi
|
|
28464 |
+AC_CACHE_VAL(acl_cv_path_LD,
|
|
28465 |
+[if test -z "$LD"; then
|
|
28466 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
28467 |
+ for ac_dir in $PATH; do
|
|
28468 |
+ test -z "$ac_dir" && ac_dir=.
|
|
28469 |
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
28470 |
+ acl_cv_path_LD="$ac_dir/$ac_prog"
|
|
28471 |
+ # Check to see if the program is GNU ld. I'd rather use --version,
|
|
28472 |
+ # but apparently some GNU ld's only accept -v.
|
|
28473 |
+ # Break only if it was the GNU/non-GNU ld that we prefer.
|
|
28474 |
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
|
28475 |
+ test "$with_gnu_ld" != no && break
|
|
28476 |
+ else
|
|
28477 |
+ test "$with_gnu_ld" != yes && break
|
|
28478 |
+ fi
|
|
28479 |
+ fi
|
|
28480 |
+ done
|
|
28481 |
+ IFS="$ac_save_ifs"
|
|
28482 |
+else
|
|
28483 |
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
28484 |
+fi])
|
|
28485 |
+LD="$acl_cv_path_LD"
|
|
28486 |
+if test -n "$LD"; then
|
|
28487 |
+ AC_MSG_RESULT($LD)
|
|
28488 |
+else
|
|
28489 |
+ AC_MSG_RESULT(no)
|
|
28490 |
+fi
|
|
28491 |
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
28492 |
+AC_LIB_PROG_LD_GNU
|
|
28493 |
+])
|
|
28494 |
diff -pruN dillo-0.8.6/m4/lib-link.m4 dillo-0.8.6-i18n-misc-20070916/m4/lib-link.m4
|
|
28495 |
--- dillo-0.8.6/m4/lib-link.m4 1970-01-01 09:00:00.000000000 +0900
|
|
28496 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/lib-link.m4 2006-05-16 01:21:07.000000000 +0900
|
|
28497 |
@@ -0,0 +1,554 @@
|
|
28498 |
+# lib-link.m4 serial 3 (gettext-0.11.3)
|
|
28499 |
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
|
28500 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
28501 |
+dnl General Public License. As a special exception to the GNU General
|
|
28502 |
+dnl Public License, this file may be distributed as part of a program
|
|
28503 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
28504 |
+dnl the same distribution terms as the rest of that program.
|
|
28505 |
+
|
|
28506 |
+dnl From Bruno Haible.
|
|
28507 |
+
|
|
28508 |
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
|
28509 |
+dnl the libraries corresponding to explicit and implicit dependencies.
|
|
28510 |
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
|
28511 |
+dnl augments the CPPFLAGS variable.
|
|
28512 |
+AC_DEFUN([AC_LIB_LINKFLAGS],
|
|
28513 |
+[
|
|
28514 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
28515 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
28516 |
+ define([Name],[translit([$1],[./-], [___])])
|
|
28517 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
28518 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
28519 |
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
|
28520 |
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
28521 |
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
|
28522 |
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
|
|
28523 |
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
|
|
28524 |
+ ])
|
|
28525 |
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
|
|
28526 |
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
|
|
28527 |
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
|
|
28528 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
28529 |
+ AC_SUBST([LIB]NAME)
|
|
28530 |
+ AC_SUBST([LTLIB]NAME)
|
|
28531 |
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
|
28532 |
+ dnl results of this search when this library appears as a dependency.
|
|
28533 |
+ HAVE_LIB[]NAME=yes
|
|
28534 |
+ undefine([Name])
|
|
28535 |
+ undefine([NAME])
|
|
28536 |
+])
|
|
28537 |
+
|
|
28538 |
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
|
|
28539 |
+dnl searches for libname and the libraries corresponding to explicit and
|
|
28540 |
+dnl implicit dependencies, together with the specified include files and
|
|
28541 |
+dnl the ability to compile and link the specified testcode. If found, it
|
|
28542 |
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
|
|
28543 |
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
|
28544 |
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
|
28545 |
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
|
28546 |
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
28547 |
+[
|
|
28548 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
28549 |
+ AC_REQUIRE([AC_LIB_RPATH])
|
|
28550 |
+ define([Name],[translit([$1],[./-], [___])])
|
|
28551 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
28552 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
28553 |
+
|
|
28554 |
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
|
28555 |
+ dnl accordingly.
|
|
28556 |
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
28557 |
+
|
|
28558 |
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
|
|
28559 |
+ dnl because if the user has installed lib[]Name and not disabled its use
|
|
28560 |
+ dnl via --without-lib[]Name-prefix, he wants to use it.
|
|
28561 |
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
|
28562 |
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
28563 |
+
|
|
28564 |
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
|
28565 |
+ ac_save_LIBS="$LIBS"
|
|
28566 |
+ LIBS="$LIBS $LIB[]NAME"
|
|
28567 |
+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
|
|
28568 |
+ LIBS="$ac_save_LIBS"
|
|
28569 |
+ ])
|
|
28570 |
+ if test "$ac_cv_lib[]Name" = yes; then
|
|
28571 |
+ HAVE_LIB[]NAME=yes
|
|
28572 |
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
|
|
28573 |
+ AC_MSG_CHECKING([how to link with lib[]$1])
|
|
28574 |
+ AC_MSG_RESULT([$LIB[]NAME])
|
|
28575 |
+ else
|
|
28576 |
+ HAVE_LIB[]NAME=no
|
|
28577 |
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
|
|
28578 |
+ dnl $INC[]NAME either.
|
|
28579 |
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
|
28580 |
+ LIB[]NAME=
|
|
28581 |
+ LTLIB[]NAME=
|
|
28582 |
+ fi
|
|
28583 |
+ AC_SUBST([HAVE_LIB]NAME)
|
|
28584 |
+ AC_SUBST([LIB]NAME)
|
|
28585 |
+ AC_SUBST([LTLIB]NAME)
|
|
28586 |
+ undefine([Name])
|
|
28587 |
+ undefine([NAME])
|
|
28588 |
+])
|
|
28589 |
+
|
|
28590 |
+dnl Determine the platform dependent parameters needed to use rpath:
|
|
28591 |
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
|
|
28592 |
+dnl hardcode_direct, hardcode_minus_L,
|
|
28593 |
+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
|
|
28594 |
+AC_DEFUN([AC_LIB_RPATH],
|
|
28595 |
+[
|
|
28596 |
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
|
28597 |
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
|
28598 |
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
|
28599 |
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
|
28600 |
+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
|
|
28601 |
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
|
28602 |
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
|
28603 |
+ . ./conftest.sh
|
|
28604 |
+ rm -f ./conftest.sh
|
|
28605 |
+ acl_cv_rpath=done
|
|
28606 |
+ ])
|
|
28607 |
+ wl="$acl_cv_wl"
|
|
28608 |
+ libext="$acl_cv_libext"
|
|
28609 |
+ shlibext="$acl_cv_shlibext"
|
|
28610 |
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
|
28611 |
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
|
28612 |
+ hardcode_direct="$acl_cv_hardcode_direct"
|
|
28613 |
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
|
28614 |
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
|
|
28615 |
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
|
|
28616 |
+ dnl Determine whether the user wants rpath handling at all.
|
|
28617 |
+ AC_ARG_ENABLE(rpath,
|
|
28618 |
+ [ --disable-rpath do not hardcode runtime library paths],
|
|
28619 |
+ :, enable_rpath=yes)
|
|
28620 |
+])
|
|
28621 |
+
|
|
28622 |
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
|
28623 |
+dnl the libraries corresponding to explicit and implicit dependencies.
|
|
28624 |
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
|
28625 |
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
28626 |
+[
|
|
28627 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
28628 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
28629 |
+ dnl By default, look in $includedir and $libdir.
|
|
28630 |
+ use_additional=yes
|
|
28631 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
28632 |
+ eval additional_includedir=\"$includedir\"
|
|
28633 |
+ eval additional_libdir=\"$libdir\"
|
|
28634 |
+ ])
|
|
28635 |
+ AC_ARG_WITH([lib$1-prefix],
|
|
28636 |
+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
|
|
28637 |
+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
|
|
28638 |
+[
|
|
28639 |
+ if test "X$withval" = "Xno"; then
|
|
28640 |
+ use_additional=no
|
|
28641 |
+ else
|
|
28642 |
+ if test "X$withval" = "X"; then
|
|
28643 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
28644 |
+ eval additional_includedir=\"$includedir\"
|
|
28645 |
+ eval additional_libdir=\"$libdir\"
|
|
28646 |
+ ])
|
|
28647 |
+ else
|
|
28648 |
+ additional_includedir="$withval/include"
|
|
28649 |
+ additional_libdir="$withval/lib"
|
|
28650 |
+ fi
|
|
28651 |
+ fi
|
|
28652 |
+])
|
|
28653 |
+ dnl Search the library and its dependencies in $additional_libdir and
|
|
28654 |
+ dnl $LDFLAGS. Using breadth-first-seach.
|
|
28655 |
+ LIB[]NAME=
|
|
28656 |
+ LTLIB[]NAME=
|
|
28657 |
+ INC[]NAME=
|
|
28658 |
+ rpathdirs=
|
|
28659 |
+ ltrpathdirs=
|
|
28660 |
+ names_already_handled=
|
|
28661 |
+ names_next_round='$1 $2'
|
|
28662 |
+ while test -n "$names_next_round"; do
|
|
28663 |
+ names_this_round="$names_next_round"
|
|
28664 |
+ names_next_round=
|
|
28665 |
+ for name in $names_this_round; do
|
|
28666 |
+ already_handled=
|
|
28667 |
+ for n in $names_already_handled; do
|
|
28668 |
+ if test "$n" = "$name"; then
|
|
28669 |
+ already_handled=yes
|
|
28670 |
+ break
|
|
28671 |
+ fi
|
|
28672 |
+ done
|
|
28673 |
+ if test -z "$already_handled"; then
|
|
28674 |
+ names_already_handled="$names_already_handled $name"
|
|
28675 |
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
|
|
28676 |
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
|
|
28677 |
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
|
28678 |
+ eval value=\"\$HAVE_LIB$uppername\"
|
|
28679 |
+ if test -n "$value"; then
|
|
28680 |
+ if test "$value" = yes; then
|
|
28681 |
+ eval value=\"\$LIB$uppername\"
|
|
28682 |
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
|
|
28683 |
+ eval value=\"\$LTLIB$uppername\"
|
|
28684 |
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
|
|
28685 |
+ else
|
|
28686 |
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
|
|
28687 |
+ dnl that this library doesn't exist. So just drop it.
|
|
28688 |
+ :
|
|
28689 |
+ fi
|
|
28690 |
+ else
|
|
28691 |
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
|
|
28692 |
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
|
|
28693 |
+ found_dir=
|
|
28694 |
+ found_la=
|
|
28695 |
+ found_so=
|
|
28696 |
+ found_a=
|
|
28697 |
+ if test $use_additional = yes; then
|
|
28698 |
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
|
|
28699 |
+ found_dir="$additional_libdir"
|
|
28700 |
+ found_so="$additional_libdir/lib$name.$shlibext"
|
|
28701 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
28702 |
+ found_la="$additional_libdir/lib$name.la"
|
|
28703 |
+ fi
|
|
28704 |
+ else
|
|
28705 |
+ if test -f "$additional_libdir/lib$name.$libext"; then
|
|
28706 |
+ found_dir="$additional_libdir"
|
|
28707 |
+ found_a="$additional_libdir/lib$name.$libext"
|
|
28708 |
+ if test -f "$additional_libdir/lib$name.la"; then
|
|
28709 |
+ found_la="$additional_libdir/lib$name.la"
|
|
28710 |
+ fi
|
|
28711 |
+ fi
|
|
28712 |
+ fi
|
|
28713 |
+ fi
|
|
28714 |
+ if test "X$found_dir" = "X"; then
|
|
28715 |
+ for x in $LDFLAGS $LTLIB[]NAME; do
|
|
28716 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
28717 |
+ case "$x" in
|
|
28718 |
+ -L*)
|
|
28719 |
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
|
|
28720 |
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
|
|
28721 |
+ found_dir="$dir"
|
|
28722 |
+ found_so="$dir/lib$name.$shlibext"
|
|
28723 |
+ if test -f "$dir/lib$name.la"; then
|
|
28724 |
+ found_la="$dir/lib$name.la"
|
|
28725 |
+ fi
|
|
28726 |
+ else
|
|
28727 |
+ if test -f "$dir/lib$name.$libext"; then
|
|
28728 |
+ found_dir="$dir"
|
|
28729 |
+ found_a="$dir/lib$name.$libext"
|
|
28730 |
+ if test -f "$dir/lib$name.la"; then
|
|
28731 |
+ found_la="$dir/lib$name.la"
|
|
28732 |
+ fi
|
|
28733 |
+ fi
|
|
28734 |
+ fi
|
|
28735 |
+ ;;
|
|
28736 |
+ esac
|
|
28737 |
+ if test "X$found_dir" != "X"; then
|
|
28738 |
+ break
|
|
28739 |
+ fi
|
|
28740 |
+ done
|
|
28741 |
+ fi
|
|
28742 |
+ if test "X$found_dir" != "X"; then
|
|
28743 |
+ dnl Found the library.
|
|
28744 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
|
|
28745 |
+ if test "X$found_so" != "X"; then
|
|
28746 |
+ dnl Linking with a shared library. We attempt to hardcode its
|
|
28747 |
+ dnl directory into the executable's runpath, unless it's the
|
|
28748 |
+ dnl standard /usr/lib.
|
|
28749 |
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
|
|
28750 |
+ dnl No hardcoding is needed.
|
|
28751 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
28752 |
+ else
|
|
28753 |
+ dnl Use an explicit option to hardcode DIR into the resulting
|
|
28754 |
+ dnl binary.
|
|
28755 |
+ dnl Potentially add DIR to ltrpathdirs.
|
|
28756 |
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
28757 |
+ haveit=
|
|
28758 |
+ for x in $ltrpathdirs; do
|
|
28759 |
+ if test "X$x" = "X$found_dir"; then
|
|
28760 |
+ haveit=yes
|
|
28761 |
+ break
|
|
28762 |
+ fi
|
|
28763 |
+ done
|
|
28764 |
+ if test -z "$haveit"; then
|
|
28765 |
+ ltrpathdirs="$ltrpathdirs $found_dir"
|
|
28766 |
+ fi
|
|
28767 |
+ dnl The hardcoding into $LIBNAME is system dependent.
|
|
28768 |
+ if test "$hardcode_direct" = yes; then
|
|
28769 |
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
|
|
28770 |
+ dnl resulting binary.
|
|
28771 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
28772 |
+ else
|
|
28773 |
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
|
28774 |
+ dnl Use an explicit option to hardcode DIR into the resulting
|
|
28775 |
+ dnl binary.
|
|
28776 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
28777 |
+ dnl Potentially add DIR to rpathdirs.
|
|
28778 |
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
28779 |
+ haveit=
|
|
28780 |
+ for x in $rpathdirs; do
|
|
28781 |
+ if test "X$x" = "X$found_dir"; then
|
|
28782 |
+ haveit=yes
|
|
28783 |
+ break
|
|
28784 |
+ fi
|
|
28785 |
+ done
|
|
28786 |
+ if test -z "$haveit"; then
|
|
28787 |
+ rpathdirs="$rpathdirs $found_dir"
|
|
28788 |
+ fi
|
|
28789 |
+ else
|
|
28790 |
+ dnl Rely on "-L$found_dir".
|
|
28791 |
+ dnl But don't add it if it's already contained in the LDFLAGS
|
|
28792 |
+ dnl or the already constructed $LIBNAME
|
|
28793 |
+ haveit=
|
|
28794 |
+ for x in $LDFLAGS $LIB[]NAME; do
|
|
28795 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
28796 |
+ if test "X$x" = "X-L$found_dir"; then
|
|
28797 |
+ haveit=yes
|
|
28798 |
+ break
|
|
28799 |
+ fi
|
|
28800 |
+ done
|
|
28801 |
+ if test -z "$haveit"; then
|
|
28802 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
|
|
28803 |
+ fi
|
|
28804 |
+ if test "$hardcode_minus_L" != no; then
|
|
28805 |
+ dnl FIXME: Not sure whether we should use
|
|
28806 |
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
28807 |
+ dnl here.
|
|
28808 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
28809 |
+ else
|
|
28810 |
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
|
|
28811 |
+ dnl here, because this doesn't fit in flags passed to the
|
|
28812 |
+ dnl compiler. So give up. No hardcoding. This affects only
|
|
28813 |
+ dnl very old systems.
|
|
28814 |
+ dnl FIXME: Not sure whether we should use
|
|
28815 |
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
28816 |
+ dnl here.
|
|
28817 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
28818 |
+ fi
|
|
28819 |
+ fi
|
|
28820 |
+ fi
|
|
28821 |
+ fi
|
|
28822 |
+ else
|
|
28823 |
+ if test "X$found_a" != "X"; then
|
|
28824 |
+ dnl Linking with a static library.
|
|
28825 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
|
|
28826 |
+ else
|
|
28827 |
+ dnl We shouldn't come here, but anyway it's good to have a
|
|
28828 |
+ dnl fallback.
|
|
28829 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
|
|
28830 |
+ fi
|
|
28831 |
+ fi
|
|
28832 |
+ dnl Assume the include files are nearby.
|
|
28833 |
+ additional_includedir=
|
|
28834 |
+ case "$found_dir" in
|
|
28835 |
+ */lib | */lib/)
|
|
28836 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
|
|
28837 |
+ additional_includedir="$basedir/include"
|
|
28838 |
+ ;;
|
|
28839 |
+ esac
|
|
28840 |
+ if test "X$additional_includedir" != "X"; then
|
|
28841 |
+ dnl Potentially add $additional_includedir to $INCNAME.
|
|
28842 |
+ dnl But don't add it
|
|
28843 |
+ dnl 1. if it's the standard /usr/include,
|
|
28844 |
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
|
|
28845 |
+ dnl 3. if it's already present in $CPPFLAGS or the already
|
|
28846 |
+ dnl constructed $INCNAME,
|
|
28847 |
+ dnl 4. if it doesn't exist as a directory.
|
|
28848 |
+ if test "X$additional_includedir" != "X/usr/include"; then
|
|
28849 |
+ haveit=
|
|
28850 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
28851 |
+ if test -n "$GCC"; then
|
|
28852 |
+ case $host_os in
|
|
28853 |
+ linux*) haveit=yes;;
|
|
28854 |
+ esac
|
|
28855 |
+ fi
|
|
28856 |
+ fi
|
|
28857 |
+ if test -z "$haveit"; then
|
|
28858 |
+ for x in $CPPFLAGS $INC[]NAME; do
|
|
28859 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
28860 |
+ if test "X$x" = "X-I$additional_includedir"; then
|
|
28861 |
+ haveit=yes
|
|
28862 |
+ break
|
|
28863 |
+ fi
|
|
28864 |
+ done
|
|
28865 |
+ if test -z "$haveit"; then
|
|
28866 |
+ if test -d "$additional_includedir"; then
|
|
28867 |
+ dnl Really add $additional_includedir to $INCNAME.
|
|
28868 |
+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
|
|
28869 |
+ fi
|
|
28870 |
+ fi
|
|
28871 |
+ fi
|
|
28872 |
+ fi
|
|
28873 |
+ fi
|
|
28874 |
+ dnl Look for dependencies.
|
|
28875 |
+ if test -n "$found_la"; then
|
|
28876 |
+ dnl Read the .la file. It defines the variables
|
|
28877 |
+ dnl dlname, library_names, old_library, dependency_libs, current,
|
|
28878 |
+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
|
|
28879 |
+ save_libdir="$libdir"
|
|
28880 |
+ case "$found_la" in
|
|
28881 |
+ */* | *\\*) . "$found_la" ;;
|
|
28882 |
+ *) . "./$found_la" ;;
|
|
28883 |
+ esac
|
|
28884 |
+ libdir="$save_libdir"
|
|
28885 |
+ dnl We use only dependency_libs.
|
|
28886 |
+ for dep in $dependency_libs; do
|
|
28887 |
+ case "$dep" in
|
|
28888 |
+ -L*)
|
|
28889 |
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
|
28890 |
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
|
|
28891 |
+ dnl But don't add it
|
|
28892 |
+ dnl 1. if it's the standard /usr/lib,
|
|
28893 |
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
|
|
28894 |
+ dnl 3. if it's already present in $LDFLAGS or the already
|
|
28895 |
+ dnl constructed $LIBNAME,
|
|
28896 |
+ dnl 4. if it doesn't exist as a directory.
|
|
28897 |
+ if test "X$additional_libdir" != "X/usr/lib"; then
|
|
28898 |
+ haveit=
|
|
28899 |
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
28900 |
+ if test -n "$GCC"; then
|
|
28901 |
+ case $host_os in
|
|
28902 |
+ linux*) haveit=yes;;
|
|
28903 |
+ esac
|
|
28904 |
+ fi
|
|
28905 |
+ fi
|
|
28906 |
+ if test -z "$haveit"; then
|
|
28907 |
+ haveit=
|
|
28908 |
+ for x in $LDFLAGS $LIB[]NAME; do
|
|
28909 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
28910 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
28911 |
+ haveit=yes
|
|
28912 |
+ break
|
|
28913 |
+ fi
|
|
28914 |
+ done
|
|
28915 |
+ if test -z "$haveit"; then
|
|
28916 |
+ if test -d "$additional_libdir"; then
|
|
28917 |
+ dnl Really add $additional_libdir to $LIBNAME.
|
|
28918 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
|
|
28919 |
+ fi
|
|
28920 |
+ fi
|
|
28921 |
+ haveit=
|
|
28922 |
+ for x in $LDFLAGS $LTLIB[]NAME; do
|
|
28923 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
28924 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
28925 |
+ haveit=yes
|
|
28926 |
+ break
|
|
28927 |
+ fi
|
|
28928 |
+ done
|
|
28929 |
+ if test -z "$haveit"; then
|
|
28930 |
+ if test -d "$additional_libdir"; then
|
|
28931 |
+ dnl Really add $additional_libdir to $LTLIBNAME.
|
|
28932 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
|
|
28933 |
+ fi
|
|
28934 |
+ fi
|
|
28935 |
+ fi
|
|
28936 |
+ fi
|
|
28937 |
+ ;;
|
|
28938 |
+ -R*)
|
|
28939 |
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
|
28940 |
+ if test "$enable_rpath" != no; then
|
|
28941 |
+ dnl Potentially add DIR to rpathdirs.
|
|
28942 |
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
28943 |
+ haveit=
|
|
28944 |
+ for x in $rpathdirs; do
|
|
28945 |
+ if test "X$x" = "X$dir"; then
|
|
28946 |
+ haveit=yes
|
|
28947 |
+ break
|
|
28948 |
+ fi
|
|
28949 |
+ done
|
|
28950 |
+ if test -z "$haveit"; then
|
|
28951 |
+ rpathdirs="$rpathdirs $dir"
|
|
28952 |
+ fi
|
|
28953 |
+ dnl Potentially add DIR to ltrpathdirs.
|
|
28954 |
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
28955 |
+ haveit=
|
|
28956 |
+ for x in $ltrpathdirs; do
|
|
28957 |
+ if test "X$x" = "X$dir"; then
|
|
28958 |
+ haveit=yes
|
|
28959 |
+ break
|
|
28960 |
+ fi
|
|
28961 |
+ done
|
|
28962 |
+ if test -z "$haveit"; then
|
|
28963 |
+ ltrpathdirs="$ltrpathdirs $dir"
|
|
28964 |
+ fi
|
|
28965 |
+ fi
|
|
28966 |
+ ;;
|
|
28967 |
+ -l*)
|
|
28968 |
+ dnl Handle this in the next round.
|
|
28969 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
|
28970 |
+ ;;
|
|
28971 |
+ *.la)
|
|
28972 |
+ dnl Handle this in the next round. Throw away the .la's
|
|
28973 |
+ dnl directory; it is already contained in a preceding -L
|
|
28974 |
+ dnl option.
|
|
28975 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
|
28976 |
+ ;;
|
|
28977 |
+ *)
|
|
28978 |
+ dnl Most likely an immediate library name.
|
|
28979 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
|
|
28980 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
|
|
28981 |
+ ;;
|
|
28982 |
+ esac
|
|
28983 |
+ done
|
|
28984 |
+ fi
|
|
28985 |
+ else
|
|
28986 |
+ dnl Didn't find the library; assume it is in the system directories
|
|
28987 |
+ dnl known to the linker and runtime loader. (All the system
|
|
28988 |
+ dnl directories known to the linker should also be known to the
|
|
28989 |
+ dnl runtime loader, otherwise the system is severely misconfigured.)
|
|
28990 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
28991 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
|
|
28992 |
+ fi
|
|
28993 |
+ fi
|
|
28994 |
+ fi
|
|
28995 |
+ done
|
|
28996 |
+ done
|
|
28997 |
+ if test "X$rpathdirs" != "X"; then
|
|
28998 |
+ if test -n "$hardcode_libdir_separator"; then
|
|
28999 |
+ dnl Weird platform: only the last -rpath option counts, the user must
|
|
29000 |
+ dnl pass all path elements in one option. We can arrange that for a
|
|
29001 |
+ dnl single library, but not when more than one $LIBNAMEs are used.
|
|
29002 |
+ alldirs=
|
|
29003 |
+ for found_dir in $rpathdirs; do
|
|
29004 |
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
|
29005 |
+ done
|
|
29006 |
+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
|
|
29007 |
+ acl_save_libdir="$libdir"
|
|
29008 |
+ libdir="$alldirs"
|
|
29009 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
29010 |
+ libdir="$acl_save_libdir"
|
|
29011 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
29012 |
+ else
|
|
29013 |
+ dnl The -rpath options are cumulative.
|
|
29014 |
+ for found_dir in $rpathdirs; do
|
|
29015 |
+ acl_save_libdir="$libdir"
|
|
29016 |
+ libdir="$found_dir"
|
|
29017 |
+ eval flag=\"$hardcode_libdir_flag_spec\"
|
|
29018 |
+ libdir="$acl_save_libdir"
|
|
29019 |
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
29020 |
+ done
|
|
29021 |
+ fi
|
|
29022 |
+ fi
|
|
29023 |
+ if test "X$ltrpathdirs" != "X"; then
|
|
29024 |
+ dnl When using libtool, the option that works for both libraries and
|
|
29025 |
+ dnl executables is -R. The -R options are cumulative.
|
|
29026 |
+ for found_dir in $ltrpathdirs; do
|
|
29027 |
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
|
29028 |
+ done
|
|
29029 |
+ fi
|
|
29030 |
+])
|
|
29031 |
+
|
|
29032 |
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
|
29033 |
+dnl unless already present in VAR.
|
|
29034 |
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
|
|
29035 |
+dnl contains two or three consecutive elements that belong together.
|
|
29036 |
+AC_DEFUN([AC_LIB_APPENDTOVAR],
|
|
29037 |
+[
|
|
29038 |
+ for element in [$2]; do
|
|
29039 |
+ haveit=
|
|
29040 |
+ for x in $[$1]; do
|
|
29041 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
29042 |
+ if test "X$x" = "X$element"; then
|
|
29043 |
+ haveit=yes
|
|
29044 |
+ break
|
|
29045 |
+ fi
|
|
29046 |
+ done
|
|
29047 |
+ if test -z "$haveit"; then
|
|
29048 |
+ [$1]="${[$1]}${[$1]:+ }$element"
|
|
29049 |
+ fi
|
|
29050 |
+ done
|
|
29051 |
+])
|
|
29052 |
diff -pruN dillo-0.8.6/m4/lib-prefix.m4 dillo-0.8.6-i18n-misc-20070916/m4/lib-prefix.m4
|
|
29053 |
--- dillo-0.8.6/m4/lib-prefix.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29054 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/lib-prefix.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29055 |
@@ -0,0 +1,148 @@
|
|
29056 |
+# lib-prefix.m4 serial 1 (gettext-0.11)
|
|
29057 |
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
|
29058 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29059 |
+dnl General Public License. As a special exception to the GNU General
|
|
29060 |
+dnl Public License, this file may be distributed as part of a program
|
|
29061 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29062 |
+dnl the same distribution terms as the rest of that program.
|
|
29063 |
+
|
|
29064 |
+dnl From Bruno Haible.
|
|
29065 |
+
|
|
29066 |
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
|
|
29067 |
+dnl to access previously installed libraries. The basic assumption is that
|
|
29068 |
+dnl a user will want packages to use other packages he previously installed
|
|
29069 |
+dnl with the same --prefix option.
|
|
29070 |
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
|
|
29071 |
+dnl libraries, but is otherwise very convenient.
|
|
29072 |
+AC_DEFUN([AC_LIB_PREFIX],
|
|
29073 |
+[
|
|
29074 |
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
|
|
29075 |
+ AC_REQUIRE([AC_PROG_CC])
|
|
29076 |
+ AC_REQUIRE([AC_CANONICAL_HOST])
|
|
29077 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
29078 |
+ dnl By default, look in $includedir and $libdir.
|
|
29079 |
+ use_additional=yes
|
|
29080 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
29081 |
+ eval additional_includedir=\"$includedir\"
|
|
29082 |
+ eval additional_libdir=\"$libdir\"
|
|
29083 |
+ ])
|
|
29084 |
+ AC_ARG_WITH([lib-prefix],
|
|
29085 |
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
|
|
29086 |
+ --without-lib-prefix don't search for libraries in includedir and libdir],
|
|
29087 |
+[
|
|
29088 |
+ if test "X$withval" = "Xno"; then
|
|
29089 |
+ use_additional=no
|
|
29090 |
+ else
|
|
29091 |
+ if test "X$withval" = "X"; then
|
|
29092 |
+ AC_LIB_WITH_FINAL_PREFIX([
|
|
29093 |
+ eval additional_includedir=\"$includedir\"
|
|
29094 |
+ eval additional_libdir=\"$libdir\"
|
|
29095 |
+ ])
|
|
29096 |
+ else
|
|
29097 |
+ additional_includedir="$withval/include"
|
|
29098 |
+ additional_libdir="$withval/lib"
|
|
29099 |
+ fi
|
|
29100 |
+ fi
|
|
29101 |
+])
|
|
29102 |
+ if test $use_additional = yes; then
|
|
29103 |
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
|
|
29104 |
+ dnl But don't add it
|
|
29105 |
+ dnl 1. if it's the standard /usr/include,
|
|
29106 |
+ dnl 2. if it's already present in $CPPFLAGS,
|
|
29107 |
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
|
|
29108 |
+ dnl 4. if it doesn't exist as a directory.
|
|
29109 |
+ if test "X$additional_includedir" != "X/usr/include"; then
|
|
29110 |
+ haveit=
|
|
29111 |
+ for x in $CPPFLAGS; do
|
|
29112 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
29113 |
+ if test "X$x" = "X-I$additional_includedir"; then
|
|
29114 |
+ haveit=yes
|
|
29115 |
+ break
|
|
29116 |
+ fi
|
|
29117 |
+ done
|
|
29118 |
+ if test -z "$haveit"; then
|
|
29119 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
29120 |
+ if test -n "$GCC"; then
|
|
29121 |
+ case $host_os in
|
|
29122 |
+ linux*) haveit=yes;;
|
|
29123 |
+ esac
|
|
29124 |
+ fi
|
|
29125 |
+ fi
|
|
29126 |
+ if test -z "$haveit"; then
|
|
29127 |
+ if test -d "$additional_includedir"; then
|
|
29128 |
+ dnl Really add $additional_includedir to $CPPFLAGS.
|
|
29129 |
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
|
|
29130 |
+ fi
|
|
29131 |
+ fi
|
|
29132 |
+ fi
|
|
29133 |
+ fi
|
|
29134 |
+ dnl Potentially add $additional_libdir to $LDFLAGS.
|
|
29135 |
+ dnl But don't add it
|
|
29136 |
+ dnl 1. if it's the standard /usr/lib,
|
|
29137 |
+ dnl 2. if it's already present in $LDFLAGS,
|
|
29138 |
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
|
|
29139 |
+ dnl 4. if it doesn't exist as a directory.
|
|
29140 |
+ if test "X$additional_libdir" != "X/usr/lib"; then
|
|
29141 |
+ haveit=
|
|
29142 |
+ for x in $LDFLAGS; do
|
|
29143 |
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
29144 |
+ if test "X$x" = "X-L$additional_libdir"; then
|
|
29145 |
+ haveit=yes
|
|
29146 |
+ break
|
|
29147 |
+ fi
|
|
29148 |
+ done
|
|
29149 |
+ if test -z "$haveit"; then
|
|
29150 |
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
29151 |
+ if test -n "$GCC"; then
|
|
29152 |
+ case $host_os in
|
|
29153 |
+ linux*) haveit=yes;;
|
|
29154 |
+ esac
|
|
29155 |
+ fi
|
|
29156 |
+ fi
|
|
29157 |
+ if test -z "$haveit"; then
|
|
29158 |
+ if test -d "$additional_libdir"; then
|
|
29159 |
+ dnl Really add $additional_libdir to $LDFLAGS.
|
|
29160 |
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
|
|
29161 |
+ fi
|
|
29162 |
+ fi
|
|
29163 |
+ fi
|
|
29164 |
+ fi
|
|
29165 |
+ fi
|
|
29166 |
+])
|
|
29167 |
+
|
|
29168 |
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
|
|
29169 |
+dnl acl_final_exec_prefix, containing the values to which $prefix and
|
|
29170 |
+dnl $exec_prefix will expand at the end of the configure script.
|
|
29171 |
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
|
|
29172 |
+[
|
|
29173 |
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
|
|
29174 |
+ dnl at the end of configure.
|
|
29175 |
+ if test "X$prefix" = "XNONE"; then
|
|
29176 |
+ acl_final_prefix="$ac_default_prefix"
|
|
29177 |
+ else
|
|
29178 |
+ acl_final_prefix="$prefix"
|
|
29179 |
+ fi
|
|
29180 |
+ if test "X$exec_prefix" = "XNONE"; then
|
|
29181 |
+ acl_final_exec_prefix='${prefix}'
|
|
29182 |
+ else
|
|
29183 |
+ acl_final_exec_prefix="$exec_prefix"
|
|
29184 |
+ fi
|
|
29185 |
+ acl_save_prefix="$prefix"
|
|
29186 |
+ prefix="$acl_final_prefix"
|
|
29187 |
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
|
29188 |
+ prefix="$acl_save_prefix"
|
|
29189 |
+])
|
|
29190 |
+
|
|
29191 |
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
|
|
29192 |
+dnl variables prefix and exec_prefix bound to the values they will have
|
|
29193 |
+dnl at the end of the configure script.
|
|
29194 |
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
|
29195 |
+[
|
|
29196 |
+ acl_save_prefix="$prefix"
|
|
29197 |
+ prefix="$acl_final_prefix"
|
|
29198 |
+ acl_save_exec_prefix="$exec_prefix"
|
|
29199 |
+ exec_prefix="$acl_final_exec_prefix"
|
|
29200 |
+ $1
|
|
29201 |
+ exec_prefix="$acl_save_exec_prefix"
|
|
29202 |
+ prefix="$acl_save_prefix"
|
|
29203 |
+])
|
|
29204 |
diff -pruN dillo-0.8.6/m4/longdouble.m4 dillo-0.8.6-i18n-misc-20070916/m4/longdouble.m4
|
|
29205 |
--- dillo-0.8.6/m4/longdouble.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29206 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/longdouble.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29207 |
@@ -0,0 +1,30 @@
|
|
29208 |
+# longdouble.m4 serial 1 (gettext-0.12)
|
|
29209 |
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
|
29210 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29211 |
+dnl General Public License. As a special exception to the GNU General
|
|
29212 |
+dnl Public License, this file may be distributed as part of a program
|
|
29213 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29214 |
+dnl the same distribution terms as the rest of that program.
|
|
29215 |
+
|
|
29216 |
+dnl From Bruno Haible.
|
|
29217 |
+dnl Test whether the compiler supports the 'long double' type.
|
|
29218 |
+dnl Prerequisite: AC_PROG_CC
|
|
29219 |
+
|
|
29220 |
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
|
|
29221 |
+[
|
|
29222 |
+ AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
|
|
29223 |
+ [if test "$GCC" = yes; then
|
|
29224 |
+ gt_cv_c_long_double=yes
|
|
29225 |
+ else
|
|
29226 |
+ AC_TRY_COMPILE([
|
|
29227 |
+ /* The Stardent Vistra knows sizeof(long double), but does not support it. */
|
|
29228 |
+ long double foo = 0.0;
|
|
29229 |
+ /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
|
|
29230 |
+ int array [2*(sizeof(long double) >= sizeof(double)) - 1];
|
|
29231 |
+ ], ,
|
|
29232 |
+ gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
|
|
29233 |
+ fi])
|
|
29234 |
+ if test $gt_cv_c_long_double = yes; then
|
|
29235 |
+ AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
|
|
29236 |
+ fi
|
|
29237 |
+])
|
|
29238 |
diff -pruN dillo-0.8.6/m4/longlong.m4 dillo-0.8.6-i18n-misc-20070916/m4/longlong.m4
|
|
29239 |
--- dillo-0.8.6/m4/longlong.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29240 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/longlong.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29241 |
@@ -0,0 +1,25 @@
|
|
29242 |
+# longlong.m4 serial 4
|
|
29243 |
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
|
29244 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29245 |
+dnl General Public License. As a special exception to the GNU General
|
|
29246 |
+dnl Public License, this file may be distributed as part of a program
|
|
29247 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29248 |
+dnl the same distribution terms as the rest of that program.
|
|
29249 |
+
|
|
29250 |
+dnl From Paul Eggert.
|
|
29251 |
+
|
|
29252 |
+# Define HAVE_LONG_LONG if 'long long' works.
|
|
29253 |
+
|
|
29254 |
+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
|
|
29255 |
+[
|
|
29256 |
+ AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
|
|
29257 |
+ [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
|
|
29258 |
+ [long long llmax = (long long) -1;
|
|
29259 |
+ return ll << i | ll >> i | llmax / ll | llmax % ll;],
|
|
29260 |
+ ac_cv_type_long_long=yes,
|
|
29261 |
+ ac_cv_type_long_long=no)])
|
|
29262 |
+ if test $ac_cv_type_long_long = yes; then
|
|
29263 |
+ AC_DEFINE(HAVE_LONG_LONG, 1,
|
|
29264 |
+ [Define if you have the 'long long' type.])
|
|
29265 |
+ fi
|
|
29266 |
+])
|
|
29267 |
diff -pruN dillo-0.8.6/m4/nls.m4 dillo-0.8.6-i18n-misc-20070916/m4/nls.m4
|
|
29268 |
--- dillo-0.8.6/m4/nls.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29269 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/nls.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29270 |
@@ -0,0 +1,49 @@
|
|
29271 |
+# nls.m4 serial 1 (gettext-0.12)
|
|
29272 |
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
|
|
29273 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29274 |
+dnl General Public License. As a special exception to the GNU General
|
|
29275 |
+dnl Public License, this file may be distributed as part of a program
|
|
29276 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29277 |
+dnl the same distribution terms as the rest of that program.
|
|
29278 |
+dnl
|
|
29279 |
+dnl This file can can be used in projects which are not available under
|
|
29280 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
29281 |
+dnl License but which still want to provide support for the GNU gettext
|
|
29282 |
+dnl functionality.
|
|
29283 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
29284 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
29285 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
29286 |
+dnl They are *not* in the public domain.
|
|
29287 |
+
|
|
29288 |
+dnl Authors:
|
|
29289 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
29290 |
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
|
29291 |
+
|
|
29292 |
+AC_DEFUN([AM_NLS],
|
|
29293 |
+[
|
|
29294 |
+ AC_MSG_CHECKING([whether NLS is requested])
|
|
29295 |
+ dnl Default is enabled NLS
|
|
29296 |
+ AC_ARG_ENABLE(nls,
|
|
29297 |
+ [ --disable-nls do not use Native Language Support],
|
|
29298 |
+ USE_NLS=$enableval, USE_NLS=yes)
|
|
29299 |
+ AC_MSG_RESULT($USE_NLS)
|
|
29300 |
+ AC_SUBST(USE_NLS)
|
|
29301 |
+])
|
|
29302 |
+
|
|
29303 |
+AC_DEFUN([AM_MKINSTALLDIRS],
|
|
29304 |
+[
|
|
29305 |
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
|
29306 |
+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
|
29307 |
+ dnl Try to locate it.
|
|
29308 |
+ MKINSTALLDIRS=
|
|
29309 |
+ if test -n "$ac_aux_dir"; then
|
|
29310 |
+ case "$ac_aux_dir" in
|
|
29311 |
+ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
|
|
29312 |
+ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
|
|
29313 |
+ esac
|
|
29314 |
+ fi
|
|
29315 |
+ if test -z "$MKINSTALLDIRS"; then
|
|
29316 |
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
29317 |
+ fi
|
|
29318 |
+ AC_SUBST(MKINSTALLDIRS)
|
|
29319 |
+])
|
|
29320 |
diff -pruN dillo-0.8.6/m4/po.m4 dillo-0.8.6-i18n-misc-20070916/m4/po.m4
|
|
29321 |
--- dillo-0.8.6/m4/po.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29322 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/po.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29323 |
@@ -0,0 +1,426 @@
|
|
29324 |
+# po.m4 serial 3 (gettext-0.14)
|
|
29325 |
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
|
|
29326 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29327 |
+dnl General Public License. As a special exception to the GNU General
|
|
29328 |
+dnl Public License, this file may be distributed as part of a program
|
|
29329 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29330 |
+dnl the same distribution terms as the rest of that program.
|
|
29331 |
+dnl
|
|
29332 |
+dnl This file can can be used in projects which are not available under
|
|
29333 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
29334 |
+dnl License but which still want to provide support for the GNU gettext
|
|
29335 |
+dnl functionality.
|
|
29336 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
29337 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
29338 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
29339 |
+dnl They are *not* in the public domain.
|
|
29340 |
+
|
|
29341 |
+dnl Authors:
|
|
29342 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
29343 |
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
|
29344 |
+
|
|
29345 |
+dnl Checks for all prerequisites of the po subdirectory.
|
|
29346 |
+AC_DEFUN([AM_PO_SUBDIRS],
|
|
29347 |
+[
|
|
29348 |
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
29349 |
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
29350 |
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
29351 |
+ AC_REQUIRE([AM_NLS])dnl
|
|
29352 |
+
|
|
29353 |
+ dnl Perform the following tests also if --disable-nls has been given,
|
|
29354 |
+ dnl because they are needed for "make dist" to work.
|
|
29355 |
+
|
|
29356 |
+ dnl Search for GNU msgfmt in the PATH.
|
|
29357 |
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
|
29358 |
+ dnl The second test excludes FreeBSD msgfmt.
|
|
29359 |
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
|
29360 |
+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
|
|
29361 |
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
29362 |
+ :)
|
|
29363 |
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
29364 |
+
|
|
29365 |
+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
|
|
29366 |
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
|
29367 |
+ dnl The second test excludes FreeBSD xgettext.
|
|
29368 |
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
29369 |
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
|
|
29370 |
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
29371 |
+ :)
|
|
29372 |
+ dnl Remove leftover from FreeBSD xgettext call.
|
|
29373 |
+ rm -f messages.po
|
|
29374 |
+
|
|
29375 |
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
|
29376 |
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
|
29377 |
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
|
|
29378 |
+
|
|
29379 |
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
29380 |
+ dnl Test whether we really found GNU msgfmt.
|
|
29381 |
+ if test "$GMSGFMT" != ":"; then
|
|
29382 |
+ dnl If it is no GNU msgfmt we define it as : so that the
|
|
29383 |
+ dnl Makefiles still can work.
|
|
29384 |
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
|
|
29385 |
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
29386 |
+ : ;
|
|
29387 |
+ else
|
|
29388 |
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
|
|
29389 |
+ AC_MSG_RESULT(
|
|
29390 |
+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
|
|
29391 |
+ GMSGFMT=":"
|
|
29392 |
+ fi
|
|
29393 |
+ fi
|
|
29394 |
+
|
|
29395 |
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
29396 |
+ dnl Test whether we really found GNU xgettext.
|
|
29397 |
+ if test "$XGETTEXT" != ":"; then
|
|
29398 |
+ dnl If it is no GNU xgettext we define it as : so that the
|
|
29399 |
+ dnl Makefiles still can work.
|
|
29400 |
+ if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
|
|
29401 |
+ (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
29402 |
+ : ;
|
|
29403 |
+ else
|
|
29404 |
+ AC_MSG_RESULT(
|
|
29405 |
+ [found xgettext program is not GNU xgettext; ignore it])
|
|
29406 |
+ XGETTEXT=":"
|
|
29407 |
+ fi
|
|
29408 |
+ dnl Remove leftover from FreeBSD xgettext call.
|
|
29409 |
+ rm -f messages.po
|
|
29410 |
+ fi
|
|
29411 |
+
|
|
29412 |
+ AC_OUTPUT_COMMANDS([
|
|
29413 |
+ for ac_file in $CONFIG_FILES; do
|
|
29414 |
+ # Support "outfile[:infile[:infile...]]"
|
|
29415 |
+ case "$ac_file" in
|
|
29416 |
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
29417 |
+ esac
|
|
29418 |
+ # PO directories have a Makefile.in generated from Makefile.in.in.
|
|
29419 |
+ case "$ac_file" in */Makefile.in)
|
|
29420 |
+ # Adjust a relative srcdir.
|
|
29421 |
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
29422 |
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
29423 |
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
29424 |
+ # In autoconf-2.13 it is called $ac_given_srcdir.
|
|
29425 |
+ # In autoconf-2.50 it is called $srcdir.
|
|
29426 |
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
|
29427 |
+ case "$ac_given_srcdir" in
|
|
29428 |
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
29429 |
+ /*) top_srcdir="$ac_given_srcdir" ;;
|
|
29430 |
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
29431 |
+ esac
|
|
29432 |
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
|
29433 |
+ rm -f "$ac_dir/POTFILES"
|
|
29434 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
|
29435 |
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
|
|
29436 |
+ POMAKEFILEDEPS="POTFILES.in"
|
|
29437 |
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
|
|
29438 |
+ # on $ac_dir but don't depend on user-specified configuration
|
|
29439 |
+ # parameters.
|
|
29440 |
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
|
29441 |
+ # The LINGUAS file contains the set of available languages.
|
|
29442 |
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
|
|
29443 |
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
|
29444 |
+ fi
|
|
29445 |
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
|
29446 |
+ # Hide the ALL_LINGUAS assigment from automake.
|
|
29447 |
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
|
29448 |
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
|
29449 |
+ else
|
|
29450 |
+ # The set of available languages was given in configure.in.
|
|
29451 |
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
|
|
29452 |
+ fi
|
|
29453 |
+ # Compute POFILES
|
|
29454 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
|
|
29455 |
+ # Compute UPDATEPOFILES
|
|
29456 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
|
|
29457 |
+ # Compute DUMMYPOFILES
|
|
29458 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
|
|
29459 |
+ # Compute GMOFILES
|
|
29460 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
|
|
29461 |
+ case "$ac_given_srcdir" in
|
|
29462 |
+ .) srcdirpre= ;;
|
|
29463 |
+ *) srcdirpre='$(srcdir)/' ;;
|
|
29464 |
+ esac
|
|
29465 |
+ POFILES=
|
|
29466 |
+ UPDATEPOFILES=
|
|
29467 |
+ DUMMYPOFILES=
|
|
29468 |
+ GMOFILES=
|
|
29469 |
+ for lang in $ALL_LINGUAS; do
|
|
29470 |
+ POFILES="$POFILES $srcdirpre$lang.po"
|
|
29471 |
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
|
29472 |
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
|
29473 |
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
|
29474 |
+ done
|
|
29475 |
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
29476 |
+ # environment variable.
|
|
29477 |
+ INST_LINGUAS=
|
|
29478 |
+ if test -n "$ALL_LINGUAS"; then
|
|
29479 |
+ for presentlang in $ALL_LINGUAS; do
|
|
29480 |
+ useit=no
|
|
29481 |
+ if test "%UNSET%" != "$LINGUAS"; then
|
|
29482 |
+ desiredlanguages="$LINGUAS"
|
|
29483 |
+ else
|
|
29484 |
+ desiredlanguages="$ALL_LINGUAS"
|
|
29485 |
+ fi
|
|
29486 |
+ for desiredlang in $desiredlanguages; do
|
|
29487 |
+ # Use the presentlang catalog if desiredlang is
|
|
29488 |
+ # a. equal to presentlang, or
|
|
29489 |
+ # b. a variant of presentlang (because in this case,
|
|
29490 |
+ # presentlang can be used as a fallback for messages
|
|
29491 |
+ # which are not translated in the desiredlang catalog).
|
|
29492 |
+ case "$desiredlang" in
|
|
29493 |
+ "$presentlang"*) useit=yes;;
|
|
29494 |
+ esac
|
|
29495 |
+ done
|
|
29496 |
+ if test $useit = yes; then
|
|
29497 |
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
|
|
29498 |
+ fi
|
|
29499 |
+ done
|
|
29500 |
+ fi
|
|
29501 |
+ CATALOGS=
|
|
29502 |
+ if test -n "$INST_LINGUAS"; then
|
|
29503 |
+ for lang in $INST_LINGUAS; do
|
|
29504 |
+ CATALOGS="$CATALOGS $lang.gmo"
|
|
29505 |
+ done
|
|
29506 |
+ fi
|
|
29507 |
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
|
|
29508 |
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
|
29509 |
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
|
|
29510 |
+ if test -f "$f"; then
|
|
29511 |
+ case "$f" in
|
|
29512 |
+ *.orig | *.bak | *~) ;;
|
|
29513 |
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
|
|
29514 |
+ esac
|
|
29515 |
+ fi
|
|
29516 |
+ done
|
|
29517 |
+ fi
|
|
29518 |
+ ;;
|
|
29519 |
+ esac
|
|
29520 |
+ done],
|
|
29521 |
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
|
|
29522 |
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
|
|
29523 |
+ # from automake.
|
|
29524 |
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
|
|
29525 |
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
|
|
29526 |
+ LINGUAS="${LINGUAS-%UNSET%}"
|
|
29527 |
+ ])
|
|
29528 |
+])
|
|
29529 |
+
|
|
29530 |
+dnl Postprocesses a Makefile in a directory containing PO files.
|
|
29531 |
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
|
|
29532 |
+[
|
|
29533 |
+ # When this code is run, in config.status, two variables have already been
|
|
29534 |
+ # set:
|
|
29535 |
+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
|
|
29536 |
+ # - LINGUAS is the value of the environment variable LINGUAS at configure
|
|
29537 |
+ # time.
|
|
29538 |
+
|
|
29539 |
+changequote(,)dnl
|
|
29540 |
+ # Adjust a relative srcdir.
|
|
29541 |
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
29542 |
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
29543 |
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
29544 |
+ # In autoconf-2.13 it is called $ac_given_srcdir.
|
|
29545 |
+ # In autoconf-2.50 it is called $srcdir.
|
|
29546 |
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
|
29547 |
+ case "$ac_given_srcdir" in
|
|
29548 |
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
29549 |
+ /*) top_srcdir="$ac_given_srcdir" ;;
|
|
29550 |
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
29551 |
+ esac
|
|
29552 |
+
|
|
29553 |
+ # Find a way to echo strings without interpreting backslash.
|
|
29554 |
+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
|
|
29555 |
+ gt_echo='echo'
|
|
29556 |
+ else
|
|
29557 |
+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
|
|
29558 |
+ gt_echo='printf %s\n'
|
|
29559 |
+ else
|
|
29560 |
+ echo_func () {
|
|
29561 |
+ cat <<EOT
|
|
29562 |
+$*
|
|
29563 |
+EOT
|
|
29564 |
+ }
|
|
29565 |
+ gt_echo='echo_func'
|
|
29566 |
+ fi
|
|
29567 |
+ fi
|
|
29568 |
+
|
|
29569 |
+ # A sed script that extracts the value of VARIABLE from a Makefile.
|
|
29570 |
+ sed_x_variable='
|
|
29571 |
+# Test if the hold space is empty.
|
|
29572 |
+x
|
|
29573 |
+s/P/P/
|
|
29574 |
+x
|
|
29575 |
+ta
|
|
29576 |
+# Yes it was empty. Look if we have the expected variable definition.
|
|
29577 |
+/^[ ]*VARIABLE[ ]*=/{
|
|
29578 |
+ # Seen the first line of the variable definition.
|
|
29579 |
+ s/^[ ]*VARIABLE[ ]*=//
|
|
29580 |
+ ba
|
|
29581 |
+}
|
|
29582 |
+bd
|
|
29583 |
+:a
|
|
29584 |
+# Here we are processing a line from the variable definition.
|
|
29585 |
+# Remove comment, more precisely replace it with a space.
|
|
29586 |
+s/#.*$/ /
|
|
29587 |
+# See if the line ends in a backslash.
|
|
29588 |
+tb
|
|
29589 |
+:b
|
|
29590 |
+s/\\$//
|
|
29591 |
+# Print the line, without the trailing backslash.
|
|
29592 |
+p
|
|
29593 |
+tc
|
|
29594 |
+# There was no trailing backslash. The end of the variable definition is
|
|
29595 |
+# reached. Clear the hold space.
|
|
29596 |
+s/^.*$//
|
|
29597 |
+x
|
|
29598 |
+bd
|
|
29599 |
+:c
|
|
29600 |
+# A trailing backslash means that the variable definition continues in the
|
|
29601 |
+# next line. Put a nonempty string into the hold space to indicate this.
|
|
29602 |
+s/^.*$/P/
|
|
29603 |
+x
|
|
29604 |
+:d
|
|
29605 |
+'
|
|
29606 |
+changequote([,])dnl
|
|
29607 |
+
|
|
29608 |
+ # Set POTFILES to the value of the Makefile variable POTFILES.
|
|
29609 |
+ sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
|
|
29610 |
+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
|
|
29611 |
+ # Compute POTFILES_DEPS as
|
|
29612 |
+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
|
|
29613 |
+ POTFILES_DEPS=
|
|
29614 |
+ for file in $POTFILES; do
|
|
29615 |
+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
|
|
29616 |
+ done
|
|
29617 |
+ POMAKEFILEDEPS=""
|
|
29618 |
+
|
|
29619 |
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
|
|
29620 |
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
|
29621 |
+ fi
|
|
29622 |
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
|
29623 |
+ # The LINGUAS file contains the set of available languages.
|
|
29624 |
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
|
29625 |
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
|
29626 |
+ else
|
|
29627 |
+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
|
|
29628 |
+ sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
|
|
29629 |
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
|
|
29630 |
+ fi
|
|
29631 |
+ # Hide the ALL_LINGUAS assigment from automake.
|
|
29632 |
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
|
29633 |
+ # Compute POFILES
|
|
29634 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
|
|
29635 |
+ # Compute UPDATEPOFILES
|
|
29636 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
|
|
29637 |
+ # Compute DUMMYPOFILES
|
|
29638 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
|
|
29639 |
+ # Compute GMOFILES
|
|
29640 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
|
|
29641 |
+ # Compute PROPERTIESFILES
|
|
29642 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
|
|
29643 |
+ # Compute CLASSFILES
|
|
29644 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
|
|
29645 |
+ # Compute QMFILES
|
|
29646 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
|
|
29647 |
+ # Compute MSGFILES
|
|
29648 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
|
|
29649 |
+ # Compute RESOURCESDLLFILES
|
|
29650 |
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
|
|
29651 |
+ case "$ac_given_srcdir" in
|
|
29652 |
+ .) srcdirpre= ;;
|
|
29653 |
+ *) srcdirpre='$(srcdir)/' ;;
|
|
29654 |
+ esac
|
|
29655 |
+ POFILES=
|
|
29656 |
+ UPDATEPOFILES=
|
|
29657 |
+ DUMMYPOFILES=
|
|
29658 |
+ GMOFILES=
|
|
29659 |
+ PROPERTIESFILES=
|
|
29660 |
+ CLASSFILES=
|
|
29661 |
+ QMFILES=
|
|
29662 |
+ MSGFILES=
|
|
29663 |
+ RESOURCESDLLFILES=
|
|
29664 |
+ for lang in $ALL_LINGUAS; do
|
|
29665 |
+ POFILES="$POFILES $srcdirpre$lang.po"
|
|
29666 |
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
|
29667 |
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
|
29668 |
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
|
29669 |
+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
|
|
29670 |
+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
|
|
29671 |
+ QMFILES="$QMFILES $srcdirpre$lang.qm"
|
|
29672 |
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
|
29673 |
+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
|
|
29674 |
+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
|
29675 |
+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
|
|
29676 |
+ done
|
|
29677 |
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
29678 |
+ # environment variable.
|
|
29679 |
+ INST_LINGUAS=
|
|
29680 |
+ if test -n "$ALL_LINGUAS"; then
|
|
29681 |
+ for presentlang in $ALL_LINGUAS; do
|
|
29682 |
+ useit=no
|
|
29683 |
+ if test "%UNSET%" != "$LINGUAS"; then
|
|
29684 |
+ desiredlanguages="$LINGUAS"
|
|
29685 |
+ else
|
|
29686 |
+ desiredlanguages="$ALL_LINGUAS"
|
|
29687 |
+ fi
|
|
29688 |
+ for desiredlang in $desiredlanguages; do
|
|
29689 |
+ # Use the presentlang catalog if desiredlang is
|
|
29690 |
+ # a. equal to presentlang, or
|
|
29691 |
+ # b. a variant of presentlang (because in this case,
|
|
29692 |
+ # presentlang can be used as a fallback for messages
|
|
29693 |
+ # which are not translated in the desiredlang catalog).
|
|
29694 |
+ case "$desiredlang" in
|
|
29695 |
+ "$presentlang"*) useit=yes;;
|
|
29696 |
+ esac
|
|
29697 |
+ done
|
|
29698 |
+ if test $useit = yes; then
|
|
29699 |
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
|
|
29700 |
+ fi
|
|
29701 |
+ done
|
|
29702 |
+ fi
|
|
29703 |
+ CATALOGS=
|
|
29704 |
+ JAVACATALOGS=
|
|
29705 |
+ QTCATALOGS=
|
|
29706 |
+ TCLCATALOGS=
|
|
29707 |
+ CSHARPCATALOGS=
|
|
29708 |
+ if test -n "$INST_LINGUAS"; then
|
|
29709 |
+ for lang in $INST_LINGUAS; do
|
|
29710 |
+ CATALOGS="$CATALOGS $lang.gmo"
|
|
29711 |
+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
|
|
29712 |
+ QTCATALOGS="$QTCATALOGS $lang.qm"
|
|
29713 |
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
|
29714 |
+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
|
|
29715 |
+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
|
29716 |
+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
|
|
29717 |
+ done
|
|
29718 |
+ fi
|
|
29719 |
+
|
|
29720 |
+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
|
|
29721 |
+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
|
|
29722 |
+ # Add dependencies that cannot be formulated as a simple suffix rule.
|
|
29723 |
+ for lang in $ALL_LINGUAS; do
|
|
29724 |
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
|
29725 |
+ cat >> "$ac_file.tmp" <<EOF
|
|
29726 |
+$frobbedlang.msg: $lang.po
|
|
29727 |
+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
|
|
29728 |
+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
|
|
29729 |
+EOF
|
|
29730 |
+ done
|
|
29731 |
+ fi
|
|
29732 |
+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
|
|
29733 |
+ # Add dependencies that cannot be formulated as a simple suffix rule.
|
|
29734 |
+ for lang in $ALL_LINGUAS; do
|
|
29735 |
+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
|
29736 |
+ cat >> "$ac_file.tmp" <<EOF
|
|
29737 |
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
|
|
29738 |
+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
|
|
29739 |
+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
|
|
29740 |
+EOF
|
|
29741 |
+ done
|
|
29742 |
+ fi
|
|
29743 |
+ if test -n "$POMAKEFILEDEPS"; then
|
|
29744 |
+ cat >> "$ac_file.tmp" <<EOF
|
|
29745 |
+Makefile: $POMAKEFILEDEPS
|
|
29746 |
+EOF
|
|
29747 |
+ fi
|
|
29748 |
+ mv "$ac_file.tmp" "$ac_file"
|
|
29749 |
+])
|
|
29750 |
diff -pruN dillo-0.8.6/m4/printf-posix.m4 dillo-0.8.6-i18n-misc-20070916/m4/printf-posix.m4
|
|
29751 |
--- dillo-0.8.6/m4/printf-posix.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29752 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/printf-posix.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29753 |
@@ -0,0 +1,46 @@
|
|
29754 |
+# printf-posix.m4 serial 2 (gettext-0.13.1)
|
|
29755 |
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
|
29756 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29757 |
+dnl General Public License. As a special exception to the GNU General
|
|
29758 |
+dnl Public License, this file may be distributed as part of a program
|
|
29759 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29760 |
+dnl the same distribution terms as the rest of that program.
|
|
29761 |
+
|
|
29762 |
+dnl From Bruno Haible.
|
|
29763 |
+dnl Test whether the printf() function supports POSIX/XSI format strings with
|
|
29764 |
+dnl positions.
|
|
29765 |
+
|
|
29766 |
+AC_DEFUN([gt_PRINTF_POSIX],
|
|
29767 |
+[
|
|
29768 |
+ AC_REQUIRE([AC_PROG_CC])
|
|
29769 |
+ AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
|
|
29770 |
+ gt_cv_func_printf_posix,
|
|
29771 |
+ [
|
|
29772 |
+ AC_TRY_RUN([
|
|
29773 |
+#include <stdio.h>
|
|
29774 |
+#include <string.h>
|
|
29775 |
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
|
|
29776 |
+ dollar expansion (possibly an autoconf bug). */
|
|
29777 |
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
|
|
29778 |
+static char buf[100];
|
|
29779 |
+int main ()
|
|
29780 |
+{
|
|
29781 |
+ sprintf (buf, format, 33, 55);
|
|
29782 |
+ return (strcmp (buf, "55 33") != 0);
|
|
29783 |
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
|
|
29784 |
+ [
|
|
29785 |
+ AC_EGREP_CPP(notposix, [
|
|
29786 |
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
|
|
29787 |
+ notposix
|
|
29788 |
+#endif
|
|
29789 |
+ ], gt_cv_func_printf_posix="guessing no",
|
|
29790 |
+ gt_cv_func_printf_posix="guessing yes")
|
|
29791 |
+ ])
|
|
29792 |
+ ])
|
|
29793 |
+ case $gt_cv_func_printf_posix in
|
|
29794 |
+ *yes)
|
|
29795 |
+ AC_DEFINE(HAVE_POSIX_PRINTF, 1,
|
|
29796 |
+ [Define if your printf() function supports format strings with positions.])
|
|
29797 |
+ ;;
|
|
29798 |
+ esac
|
|
29799 |
+])
|
|
29800 |
diff -pruN dillo-0.8.6/m4/progtest.m4 dillo-0.8.6-i18n-misc-20070916/m4/progtest.m4
|
|
29801 |
--- dillo-0.8.6/m4/progtest.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29802 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/progtest.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29803 |
@@ -0,0 +1,59 @@
|
|
29804 |
+# progtest.m4 serial 2 (gettext-0.10.40)
|
|
29805 |
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
|
|
29806 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29807 |
+dnl General Public License. As a special exception to the GNU General
|
|
29808 |
+dnl Public License, this file may be distributed as part of a program
|
|
29809 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29810 |
+dnl the same distribution terms as the rest of that program.
|
|
29811 |
+dnl
|
|
29812 |
+dnl This file can can be used in projects which are not available under
|
|
29813 |
+dnl the GNU General Public License or the GNU Library General Public
|
|
29814 |
+dnl License but which still want to provide support for the GNU gettext
|
|
29815 |
+dnl functionality.
|
|
29816 |
+dnl Please note that the actual code of the GNU gettext library is covered
|
|
29817 |
+dnl by the GNU Library General Public License, and the rest of the GNU
|
|
29818 |
+dnl gettext package package is covered by the GNU General Public License.
|
|
29819 |
+dnl They are *not* in the public domain.
|
|
29820 |
+
|
|
29821 |
+dnl Authors:
|
|
29822 |
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
29823 |
+
|
|
29824 |
+# Search path for a program which passes the given test.
|
|
29825 |
+
|
|
29826 |
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
|
29827 |
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
|
29828 |
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
|
|
29829 |
+[# Extract the first word of "$2", so it can be a program name with args.
|
|
29830 |
+set dummy $2; ac_word=[$]2
|
|
29831 |
+AC_MSG_CHECKING([for $ac_word])
|
|
29832 |
+AC_CACHE_VAL(ac_cv_path_$1,
|
|
29833 |
+[case "[$]$1" in
|
|
29834 |
+ /*)
|
|
29835 |
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
|
|
29836 |
+ ;;
|
|
29837 |
+ *)
|
|
29838 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
29839 |
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
|
|
29840 |
+ test -z "$ac_dir" && ac_dir=.
|
|
29841 |
+ if test -f $ac_dir/$ac_word; then
|
|
29842 |
+ if [$3]; then
|
|
29843 |
+ ac_cv_path_$1="$ac_dir/$ac_word"
|
|
29844 |
+ break
|
|
29845 |
+ fi
|
|
29846 |
+ fi
|
|
29847 |
+ done
|
|
29848 |
+ IFS="$ac_save_ifs"
|
|
29849 |
+dnl If no 4th arg is given, leave the cache variable unset,
|
|
29850 |
+dnl so AC_PATH_PROGS will keep looking.
|
|
29851 |
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
|
|
29852 |
+])dnl
|
|
29853 |
+ ;;
|
|
29854 |
+esac])dnl
|
|
29855 |
+$1="$ac_cv_path_$1"
|
|
29856 |
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
|
|
29857 |
+ AC_MSG_RESULT([$]$1)
|
|
29858 |
+else
|
|
29859 |
+ AC_MSG_RESULT(no)
|
|
29860 |
+fi
|
|
29861 |
+AC_SUBST($1)dnl
|
|
29862 |
+])
|
|
29863 |
diff -pruN dillo-0.8.6/m4/signed.m4 dillo-0.8.6-i18n-misc-20070916/m4/signed.m4
|
|
29864 |
--- dillo-0.8.6/m4/signed.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29865 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/signed.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29866 |
@@ -0,0 +1,19 @@
|
|
29867 |
+# signed.m4 serial 1 (gettext-0.10.40)
|
|
29868 |
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
|
|
29869 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29870 |
+dnl General Public License. As a special exception to the GNU General
|
|
29871 |
+dnl Public License, this file may be distributed as part of a program
|
|
29872 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29873 |
+dnl the same distribution terms as the rest of that program.
|
|
29874 |
+
|
|
29875 |
+dnl From Bruno Haible.
|
|
29876 |
+
|
|
29877 |
+AC_DEFUN([bh_C_SIGNED],
|
|
29878 |
+[
|
|
29879 |
+ AC_CACHE_CHECK([for signed], bh_cv_c_signed,
|
|
29880 |
+ [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
|
|
29881 |
+ if test $bh_cv_c_signed = no; then
|
|
29882 |
+ AC_DEFINE(signed, ,
|
|
29883 |
+ [Define to empty if the C compiler doesn't support this keyword.])
|
|
29884 |
+ fi
|
|
29885 |
+])
|
|
29886 |
diff -pruN dillo-0.8.6/m4/size_max.m4 dillo-0.8.6-i18n-misc-20070916/m4/size_max.m4
|
|
29887 |
--- dillo-0.8.6/m4/size_max.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29888 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/size_max.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29889 |
@@ -0,0 +1,61 @@
|
|
29890 |
+# size_max.m4 serial 2
|
|
29891 |
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
|
29892 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29893 |
+dnl General Public License. As a special exception to the GNU General
|
|
29894 |
+dnl Public License, this file may be distributed as part of a program
|
|
29895 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29896 |
+dnl the same distribution terms as the rest of that program.
|
|
29897 |
+
|
|
29898 |
+dnl From Bruno Haible.
|
|
29899 |
+
|
|
29900 |
+AC_DEFUN([gl_SIZE_MAX],
|
|
29901 |
+[
|
|
29902 |
+ AC_CHECK_HEADERS(stdint.h)
|
|
29903 |
+ dnl First test whether the system already has SIZE_MAX.
|
|
29904 |
+ AC_MSG_CHECKING([for SIZE_MAX])
|
|
29905 |
+ result=
|
|
29906 |
+ AC_EGREP_CPP([Found it], [
|
|
29907 |
+#include <limits.h>
|
|
29908 |
+#if HAVE_STDINT_H
|
|
29909 |
+#include <stdint.h>
|
|
29910 |
+#endif
|
|
29911 |
+#ifdef SIZE_MAX
|
|
29912 |
+Found it
|
|
29913 |
+#endif
|
|
29914 |
+], result=yes)
|
|
29915 |
+ if test -z "$result"; then
|
|
29916 |
+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
|
|
29917 |
+ dnl than the type 'unsigned long'.
|
|
29918 |
+ dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
|
|
29919 |
+ dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
|
|
29920 |
+ _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
|
|
29921 |
+ [#include <stddef.h>], result=?)
|
|
29922 |
+ _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
|
|
29923 |
+ [#include <stddef.h>], result=?)
|
|
29924 |
+ _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
|
|
29925 |
+ [#include <stddef.h>], result=?)
|
|
29926 |
+ if test "$fits_in_uint" = 1; then
|
|
29927 |
+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
|
|
29928 |
+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
|
|
29929 |
+ AC_TRY_COMPILE([#include <stddef.h>
|
|
29930 |
+ extern size_t foo;
|
|
29931 |
+ extern unsigned long foo;
|
|
29932 |
+ ], [], fits_in_uint=0)
|
|
29933 |
+ fi
|
|
29934 |
+ if test -z "$result"; then
|
|
29935 |
+ if test "$fits_in_uint" = 1; then
|
|
29936 |
+ result="$res_hi$res_lo"U
|
|
29937 |
+ else
|
|
29938 |
+ result="$res_hi$res_lo"UL
|
|
29939 |
+ fi
|
|
29940 |
+ else
|
|
29941 |
+ dnl Shouldn't happen, but who knows...
|
|
29942 |
+ result='~(size_t)0'
|
|
29943 |
+ fi
|
|
29944 |
+ fi
|
|
29945 |
+ AC_MSG_RESULT([$result])
|
|
29946 |
+ if test "$result" != yes; then
|
|
29947 |
+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
|
|
29948 |
+ [Define as the maximum value of type 'size_t', if the system doesn't define it.])
|
|
29949 |
+ fi
|
|
29950 |
+])
|
|
29951 |
diff -pruN dillo-0.8.6/m4/stdint_h.m4 dillo-0.8.6-i18n-misc-20070916/m4/stdint_h.m4
|
|
29952 |
--- dillo-0.8.6/m4/stdint_h.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29953 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/stdint_h.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29954 |
@@ -0,0 +1,28 @@
|
|
29955 |
+# stdint_h.m4 serial 2 (gettext-0.11.4)
|
|
29956 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
29957 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29958 |
+dnl General Public License. As a special exception to the GNU General
|
|
29959 |
+dnl Public License, this file may be distributed as part of a program
|
|
29960 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29961 |
+dnl the same distribution terms as the rest of that program.
|
|
29962 |
+
|
|
29963 |
+dnl From Paul Eggert.
|
|
29964 |
+
|
|
29965 |
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
|
|
29966 |
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
|
|
29967 |
+
|
|
29968 |
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
|
|
29969 |
+[
|
|
29970 |
+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
|
|
29971 |
+ [AC_TRY_COMPILE(
|
|
29972 |
+ [#include <sys/types.h>
|
|
29973 |
+#include <stdint.h>],
|
|
29974 |
+ [uintmax_t i = (uintmax_t) -1;],
|
|
29975 |
+ jm_ac_cv_header_stdint_h=yes,
|
|
29976 |
+ jm_ac_cv_header_stdint_h=no)])
|
|
29977 |
+ if test $jm_ac_cv_header_stdint_h = yes; then
|
|
29978 |
+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
|
|
29979 |
+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
|
|
29980 |
+ and declares uintmax_t. ])
|
|
29981 |
+ fi
|
|
29982 |
+])
|
|
29983 |
diff -pruN dillo-0.8.6/m4/uintmax_t.m4 dillo-0.8.6-i18n-misc-20070916/m4/uintmax_t.m4
|
|
29984 |
--- dillo-0.8.6/m4/uintmax_t.m4 1970-01-01 09:00:00.000000000 +0900
|
|
29985 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/uintmax_t.m4 2006-05-16 01:21:07.000000000 +0900
|
|
29986 |
@@ -0,0 +1,29 @@
|
|
29987 |
+# uintmax_t.m4 serial 6 (gettext-0.11)
|
|
29988 |
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
29989 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
29990 |
+dnl General Public License. As a special exception to the GNU General
|
|
29991 |
+dnl Public License, this file may be distributed as part of a program
|
|
29992 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
29993 |
+dnl the same distribution terms as the rest of that program.
|
|
29994 |
+
|
|
29995 |
+dnl From Paul Eggert.
|
|
29996 |
+
|
|
29997 |
+AC_PREREQ(2.13)
|
|
29998 |
+
|
|
29999 |
+# Define uintmax_t to `unsigned long' or `unsigned long long'
|
|
30000 |
+# if <inttypes.h> does not exist.
|
|
30001 |
+
|
|
30002 |
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
|
|
30003 |
+[
|
|
30004 |
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
|
30005 |
+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
|
30006 |
+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
|
|
30007 |
+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
|
|
30008 |
+ test $ac_cv_type_unsigned_long_long = yes \
|
|
30009 |
+ && ac_type='unsigned long long' \
|
|
30010 |
+ || ac_type='unsigned long'
|
|
30011 |
+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
|
|
30012 |
+ [Define to unsigned long or unsigned long long
|
|
30013 |
+ if <inttypes.h> and <stdint.h> don't define.])
|
|
30014 |
+ fi
|
|
30015 |
+])
|
|
30016 |
diff -pruN dillo-0.8.6/m4/ulonglong.m4 dillo-0.8.6-i18n-misc-20070916/m4/ulonglong.m4
|
|
30017 |
--- dillo-0.8.6/m4/ulonglong.m4 1970-01-01 09:00:00.000000000 +0900
|
|
30018 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/ulonglong.m4 2006-05-16 01:21:07.000000000 +0900
|
|
30019 |
@@ -0,0 +1,25 @@
|
|
30020 |
+# ulonglong.m4 serial 3
|
|
30021 |
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
|
30022 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
30023 |
+dnl General Public License. As a special exception to the GNU General
|
|
30024 |
+dnl Public License, this file may be distributed as part of a program
|
|
30025 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
30026 |
+dnl the same distribution terms as the rest of that program.
|
|
30027 |
+
|
|
30028 |
+dnl From Paul Eggert.
|
|
30029 |
+
|
|
30030 |
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
|
|
30031 |
+
|
|
30032 |
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
|
|
30033 |
+[
|
|
30034 |
+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
|
|
30035 |
+ [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
|
|
30036 |
+ [unsigned long long ullmax = (unsigned long long) -1;
|
|
30037 |
+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
|
|
30038 |
+ ac_cv_type_unsigned_long_long=yes,
|
|
30039 |
+ ac_cv_type_unsigned_long_long=no)])
|
|
30040 |
+ if test $ac_cv_type_unsigned_long_long = yes; then
|
|
30041 |
+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
|
|
30042 |
+ [Define if you have the 'unsigned long long' type.])
|
|
30043 |
+ fi
|
|
30044 |
+])
|
|
30045 |
diff -pruN dillo-0.8.6/m4/wchar_t.m4 dillo-0.8.6-i18n-misc-20070916/m4/wchar_t.m4
|
|
30046 |
--- dillo-0.8.6/m4/wchar_t.m4 1970-01-01 09:00:00.000000000 +0900
|
|
30047 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/wchar_t.m4 2006-05-16 01:21:07.000000000 +0900
|
|
30048 |
@@ -0,0 +1,22 @@
|
|
30049 |
+# wchar_t.m4 serial 1 (gettext-0.12)
|
|
30050 |
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
|
|
30051 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
30052 |
+dnl General Public License. As a special exception to the GNU General
|
|
30053 |
+dnl Public License, this file may be distributed as part of a program
|
|
30054 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
30055 |
+dnl the same distribution terms as the rest of that program.
|
|
30056 |
+
|
|
30057 |
+dnl From Bruno Haible.
|
|
30058 |
+dnl Test whether <stddef.h> has the 'wchar_t' type.
|
|
30059 |
+dnl Prerequisite: AC_PROG_CC
|
|
30060 |
+
|
|
30061 |
+AC_DEFUN([gt_TYPE_WCHAR_T],
|
|
30062 |
+[
|
|
30063 |
+ AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
|
|
30064 |
+ [AC_TRY_COMPILE([#include <stddef.h>
|
|
30065 |
+ wchar_t foo = (wchar_t)'\0';], ,
|
|
30066 |
+ gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
|
|
30067 |
+ if test $gt_cv_c_wchar_t = yes; then
|
|
30068 |
+ AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
|
|
30069 |
+ fi
|
|
30070 |
+])
|
|
30071 |
diff -pruN dillo-0.8.6/m4/wint_t.m4 dillo-0.8.6-i18n-misc-20070916/m4/wint_t.m4
|
|
30072 |
--- dillo-0.8.6/m4/wint_t.m4 1970-01-01 09:00:00.000000000 +0900
|
|
30073 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/wint_t.m4 2006-05-16 01:21:07.000000000 +0900
|
|
30074 |
@@ -0,0 +1,22 @@
|
|
30075 |
+# wint_t.m4 serial 1 (gettext-0.12)
|
|
30076 |
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
|
30077 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
30078 |
+dnl General Public License. As a special exception to the GNU General
|
|
30079 |
+dnl Public License, this file may be distributed as part of a program
|
|
30080 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
30081 |
+dnl the same distribution terms as the rest of that program.
|
|
30082 |
+
|
|
30083 |
+dnl From Bruno Haible.
|
|
30084 |
+dnl Test whether <wchar.h> has the 'wint_t' type.
|
|
30085 |
+dnl Prerequisite: AC_PROG_CC
|
|
30086 |
+
|
|
30087 |
+AC_DEFUN([gt_TYPE_WINT_T],
|
|
30088 |
+[
|
|
30089 |
+ AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
|
|
30090 |
+ [AC_TRY_COMPILE([#include <wchar.h>
|
|
30091 |
+ wint_t foo = (wchar_t)'\0';], ,
|
|
30092 |
+ gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
|
|
30093 |
+ if test $gt_cv_c_wint_t = yes; then
|
|
30094 |
+ AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
|
|
30095 |
+ fi
|
|
30096 |
+])
|
|
30097 |
diff -pruN dillo-0.8.6/m4/xsize.m4 dillo-0.8.6-i18n-misc-20070916/m4/xsize.m4
|
|
30098 |
--- dillo-0.8.6/m4/xsize.m4 1970-01-01 09:00:00.000000000 +0900
|
|
30099 |
+++ dillo-0.8.6-i18n-misc-20070916/m4/xsize.m4 2006-05-16 01:21:07.000000000 +0900
|
|
30100 |
@@ -0,0 +1,14 @@
|
|
30101 |
+# xsize.m4 serial 2
|
|
30102 |
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
|
|
30103 |
+dnl This file is free software, distributed under the terms of the GNU
|
|
30104 |
+dnl General Public License. As a special exception to the GNU General
|
|
30105 |
+dnl Public License, this file may be distributed as part of a program
|
|
30106 |
+dnl that contains a configuration script generated by Autoconf, under
|
|
30107 |
+dnl the same distribution terms as the rest of that program.
|
|
30108 |
+
|
|
30109 |
+AC_DEFUN([gl_XSIZE],
|
|
30110 |
+[
|
|
30111 |
+ dnl Prerequisites of lib/xsize.h.
|
|
30112 |
+ AC_REQUIRE([gl_SIZE_MAX])
|
|
30113 |
+ AC_CHECK_HEADERS(stdint.h)
|
|
30114 |
+])
|
|
30115 |
diff -pruN dillo-0.8.6/missing dillo-0.8.6-i18n-misc-20070916/missing
|
|
30116 |
--- dillo-0.8.6/missing 2005-03-22 16:17:05.000000000 +0900
|
|
30117 |
+++ dillo-0.8.6-i18n-misc-20070916/missing 2006-05-16 01:21:07.000000000 +0900
|
|
30118 |
@@ -1,9 +1,9 @@
|
|
30119 |
#! /bin/sh
|
|
30120 |
# Common stub for a few missing GNU programs while installing.
|
|
30121 |
|
|
30122 |
-scriptversion=2005-02-08.22
|
|
30123 |
+scriptversion=2003-09-02.23
|
|
30124 |
|
|
30125 |
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
|
|
30126 |
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
|
30127 |
# Free Software Foundation, Inc.
|
|
30128 |
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
|
30129 |
|
|
30130 |
@@ -60,6 +60,11 @@ case "$1" in
|
|
30131 |
msg="probably too old"
|
|
30132 |
fi
|
|
30133 |
;;
|
|
30134 |
+esac
|
|
30135 |
+
|
|
30136 |
+# If it does not exist, or fails to run (possibly an outdated version),
|
|
30137 |
+# try to emulate it.
|
|
30138 |
+case "$1" in
|
|
30139 |
|
|
30140 |
-h|--h|--he|--hel|--help)
|
|
30141 |
echo "\
|
|
30142 |
@@ -87,12 +92,10 @@ Supported PROGRAM values:
|
|
30143 |
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
|
30144 |
|
|
30145 |
Send bug reports to <bug-automake@gnu.org>."
|
|
30146 |
- exit $?
|
|
30147 |
;;
|
|
30148 |
|
|
30149 |
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
|
30150 |
echo "missing $scriptversion (GNU Automake)"
|
|
30151 |
- exit $?
|
|
30152 |
;;
|
|
30153 |
|
|
30154 |
-*)
|
|
30155 |
@@ -101,42 +104,12 @@ Send bug reports to <bug-automake@gnu.or
|
|
30156 |
exit 1
|
|
30157 |
;;
|
|
30158 |
|
|
30159 |
-esac
|
|
30160 |
-
|
|
30161 |
-# Now exit if we have it, but it failed. Also exit now if we
|
|
30162 |
-# don't have it and --version was passed (most likely to detect
|
|
30163 |
-# the program).
|
|
30164 |
-case "$1" in
|
|
30165 |
- lex|yacc)
|
|
30166 |
- # Not GNU programs, they don't have --version.
|
|
30167 |
- ;;
|
|
30168 |
-
|
|
30169 |
- tar)
|
|
30170 |
- if test -n "$run"; then
|
|
30171 |
- echo 1>&2 "ERROR: \`tar' requires --run"
|
|
30172 |
- exit 1
|
|
30173 |
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
|
30174 |
- exit 1
|
|
30175 |
- fi
|
|
30176 |
- ;;
|
|
30177 |
-
|
|
30178 |
- *)
|
|
30179 |
+ aclocal*)
|
|
30180 |
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
30181 |
# We have it, but it failed.
|
|
30182 |
exit 1
|
|
30183 |
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
|
30184 |
- # Could not run --version or --help. This is probably someone
|
|
30185 |
- # running `$TOOL --version' or `$TOOL --help' to check whether
|
|
30186 |
- # $TOOL exists and not knowing $TOOL uses missing.
|
|
30187 |
- exit 1
|
|
30188 |
fi
|
|
30189 |
- ;;
|
|
30190 |
-esac
|
|
30191 |
|
|
30192 |
-# If it does not exist, or fails to run (possibly an outdated version),
|
|
30193 |
-# try to emulate it.
|
|
30194 |
-case "$1" in
|
|
30195 |
- aclocal*)
|
|
30196 |
echo 1>&2 "\
|
|
30197 |
WARNING: \`$1' is $msg. You should only need it if
|
|
30198 |
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
|
30199 |
@@ -146,6 +119,11 @@ WARNING: \`$1' is $msg. You should only
|
|
30200 |
;;
|
|
30201 |
|
|
30202 |
autoconf)
|
|
30203 |
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
30204 |
+ # We have it, but it failed.
|
|
30205 |
+ exit 1
|
|
30206 |
+ fi
|
|
30207 |
+
|
|
30208 |
echo 1>&2 "\
|
|
30209 |
WARNING: \`$1' is $msg. You should only need it if
|
|
30210 |
you modified \`${configure_ac}'. You might want to install the
|
|
30211 |
@@ -155,6 +133,11 @@ WARNING: \`$1' is $msg. You should only
|
|
30212 |
;;
|
|
30213 |
|
|
30214 |
autoheader)
|
|
30215 |
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
30216 |
+ # We have it, but it failed.
|
|
30217 |
+ exit 1
|
|
30218 |
+ fi
|
|
30219 |
+
|
|
30220 |
echo 1>&2 "\
|
|
30221 |
WARNING: \`$1' is $msg. You should only need it if
|
|
30222 |
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
|
30223 |
@@ -174,6 +157,11 @@ WARNING: \`$1' is $msg. You should only
|
|
30224 |
;;
|
|
30225 |
|
|
30226 |
automake*)
|
|
30227 |
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
30228 |
+ # We have it, but it failed.
|
|
30229 |
+ exit 1
|
|
30230 |
+ fi
|
|
30231 |
+
|
|
30232 |
echo 1>&2 "\
|
|
30233 |
WARNING: \`$1' is $msg. You should only need it if
|
|
30234 |
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
|
30235 |
@@ -185,11 +173,16 @@ WARNING: \`$1' is $msg. You should only
|
|
30236 |
;;
|
|
30237 |
|
|
30238 |
autom4te)
|
|
30239 |
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
30240 |
+ # We have it, but it failed.
|
|
30241 |
+ exit 1
|
|
30242 |
+ fi
|
|
30243 |
+
|
|
30244 |
echo 1>&2 "\
|
|
30245 |
WARNING: \`$1' is needed, but is $msg.
|
|
30246 |
You might have modified some files without having the
|
|
30247 |
proper tools for further handling them.
|
|
30248 |
- You can get \`$1' as part of \`Autoconf' from any GNU
|
|
30249 |
+ You can get \`$1Help2man' as part of \`Autoconf' from any GNU
|
|
30250 |
archive site."
|
|
30251 |
|
|
30252 |
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
|
|
30253 |
@@ -261,6 +254,11 @@ WARNING: \`$1' is $msg. You should only
|
|
30254 |
;;
|
|
30255 |
|
|
30256 |
help2man)
|
|
30257 |
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
30258 |
+ # We have it, but it failed.
|
|
30259 |
+ exit 1
|
|
30260 |
+ fi
|
|
30261 |
+
|
|
30262 |
echo 1>&2 "\
|
|
30263 |
WARNING: \`$1' is $msg. You should only need it if
|
|
30264 |
you modified a dependency of a manual page. You may need the
|
|
30265 |
@@ -281,6 +279,11 @@ WARNING: \`$1' is $msg. You should only
|
|
30266 |
;;
|
|
30267 |
|
|
30268 |
makeinfo)
|
|
30269 |
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
|
|
30270 |
+ # We have makeinfo, but it failed.
|
|
30271 |
+ exit 1
|
|
30272 |
+ fi
|
|
30273 |
+
|
|
30274 |
echo 1>&2 "\
|
|
30275 |
WARNING: \`$1' is $msg. You should only need it if
|
|
30276 |
you modified a \`.texi' or \`.texinfo' file, or any other file
|
|
30277 |
@@ -288,20 +291,20 @@ WARNING: \`$1' is $msg. You should only
|
|
30278 |
call might also be the consequence of using a buggy \`make' (AIX,
|
|
30279 |
DU, IRIX). You might want to install the \`Texinfo' package or
|
|
30280 |
the \`GNU make' package. Grab either from any GNU archive site."
|
|
30281 |
- # The file to touch is that specified with -o ...
|
|
30282 |
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
|
|
30283 |
if test -z "$file"; then
|
|
30284 |
- # ... or it is the one specified with @setfilename ...
|
|
30285 |
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
|
30286 |
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
|
|
30287 |
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
|
|
30288 |
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
|
|
30289 |
+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
|
30290 |
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
|
|
30291 |
fi
|
|
30292 |
touch $file
|
|
30293 |
;;
|
|
30294 |
|
|
30295 |
tar)
|
|
30296 |
shift
|
|
30297 |
+ if test -n "$run"; then
|
|
30298 |
+ echo 1>&2 "ERROR: \`tar' requires --run"
|
|
30299 |
+ exit 1
|
|
30300 |
+ fi
|
|
30301 |
|
|
30302 |
# We have already tried tar in the generic part.
|
|
30303 |
# Look for gnutar/gtar before invocation to avoid ugly error
|
|
30304 |
@@ -340,7 +343,7 @@ WARNING: I can't seem to be able to run
|
|
30305 |
WARNING: \`$1' is needed, and is $msg.
|
|
30306 |
You might have modified some files without having the
|
|
30307 |
proper tools for further handling them. Check the \`README' file,
|
|
30308 |
- it often tells you about the needed prerequisites for installing
|
|
30309 |
+ it often tells you about the needed prerequirements for installing
|
|
30310 |
this package. You may also peek at any GNU archive site, in case
|
|
30311 |
some other package would contain this missing \`$1' program."
|
|
30312 |
exit 1
|
|
30313 |
diff -pruN dillo-0.8.6/mkinstalldirs dillo-0.8.6-i18n-misc-20070916/mkinstalldirs
|
|
30314 |
--- dillo-0.8.6/mkinstalldirs 1970-01-01 09:00:00.000000000 +0900
|
|
30315 |
+++ dillo-0.8.6-i18n-misc-20070916/mkinstalldirs 2006-05-16 01:21:07.000000000 +0900
|
|
30316 |
@@ -0,0 +1,40 @@
|
|
30317 |
+#! /bin/sh
|
|
30318 |
+# mkinstalldirs --- make directory hierarchy
|
|
30319 |
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
|
|
30320 |
+# Created: 1993-05-16
|
|
30321 |
+# Public domain
|
|
30322 |
+
|
|
30323 |
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
|
|
30324 |
+
|
|
30325 |
+errstatus=0
|
|
30326 |
+
|
|
30327 |
+for file
|
|
30328 |
+do
|
|
30329 |
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
|
30330 |
+ shift
|
|
30331 |
+
|
|
30332 |
+ pathcomp=
|
|
30333 |
+ for d
|
|
30334 |
+ do
|
|
30335 |
+ pathcomp="$pathcomp$d"
|
|
30336 |
+ case "$pathcomp" in
|
|
30337 |
+ -* ) pathcomp=./$pathcomp ;;
|
|
30338 |
+ esac
|
|
30339 |
+
|
|
30340 |
+ if test ! -d "$pathcomp"; then
|
|
30341 |
+ echo "mkdir $pathcomp"
|
|
30342 |
+
|
|
30343 |
+ mkdir "$pathcomp" || lasterr=$?
|
|
30344 |
+
|
|
30345 |
+ if test ! -d "$pathcomp"; then
|
|
30346 |
+ errstatus=$lasterr
|
|
30347 |
+ fi
|
|
30348 |
+ fi
|
|
30349 |
+
|
|
30350 |
+ pathcomp="$pathcomp/"
|
|
30351 |
+ done
|
|
30352 |
+done
|
|
30353 |
+
|
|
30354 |
+exit $errstatus
|
|
30355 |
+
|
|
30356 |
+# mkinstalldirs ends here
|
|
30357 |
diff -pruN dillo-0.8.6/po/ChangeLog dillo-0.8.6-i18n-misc-20070916/po/ChangeLog
|
|
30358 |
--- dillo-0.8.6/po/ChangeLog 1970-01-01 09:00:00.000000000 +0900
|
|
30359 |
+++ dillo-0.8.6-i18n-misc-20070916/po/ChangeLog 2006-05-16 01:21:07.000000000 +0900
|
|
30360 |
@@ -0,0 +1,16 @@
|
|
30361 |
+2004-11-23 gettextize <bug-gnu-gettext@gnu.org>
|
|
30362 |
+
|
|
30363 |
+ * Makefile.in.in: Upgrade to gettext-0.11.4.
|
|
30364 |
+ * Rules-quot: Upgrade to gettext-0.11.4.
|
|
30365 |
+
|
|
30366 |
+2003-10-01 gettextize <bug-gnu-gettext@gnu.org>
|
|
30367 |
+
|
|
30368 |
+ * Makefile.in.in: New file, from gettext-0.11.4.
|
|
30369 |
+ * Rules-quot: New file, from gettext-0.11.4.
|
|
30370 |
+ * boldquot.sed: New file, from gettext-0.11.4.
|
|
30371 |
+ * en@boldquot.header: New file, from gettext-0.11.4.
|
|
30372 |
+ * en@quot.header: New file, from gettext-0.11.4.
|
|
30373 |
+ * insert-header.sin: New file, from gettext-0.11.4.
|
|
30374 |
+ * quot.sed: New file, from gettext-0.11.4.
|
|
30375 |
+ * remove-potcdate.sin: New file, from gettext-0.11.4.
|
|
30376 |
+
|
|
30377 |
diff -pruN dillo-0.8.6/po/Makefile.in.in dillo-0.8.6-i18n-misc-20070916/po/Makefile.in.in
|
|
30378 |
--- dillo-0.8.6/po/Makefile.in.in 1970-01-01 09:00:00.000000000 +0900
|
|
30379 |
+++ dillo-0.8.6-i18n-misc-20070916/po/Makefile.in.in 2007-09-09 15:13:51.000000000 +0900
|
|
30380 |
@@ -0,0 +1,318 @@
|
|
30381 |
+# Makefile for PO directory in any package using GNU gettext.
|
|
30382 |
+# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
|
30383 |
+#
|
|
30384 |
+# This file can be copied and used freely without restrictions. It can
|
|
30385 |
+# be used in projects which are not available under the GNU General Public
|
|
30386 |
+# License but which still want to provide support for the GNU gettext
|
|
30387 |
+# functionality.
|
|
30388 |
+# Please note that the actual code of GNU gettext is covered by the GNU
|
|
30389 |
+# General Public License and is *not* in the public domain.
|
|
30390 |
+
|
|
30391 |
+PACKAGE = @PACKAGE@
|
|
30392 |
+VERSION = @VERSION@
|
|
30393 |
+
|
|
30394 |
+SHELL = /bin/sh
|
|
30395 |
+@SET_MAKE@
|
|
30396 |
+
|
|
30397 |
+srcdir = @srcdir@
|
|
30398 |
+top_srcdir = @top_srcdir@
|
|
30399 |
+VPATH = @srcdir@
|
|
30400 |
+
|
|
30401 |
+prefix = @prefix@
|
|
30402 |
+exec_prefix = @exec_prefix@
|
|
30403 |
+datadir = @datadir@
|
|
30404 |
+localedir = $(datadir)/locale
|
|
30405 |
+gettextsrcdir = $(datadir)/gettext/po
|
|
30406 |
+
|
|
30407 |
+INSTALL = @INSTALL@
|
|
30408 |
+INSTALL_DATA = @INSTALL_DATA@
|
|
30409 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
30410 |
+#mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
|
30411 |
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
|
|
30412 |
+
|
|
30413 |
+GMSGFMT = @GMSGFMT@
|
|
30414 |
+MSGFMT = @MSGFMT@
|
|
30415 |
+XGETTEXT = @XGETTEXT@
|
|
30416 |
+MSGMERGE = msgmerge
|
|
30417 |
+MSGMERGE_UPDATE = @MSGMERGE@ --update
|
|
30418 |
+MSGINIT = msginit
|
|
30419 |
+MSGCONV = msgconv
|
|
30420 |
+MSGFILTER = msgfilter
|
|
30421 |
+
|
|
30422 |
+POFILES = @POFILES@
|
|
30423 |
+GMOFILES = @GMOFILES@
|
|
30424 |
+UPDATEPOFILES = @UPDATEPOFILES@
|
|
30425 |
+DUMMYPOFILES = @DUMMYPOFILES@
|
|
30426 |
+DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
|
|
30427 |
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
|
|
30428 |
+DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
|
|
30429 |
+$(POFILES) $(GMOFILES) \
|
|
30430 |
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
|
|
30431 |
+
|
|
30432 |
+POTFILES = \
|
|
30433 |
+
|
|
30434 |
+CATALOGS = @CATALOGS@
|
|
30435 |
+
|
|
30436 |
+# Makevars gets inserted here. (Don't remove this line!)
|
|
30437 |
+
|
|
30438 |
+.SUFFIXES:
|
|
30439 |
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
|
|
30440 |
+
|
|
30441 |
+.po.mo:
|
|
30442 |
+ @echo "$(MSGFMT) -c -o $@ $<"; \
|
|
30443 |
+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
|
|
30444 |
+
|
|
30445 |
+.po.gmo:
|
|
30446 |
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
|
|
30447 |
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
|
30448 |
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
|
|
30449 |
+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
|
|
30450 |
+
|
|
30451 |
+.sin.sed:
|
|
30452 |
+ sed -e '/^#/d' $< > t-$@
|
|
30453 |
+ mv t-$@ $@
|
|
30454 |
+
|
|
30455 |
+
|
|
30456 |
+all: all-@USE_NLS@
|
|
30457 |
+
|
|
30458 |
+all-yes: $(CATALOGS)
|
|
30459 |
+all-no:
|
|
30460 |
+
|
|
30461 |
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
|
|
30462 |
+# otherwise packages like GCC can not be built if only parts of the source
|
|
30463 |
+# have been downloaded.
|
|
30464 |
+
|
|
30465 |
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
|
30466 |
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
|
|
30467 |
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
|
|
30468 |
+ --files-from=$(srcdir)/POTFILES.in \
|
|
30469 |
+ --copyright-holder='$(COPYRIGHT_HOLDER)'
|
|
30470 |
+ test ! -f $(DOMAIN).po || { \
|
|
30471 |
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
|
|
30472 |
+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
|
|
30473 |
+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
|
|
30474 |
+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
|
|
30475 |
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
|
|
30476 |
+ else \
|
|
30477 |
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
|
|
30478 |
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
|
|
30479 |
+ fi; \
|
|
30480 |
+ else \
|
|
30481 |
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
|
|
30482 |
+ fi; \
|
|
30483 |
+ }
|
|
30484 |
+
|
|
30485 |
+$(srcdir)/$(DOMAIN).pot:
|
|
30486 |
+ $(MAKE) $(DOMAIN).pot-update
|
|
30487 |
+
|
|
30488 |
+$(POFILES): $(srcdir)/$(DOMAIN).pot
|
|
30489 |
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
|
|
30490 |
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
|
30491 |
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
|
|
30492 |
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
|
|
30493 |
+
|
|
30494 |
+
|
|
30495 |
+install: install-exec install-data
|
|
30496 |
+install-exec:
|
|
30497 |
+install-data: install-data-@USE_NLS@
|
|
30498 |
+ if test "$(PACKAGE)" = "gettext"; then \
|
|
30499 |
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
|
30500 |
+ for file in $(DISTFILES.common); do \
|
|
30501 |
+ $(INSTALL_DATA) $(srcdir)/$$file \
|
|
30502 |
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
|
|
30503 |
+ done; \
|
|
30504 |
+ else \
|
|
30505 |
+ : ; \
|
|
30506 |
+ fi
|
|
30507 |
+install-data-no: all
|
|
30508 |
+install-data-yes: all
|
|
30509 |
+ $(mkinstalldirs) $(DESTDIR)$(datadir)
|
|
30510 |
+ @catalogs='$(CATALOGS)'; \
|
|
30511 |
+ for cat in $$catalogs; do \
|
|
30512 |
+ cat=`basename $$cat`; \
|
|
30513 |
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
|
30514 |
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
|
|
30515 |
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
|
|
30516 |
+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
|
|
30517 |
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
|
|
30518 |
+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
|
|
30519 |
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
|
30520 |
+ if test -n "$$lc"; then \
|
|
30521 |
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|
|
30522 |
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
|
|
30523 |
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
|
30524 |
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
|
30525 |
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
|
|
30526 |
+ for file in *; do \
|
|
30527 |
+ if test -f $$file; then \
|
|
30528 |
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
|
|
30529 |
+ fi; \
|
|
30530 |
+ done); \
|
|
30531 |
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
|
30532 |
+ else \
|
|
30533 |
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
|
|
30534 |
+ :; \
|
|
30535 |
+ else \
|
|
30536 |
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
|
30537 |
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
|
30538 |
+ fi; \
|
|
30539 |
+ fi; \
|
|
30540 |
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
|
|
30541 |
+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
|
|
30542 |
+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
|
|
30543 |
+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
|
|
30544 |
+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
|
|
30545 |
+ fi; \
|
|
30546 |
+ done; \
|
|
30547 |
+ done
|
|
30548 |
+
|
|
30549 |
+install-strip: install
|
|
30550 |
+
|
|
30551 |
+installdirs: installdirs-exec installdirs-data
|
|
30552 |
+installdirs-exec:
|
|
30553 |
+installdirs-data: installdirs-data-@USE_NLS@
|
|
30554 |
+ if test "$(PACKAGE)" = "gettext"; then \
|
|
30555 |
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
|
30556 |
+ else \
|
|
30557 |
+ : ; \
|
|
30558 |
+ fi
|
|
30559 |
+installdirs-data-no:
|
|
30560 |
+installdirs-data-yes:
|
|
30561 |
+ $(mkinstalldirs) $(DESTDIR)$(datadir)
|
|
30562 |
+ @catalogs='$(CATALOGS)'; \
|
|
30563 |
+ for cat in $$catalogs; do \
|
|
30564 |
+ cat=`basename $$cat`; \
|
|
30565 |
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
|
30566 |
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
|
|
30567 |
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
|
|
30568 |
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
|
30569 |
+ if test -n "$$lc"; then \
|
|
30570 |
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|
|
30571 |
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
|
|
30572 |
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
|
30573 |
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
|
30574 |
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
|
|
30575 |
+ for file in *; do \
|
|
30576 |
+ if test -f $$file; then \
|
|
30577 |
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
|
|
30578 |
+ fi; \
|
|
30579 |
+ done); \
|
|
30580 |
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
|
|
30581 |
+ else \
|
|
30582 |
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
|
|
30583 |
+ :; \
|
|
30584 |
+ else \
|
|
30585 |
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
|
30586 |
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
|
|
30587 |
+ fi; \
|
|
30588 |
+ fi; \
|
|
30589 |
+ fi; \
|
|
30590 |
+ done; \
|
|
30591 |
+ done
|
|
30592 |
+
|
|
30593 |
+# Define this as empty until I found a useful application.
|
|
30594 |
+installcheck:
|
|
30595 |
+
|
|
30596 |
+uninstall: uninstall-exec uninstall-data
|
|
30597 |
+uninstall-exec:
|
|
30598 |
+uninstall-data: uninstall-data-@USE_NLS@
|
|
30599 |
+ if test "$(PACKAGE)" = "gettext"; then \
|
|
30600 |
+ for file in $(DISTFILES.common); do \
|
|
30601 |
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
|
|
30602 |
+ done; \
|
|
30603 |
+ else \
|
|
30604 |
+ : ; \
|
|
30605 |
+ fi
|
|
30606 |
+uninstall-data-no:
|
|
30607 |
+uninstall-data-yes:
|
|
30608 |
+ catalogs='$(CATALOGS)'; \
|
|
30609 |
+ for cat in $$catalogs; do \
|
|
30610 |
+ cat=`basename $$cat`; \
|
|
30611 |
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
|
30612 |
+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
|
|
30613 |
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
|
|
30614 |
+ done; \
|
|
30615 |
+ done
|
|
30616 |
+
|
|
30617 |
+check: all
|
|
30618 |
+
|
|
30619 |
+dvi info tags TAGS ID:
|
|
30620 |
+
|
|
30621 |
+mostlyclean:
|
|
30622 |
+ rm -f remove-potcdate.sed
|
|
30623 |
+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
|
|
30624 |
+ rm -fr *.o
|
|
30625 |
+
|
|
30626 |
+clean: mostlyclean
|
|
30627 |
+
|
|
30628 |
+distclean: clean
|
|
30629 |
+ rm -f Makefile Makefile.in POTFILES *.mo
|
|
30630 |
+
|
|
30631 |
+maintainer-clean: distclean
|
|
30632 |
+ @echo "This command is intended for maintainers to use;"
|
|
30633 |
+ @echo "it deletes files that may require special tools to rebuild."
|
|
30634 |
+ rm -f $(GMOFILES)
|
|
30635 |
+
|
|
30636 |
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
|
30637 |
+dist distdir:
|
|
30638 |
+ $(MAKE) update-po
|
|
30639 |
+ @$(MAKE) dist2
|
|
30640 |
+# This is a separate target because 'update-po' must be executed before.
|
|
30641 |
+dist2: $(DISTFILES)
|
|
30642 |
+ dists="$(DISTFILES)"; \
|
|
30643 |
+ if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
|
|
30644 |
+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
|
|
30645 |
+ for file in $$dists; do \
|
|
30646 |
+ if test -f $$file; then \
|
|
30647 |
+ cp -p $$file $(distdir); \
|
|
30648 |
+ else \
|
|
30649 |
+ cp -p $(srcdir)/$$file $(distdir); \
|
|
30650 |
+ fi; \
|
|
30651 |
+ done
|
|
30652 |
+
|
|
30653 |
+update-po: Makefile
|
|
30654 |
+ $(MAKE) $(DOMAIN).pot-update
|
|
30655 |
+ $(MAKE) $(UPDATEPOFILES)
|
|
30656 |
+ $(MAKE) update-gmo
|
|
30657 |
+
|
|
30658 |
+# General rule for updating PO files.
|
|
30659 |
+
|
|
30660 |
+.nop.po-update:
|
|
30661 |
+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
|
|
30662 |
+ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
|
|
30663 |
+ tmpdir=`pwd`; \
|
|
30664 |
+ echo "$$lang:"; \
|
|
30665 |
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
|
30666 |
+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
|
|
30667 |
+ cd $(srcdir); \
|
|
30668 |
+ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
|
|
30669 |
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
|
30670 |
+ rm -f $$tmpdir/$$lang.new.po; \
|
|
30671 |
+ else \
|
|
30672 |
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
|
|
30673 |
+ :; \
|
|
30674 |
+ else \
|
|
30675 |
+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
|
|
30676 |
+ exit 1; \
|
|
30677 |
+ fi; \
|
|
30678 |
+ fi; \
|
|
30679 |
+ else \
|
|
30680 |
+ echo "msgmerge for $$lang.po failed!" 1>&2; \
|
|
30681 |
+ rm -f $$tmpdir/$$lang.new.po; \
|
|
30682 |
+ fi
|
|
30683 |
+
|
|
30684 |
+$(DUMMYPOFILES):
|
|
30685 |
+
|
|
30686 |
+update-gmo: Makefile $(GMOFILES)
|
|
30687 |
+ @:
|
|
30688 |
+
|
|
30689 |
+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
|
|
30690 |
+ cd $(top_builddir) \
|
|
30691 |
+ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
|
30692 |
+ $(SHELL) ./config.status
|
|
30693 |
+
|
|
30694 |
+force:
|
|
30695 |
+
|
|
30696 |
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
|
|
30697 |
+# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
30698 |
+.NOEXPORT:
|
|
30699 |
diff -pruN dillo-0.8.6/po/Makevars dillo-0.8.6-i18n-misc-20070916/po/Makevars
|
|
30700 |
--- dillo-0.8.6/po/Makevars 1970-01-01 09:00:00.000000000 +0900
|
|
30701 |
+++ dillo-0.8.6-i18n-misc-20070916/po/Makevars 2006-05-16 01:21:06.000000000 +0900
|
|
30702 |
@@ -0,0 +1,41 @@
|
|
30703 |
+# Makefile variables for PO directory in any package using GNU gettext.
|
|
30704 |
+
|
|
30705 |
+# Usually the message domain is the same as the package name.
|
|
30706 |
+DOMAIN = $(PACKAGE)
|
|
30707 |
+
|
|
30708 |
+# These two variables depend on the location of this directory.
|
|
30709 |
+subdir = po
|
|
30710 |
+top_builddir = ..
|
|
30711 |
+
|
|
30712 |
+# These options get passed to xgettext.
|
|
30713 |
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
|
|
30714 |
+
|
|
30715 |
+# This is the copyright holder that gets inserted into the header of the
|
|
30716 |
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
|
|
30717 |
+# package. (Note that the msgstr strings, extracted from the package's
|
|
30718 |
+# sources, belong to the copyright holder of the package.) Translators are
|
|
30719 |
+# expected to transfer the copyright for their translations to this person
|
|
30720 |
+# or entity, or to disclaim their copyright. The empty string stands for
|
|
30721 |
+# the public domain; in this case the translators are expected to disclaim
|
|
30722 |
+# their copyright.
|
|
30723 |
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
|
|
30724 |
+
|
|
30725 |
+# This is the email address or URL to which the translators shall report
|
|
30726 |
+# bugs in the untranslated strings:
|
|
30727 |
+# - Strings which are not entire sentences, see the maintainer guidelines
|
|
30728 |
+# in the GNU gettext documentation, section 'Preparing Strings'.
|
|
30729 |
+# - Strings which use unclear terms or require additional context to be
|
|
30730 |
+# understood.
|
|
30731 |
+# - Strings which make invalid assumptions about notation of date, time or
|
|
30732 |
+# money.
|
|
30733 |
+# - Pluralisation problems.
|
|
30734 |
+# - Incorrect English spelling.
|
|
30735 |
+# - Incorrect formatting.
|
|
30736 |
+# It can be your email address, or a mailing list address where translators
|
|
30737 |
+# can write to without being subscribed, or the URL of a web page through
|
|
30738 |
+# which the translators can contact you.
|
|
30739 |
+MSGID_BUGS_ADDRESS = http://teki.jpn.ph/
|
|
30740 |
+
|
|
30741 |
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
|
|
30742 |
+# message catalogs shall be used. It is usually empty.
|
|
30743 |
+EXTRA_LOCALE_CATEGORIES =
|
|
30744 |
diff -pruN dillo-0.8.6/po/POTFILES.in dillo-0.8.6-i18n-misc-20070916/po/POTFILES.in
|
|
30745 |
--- dillo-0.8.6/po/POTFILES.in 1970-01-01 09:00:00.000000000 +0900
|
|
30746 |
+++ dillo-0.8.6-i18n-misc-20070916/po/POTFILES.in 2006-05-16 01:25:31.000000000 +0900
|
|
30747 |
@@ -0,0 +1,176 @@
|
|
30748 |
+src/msg.h
|
|
30749 |
+src/acconfig.h
|
|
30750 |
+src/auth.c
|
|
30751 |
+src/auth.h
|
|
30752 |
+src/bitvec.c
|
|
30753 |
+src/bitvec.h
|
|
30754 |
+src/bookmark.c
|
|
30755 |
+src/bookmark.h
|
|
30756 |
+src/browser.h
|
|
30757 |
+src/cache.c
|
|
30758 |
+src/cache.h
|
|
30759 |
+src/capi.c
|
|
30760 |
+src/capi.h
|
|
30761 |
+src/chain.c
|
|
30762 |
+src/chain.h
|
|
30763 |
+src/colors.c
|
|
30764 |
+src/colors.h
|
|
30765 |
+src/commands.c
|
|
30766 |
+src/commands.h
|
|
30767 |
+src/cookies.c
|
|
30768 |
+src/cookies.h
|
|
30769 |
+src/debug.h
|
|
30770 |
+src/dicache.c
|
|
30771 |
+src/dicache.h
|
|
30772 |
+src/dillo.c
|
|
30773 |
+src/dillo.h
|
|
30774 |
+src/dns.c
|
|
30775 |
+src/dns.h
|
|
30776 |
+src/doc.c
|
|
30777 |
+src/doc.h
|
|
30778 |
+src/dw.c
|
|
30779 |
+src/dw.h
|
|
30780 |
+src/dw_aligned_page.c
|
|
30781 |
+src/dw_aligned_page.h
|
|
30782 |
+src/dw_bullet.c
|
|
30783 |
+src/dw_bullet.h
|
|
30784 |
+src/dw_button.c
|
|
30785 |
+src/dw_button.h
|
|
30786 |
+src/dw_container.c
|
|
30787 |
+src/dw_container.h
|
|
30788 |
+src/dw_embed_gtk.c
|
|
30789 |
+src/dw_embed_gtk.h
|
|
30790 |
+src/dw_ext_iterator.c
|
|
30791 |
+src/dw_ext_iterator.h
|
|
30792 |
+src/dw_gtk_scrolled_frame.c
|
|
30793 |
+src/dw_gtk_scrolled_frame.h
|
|
30794 |
+src/dw_gtk_scrolled_window.c
|
|
30795 |
+src/dw_gtk_scrolled_window.h
|
|
30796 |
+src/dw_gtk_statuslabel.c
|
|
30797 |
+src/dw_gtk_statuslabel.h
|
|
30798 |
+src/dw_gtk_viewport.c
|
|
30799 |
+src/dw_gtk_viewport.h
|
|
30800 |
+src/dw_hruler.c
|
|
30801 |
+src/dw_hruler.h
|
|
30802 |
+src/dw_image.c
|
|
30803 |
+src/dw_image.h
|
|
30804 |
+src/dw_list_item.c
|
|
30805 |
+src/dw_list_item.h
|
|
30806 |
+src/dw_marshal.c
|
|
30807 |
+src/dw_marshal.h
|
|
30808 |
+src/dw_page.c
|
|
30809 |
+src/dw_page.h
|
|
30810 |
+src/dw_style.c
|
|
30811 |
+src/dw_style.h
|
|
30812 |
+src/dw_table.c
|
|
30813 |
+src/dw_table.h
|
|
30814 |
+src/dw_table_cell.c
|
|
30815 |
+src/dw_table_cell.h
|
|
30816 |
+src/dw_tooltip.c
|
|
30817 |
+src/dw_tooltip.h
|
|
30818 |
+src/dw_widget.c
|
|
30819 |
+src/dw_widget.h
|
|
30820 |
+src/findtext.c
|
|
30821 |
+src/findtext.h
|
|
30822 |
+src/selection.c
|
|
30823 |
+src/selection.h
|
|
30824 |
+src/web.c
|
|
30825 |
+src/web.h
|
|
30826 |
+src/progressbar.c
|
|
30827 |
+src/progressbar.h
|
|
30828 |
+src/gtk_ext_button.c
|
|
30829 |
+src/gtk_ext_button.h
|
|
30830 |
+src/gtk_ext_menu.c
|
|
30831 |
+src/gtk_ext_menu.h
|
|
30832 |
+src/gtk_ext_menu_item.c
|
|
30833 |
+src/gtk_ext_menu_item.h
|
|
30834 |
+src/gtk_menu_title.c
|
|
30835 |
+src/gtk_menu_title.h
|
|
30836 |
+src/gif.c
|
|
30837 |
+src/jpeg.c
|
|
30838 |
+src/png.c
|
|
30839 |
+src/html.c
|
|
30840 |
+src/html.h
|
|
30841 |
+src/image.c
|
|
30842 |
+src/image.h
|
|
30843 |
+src/misc.c
|
|
30844 |
+src/misc.h
|
|
30845 |
+src/interface.h
|
|
30846 |
+src/interface.c
|
|
30847 |
+src/history.c
|
|
30848 |
+src/history.h
|
|
30849 |
+src/nav.c
|
|
30850 |
+src/nav.h
|
|
30851 |
+src/plain.c
|
|
30852 |
+src/menu.c
|
|
30853 |
+src/menu.h
|
|
30854 |
+src/prefs.c
|
|
30855 |
+src/prefs.h
|
|
30856 |
+src/klist.c
|
|
30857 |
+src/klist.h
|
|
30858 |
+src/strbuf.c
|
|
30859 |
+src/strbuf.h
|
|
30860 |
+src/url.c
|
|
30861 |
+src/url.h
|
|
30862 |
+src/list.h
|
|
30863 |
+src/binaryconst.h
|
|
30864 |
+src/pixmaps.h
|
|
30865 |
+src/dpiapi.c
|
|
30866 |
+src/dpiapi.h
|
|
30867 |
+src/i18n.c
|
|
30868 |
+src/i18n.h
|
|
30869 |
+src/i18n_gtk.c
|
|
30870 |
+src/i18n_gtk.h
|
|
30871 |
+src/gtkframeset.c
|
|
30872 |
+src/gtkframeset.h
|
|
30873 |
+src/intl.h
|
|
30874 |
+src/tab.c
|
|
30875 |
+src/tab.h
|
|
30876 |
+src/IO/https.c
|
|
30877 |
+src/IO/DBIO.h
|
|
30878 |
+src/IO/DBIO.c
|
|
30879 |
+src/IO/mime.c
|
|
30880 |
+src/IO/mime.h
|
|
30881 |
+src/IO/about.c
|
|
30882 |
+src/IO/Url.c
|
|
30883 |
+src/IO/Url.h
|
|
30884 |
+src/IO/proto.c
|
|
30885 |
+src/IO/http.c
|
|
30886 |
+src/IO/dpi.c
|
|
30887 |
+src/IO/IO.c
|
|
30888 |
+src/IO/IO.h
|
|
30889 |
+src/adblock.c
|
|
30890 |
+src/adblock.h
|
|
30891 |
+dpid/dpi.h
|
|
30892 |
+dpid/dpi_service.h
|
|
30893 |
+dpid/dpi_socket_dir.h
|
|
30894 |
+dpid/dpid.h
|
|
30895 |
+dpid/dpid_common.h
|
|
30896 |
+dpid/misc_new.h
|
|
30897 |
+dpid/dpi.c
|
|
30898 |
+dpid/dpi_service.c
|
|
30899 |
+dpid/dpi_socket_dir.c
|
|
30900 |
+dpid/dpid.c
|
|
30901 |
+dpid/dpid_common.c
|
|
30902 |
+dpid/main.c
|
|
30903 |
+dpid/misc_new.c
|
|
30904 |
+dpi/bookmarks.c
|
|
30905 |
+dpi/dpiutil.c
|
|
30906 |
+dpi/dpiutil.h
|
|
30907 |
+dpi/downloads.cc
|
|
30908 |
+dpi/file.c
|
|
30909 |
+dpi/ftp.c
|
|
30910 |
+dpi/hello.c
|
|
30911 |
+dpi/https.c
|
|
30912 |
+dpi/cookies.c
|
|
30913 |
+dpi/datauri.c
|
|
30914 |
+dpi/downloads-old.c
|
|
30915 |
+config/dillocfg.c
|
|
30916 |
+config/dillocfg.h
|
|
30917 |
+config/dillocfg_option.c
|
|
30918 |
+config/dillocfg_option.h
|
|
30919 |
+config/dillocfg_token.h
|
|
30920 |
+config/dillocfg_token.c
|
|
30921 |
+config.h
|
|
30922 |
+dpip/dpip.h
|
|
30923 |
+dpip/dpip.c
|
|
30924 |
diff -pruN dillo-0.8.6/po/Rules-quot dillo-0.8.6-i18n-misc-20070916/po/Rules-quot
|
|
30925 |
--- dillo-0.8.6/po/Rules-quot 1970-01-01 09:00:00.000000000 +0900
|
|
30926 |
+++ dillo-0.8.6-i18n-misc-20070916/po/Rules-quot 2006-05-16 01:21:06.000000000 +0900
|
|
30927 |
@@ -0,0 +1,42 @@
|
|
30928 |
+# Special Makefile rules for English message catalogs with quotation marks.
|
|
30929 |
+
|
|
30930 |
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
|
|
30931 |
+
|
|
30932 |
+.SUFFIXES: .insert-header .po-update-en
|
|
30933 |
+
|
|
30934 |
+en@quot.po-update: en@quot.po-update-en
|
|
30935 |
+en@boldquot.po-update: en@boldquot.po-update-en
|
|
30936 |
+
|
|
30937 |
+.insert-header.po-update-en:
|
|
30938 |
+ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
|
|
30939 |
+ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
|
|
30940 |
+ tmpdir=`pwd`; \
|
|
30941 |
+ echo "$$lang:"; \
|
|
30942 |
+ ll=`echo $$lang | sed -e 's/@.*//'`; \
|
|
30943 |
+ LC_ALL=C; export LC_ALL; \
|
|
30944 |
+ cd $(srcdir); \
|
|
30945 |
+ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
|
|
30946 |
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
|
30947 |
+ rm -f $$tmpdir/$$lang.new.po; \
|
|
30948 |
+ else \
|
|
30949 |
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
|
|
30950 |
+ :; \
|
|
30951 |
+ else \
|
|
30952 |
+ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
|
|
30953 |
+ exit 1; \
|
|
30954 |
+ fi; \
|
|
30955 |
+ fi; \
|
|
30956 |
+ else \
|
|
30957 |
+ echo "creation of $$lang.po failed!" 1>&2; \
|
|
30958 |
+ rm -f $$tmpdir/$$lang.new.po; \
|
|
30959 |
+ fi
|
|
30960 |
+
|
|
30961 |
+en@quot.insert-header: insert-header.sin
|
|
30962 |
+ sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
|
|
30963 |
+
|
|
30964 |
+en@boldquot.insert-header: insert-header.sin
|
|
30965 |
+ sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
|
|
30966 |
+
|
|
30967 |
+mostlyclean: mostlyclean-quot
|
|
30968 |
+mostlyclean-quot:
|
|
30969 |
+ rm -f *.insert-header
|
|
30970 |
diff -pruN dillo-0.8.6/po/boldquot.sed dillo-0.8.6-i18n-misc-20070916/po/boldquot.sed
|
|
30971 |
--- dillo-0.8.6/po/boldquot.sed 1970-01-01 09:00:00.000000000 +0900
|
|
30972 |
+++ dillo-0.8.6-i18n-misc-20070916/po/boldquot.sed 2006-05-16 01:21:06.000000000 +0900
|
|
30973 |
@@ -0,0 +1,10 @@
|
|
30974 |
+s/"\([^"]*\)"/“\1”/g
|
|
30975 |
+s/`\([^`']*\)'/‘\1’/g
|
|
30976 |
+s/ '\([^`']*\)' / ‘\1’ /g
|
|
30977 |
+s/ '\([^`']*\)'$/ ‘\1’/g
|
|
30978 |
+s/^'\([^`']*\)' /‘\1’ /g
|
|
30979 |
+s/“”/""/g
|
|
30980 |
+s/“/“[1m/g
|
|
30981 |
+s/”/[0m”/g
|
|
30982 |
+s/‘/‘[1m/g
|
|
30983 |
+s/’/[0m’/g
|
|
30984 |
バイナリー・ファイルdillo-0.8.6/po/de.gmoとdillo-0.8.6-i18n-misc-20070916/po/de.gmoは違います
|
|
30985 |
diff -pruN dillo-0.8.6/po/de.po dillo-0.8.6-i18n-misc-20070916/po/de.po
|
|
30986 |
--- dillo-0.8.6/po/de.po 1970-01-01 09:00:00.000000000 +0900
|
|
30987 |
+++ dillo-0.8.6-i18n-misc-20070916/po/de.po 2007-09-11 08:04:31.000000000 +0900
|
|
30988 |
@@ -0,0 +1,2161 @@
|
|
30989 |
+# Dillo German translation
|
|
30990 |
+# Copyright (C) 2007
|
|
30991 |
+# This file is distributed under the same license as the DILLO package.
|
|
30992 |
+# CARSTEN STUPKA, 2007.
|
|
30993 |
+#
|
|
30994 |
+msgid ""
|
|
30995 |
+msgstr ""
|
|
30996 |
+"Project-Id-Version: dillo-0.8.6-i18n-misc\n"
|
|
30997 |
+"Report-Msgid-Bugs-To: \n"
|
|
30998 |
+"POT-Creation-Date: 2007-09-09 15:45+0900\n"
|
|
30999 |
+"PO-Revision-Date: 2007-09-09 18:48+0100\n"
|
|
31000 |
+"Last-Translator: \n"
|
|
31001 |
+"Language-Team: \n"
|
|
31002 |
+"MIME-Version: 1.0\n"
|
|
31003 |
+"Content-Type: text/plain; charset=utf-8\n"
|
|
31004 |
+"Content-Transfer-Encoding: 8bit\n"
|
|
31005 |
+
|
|
31006 |
+#: src/msg.h:27
|
|
31007 |
+msgid "HTTP warning: "
|
|
31008 |
+msgstr "HTTP-Warnung: "
|
|
31009 |
+
|
|
31010 |
+#: src/auth.c:87
|
|
31011 |
+msgid "Browser Url has changed\n"
|
|
31012 |
+msgstr "Browser-URL hat sich geändert\n"
|
|
31013 |
+
|
|
31014 |
+#: src/cache.c:253
|
|
31015 |
+msgid "WARNING: Cache_entry_add, leaking an entry.\n"
|
|
31016 |
+msgstr "WARNUNG: Cache_entry_add, ein Eintrag verloren.\n"
|
|
31017 |
+
|
|
31018 |
+#: src/cache.c:316
|
|
31019 |
+msgid "## Aborting CCCQuery\n"
|
|
31020 |
+msgstr "## CCCQuery wird abgebrochen\n"
|
|
31021 |
+
|
|
31022 |
+#: src/cache.c:319
|
|
31023 |
+msgid "## Aborting CCCAnswer\n"
|
|
31024 |
+msgstr "## CCCAnswer wird abgebrochen\n"
|
|
31025 |
+
|
|
31026 |
+#: src/cache.c:322
|
|
31027 |
+msgid "## Aborting raw2\n"
|
|
31028 |
+msgstr "## raw2 wird abgebrochen\n"
|
|
31029 |
+
|
|
31030 |
+#: src/cache.c:365
|
|
31031 |
+msgid "## No more clients for this entry\n"
|
|
31032 |
+msgstr ""
|
|
31033 |
+
|
|
31034 |
+#: src/cache.c:369
|
|
31035 |
+msgid "Cache_prepare_reload: ERROR, entry still has clients\n"
|
|
31036 |
+msgstr ""
|
|
31037 |
+
|
|
31038 |
+#: src/cache.c:398
|
|
31039 |
+#, c-format
|
|
31040 |
+msgid "Reloading >%s< because it shouldn't be cached\n"
|
|
31041 |
+msgstr ""
|
|
31042 |
+">%s< wird neu geladen, weil es nicht zwischengespeichert werden sollte\n"
|
|
31043 |
+
|
|
31044 |
+#: src/cache.c:418
|
|
31045 |
+msgid "ERROR: unsupported protocol"
|
|
31046 |
+msgstr "FEHLER: nicht unterstütztes Protokoll"
|
|
31047 |
+
|
|
31048 |
+#: src/cache.c:488
|
|
31049 |
+#, c-format
|
|
31050 |
+msgid "Redirect loop for URL: >%s<\n"
|
|
31051 |
+msgstr "Umleitungsschleife für URL: >%s<\n"
|
|
31052 |
+
|
|
31053 |
+#: src/cache.c:590
|
|
31054 |
+#, c-format
|
|
31055 |
+msgid "Bad clocks, ignore expire on >%s<\n"
|
|
31056 |
+msgstr ""
|
|
31057 |
+
|
|
31058 |
+#: src/cache.c:594
|
|
31059 |
+#, c-format
|
|
31060 |
+msgid "Forcing min expire %d on >%s< instead %ld\n"
|
|
31061 |
+msgstr ""
|
|
31062 |
+
|
|
31063 |
+#: src/cache.c:678
|
|
31064 |
+msgid "'Cache-Control: max-age=' without 'Date: ' header"
|
|
31065 |
+msgstr "'Cache-Control: max-age=' ohne 'Date: '-Header"
|
|
31066 |
+
|
|
31067 |
+#: src/cache.c:722
|
|
31068 |
+msgid "Server didn't send Content-Type in header.\n"
|
|
31069 |
+msgstr "Server hat kein Content-Type im Header geschickt.\n"
|
|
31070 |
+
|
|
31071 |
+#: src/cache.c:743
|
|
31072 |
+#, c-format
|
|
31073 |
+msgid "Forcing default expire to query url >%s<\n"
|
|
31074 |
+msgstr ""
|
|
31075 |
+
|
|
31076 |
+#: src/cache.c:831
|
|
31077 |
+#, c-format
|
|
31078 |
+msgid "Cache_decode_data: got all data -- decodinging %s\n"
|
|
31079 |
+msgstr "Cache_decode_data: alle Daten empfangen -- %s wird dekodiert\n"
|
|
31080 |
+
|
|
31081 |
+#: src/cache.c:840
|
|
31082 |
+msgid "Cache_decode_data: not gzip data!\n"
|
|
31083 |
+msgstr "Cache_decode_data: keine gzip-Daten!\n"
|
|
31084 |
+
|
|
31085 |
+#: src/cache.c:846
|
|
31086 |
+msgid "Cache_decode_data: invalid gzip data!\n"
|
|
31087 |
+msgstr "Cache_decode_data: ungültige gzip-Daten!\n"
|
|
31088 |
+
|
|
31089 |
+#: src/cache.c:898
|
|
31090 |
+msgid "not x-gzip\n"
|
|
31091 |
+msgstr "nicht x-gzip\n"
|
|
31092 |
+
|
|
31093 |
+#: src/cache.c:931
|
|
31094 |
+#, c-format
|
|
31095 |
+msgid ""
|
|
31096 |
+"Content-Length does NOT match message body,\n"
|
|
31097 |
+" at: %s\n"
|
|
31098 |
+msgstr ""
|
|
31099 |
+"Content-Length stimmt NICHT mit Nachrichtenrumpf überein,\n"
|
|
31100 |
+" bei: %s\n"
|
|
31101 |
+
|
|
31102 |
+#: src/cache.c:950
|
|
31103 |
+msgid "Cache_process_io Op = IOAbort; not implemented yet\n"
|
|
31104 |
+msgstr "Cache_process_io Op = IOAbort; noch nicht implementiert\n"
|
|
31105 |
+
|
|
31106 |
+#: src/cache.c:1004
|
|
31107 |
+#, c-format
|
|
31108 |
+msgid "ERROR: redirect loop for: %s"
|
|
31109 |
+msgstr "FEHLER: Umleitungsschleife für: %s"
|
|
31110 |
+
|
|
31111 |
+#: src/cache.c:1015
|
|
31112 |
+#, c-format
|
|
31113 |
+msgid ""
|
|
31114 |
+">>>Redirect from: %s\n"
|
|
31115 |
+" to %s\n"
|
|
31116 |
+msgstr ""
|
|
31117 |
+">>>Umleitung von: %s\n"
|
|
31118 |
+" auf %s\n"
|
|
31119 |
+
|
|
31120 |
+#: src/cache.c:1035
|
|
31121 |
+msgid ">>>Image redirection without entity-content<<<\n"
|
|
31122 |
+msgstr ""
|
|
31123 |
+
|
|
31124 |
+#: src/cache.c:1037
|
|
31125 |
+msgid ">>>Image redirection with entity-content<<<\n"
|
|
31126 |
+msgstr ""
|
|
31127 |
+
|
|
31128 |
+#: src/cache.c:1103
|
|
31129 |
+msgid "FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n"
|
|
31130 |
+msgstr ""
|
|
31131 |
+
|
|
31132 |
+#: src/cache.c:1111
|
|
31133 |
+#, c-format
|
|
31134 |
+msgid "Content-Type '%s' doesn't match the real data.\n"
|
|
31135 |
+msgstr "Content-Type '%s' stimmt nicht mit den tatsächlichen Daten überein.\n"
|
|
31136 |
+
|
|
31137 |
+#: src/cache.c:1140
|
|
31138 |
+#, c-format
|
|
31139 |
+msgid "HTTP warning: Content-Type '%s' doesn't match the real data."
|
|
31140 |
+msgstr ""
|
|
31141 |
+"HTTP-Warnung: Content-Type '%s' stimmt nicht mit den tatsächlichen Daten "
|
|
31142 |
+"überein."
|
|
31143 |
+
|
|
31144 |
+#: src/cache.c:1177
|
|
31145 |
+#, c-format
|
|
31146 |
+msgid "Unhandled MIME type: <%s>\n"
|
|
31147 |
+msgstr ""
|
|
31148 |
+
|
|
31149 |
+#: src/cache.c:1202
|
|
31150 |
+msgid "Client Callback is NULL"
|
|
31151 |
+msgstr ""
|
|
31152 |
+
|
|
31153 |
+#: src/cache.c:1303
|
|
31154 |
+msgid "WARNING: Cache_stop_client, inexistent client\n"
|
|
31155 |
+msgstr ""
|
|
31156 |
+
|
|
31157 |
+#: src/cache.c:1445 src/capi.c:428 src/capi.c:481 src/capi.c:536
|
|
31158 |
+#: src/capi.c:570 src/IO/dpi.c:720 src/IO/dpi.c:760
|
|
31159 |
+msgid " Not implemented\n"
|
|
31160 |
+msgstr " Nicht implementiert\n"
|
|
31161 |
+
|
|
31162 |
+#: src/capi.c:229
|
|
31163 |
+msgid "Capi_verify_dpi_url_request: Permission Denied!\n"
|
|
31164 |
+msgstr ""
|
|
31165 |
+
|
|
31166 |
+#: src/capi.c:324
|
|
31167 |
+#, c-format
|
|
31168 |
+msgid " reload=%d URL_E2EReload=%d\n"
|
|
31169 |
+msgstr ""
|
|
31170 |
+
|
|
31171 |
+#: src/capi.c:389
|
|
31172 |
+msgid " ERROR: [a_Capi_dpi_send_cmd] No open connection found\n"
|
|
31173 |
+msgstr " FEHLER: [a_Capi_dpi_send_cmd] Keine offene Verbindung gefunden\n"
|
|
31174 |
+
|
|
31175 |
+#: src/capi.c:457
|
|
31176 |
+msgid "ERROR: can't start dpid daemon!"
|
|
31177 |
+msgstr "FEHLER: DPID-Dämon kann nicht gestartet werden!"
|
|
31178 |
+
|
|
31179 |
+#: src/capi.c:492
|
|
31180 |
+msgid " ** Capi 2F catched an invalid 'web' structure\n"
|
|
31181 |
+msgstr ""
|
|
31182 |
+
|
|
31183 |
+#: src/capi.c:552
|
|
31184 |
+msgid " Error with pipe\n"
|
|
31185 |
+msgstr ""
|
|
31186 |
+
|
|
31187 |
+#: src/commands.c:166
|
|
31188 |
+msgid "View Source"
|
|
31189 |
+msgstr "Quelltext anzeigen"
|
|
31190 |
+
|
|
31191 |
+#: src/commands.c:183
|
|
31192 |
+msgid "Detected HTML errors"
|
|
31193 |
+msgstr "Erkannte HTML-Fehler"
|
|
31194 |
+
|
|
31195 |
+#: src/commands.c:265
|
|
31196 |
+msgid "Stopped"
|
|
31197 |
+msgstr "Angehalten"
|
|
31198 |
+
|
|
31199 |
+#: src/dillo.c:109
|
|
31200 |
+msgid ""
|
|
31201 |
+" -x, --xid XID Open first Dillo window in an existing\n"
|
|
31202 |
+" GtkSocket which window ID is XID (decimal)."
|
|
31203 |
+msgstr ""
|
|
31204 |
+" -x, --xid XID Erstes Dillo-Fenster in einem bestehenden\n"
|
|
31205 |
+" GtkSocket öffnen, dessen Fenster-ID XID ist "
|
|
31206 |
+"(dezimal)."
|
|
31207 |
+
|
|
31208 |
+#: src/dillo.c:112
|
|
31209 |
+msgid " -v, --version Display version info and exit."
|
|
31210 |
+msgstr " -v, --version Versionsinfo anzeigen und beenden."
|
|
31211 |
+
|
|
31212 |
+#: src/dillo.c:114
|
|
31213 |
+msgid " -h, --help Display this help text and exit."
|
|
31214 |
+msgstr " -h, --help Diesen Hilfetext anzeigen und beenden."
|
|
31215 |
+
|
|
31216 |
+#: src/dillo.c:116
|
|
31217 |
+msgid ""
|
|
31218 |
+" -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
31219 |
+" navigation buttons, menu, and status bar."
|
|
31220 |
+msgstr ""
|
|
31221 |
+" -f, --fullwindow Im Vollbildmodus starten: Adressleiste,\n"
|
|
31222 |
+" Navigationselemente, Menü und Statusleiste "
|
|
31223 |
+"ausblenden."
|
|
31224 |
+
|
|
31225 |
+#: src/dillo.c:119
|
|
31226 |
+msgid " -l, --local Don't follow links for this URL(s)."
|
|
31227 |
+msgstr " -l, --local Links für diese URL(s) nicht folgen."
|
|
31228 |
+
|
|
31229 |
+#: src/dillo.c:121
|
|
31230 |
+msgid ""
|
|
31231 |
+" -g, -geometry GEO Set initial window position where GEO is\n"
|
|
31232 |
+" <width>x<height>{+-}<x>{+-}<y>"
|
|
31233 |
+msgstr ""
|
|
31234 |
+" -g, -geometry GEO Anfangsposition des Fensters auf GEO setzen\n"
|
|
31235 |
+" <Breite>x<Höhe>{+-}<x>{+-}<y>"
|
|
31236 |
+
|
|
31237 |
+#: src/dillo.c:125
|
|
31238 |
+msgid ""
|
|
31239 |
+" -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
31240 |
+" representing its structure. For debugging. "
|
|
31241 |
+msgstr ""
|
|
31242 |
+" -D, --debug-rendering Einige zusätzliche Linien in die Webseite "
|
|
31243 |
+"zeichnen,\n"
|
|
31244 |
+" die ihre Struktur aufzeigen. Fürs Debuggen. "
|
|
31245 |
+
|
|
31246 |
+#: src/dillo.c:129
|
|
31247 |
+msgid " -R, --rcfile FILE Use alternative rcfile."
|
|
31248 |
+msgstr " -R, --rcfile DATEI Alternative rc-Datei verwenden."
|
|
31249 |
+
|
|
31250 |
+#: src/dillo.c:266
|
|
31251 |
+#, c-format
|
|
31252 |
+msgid ""
|
|
31253 |
+"Error: the XID must be an unsigned decimal numerical value.\n"
|
|
31254 |
+"The offending value was: %s\n"
|
|
31255 |
+msgstr ""
|
|
31256 |
+"Fehler: die XID muss ein vorzeichenloser Dezimalwert sein.\n"
|
|
31257 |
+"Der dagegen verstoßende Wert war: %s\n"
|
|
31258 |
+
|
|
31259 |
+#: src/dillo.c:284
|
|
31260 |
+msgid "Error in command line options.\n"
|
|
31261 |
+msgstr "Fehler in den Befehlszeilenoptionen.\n"
|
|
31262 |
+
|
|
31263 |
+#: src/dillo.c:291
|
|
31264 |
+#, c-format
|
|
31265 |
+msgid "Setting gtk charset to %s...\n"
|
|
31266 |
+msgstr "GTK-Zeichensatz wird auf %s gestellt...\n"
|
|
31267 |
+
|
|
31268 |
+#: src/dillo.c:395
|
|
31269 |
+msgid "Dillo: normal exit!\n"
|
|
31270 |
+msgstr "Dillo: normal beendet!\n"
|
|
31271 |
+
|
|
31272 |
+#: src/dillo.c:409
|
|
31273 |
+#, c-format
|
|
31274 |
+msgid "Dillo: error creating directory %s: %s\n"
|
|
31275 |
+msgstr "Dillo: Fehler beim Erstellen des Verzeichnisses %s: %s\n"
|
|
31276 |
+
|
|
31277 |
+#: src/dillo.c:412
|
|
31278 |
+#, c-format
|
|
31279 |
+msgid "Dillo: error reading %s: %s\n"
|
|
31280 |
+msgstr "Dillo: Fehler beim Lesen von %s: %s\n"
|
|
31281 |
+
|
|
31282 |
+#: src/dillo.c:461
|
|
31283 |
+#, c-format
|
|
31284 |
+msgid "Option %s requires %d argument(s)\n"
|
|
31285 |
+msgstr "Option %s verlangt %d Argument(e)\n"
|
|
31286 |
+
|
|
31287 |
+#: src/dillo.c:496
|
|
31288 |
+msgid ""
|
|
31289 |
+"\n"
|
|
31290 |
+"Usage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
31291 |
+"Options:\n"
|
|
31292 |
+msgstr ""
|
|
31293 |
+"\n"
|
|
31294 |
+"Benutzung: dillo [OPTIONEN] [URL|DATEI]...\n"
|
|
31295 |
+"Optionen:\n"
|
|
31296 |
+
|
|
31297 |
+#: src/dillo.c:503
|
|
31298 |
+#, c-format
|
|
31299 |
+msgid " %s, %s *Undocumented*\n"
|
|
31300 |
+msgstr " %s, %s *Undokumentiert*\n"
|
|
31301 |
+
|
|
31302 |
+#: src/dillo.c:506
|
|
31303 |
+msgid ""
|
|
31304 |
+" URL URL to browse.\n"
|
|
31305 |
+" FILE Local FILE to view.\n"
|
|
31306 |
+msgstr ""
|
|
31307 |
+" URL Zu öffnende URL.\n"
|
|
31308 |
+" DATEI Anzuzeigende lokale Datei.\n"
|
|
31309 |
+
|
|
31310 |
+#: src/html.c:182
|
|
31311 |
+#, c-format
|
|
31312 |
+msgid "HTML warning: line %d, "
|
|
31313 |
+msgstr "HTML-Warnung: Zeile %d, "
|
|
31314 |
+
|
|
31315 |
+#: src/html.c:212
|
|
31316 |
+#, c-format
|
|
31317 |
+msgid "URL has %d illegal character [%d space]\n"
|
|
31318 |
+msgstr "URL enthält %d ungültiges Zeichen [%d Leerzeichen]\n"
|
|
31319 |
+
|
|
31320 |
+#: src/html.c:213
|
|
31321 |
+#, c-format
|
|
31322 |
+msgid "URL has %d illegal characters [%d spaces]\n"
|
|
31323 |
+msgstr "URL enthält %d ungültiges Zeichen [%d Leerzeichen]\n"
|
|
31324 |
+
|
|
31325 |
+#: src/html.c:216
|
|
31326 |
+#, c-format
|
|
31327 |
+msgid "URL has %d illegal character [%d in (00-1F or 7F)]\n"
|
|
31328 |
+msgstr "URL enthält %d ungültiges Zeichen [%d in (00-1F oder 7F)]\n"
|
|
31329 |
+
|
|
31330 |
+#: src/html.c:218
|
|
31331 |
+#, c-format
|
|
31332 |
+msgid "URL has %d illegal characters [%d in (00-1F or 7F)]\n"
|
|
31333 |
+msgstr "URL enthält %d ungültige Zeichen [%d in (00-1F oder 7F)]\n"
|
|
31334 |
+
|
|
31335 |
+#: src/html.c:222
|
|
31336 |
+#, c-format
|
|
31337 |
+msgid "URL has %d illegal character [%d space and %d in (00-1F or 7F)]\n"
|
|
31338 |
+msgstr ""
|
|
31339 |
+"URL enthält %d ungültige Zeichen [%d Leerzeichen und %d in (00-1F oder 7F)]\n"
|
|
31340 |
+
|
|
31341 |
+#: src/html.c:224
|
|
31342 |
+#, c-format
|
|
31343 |
+msgid "URL has %d illegal characters [%d space and %d in (00-1F or 7F)]\n"
|
|
31344 |
+msgstr ""
|
|
31345 |
+"URL enthält %d ungültige Zeichen [%d Leerzeichen und %d in (00-1F oder 7F)]\n"
|
|
31346 |
+
|
|
31347 |
+#: src/html.c:228
|
|
31348 |
+#, c-format
|
|
31349 |
+msgid "URL has %d illegal character [%d spaces and %d in (00-1F or 7F)]\n"
|
|
31350 |
+msgstr ""
|
|
31351 |
+"URL enthält %d ungültiges Zeichen [%d Leerzeichen und %d in (00-1F oder "
|
|
31352 |
+"7F)]\n"
|
|
31353 |
+
|
|
31354 |
+#: src/html.c:230
|
|
31355 |
+#, c-format
|
|
31356 |
+msgid "URL has %d illegal characters [%d spaces and %d in (00-1F or 7F)]\n"
|
|
31357 |
+msgstr ""
|
|
31358 |
+"URL enthält %d ungültige Zeichen [%d Leerzeichen und %d in (00-1F oder 7F)]\n"
|
|
31359 |
+
|
|
31360 |
+#: src/html.c:1237
|
|
31361 |
+msgid "numeric character reference out of range\n"
|
|
31362 |
+msgstr "numerische Zeichenreferenz außerhalb des gültigen Bereichs\n"
|
|
31363 |
+
|
|
31364 |
+#: src/html.c:1245
|
|
31365 |
+msgid "numeric character reference without trailing ';'\n"
|
|
31366 |
+msgstr "numerische Zeichenreferenz ohne nachfolgendes ';'\n"
|
|
31367 |
+
|
|
31368 |
+#: src/html.c:1257
|
|
31369 |
+#, c-format
|
|
31370 |
+msgid "undefined character entity '%s'\n"
|
|
31371 |
+msgstr "nicht definierte Zeichenentität '%s'\n"
|
|
31372 |
+
|
|
31373 |
+#: src/html.c:1265
|
|
31374 |
+msgid "character entity reference without trailing ';'\n"
|
|
31375 |
+msgstr "Zeichenentitätsreferenz ohne nachfolgendes ';'\n"
|
|
31376 |
+
|
|
31377 |
+#: src/html.c:1273
|
|
31378 |
+msgid "code positions 128-159 are not defined for ISO Latin-1\n"
|
|
31379 |
+msgstr ""
|
|
31380 |
+
|
|
31381 |
+#: src/html.c:1281
|
|
31382 |
+msgid "literal '&'\n"
|
|
31383 |
+msgstr "Zeichen '&'\n"
|
|
31384 |
+
|
|
31385 |
+#: src/html.c:1390
|
|
31386 |
+msgid "TAB character inside <PRE>\n"
|
|
31387 |
+msgstr "TABULATOR-Zeichen innerhalb von <PRE>\n"
|
|
31388 |
+
|
|
31389 |
+#: src/html.c:1626
|
|
31390 |
+#, c-format
|
|
31391 |
+msgid " - forcing close of open tag: <%s>\n"
|
|
31392 |
+msgstr " - Schließung des offenen Tags <%s> wird erzwungen\n"
|
|
31393 |
+
|
|
31394 |
+#: src/html.c:1635
|
|
31395 |
+#, c-format
|
|
31396 |
+msgid "unexpected closing tag: </%1$s>. -- expected </%2$s>\n"
|
|
31397 |
+msgstr "unerwarteter schließender Tag: </%1$s>. -- </%2$s> erwartet\n"
|
|
31398 |
+
|
|
31399 |
+#: src/html.c:1707
|
|
31400 |
+#, c-format
|
|
31401 |
+msgid "Garbage after length: %s\n"
|
|
31402 |
+msgstr ""
|
|
31403 |
+
|
|
31404 |
+#: src/html.c:1726
|
|
31405 |
+msgid "color is not in \"#RRGGBB\" format\n"
|
|
31406 |
+msgstr "Farbe hat nicht das Format \"#RRGGBB\"\n"
|
|
31407 |
+
|
|
31408 |
+#: src/html.c:1746
|
|
31409 |
+#, c-format
|
|
31410 |
+msgid "'%s' value is not of the form [A-Za-z][A-Za-z0-9:_.-]*\n"
|
|
31411 |
+msgstr "Wert '%s' ist nicht von der Form [A-Za-z][A-Za-z0-9:_.-]*\n"
|
|
31412 |
+
|
|
31413 |
+#: src/html.c:1850
|
|
31414 |
+msgid "HTML element was already open\n"
|
|
31415 |
+msgstr "HTML-Element war bereits offen\n"
|
|
31416 |
+
|
|
31417 |
+#: src/html.c:1877
|
|
31418 |
+msgid "HEAD element must go before the BODY section\n"
|
|
31419 |
+msgstr "HEAD-Element muss sich vor dem BODY-Abschnitt befinden\n"
|
|
31420 |
+
|
|
31421 |
+#: src/html.c:1887
|
|
31422 |
+msgid "HEAD element was already open\n"
|
|
31423 |
+msgstr "HEAD-Element war bereits offen\n"
|
|
31424 |
+
|
|
31425 |
+#: src/html.c:1900
|
|
31426 |
+msgid "HEAD section lacks the TITLE element\n"
|
|
31427 |
+msgstr "HEAD-Abschnitt hat kein TITLE-Element\n"
|
|
31428 |
+
|
|
31429 |
+#: src/html.c:1928
|
|
31430 |
+msgid "the TITLE element must be inside the HEAD section\n"
|
|
31431 |
+msgstr "das TITLE-Element muss sich im HEAD-Abschnitt befinden\n"
|
|
31432 |
+
|
|
31433 |
+#: src/html.c:1997
|
|
31434 |
+msgid "BODY element was already open\n"
|
|
31435 |
+msgstr "BODY-Element war schon offen\n"
|
|
31436 |
+
|
|
31437 |
+#: src/html.c:2002
|
|
31438 |
+msgid "unclosed HEAD element\n"
|
|
31439 |
+msgstr "nicht geschlossenes HEAD-Element\n"
|
|
31440 |
+
|
|
31441 |
+#: src/html.c:2198
|
|
31442 |
+msgid "<td> or <th> outside <table>\n"
|
|
31443 |
+msgstr "<td> oder <th> außerhalb von <table>\n"
|
|
31444 |
+
|
|
31445 |
+#: src/html.c:2202
|
|
31446 |
+msgid "<td> or <th> outside <tr>\n"
|
|
31447 |
+msgstr "<td> oder <th> außerhalb von <tr>\n"
|
|
31448 |
+
|
|
31449 |
+#: src/html.c:2320
|
|
31450 |
+msgid "Invalid HTML syntax: <tr> outside <table>\n"
|
|
31451 |
+msgstr "Ungültige HTML-Syntax: <tr> außerhalb von <table>\n"
|
|
31452 |
+
|
|
31453 |
+#: src/html.c:2378
|
|
31454 |
+msgid "<noframes> outside of <frameset>!!!\n"
|
|
31455 |
+msgstr "<noframes> außerhalb von <frameset>!!!\n"
|
|
31456 |
+
|
|
31457 |
+#: src/html.c:2386
|
|
31458 |
+msgid "<noframe> is illegal tag !!! use <noframes>.\n"
|
|
31459 |
+msgstr "<noframe> ist ein ungültiger Tag!!! <noframes> wird benutzt.\n"
|
|
31460 |
+
|
|
31461 |
+#: src/html.c:2573
|
|
31462 |
+msgid "<frame> outside of <frameset>\n"
|
|
31463 |
+msgstr "<frame> außerhalb von <frameset>\n"
|
|
31464 |
+
|
|
31465 |
+#: src/html.c:2576
|
|
31466 |
+msgid "<frame> inside of <noframes>\n"
|
|
31467 |
+msgstr "<frame> innerhalb von <noframes>\n"
|
|
31468 |
+
|
|
31469 |
+#: src/html.c:2579
|
|
31470 |
+msgid "<frame> inside of <iframe>\n"
|
|
31471 |
+msgstr "<frame> innerhalb von <iframe>\n"
|
|
31472 |
+
|
|
31473 |
+#: src/html.c:2631
|
|
31474 |
+msgid "incorrectly placed <frameset>\n"
|
|
31475 |
+msgstr "falsch plazierter <frameset>\n"
|
|
31476 |
+
|
|
31477 |
+#: src/html.c:2647
|
|
31478 |
+msgid "<frameset> inside of <noframes>\n"
|
|
31479 |
+msgstr "<frameset> innerhalb von <noframes>\n"
|
|
31480 |
+
|
|
31481 |
+#: src/html.c:2652
|
|
31482 |
+msgid "<frameset> inside of <iframe>\n"
|
|
31483 |
+msgstr "<frameset> innerhalb von <iframe>\n"
|
|
31484 |
+
|
|
31485 |
+#: src/html.c:3134
|
|
31486 |
+msgid " Html_tag_open_img: server-side map (ISMAP)\n"
|
|
31487 |
+msgstr ""
|
|
31488 |
+
|
|
31489 |
+#: src/html.c:3160
|
|
31490 |
+msgid "nested <map>\n"
|
|
31491 |
+msgstr "verschachteltes <map>\n"
|
|
31492 |
+
|
|
31493 |
+#: src/html.c:3212
|
|
31494 |
+msgid "usemap coords MUST be separated with ','\n"
|
|
31495 |
+msgstr "usemap-Koordinaten MÜSSEN durch ',' getrennt werden\n"
|
|
31496 |
+
|
|
31497 |
+#: src/html.c:3256
|
|
31498 |
+msgid "nohref"
|
|
31499 |
+msgstr ""
|
|
31500 |
+
|
|
31501 |
+#: src/html.c:3295
|
|
31502 |
+msgid "link depends on javascript()\n"
|
|
31503 |
+msgstr "Link von javascript() abhängig\n"
|
|
31504 |
+
|
|
31505 |
+#: src/html.c:3311
|
|
31506 |
+#, c-format
|
|
31507 |
+msgid "Registering ANCHOR: %s\n"
|
|
31508 |
+msgstr ""
|
|
31509 |
+
|
|
31510 |
+#: src/html.c:3316
|
|
31511 |
+msgid "Anchor names must be unique within the document\n"
|
|
31512 |
+msgstr "Ankernamen müssen innerhalb des Dokuments eindeutig sein\n"
|
|
31513 |
+
|
|
31514 |
+#: src/html.c:3523
|
|
31515 |
+msgid "it is strongly recommended using <UL> instead of <MENU>\n"
|
|
31516 |
+msgstr "es ist sehr zu empfehlen, <UL> statt <MENU> zu benutzen\n"
|
|
31517 |
+
|
|
31518 |
+#: src/html.c:3585
|
|
31519 |
+msgid "<li> outside <ul> or <ol>\n"
|
|
31520 |
+msgstr "<li> außerhalb von <ul> oder <ol>\n"
|
|
31521 |
+
|
|
31522 |
+#: src/html.c:3781
|
|
31523 |
+msgid "nested forms\n"
|
|
31524 |
+msgstr "verschachtelte Formulare\n"
|
|
31525 |
+
|
|
31526 |
+#: src/html.c:3828
|
|
31527 |
+msgid "FORM lacks a Submit button\n"
|
|
31528 |
+msgstr "FORM hat keine Submit-Schaltfläche\n"
|
|
31529 |
+
|
|
31530 |
+#: src/html.c:3830
|
|
31531 |
+msgid " (added a submit button internally)\n"
|
|
31532 |
+msgstr " (Schaltfläche intern hinzugefügt)\n"
|
|
31533 |
+
|
|
31534 |
+#: src/html.c:3934
|
|
31535 |
+msgid "META elements must be inside the HEAD section\n"
|
|
31536 |
+msgstr "META-Elemente müssen sich im HEAD-Abschnitt befinden\n"
|
|
31537 |
+
|
|
31538 |
+#: src/html.c:3986
|
|
31539 |
+#, c-format
|
|
31540 |
+msgid ""
|
|
31541 |
+"The NON-STANDARD meta refresh tag. The HTML 4.01 SPEC (sec 7.4.4) recommends "
|
|
31542 |
+"explicitly to avoid it. The author wanted you to go <%s>\n"
|
|
31543 |
+msgstr ""
|
|
31544 |
+"Der nicht standardmäßige meta-refresh-Tag. Die HTML-4.01-Spezifikation "
|
|
31545 |
+"(Abschnitt 7.4.4) rät ausdrücklich dazu, ihn zu vermeiden. Der Autor wollte "
|
|
31546 |
+"sie auf <%s> umleiten\n"
|
|
31547 |
+
|
|
31548 |
+#: src/html.c:4356
|
|
31549 |
+msgid "Html_submit_form: Method unknown\n"
|
|
31550 |
+msgstr "Html_submit_form: Unbekannte Methode\n"
|
|
31551 |
+
|
|
31552 |
+#: src/html.c:4438
|
|
31553 |
+msgid "Html_input_image: unable to create image submit.\n"
|
|
31554 |
+msgstr ""
|
|
31555 |
+
|
|
31556 |
+#: src/html.c:4460
|
|
31557 |
+msgid "input camp outside <form>\n"
|
|
31558 |
+msgstr ""
|
|
31559 |
+
|
|
31560 |
+#: src/html.c:4540
|
|
31561 |
+msgid "submit"
|
|
31562 |
+msgstr "übermitteln"
|
|
31563 |
+
|
|
31564 |
+#: src/html.c:4547 config/dillocfg.c:81
|
|
31565 |
+msgid "Reset"
|
|
31566 |
+msgstr "Zurücksetzen"
|
|
31567 |
+
|
|
31568 |
+#: src/html.c:4557
|
|
31569 |
+msgid "Submit"
|
|
31570 |
+msgstr "Übermitteln"
|
|
31571 |
+
|
|
31572 |
+#: src/html.c:4574
|
|
31573 |
+msgid "An input of the type \"file\" wasn't rendered!\n"
|
|
31574 |
+msgstr ""
|
|
31575 |
+
|
|
31576 |
+#: src/html.c:4748
|
|
31577 |
+msgid "<textarea> outside <form>\n"
|
|
31578 |
+msgstr "<textarea> außerhalb von <form>\n"
|
|
31579 |
+
|
|
31580 |
+#: src/html.c:4753
|
|
31581 |
+msgid "nested <textarea>\n"
|
|
31582 |
+msgstr "verschachteltes <textarea>\n"
|
|
31583 |
+
|
|
31584 |
+#: src/html.c:4825
|
|
31585 |
+msgid "<select> outside <form>\n"
|
|
31586 |
+msgstr "<select> außerhalb von <form>\n"
|
|
31587 |
+
|
|
31588 |
+#: src/html.c:4829
|
|
31589 |
+msgid "nested <select>\n"
|
|
31590 |
+msgstr "verschachteltes <select>\n"
|
|
31591 |
+
|
|
31592 |
+#: src/html.c:5053
|
|
31593 |
+msgid "base URI is relative (it MUST be absolute)\n"
|
|
31594 |
+msgstr "Basis-URI ist relativ (MUSS absolut sein)\n"
|
|
31595 |
+
|
|
31596 |
+#: src/html.c:5060
|
|
31597 |
+msgid "the BASE element must appear in the HEAD section\n"
|
|
31598 |
+msgstr "das BASE-Element muss im HEAD-Abschnitt erscheinen\n"
|
|
31599 |
+
|
|
31600 |
+#: src/html.c:5411
|
|
31601 |
+#, c-format
|
|
31602 |
+msgid "<%1$s> is not allowed to contain <%2$s>. -- closing <%3$s>\n"
|
|
31603 |
+msgstr "<%1$s> darf nicht <%2$s> enthalten. -- <%3$s> wird geschlossen\n"
|
|
31604 |
+
|
|
31605 |
+#: src/html.c:5435
|
|
31606 |
+msgid "the required DOCTYPE declaration is missing (or invalid)\n"
|
|
31607 |
+msgstr ""
|
|
31608 |
+
|
|
31609 |
+#: src/html.c:5526
|
|
31610 |
+#, c-format
|
|
31611 |
+msgid "<pre> is not allowed to contain <%s>\n"
|
|
31612 |
+msgstr "<pre> darf kein <%s> enthalten\n"
|
|
31613 |
+
|
|
31614 |
+#: src/html.c:5548
|
|
31615 |
+msgid "'id' and 'name' attribute of <a> tag differ\n"
|
|
31616 |
+msgstr "Die Attribute 'id' und 'name' des <a>-Tags sind unterschiedlich\n"
|
|
31617 |
+
|
|
31618 |
+#: src/html.c:5775
|
|
31619 |
+msgid "Html_write_raw : bufsize is negative!\n"
|
|
31620 |
+msgstr "Html_write_raw : Puffergröße ist negativ!\n"
|
|
31621 |
+
|
|
31622 |
+#: src/html.c:5853
|
|
31623 |
+msgid "attribute lacks closing quote\n"
|
|
31624 |
+msgstr "dem Attribut fehlt ein schließendes Anführungszeichen\n"
|
|
31625 |
+
|
|
31626 |
+#: src/html.c:5861
|
|
31627 |
+#, c-format
|
|
31628 |
+msgid "<%s> element lacks its closing '>'\n"
|
|
31629 |
+msgstr "Element <%s> hat kein schließendes '>'\n"
|
|
31630 |
+
|
|
31631 |
+#: src/html.c:6155
|
|
31632 |
+msgid "could not allocate character encoding converter"
|
|
31633 |
+msgstr ""
|
|
31634 |
+
|
|
31635 |
+#: src/misc.c:455
|
|
31636 |
+msgid "Untitled"
|
|
31637 |
+msgstr "Unbenannt"
|
|
31638 |
+
|
|
31639 |
+#: src/interface.c:249
|
|
31640 |
+msgid "Selection retrieval failed\n"
|
|
31641 |
+msgstr ""
|
|
31642 |
+
|
|
31643 |
+#: src/interface.c:363
|
|
31644 |
+msgid "Clear the URL box (middle-click to paste an URL)."
|
|
31645 |
+msgstr "URL-Feld leeren (Mittelklick, um URL einzufügen)"
|
|
31646 |
+
|
|
31647 |
+#: src/interface.c:385
|
|
31648 |
+msgid "Search the Web"
|
|
31649 |
+msgstr "Im Web suchen"
|
|
31650 |
+
|
|
31651 |
+#: src/interface.c:417 src/menu.c:231 src/menu.c:280
|
|
31652 |
+msgid "Back"
|
|
31653 |
+msgstr "Zurück"
|
|
31654 |
+
|
|
31655 |
+#: src/interface.c:421
|
|
31656 |
+msgid "Go to previous page (right-click for menu)."
|
|
31657 |
+msgstr "Zur vorherigen Seite (Rechtsklick öffnet Menü)."
|
|
31658 |
+
|
|
31659 |
+#: src/interface.c:450 src/menu.c:233 src/menu.c:282
|
|
31660 |
+msgid "Forward"
|
|
31661 |
+msgstr "Weiter"
|
|
31662 |
+
|
|
31663 |
+#: src/interface.c:454
|
|
31664 |
+msgid "Go to next page (right-click for menu)."
|
|
31665 |
+msgstr "Zur nächsten Seite (Rechtsklick öffnet Menü)"
|
|
31666 |
+
|
|
31667 |
+#: src/interface.c:481
|
|
31668 |
+msgid "Home"
|
|
31669 |
+msgstr " Start "
|
|
31670 |
+
|
|
31671 |
+#: src/interface.c:485
|
|
31672 |
+msgid "Go to the Home page"
|
|
31673 |
+msgstr "Zur Startseite gehen"
|
|
31674 |
+
|
|
31675 |
+#: src/interface.c:499 config/dillocfg.c:82
|
|
31676 |
+msgid "Reload"
|
|
31677 |
+msgstr "Neu laden"
|
|
31678 |
+
|
|
31679 |
+#: src/interface.c:500
|
|
31680 |
+msgid "Reload this page"
|
|
31681 |
+msgstr "Diese Seite neu laden"
|
|
31682 |
+
|
|
31683 |
+#: src/interface.c:512 config/dillocfg.c:83
|
|
31684 |
+msgid "Save"
|
|
31685 |
+msgstr "Speichern"
|
|
31686 |
+
|
|
31687 |
+#: src/interface.c:513
|
|
31688 |
+msgid "Save this page"
|
|
31689 |
+msgstr "Diese Seite speichern"
|
|
31690 |
+
|
|
31691 |
+#: src/interface.c:520 src/menu.c:235 src/menu.c:284
|
|
31692 |
+msgid "Stop"
|
|
31693 |
+msgstr ""
|
|
31694 |
+
|
|
31695 |
+#: src/interface.c:521
|
|
31696 |
+msgid "Stop the current transfer"
|
|
31697 |
+msgstr "Die laufende Übertragung abbrechen"
|
|
31698 |
+
|
|
31699 |
+#: src/interface.c:534
|
|
31700 |
+msgid "Book"
|
|
31701 |
+msgstr "Lesez"
|
|
31702 |
+
|
|
31703 |
+#: src/interface.c:538
|
|
31704 |
+msgid "View bookmarks"
|
|
31705 |
+msgstr "Lesezeichen ansehen"
|
|
31706 |
+
|
|
31707 |
+#: src/interface.c:655 src/interface.c:826
|
|
31708 |
+msgid "Hide Controls"
|
|
31709 |
+msgstr "Steuerelemente ausblenden"
|
|
31710 |
+
|
|
31711 |
+#: src/interface.c:655 src/interface.c:826
|
|
31712 |
+msgid "Show Controls"
|
|
31713 |
+msgstr "Steuerelemente anzeigen"
|
|
31714 |
+
|
|
31715 |
+#: src/interface.c:929
|
|
31716 |
+msgid "Show HTML bugs (right-click for menu)."
|
|
31717 |
+msgstr "HTML-Fehler anzeigen (Rechtsklick öffnet Menü)"
|
|
31718 |
+
|
|
31719 |
+#: src/interface.c:1231
|
|
31720 |
+#, c-format
|
|
31721 |
+msgid "Warning: search_url ends with '%%'\n"
|
|
31722 |
+msgstr "Warnung: Such-URL endet auf '%%'\n"
|
|
31723 |
+
|
|
31724 |
+#: src/interface.c:1233
|
|
31725 |
+#, c-format
|
|
31726 |
+msgid "Warning: illegal specifier '%%%c' in search_url\n"
|
|
31727 |
+msgstr "Warnung: ungültiger Parameter '%%%c' in der Such-URLl\n"
|
|
31728 |
+
|
|
31729 |
+#: src/interface.c:1298
|
|
31730 |
+msgid "Dillo: Open File"
|
|
31731 |
+msgstr "Dillo: Datei öffnen"
|
|
31732 |
+
|
|
31733 |
+#: src/interface.c:1374
|
|
31734 |
+msgid "Clear"
|
|
31735 |
+msgstr "Leeren"
|
|
31736 |
+
|
|
31737 |
+#: src/interface.c:1382 src/interface.c:1536 src/nav.c:453
|
|
31738 |
+msgid "Cancel"
|
|
31739 |
+msgstr "Abbrechen"
|
|
31740 |
+
|
|
31741 |
+#: src/interface.c:1513
|
|
31742 |
+msgid "User Name:"
|
|
31743 |
+msgstr "Benutzername:"
|
|
31744 |
+
|
|
31745 |
+#: src/interface.c:1520
|
|
31746 |
+msgid "Password:"
|
|
31747 |
+msgstr "Passwort:"
|
|
31748 |
+
|
|
31749 |
+#: src/interface.c:1529 src/interface.c:1604 src/interface.c:2073
|
|
31750 |
+#: src/nav.c:453
|
|
31751 |
+msgid "OK"
|
|
31752 |
+msgstr ""
|
|
31753 |
+
|
|
31754 |
+#: src/interface.c:1566
|
|
31755 |
+msgid "Dillo: Enter Authentication"
|
|
31756 |
+msgstr "Dillo: Authentifizierung eingeben"
|
|
31757 |
+
|
|
31758 |
+#: src/interface.c:1586
|
|
31759 |
+msgid "Dillo: Question"
|
|
31760 |
+msgstr "Dillo: Frage"
|
|
31761 |
+
|
|
31762 |
+#: src/interface.c:1602
|
|
31763 |
+msgid "Dillo: Open URL"
|
|
31764 |
+msgstr "Dillo: URL öffnen"
|
|
31765 |
+
|
|
31766 |
+#: src/interface.c:1626
|
|
31767 |
+#, c-format
|
|
31768 |
+msgid "File saved (%d Bytes)"
|
|
31769 |
+msgstr "Datei gespeichert (%d Byte)"
|
|
31770 |
+
|
|
31771 |
+#: src/interface.c:1708
|
|
31772 |
+#, c-format
|
|
31773 |
+msgid "Error trying to save: %s\n"
|
|
31774 |
+msgstr "Fehler beim Speichern: %s\n"
|
|
31775 |
+
|
|
31776 |
+#: src/interface.c:1761
|
|
31777 |
+msgid "Dillo: Save URL as File..."
|
|
31778 |
+msgstr "Dillo: URL als Datei speichern..."
|
|
31779 |
+
|
|
31780 |
+#: src/interface.c:1788
|
|
31781 |
+msgid "Dillo: Save link as File..."
|
|
31782 |
+msgstr "Dillo: Link als Datei speichern..."
|
|
31783 |
+
|
|
31784 |
+#: src/interface.c:1843 src/interface.c:1857
|
|
31785 |
+msgid "Dillo: Find text"
|
|
31786 |
+msgstr "Dillo: Text suchen"
|
|
31787 |
+
|
|
31788 |
+#: src/interface.c:1844 src/interface.c:1850
|
|
31789 |
+#, c-format
|
|
31790 |
+msgid "Cannot find \"%s\"."
|
|
31791 |
+msgstr "\"%s\" konnte nicht gefunden werden."
|
|
31792 |
+
|
|
31793 |
+#: src/interface.c:1858
|
|
31794 |
+#, c-format
|
|
31795 |
+msgid "No further occurence of \"%s\". Restarting from the beginning."
|
|
31796 |
+msgstr "Kein weiteres Vorkommen von \"%s\". Suche wird am Anfang fortgesetzt."
|
|
31797 |
+
|
|
31798 |
+#: src/interface.c:1866
|
|
31799 |
+#, c-format
|
|
31800 |
+msgid "(Find) \"%s\": restart from beginning"
|
|
31801 |
+msgstr "(Suche nach) \"%s\": Neubeginn am Anfang"
|
|
31802 |
+
|
|
31803 |
+#: src/interface.c:1879
|
|
31804 |
+#, c-format
|
|
31805 |
+msgid "(Find) \"%s\""
|
|
31806 |
+msgstr "(Suche nach) \"%s\""
|
|
31807 |
+
|
|
31808 |
+#: src/interface.c:1885
|
|
31809 |
+msgid "Unexpected return from a_Dw_gtk_scrolled_window_search()\n"
|
|
31810 |
+msgstr "Unerwarteter Rückgabewert von a_Dw_gtk_scrolled_window_search()\n"
|
|
31811 |
+
|
|
31812 |
+#: src/interface.c:1937
|
|
31813 |
+msgid "press <Enter> to (repeat) search, <Esc> to close search"
|
|
31814 |
+msgstr ""
|
|
31815 |
+"<Enter> zum (wiederholten) Suchen drücken, <Esc> zum Schließen der Suche"
|
|
31816 |
+
|
|
31817 |
+#: src/interface.c:1938 src/interface.c:2031
|
|
31818 |
+msgid "Search"
|
|
31819 |
+msgstr "Suchen"
|
|
31820 |
+
|
|
31821 |
+#: src/interface.c:1940 src/interface.c:1941 src/interface.c:1977
|
|
31822 |
+msgid "Case sensitive"
|
|
31823 |
+msgstr "Groß-/Kleinschreibung"
|
|
31824 |
+
|
|
31825 |
+#: src/interface.c:1975
|
|
31826 |
+msgid "Dillo: Find text in page"
|
|
31827 |
+msgstr "Dillo: Text auf der Seite suchen"
|
|
31828 |
+
|
|
31829 |
+#: src/interface.c:1978
|
|
31830 |
+msgid "Find"
|
|
31831 |
+msgstr "Suchen"
|
|
31832 |
+
|
|
31833 |
+#: src/interface.c:2029
|
|
31834 |
+msgid "Dillo"
|
|
31835 |
+msgstr ""
|
|
31836 |
+
|
|
31837 |
+#: src/interface.c:2029
|
|
31838 |
+msgid "Dillo: Search the Web"
|
|
31839 |
+msgstr "Dillo: Im Web suchen"
|
|
31840 |
+
|
|
31841 |
+#: src/interface.c:2066
|
|
31842 |
+#, c-format
|
|
31843 |
+msgid "Dillo: Enter proxy password for '%s'"
|
|
31844 |
+msgstr "Dillo: Proxy-Passwort für '%s' eingeben"
|
|
31845 |
+
|
|
31846 |
+#: src/interface.c:2151
|
|
31847 |
+msgid "Close"
|
|
31848 |
+msgstr "Schließen"
|
|
31849 |
+
|
|
31850 |
+#: src/interface.c:2226
|
|
31851 |
+msgid "close"
|
|
31852 |
+msgstr "schließen"
|
|
31853 |
+
|
|
31854 |
+#: src/nav.c:383
|
|
31855 |
+#, c-format
|
|
31856 |
+msgid "Unhandled switch type %d in a_Nav_jump_callback in src/nav.c\n"
|
|
31857 |
+msgstr ""
|
|
31858 |
+
|
|
31859 |
+#: src/nav.c:452
|
|
31860 |
+msgid "Repost form data?"
|
|
31861 |
+msgstr "Formulardaten erneut senden?"
|
|
31862 |
+
|
|
31863 |
+#: src/menu.c:173
|
|
31864 |
+msgid "_File"
|
|
31865 |
+msgstr "_Datei"
|
|
31866 |
+
|
|
31867 |
+#: src/menu.c:174
|
|
31868 |
+msgid "_New Window"
|
|
31869 |
+msgstr "_Neues Fenster"
|
|
31870 |
+
|
|
31871 |
+#: src/menu.c:177
|
|
31872 |
+msgid "New _Tab"
|
|
31873 |
+msgstr "Neuer _Reiter"
|
|
31874 |
+
|
|
31875 |
+#: src/menu.c:181
|
|
31876 |
+msgid "_Open File..."
|
|
31877 |
+msgstr "Datei ö_ffnen..."
|
|
31878 |
+
|
|
31879 |
+#: src/menu.c:183
|
|
31880 |
+msgid "Open _URL..."
|
|
31881 |
+msgstr "_URL öffnen..."
|
|
31882 |
+
|
|
31883 |
+#: src/menu.c:189
|
|
31884 |
+msgid "Close Window"
|
|
31885 |
+msgstr "Fenster schließen"
|
|
31886 |
+
|
|
31887 |
+#: src/menu.c:192 src/menu.c:359
|
|
31888 |
+msgid "Close Tab"
|
|
31889 |
+msgstr "Reiter schließen"
|
|
31890 |
+
|
|
31891 |
+#: src/menu.c:196
|
|
31892 |
+msgid "Exit Dillo"
|
|
31893 |
+msgstr "Dillo beenden"
|
|
31894 |
+
|
|
31895 |
+#: src/menu.c:200
|
|
31896 |
+msgid "_View"
|
|
31897 |
+msgstr "_Ansicht"
|
|
31898 |
+
|
|
31899 |
+#: src/menu.c:202
|
|
31900 |
+msgid "Previous tab"
|
|
31901 |
+msgstr "Vorheriger Reiter"
|
|
31902 |
+
|
|
31903 |
+#: src/menu.c:204
|
|
31904 |
+msgid "Next tab"
|
|
31905 |
+msgstr "Nächster Reiter"
|
|
31906 |
+
|
|
31907 |
+#: src/menu.c:208
|
|
31908 |
+msgid "_Options..."
|
|
31909 |
+msgstr "_Optionen..."
|
|
31910 |
+
|
|
31911 |
+#: src/menu.c:228
|
|
31912 |
+msgid "PAGE OPTIONS"
|
|
31913 |
+msgstr "SEITENOPTIONEN"
|
|
31914 |
+
|
|
31915 |
+#: src/menu.c:237 src/menu.c:286
|
|
31916 |
+msgid "_Reload"
|
|
31917 |
+msgstr "_Neu laden"
|
|
31918 |
+
|
|
31919 |
+#: src/menu.c:241
|
|
31920 |
+msgid "View page So_urce"
|
|
31921 |
+msgstr "_Quelltext anzeigen"
|
|
31922 |
+
|
|
31923 |
+#: src/menu.c:243
|
|
31924 |
+msgid "View page Bugs"
|
|
31925 |
+msgstr "Seitenfehler anzeigen"
|
|
31926 |
+
|
|
31927 |
+#: src/menu.c:244
|
|
31928 |
+msgid "_Bookmark this Page"
|
|
31929 |
+msgstr "_Lesezeichen setzen"
|
|
31930 |
+
|
|
31931 |
+#: src/menu.c:247
|
|
31932 |
+msgid "Duplicate this Page"
|
|
31933 |
+msgstr "Diese Seite duplizieren"
|
|
31934 |
+
|
|
31935 |
+#: src/menu.c:250
|
|
31936 |
+msgid "Duplicate this tab"
|
|
31937 |
+msgstr "Diesen Reiter duplizieren"
|
|
31938 |
+
|
|
31939 |
+#: src/menu.c:254
|
|
31940 |
+msgid "_Find Text"
|
|
31941 |
+msgstr "Text _suchen"
|
|
31942 |
+
|
|
31943 |
+#: src/menu.c:257
|
|
31944 |
+msgid "Jump to..."
|
|
31945 |
+msgstr "Gehe zu..."
|
|
31946 |
+
|
|
31947 |
+#: src/menu.c:258
|
|
31948 |
+msgid "This Frame..."
|
|
31949 |
+msgstr "Frame..."
|
|
31950 |
+
|
|
31951 |
+#: src/menu.c:259
|
|
31952 |
+msgid "This Frameset..."
|
|
31953 |
+msgstr "Frameset..."
|
|
31954 |
+
|
|
31955 |
+#: src/menu.c:262
|
|
31956 |
+msgid "Save Page As..."
|
|
31957 |
+msgstr "Seite speichern unter..."
|
|
31958 |
+
|
|
31959 |
+#: src/menu.c:277
|
|
31960 |
+msgid "FRAME OPTIONS"
|
|
31961 |
+msgstr "FRAMEOPTIONEN"
|
|
31962 |
+
|
|
31963 |
+#: src/menu.c:290
|
|
31964 |
+msgid "View frame Source"
|
|
31965 |
+msgstr "Quelltext anzeigen"
|
|
31966 |
+
|
|
31967 |
+#: src/menu.c:292
|
|
31968 |
+msgid "Bookmark this Frame"
|
|
31969 |
+msgstr "Lesezeichen setzen"
|
|
31970 |
+
|
|
31971 |
+#: src/menu.c:294
|
|
31972 |
+msgid "Reload this Frame"
|
|
31973 |
+msgstr "Neu laden"
|
|
31974 |
+
|
|
31975 |
+#: src/menu.c:297
|
|
31976 |
+msgid "Show only this Frame"
|
|
31977 |
+msgstr "Nur diesen Frame anzeigen"
|
|
31978 |
+
|
|
31979 |
+#: src/menu.c:299
|
|
31980 |
+msgid "Open Frame in new Window"
|
|
31981 |
+msgstr "In neuem Fenster öffnen"
|
|
31982 |
+
|
|
31983 |
+#: src/menu.c:302
|
|
31984 |
+msgid "Open Frame in new Tab"
|
|
31985 |
+msgstr "In neuem Reiter öffnen"
|
|
31986 |
+
|
|
31987 |
+#: src/menu.c:306
|
|
31988 |
+msgid "_Find Text in this Frame..."
|
|
31989 |
+msgstr "Text _suchen"
|
|
31990 |
+
|
|
31991 |
+#: src/menu.c:309 src/menu.c:340
|
|
31992 |
+msgid "Save Frame As..."
|
|
31993 |
+msgstr "Speichern unter..."
|
|
31994 |
+
|
|
31995 |
+#: src/menu.c:325
|
|
31996 |
+msgid "FRAMESET OPTIONS"
|
|
31997 |
+msgstr "FRAMESETOPTIONEN"
|
|
31998 |
+
|
|
31999 |
+#: src/menu.c:327
|
|
32000 |
+msgid "View Frameset Source"
|
|
32001 |
+msgstr "Quelltext anzeigen"
|
|
32002 |
+
|
|
32003 |
+#: src/menu.c:329
|
|
32004 |
+msgid "Bookmark this Frameset"
|
|
32005 |
+msgstr "Lesezeichen setzen"
|
|
32006 |
+
|
|
32007 |
+#: src/menu.c:331
|
|
32008 |
+msgid "Reload this Frameset"
|
|
32009 |
+msgstr "Neu laden"
|
|
32010 |
+
|
|
32011 |
+#: src/menu.c:334
|
|
32012 |
+msgid "Show only this Frameset"
|
|
32013 |
+msgstr "Nur diesen Frameset anzeigen"
|
|
32014 |
+
|
|
32015 |
+#: src/menu.c:337
|
|
32016 |
+msgid "_Find Text in this Frameset..."
|
|
32017 |
+msgstr "Text _suchen..."
|
|
32018 |
+
|
|
32019 |
+#: src/menu.c:357
|
|
32020 |
+msgid "TAB OPTIONS"
|
|
32021 |
+msgstr "REITEROPTIONEN"
|
|
32022 |
+
|
|
32023 |
+#: src/menu.c:361
|
|
32024 |
+msgid "New Tab"
|
|
32025 |
+msgstr "Neuer Reiter"
|
|
32026 |
+
|
|
32027 |
+#: src/menu.c:363
|
|
32028 |
+msgid "Reload Tab"
|
|
32029 |
+msgstr "Reiter neu laden"
|
|
32030 |
+
|
|
32031 |
+#: src/menu.c:460
|
|
32032 |
+msgid "FOLLOWING PAGES"
|
|
32033 |
+msgstr "FOLGENDE SEITEN"
|
|
32034 |
+
|
|
32035 |
+#: src/menu.c:463
|
|
32036 |
+msgid "PREVIOUS PAGES"
|
|
32037 |
+msgstr "VORHERIGE SEITEN"
|
|
32038 |
+
|
|
32039 |
+#: src/menu.c:531
|
|
32040 |
+msgid "LINK OPTIONS"
|
|
32041 |
+msgstr "LINKOPTIONEN"
|
|
32042 |
+
|
|
32043 |
+#: src/menu.c:533
|
|
32044 |
+msgid "Open Link in New Window"
|
|
32045 |
+msgstr "In neuem Fenster öffnen"
|
|
32046 |
+
|
|
32047 |
+#: src/menu.c:536
|
|
32048 |
+msgid "Open Link in New Tab"
|
|
32049 |
+msgstr "In neuem Reiter öffnen"
|
|
32050 |
+
|
|
32051 |
+#: src/menu.c:539
|
|
32052 |
+msgid "Open Link"
|
|
32053 |
+msgstr "Link öffnen"
|
|
32054 |
+
|
|
32055 |
+#: src/menu.c:542
|
|
32056 |
+msgid "Bookmark this Link"
|
|
32057 |
+msgstr "Lesezeichen auf diesen Link setzen"
|
|
32058 |
+
|
|
32059 |
+#: src/menu.c:544
|
|
32060 |
+msgid "Copy Link location"
|
|
32061 |
+msgstr "Linkadresse kopieren"
|
|
32062 |
+
|
|
32063 |
+#: src/menu.c:549
|
|
32064 |
+msgid "Save Link As..."
|
|
32065 |
+msgstr "Link speichern unter..."
|
|
32066 |
+
|
|
32067 |
+#: src/menu.c:553
|
|
32068 |
+msgid "Image Menu..."
|
|
32069 |
+msgstr "Bildmenü..."
|
|
32070 |
+
|
|
32071 |
+#: src/menu.c:571
|
|
32072 |
+msgid "IMAGE OPTIONS"
|
|
32073 |
+msgstr "BILDOPTIONEN"
|
|
32074 |
+
|
|
32075 |
+#: src/menu.c:573
|
|
32076 |
+msgid "Isolate Image"
|
|
32077 |
+msgstr "Bild freistellen"
|
|
32078 |
+
|
|
32079 |
+#: src/menu.c:575
|
|
32080 |
+msgid "Open Image in New Window"
|
|
32081 |
+msgstr "Bild in neuem Fenster öffnen"
|
|
32082 |
+
|
|
32083 |
+#: src/menu.c:578
|
|
32084 |
+msgid "Open Image in New Tab"
|
|
32085 |
+msgstr "Bild in neuem Reiter öffnen"
|
|
32086 |
+
|
|
32087 |
+#: src/menu.c:581
|
|
32088 |
+msgid "Open Image"
|
|
32089 |
+msgstr "Bild öffnen"
|
|
32090 |
+
|
|
32091 |
+#: src/menu.c:584
|
|
32092 |
+msgid "Bookmark this Image"
|
|
32093 |
+msgstr "Lesezeichen auf dieses Bild setzen"
|
|
32094 |
+
|
|
32095 |
+#: src/menu.c:586
|
|
32096 |
+msgid "Copy Image location"
|
|
32097 |
+msgstr "Bildadresse kopieren"
|
|
32098 |
+
|
|
32099 |
+#: src/menu.c:591
|
|
32100 |
+msgid "Save Image As..."
|
|
32101 |
+msgstr "Bild speichern unter..."
|
|
32102 |
+
|
|
32103 |
+#: src/menu.c:605
|
|
32104 |
+msgid "BUG METER OPTIONS"
|
|
32105 |
+msgstr "OPTIONEN FEHLERZÄHLER"
|
|
32106 |
+
|
|
32107 |
+#: src/menu.c:607
|
|
32108 |
+msgid "Validate URL with W3C"
|
|
32109 |
+msgstr "URL mit W3C validieren"
|
|
32110 |
+
|
|
32111 |
+#: src/menu.c:609
|
|
32112 |
+msgid "Validate URL with WDG"
|
|
32113 |
+msgstr "URL mit WDG validieren"
|
|
32114 |
+
|
|
32115 |
+#: src/menu.c:612
|
|
32116 |
+msgid "About Bug Meter..."
|
|
32117 |
+msgstr "Über den Fehlerzähler..."
|
|
32118 |
+
|
|
32119 |
+#: src/prefs.c:431
|
|
32120 |
+msgid "Error: Can't open specified config file. default file is used.\n"
|
|
32121 |
+msgstr ""
|
|
32122 |
+"Fehler: Angegebene Konfigurationsdatei kann nicht geöffnet werden. Es wird "
|
|
32123 |
+"die Standarddatei benutzt.\n"
|
|
32124 |
+
|
|
32125 |
+#: src/i18n.c:359
|
|
32126 |
+msgid "charset detect may mistake...\n"
|
|
32127 |
+msgstr "erkannter Zeichensatz könnte falsch sein...\n"
|
|
32128 |
+
|
|
32129 |
+#: src/i18n.c:447
|
|
32130 |
+msgid "<meta> outside of <head>!\n"
|
|
32131 |
+msgstr "<meta> außerhalb von <head>!\n"
|
|
32132 |
+
|
|
32133 |
+#: src/i18n.c:493
|
|
32134 |
+msgid "all ascii code\n"
|
|
32135 |
+msgstr ""
|
|
32136 |
+
|
|
32137 |
+#: src/i18n.c:526
|
|
32138 |
+msgid "unable to fully convert between character encodings\n"
|
|
32139 |
+msgstr "vollständiges Konvertieren zwischen Zeichensätzen nicht möglich\n"
|
|
32140 |
+
|
|
32141 |
+#: src/i18n.c:565
|
|
32142 |
+msgid "no support enc\n"
|
|
32143 |
+msgstr ""
|
|
32144 |
+
|
|
32145 |
+#: src/tab.c:293 src/tab.c:425 dpi/bookmarks.c:1653
|
|
32146 |
+msgid "(Untitled)"
|
|
32147 |
+msgstr "(Unbenannt)"
|
|
32148 |
+
|
|
32149 |
+#: src/IO/https.c:168
|
|
32150 |
+msgid "--Error detected\n"
|
|
32151 |
+msgstr "--Fehler erkannt\n"
|
|
32152 |
+
|
|
32153 |
+#: src/IO/https.c:173 src/IO/https.c:204 src/IO/http.c:294
|
|
32154 |
+msgid "ERROR: unable to connect to remote host"
|
|
32155 |
+msgstr "FEHLER: Verbindungsaufbau zum entfernten Host nicht möglich"
|
|
32156 |
+
|
|
32157 |
+#: src/IO/https.c:179 src/IO/http.c:309
|
|
32158 |
+msgid "--Connection established\n"
|
|
32159 |
+msgstr "--Verbindung aufgebaut\n"
|
|
32160 |
+
|
|
32161 |
+#: src/IO/https.c:280 src/IO/http.c:417
|
|
32162 |
+#, c-format
|
|
32163 |
+msgid "Sending query to %s..."
|
|
32164 |
+msgstr "Sende Anfrage an %s..."
|
|
32165 |
+
|
|
32166 |
+#: src/IO/https.c:333 src/IO/http.c:486
|
|
32167 |
+#, c-format
|
|
32168 |
+msgid "DNS solving %s"
|
|
32169 |
+msgstr "DNS löst %s auf"
|
|
32170 |
+
|
|
32171 |
+#: src/IO/https.c:363
|
|
32172 |
+msgid " HTTPS: new abort handler! #2\n"
|
|
32173 |
+msgstr ""
|
|
32174 |
+
|
|
32175 |
+#: src/IO/https.c:365 src/IO/https.c:387 src/IO/http.c:301 src/IO/http.c:520
|
|
32176 |
+#: src/IO/http.c:551
|
|
32177 |
+#, c-format
|
|
32178 |
+msgid "ERROR: %s"
|
|
32179 |
+msgstr "FEHLER: %s"
|
|
32180 |
+
|
|
32181 |
+#: src/IO/https.c:386
|
|
32182 |
+msgid " HTTP: new abort handler! #1\n"
|
|
32183 |
+msgstr ""
|
|
32184 |
+
|
|
32185 |
+#: src/IO/https.c:400 src/IO/http.c:564
|
|
32186 |
+#, c-format
|
|
32187 |
+msgid "ERROR: Dns can't solve %s"
|
|
32188 |
+msgstr "FEHLER: DNS kann %s nicht auflösen"
|
|
32189 |
+
|
|
32190 |
+#: src/IO/https.c:421 src/IO/http.c:591
|
|
32191 |
+msgid "Query sent, waiting for reply..."
|
|
32192 |
+msgstr "Abfrage gesendet, Antwort wird erwartet..."
|
|
32193 |
+
|
|
32194 |
+#: src/IO/http.c:190
|
|
32195 |
+#, c-format
|
|
32196 |
+msgid "Getting %1$s, referer %2$s\n"
|
|
32197 |
+msgstr ""
|
|
32198 |
+
|
|
32199 |
+#: src/IO/http.c:259
|
|
32200 |
+#, c-format
|
|
32201 |
+msgid ""
|
|
32202 |
+"Query:\n"
|
|
32203 |
+"%s"
|
|
32204 |
+msgstr ""
|
|
32205 |
+"Abfrage:\n"
|
|
32206 |
+"%s"
|
|
32207 |
+
|
|
32208 |
+#: src/IO/http.c:286
|
|
32209 |
+msgid "--Connection broken\n"
|
|
32210 |
+msgstr "--Verbindung unterbrochen\n"
|
|
32211 |
+
|
|
32212 |
+#: src/IO/http.c:342
|
|
32213 |
+#, c-format
|
|
32214 |
+msgid "Http_connect_socket ERROR: %s\n"
|
|
32215 |
+msgstr ""
|
|
32216 |
+
|
|
32217 |
+#: src/IO/http.c:363 src/IO/http.c:377
|
|
32218 |
+#, c-format
|
|
32219 |
+msgid "Connecting to %s\n"
|
|
32220 |
+msgstr "Verbindungsaufbau zu %s\n"
|
|
32221 |
+
|
|
32222 |
+#: src/IO/http.c:396
|
|
32223 |
+msgid "Contacting host..."
|
|
32224 |
+msgstr "Verbindungsaufbau zum Host..."
|
|
32225 |
+
|
|
32226 |
+#: src/IO/http.c:529
|
|
32227 |
+msgid "Http: OpAbort [1B]\n"
|
|
32228 |
+msgstr ""
|
|
32229 |
+
|
|
32230 |
+#: src/IO/dpi.c:188
|
|
32231 |
+msgid "ERROR: [Dpi_get_token] Can't find token start\n"
|
|
32232 |
+msgstr ""
|
|
32233 |
+
|
|
32234 |
+#: src/IO/dpi.c:221
|
|
32235 |
+msgid "ERROR: [Dpi_get_token] *** NULL code here ***\n"
|
|
32236 |
+msgstr ""
|
|
32237 |
+
|
|
32238 |
+#: src/IO/dpi.c:312
|
|
32239 |
+msgid "Dpi: [Dpi_process_io] IOClose\n"
|
|
32240 |
+msgstr ""
|
|
32241 |
+
|
|
32242 |
+#: src/IO/dpi.c:338
|
|
32243 |
+#, c-format
|
|
32244 |
+msgid "Dpi_start_dpid (child): %s\n"
|
|
32245 |
+msgstr ""
|
|
32246 |
+
|
|
32247 |
+#: src/IO/dpi.c:348 src/IO/dpi.c:363
|
|
32248 |
+#, c-format
|
|
32249 |
+msgid "Dpi_start_dpid: %s\n"
|
|
32250 |
+msgstr ""
|
|
32251 |
+
|
|
32252 |
+#: src/IO/dpi.c:359
|
|
32253 |
+#, c-format
|
|
32254 |
+msgid "Dpi_start_dpid: n = %d\n"
|
|
32255 |
+msgstr ""
|
|
32256 |
+
|
|
32257 |
+#: src/IO/dpi.c:386
|
|
32258 |
+#, c-format
|
|
32259 |
+msgid "Dpi_check_uds: %1$s %2$s\n"
|
|
32260 |
+msgstr ""
|
|
32261 |
+
|
|
32262 |
+#: src/IO/dpi.c:673
|
|
32263 |
+msgid "dpi.c: ERROR, can't start dpi daemon\n"
|
|
32264 |
+msgstr "dpi.c: FEHLER, dpi-Dämon kann nicht gestartet werden\n"
|
|
32265 |
+
|
|
32266 |
+#: src/IO/dpi.c:686
|
|
32267 |
+msgid "a_Dpi_ccc: OpAbort[2B], Not implemented\n"
|
|
32268 |
+msgstr ""
|
|
32269 |
+
|
|
32270 |
+#: src/IO/dpi.c:790 src/IO/dpi.c:794
|
|
32271 |
+#, c-format
|
|
32272 |
+msgid "a_Dpi_bye_dpid: %s\n"
|
|
32273 |
+msgstr ""
|
|
32274 |
+
|
|
32275 |
+#: dpid/dpi_socket_dir.c:106
|
|
32276 |
+#, c-format
|
|
32277 |
+msgid "The dpi_socket_dir file does not exist\n"
|
|
32278 |
+msgstr "Die dpi_socket_dir-Datei existiert nicht\n"
|
|
32279 |
+
|
|
32280 |
+#: dpid/dpi_socket_dir.c:110 dpid/dpi_socket_dir.c:114
|
|
32281 |
+#, c-format
|
|
32282 |
+msgid "debug_msg - init_sockdir: The socket directory "
|
|
32283 |
+msgstr "debug_msg - init_sockdir: Das Socketverzeichnis"
|
|
32284 |
+
|
|
32285 |
+#: dpid/dpi_socket_dir.c:111
|
|
32286 |
+#, c-format
|
|
32287 |
+msgid "%s exists and is OK\n"
|
|
32288 |
+msgstr "%s existiert und ist in Ordnung\n"
|
|
32289 |
+
|
|
32290 |
+#: dpid/dpi_socket_dir.c:115
|
|
32291 |
+#, c-format
|
|
32292 |
+msgid "%s does not exist or is not a directory\n"
|
|
32293 |
+msgstr "%s existiert nicht oder ist kein Verzeichnis\n"
|
|
32294 |
+
|
|
32295 |
+#: dpid/dpi_socket_dir.c:124
|
|
32296 |
+#, c-format
|
|
32297 |
+msgid " - Failed to create dpi socket directory\n"
|
|
32298 |
+msgstr " - DPI-Socket-Verzeichnis konnte nicht erstellt werden\n"
|
|
32299 |
+
|
|
32300 |
+#: dpid/dpi_socket_dir.c:127
|
|
32301 |
+#, c-format
|
|
32302 |
+msgid " - failed to save %s\n"
|
|
32303 |
+msgstr " - %s konnte nicht gespeichert werden\n"
|
|
32304 |
+
|
|
32305 |
+#: dpid/main.c:59 dpid/main.c:66 dpid/main.c:77 dpid/main.c:85 dpid/main.c:99
|
|
32306 |
+#: dpid/main.c:104 dpid/main.c:109
|
|
32307 |
+#, c-format
|
|
32308 |
+msgid "ERROR in child proc for %s\n"
|
|
32309 |
+msgstr ""
|
|
32310 |
+
|
|
32311 |
+#: dpid/main.c:166
|
|
32312 |
+#, c-format
|
|
32313 |
+msgid ": dpid failed to parse cmd in %s\n"
|
|
32314 |
+msgstr ": dpid konnte Befehl in %s nicht parsen\n"
|
|
32315 |
+
|
|
32316 |
+#: dpid/main.c:265
|
|
32317 |
+#, c-format
|
|
32318 |
+msgid "Failed to create socket directory\n"
|
|
32319 |
+msgstr "Socket-Verzeichnis konnte nicht erstellt werden\n"
|
|
32320 |
+
|
|
32321 |
+#: dpid/main.c:275
|
|
32322 |
+#, c-format
|
|
32323 |
+msgid "dpid refuses to start, possibly because:\n"
|
|
32324 |
+msgstr "dpid startet nicht, wahrscheinlich weil:\n"
|
|
32325 |
+
|
|
32326 |
+#: dpid/main.c:276
|
|
32327 |
+#, c-format
|
|
32328 |
+msgid "\t1) An instance of dpid is already running.\n"
|
|
32329 |
+msgstr "\t1) Bereits eine Instanz von dpid läuft.\n"
|
|
32330 |
+
|
|
32331 |
+#: dpid/main.c:277
|
|
32332 |
+#, c-format
|
|
32333 |
+msgid "\t2) A previous dpid didn't clean up on exit.\n"
|
|
32334 |
+msgstr "\t2) Ein früherer dpid hat beim Beenden nicht aufgeräumt.\n"
|
|
32335 |
+
|
|
32336 |
+#: dpid/main.c:280
|
|
32337 |
+msgid "init_srs_sockets failed\n"
|
|
32338 |
+msgstr "init_srs_sockets fehlgeschlagen\n"
|
|
32339 |
+
|
|
32340 |
+#: dpid/main.c:294
|
|
32341 |
+#, c-format
|
|
32342 |
+msgid "dpid started\n"
|
|
32343 |
+msgstr "dpid gestartet\n"
|
|
32344 |
+
|
|
32345 |
+#: dpid/main.c:340
|
|
32346 |
+#, c-format
|
|
32347 |
+msgid "accept on srs socket failed\n"
|
|
32348 |
+msgstr ""
|
|
32349 |
+
|
|
32350 |
+#: dpid/main.c:341
|
|
32351 |
+#, c-format
|
|
32352 |
+msgid "service pending connections, and continue\n"
|
|
32353 |
+msgstr ""
|
|
32354 |
+
|
|
32355 |
+#: dpi/bookmarks.c:96
|
|
32356 |
+msgid ""
|
|
32357 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32358 |
+"<html>\n"
|
|
32359 |
+"<head>\n"
|
|
32360 |
+"<title>Bookmarks</title>\n"
|
|
32361 |
+"</head>\n"
|
|
32362 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32363 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32364 |
+" <tr><td>\n"
|
|
32365 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32366 |
+" <tr>\n"
|
|
32367 |
+" <td> Bookmarks::</td>\n"
|
|
32368 |
+" <td width='100%' align='right'>\n"
|
|
32369 |
+" [<a href='dpi:/bm/modify'>modify</a>]\n"
|
|
32370 |
+" </td></tr>\n"
|
|
32371 |
+" </table></td></tr>\n"
|
|
32372 |
+"</table>\n"
|
|
32373 |
+"<br>\n"
|
|
32374 |
+msgstr ""
|
|
32375 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32376 |
+"<html>\n"
|
|
32377 |
+"<head>\n"
|
|
32378 |
+"<title>Lesezeichen</title>\n"
|
|
32379 |
+"</head>\n"
|
|
32380 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32381 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32382 |
+" <tr><td>\n"
|
|
32383 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32384 |
+" <tr>\n"
|
|
32385 |
+" <td> Lesezeichen::</td>\n"
|
|
32386 |
+" <td width='100%' align='right'>\n"
|
|
32387 |
+" [<a href='dpi:/bm/modify'>ändern</a>]\n"
|
|
32388 |
+" </td></tr>\n"
|
|
32389 |
+" </table></td></tr>\n"
|
|
32390 |
+"</table>\n"
|
|
32391 |
+"<br>\n"
|
|
32392 |
+
|
|
32393 |
+#: dpi/bookmarks.c:115
|
|
32394 |
+msgid ""
|
|
32395 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32396 |
+"<html>\n"
|
|
32397 |
+"<head>\n"
|
|
32398 |
+"<title>Bookmarks</title>\n"
|
|
32399 |
+"</head>\n"
|
|
32400 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32401 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32402 |
+" <tr><td>\n"
|
|
32403 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32404 |
+" <tr>\n"
|
|
32405 |
+" <td> Bookmarks :: modify</td></tr>\n"
|
|
32406 |
+" </table></td></tr> \n"
|
|
32407 |
+"</table> \n"
|
|
32408 |
+"\n"
|
|
32409 |
+"<form>\n"
|
|
32410 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
32411 |
+" <tr><td>\n"
|
|
32412 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
32413 |
+" <tr>\n"
|
|
32414 |
+" <td><b>Select an operation </b></td>\n"
|
|
32415 |
+" <td><select name='operation'>\n"
|
|
32416 |
+" <option value='none' selected>--\n"
|
|
32417 |
+" <option value='delete'>Delete\n"
|
|
32418 |
+" <option value='move'>Move\n"
|
|
32419 |
+" <option value='modify'>Modify\n"
|
|
32420 |
+" <option value='add_sec'>Add Section\n"
|
|
32421 |
+" <option value='add_url'>Add URL\n"
|
|
32422 |
+" </select></td>\n"
|
|
32423 |
+" <td><b>, mark its operands, and </b></td>\n"
|
|
32424 |
+" <td><input type='submit' name='submit' value='submit.'></td>\n"
|
|
32425 |
+" <td width='100%'></td>\n"
|
|
32426 |
+" </tr>\n"
|
|
32427 |
+" </table></td></tr>\n"
|
|
32428 |
+"</table>\n"
|
|
32429 |
+msgstr ""
|
|
32430 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32431 |
+"<html>\n"
|
|
32432 |
+"<head>\n"
|
|
32433 |
+"<title>Lesezeichen</title>\n"
|
|
32434 |
+"</head>\n"
|
|
32435 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32436 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32437 |
+" <tr><td>\n"
|
|
32438 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32439 |
+" <tr>\n"
|
|
32440 |
+" <td> Lesezeichen :: ändern</td></tr>\n"
|
|
32441 |
+" </table></td></tr> \n"
|
|
32442 |
+"</table> \n"
|
|
32443 |
+"\n"
|
|
32444 |
+"<form>\n"
|
|
32445 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
32446 |
+" <tr><td>\n"
|
|
32447 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
32448 |
+" <tr>\n"
|
|
32449 |
+" <td><b>Aktion wählen </b></td>\n"
|
|
32450 |
+" <td><select name='operation'>\n"
|
|
32451 |
+" <option value='none' selected>--\n"
|
|
32452 |
+" <option value='delete'>Löschen\n"
|
|
32453 |
+" <option value='move'>Verschieben\n"
|
|
32454 |
+" <option value='modify'>Ändern\n"
|
|
32455 |
+" <option value='add_sec'>Kategorie hinzufügen\n"
|
|
32456 |
+" <option value='add_url'>URL hinzufügen\n"
|
|
32457 |
+" </select></td>\n"
|
|
32458 |
+" <td><b>, Operanden wählen und </b></td>\n"
|
|
32459 |
+" <td><input type='submit' name='submit' value='übermitteln.'></td>\n"
|
|
32460 |
+" <td width='100%'></td>\n"
|
|
32461 |
+" </tr>\n"
|
|
32462 |
+" </table></td></tr>\n"
|
|
32463 |
+"</table>\n"
|
|
32464 |
+
|
|
32465 |
+#: dpi/bookmarks.c:151
|
|
32466 |
+msgid ""
|
|
32467 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
32468 |
+" <tr valign='top'>\n"
|
|
32469 |
+" <td>\n"
|
|
32470 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
32471 |
+" <tr><td>\n"
|
|
32472 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32473 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
32474 |
+msgstr ""
|
|
32475 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
32476 |
+" <tr valign='top'>\n"
|
|
32477 |
+" <td>\n"
|
|
32478 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
32479 |
+" <tr><td>\n"
|
|
32480 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32481 |
+" <tr><td><small>Kategorien:</small></td></tr></table></td></tr>\n"
|
|
32482 |
+
|
|
32483 |
+#: dpi/bookmarks.c:160
|
|
32484 |
+msgid ""
|
|
32485 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
32486 |
+" <tr valign='top'>\n"
|
|
32487 |
+" <td>\n"
|
|
32488 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
32489 |
+" <tr><td>\n"
|
|
32490 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32491 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
32492 |
+msgstr ""
|
|
32493 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
32494 |
+" <tr valign='top'>\n"
|
|
32495 |
+" <td>\n"
|
|
32496 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
32497 |
+" <tr><td>\n"
|
|
32498 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
32499 |
+" <tr><td><small>Kategorien:</small></td></tr></table></td></tr>\n"
|
|
32500 |
+
|
|
32501 |
+#: dpi/bookmarks.c:243
|
|
32502 |
+msgid ""
|
|
32503 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32504 |
+"<html>\n"
|
|
32505 |
+"<head>\n"
|
|
32506 |
+"<title>Bookmarks</title>\n"
|
|
32507 |
+"</head>\n"
|
|
32508 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32509 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32510 |
+" <tr><td colspan='2'>\n"
|
|
32511 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
32512 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add section\n"
|
|
32513 |
+" </td></tr></table></td></tr>\n"
|
|
32514 |
+"</table>\n"
|
|
32515 |
+"<br>\n"
|
|
32516 |
+"<form>\n"
|
|
32517 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
32518 |
+"<table border='1' width='100%'>\n"
|
|
32519 |
+" <tr>\n"
|
|
32520 |
+" <td bgcolor='olive'><b>New section:</b></td>\n"
|
|
32521 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
32522 |
+"</table>\n"
|
|
32523 |
+"<table width='100%' cellpadding='10'>\n"
|
|
32524 |
+"<tr><td>\n"
|
|
32525 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
32526 |
+" <tr>\n"
|
|
32527 |
+" <td>Title:</td>\n"
|
|
32528 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
32529 |
+" </table>\n"
|
|
32530 |
+" </td></tr>\n"
|
|
32531 |
+"</table>\n"
|
|
32532 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
32533 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
32534 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
32535 |
+"</table>\n"
|
|
32536 |
+"</form>\n"
|
|
32537 |
+"</body>\n"
|
|
32538 |
+"</html>\n"
|
|
32539 |
+"\n"
|
|
32540 |
+msgstr ""
|
|
32541 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32542 |
+"<html>\n"
|
|
32543 |
+"<head>\n"
|
|
32544 |
+"<title>Lesezeichen</title>\n"
|
|
32545 |
+"</head>\n"
|
|
32546 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32547 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32548 |
+" <tr><td colspan='2'>\n"
|
|
32549 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
32550 |
+" <tr><td bgcolor='#b4b4b4'> Lesezeichen ändern:: Kategorie "
|
|
32551 |
+"hinzufügen\n"
|
|
32552 |
+" </td></tr></table></td></tr>\n"
|
|
32553 |
+"</table>\n"
|
|
32554 |
+"<br>\n"
|
|
32555 |
+"<form>\n"
|
|
32556 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
32557 |
+"<table border='1' width='100%'>\n"
|
|
32558 |
+" <tr>\n"
|
|
32559 |
+" <td bgcolor='olive'><b>Neue Kategorie:</b></td>\n"
|
|
32560 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
32561 |
+"</table>\n"
|
|
32562 |
+"<table width='100%' cellpadding='10'>\n"
|
|
32563 |
+"<tr><td>\n"
|
|
32564 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
32565 |
+" <tr>\n"
|
|
32566 |
+" <td>Titel:</td>\n"
|
|
32567 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
32568 |
+" </table>\n"
|
|
32569 |
+" </td></tr>\n"
|
|
32570 |
+"</table>\n"
|
|
32571 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
32572 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
32573 |
+" <input type='submit' name='submit' value='übermitteln.'></td></tr>\n"
|
|
32574 |
+"</table>\n"
|
|
32575 |
+"</form>\n"
|
|
32576 |
+"</body>\n"
|
|
32577 |
+"</html>\n"
|
|
32578 |
+"\n"
|
|
32579 |
+
|
|
32580 |
+#: dpi/bookmarks.c:283
|
|
32581 |
+msgid ""
|
|
32582 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32583 |
+"<html>\n"
|
|
32584 |
+"<head>\n"
|
|
32585 |
+"<title>Bookmarks</title>\n"
|
|
32586 |
+"</head>\n"
|
|
32587 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32588 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32589 |
+" <tr><td colspan='2'>\n"
|
|
32590 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
32591 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: update\n"
|
|
32592 |
+" </td></tr></table></td></tr>\n"
|
|
32593 |
+"</table>\n"
|
|
32594 |
+"<br>\n"
|
|
32595 |
+"<form>\n"
|
|
32596 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
32597 |
+msgstr ""
|
|
32598 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32599 |
+"<html>\n"
|
|
32600 |
+"<head>\n"
|
|
32601 |
+"<title>Lesezeichen</title>\n"
|
|
32602 |
+"</head>\n"
|
|
32603 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32604 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32605 |
+" <tr><td colspan='2'>\n"
|
|
32606 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
32607 |
+" <tr><td bgcolor='#b4b4b4'> Lesezeichen ändern:: überarbeiten\n"
|
|
32608 |
+" </td></tr></table></td></tr>\n"
|
|
32609 |
+"</table>\n"
|
|
32610 |
+"<br>\n"
|
|
32611 |
+"<form>\n"
|
|
32612 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
32613 |
+
|
|
32614 |
+#: dpi/bookmarks.c:310
|
|
32615 |
+#, c-format
|
|
32616 |
+msgid ""
|
|
32617 |
+"<tr><td>\n"
|
|
32618 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
32619 |
+" <tr>\n"
|
|
32620 |
+" <td>Title:</td>\n"
|
|
32621 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
32622 |
+" value='%s'></td></tr>\n"
|
|
32623 |
+" <tr>\n"
|
|
32624 |
+" <td>URL:</td>\n"
|
|
32625 |
+" <td>%s</td></tr>\n"
|
|
32626 |
+" </table>\n"
|
|
32627 |
+" </td></tr>\n"
|
|
32628 |
+msgstr ""
|
|
32629 |
+"<tr><td>\n"
|
|
32630 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
32631 |
+" <tr>\n"
|
|
32632 |
+" <td>Titel:</td>\n"
|
|
32633 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
32634 |
+" value='%s'></td></tr>\n"
|
|
32635 |
+" <tr>\n"
|
|
32636 |
+" <td>URL:</td>\n"
|
|
32637 |
+" <td>%s</td></tr>\n"
|
|
32638 |
+" </table>\n"
|
|
32639 |
+" </td></tr>\n"
|
|
32640 |
+
|
|
32641 |
+#: dpi/bookmarks.c:323
|
|
32642 |
+#, c-format
|
|
32643 |
+msgid ""
|
|
32644 |
+"<tr><td>\n"
|
|
32645 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
32646 |
+" <tr>\n"
|
|
32647 |
+" <td>Title:</td>\n"
|
|
32648 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
32649 |
+" value='%s'></td></tr>\n"
|
|
32650 |
+" </table>\n"
|
|
32651 |
+" </td></tr>\n"
|
|
32652 |
+msgstr ""
|
|
32653 |
+"<tr><td>\n"
|
|
32654 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
32655 |
+" <tr>\n"
|
|
32656 |
+" <td>Titel:</td>\n"
|
|
32657 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
32658 |
+" value='%s'></td></tr>\n"
|
|
32659 |
+" </table>\n"
|
|
32660 |
+" </td></tr>\n"
|
|
32661 |
+
|
|
32662 |
+#: dpi/bookmarks.c:336
|
|
32663 |
+#, c-format
|
|
32664 |
+msgid ""
|
|
32665 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
32666 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
32667 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
32668 |
+"</table>\n"
|
|
32669 |
+"</form>\n"
|
|
32670 |
+"</body>\n"
|
|
32671 |
+"</html>\n"
|
|
32672 |
+msgstr ""
|
|
32673 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
32674 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
32675 |
+" <input type='submit' name='submit' value='übermitteln.'></td></tr>\n"
|
|
32676 |
+"</table>\n"
|
|
32677 |
+"</form>\n"
|
|
32678 |
+"</body>\n"
|
|
32679 |
+"</html>\n"
|
|
32680 |
+
|
|
32681 |
+#: dpi/bookmarks.c:346
|
|
32682 |
+msgid ""
|
|
32683 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32684 |
+"<html>\n"
|
|
32685 |
+"<head>\n"
|
|
32686 |
+"<title>Bookmarks</title>\n"
|
|
32687 |
+"</head>\n"
|
|
32688 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32689 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32690 |
+" <tr><td colspan='2'>\n"
|
|
32691 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
32692 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add url\n"
|
|
32693 |
+" </td></tr></table></td></tr>\n"
|
|
32694 |
+"</table>\n"
|
|
32695 |
+"<br>\n"
|
|
32696 |
+"<form>\n"
|
|
32697 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
32698 |
+"<table border='1' width='100%'>\n"
|
|
32699 |
+" <tr>\n"
|
|
32700 |
+" <td bgcolor='olive'><b>Add url:</b></td>\n"
|
|
32701 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
32702 |
+"</table>\n"
|
|
32703 |
+"<table width='100%' cellpadding='10'>\n"
|
|
32704 |
+"<tr><td>\n"
|
|
32705 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
32706 |
+" <tr>\n"
|
|
32707 |
+" <td>Title:</td>\n"
|
|
32708 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
32709 |
+" <tr>\n"
|
|
32710 |
+" <td>URL:</td>\n"
|
|
32711 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
32712 |
+" </table>\n"
|
|
32713 |
+" </td></tr>\n"
|
|
32714 |
+"</table>\n"
|
|
32715 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
32716 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
32717 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
32718 |
+"</table>\n"
|
|
32719 |
+"</form>\n"
|
|
32720 |
+"</body>\n"
|
|
32721 |
+"</html>\n"
|
|
32722 |
+msgstr ""
|
|
32723 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32724 |
+"<html>\n"
|
|
32725 |
+"<head>\n"
|
|
32726 |
+"<title>Lesezeichen</title>\n"
|
|
32727 |
+"</head>\n"
|
|
32728 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
32729 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
32730 |
+" <tr><td colspan='2'>\n"
|
|
32731 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
32732 |
+" <tr><td bgcolor='#b4b4b4'> Lesezeichen ändern:: URL hinzufügen\n"
|
|
32733 |
+" </td></tr></table></td></tr>\n"
|
|
32734 |
+"</table>\n"
|
|
32735 |
+"<br>\n"
|
|
32736 |
+"<form>\n"
|
|
32737 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
32738 |
+"<table border='1' width='100%'>\n"
|
|
32739 |
+" <tr>\n"
|
|
32740 |
+" <td bgcolor='olive'><b>URL hinzufügen:</b></td>\n"
|
|
32741 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
32742 |
+"</table>\n"
|
|
32743 |
+"<table width='100%' cellpadding='10'>\n"
|
|
32744 |
+"<tr><td>\n"
|
|
32745 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
32746 |
+" <tr>\n"
|
|
32747 |
+" <td>Titel:</td>\n"
|
|
32748 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
32749 |
+" <tr>\n"
|
|
32750 |
+" <td>URL:</td>\n"
|
|
32751 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
32752 |
+" </table>\n"
|
|
32753 |
+" </td></tr>\n"
|
|
32754 |
+"</table>\n"
|
|
32755 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
32756 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
32757 |
+" <input type='submit' name='submit' value='übermitteln.'></td></tr>\n"
|
|
32758 |
+"</table>\n"
|
|
32759 |
+"</form>\n"
|
|
32760 |
+"</body>\n"
|
|
32761 |
+"</html>\n"
|
|
32762 |
+
|
|
32763 |
+#: dpi/bookmarks.c:691
|
|
32764 |
+msgid "Unclassified"
|
|
32765 |
+msgstr "Uneingeordnet"
|
|
32766 |
+
|
|
32767 |
+#: dpi/bookmarks.c:724
|
|
32768 |
+#, c-format
|
|
32769 |
+msgid "echo \":s0: Unclassified\" > %s"
|
|
32770 |
+msgstr "echo \":s0: Uneingeordnet\" > %s"
|
|
32771 |
+
|
|
32772 |
+#: dpi/bookmarks.c:786
|
|
32773 |
+#, c-format
|
|
32774 |
+msgid ""
|
|
32775 |
+"Syntax error in bookmarks file:\n"
|
|
32776 |
+" %s"
|
|
32777 |
+msgstr ""
|
|
32778 |
+"Syntaxfehler in der Lesezeichendatei:\n"
|
|
32779 |
+" %s"
|
|
32780 |
+
|
|
32781 |
+#: dpi/bookmarks.c:898
|
|
32782 |
+msgid "Added bookmark!"
|
|
32783 |
+msgstr "Lesezeichen gesetzt!"
|
|
32784 |
+
|
|
32785 |
+#: dpi/bookmarks.c:1087
|
|
32786 |
+msgid "Update sections:"
|
|
32787 |
+msgstr "Kategorien bearbeiten:"
|
|
32788 |
+
|
|
32789 |
+#: dpi/bookmarks.c:1107
|
|
32790 |
+msgid "Update titles:"
|
|
32791 |
+msgstr "Titel bearbeiten:"
|
|
32792 |
+
|
|
32793 |
+#: dpi/bookmarks.c:1404
|
|
32794 |
+msgid "Delete: you must mark what to delete!"
|
|
32795 |
+msgstr "Löschen: Sie müssen wählen, was Sie löschen möchten!"
|
|
32796 |
+
|
|
32797 |
+#: dpi/bookmarks.c:1410
|
|
32798 |
+msgid "Move: you must mark a target section!"
|
|
32799 |
+msgstr "Verschieben: Sie müssen eine Zielkategorie wählen!"
|
|
32800 |
+
|
|
32801 |
+#: dpi/bookmarks.c:1412
|
|
32802 |
+msgid "Move: can not move a section (yet)."
|
|
32803 |
+msgstr "Verschieben: Sie können (noch) keine Kategorie verschieben."
|
|
32804 |
+
|
|
32805 |
+#: dpi/bookmarks.c:1414
|
|
32806 |
+msgid "Move: you must mark some urls, and a target section!"
|
|
32807 |
+msgstr "Verschieben: Sie müssen URLs und Zielkategorie wählen!"
|
|
32808 |
+
|
|
32809 |
+#: dpi/bookmarks.c:1419
|
|
32810 |
+msgid "Modify: you must mark what to update!"
|
|
32811 |
+msgstr "Ändern: Sie müssen wählen, was Sie aktualisieren wollen!"
|
|
32812 |
+
|
|
32813 |
+#: dpi/bookmarks.c:1436
|
|
32814 |
+msgid "Add url: only one target section is allowed!"
|
|
32815 |
+msgstr "URL hinzufügen: nur eine Zielkategorie erlaubt!"
|
|
32816 |
+
|
|
32817 |
+#: dpi/bookmarks.c:1443
|
|
32818 |
+msgid "No operation, just do nothing!"
|
|
32819 |
+msgstr "Kein Befehl, keine Ausführung."
|
|
32820 |
+
|
|
32821 |
+#: dpi/bookmarks.c:1446
|
|
32822 |
+msgid "Sorry, not implemented yet."
|
|
32823 |
+msgstr "Verzeihung, ist noch nicht implementiert."
|
|
32824 |
+
|
|
32825 |
+#: dpi/bookmarks.c:1614
|
|
32826 |
+msgid "Haven't got a full tag!\n"
|
|
32827 |
+msgstr ""
|
|
32828 |
+
|
|
32829 |
+#: dpi/bookmarks.c:1690
|
|
32830 |
+msgid ""
|
|
32831 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32832 |
+"<HTML><body> Error on the bookmarks server...</body></html>"
|
|
32833 |
+msgstr ""
|
|
32834 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
32835 |
+"<HTML><body> Fehler beim Lesezeichenserver...</body></html>"
|
|
32836 |
+
|
|
32837 |
+#: config/dillocfg.c:84
|
|
32838 |
+msgid "Quit"
|
|
32839 |
+msgstr "Beenden"
|
|
32840 |
+
|
|
32841 |
+#: config/dillocfg.c:86 config/dillocfg.c:92
|
|
32842 |
+msgid "Dillo Preferences"
|
|
32843 |
+msgstr "Dillo - Eigenschaften"
|
|
32844 |
+
|
|
32845 |
+#: config/dillocfg.c:115
|
|
32846 |
+msgid "Interface"
|
|
32847 |
+msgstr "Oberfläche"
|
|
32848 |
+
|
|
32849 |
+#: config/dillocfg.c:116
|
|
32850 |
+msgid " Font "
|
|
32851 |
+msgstr " Schrift "
|
|
32852 |
+
|
|
32853 |
+#: config/dillocfg.c:117
|
|
32854 |
+msgid " Color "
|
|
32855 |
+msgstr " Farbe "
|
|
32856 |
+
|
|
32857 |
+#: config/dillocfg.c:118
|
|
32858 |
+msgid " Network "
|
|
32859 |
+msgstr " Netzwerk "
|
|
32860 |
+
|
|
32861 |
+#: config/dillocfg.c:120
|
|
32862 |
+msgid " Tab "
|
|
32863 |
+msgstr " Reiter "
|
|
32864 |
+
|
|
32865 |
+#: config/dillocfg.c:123
|
|
32866 |
+msgid " Other "
|
|
32867 |
+msgstr " Sonstiges "
|
|
32868 |
+
|
|
32869 |
+#: config/dillocfg.c:331
|
|
32870 |
+msgid "Add"
|
|
32871 |
+msgstr "Hinzufügen"
|
|
32872 |
+
|
|
32873 |
+#: config/dillocfg.c:332
|
|
32874 |
+msgid "Delete"
|
|
32875 |
+msgstr "Löschen"
|
|
32876 |
+
|
|
32877 |
+#: config/dillocfg.c:338
|
|
32878 |
+msgid "Address"
|
|
32879 |
+msgstr "Adresse"
|
|
32880 |
+
|
|
32881 |
+#: config/dillocfg.c:339
|
|
32882 |
+msgid "Rule"
|
|
32883 |
+msgstr ""
|
|
32884 |
+
|
|
32885 |
+#: config/dillocfg.c:365 config/dillocfg.c:371
|
|
32886 |
+#, c-format
|
|
32887 |
+msgid "Read failed <%s>\n"
|
|
32888 |
+msgstr "<%s> konnte nicht gelesen werden\n"
|
|
32889 |
+
|
|
32890 |
+#: config/dillocfg.c:452 config/dillocfg.c:460
|
|
32891 |
+#, c-format
|
|
32892 |
+msgid "can't write <%s>\n"
|
|
32893 |
+msgstr "<%s> konnte nicht geschrieben werden\n"
|
|
32894 |
+
|
|
32895 |
+#: config/dillocfg_token.c:60
|
|
32896 |
+msgid "Window Size"
|
|
32897 |
+msgstr "Fenstergröße"
|
|
32898 |
+
|
|
32899 |
+#: config/dillocfg_token.c:68
|
|
32900 |
+msgid "HTTP Proxy"
|
|
32901 |
+msgstr "HTTP-Proxy"
|
|
32902 |
+
|
|
32903 |
+#: config/dillocfg_token.c:76
|
|
32904 |
+msgid "HTTP Proxy User"
|
|
32905 |
+msgstr "Benutzer HTTP-Proxy"
|
|
32906 |
+
|
|
32907 |
+#: config/dillocfg_token.c:84
|
|
32908 |
+msgid "NO Proxy"
|
|
32909 |
+msgstr "Kein Proxy für"
|
|
32910 |
+
|
|
32911 |
+#: config/dillocfg_token.c:92
|
|
32912 |
+msgid "User-Agent"
|
|
32913 |
+msgstr ""
|
|
32914 |
+
|
|
32915 |
+#: config/dillocfg_token.c:100
|
|
32916 |
+msgid "Send referer header"
|
|
32917 |
+msgstr "Referrer-Header senden"
|
|
32918 |
+
|
|
32919 |
+#: config/dillocfg_token.c:108
|
|
32920 |
+msgid "Link color"
|
|
32921 |
+msgstr "Linkfarbe"
|
|
32922 |
+
|
|
32923 |
+#: config/dillocfg_token.c:116
|
|
32924 |
+msgid "Visited color"
|
|
32925 |
+msgstr "Besuchte Links"
|
|
32926 |
+
|
|
32927 |
+#: config/dillocfg_token.c:124
|
|
32928 |
+msgid "BackGround color"
|
|
32929 |
+msgstr "Hintergrundfarbe"
|
|
32930 |
+
|
|
32931 |
+#: config/dillocfg_token.c:132
|
|
32932 |
+msgid "Allow white bg"
|
|
32933 |
+msgstr "Weißen Hintergrund erlauben"
|
|
32934 |
+
|
|
32935 |
+#: config/dillocfg_token.c:140
|
|
32936 |
+msgid "Force my colors"
|
|
32937 |
+msgstr "Eigene Farben erzwingen"
|
|
32938 |
+
|
|
32939 |
+#: config/dillocfg_token.c:148
|
|
32940 |
+msgid "Contrast visited color"
|
|
32941 |
+msgstr "Besuchte Links in Kontrastfarbe"
|
|
32942 |
+
|
|
32943 |
+#: config/dillocfg_token.c:156
|
|
32944 |
+msgid "Text color"
|
|
32945 |
+msgstr "Textfarbe"
|
|
32946 |
+
|
|
32947 |
+#: config/dillocfg_token.c:164
|
|
32948 |
+msgid "Use oblique"
|
|
32949 |
+msgstr "Schräg statt kursiv"
|
|
32950 |
+
|
|
32951 |
+#: config/dillocfg_token.c:172
|
|
32952 |
+msgid "Start Page"
|
|
32953 |
+msgstr "Startseite"
|
|
32954 |
+
|
|
32955 |
+#: config/dillocfg_token.c:180
|
|
32956 |
+msgid "HOMEPAGE"
|
|
32957 |
+msgstr "STARTSEITE"
|
|
32958 |
+
|
|
32959 |
+#: config/dillocfg_token.c:188
|
|
32960 |
+msgid "Search-engine's URL"
|
|
32961 |
+msgstr "URL der Suchmaschine"
|
|
32962 |
+
|
|
32963 |
+#: config/dillocfg_token.c:196
|
|
32964 |
+msgid "Search-engine's charset"
|
|
32965 |
+msgstr "Zeichensatz der Suchmaschine"
|
|
32966 |
+
|
|
32967 |
+#: config/dillocfg_token.c:204
|
|
32968 |
+msgid "Show Tooltip"
|
|
32969 |
+msgstr "Kurzinfos für Bilder"
|
|
32970 |
+
|
|
32971 |
+#: config/dillocfg_token.c:212
|
|
32972 |
+msgid "Panel Size"
|
|
32973 |
+msgstr "Leistengröße"
|
|
32974 |
+
|
|
32975 |
+#: config/dillocfg_token.c:220
|
|
32976 |
+msgid "Small icons"
|
|
32977 |
+msgstr "Kleine Symbole"
|
|
32978 |
+
|
|
32979 |
+#: config/dillocfg_token.c:228
|
|
32980 |
+msgid "Limit text width"
|
|
32981 |
+msgstr "Textbreite begrenzen"
|
|
32982 |
+
|
|
32983 |
+#: config/dillocfg_token.c:236
|
|
32984 |
+msgid "Limit font decoration"
|
|
32985 |
+msgstr "Schriftverzierung beschränken"
|
|
32986 |
+
|
|
32987 |
+#: config/dillocfg_token.c:244
|
|
32988 |
+msgid "Font factor"
|
|
32989 |
+msgstr "Schriftmultiplikator"
|
|
32990 |
+
|
|
32991 |
+#: config/dillocfg_token.c:252
|
|
32992 |
+msgid "Font Sizes"
|
|
32993 |
+msgstr "Schriftgrößen"
|
|
32994 |
+
|
|
32995 |
+#: config/dillocfg_token.c:260
|
|
32996 |
+msgid "W3C+heuristics"
|
|
32997 |
+msgstr "W3C+Heuristik"
|
|
32998 |
+
|
|
32999 |
+#: config/dillocfg_token.c:268
|
|
33000 |
+msgid "Use dicache"
|
|
33001 |
+msgstr "Dicache benutzen"
|
|
33002 |
+
|
|
33003 |
+#: config/dillocfg_token.c:276
|
|
33004 |
+msgid "Show Back"
|
|
33005 |
+msgstr "'Zurück' anzeigen"
|
|
33006 |
+
|
|
33007 |
+#: config/dillocfg_token.c:284
|
|
33008 |
+msgid "Show Forw"
|
|
33009 |
+msgstr "'Weiter' anzeigen"
|
|
33010 |
+
|
|
33011 |
+#: config/dillocfg_token.c:292
|
|
33012 |
+msgid "Show Home"
|
|
33013 |
+msgstr "'Start' anzeigen"
|
|
33014 |
+
|
|
33015 |
+#: config/dillocfg_token.c:300
|
|
33016 |
+msgid "Show Reload"
|
|
33017 |
+msgstr "'Neu laden' anzeigen"
|
|
33018 |
+
|
|
33019 |
+#: config/dillocfg_token.c:308
|
|
33020 |
+msgid "Show Save"
|
|
33021 |
+msgstr "'Speichern' anzeigen"
|
|
33022 |
+
|
|
33023 |
+#: config/dillocfg_token.c:316
|
|
33024 |
+msgid "Show Stop"
|
|
33025 |
+msgstr "'Stop' anzeigen"
|
|
33026 |
+
|
|
33027 |
+#: config/dillocfg_token.c:324
|
|
33028 |
+msgid "Show Bookmarks"
|
|
33029 |
+msgstr "'Lesez' anzeigen"
|
|
33030 |
+
|
|
33031 |
+#: config/dillocfg_token.c:332
|
|
33032 |
+msgid "Show Menubar"
|
|
33033 |
+msgstr "Menüleiste anzeigen"
|
|
33034 |
+
|
|
33035 |
+#: config/dillocfg_token.c:340
|
|
33036 |
+msgid "Show ClearURL"
|
|
33037 |
+msgstr "'URL löschen' anzeigen"
|
|
33038 |
+
|
|
33039 |
+#: config/dillocfg_token.c:348
|
|
33040 |
+msgid "Show URL box"
|
|
33041 |
+msgstr "URL-Feld anzeigen"
|
|
33042 |
+
|
|
33043 |
+#: config/dillocfg_token.c:356
|
|
33044 |
+msgid "Show Web Search"
|
|
33045 |
+msgstr "Websuche anzeigen"
|
|
33046 |
+
|
|
33047 |
+#: config/dillocfg_token.c:364
|
|
33048 |
+msgid "Show Progress box"
|
|
33049 |
+msgstr "Fortschrittsfeld anzeigen"
|
|
33050 |
+
|
|
33051 |
+#: config/dillocfg_token.c:372
|
|
33052 |
+msgid "Show Popup navigation"
|
|
33053 |
+msgstr "Navigation im Kontextmenü"
|
|
33054 |
+
|
|
33055 |
+#: config/dillocfg_token.c:380
|
|
33056 |
+msgid "Fullwindow start"
|
|
33057 |
+msgstr "Im Vollbildmodus starten"
|
|
33058 |
+
|
|
33059 |
+#: config/dillocfg_token.c:388
|
|
33060 |
+msgid "Transient dialogs"
|
|
33061 |
+msgstr ""
|
|
33062 |
+
|
|
33063 |
+#: config/dillocfg_token.c:396
|
|
33064 |
+msgid "Popup dialogs"
|
|
33065 |
+msgstr "Dialogfenster"
|
|
33066 |
+
|
|
33067 |
+#: config/dillocfg_token.c:404
|
|
33068 |
+msgid "vw_aafontname"
|
|
33069 |
+msgstr "vB_KgSchriftart"
|
|
33070 |
+
|
|
33071 |
+#: config/dillocfg_token.c:412
|
|
33072 |
+msgid "fw_aafontname"
|
|
33073 |
+msgstr "fB_KgSchriftart"
|
|
33074 |
+
|
|
33075 |
+#: config/dillocfg_token.c:420
|
|
33076 |
+msgid "vw_fontname"
|
|
33077 |
+msgstr "vB_Schriftart"
|
|
33078 |
+
|
|
33079 |
+#: config/dillocfg_token.c:428
|
|
33080 |
+msgid "fw_fontname"
|
|
33081 |
+msgstr "fB_Schriftart"
|
|
33082 |
+
|
|
33083 |
+#: config/dillocfg_token.c:436
|
|
33084 |
+msgid "Generate submit"
|
|
33085 |
+msgstr "Submit-Schaltflächen erzeugen"
|
|
33086 |
+
|
|
33087 |
+#: config/dillocfg_token.c:444
|
|
33088 |
+msgid "Enterpress forces submit"
|
|
33089 |
+msgstr "Drücken von Enter erzwingt Übermittlung"
|
|
33090 |
+
|
|
33091 |
+#: config/dillocfg_token.c:452
|
|
33092 |
+msgid "Show debugging messsages"
|
|
33093 |
+msgstr "Debugging-Nachrichten anzeigen"
|
|
33094 |
+
|
|
33095 |
+#: config/dillocfg_token.c:460
|
|
33096 |
+msgid "Show Extra Warnings"
|
|
33097 |
+msgstr "Zusätzliche Warnungen ausgeben"
|
|
33098 |
+
|
|
33099 |
+#: config/dillocfg_token.c:468
|
|
33100 |
+msgid "Focus location on new"
|
|
33101 |
+msgstr "Fokus auf Adressfeld bei neuen Fenstern"
|
|
33102 |
+
|
|
33103 |
+#: config/dillocfg_token.c:476 config/dillocfg_token.c:484
|
|
33104 |
+msgid "Accept Language"
|
|
33105 |
+msgstr "Sprachen"
|
|
33106 |
+
|
|
33107 |
+#: config/dillocfg_token.c:493
|
|
33108 |
+msgid "Tab load in background"
|
|
33109 |
+msgstr "Neue Reiter im Hintergrund"
|
|
33110 |
+
|
|
33111 |
+#: config/dillocfg_token.c:501
|
|
33112 |
+msgid "Tab close middle click"
|
|
33113 |
+msgstr "Mittelklick schließt Reiter"
|
|
33114 |
+
|
|
33115 |
+#: config/dillocfg_token.c:509
|
|
33116 |
+msgid "Tab instead of window"
|
|
33117 |
+msgstr "Reiter statt Fenster"
|
|
33118 |
+
|
|
33119 |
+#: config/dillocfg_token.c:517
|
|
33120 |
+msgid "Tab bar show fullscreen"
|
|
33121 |
+msgstr "Registerleiste im Vollbildmodus"
|
|
33122 |
+
|
|
33123 |
+#: config/dillocfg_token.c:525
|
|
33124 |
+msgid "Tab bar show single tab"
|
|
33125 |
+msgstr "Registerleiste immer anzeigen"
|
|
33126 |
+
|
|
33127 |
+#: config/dillocfg_token.c:533
|
|
33128 |
+msgid "Tab bar scroller"
|
|
33129 |
+msgstr "Registerleistenschieber"
|
|
33130 |
+
|
|
33131 |
+#: config/dillocfg_token.c:541
|
|
33132 |
+msgid "Tab bar homogeneous"
|
|
33133 |
+msgstr "Einheitliche Registerleiste"
|
|
33134 |
+
|
|
33135 |
+#: config/dillocfg_token.c:549
|
|
33136 |
+msgid "Tab title compress"
|
|
33137 |
+msgstr "Titel der Reiter verdichten"
|
|
33138 |
+
|
|
33139 |
+#: config/dillocfg_token.c:557
|
|
33140 |
+msgid "Compress vowels"
|
|
33141 |
+msgstr "Vokale verdichten"
|
|
33142 |
+
|
|
33143 |
+#: config/dillocfg_token.c:565
|
|
33144 |
+msgid "Compress_common_prefixes"
|
|
33145 |
+msgstr "Standardvorsätze verdichten"
|
|
33146 |
+
|
|
33147 |
+#: config/dillocfg_token.c:574
|
|
33148 |
+msgid "Default"
|
|
33149 |
+msgstr "Standard"
|
|
33150 |
diff -pruN dillo-0.8.6/po/dillo.pot dillo-0.8.6-i18n-misc-20070916/po/dillo.pot
|
|
33151 |
--- dillo-0.8.6/po/dillo.pot 1970-01-01 09:00:00.000000000 +0900
|
|
33152 |
+++ dillo-0.8.6-i18n-misc-20070916/po/dillo.pot 2007-09-09 15:45:03.000000000 +0900
|
|
33153 |
@@ -0,0 +1,1937 @@
|
|
33154 |
+# SOME DESCRIPTIVE TITLE.
|
|
33155 |
+# Copyright (C) YEAR Free Software Foundation, Inc.
|
|
33156 |
+# This file is distributed under the same license as the PACKAGE package.
|
|
33157 |
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
|
33158 |
+#
|
|
33159 |
+#, fuzzy
|
|
33160 |
+msgid ""
|
|
33161 |
+msgstr ""
|
|
33162 |
+"Project-Id-Version: PACKAGE VERSION\n"
|
|
33163 |
+"Report-Msgid-Bugs-To: \n"
|
|
33164 |
+"POT-Creation-Date: 2007-09-09 15:45+0900\n"
|
|
33165 |
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
|
33166 |
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
33167 |
+"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
33168 |
+"MIME-Version: 1.0\n"
|
|
33169 |
+"Content-Type: text/plain; charset=CHARSET\n"
|
|
33170 |
+"Content-Transfer-Encoding: 8bit\n"
|
|
33171 |
+
|
|
33172 |
+#: src/msg.h:27
|
|
33173 |
+msgid "HTTP warning: "
|
|
33174 |
+msgstr ""
|
|
33175 |
+
|
|
33176 |
+#: src/auth.c:87
|
|
33177 |
+msgid "Browser Url has changed\n"
|
|
33178 |
+msgstr ""
|
|
33179 |
+
|
|
33180 |
+#: src/cache.c:253
|
|
33181 |
+msgid "WARNING: Cache_entry_add, leaking an entry.\n"
|
|
33182 |
+msgstr ""
|
|
33183 |
+
|
|
33184 |
+#: src/cache.c:316
|
|
33185 |
+msgid "## Aborting CCCQuery\n"
|
|
33186 |
+msgstr ""
|
|
33187 |
+
|
|
33188 |
+#: src/cache.c:319
|
|
33189 |
+msgid "## Aborting CCCAnswer\n"
|
|
33190 |
+msgstr ""
|
|
33191 |
+
|
|
33192 |
+#: src/cache.c:322
|
|
33193 |
+msgid "## Aborting raw2\n"
|
|
33194 |
+msgstr ""
|
|
33195 |
+
|
|
33196 |
+#: src/cache.c:365
|
|
33197 |
+msgid "## No more clients for this entry\n"
|
|
33198 |
+msgstr ""
|
|
33199 |
+
|
|
33200 |
+#: src/cache.c:369
|
|
33201 |
+msgid "Cache_prepare_reload: ERROR, entry still has clients\n"
|
|
33202 |
+msgstr ""
|
|
33203 |
+
|
|
33204 |
+#: src/cache.c:398
|
|
33205 |
+#, c-format
|
|
33206 |
+msgid "Reloading >%s< because it shouldn't be cached\n"
|
|
33207 |
+msgstr ""
|
|
33208 |
+
|
|
33209 |
+#: src/cache.c:418
|
|
33210 |
+msgid "ERROR: unsupported protocol"
|
|
33211 |
+msgstr ""
|
|
33212 |
+
|
|
33213 |
+#: src/cache.c:488
|
|
33214 |
+#, c-format
|
|
33215 |
+msgid "Redirect loop for URL: >%s<\n"
|
|
33216 |
+msgstr ""
|
|
33217 |
+
|
|
33218 |
+#: src/cache.c:590
|
|
33219 |
+#, c-format
|
|
33220 |
+msgid "Bad clocks, ignore expire on >%s<\n"
|
|
33221 |
+msgstr ""
|
|
33222 |
+
|
|
33223 |
+#: src/cache.c:594
|
|
33224 |
+#, c-format
|
|
33225 |
+msgid "Forcing min expire %d on >%s< instead %ld\n"
|
|
33226 |
+msgstr ""
|
|
33227 |
+
|
|
33228 |
+#: src/cache.c:678
|
|
33229 |
+msgid "'Cache-Control: max-age=' without 'Date: ' header"
|
|
33230 |
+msgstr ""
|
|
33231 |
+
|
|
33232 |
+#: src/cache.c:722
|
|
33233 |
+msgid "Server didn't send Content-Type in header.\n"
|
|
33234 |
+msgstr ""
|
|
33235 |
+
|
|
33236 |
+#: src/cache.c:743
|
|
33237 |
+#, c-format
|
|
33238 |
+msgid "Forcing default expire to query url >%s<\n"
|
|
33239 |
+msgstr ""
|
|
33240 |
+
|
|
33241 |
+#: src/cache.c:831
|
|
33242 |
+#, c-format
|
|
33243 |
+msgid "Cache_decode_data: got all data -- decodinging %s\n"
|
|
33244 |
+msgstr ""
|
|
33245 |
+
|
|
33246 |
+#: src/cache.c:840
|
|
33247 |
+msgid "Cache_decode_data: not gzip data!\n"
|
|
33248 |
+msgstr ""
|
|
33249 |
+
|
|
33250 |
+#: src/cache.c:846
|
|
33251 |
+msgid "Cache_decode_data: invalid gzip data!\n"
|
|
33252 |
+msgstr ""
|
|
33253 |
+
|
|
33254 |
+#: src/cache.c:898
|
|
33255 |
+msgid "not x-gzip\n"
|
|
33256 |
+msgstr ""
|
|
33257 |
+
|
|
33258 |
+#: src/cache.c:931
|
|
33259 |
+#, c-format
|
|
33260 |
+msgid ""
|
|
33261 |
+"Content-Length does NOT match message body,\n"
|
|
33262 |
+" at: %s\n"
|
|
33263 |
+msgstr ""
|
|
33264 |
+
|
|
33265 |
+#: src/cache.c:950
|
|
33266 |
+msgid "Cache_process_io Op = IOAbort; not implemented yet\n"
|
|
33267 |
+msgstr ""
|
|
33268 |
+
|
|
33269 |
+#: src/cache.c:1004
|
|
33270 |
+#, c-format
|
|
33271 |
+msgid "ERROR: redirect loop for: %s"
|
|
33272 |
+msgstr ""
|
|
33273 |
+
|
|
33274 |
+#: src/cache.c:1015
|
|
33275 |
+#, c-format
|
|
33276 |
+msgid ""
|
|
33277 |
+">>>Redirect from: %s\n"
|
|
33278 |
+" to %s\n"
|
|
33279 |
+msgstr ""
|
|
33280 |
+
|
|
33281 |
+#: src/cache.c:1035
|
|
33282 |
+msgid ">>>Image redirection without entity-content<<<\n"
|
|
33283 |
+msgstr ""
|
|
33284 |
+
|
|
33285 |
+#: src/cache.c:1037
|
|
33286 |
+msgid ">>>Image redirection with entity-content<<<\n"
|
|
33287 |
+msgstr ""
|
|
33288 |
+
|
|
33289 |
+#: src/cache.c:1103
|
|
33290 |
+msgid "FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n"
|
|
33291 |
+msgstr ""
|
|
33292 |
+
|
|
33293 |
+#: src/cache.c:1111
|
|
33294 |
+#, c-format
|
|
33295 |
+msgid "Content-Type '%s' doesn't match the real data.\n"
|
|
33296 |
+msgstr ""
|
|
33297 |
+
|
|
33298 |
+#: src/cache.c:1140
|
|
33299 |
+#, c-format
|
|
33300 |
+msgid "HTTP warning: Content-Type '%s' doesn't match the real data."
|
|
33301 |
+msgstr ""
|
|
33302 |
+
|
|
33303 |
+#: src/cache.c:1177
|
|
33304 |
+#, c-format
|
|
33305 |
+msgid "Unhandled MIME type: <%s>\n"
|
|
33306 |
+msgstr ""
|
|
33307 |
+
|
|
33308 |
+#: src/cache.c:1202
|
|
33309 |
+msgid "Client Callback is NULL"
|
|
33310 |
+msgstr ""
|
|
33311 |
+
|
|
33312 |
+#: src/cache.c:1303
|
|
33313 |
+msgid "WARNING: Cache_stop_client, inexistent client\n"
|
|
33314 |
+msgstr ""
|
|
33315 |
+
|
|
33316 |
+#: src/cache.c:1445 src/capi.c:428 src/capi.c:481 src/capi.c:536
|
|
33317 |
+#: src/capi.c:570 src/IO/dpi.c:720 src/IO/dpi.c:760
|
|
33318 |
+msgid " Not implemented\n"
|
|
33319 |
+msgstr ""
|
|
33320 |
+
|
|
33321 |
+#: src/capi.c:229
|
|
33322 |
+msgid "Capi_verify_dpi_url_request: Permission Denied!\n"
|
|
33323 |
+msgstr ""
|
|
33324 |
+
|
|
33325 |
+#: src/capi.c:324
|
|
33326 |
+#, c-format
|
|
33327 |
+msgid " reload=%d URL_E2EReload=%d\n"
|
|
33328 |
+msgstr ""
|
|
33329 |
+
|
|
33330 |
+#: src/capi.c:389
|
|
33331 |
+msgid " ERROR: [a_Capi_dpi_send_cmd] No open connection found\n"
|
|
33332 |
+msgstr ""
|
|
33333 |
+
|
|
33334 |
+#: src/capi.c:457
|
|
33335 |
+msgid "ERROR: can't start dpid daemon!"
|
|
33336 |
+msgstr ""
|
|
33337 |
+
|
|
33338 |
+#: src/capi.c:492
|
|
33339 |
+msgid " ** Capi 2F catched an invalid 'web' structure\n"
|
|
33340 |
+msgstr ""
|
|
33341 |
+
|
|
33342 |
+#: src/capi.c:552
|
|
33343 |
+msgid " Error with pipe\n"
|
|
33344 |
+msgstr ""
|
|
33345 |
+
|
|
33346 |
+#: src/commands.c:166
|
|
33347 |
+msgid "View Source"
|
|
33348 |
+msgstr ""
|
|
33349 |
+
|
|
33350 |
+#: src/commands.c:183
|
|
33351 |
+msgid "Detected HTML errors"
|
|
33352 |
+msgstr ""
|
|
33353 |
+
|
|
33354 |
+#: src/commands.c:265
|
|
33355 |
+msgid "Stopped"
|
|
33356 |
+msgstr ""
|
|
33357 |
+
|
|
33358 |
+#: src/dillo.c:109
|
|
33359 |
+msgid ""
|
|
33360 |
+" -x, --xid XID Open first Dillo window in an existing\n"
|
|
33361 |
+" GtkSocket which window ID is XID (decimal)."
|
|
33362 |
+msgstr ""
|
|
33363 |
+
|
|
33364 |
+#: src/dillo.c:112
|
|
33365 |
+msgid " -v, --version Display version info and exit."
|
|
33366 |
+msgstr ""
|
|
33367 |
+
|
|
33368 |
+#: src/dillo.c:114
|
|
33369 |
+msgid " -h, --help Display this help text and exit."
|
|
33370 |
+msgstr ""
|
|
33371 |
+
|
|
33372 |
+#: src/dillo.c:116
|
|
33373 |
+msgid ""
|
|
33374 |
+" -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
33375 |
+" navigation buttons, menu, and status bar."
|
|
33376 |
+msgstr ""
|
|
33377 |
+
|
|
33378 |
+#: src/dillo.c:119
|
|
33379 |
+msgid " -l, --local Don't follow links for this URL(s)."
|
|
33380 |
+msgstr ""
|
|
33381 |
+
|
|
33382 |
+#: src/dillo.c:121
|
|
33383 |
+msgid ""
|
|
33384 |
+" -g, -geometry GEO Set initial window position where GEO is\n"
|
|
33385 |
+" <width>x<height>{+-}<x>{+-}<y>"
|
|
33386 |
+msgstr ""
|
|
33387 |
+
|
|
33388 |
+#: src/dillo.c:125
|
|
33389 |
+msgid ""
|
|
33390 |
+" -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
33391 |
+" representing its structure. For debugging. "
|
|
33392 |
+msgstr ""
|
|
33393 |
+
|
|
33394 |
+#: src/dillo.c:129
|
|
33395 |
+msgid " -R, --rcfile FILE Use alternative rcfile."
|
|
33396 |
+msgstr ""
|
|
33397 |
+
|
|
33398 |
+#: src/dillo.c:266
|
|
33399 |
+#, c-format
|
|
33400 |
+msgid ""
|
|
33401 |
+"Error: the XID must be an unsigned decimal numerical value.\n"
|
|
33402 |
+"The offending value was: %s\n"
|
|
33403 |
+msgstr ""
|
|
33404 |
+
|
|
33405 |
+#: src/dillo.c:284
|
|
33406 |
+msgid "Error in command line options.\n"
|
|
33407 |
+msgstr ""
|
|
33408 |
+
|
|
33409 |
+#: src/dillo.c:291
|
|
33410 |
+#, c-format
|
|
33411 |
+msgid "Setting gtk charset to %s...\n"
|
|
33412 |
+msgstr ""
|
|
33413 |
+
|
|
33414 |
+#: src/dillo.c:395
|
|
33415 |
+msgid "Dillo: normal exit!\n"
|
|
33416 |
+msgstr ""
|
|
33417 |
+
|
|
33418 |
+#: src/dillo.c:409
|
|
33419 |
+#, c-format
|
|
33420 |
+msgid "Dillo: error creating directory %s: %s\n"
|
|
33421 |
+msgstr ""
|
|
33422 |
+
|
|
33423 |
+#: src/dillo.c:412
|
|
33424 |
+#, c-format
|
|
33425 |
+msgid "Dillo: error reading %s: %s\n"
|
|
33426 |
+msgstr ""
|
|
33427 |
+
|
|
33428 |
+#: src/dillo.c:461
|
|
33429 |
+#, c-format
|
|
33430 |
+msgid "Option %s requires %d argument(s)\n"
|
|
33431 |
+msgstr ""
|
|
33432 |
+
|
|
33433 |
+#: src/dillo.c:496
|
|
33434 |
+msgid ""
|
|
33435 |
+"\n"
|
|
33436 |
+"Usage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
33437 |
+"Options:\n"
|
|
33438 |
+msgstr ""
|
|
33439 |
+
|
|
33440 |
+#: src/dillo.c:503
|
|
33441 |
+#, c-format
|
|
33442 |
+msgid " %s, %s *Undocumented*\n"
|
|
33443 |
+msgstr ""
|
|
33444 |
+
|
|
33445 |
+#: src/dillo.c:506
|
|
33446 |
+msgid ""
|
|
33447 |
+" URL URL to browse.\n"
|
|
33448 |
+" FILE Local FILE to view.\n"
|
|
33449 |
+msgstr ""
|
|
33450 |
+
|
|
33451 |
+#: src/html.c:182
|
|
33452 |
+#, c-format
|
|
33453 |
+msgid "HTML warning: line %d, "
|
|
33454 |
+msgstr ""
|
|
33455 |
+
|
|
33456 |
+#: src/html.c:212
|
|
33457 |
+#, c-format
|
|
33458 |
+msgid "URL has %d illegal character [%d space]\n"
|
|
33459 |
+msgstr ""
|
|
33460 |
+
|
|
33461 |
+#: src/html.c:213
|
|
33462 |
+#, c-format
|
|
33463 |
+msgid "URL has %d illegal characters [%d spaces]\n"
|
|
33464 |
+msgstr ""
|
|
33465 |
+
|
|
33466 |
+#: src/html.c:216
|
|
33467 |
+#, c-format
|
|
33468 |
+msgid "URL has %d illegal character [%d in (00-1F or 7F)]\n"
|
|
33469 |
+msgstr ""
|
|
33470 |
+
|
|
33471 |
+#: src/html.c:218
|
|
33472 |
+#, c-format
|
|
33473 |
+msgid "URL has %d illegal characters [%d in (00-1F or 7F)]\n"
|
|
33474 |
+msgstr ""
|
|
33475 |
+
|
|
33476 |
+#: src/html.c:222
|
|
33477 |
+#, c-format
|
|
33478 |
+msgid "URL has %d illegal character [%d space and %d in (00-1F or 7F)]\n"
|
|
33479 |
+msgstr ""
|
|
33480 |
+
|
|
33481 |
+#: src/html.c:224
|
|
33482 |
+#, c-format
|
|
33483 |
+msgid "URL has %d illegal characters [%d space and %d in (00-1F or 7F)]\n"
|
|
33484 |
+msgstr ""
|
|
33485 |
+
|
|
33486 |
+#: src/html.c:228
|
|
33487 |
+#, c-format
|
|
33488 |
+msgid "URL has %d illegal character [%d spaces and %d in (00-1F or 7F)]\n"
|
|
33489 |
+msgstr ""
|
|
33490 |
+
|
|
33491 |
+#: src/html.c:230
|
|
33492 |
+#, c-format
|
|
33493 |
+msgid "URL has %d illegal characters [%d spaces and %d in (00-1F or 7F)]\n"
|
|
33494 |
+msgstr ""
|
|
33495 |
+
|
|
33496 |
+#: src/html.c:1237
|
|
33497 |
+msgid "numeric character reference out of range\n"
|
|
33498 |
+msgstr ""
|
|
33499 |
+
|
|
33500 |
+#: src/html.c:1245
|
|
33501 |
+msgid "numeric character reference without trailing ';'\n"
|
|
33502 |
+msgstr ""
|
|
33503 |
+
|
|
33504 |
+#: src/html.c:1257
|
|
33505 |
+#, c-format
|
|
33506 |
+msgid "undefined character entity '%s'\n"
|
|
33507 |
+msgstr ""
|
|
33508 |
+
|
|
33509 |
+#: src/html.c:1265
|
|
33510 |
+msgid "character entity reference without trailing ';'\n"
|
|
33511 |
+msgstr ""
|
|
33512 |
+
|
|
33513 |
+#: src/html.c:1273
|
|
33514 |
+msgid "code positions 128-159 are not defined for ISO Latin-1\n"
|
|
33515 |
+msgstr ""
|
|
33516 |
+
|
|
33517 |
+#: src/html.c:1281
|
|
33518 |
+msgid "literal '&'\n"
|
|
33519 |
+msgstr ""
|
|
33520 |
+
|
|
33521 |
+#: src/html.c:1390
|
|
33522 |
+msgid "TAB character inside <PRE>\n"
|
|
33523 |
+msgstr ""
|
|
33524 |
+
|
|
33525 |
+#: src/html.c:1626
|
|
33526 |
+#, c-format
|
|
33527 |
+msgid " - forcing close of open tag: <%s>\n"
|
|
33528 |
+msgstr ""
|
|
33529 |
+
|
|
33530 |
+#: src/html.c:1635
|
|
33531 |
+#, c-format
|
|
33532 |
+msgid "unexpected closing tag: </%1$s>. -- expected </%2$s>\n"
|
|
33533 |
+msgstr ""
|
|
33534 |
+
|
|
33535 |
+#: src/html.c:1707
|
|
33536 |
+#, c-format
|
|
33537 |
+msgid "Garbage after length: %s\n"
|
|
33538 |
+msgstr ""
|
|
33539 |
+
|
|
33540 |
+#: src/html.c:1726
|
|
33541 |
+msgid "color is not in \"#RRGGBB\" format\n"
|
|
33542 |
+msgstr ""
|
|
33543 |
+
|
|
33544 |
+#: src/html.c:1746
|
|
33545 |
+#, c-format
|
|
33546 |
+msgid "'%s' value is not of the form [A-Za-z][A-Za-z0-9:_.-]*\n"
|
|
33547 |
+msgstr ""
|
|
33548 |
+
|
|
33549 |
+#: src/html.c:1850
|
|
33550 |
+msgid "HTML element was already open\n"
|
|
33551 |
+msgstr ""
|
|
33552 |
+
|
|
33553 |
+#: src/html.c:1877
|
|
33554 |
+msgid "HEAD element must go before the BODY section\n"
|
|
33555 |
+msgstr ""
|
|
33556 |
+
|
|
33557 |
+#: src/html.c:1887
|
|
33558 |
+msgid "HEAD element was already open\n"
|
|
33559 |
+msgstr ""
|
|
33560 |
+
|
|
33561 |
+#: src/html.c:1900
|
|
33562 |
+msgid "HEAD section lacks the TITLE element\n"
|
|
33563 |
+msgstr ""
|
|
33564 |
+
|
|
33565 |
+#: src/html.c:1928
|
|
33566 |
+msgid "the TITLE element must be inside the HEAD section\n"
|
|
33567 |
+msgstr ""
|
|
33568 |
+
|
|
33569 |
+#: src/html.c:1997
|
|
33570 |
+msgid "BODY element was already open\n"
|
|
33571 |
+msgstr ""
|
|
33572 |
+
|
|
33573 |
+#: src/html.c:2002
|
|
33574 |
+msgid "unclosed HEAD element\n"
|
|
33575 |
+msgstr ""
|
|
33576 |
+
|
|
33577 |
+#: src/html.c:2198
|
|
33578 |
+msgid "<td> or <th> outside <table>\n"
|
|
33579 |
+msgstr ""
|
|
33580 |
+
|
|
33581 |
+#: src/html.c:2202
|
|
33582 |
+msgid "<td> or <th> outside <tr>\n"
|
|
33583 |
+msgstr ""
|
|
33584 |
+
|
|
33585 |
+#: src/html.c:2320
|
|
33586 |
+msgid "Invalid HTML syntax: <tr> outside <table>\n"
|
|
33587 |
+msgstr ""
|
|
33588 |
+
|
|
33589 |
+#: src/html.c:2378
|
|
33590 |
+msgid "<noframes> outside of <frameset>!!!\n"
|
|
33591 |
+msgstr ""
|
|
33592 |
+
|
|
33593 |
+#: src/html.c:2386
|
|
33594 |
+msgid "<noframe> is illegal tag !!! use <noframes>.\n"
|
|
33595 |
+msgstr ""
|
|
33596 |
+
|
|
33597 |
+#: src/html.c:2573
|
|
33598 |
+msgid "<frame> outside of <frameset>\n"
|
|
33599 |
+msgstr ""
|
|
33600 |
+
|
|
33601 |
+#: src/html.c:2576
|
|
33602 |
+msgid "<frame> inside of <noframes>\n"
|
|
33603 |
+msgstr ""
|
|
33604 |
+
|
|
33605 |
+#: src/html.c:2579
|
|
33606 |
+msgid "<frame> inside of <iframe>\n"
|
|
33607 |
+msgstr ""
|
|
33608 |
+
|
|
33609 |
+#: src/html.c:2631
|
|
33610 |
+msgid "incorrectly placed <frameset>\n"
|
|
33611 |
+msgstr ""
|
|
33612 |
+
|
|
33613 |
+#: src/html.c:2647
|
|
33614 |
+msgid "<frameset> inside of <noframes>\n"
|
|
33615 |
+msgstr ""
|
|
33616 |
+
|
|
33617 |
+#: src/html.c:2652
|
|
33618 |
+msgid "<frameset> inside of <iframe>\n"
|
|
33619 |
+msgstr ""
|
|
33620 |
+
|
|
33621 |
+#: src/html.c:3134
|
|
33622 |
+msgid " Html_tag_open_img: server-side map (ISMAP)\n"
|
|
33623 |
+msgstr ""
|
|
33624 |
+
|
|
33625 |
+#: src/html.c:3160
|
|
33626 |
+msgid "nested <map>\n"
|
|
33627 |
+msgstr ""
|
|
33628 |
+
|
|
33629 |
+#: src/html.c:3212
|
|
33630 |
+msgid "usemap coords MUST be separated with ','\n"
|
|
33631 |
+msgstr ""
|
|
33632 |
+
|
|
33633 |
+#: src/html.c:3256
|
|
33634 |
+msgid "nohref"
|
|
33635 |
+msgstr ""
|
|
33636 |
+
|
|
33637 |
+#: src/html.c:3295
|
|
33638 |
+msgid "link depends on javascript()\n"
|
|
33639 |
+msgstr ""
|
|
33640 |
+
|
|
33641 |
+#: src/html.c:3311
|
|
33642 |
+#, c-format
|
|
33643 |
+msgid "Registering ANCHOR: %s\n"
|
|
33644 |
+msgstr ""
|
|
33645 |
+
|
|
33646 |
+#: src/html.c:3316
|
|
33647 |
+msgid "Anchor names must be unique within the document\n"
|
|
33648 |
+msgstr ""
|
|
33649 |
+
|
|
33650 |
+#: src/html.c:3523
|
|
33651 |
+msgid "it is strongly recommended using <UL> instead of <MENU>\n"
|
|
33652 |
+msgstr ""
|
|
33653 |
+
|
|
33654 |
+#: src/html.c:3585
|
|
33655 |
+msgid "<li> outside <ul> or <ol>\n"
|
|
33656 |
+msgstr ""
|
|
33657 |
+
|
|
33658 |
+#: src/html.c:3781
|
|
33659 |
+msgid "nested forms\n"
|
|
33660 |
+msgstr ""
|
|
33661 |
+
|
|
33662 |
+#: src/html.c:3828
|
|
33663 |
+msgid "FORM lacks a Submit button\n"
|
|
33664 |
+msgstr ""
|
|
33665 |
+
|
|
33666 |
+#: src/html.c:3830
|
|
33667 |
+msgid " (added a submit button internally)\n"
|
|
33668 |
+msgstr ""
|
|
33669 |
+
|
|
33670 |
+#: src/html.c:3934
|
|
33671 |
+msgid "META elements must be inside the HEAD section\n"
|
|
33672 |
+msgstr ""
|
|
33673 |
+
|
|
33674 |
+#: src/html.c:3986
|
|
33675 |
+#, c-format
|
|
33676 |
+msgid ""
|
|
33677 |
+"The NON-STANDARD meta refresh tag. The HTML 4.01 SPEC (sec 7.4.4) recommends "
|
|
33678 |
+"explicitly to avoid it. The author wanted you to go <%s>\n"
|
|
33679 |
+msgstr ""
|
|
33680 |
+
|
|
33681 |
+#: src/html.c:4356
|
|
33682 |
+msgid "Html_submit_form: Method unknown\n"
|
|
33683 |
+msgstr ""
|
|
33684 |
+
|
|
33685 |
+#: src/html.c:4438
|
|
33686 |
+msgid "Html_input_image: unable to create image submit.\n"
|
|
33687 |
+msgstr ""
|
|
33688 |
+
|
|
33689 |
+#: src/html.c:4460
|
|
33690 |
+msgid "input camp outside <form>\n"
|
|
33691 |
+msgstr ""
|
|
33692 |
+
|
|
33693 |
+#: src/html.c:4540
|
|
33694 |
+msgid "submit"
|
|
33695 |
+msgstr ""
|
|
33696 |
+
|
|
33697 |
+#: src/html.c:4547 config/dillocfg.c:81
|
|
33698 |
+msgid "Reset"
|
|
33699 |
+msgstr ""
|
|
33700 |
+
|
|
33701 |
+#: src/html.c:4557
|
|
33702 |
+msgid "Submit"
|
|
33703 |
+msgstr ""
|
|
33704 |
+
|
|
33705 |
+#: src/html.c:4574
|
|
33706 |
+msgid "An input of the type \"file\" wasn't rendered!\n"
|
|
33707 |
+msgstr ""
|
|
33708 |
+
|
|
33709 |
+#: src/html.c:4748
|
|
33710 |
+msgid "<textarea> outside <form>\n"
|
|
33711 |
+msgstr ""
|
|
33712 |
+
|
|
33713 |
+#: src/html.c:4753
|
|
33714 |
+msgid "nested <textarea>\n"
|
|
33715 |
+msgstr ""
|
|
33716 |
+
|
|
33717 |
+#: src/html.c:4825
|
|
33718 |
+msgid "<select> outside <form>\n"
|
|
33719 |
+msgstr ""
|
|
33720 |
+
|
|
33721 |
+#: src/html.c:4829
|
|
33722 |
+msgid "nested <select>\n"
|
|
33723 |
+msgstr ""
|
|
33724 |
+
|
|
33725 |
+#: src/html.c:5053
|
|
33726 |
+msgid "base URI is relative (it MUST be absolute)\n"
|
|
33727 |
+msgstr ""
|
|
33728 |
+
|
|
33729 |
+#: src/html.c:5060
|
|
33730 |
+msgid "the BASE element must appear in the HEAD section\n"
|
|
33731 |
+msgstr ""
|
|
33732 |
+
|
|
33733 |
+#: src/html.c:5411
|
|
33734 |
+#, c-format
|
|
33735 |
+msgid "<%1$s> is not allowed to contain <%2$s>. -- closing <%3$s>\n"
|
|
33736 |
+msgstr ""
|
|
33737 |
+
|
|
33738 |
+#: src/html.c:5435
|
|
33739 |
+msgid "the required DOCTYPE declaration is missing (or invalid)\n"
|
|
33740 |
+msgstr ""
|
|
33741 |
+
|
|
33742 |
+#: src/html.c:5526
|
|
33743 |
+#, c-format
|
|
33744 |
+msgid "<pre> is not allowed to contain <%s>\n"
|
|
33745 |
+msgstr ""
|
|
33746 |
+
|
|
33747 |
+#: src/html.c:5548
|
|
33748 |
+msgid "'id' and 'name' attribute of <a> tag differ\n"
|
|
33749 |
+msgstr ""
|
|
33750 |
+
|
|
33751 |
+#: src/html.c:5775
|
|
33752 |
+msgid "Html_write_raw : bufsize is negative!\n"
|
|
33753 |
+msgstr ""
|
|
33754 |
+
|
|
33755 |
+#: src/html.c:5853
|
|
33756 |
+msgid "attribute lacks closing quote\n"
|
|
33757 |
+msgstr ""
|
|
33758 |
+
|
|
33759 |
+#: src/html.c:5861
|
|
33760 |
+#, c-format
|
|
33761 |
+msgid "<%s> element lacks its closing '>'\n"
|
|
33762 |
+msgstr ""
|
|
33763 |
+
|
|
33764 |
+#: src/html.c:6155
|
|
33765 |
+msgid "could not allocate character encoding converter"
|
|
33766 |
+msgstr ""
|
|
33767 |
+
|
|
33768 |
+#: src/misc.c:455
|
|
33769 |
+msgid "Untitled"
|
|
33770 |
+msgstr ""
|
|
33771 |
+
|
|
33772 |
+#: src/interface.c:249
|
|
33773 |
+msgid "Selection retrieval failed\n"
|
|
33774 |
+msgstr ""
|
|
33775 |
+
|
|
33776 |
+#: src/interface.c:363
|
|
33777 |
+msgid "Clear the URL box (middle-click to paste an URL)."
|
|
33778 |
+msgstr ""
|
|
33779 |
+
|
|
33780 |
+#: src/interface.c:385
|
|
33781 |
+msgid "Search the Web"
|
|
33782 |
+msgstr ""
|
|
33783 |
+
|
|
33784 |
+#: src/interface.c:417 src/menu.c:231 src/menu.c:280
|
|
33785 |
+msgid "Back"
|
|
33786 |
+msgstr ""
|
|
33787 |
+
|
|
33788 |
+#: src/interface.c:421
|
|
33789 |
+msgid "Go to previous page (right-click for menu)."
|
|
33790 |
+msgstr ""
|
|
33791 |
+
|
|
33792 |
+#: src/interface.c:450 src/menu.c:233 src/menu.c:282
|
|
33793 |
+msgid "Forward"
|
|
33794 |
+msgstr ""
|
|
33795 |
+
|
|
33796 |
+#: src/interface.c:454
|
|
33797 |
+msgid "Go to next page (right-click for menu)."
|
|
33798 |
+msgstr ""
|
|
33799 |
+
|
|
33800 |
+#: src/interface.c:481
|
|
33801 |
+msgid "Home"
|
|
33802 |
+msgstr ""
|
|
33803 |
+
|
|
33804 |
+#: src/interface.c:485
|
|
33805 |
+msgid "Go to the Home page"
|
|
33806 |
+msgstr ""
|
|
33807 |
+
|
|
33808 |
+#: src/interface.c:499 config/dillocfg.c:82
|
|
33809 |
+msgid "Reload"
|
|
33810 |
+msgstr ""
|
|
33811 |
+
|
|
33812 |
+#: src/interface.c:500
|
|
33813 |
+msgid "Reload this page"
|
|
33814 |
+msgstr ""
|
|
33815 |
+
|
|
33816 |
+#: src/interface.c:512 config/dillocfg.c:83
|
|
33817 |
+msgid "Save"
|
|
33818 |
+msgstr ""
|
|
33819 |
+
|
|
33820 |
+#: src/interface.c:513
|
|
33821 |
+msgid "Save this page"
|
|
33822 |
+msgstr ""
|
|
33823 |
+
|
|
33824 |
+#: src/interface.c:520 src/menu.c:235 src/menu.c:284
|
|
33825 |
+msgid "Stop"
|
|
33826 |
+msgstr ""
|
|
33827 |
+
|
|
33828 |
+#: src/interface.c:521
|
|
33829 |
+msgid "Stop the current transfer"
|
|
33830 |
+msgstr ""
|
|
33831 |
+
|
|
33832 |
+#: src/interface.c:534
|
|
33833 |
+msgid "Book"
|
|
33834 |
+msgstr ""
|
|
33835 |
+
|
|
33836 |
+#: src/interface.c:538
|
|
33837 |
+msgid "View bookmarks"
|
|
33838 |
+msgstr ""
|
|
33839 |
+
|
|
33840 |
+#: src/interface.c:655 src/interface.c:826
|
|
33841 |
+msgid "Hide Controls"
|
|
33842 |
+msgstr ""
|
|
33843 |
+
|
|
33844 |
+#: src/interface.c:655 src/interface.c:826
|
|
33845 |
+msgid "Show Controls"
|
|
33846 |
+msgstr ""
|
|
33847 |
+
|
|
33848 |
+#: src/interface.c:929
|
|
33849 |
+msgid "Show HTML bugs (right-click for menu)."
|
|
33850 |
+msgstr ""
|
|
33851 |
+
|
|
33852 |
+#: src/interface.c:1231
|
|
33853 |
+#, c-format
|
|
33854 |
+msgid "Warning: search_url ends with '%%'\n"
|
|
33855 |
+msgstr ""
|
|
33856 |
+
|
|
33857 |
+#: src/interface.c:1233
|
|
33858 |
+#, c-format
|
|
33859 |
+msgid "Warning: illegal specifier '%%%c' in search_url\n"
|
|
33860 |
+msgstr ""
|
|
33861 |
+
|
|
33862 |
+#: src/interface.c:1298
|
|
33863 |
+msgid "Dillo: Open File"
|
|
33864 |
+msgstr ""
|
|
33865 |
+
|
|
33866 |
+#: src/interface.c:1374
|
|
33867 |
+msgid "Clear"
|
|
33868 |
+msgstr ""
|
|
33869 |
+
|
|
33870 |
+#: src/interface.c:1382 src/interface.c:1536 src/nav.c:453
|
|
33871 |
+msgid "Cancel"
|
|
33872 |
+msgstr ""
|
|
33873 |
+
|
|
33874 |
+#: src/interface.c:1513
|
|
33875 |
+msgid "User Name:"
|
|
33876 |
+msgstr ""
|
|
33877 |
+
|
|
33878 |
+#: src/interface.c:1520
|
|
33879 |
+msgid "Password:"
|
|
33880 |
+msgstr ""
|
|
33881 |
+
|
|
33882 |
+#: src/interface.c:1529 src/interface.c:1604 src/interface.c:2073
|
|
33883 |
+#: src/nav.c:453
|
|
33884 |
+msgid "OK"
|
|
33885 |
+msgstr ""
|
|
33886 |
+
|
|
33887 |
+#: src/interface.c:1566
|
|
33888 |
+msgid "Dillo: Enter Authentication"
|
|
33889 |
+msgstr ""
|
|
33890 |
+
|
|
33891 |
+#: src/interface.c:1586
|
|
33892 |
+msgid "Dillo: Question"
|
|
33893 |
+msgstr ""
|
|
33894 |
+
|
|
33895 |
+#: src/interface.c:1602
|
|
33896 |
+msgid "Dillo: Open URL"
|
|
33897 |
+msgstr ""
|
|
33898 |
+
|
|
33899 |
+#: src/interface.c:1626
|
|
33900 |
+#, c-format
|
|
33901 |
+msgid "File saved (%d Bytes)"
|
|
33902 |
+msgstr ""
|
|
33903 |
+
|
|
33904 |
+#: src/interface.c:1708
|
|
33905 |
+#, c-format
|
|
33906 |
+msgid "Error trying to save: %s\n"
|
|
33907 |
+msgstr ""
|
|
33908 |
+
|
|
33909 |
+#: src/interface.c:1761
|
|
33910 |
+msgid "Dillo: Save URL as File..."
|
|
33911 |
+msgstr ""
|
|
33912 |
+
|
|
33913 |
+#: src/interface.c:1788
|
|
33914 |
+msgid "Dillo: Save link as File..."
|
|
33915 |
+msgstr ""
|
|
33916 |
+
|
|
33917 |
+#: src/interface.c:1843 src/interface.c:1857
|
|
33918 |
+msgid "Dillo: Find text"
|
|
33919 |
+msgstr ""
|
|
33920 |
+
|
|
33921 |
+#: src/interface.c:1844 src/interface.c:1850
|
|
33922 |
+#, c-format
|
|
33923 |
+msgid "Cannot find \"%s\"."
|
|
33924 |
+msgstr ""
|
|
33925 |
+
|
|
33926 |
+#: src/interface.c:1858
|
|
33927 |
+#, c-format
|
|
33928 |
+msgid "No further occurence of \"%s\". Restarting from the beginning."
|
|
33929 |
+msgstr ""
|
|
33930 |
+
|
|
33931 |
+#: src/interface.c:1866
|
|
33932 |
+#, c-format
|
|
33933 |
+msgid "(Find) \"%s\": restart from beginning"
|
|
33934 |
+msgstr ""
|
|
33935 |
+
|
|
33936 |
+#: src/interface.c:1879
|
|
33937 |
+#, c-format
|
|
33938 |
+msgid "(Find) \"%s\""
|
|
33939 |
+msgstr ""
|
|
33940 |
+
|
|
33941 |
+#: src/interface.c:1885
|
|
33942 |
+msgid "Unexpected return from a_Dw_gtk_scrolled_window_search()\n"
|
|
33943 |
+msgstr ""
|
|
33944 |
+
|
|
33945 |
+#: src/interface.c:1937
|
|
33946 |
+msgid "press <Enter> to (repeat) search, <Esc> to close search"
|
|
33947 |
+msgstr ""
|
|
33948 |
+
|
|
33949 |
+#: src/interface.c:1938 src/interface.c:2031
|
|
33950 |
+msgid "Search"
|
|
33951 |
+msgstr ""
|
|
33952 |
+
|
|
33953 |
+#: src/interface.c:1940 src/interface.c:1941 src/interface.c:1977
|
|
33954 |
+msgid "Case sensitive"
|
|
33955 |
+msgstr ""
|
|
33956 |
+
|
|
33957 |
+#: src/interface.c:1975
|
|
33958 |
+msgid "Dillo: Find text in page"
|
|
33959 |
+msgstr ""
|
|
33960 |
+
|
|
33961 |
+#: src/interface.c:1978
|
|
33962 |
+msgid "Find"
|
|
33963 |
+msgstr ""
|
|
33964 |
+
|
|
33965 |
+#: src/interface.c:2029
|
|
33966 |
+msgid "Dillo"
|
|
33967 |
+msgstr ""
|
|
33968 |
+
|
|
33969 |
+#: src/interface.c:2029
|
|
33970 |
+msgid "Dillo: Search the Web"
|
|
33971 |
+msgstr ""
|
|
33972 |
+
|
|
33973 |
+#: src/interface.c:2066
|
|
33974 |
+#, c-format
|
|
33975 |
+msgid "Dillo: Enter proxy password for '%s'"
|
|
33976 |
+msgstr ""
|
|
33977 |
+
|
|
33978 |
+#: src/interface.c:2151
|
|
33979 |
+msgid "Close"
|
|
33980 |
+msgstr ""
|
|
33981 |
+
|
|
33982 |
+#: src/interface.c:2226
|
|
33983 |
+msgid "close"
|
|
33984 |
+msgstr ""
|
|
33985 |
+
|
|
33986 |
+#: src/nav.c:383
|
|
33987 |
+#, c-format
|
|
33988 |
+msgid "Unhandled switch type %d in a_Nav_jump_callback in src/nav.c\n"
|
|
33989 |
+msgstr ""
|
|
33990 |
+
|
|
33991 |
+#: src/nav.c:452
|
|
33992 |
+msgid "Repost form data?"
|
|
33993 |
+msgstr ""
|
|
33994 |
+
|
|
33995 |
+#: src/menu.c:173
|
|
33996 |
+msgid "_File"
|
|
33997 |
+msgstr ""
|
|
33998 |
+
|
|
33999 |
+#: src/menu.c:174
|
|
34000 |
+msgid "_New Window"
|
|
34001 |
+msgstr ""
|
|
34002 |
+
|
|
34003 |
+#: src/menu.c:177
|
|
34004 |
+msgid "New _Tab"
|
|
34005 |
+msgstr ""
|
|
34006 |
+
|
|
34007 |
+#: src/menu.c:181
|
|
34008 |
+msgid "_Open File..."
|
|
34009 |
+msgstr ""
|
|
34010 |
+
|
|
34011 |
+#: src/menu.c:183
|
|
34012 |
+msgid "Open _URL..."
|
|
34013 |
+msgstr ""
|
|
34014 |
+
|
|
34015 |
+#: src/menu.c:189
|
|
34016 |
+msgid "Close Window"
|
|
34017 |
+msgstr ""
|
|
34018 |
+
|
|
34019 |
+#: src/menu.c:192 src/menu.c:359
|
|
34020 |
+msgid "Close Tab"
|
|
34021 |
+msgstr ""
|
|
34022 |
+
|
|
34023 |
+#: src/menu.c:196
|
|
34024 |
+msgid "Exit Dillo"
|
|
34025 |
+msgstr ""
|
|
34026 |
+
|
|
34027 |
+#: src/menu.c:200
|
|
34028 |
+msgid "_View"
|
|
34029 |
+msgstr ""
|
|
34030 |
+
|
|
34031 |
+#: src/menu.c:202
|
|
34032 |
+msgid "Previous tab"
|
|
34033 |
+msgstr ""
|
|
34034 |
+
|
|
34035 |
+#: src/menu.c:204
|
|
34036 |
+msgid "Next tab"
|
|
34037 |
+msgstr ""
|
|
34038 |
+
|
|
34039 |
+#: src/menu.c:208
|
|
34040 |
+msgid "_Options..."
|
|
34041 |
+msgstr ""
|
|
34042 |
+
|
|
34043 |
+#: src/menu.c:228
|
|
34044 |
+msgid "PAGE OPTIONS"
|
|
34045 |
+msgstr ""
|
|
34046 |
+
|
|
34047 |
+#: src/menu.c:237 src/menu.c:286
|
|
34048 |
+msgid "_Reload"
|
|
34049 |
+msgstr ""
|
|
34050 |
+
|
|
34051 |
+#: src/menu.c:241
|
|
34052 |
+msgid "View page So_urce"
|
|
34053 |
+msgstr ""
|
|
34054 |
+
|
|
34055 |
+#: src/menu.c:243
|
|
34056 |
+msgid "View page Bugs"
|
|
34057 |
+msgstr ""
|
|
34058 |
+
|
|
34059 |
+#: src/menu.c:244
|
|
34060 |
+msgid "_Bookmark this Page"
|
|
34061 |
+msgstr ""
|
|
34062 |
+
|
|
34063 |
+#: src/menu.c:247
|
|
34064 |
+msgid "Duplicate this Page"
|
|
34065 |
+msgstr ""
|
|
34066 |
+
|
|
34067 |
+#: src/menu.c:250
|
|
34068 |
+msgid "Duplicate this tab"
|
|
34069 |
+msgstr ""
|
|
34070 |
+
|
|
34071 |
+#: src/menu.c:254
|
|
34072 |
+msgid "_Find Text"
|
|
34073 |
+msgstr ""
|
|
34074 |
+
|
|
34075 |
+#: src/menu.c:257
|
|
34076 |
+msgid "Jump to..."
|
|
34077 |
+msgstr ""
|
|
34078 |
+
|
|
34079 |
+#: src/menu.c:258
|
|
34080 |
+msgid "This Frame..."
|
|
34081 |
+msgstr ""
|
|
34082 |
+
|
|
34083 |
+#: src/menu.c:259
|
|
34084 |
+msgid "This Frameset..."
|
|
34085 |
+msgstr ""
|
|
34086 |
+
|
|
34087 |
+#: src/menu.c:262
|
|
34088 |
+msgid "Save Page As..."
|
|
34089 |
+msgstr ""
|
|
34090 |
+
|
|
34091 |
+#: src/menu.c:277
|
|
34092 |
+msgid "FRAME OPTIONS"
|
|
34093 |
+msgstr ""
|
|
34094 |
+
|
|
34095 |
+#: src/menu.c:290
|
|
34096 |
+msgid "View frame Source"
|
|
34097 |
+msgstr ""
|
|
34098 |
+
|
|
34099 |
+#: src/menu.c:292
|
|
34100 |
+msgid "Bookmark this Frame"
|
|
34101 |
+msgstr ""
|
|
34102 |
+
|
|
34103 |
+#: src/menu.c:294
|
|
34104 |
+msgid "Reload this Frame"
|
|
34105 |
+msgstr ""
|
|
34106 |
+
|
|
34107 |
+#: src/menu.c:297
|
|
34108 |
+msgid "Show only this Frame"
|
|
34109 |
+msgstr ""
|
|
34110 |
+
|
|
34111 |
+#: src/menu.c:299
|
|
34112 |
+msgid "Open Frame in new Window"
|
|
34113 |
+msgstr ""
|
|
34114 |
+
|
|
34115 |
+#: src/menu.c:302
|
|
34116 |
+msgid "Open Frame in new Tab"
|
|
34117 |
+msgstr ""
|
|
34118 |
+
|
|
34119 |
+#: src/menu.c:306
|
|
34120 |
+msgid "_Find Text in this Frame..."
|
|
34121 |
+msgstr ""
|
|
34122 |
+
|
|
34123 |
+#: src/menu.c:309 src/menu.c:340
|
|
34124 |
+msgid "Save Frame As..."
|
|
34125 |
+msgstr ""
|
|
34126 |
+
|
|
34127 |
+#: src/menu.c:325
|
|
34128 |
+msgid "FRAMESET OPTIONS"
|
|
34129 |
+msgstr ""
|
|
34130 |
+
|
|
34131 |
+#: src/menu.c:327
|
|
34132 |
+msgid "View Frameset Source"
|
|
34133 |
+msgstr ""
|
|
34134 |
+
|
|
34135 |
+#: src/menu.c:329
|
|
34136 |
+msgid "Bookmark this Frameset"
|
|
34137 |
+msgstr ""
|
|
34138 |
+
|
|
34139 |
+#: src/menu.c:331
|
|
34140 |
+msgid "Reload this Frameset"
|
|
34141 |
+msgstr ""
|
|
34142 |
+
|
|
34143 |
+#: src/menu.c:334
|
|
34144 |
+msgid "Show only this Frameset"
|
|
34145 |
+msgstr ""
|
|
34146 |
+
|
|
34147 |
+#: src/menu.c:337
|
|
34148 |
+msgid "_Find Text in this Frameset..."
|
|
34149 |
+msgstr ""
|
|
34150 |
+
|
|
34151 |
+#: src/menu.c:357
|
|
34152 |
+msgid "TAB OPTIONS"
|
|
34153 |
+msgstr ""
|
|
34154 |
+
|
|
34155 |
+#: src/menu.c:361
|
|
34156 |
+msgid "New Tab"
|
|
34157 |
+msgstr ""
|
|
34158 |
+
|
|
34159 |
+#: src/menu.c:363
|
|
34160 |
+msgid "Reload Tab"
|
|
34161 |
+msgstr ""
|
|
34162 |
+
|
|
34163 |
+#: src/menu.c:460
|
|
34164 |
+msgid "FOLLOWING PAGES"
|
|
34165 |
+msgstr ""
|
|
34166 |
+
|
|
34167 |
+#: src/menu.c:463
|
|
34168 |
+msgid "PREVIOUS PAGES"
|
|
34169 |
+msgstr ""
|
|
34170 |
+
|
|
34171 |
+#: src/menu.c:531
|
|
34172 |
+msgid "LINK OPTIONS"
|
|
34173 |
+msgstr ""
|
|
34174 |
+
|
|
34175 |
+#: src/menu.c:533
|
|
34176 |
+msgid "Open Link in New Window"
|
|
34177 |
+msgstr ""
|
|
34178 |
+
|
|
34179 |
+#: src/menu.c:536
|
|
34180 |
+msgid "Open Link in New Tab"
|
|
34181 |
+msgstr ""
|
|
34182 |
+
|
|
34183 |
+#: src/menu.c:539
|
|
34184 |
+msgid "Open Link"
|
|
34185 |
+msgstr ""
|
|
34186 |
+
|
|
34187 |
+#: src/menu.c:542
|
|
34188 |
+msgid "Bookmark this Link"
|
|
34189 |
+msgstr ""
|
|
34190 |
+
|
|
34191 |
+#: src/menu.c:544
|
|
34192 |
+msgid "Copy Link location"
|
|
34193 |
+msgstr ""
|
|
34194 |
+
|
|
34195 |
+#: src/menu.c:549
|
|
34196 |
+msgid "Save Link As..."
|
|
34197 |
+msgstr ""
|
|
34198 |
+
|
|
34199 |
+#: src/menu.c:553
|
|
34200 |
+msgid "Image Menu..."
|
|
34201 |
+msgstr ""
|
|
34202 |
+
|
|
34203 |
+#: src/menu.c:571
|
|
34204 |
+msgid "IMAGE OPTIONS"
|
|
34205 |
+msgstr ""
|
|
34206 |
+
|
|
34207 |
+#: src/menu.c:573
|
|
34208 |
+msgid "Isolate Image"
|
|
34209 |
+msgstr ""
|
|
34210 |
+
|
|
34211 |
+#: src/menu.c:575
|
|
34212 |
+msgid "Open Image in New Window"
|
|
34213 |
+msgstr ""
|
|
34214 |
+
|
|
34215 |
+#: src/menu.c:578
|
|
34216 |
+msgid "Open Image in New Tab"
|
|
34217 |
+msgstr ""
|
|
34218 |
+
|
|
34219 |
+#: src/menu.c:581
|
|
34220 |
+msgid "Open Image"
|
|
34221 |
+msgstr ""
|
|
34222 |
+
|
|
34223 |
+#: src/menu.c:584
|
|
34224 |
+msgid "Bookmark this Image"
|
|
34225 |
+msgstr ""
|
|
34226 |
+
|
|
34227 |
+#: src/menu.c:586
|
|
34228 |
+msgid "Copy Image location"
|
|
34229 |
+msgstr ""
|
|
34230 |
+
|
|
34231 |
+#: src/menu.c:591
|
|
34232 |
+msgid "Save Image As..."
|
|
34233 |
+msgstr ""
|
|
34234 |
+
|
|
34235 |
+#: src/menu.c:605
|
|
34236 |
+msgid "BUG METER OPTIONS"
|
|
34237 |
+msgstr ""
|
|
34238 |
+
|
|
34239 |
+#: src/menu.c:607
|
|
34240 |
+msgid "Validate URL with W3C"
|
|
34241 |
+msgstr ""
|
|
34242 |
+
|
|
34243 |
+#: src/menu.c:609
|
|
34244 |
+msgid "Validate URL with WDG"
|
|
34245 |
+msgstr ""
|
|
34246 |
+
|
|
34247 |
+#: src/menu.c:612
|
|
34248 |
+msgid "About Bug Meter..."
|
|
34249 |
+msgstr ""
|
|
34250 |
+
|
|
34251 |
+#: src/prefs.c:431
|
|
34252 |
+msgid "Error: Can't open specified config file. default file is used.\n"
|
|
34253 |
+msgstr ""
|
|
34254 |
+
|
|
34255 |
+#: src/i18n.c:359
|
|
34256 |
+msgid "charset detect may mistake...\n"
|
|
34257 |
+msgstr ""
|
|
34258 |
+
|
|
34259 |
+#: src/i18n.c:447
|
|
34260 |
+msgid "<meta> outside of <head>!\n"
|
|
34261 |
+msgstr ""
|
|
34262 |
+
|
|
34263 |
+#: src/i18n.c:493
|
|
34264 |
+msgid "all ascii code\n"
|
|
34265 |
+msgstr ""
|
|
34266 |
+
|
|
34267 |
+#: src/i18n.c:526
|
|
34268 |
+msgid "unable to fully convert between character encodings\n"
|
|
34269 |
+msgstr ""
|
|
34270 |
+
|
|
34271 |
+#: src/i18n.c:565
|
|
34272 |
+msgid "no support enc\n"
|
|
34273 |
+msgstr ""
|
|
34274 |
+
|
|
34275 |
+#: src/tab.c:293 src/tab.c:425 dpi/bookmarks.c:1653
|
|
34276 |
+msgid "(Untitled)"
|
|
34277 |
+msgstr ""
|
|
34278 |
+
|
|
34279 |
+#: src/IO/https.c:168
|
|
34280 |
+msgid "--Error detected\n"
|
|
34281 |
+msgstr ""
|
|
34282 |
+
|
|
34283 |
+#: src/IO/https.c:173 src/IO/https.c:204 src/IO/http.c:294
|
|
34284 |
+msgid "ERROR: unable to connect to remote host"
|
|
34285 |
+msgstr ""
|
|
34286 |
+
|
|
34287 |
+#: src/IO/https.c:179 src/IO/http.c:309
|
|
34288 |
+msgid "--Connection established\n"
|
|
34289 |
+msgstr ""
|
|
34290 |
+
|
|
34291 |
+#: src/IO/https.c:280 src/IO/http.c:417
|
|
34292 |
+#, c-format
|
|
34293 |
+msgid "Sending query to %s..."
|
|
34294 |
+msgstr ""
|
|
34295 |
+
|
|
34296 |
+#: src/IO/https.c:333 src/IO/http.c:486
|
|
34297 |
+#, c-format
|
|
34298 |
+msgid "DNS solving %s"
|
|
34299 |
+msgstr ""
|
|
34300 |
+
|
|
34301 |
+#: src/IO/https.c:363
|
|
34302 |
+msgid " HTTPS: new abort handler! #2\n"
|
|
34303 |
+msgstr ""
|
|
34304 |
+
|
|
34305 |
+#: src/IO/https.c:365 src/IO/https.c:387 src/IO/http.c:301 src/IO/http.c:520
|
|
34306 |
+#: src/IO/http.c:551
|
|
34307 |
+#, c-format
|
|
34308 |
+msgid "ERROR: %s"
|
|
34309 |
+msgstr ""
|
|
34310 |
+
|
|
34311 |
+#: src/IO/https.c:386
|
|
34312 |
+msgid " HTTP: new abort handler! #1\n"
|
|
34313 |
+msgstr ""
|
|
34314 |
+
|
|
34315 |
+#: src/IO/https.c:400 src/IO/http.c:564
|
|
34316 |
+#, c-format
|
|
34317 |
+msgid "ERROR: Dns can't solve %s"
|
|
34318 |
+msgstr ""
|
|
34319 |
+
|
|
34320 |
+#: src/IO/https.c:421 src/IO/http.c:591
|
|
34321 |
+msgid "Query sent, waiting for reply..."
|
|
34322 |
+msgstr ""
|
|
34323 |
+
|
|
34324 |
+#: src/IO/http.c:190
|
|
34325 |
+#, c-format
|
|
34326 |
+msgid "Getting %1$s, referer %2$s\n"
|
|
34327 |
+msgstr ""
|
|
34328 |
+
|
|
34329 |
+#: src/IO/http.c:259
|
|
34330 |
+#, c-format
|
|
34331 |
+msgid ""
|
|
34332 |
+"Query:\n"
|
|
34333 |
+"%s"
|
|
34334 |
+msgstr ""
|
|
34335 |
+
|
|
34336 |
+#: src/IO/http.c:286
|
|
34337 |
+msgid "--Connection broken\n"
|
|
34338 |
+msgstr ""
|
|
34339 |
+
|
|
34340 |
+#: src/IO/http.c:342
|
|
34341 |
+#, c-format
|
|
34342 |
+msgid "Http_connect_socket ERROR: %s\n"
|
|
34343 |
+msgstr ""
|
|
34344 |
+
|
|
34345 |
+#: src/IO/http.c:363 src/IO/http.c:377
|
|
34346 |
+#, c-format
|
|
34347 |
+msgid "Connecting to %s\n"
|
|
34348 |
+msgstr ""
|
|
34349 |
+
|
|
34350 |
+#: src/IO/http.c:396
|
|
34351 |
+msgid "Contacting host..."
|
|
34352 |
+msgstr ""
|
|
34353 |
+
|
|
34354 |
+#: src/IO/http.c:529
|
|
34355 |
+msgid "Http: OpAbort [1B]\n"
|
|
34356 |
+msgstr ""
|
|
34357 |
+
|
|
34358 |
+#: src/IO/dpi.c:188
|
|
34359 |
+msgid "ERROR: [Dpi_get_token] Can't find token start\n"
|
|
34360 |
+msgstr ""
|
|
34361 |
+
|
|
34362 |
+#: src/IO/dpi.c:221
|
|
34363 |
+msgid "ERROR: [Dpi_get_token] *** NULL code here ***\n"
|
|
34364 |
+msgstr ""
|
|
34365 |
+
|
|
34366 |
+#: src/IO/dpi.c:312
|
|
34367 |
+msgid "Dpi: [Dpi_process_io] IOClose\n"
|
|
34368 |
+msgstr ""
|
|
34369 |
+
|
|
34370 |
+#: src/IO/dpi.c:338
|
|
34371 |
+#, c-format
|
|
34372 |
+msgid "Dpi_start_dpid (child): %s\n"
|
|
34373 |
+msgstr ""
|
|
34374 |
+
|
|
34375 |
+#: src/IO/dpi.c:348 src/IO/dpi.c:363
|
|
34376 |
+#, c-format
|
|
34377 |
+msgid "Dpi_start_dpid: %s\n"
|
|
34378 |
+msgstr ""
|
|
34379 |
+
|
|
34380 |
+#: src/IO/dpi.c:359
|
|
34381 |
+#, c-format
|
|
34382 |
+msgid "Dpi_start_dpid: n = %d\n"
|
|
34383 |
+msgstr ""
|
|
34384 |
+
|
|
34385 |
+#: src/IO/dpi.c:386
|
|
34386 |
+#, c-format
|
|
34387 |
+msgid "Dpi_check_uds: %1$s %2$s\n"
|
|
34388 |
+msgstr ""
|
|
34389 |
+
|
|
34390 |
+#: src/IO/dpi.c:673
|
|
34391 |
+msgid "dpi.c: ERROR, can't start dpi daemon\n"
|
|
34392 |
+msgstr ""
|
|
34393 |
+
|
|
34394 |
+#: src/IO/dpi.c:686
|
|
34395 |
+msgid "a_Dpi_ccc: OpAbort[2B], Not implemented\n"
|
|
34396 |
+msgstr ""
|
|
34397 |
+
|
|
34398 |
+#: src/IO/dpi.c:790 src/IO/dpi.c:794
|
|
34399 |
+#, c-format
|
|
34400 |
+msgid "a_Dpi_bye_dpid: %s\n"
|
|
34401 |
+msgstr ""
|
|
34402 |
+
|
|
34403 |
+#: dpid/dpi_socket_dir.c:106
|
|
34404 |
+#, c-format
|
|
34405 |
+msgid "The dpi_socket_dir file does not exist\n"
|
|
34406 |
+msgstr ""
|
|
34407 |
+
|
|
34408 |
+#: dpid/dpi_socket_dir.c:110 dpid/dpi_socket_dir.c:114
|
|
34409 |
+#, c-format
|
|
34410 |
+msgid "debug_msg - init_sockdir: The socket directory "
|
|
34411 |
+msgstr ""
|
|
34412 |
+
|
|
34413 |
+#: dpid/dpi_socket_dir.c:111
|
|
34414 |
+#, c-format
|
|
34415 |
+msgid "%s exists and is OK\n"
|
|
34416 |
+msgstr ""
|
|
34417 |
+
|
|
34418 |
+#: dpid/dpi_socket_dir.c:115
|
|
34419 |
+#, c-format
|
|
34420 |
+msgid "%s does not exist or is not a directory\n"
|
|
34421 |
+msgstr ""
|
|
34422 |
+
|
|
34423 |
+#: dpid/dpi_socket_dir.c:124
|
|
34424 |
+#, c-format
|
|
34425 |
+msgid " - Failed to create dpi socket directory\n"
|
|
34426 |
+msgstr ""
|
|
34427 |
+
|
|
34428 |
+#: dpid/dpi_socket_dir.c:127
|
|
34429 |
+#, c-format
|
|
34430 |
+msgid " - failed to save %s\n"
|
|
34431 |
+msgstr ""
|
|
34432 |
+
|
|
34433 |
+#: dpid/main.c:59 dpid/main.c:66 dpid/main.c:77 dpid/main.c:85 dpid/main.c:99
|
|
34434 |
+#: dpid/main.c:104 dpid/main.c:109
|
|
34435 |
+#, c-format
|
|
34436 |
+msgid "ERROR in child proc for %s\n"
|
|
34437 |
+msgstr ""
|
|
34438 |
+
|
|
34439 |
+#: dpid/main.c:166
|
|
34440 |
+#, c-format
|
|
34441 |
+msgid ": dpid failed to parse cmd in %s\n"
|
|
34442 |
+msgstr ""
|
|
34443 |
+
|
|
34444 |
+#: dpid/main.c:265
|
|
34445 |
+#, c-format
|
|
34446 |
+msgid "Failed to create socket directory\n"
|
|
34447 |
+msgstr ""
|
|
34448 |
+
|
|
34449 |
+#: dpid/main.c:275
|
|
34450 |
+#, c-format
|
|
34451 |
+msgid "dpid refuses to start, possibly because:\n"
|
|
34452 |
+msgstr ""
|
|
34453 |
+
|
|
34454 |
+#: dpid/main.c:276
|
|
34455 |
+#, c-format
|
|
34456 |
+msgid "\t1) An instance of dpid is already running.\n"
|
|
34457 |
+msgstr ""
|
|
34458 |
+
|
|
34459 |
+#: dpid/main.c:277
|
|
34460 |
+#, c-format
|
|
34461 |
+msgid "\t2) A previous dpid didn't clean up on exit.\n"
|
|
34462 |
+msgstr ""
|
|
34463 |
+
|
|
34464 |
+#: dpid/main.c:280
|
|
34465 |
+msgid "init_srs_sockets failed\n"
|
|
34466 |
+msgstr ""
|
|
34467 |
+
|
|
34468 |
+#: dpid/main.c:294
|
|
34469 |
+#, c-format
|
|
34470 |
+msgid "dpid started\n"
|
|
34471 |
+msgstr ""
|
|
34472 |
+
|
|
34473 |
+#: dpid/main.c:340
|
|
34474 |
+#, c-format
|
|
34475 |
+msgid "accept on srs socket failed\n"
|
|
34476 |
+msgstr ""
|
|
34477 |
+
|
|
34478 |
+#: dpid/main.c:341
|
|
34479 |
+#, c-format
|
|
34480 |
+msgid "service pending connections, and continue\n"
|
|
34481 |
+msgstr ""
|
|
34482 |
+
|
|
34483 |
+#: dpi/bookmarks.c:96
|
|
34484 |
+msgid ""
|
|
34485 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
34486 |
+"<html>\n"
|
|
34487 |
+"<head>\n"
|
|
34488 |
+"<title>Bookmarks</title>\n"
|
|
34489 |
+"</head>\n"
|
|
34490 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
34491 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
34492 |
+" <tr><td>\n"
|
|
34493 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
34494 |
+" <tr>\n"
|
|
34495 |
+" <td> Bookmarks::</td>\n"
|
|
34496 |
+" <td width='100%' align='right'>\n"
|
|
34497 |
+" [<a href='dpi:/bm/modify'>modify</a>]\n"
|
|
34498 |
+" </td></tr>\n"
|
|
34499 |
+" </table></td></tr>\n"
|
|
34500 |
+"</table>\n"
|
|
34501 |
+"<br>\n"
|
|
34502 |
+msgstr ""
|
|
34503 |
+
|
|
34504 |
+#: dpi/bookmarks.c:115
|
|
34505 |
+msgid ""
|
|
34506 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
34507 |
+"<html>\n"
|
|
34508 |
+"<head>\n"
|
|
34509 |
+"<title>Bookmarks</title>\n"
|
|
34510 |
+"</head>\n"
|
|
34511 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
34512 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
34513 |
+" <tr><td>\n"
|
|
34514 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
34515 |
+" <tr>\n"
|
|
34516 |
+" <td> Bookmarks :: modify</td></tr>\n"
|
|
34517 |
+" </table></td></tr> \n"
|
|
34518 |
+"</table> \n"
|
|
34519 |
+"\n"
|
|
34520 |
+"<form>\n"
|
|
34521 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
34522 |
+" <tr><td>\n"
|
|
34523 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
34524 |
+" <tr>\n"
|
|
34525 |
+" <td><b>Select an operation </b></td>\n"
|
|
34526 |
+" <td><select name='operation'>\n"
|
|
34527 |
+" <option value='none' selected>--\n"
|
|
34528 |
+" <option value='delete'>Delete\n"
|
|
34529 |
+" <option value='move'>Move\n"
|
|
34530 |
+" <option value='modify'>Modify\n"
|
|
34531 |
+" <option value='add_sec'>Add Section\n"
|
|
34532 |
+" <option value='add_url'>Add URL\n"
|
|
34533 |
+" </select></td>\n"
|
|
34534 |
+" <td><b>, mark its operands, and </b></td>\n"
|
|
34535 |
+" <td><input type='submit' name='submit' value='submit.'></td>\n"
|
|
34536 |
+" <td width='100%'></td>\n"
|
|
34537 |
+" </tr>\n"
|
|
34538 |
+" </table></td></tr>\n"
|
|
34539 |
+"</table>\n"
|
|
34540 |
+msgstr ""
|
|
34541 |
+
|
|
34542 |
+#: dpi/bookmarks.c:151
|
|
34543 |
+msgid ""
|
|
34544 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
34545 |
+" <tr valign='top'>\n"
|
|
34546 |
+" <td>\n"
|
|
34547 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
34548 |
+" <tr><td>\n"
|
|
34549 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
34550 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
34551 |
+msgstr ""
|
|
34552 |
+
|
|
34553 |
+#: dpi/bookmarks.c:160
|
|
34554 |
+msgid ""
|
|
34555 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
34556 |
+" <tr valign='top'>\n"
|
|
34557 |
+" <td>\n"
|
|
34558 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
34559 |
+" <tr><td>\n"
|
|
34560 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
34561 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
34562 |
+msgstr ""
|
|
34563 |
+
|
|
34564 |
+#: dpi/bookmarks.c:243
|
|
34565 |
+msgid ""
|
|
34566 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
34567 |
+"<html>\n"
|
|
34568 |
+"<head>\n"
|
|
34569 |
+"<title>Bookmarks</title>\n"
|
|
34570 |
+"</head>\n"
|
|
34571 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
34572 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
34573 |
+" <tr><td colspan='2'>\n"
|
|
34574 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
34575 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add section\n"
|
|
34576 |
+" </td></tr></table></td></tr>\n"
|
|
34577 |
+"</table>\n"
|
|
34578 |
+"<br>\n"
|
|
34579 |
+"<form>\n"
|
|
34580 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
34581 |
+"<table border='1' width='100%'>\n"
|
|
34582 |
+" <tr>\n"
|
|
34583 |
+" <td bgcolor='olive'><b>New section:</b></td>\n"
|
|
34584 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
34585 |
+"</table>\n"
|
|
34586 |
+"<table width='100%' cellpadding='10'>\n"
|
|
34587 |
+"<tr><td>\n"
|
|
34588 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
34589 |
+" <tr>\n"
|
|
34590 |
+" <td>Title:</td>\n"
|
|
34591 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
34592 |
+" </table>\n"
|
|
34593 |
+" </td></tr>\n"
|
|
34594 |
+"</table>\n"
|
|
34595 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
34596 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
34597 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
34598 |
+"</table>\n"
|
|
34599 |
+"</form>\n"
|
|
34600 |
+"</body>\n"
|
|
34601 |
+"</html>\n"
|
|
34602 |
+"\n"
|
|
34603 |
+msgstr ""
|
|
34604 |
+
|
|
34605 |
+#: dpi/bookmarks.c:283
|
|
34606 |
+msgid ""
|
|
34607 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
34608 |
+"<html>\n"
|
|
34609 |
+"<head>\n"
|
|
34610 |
+"<title>Bookmarks</title>\n"
|
|
34611 |
+"</head>\n"
|
|
34612 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
34613 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
34614 |
+" <tr><td colspan='2'>\n"
|
|
34615 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
34616 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: update\n"
|
|
34617 |
+" </td></tr></table></td></tr>\n"
|
|
34618 |
+"</table>\n"
|
|
34619 |
+"<br>\n"
|
|
34620 |
+"<form>\n"
|
|
34621 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
34622 |
+msgstr ""
|
|
34623 |
+
|
|
34624 |
+#: dpi/bookmarks.c:310
|
|
34625 |
+#, c-format
|
|
34626 |
+msgid ""
|
|
34627 |
+"<tr><td>\n"
|
|
34628 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
34629 |
+" <tr>\n"
|
|
34630 |
+" <td>Title:</td>\n"
|
|
34631 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
34632 |
+" value='%s'></td></tr>\n"
|
|
34633 |
+" <tr>\n"
|
|
34634 |
+" <td>URL:</td>\n"
|
|
34635 |
+" <td>%s</td></tr>\n"
|
|
34636 |
+" </table>\n"
|
|
34637 |
+" </td></tr>\n"
|
|
34638 |
+msgstr ""
|
|
34639 |
+
|
|
34640 |
+#: dpi/bookmarks.c:323
|
|
34641 |
+#, c-format
|
|
34642 |
+msgid ""
|
|
34643 |
+"<tr><td>\n"
|
|
34644 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
34645 |
+" <tr>\n"
|
|
34646 |
+" <td>Title:</td>\n"
|
|
34647 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
34648 |
+" value='%s'></td></tr>\n"
|
|
34649 |
+" </table>\n"
|
|
34650 |
+" </td></tr>\n"
|
|
34651 |
+msgstr ""
|
|
34652 |
+
|
|
34653 |
+#: dpi/bookmarks.c:336
|
|
34654 |
+#, c-format
|
|
34655 |
+msgid ""
|
|
34656 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
34657 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
34658 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
34659 |
+"</table>\n"
|
|
34660 |
+"</form>\n"
|
|
34661 |
+"</body>\n"
|
|
34662 |
+"</html>\n"
|
|
34663 |
+msgstr ""
|
|
34664 |
+
|
|
34665 |
+#: dpi/bookmarks.c:346
|
|
34666 |
+msgid ""
|
|
34667 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
34668 |
+"<html>\n"
|
|
34669 |
+"<head>\n"
|
|
34670 |
+"<title>Bookmarks</title>\n"
|
|
34671 |
+"</head>\n"
|
|
34672 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
34673 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
34674 |
+" <tr><td colspan='2'>\n"
|
|
34675 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
34676 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add url\n"
|
|
34677 |
+" </td></tr></table></td></tr>\n"
|
|
34678 |
+"</table>\n"
|
|
34679 |
+"<br>\n"
|
|
34680 |
+"<form>\n"
|
|
34681 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
34682 |
+"<table border='1' width='100%'>\n"
|
|
34683 |
+" <tr>\n"
|
|
34684 |
+" <td bgcolor='olive'><b>Add url:</b></td>\n"
|
|
34685 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
34686 |
+"</table>\n"
|
|
34687 |
+"<table width='100%' cellpadding='10'>\n"
|
|
34688 |
+"<tr><td>\n"
|
|
34689 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
34690 |
+" <tr>\n"
|
|
34691 |
+" <td>Title:</td>\n"
|
|
34692 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
34693 |
+" <tr>\n"
|
|
34694 |
+" <td>URL:</td>\n"
|
|
34695 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
34696 |
+" </table>\n"
|
|
34697 |
+" </td></tr>\n"
|
|
34698 |
+"</table>\n"
|
|
34699 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
34700 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
34701 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
34702 |
+"</table>\n"
|
|
34703 |
+"</form>\n"
|
|
34704 |
+"</body>\n"
|
|
34705 |
+"</html>\n"
|
|
34706 |
+msgstr ""
|
|
34707 |
+
|
|
34708 |
+#: dpi/bookmarks.c:691
|
|
34709 |
+msgid "Unclassified"
|
|
34710 |
+msgstr ""
|
|
34711 |
+
|
|
34712 |
+#: dpi/bookmarks.c:724
|
|
34713 |
+#, c-format
|
|
34714 |
+msgid "echo \":s0: Unclassified\" > %s"
|
|
34715 |
+msgstr ""
|
|
34716 |
+
|
|
34717 |
+#: dpi/bookmarks.c:786
|
|
34718 |
+#, c-format
|
|
34719 |
+msgid ""
|
|
34720 |
+"Syntax error in bookmarks file:\n"
|
|
34721 |
+" %s"
|
|
34722 |
+msgstr ""
|
|
34723 |
+
|
|
34724 |
+#: dpi/bookmarks.c:898
|
|
34725 |
+msgid "Added bookmark!"
|
|
34726 |
+msgstr ""
|
|
34727 |
+
|
|
34728 |
+#: dpi/bookmarks.c:1087
|
|
34729 |
+msgid "Update sections:"
|
|
34730 |
+msgstr ""
|
|
34731 |
+
|
|
34732 |
+#: dpi/bookmarks.c:1107
|
|
34733 |
+msgid "Update titles:"
|
|
34734 |
+msgstr ""
|
|
34735 |
+
|
|
34736 |
+#: dpi/bookmarks.c:1404
|
|
34737 |
+msgid "Delete: you must mark what to delete!"
|
|
34738 |
+msgstr ""
|
|
34739 |
+
|
|
34740 |
+#: dpi/bookmarks.c:1410
|
|
34741 |
+msgid "Move: you must mark a target section!"
|
|
34742 |
+msgstr ""
|
|
34743 |
+
|
|
34744 |
+#: dpi/bookmarks.c:1412
|
|
34745 |
+msgid "Move: can not move a section (yet)."
|
|
34746 |
+msgstr ""
|
|
34747 |
+
|
|
34748 |
+#: dpi/bookmarks.c:1414
|
|
34749 |
+msgid "Move: you must mark some urls, and a target section!"
|
|
34750 |
+msgstr ""
|
|
34751 |
+
|
|
34752 |
+#: dpi/bookmarks.c:1419
|
|
34753 |
+msgid "Modify: you must mark what to update!"
|
|
34754 |
+msgstr ""
|
|
34755 |
+
|
|
34756 |
+#: dpi/bookmarks.c:1436
|
|
34757 |
+msgid "Add url: only one target section is allowed!"
|
|
34758 |
+msgstr ""
|
|
34759 |
+
|
|
34760 |
+#: dpi/bookmarks.c:1443
|
|
34761 |
+msgid "No operation, just do nothing!"
|
|
34762 |
+msgstr ""
|
|
34763 |
+
|
|
34764 |
+#: dpi/bookmarks.c:1446
|
|
34765 |
+msgid "Sorry, not implemented yet."
|
|
34766 |
+msgstr ""
|
|
34767 |
+
|
|
34768 |
+#: dpi/bookmarks.c:1614
|
|
34769 |
+msgid "Haven't got a full tag!\n"
|
|
34770 |
+msgstr ""
|
|
34771 |
+
|
|
34772 |
+#: dpi/bookmarks.c:1690
|
|
34773 |
+msgid ""
|
|
34774 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
34775 |
+"<HTML><body> Error on the bookmarks server...</body></html>"
|
|
34776 |
+msgstr ""
|
|
34777 |
+
|
|
34778 |
+#: config/dillocfg.c:84
|
|
34779 |
+msgid "Quit"
|
|
34780 |
+msgstr ""
|
|
34781 |
+
|
|
34782 |
+#: config/dillocfg.c:86 config/dillocfg.c:92
|
|
34783 |
+msgid "Dillo Preferences"
|
|
34784 |
+msgstr ""
|
|
34785 |
+
|
|
34786 |
+#: config/dillocfg.c:115
|
|
34787 |
+msgid "Interface"
|
|
34788 |
+msgstr ""
|
|
34789 |
+
|
|
34790 |
+#: config/dillocfg.c:116
|
|
34791 |
+msgid " Font "
|
|
34792 |
+msgstr ""
|
|
34793 |
+
|
|
34794 |
+#: config/dillocfg.c:117
|
|
34795 |
+msgid " Color "
|
|
34796 |
+msgstr ""
|
|
34797 |
+
|
|
34798 |
+#: config/dillocfg.c:118
|
|
34799 |
+msgid " Network "
|
|
34800 |
+msgstr ""
|
|
34801 |
+
|
|
34802 |
+#: config/dillocfg.c:120
|
|
34803 |
+msgid " Tab "
|
|
34804 |
+msgstr ""
|
|
34805 |
+
|
|
34806 |
+#: config/dillocfg.c:123
|
|
34807 |
+msgid " Other "
|
|
34808 |
+msgstr ""
|
|
34809 |
+
|
|
34810 |
+#: config/dillocfg.c:331
|
|
34811 |
+msgid "Add"
|
|
34812 |
+msgstr ""
|
|
34813 |
+
|
|
34814 |
+#: config/dillocfg.c:332
|
|
34815 |
+msgid "Delete"
|
|
34816 |
+msgstr ""
|
|
34817 |
+
|
|
34818 |
+#: config/dillocfg.c:338
|
|
34819 |
+msgid "Address"
|
|
34820 |
+msgstr ""
|
|
34821 |
+
|
|
34822 |
+#: config/dillocfg.c:339
|
|
34823 |
+msgid "Rule"
|
|
34824 |
+msgstr ""
|
|
34825 |
+
|
|
34826 |
+#: config/dillocfg.c:365 config/dillocfg.c:371
|
|
34827 |
+#, c-format
|
|
34828 |
+msgid "Read failed <%s>\n"
|
|
34829 |
+msgstr ""
|
|
34830 |
+
|
|
34831 |
+#: config/dillocfg.c:452 config/dillocfg.c:460
|
|
34832 |
+#, c-format
|
|
34833 |
+msgid "can't write <%s>\n"
|
|
34834 |
+msgstr ""
|
|
34835 |
+
|
|
34836 |
+#: config/dillocfg_token.c:60
|
|
34837 |
+msgid "Window Size"
|
|
34838 |
+msgstr ""
|
|
34839 |
+
|
|
34840 |
+#: config/dillocfg_token.c:68
|
|
34841 |
+msgid "HTTP Proxy"
|
|
34842 |
+msgstr ""
|
|
34843 |
+
|
|
34844 |
+#: config/dillocfg_token.c:76
|
|
34845 |
+msgid "HTTP Proxy User"
|
|
34846 |
+msgstr ""
|
|
34847 |
+
|
|
34848 |
+#: config/dillocfg_token.c:84
|
|
34849 |
+msgid "NO Proxy"
|
|
34850 |
+msgstr ""
|
|
34851 |
+
|
|
34852 |
+#: config/dillocfg_token.c:92
|
|
34853 |
+msgid "User-Agent"
|
|
34854 |
+msgstr ""
|
|
34855 |
+
|
|
34856 |
+#: config/dillocfg_token.c:100
|
|
34857 |
+msgid "Send referer header"
|
|
34858 |
+msgstr ""
|
|
34859 |
+
|
|
34860 |
+#: config/dillocfg_token.c:108
|
|
34861 |
+msgid "Link color"
|
|
34862 |
+msgstr ""
|
|
34863 |
+
|
|
34864 |
+#: config/dillocfg_token.c:116
|
|
34865 |
+msgid "Visited color"
|
|
34866 |
+msgstr ""
|
|
34867 |
+
|
|
34868 |
+#: config/dillocfg_token.c:124
|
|
34869 |
+msgid "BackGround color"
|
|
34870 |
+msgstr ""
|
|
34871 |
+
|
|
34872 |
+#: config/dillocfg_token.c:132
|
|
34873 |
+msgid "Allow white bg"
|
|
34874 |
+msgstr ""
|
|
34875 |
+
|
|
34876 |
+#: config/dillocfg_token.c:140
|
|
34877 |
+msgid "Force my colors"
|
|
34878 |
+msgstr ""
|
|
34879 |
+
|
|
34880 |
+#: config/dillocfg_token.c:148
|
|
34881 |
+msgid "Contrast visited color"
|
|
34882 |
+msgstr ""
|
|
34883 |
+
|
|
34884 |
+#: config/dillocfg_token.c:156
|
|
34885 |
+msgid "Text color"
|
|
34886 |
+msgstr ""
|
|
34887 |
+
|
|
34888 |
+#: config/dillocfg_token.c:164
|
|
34889 |
+msgid "Use oblique"
|
|
34890 |
+msgstr ""
|
|
34891 |
+
|
|
34892 |
+#: config/dillocfg_token.c:172
|
|
34893 |
+msgid "Start Page"
|
|
34894 |
+msgstr ""
|
|
34895 |
+
|
|
34896 |
+#: config/dillocfg_token.c:180
|
|
34897 |
+msgid "HOMEPAGE"
|
|
34898 |
+msgstr ""
|
|
34899 |
+
|
|
34900 |
+#: config/dillocfg_token.c:188
|
|
34901 |
+msgid "Search-engine's URL"
|
|
34902 |
+msgstr ""
|
|
34903 |
+
|
|
34904 |
+#: config/dillocfg_token.c:196
|
|
34905 |
+msgid "Search-engine's charset"
|
|
34906 |
+msgstr ""
|
|
34907 |
+
|
|
34908 |
+#: config/dillocfg_token.c:204
|
|
34909 |
+msgid "Show Tooltip"
|
|
34910 |
+msgstr ""
|
|
34911 |
+
|
|
34912 |
+#: config/dillocfg_token.c:212
|
|
34913 |
+msgid "Panel Size"
|
|
34914 |
+msgstr ""
|
|
34915 |
+
|
|
34916 |
+#: config/dillocfg_token.c:220
|
|
34917 |
+msgid "Small icons"
|
|
34918 |
+msgstr ""
|
|
34919 |
+
|
|
34920 |
+#: config/dillocfg_token.c:228
|
|
34921 |
+msgid "Limit text width"
|
|
34922 |
+msgstr ""
|
|
34923 |
+
|
|
34924 |
+#: config/dillocfg_token.c:236
|
|
34925 |
+msgid "Limit font decoration"
|
|
34926 |
+msgstr ""
|
|
34927 |
+
|
|
34928 |
+#: config/dillocfg_token.c:244
|
|
34929 |
+msgid "Font factor"
|
|
34930 |
+msgstr ""
|
|
34931 |
+
|
|
34932 |
+#: config/dillocfg_token.c:252
|
|
34933 |
+msgid "Font Sizes"
|
|
34934 |
+msgstr ""
|
|
34935 |
+
|
|
34936 |
+#: config/dillocfg_token.c:260
|
|
34937 |
+msgid "W3C+heuristics"
|
|
34938 |
+msgstr ""
|
|
34939 |
+
|
|
34940 |
+#: config/dillocfg_token.c:268
|
|
34941 |
+msgid "Use dicache"
|
|
34942 |
+msgstr ""
|
|
34943 |
+
|
|
34944 |
+#: config/dillocfg_token.c:276
|
|
34945 |
+msgid "Show Back"
|
|
34946 |
+msgstr ""
|
|
34947 |
+
|
|
34948 |
+#: config/dillocfg_token.c:284
|
|
34949 |
+msgid "Show Forw"
|
|
34950 |
+msgstr ""
|
|
34951 |
+
|
|
34952 |
+#: config/dillocfg_token.c:292
|
|
34953 |
+msgid "Show Home"
|
|
34954 |
+msgstr ""
|
|
34955 |
+
|
|
34956 |
+#: config/dillocfg_token.c:300
|
|
34957 |
+msgid "Show Reload"
|
|
34958 |
+msgstr ""
|
|
34959 |
+
|
|
34960 |
+#: config/dillocfg_token.c:308
|
|
34961 |
+msgid "Show Save"
|
|
34962 |
+msgstr ""
|
|
34963 |
+
|
|
34964 |
+#: config/dillocfg_token.c:316
|
|
34965 |
+msgid "Show Stop"
|
|
34966 |
+msgstr ""
|
|
34967 |
+
|
|
34968 |
+#: config/dillocfg_token.c:324
|
|
34969 |
+msgid "Show Bookmarks"
|
|
34970 |
+msgstr ""
|
|
34971 |
+
|
|
34972 |
+#: config/dillocfg_token.c:332
|
|
34973 |
+msgid "Show Menubar"
|
|
34974 |
+msgstr ""
|
|
34975 |
+
|
|
34976 |
+#: config/dillocfg_token.c:340
|
|
34977 |
+msgid "Show ClearURL"
|
|
34978 |
+msgstr ""
|
|
34979 |
+
|
|
34980 |
+#: config/dillocfg_token.c:348
|
|
34981 |
+msgid "Show URL box"
|
|
34982 |
+msgstr ""
|
|
34983 |
+
|
|
34984 |
+#: config/dillocfg_token.c:356
|
|
34985 |
+msgid "Show Web Search"
|
|
34986 |
+msgstr ""
|
|
34987 |
+
|
|
34988 |
+#: config/dillocfg_token.c:364
|
|
34989 |
+msgid "Show Progress box"
|
|
34990 |
+msgstr ""
|
|
34991 |
+
|
|
34992 |
+#: config/dillocfg_token.c:372
|
|
34993 |
+msgid "Show Popup navigation"
|
|
34994 |
+msgstr ""
|
|
34995 |
+
|
|
34996 |
+#: config/dillocfg_token.c:380
|
|
34997 |
+msgid "Fullwindow start"
|
|
34998 |
+msgstr ""
|
|
34999 |
+
|
|
35000 |
+#: config/dillocfg_token.c:388
|
|
35001 |
+msgid "Transient dialogs"
|
|
35002 |
+msgstr ""
|
|
35003 |
+
|
|
35004 |
+#: config/dillocfg_token.c:396
|
|
35005 |
+msgid "Popup dialogs"
|
|
35006 |
+msgstr ""
|
|
35007 |
+
|
|
35008 |
+#: config/dillocfg_token.c:404
|
|
35009 |
+msgid "vw_aafontname"
|
|
35010 |
+msgstr ""
|
|
35011 |
+
|
|
35012 |
+#: config/dillocfg_token.c:412
|
|
35013 |
+msgid "fw_aafontname"
|
|
35014 |
+msgstr ""
|
|
35015 |
+
|
|
35016 |
+#: config/dillocfg_token.c:420
|
|
35017 |
+msgid "vw_fontname"
|
|
35018 |
+msgstr ""
|
|
35019 |
+
|
|
35020 |
+#: config/dillocfg_token.c:428
|
|
35021 |
+msgid "fw_fontname"
|
|
35022 |
+msgstr ""
|
|
35023 |
+
|
|
35024 |
+#: config/dillocfg_token.c:436
|
|
35025 |
+msgid "Generate submit"
|
|
35026 |
+msgstr ""
|
|
35027 |
+
|
|
35028 |
+#: config/dillocfg_token.c:444
|
|
35029 |
+msgid "Enterpress forces submit"
|
|
35030 |
+msgstr ""
|
|
35031 |
+
|
|
35032 |
+#: config/dillocfg_token.c:452
|
|
35033 |
+msgid "Show debugging messsages"
|
|
35034 |
+msgstr ""
|
|
35035 |
+
|
|
35036 |
+#: config/dillocfg_token.c:460
|
|
35037 |
+msgid "Show Extra Warnings"
|
|
35038 |
+msgstr ""
|
|
35039 |
+
|
|
35040 |
+#: config/dillocfg_token.c:468
|
|
35041 |
+msgid "Focus location on new"
|
|
35042 |
+msgstr ""
|
|
35043 |
+
|
|
35044 |
+#: config/dillocfg_token.c:476 config/dillocfg_token.c:484
|
|
35045 |
+msgid "Accept Language"
|
|
35046 |
+msgstr ""
|
|
35047 |
+
|
|
35048 |
+#: config/dillocfg_token.c:493
|
|
35049 |
+msgid "Tab load in background"
|
|
35050 |
+msgstr ""
|
|
35051 |
+
|
|
35052 |
+#: config/dillocfg_token.c:501
|
|
35053 |
+msgid "Tab close middle click"
|
|
35054 |
+msgstr ""
|
|
35055 |
+
|
|
35056 |
+#: config/dillocfg_token.c:509
|
|
35057 |
+msgid "Tab instead of window"
|
|
35058 |
+msgstr ""
|
|
35059 |
+
|
|
35060 |
+#: config/dillocfg_token.c:517
|
|
35061 |
+msgid "Tab bar show fullscreen"
|
|
35062 |
+msgstr ""
|
|
35063 |
+
|
|
35064 |
+#: config/dillocfg_token.c:525
|
|
35065 |
+msgid "Tab bar show single tab"
|
|
35066 |
+msgstr ""
|
|
35067 |
+
|
|
35068 |
+#: config/dillocfg_token.c:533
|
|
35069 |
+msgid "Tab bar scroller"
|
|
35070 |
+msgstr ""
|
|
35071 |
+
|
|
35072 |
+#: config/dillocfg_token.c:541
|
|
35073 |
+msgid "Tab bar homogeneous"
|
|
35074 |
+msgstr ""
|
|
35075 |
+
|
|
35076 |
+#: config/dillocfg_token.c:549
|
|
35077 |
+msgid "Tab title compress"
|
|
35078 |
+msgstr ""
|
|
35079 |
+
|
|
35080 |
+#: config/dillocfg_token.c:557
|
|
35081 |
+msgid "Compress vowels"
|
|
35082 |
+msgstr ""
|
|
35083 |
+
|
|
35084 |
+#: config/dillocfg_token.c:565
|
|
35085 |
+msgid "Compress_common_prefixes"
|
|
35086 |
+msgstr ""
|
|
35087 |
+
|
|
35088 |
+#: config/dillocfg_token.c:574
|
|
35089 |
+msgid "Default"
|
|
35090 |
+msgstr ""
|
|
35091 |
diff -pruN dillo-0.8.6/po/en@boldquot.header dillo-0.8.6-i18n-misc-20070916/po/en@boldquot.header
|
|
35092 |
--- dillo-0.8.6/po/en@boldquot.header 1970-01-01 09:00:00.000000000 +0900
|
|
35093 |
+++ dillo-0.8.6-i18n-misc-20070916/po/en@boldquot.header 2006-05-16 01:21:06.000000000 +0900
|
|
35094 |
@@ -0,0 +1,25 @@
|
|
35095 |
+# All this catalog "translates" are quotation characters.
|
|
35096 |
+# The msgids must be ASCII and therefore cannot contain real quotation
|
|
35097 |
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
|
|
35098 |
+# and double quote (0x22). These substitutes look strange; see
|
|
35099 |
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
|
|
35100 |
+#
|
|
35101 |
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
|
|
35102 |
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
|
|
35103 |
+# It also translates pairs of apostrophe (0x27) to
|
|
35104 |
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
|
|
35105 |
+# and pairs of quotation mark (0x22) to
|
|
35106 |
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
|
|
35107 |
+#
|
|
35108 |
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
|
|
35109 |
+# When output to an ISO-8859-1 terminal, the single quotation marks are
|
|
35110 |
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
|
|
35111 |
+# grave/acute accent (by libiconv), and the double quotation marks are
|
|
35112 |
+# transliterated to 0x22.
|
|
35113 |
+# When output to an ASCII terminal, the single quotation marks are
|
|
35114 |
+# transliterated to apostrophes, and the double quotation marks are
|
|
35115 |
+# transliterated to 0x22.
|
|
35116 |
+#
|
|
35117 |
+# This catalog furthermore displays the text between the quotation marks in
|
|
35118 |
+# bold face, assuming the VT100/XTerm escape sequences.
|
|
35119 |
+#
|
|
35120 |
diff -pruN dillo-0.8.6/po/en@quot.header dillo-0.8.6-i18n-misc-20070916/po/en@quot.header
|
|
35121 |
--- dillo-0.8.6/po/en@quot.header 1970-01-01 09:00:00.000000000 +0900
|
|
35122 |
+++ dillo-0.8.6-i18n-misc-20070916/po/en@quot.header 2006-05-16 01:21:06.000000000 +0900
|
|
35123 |
@@ -0,0 +1,22 @@
|
|
35124 |
+# All this catalog "translates" are quotation characters.
|
|
35125 |
+# The msgids must be ASCII and therefore cannot contain real quotation
|
|
35126 |
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
|
|
35127 |
+# and double quote (0x22). These substitutes look strange; see
|
|
35128 |
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
|
|
35129 |
+#
|
|
35130 |
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
|
|
35131 |
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
|
|
35132 |
+# It also translates pairs of apostrophe (0x27) to
|
|
35133 |
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
|
|
35134 |
+# and pairs of quotation mark (0x22) to
|
|
35135 |
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
|
|
35136 |
+#
|
|
35137 |
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
|
|
35138 |
+# When output to an ISO-8859-1 terminal, the single quotation marks are
|
|
35139 |
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
|
|
35140 |
+# grave/acute accent (by libiconv), and the double quotation marks are
|
|
35141 |
+# transliterated to 0x22.
|
|
35142 |
+# When output to an ASCII terminal, the single quotation marks are
|
|
35143 |
+# transliterated to apostrophes, and the double quotation marks are
|
|
35144 |
+# transliterated to 0x22.
|
|
35145 |
+#
|
|
35146 |
diff -pruN dillo-0.8.6/po/insert-header.sin dillo-0.8.6-i18n-misc-20070916/po/insert-header.sin
|
|
35147 |
--- dillo-0.8.6/po/insert-header.sin 1970-01-01 09:00:00.000000000 +0900
|
|
35148 |
+++ dillo-0.8.6-i18n-misc-20070916/po/insert-header.sin 2006-05-16 01:21:06.000000000 +0900
|
|
35149 |
@@ -0,0 +1,23 @@
|
|
35150 |
+# Sed script that inserts the file called HEADER before the header entry.
|
|
35151 |
+#
|
|
35152 |
+# At each occurrence of a line starting with "msgid ", we execute the following
|
|
35153 |
+# commands. At the first occurrence, insert the file. At the following
|
|
35154 |
+# occurrences, do nothing. The distinction between the first and the following
|
|
35155 |
+# occurrences is achieved by looking at the hold space.
|
|
35156 |
+/^msgid /{
|
|
35157 |
+x
|
|
35158 |
+# Test if the hold space is empty.
|
|
35159 |
+s/m/m/
|
|
35160 |
+ta
|
|
35161 |
+# Yes it was empty. First occurrence. Read the file.
|
|
35162 |
+r HEADER
|
|
35163 |
+# Output the file's contents by reading the next line. But don't lose the
|
|
35164 |
+# current line while doing this.
|
|
35165 |
+g
|
|
35166 |
+N
|
|
35167 |
+bb
|
|
35168 |
+:a
|
|
35169 |
+# The hold space was nonempty. Following occurrences. Do nothing.
|
|
35170 |
+x
|
|
35171 |
+:b
|
|
35172 |
+}
|
|
35173 |
バイナリー・ファイルdillo-0.8.6/po/ja.gmoとdillo-0.8.6-i18n-misc-20070916/po/ja.gmoは違います
|
|
35174 |
diff -pruN dillo-0.8.6/po/ja.po dillo-0.8.6-i18n-misc-20070916/po/ja.po
|
|
35175 |
--- dillo-0.8.6/po/ja.po 1970-01-01 09:00:00.000000000 +0900
|
|
35176 |
+++ dillo-0.8.6-i18n-misc-20070916/po/ja.po 2007-09-09 15:48:36.000000000 +0900
|
|
35177 |
@@ -0,0 +1,2238 @@
|
|
35178 |
+# DILLO 日本語メッセージ
|
|
35179 |
+# Copyright (C) 2003-2006
|
|
35180 |
+# This file is distributed under the same license as the dillo package.
|
|
35181 |
+# Kiyo <kiyo@teki.jpn.ph>, 2003-2006.
|
|
35182 |
+msgid ""
|
|
35183 |
+msgstr ""
|
|
35184 |
+"Project-Id-Version: dillo 0.8.6-i18n-misc\n"
|
|
35185 |
+"Report-Msgid-Bugs-To: \n"
|
|
35186 |
+"POT-Creation-Date: 2007-09-09 15:45+0900\n"
|
|
35187 |
+"PO-Revision-Date: 2006-03-26 22:06+0900\n"
|
|
35188 |
+"Last-Translator: Kiyo <kiyo@teki.jpn.ph>\n"
|
|
35189 |
+"Language-Team: Japanese <kiyo@teki.jpn.ph>\n"
|
|
35190 |
+"MIME-Version: 1.0\n"
|
|
35191 |
+"Content-Type: text/plain; charset=UTF-8\n"
|
|
35192 |
+"Content-Transfer-Encoding: 8bit\n"
|
|
35193 |
+
|
|
35194 |
+#: src/msg.h:27
|
|
35195 |
+msgid "HTTP warning: "
|
|
35196 |
+msgstr "HTTP 警告: "
|
|
35197 |
+
|
|
35198 |
+#: src/auth.c:87
|
|
35199 |
+msgid "Browser Url has changed\n"
|
|
35200 |
+msgstr "ブラウザのUrlが変更されていました\n"
|
|
35201 |
+
|
|
35202 |
+#: src/cache.c:253
|
|
35203 |
+msgid "WARNING: Cache_entry_add, leaking an entry.\n"
|
|
35204 |
+msgstr "警告: Cache_entry_addでエントリーが漏れています。\n"
|
|
35205 |
+
|
|
35206 |
+#: src/cache.c:316
|
|
35207 |
+msgid "## Aborting CCCQuery\n"
|
|
35208 |
+msgstr "## CCCQueryをアボートしています\n"
|
|
35209 |
+
|
|
35210 |
+#: src/cache.c:319
|
|
35211 |
+msgid "## Aborting CCCAnswer\n"
|
|
35212 |
+msgstr "## CCCAnswerをアボートしています\n"
|
|
35213 |
+
|
|
35214 |
+#: src/cache.c:322
|
|
35215 |
+msgid "## Aborting raw2\n"
|
|
35216 |
+msgstr "## raw2をアボートしています\n"
|
|
35217 |
+
|
|
35218 |
+#: src/cache.c:365
|
|
35219 |
+msgid "## No more clients for this entry\n"
|
|
35220 |
+msgstr "## このエントリーにはクライアントがありません\n"
|
|
35221 |
+
|
|
35222 |
+#: src/cache.c:369
|
|
35223 |
+msgid "Cache_prepare_reload: ERROR, entry still has clients\n"
|
|
35224 |
+msgstr ""
|
|
35225 |
+"Cache_prepare_reload: エラー エントリーがまだクライアントを持っています\n"
|
|
35226 |
+
|
|
35227 |
+#: src/cache.c:398
|
|
35228 |
+#, c-format
|
|
35229 |
+msgid "Reloading >%s< because it shouldn't be cached\n"
|
|
35230 |
+msgstr "キャッシュされるべきではないので>%s<を再読み込みしています\n"
|
|
35231 |
+
|
|
35232 |
+#: src/cache.c:418
|
|
35233 |
+msgid "ERROR: unsupported protocol"
|
|
35234 |
+msgstr "エラー: サポートしていないプロトコルです"
|
|
35235 |
+
|
|
35236 |
+#: src/cache.c:488
|
|
35237 |
+#, c-format
|
|
35238 |
+msgid "Redirect loop for URL: >%s<\n"
|
|
35239 |
+msgstr "URL: >%s<のリダイレクトループ\n"
|
|
35240 |
+
|
|
35241 |
+#: src/cache.c:590
|
|
35242 |
+#, c-format
|
|
35243 |
+msgid "Bad clocks, ignore expire on >%s<\n"
|
|
35244 |
+msgstr "不正な時間です。>%s<の有効期限を無視します\n"
|
|
35245 |
+
|
|
35246 |
+#: src/cache.c:594
|
|
35247 |
+#, c-format
|
|
35248 |
+msgid "Forcing min expire %d on >%s< instead %ld\n"
|
|
35249 |
+msgstr "最小有効期限%dを>%s<で%ldの代わりに強制します\n"
|
|
35250 |
+
|
|
35251 |
+#: src/cache.c:678
|
|
35252 |
+msgid "'Cache-Control: max-age=' without 'Date: ' header"
|
|
35253 |
+msgstr "'Date: 'ヘッダの無い'Cache-Control: max-age='"
|
|
35254 |
+
|
|
35255 |
+#: src/cache.c:722
|
|
35256 |
+msgid "Server didn't send Content-Type in header.\n"
|
|
35257 |
+msgstr "サーバーがヘッダでContent-Typeを送信しませんでした。\n"
|
|
35258 |
+
|
|
35259 |
+#: src/cache.c:743
|
|
35260 |
+#, c-format
|
|
35261 |
+msgid "Forcing default expire to query url >%s<\n"
|
|
35262 |
+msgstr "要求されたurl>%s<にデフォルトの有効期限を強制します\n"
|
|
35263 |
+
|
|
35264 |
+#: src/cache.c:831
|
|
35265 |
+#, c-format
|
|
35266 |
+msgid "Cache_decode_data: got all data -- decodinging %s\n"
|
|
35267 |
+msgstr ""
|
|
35268 |
+"Cache_decode_data: 全てのデータを取得しました -- %sをデコードしています\n"
|
|
35269 |
+
|
|
35270 |
+#: src/cache.c:840
|
|
35271 |
+msgid "Cache_decode_data: not gzip data!\n"
|
|
35272 |
+msgstr "Cache_decode_data: gzipデータではありません!\n"
|
|
35273 |
+
|
|
35274 |
+#: src/cache.c:846
|
|
35275 |
+msgid "Cache_decode_data: invalid gzip data!\n"
|
|
35276 |
+msgstr "Cache_decode_data: 不正なgzipデータです!\n"
|
|
35277 |
+
|
|
35278 |
+#: src/cache.c:898
|
|
35279 |
+msgid "not x-gzip\n"
|
|
35280 |
+msgstr "x-gzipではありません\n"
|
|
35281 |
+
|
|
35282 |
+#: src/cache.c:931
|
|
35283 |
+#, c-format
|
|
35284 |
+msgid ""
|
|
35285 |
+"Content-Length does NOT match message body,\n"
|
|
35286 |
+" at: %s\n"
|
|
35287 |
+msgstr ""
|
|
35288 |
+"Content-Lengthがmessage bodyと適合しませんでした。\n"
|
|
35289 |
+": %s\n"
|
|
35290 |
+
|
|
35291 |
+#: src/cache.c:950
|
|
35292 |
+msgid "Cache_process_io Op = IOAbort; not implemented yet\n"
|
|
35293 |
+msgstr "Cache_process_io Op = IOAbort; まだ実装されていません\n"
|
|
35294 |
+
|
|
35295 |
+#: src/cache.c:1004
|
|
35296 |
+#, c-format
|
|
35297 |
+msgid "ERROR: redirect loop for: %s"
|
|
35298 |
+msgstr "エラー: %sのリダイレクトループ"
|
|
35299 |
+
|
|
35300 |
+#: src/cache.c:1015
|
|
35301 |
+#, c-format
|
|
35302 |
+msgid ""
|
|
35303 |
+">>>Redirect from: %s\n"
|
|
35304 |
+" to %s\n"
|
|
35305 |
+msgstr ""
|
|
35306 |
+">>>%sから\n"
|
|
35307 |
+"%sへリダイレクトします\n"
|
|
35308 |
+
|
|
35309 |
+#: src/cache.c:1035
|
|
35310 |
+msgid ">>>Image redirection without entity-content<<<\n"
|
|
35311 |
+msgstr ">>>entity-contentのない画像のリダイレクト<<<\n"
|
|
35312 |
+
|
|
35313 |
+#: src/cache.c:1037
|
|
35314 |
+msgid ">>>Image redirection with entity-content<<<\n"
|
|
35315 |
+msgstr ">>>entity-contentのある画像のリダイレクト<<<\n"
|
|
35316 |
+
|
|
35317 |
+#: src/cache.c:1103
|
|
35318 |
+msgid "FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n"
|
|
35319 |
+msgstr "致命的!:*** >>>> Cache_process_queueはビジーを検出しました!!!\n"
|
|
35320 |
+
|
|
35321 |
+#: src/cache.c:1111
|
|
35322 |
+#, c-format
|
|
35323 |
+msgid "Content-Type '%s' doesn't match the real data.\n"
|
|
35324 |
+msgstr "Content-Type '%s'は実際のデータとマッチしていません。\n"
|
|
35325 |
+
|
|
35326 |
+#: src/cache.c:1140
|
|
35327 |
+#, c-format
|
|
35328 |
+msgid "HTTP warning: Content-Type '%s' doesn't match the real data."
|
|
35329 |
+msgstr "HTTP警告: Content-Type '%s'は実際のデータとマッチしていません。"
|
|
35330 |
+
|
|
35331 |
+#: src/cache.c:1177
|
|
35332 |
+#, c-format
|
|
35333 |
+msgid "Unhandled MIME type: <%s>\n"
|
|
35334 |
+msgstr "扱えないMIMEタイプ: <%s>\n"
|
|
35335 |
+
|
|
35336 |
+#: src/cache.c:1202
|
|
35337 |
+msgid "Client Callback is NULL"
|
|
35338 |
+msgstr "クライアントのコールバックがNULLです"
|
|
35339 |
+
|
|
35340 |
+#: src/cache.c:1303
|
|
35341 |
+msgid "WARNING: Cache_stop_client, inexistent client\n"
|
|
35342 |
+msgstr "警告: Cache_stop_client クライアントが存在しません\n"
|
|
35343 |
+
|
|
35344 |
+#: src/cache.c:1445 src/capi.c:428 src/capi.c:481 src/capi.c:536
|
|
35345 |
+#: src/capi.c:570 src/IO/dpi.c:720 src/IO/dpi.c:760
|
|
35346 |
+msgid " Not implemented\n"
|
|
35347 |
+msgstr "すみません、まだ実装されていません。\n"
|
|
35348 |
+
|
|
35349 |
+#: src/capi.c:229
|
|
35350 |
+msgid "Capi_verify_dpi_url_request: Permission Denied!\n"
|
|
35351 |
+msgstr "Capi_verify_dpi_url_request: 許可がありません!\n"
|
|
35352 |
+
|
|
35353 |
+#: src/capi.c:324
|
|
35354 |
+#, c-format
|
|
35355 |
+msgid " reload=%d URL_E2EReload=%d\n"
|
|
35356 |
+msgstr " reload=%d URL_E2EReload=%d\n"
|
|
35357 |
+
|
|
35358 |
+#: src/capi.c:389
|
|
35359 |
+msgid " ERROR: [a_Capi_dpi_send_cmd] No open connection found\n"
|
|
35360 |
+msgstr " エラー: [a_Capi_dpi_send_cmd] 開いている接続が見つかりませんでした\n"
|
|
35361 |
+
|
|
35362 |
+#: src/capi.c:457
|
|
35363 |
+msgid "ERROR: can't start dpid daemon!"
|
|
35364 |
+msgstr "エラー: dpidデーモンを開始できません"
|
|
35365 |
+
|
|
35366 |
+#: src/capi.c:492
|
|
35367 |
+msgid " ** Capi 2F catched an invalid 'web' structure\n"
|
|
35368 |
+msgstr " ** Capi 2F 無効な'web'構造体をキャッチしました\n"
|
|
35369 |
+
|
|
35370 |
+#: src/capi.c:552
|
|
35371 |
+msgid " Error with pipe\n"
|
|
35372 |
+msgstr "pipeでエラーが発生しました\n"
|
|
35373 |
+
|
|
35374 |
+#: src/commands.c:166
|
|
35375 |
+msgid "View Source"
|
|
35376 |
+msgstr "ソースの表示"
|
|
35377 |
+
|
|
35378 |
+#: src/commands.c:183
|
|
35379 |
+msgid "Detected HTML errors"
|
|
35380 |
+msgstr "検出されたHTMLのエラー"
|
|
35381 |
+
|
|
35382 |
+#: src/commands.c:265
|
|
35383 |
+msgid "Stopped"
|
|
35384 |
+msgstr "停止しました。"
|
|
35385 |
+
|
|
35386 |
+#: src/dillo.c:109
|
|
35387 |
+msgid ""
|
|
35388 |
+" -x, --xid XID Open first Dillo window in an existing\n"
|
|
35389 |
+" GtkSocket which window ID is XID (decimal)."
|
|
35390 |
+msgstr ""
|
|
35391 |
+" -x, --xid XID window IDがXID(十進数)である既存のGtkSocketで\n"
|
|
35392 |
+" 最初のDilloのwindowを開きます。"
|
|
35393 |
+
|
|
35394 |
+#: src/dillo.c:112
|
|
35395 |
+msgid " -v, --version Display version info and exit."
|
|
35396 |
+msgstr " -v, --version バージョン情報を表示して終了します。"
|
|
35397 |
+
|
|
35398 |
+#: src/dillo.c:114
|
|
35399 |
+msgid " -h, --help Display this help text and exit."
|
|
35400 |
+msgstr " -h, --help このヘルプテキストを表示して終了します。"
|
|
35401 |
+
|
|
35402 |
+#: src/dillo.c:116
|
|
35403 |
+msgid ""
|
|
35404 |
+" -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
35405 |
+" navigation buttons, menu, and status bar."
|
|
35406 |
+msgstr ""
|
|
35407 |
+" -f, --fullwindow 全画面モードで開始: アドレスバー、\n"
|
|
35408 |
+" ナビゲーションボタン、メニュー、ステータスバーが非表"
|
|
35409 |
+"示になります。"
|
|
35410 |
+
|
|
35411 |
+#: src/dillo.c:119
|
|
35412 |
+msgid " -l, --local Don't follow links for this URL(s)."
|
|
35413 |
+msgstr " -l, --local このURLでリンクをたどりません"
|
|
35414 |
+
|
|
35415 |
+#: src/dillo.c:121
|
|
35416 |
+msgid ""
|
|
35417 |
+" -g, -geometry GEO Set initial window position where GEO is\n"
|
|
35418 |
+" <width>x<height>{+-}<x>{+-}<y>"
|
|
35419 |
+msgstr ""
|
|
35420 |
+" -g, -geometry GEO 初期ウインドウの位置をGEOに設定します。\n"
|
|
35421 |
+" <width>x<height>{+-}<x>{+-}<y>"
|
|
35422 |
+
|
|
35423 |
+#: src/dillo.c:125
|
|
35424 |
+msgid ""
|
|
35425 |
+" -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
35426 |
+" representing its structure. For debugging. "
|
|
35427 |
+msgstr ""
|
|
35428 |
+" -D, --debug-rendering WEBページの中にその構造を表すように、\n"
|
|
35429 |
+" いくつかの線を追加で描画します。 デバッグ用です。 "
|
|
35430 |
+
|
|
35431 |
+#: src/dillo.c:129
|
|
35432 |
+msgid " -R, --rcfile FILE Use alternative rcfile."
|
|
35433 |
+msgstr " -R, --rcfile FILE 代わりの設定ファイルを使用します。"
|
|
35434 |
+
|
|
35435 |
+#: src/dillo.c:266
|
|
35436 |
+#, c-format
|
|
35437 |
+msgid ""
|
|
35438 |
+"Error: the XID must be an unsigned decimal numerical value.\n"
|
|
35439 |
+"The offending value was: %s\n"
|
|
35440 |
+msgstr ""
|
|
35441 |
+"エラー: XIDは符号無しの十進数である必要があります。\n"
|
|
35442 |
+"問題となった値: %s\n"
|
|
35443 |
+
|
|
35444 |
+#: src/dillo.c:284
|
|
35445 |
+msgid "Error in command line options.\n"
|
|
35446 |
+msgstr "コマンドラインオプションでエラーが起きました。\n"
|
|
35447 |
+
|
|
35448 |
+#: src/dillo.c:291
|
|
35449 |
+#, c-format
|
|
35450 |
+msgid "Setting gtk charset to %s...\n"
|
|
35451 |
+msgstr "gtk charsetを%sに設定しています...\n"
|
|
35452 |
+
|
|
35453 |
+#: src/dillo.c:395
|
|
35454 |
+msgid "Dillo: normal exit!\n"
|
|
35455 |
+msgstr "Dillo: 正常終了\n"
|
|
35456 |
+
|
|
35457 |
+#: src/dillo.c:409
|
|
35458 |
+#, c-format
|
|
35459 |
+msgid "Dillo: error creating directory %s: %s\n"
|
|
35460 |
+msgstr "Dillo: ディレクトリ%sの作成でエラーしました: %s\n"
|
|
35461 |
+
|
|
35462 |
+#: src/dillo.c:412
|
|
35463 |
+#, c-format
|
|
35464 |
+msgid "Dillo: error reading %s: %s\n"
|
|
35465 |
+msgstr "Dillo: %sの読み込みでエラーしました: %s\n"
|
|
35466 |
+
|
|
35467 |
+#: src/dillo.c:461
|
|
35468 |
+#, c-format
|
|
35469 |
+msgid "Option %s requires %d argument(s)\n"
|
|
35470 |
+msgstr "オプション %sは%d個の引数を必要とします\n"
|
|
35471 |
+
|
|
35472 |
+#: src/dillo.c:496
|
|
35473 |
+msgid ""
|
|
35474 |
+"\n"
|
|
35475 |
+"Usage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
35476 |
+"Options:\n"
|
|
35477 |
+msgstr ""
|
|
35478 |
+"\n"
|
|
35479 |
+"使い方: dillo [オプション] [URL|ファイル]...\n"
|
|
35480 |
+"オプション:\n"
|
|
35481 |
+
|
|
35482 |
+#: src/dillo.c:503
|
|
35483 |
+#, c-format
|
|
35484 |
+msgid " %s, %s *Undocumented*\n"
|
|
35485 |
+msgstr " %s, %s (説明なし)\n"
|
|
35486 |
+
|
|
35487 |
+#: src/dillo.c:506
|
|
35488 |
+msgid ""
|
|
35489 |
+" URL URL to browse.\n"
|
|
35490 |
+" FILE Local FILE to view.\n"
|
|
35491 |
+msgstr ""
|
|
35492 |
+" URL ブラウズするURL\n"
|
|
35493 |
+" FILE 表示するローカルファイル\n"
|
|
35494 |
+
|
|
35495 |
+#: src/html.c:182
|
|
35496 |
+#, c-format
|
|
35497 |
+msgid "HTML warning: line %d, "
|
|
35498 |
+msgstr "HTML 警告: %d行目, "
|
|
35499 |
+
|
|
35500 |
+#: src/html.c:212
|
|
35501 |
+#, c-format
|
|
35502 |
+msgid "URL has %d illegal character [%d space]\n"
|
|
35503 |
+msgstr "URLに%d個の不正な文字 [%d個のスペース]が含まれています\n"
|
|
35504 |
+
|
|
35505 |
+#: src/html.c:213
|
|
35506 |
+#, c-format
|
|
35507 |
+msgid "URL has %d illegal characters [%d spaces]\n"
|
|
35508 |
+msgstr "URLに%d個の不正な文字 [%d個のスペース]が含まれています\n"
|
|
35509 |
+
|
|
35510 |
+#: src/html.c:216
|
|
35511 |
+#, c-format
|
|
35512 |
+msgid "URL has %d illegal character [%d in (00-1F or 7F)]\n"
|
|
35513 |
+msgstr "URLに%d個の不正な文字[%d個の(00-1Fまたは7F)]が含まれています\n"
|
|
35514 |
+
|
|
35515 |
+#: src/html.c:218
|
|
35516 |
+#, c-format
|
|
35517 |
+msgid "URL has %d illegal characters [%d in (00-1F or 7F)]\n"
|
|
35518 |
+msgstr "URLに%d個の不正な文字[%d個の(00-1Fまたは7F)]が含まれています\n"
|
|
35519 |
+
|
|
35520 |
+#: src/html.c:222
|
|
35521 |
+#, c-format
|
|
35522 |
+msgid "URL has %d illegal character [%d space and %d in (00-1F or 7F)]\n"
|
|
35523 |
+msgstr ""
|
|
35524 |
+"URLに%d個の不正な文字 [%d個のスペースと%d個の(00-1F, 7F)]が含まれています\n"
|
|
35525 |
+
|
|
35526 |
+#: src/html.c:224
|
|
35527 |
+#, c-format
|
|
35528 |
+msgid "URL has %d illegal characters [%d space and %d in (00-1F or 7F)]\n"
|
|
35529 |
+msgstr ""
|
|
35530 |
+"URLに%d個の不正な文字 [%d個のスペースと%d個の(00-1F, 7F)]が含まれています\n"
|
|
35531 |
+
|
|
35532 |
+#: src/html.c:228
|
|
35533 |
+#, c-format
|
|
35534 |
+msgid "URL has %d illegal character [%d spaces and %d in (00-1F or 7F)]\n"
|
|
35535 |
+msgstr ""
|
|
35536 |
+"URLに%d個の不正な文字 [%d個のスペースと%d個の(00-1F, 7F)]が含まれています\n"
|
|
35537 |
+
|
|
35538 |
+#: src/html.c:230
|
|
35539 |
+#, c-format
|
|
35540 |
+msgid "URL has %d illegal characters [%d spaces and %d in (00-1F or 7F)]\n"
|
|
35541 |
+msgstr ""
|
|
35542 |
+"URLに%d個の不正な文字 [%d個のスペースと%d個の(00-1F, 7F)]が含まれています\n"
|
|
35543 |
+
|
|
35544 |
+#: src/html.c:1237
|
|
35545 |
+msgid "numeric character reference out of range\n"
|
|
35546 |
+msgstr "数値文字参照が範囲外です\n"
|
|
35547 |
+
|
|
35548 |
+#: src/html.c:1245
|
|
35549 |
+msgid "numeric character reference without trailing ';'\n"
|
|
35550 |
+msgstr "後に';'が無い数値文字参照です\n"
|
|
35551 |
+
|
|
35552 |
+#: src/html.c:1257
|
|
35553 |
+#, c-format
|
|
35554 |
+msgid "undefined character entity '%s'\n"
|
|
35555 |
+msgstr "未定義の文字参照 '%s'\n"
|
|
35556 |
+
|
|
35557 |
+#: src/html.c:1265
|
|
35558 |
+msgid "character entity reference without trailing ';'\n"
|
|
35559 |
+msgstr "後に';'が無い文字実体参照です\n"
|
|
35560 |
+
|
|
35561 |
+#: src/html.c:1273
|
|
35562 |
+msgid "code positions 128-159 are not defined for ISO Latin-1\n"
|
|
35563 |
+msgstr "コードポイント 128-159はISO Latin-1で定義されていません\n"
|
|
35564 |
+
|
|
35565 |
+#: src/html.c:1281
|
|
35566 |
+msgid "literal '&'\n"
|
|
35567 |
+msgstr "リテラル '&'\n"
|
|
35568 |
+
|
|
35569 |
+#: src/html.c:1390
|
|
35570 |
+msgid "TAB character inside <PRE>\n"
|
|
35571 |
+msgstr "TAB文字が<PRE>の中にあります\n"
|
|
35572 |
+
|
|
35573 |
+#: src/html.c:1626
|
|
35574 |
+#, c-format
|
|
35575 |
+msgid " - forcing close of open tag: <%s>\n"
|
|
35576 |
+msgstr " - 開始タグに終了タグを強制します: <%s>\n"
|
|
35577 |
+
|
|
35578 |
+#: src/html.c:1635
|
|
35579 |
+#, c-format
|
|
35580 |
+msgid "unexpected closing tag: </%1$s>. -- expected </%2$s>\n"
|
|
35581 |
+msgstr "予期しない終了タグ: </%1$s> -- 予期されていたのは</%2$s>です\n"
|
|
35582 |
+
|
|
35583 |
+#: src/html.c:1707
|
|
35584 |
+#, c-format
|
|
35585 |
+msgid "Garbage after length: %s\n"
|
|
35586 |
+msgstr "長さ%s以降に不用なデータ\n"
|
|
35587 |
+
|
|
35588 |
+#: src/html.c:1726
|
|
35589 |
+msgid "color is not in \"#RRGGBB\" format\n"
|
|
35590 |
+msgstr "colorが\"#RRGGBB\"の型式ではありません\n"
|
|
35591 |
+
|
|
35592 |
+#: src/html.c:1746
|
|
35593 |
+#, c-format
|
|
35594 |
+msgid "'%s' value is not of the form [A-Za-z][A-Za-z0-9:_.-]*\n"
|
|
35595 |
+msgstr "値'%s'は[A-Za-z][A-Za-z0-9:_.-]*の形式ではありません\n"
|
|
35596 |
+
|
|
35597 |
+#: src/html.c:1850
|
|
35598 |
+msgid "HTML element was already open\n"
|
|
35599 |
+msgstr "HTML要素は既に開いています\n"
|
|
35600 |
+
|
|
35601 |
+#: src/html.c:1877
|
|
35602 |
+msgid "HEAD element must go before the BODY section\n"
|
|
35603 |
+msgstr "BASE要素はHEADセクションに現われるべきです。\n"
|
|
35604 |
+
|
|
35605 |
+#: src/html.c:1887
|
|
35606 |
+msgid "HEAD element was already open\n"
|
|
35607 |
+msgstr "HEAD要素は既に開いています\n"
|
|
35608 |
+
|
|
35609 |
+#: src/html.c:1900
|
|
35610 |
+msgid "HEAD section lacks the TITLE element\n"
|
|
35611 |
+msgstr "HEADセクションにTITLE要素が欠けています\n"
|
|
35612 |
+
|
|
35613 |
+#: src/html.c:1928
|
|
35614 |
+msgid "the TITLE element must be inside the HEAD section\n"
|
|
35615 |
+msgstr "TITLE要素はHEADセクションに現われるべきです。\n"
|
|
35616 |
+
|
|
35617 |
+#: src/html.c:1997
|
|
35618 |
+msgid "BODY element was already open\n"
|
|
35619 |
+msgstr "BODY要素は既に開いています\n"
|
|
35620 |
+
|
|
35621 |
+#: src/html.c:2002
|
|
35622 |
+msgid "unclosed HEAD element\n"
|
|
35623 |
+msgstr "閉じられなかったHEAD要素\n"
|
|
35624 |
+
|
|
35625 |
+#: src/html.c:2198
|
|
35626 |
+msgid "<td> or <th> outside <table>\n"
|
|
35627 |
+msgstr "<td>または<th>が<table>の外側にあります\n"
|
|
35628 |
+
|
|
35629 |
+#: src/html.c:2202
|
|
35630 |
+msgid "<td> or <th> outside <tr>\n"
|
|
35631 |
+msgstr "<td>または<th>が<tr>の外側にあります\n"
|
|
35632 |
+
|
|
35633 |
+#: src/html.c:2320
|
|
35634 |
+msgid "Invalid HTML syntax: <tr> outside <table>\n"
|
|
35635 |
+msgstr "不正なHTML構文: <tr>が<table>の外側にあります\n"
|
|
35636 |
+
|
|
35637 |
+#: src/html.c:2378
|
|
35638 |
+msgid "<noframes> outside of <frameset>!!!\n"
|
|
35639 |
+msgstr "<noframes>が<frameset>の外側にあります!!!\n"
|
|
35640 |
+
|
|
35641 |
+#: src/html.c:2386
|
|
35642 |
+msgid "<noframe> is illegal tag !!! use <noframes>.\n"
|
|
35643 |
+msgstr "<noframe>は不正なタグです!!! <noframes>を使用してください\n"
|
|
35644 |
+
|
|
35645 |
+#: src/html.c:2573
|
|
35646 |
+msgid "<frame> outside of <frameset>\n"
|
|
35647 |
+msgstr "<frame>が<frameset>の外側にあります\n"
|
|
35648 |
+
|
|
35649 |
+#: src/html.c:2576
|
|
35650 |
+msgid "<frame> inside of <noframes>\n"
|
|
35651 |
+msgstr "<frame>が<noframes>の内側にあります\n"
|
|
35652 |
+
|
|
35653 |
+#: src/html.c:2579
|
|
35654 |
+msgid "<frame> inside of <iframe>\n"
|
|
35655 |
+msgstr "<frame>が<iframe>の内側にあります\n"
|
|
35656 |
+
|
|
35657 |
+#: src/html.c:2631
|
|
35658 |
+msgid "incorrectly placed <frameset>\n"
|
|
35659 |
+msgstr "<frameset>が誤った場所にあります\n"
|
|
35660 |
+
|
|
35661 |
+#: src/html.c:2647
|
|
35662 |
+msgid "<frameset> inside of <noframes>\n"
|
|
35663 |
+msgstr "<frameset>が<noframes>の内側にあります\n"
|
|
35664 |
+
|
|
35665 |
+#: src/html.c:2652
|
|
35666 |
+msgid "<frameset> inside of <iframe>\n"
|
|
35667 |
+msgstr "<frameset>が<iframe>の内側にあります\n"
|
|
35668 |
+
|
|
35669 |
+#: src/html.c:3134
|
|
35670 |
+msgid " Html_tag_open_img: server-side map (ISMAP)\n"
|
|
35671 |
+msgstr " Html_tag_open_img: server-side map (ISMAP)\n"
|
|
35672 |
+
|
|
35673 |
+#: src/html.c:3160
|
|
35674 |
+msgid "nested <map>\n"
|
|
35675 |
+msgstr "<map>がネストされています\n"
|
|
35676 |
+
|
|
35677 |
+#: src/html.c:3212
|
|
35678 |
+msgid "usemap coords MUST be separated with ','\n"
|
|
35679 |
+msgstr "usemapコードは','で区切られていなければなりません\n"
|
|
35680 |
+
|
|
35681 |
+#: src/html.c:3256
|
|
35682 |
+msgid "nohref"
|
|
35683 |
+msgstr "nohref"
|
|
35684 |
+
|
|
35685 |
+#: src/html.c:3295
|
|
35686 |
+msgid "link depends on javascript()\n"
|
|
35687 |
+msgstr "リンクがjavascript()に依存しています。\n"
|
|
35688 |
+
|
|
35689 |
+#: src/html.c:3311
|
|
35690 |
+#, c-format
|
|
35691 |
+msgid "Registering ANCHOR: %s\n"
|
|
35692 |
+msgstr "ANCHORを登録しています: %s\n"
|
|
35693 |
+
|
|
35694 |
+#: src/html.c:3316
|
|
35695 |
+msgid "Anchor names must be unique within the document\n"
|
|
35696 |
+msgstr "アンカー名は文書内で固有でなければいけません\n"
|
|
35697 |
+
|
|
35698 |
+#: src/html.c:3523
|
|
35699 |
+msgid "it is strongly recommended using <UL> instead of <MENU>\n"
|
|
35700 |
+msgstr "<MENU>の代りに<UL>を使うことが強く推奨されています\n"
|
|
35701 |
+
|
|
35702 |
+#: src/html.c:3585
|
|
35703 |
+msgid "<li> outside <ul> or <ol>\n"
|
|
35704 |
+msgstr "<li>が<ul>または<ol>の外側にあります\n"
|
|
35705 |
+
|
|
35706 |
+#: src/html.c:3781
|
|
35707 |
+msgid "nested forms\n"
|
|
35708 |
+msgstr "formsがネストされています\n"
|
|
35709 |
+
|
|
35710 |
+#: src/html.c:3828
|
|
35711 |
+msgid "FORM lacks a Submit button\n"
|
|
35712 |
+msgstr "FORMにSubmitボタンが欠けています\n"
|
|
35713 |
+
|
|
35714 |
+#: src/html.c:3830
|
|
35715 |
+msgid " (added a submit button internally)\n"
|
|
35716 |
+msgstr " (submitボタンを内部で追加しました)\n"
|
|
35717 |
+
|
|
35718 |
+#: src/html.c:3934
|
|
35719 |
+msgid "META elements must be inside the HEAD section\n"
|
|
35720 |
+msgstr "META要素はHEADセクションに現われるべきです。\n"
|
|
35721 |
+
|
|
35722 |
+#: src/html.c:3986
|
|
35723 |
+#, c-format
|
|
35724 |
+msgid ""
|
|
35725 |
+"The NON-STANDARD meta refresh tag. The HTML 4.01 SPEC (sec 7.4.4) recommends "
|
|
35726 |
+"explicitly to avoid it. The author wanted you to go <%s>\n"
|
|
35727 |
+msgstr ""
|
|
35728 |
+"非標準のmeta refreshタグです。HTML4.01SPEC(sec 7.4.4)ではこれを回避することを"
|
|
35729 |
+"はっきりと推奨しています。(このページの)著者は<%s>に行くことを望んでいまし"
|
|
35730 |
+"た。\n"
|
|
35731 |
+
|
|
35732 |
+#: src/html.c:4356
|
|
35733 |
+msgid "Html_submit_form: Method unknown\n"
|
|
35734 |
+msgstr "Html_submit_form: 不明なメソッドです\n"
|
|
35735 |
+
|
|
35736 |
+#: src/html.c:4438
|
|
35737 |
+msgid "Html_input_image: unable to create image submit.\n"
|
|
35738 |
+msgstr "Html_input_image: 画像送信ボタンを生成できません。\n"
|
|
35739 |
+
|
|
35740 |
+#: src/html.c:4460
|
|
35741 |
+msgid "input camp outside <form>\n"
|
|
35742 |
+msgstr "inputの場所が<form>の外側にあります\n"
|
|
35743 |
+
|
|
35744 |
+#: src/html.c:4540
|
|
35745 |
+msgid "submit"
|
|
35746 |
+msgstr "送信"
|
|
35747 |
+
|
|
35748 |
+#: src/html.c:4547 config/dillocfg.c:81
|
|
35749 |
+msgid "Reset"
|
|
35750 |
+msgstr "リセット"
|
|
35751 |
+
|
|
35752 |
+#: src/html.c:4557
|
|
35753 |
+msgid "Submit"
|
|
35754 |
+msgstr "送信"
|
|
35755 |
+
|
|
35756 |
+#: src/html.c:4574
|
|
35757 |
+msgid "An input of the type \"file\" wasn't rendered!\n"
|
|
35758 |
+msgstr "inputタイプ\"file\"はレンダリングされませんでした。\n"
|
|
35759 |
+
|
|
35760 |
+#: src/html.c:4748
|
|
35761 |
+msgid "<textarea> outside <form>\n"
|
|
35762 |
+msgstr "<textarea>が<form>の外側にあります\n"
|
|
35763 |
+
|
|
35764 |
+#: src/html.c:4753
|
|
35765 |
+msgid "nested <textarea>\n"
|
|
35766 |
+msgstr "<textarea>がネストされています\n"
|
|
35767 |
+
|
|
35768 |
+#: src/html.c:4825
|
|
35769 |
+msgid "<select> outside <form>\n"
|
|
35770 |
+msgstr "<select>が<form>の外側にあります\n"
|
|
35771 |
+
|
|
35772 |
+#: src/html.c:4829
|
|
35773 |
+msgid "nested <select>\n"
|
|
35774 |
+msgstr "<select>がネストされています\n"
|
|
35775 |
+
|
|
35776 |
+#: src/html.c:5053
|
|
35777 |
+msgid "base URI is relative (it MUST be absolute)\n"
|
|
35778 |
+msgstr "base URIが関連しています(無条件であるべきです)\n"
|
|
35779 |
+
|
|
35780 |
+#: src/html.c:5060
|
|
35781 |
+msgid "the BASE element must appear in the HEAD section\n"
|
|
35782 |
+msgstr "BASE要素はHEADセクションに現われるべきです\n"
|
|
35783 |
+
|
|
35784 |
+#: src/html.c:5411
|
|
35785 |
+#, c-format
|
|
35786 |
+msgid "<%1$s> is not allowed to contain <%2$s>. -- closing <%3$s>\n"
|
|
35787 |
+msgstr "<%1$s>は<%2$s>を含むことが許されていません。 -- <%3$s>を閉じています\n"
|
|
35788 |
+
|
|
35789 |
+#: src/html.c:5435
|
|
35790 |
+msgid "the required DOCTYPE declaration is missing (or invalid)\n"
|
|
35791 |
+msgstr "必要なDOCTYPE宣言がありません(もしくは間違っています)\n"
|
|
35792 |
+
|
|
35793 |
+#: src/html.c:5526
|
|
35794 |
+#, c-format
|
|
35795 |
+msgid "<pre> is not allowed to contain <%s>\n"
|
|
35796 |
+msgstr "<pre>は<%s>を含むことが許されていません\n"
|
|
35797 |
+
|
|
35798 |
+#: src/html.c:5548
|
|
35799 |
+msgid "'id' and 'name' attribute of <a> tag differ\n"
|
|
35800 |
+msgstr "<a>タグの'id'と'name'属性は異なります\n"
|
|
35801 |
+
|
|
35802 |
+#: src/html.c:5775
|
|
35803 |
+msgid "Html_write_raw : bufsize is negative!\n"
|
|
35804 |
+msgstr "Html_write_raw : バッファサイズが負の値です!\n"
|
|
35805 |
+
|
|
35806 |
+#: src/html.c:5853
|
|
35807 |
+msgid "attribute lacks closing quote\n"
|
|
35808 |
+msgstr "属性で閉じるクォートが欠けています\n"
|
|
35809 |
+
|
|
35810 |
+#: src/html.c:5861
|
|
35811 |
+#, c-format
|
|
35812 |
+msgid "<%s> element lacks its closing '>'\n"
|
|
35813 |
+msgstr "<%s>属性は'>'で閉じられていません\n"
|
|
35814 |
+
|
|
35815 |
+#: src/html.c:6155
|
|
35816 |
+msgid "could not allocate character encoding converter"
|
|
35817 |
+msgstr "文字コードコンバータを割り当てられません"
|
|
35818 |
+
|
|
35819 |
+#: src/misc.c:455
|
|
35820 |
+msgid "Untitled"
|
|
35821 |
+msgstr "無題"
|
|
35822 |
+
|
|
35823 |
+#: src/interface.c:249
|
|
35824 |
+msgid "Selection retrieval failed\n"
|
|
35825 |
+msgstr "セレクションのに失敗\n"
|
|
35826 |
+
|
|
35827 |
+#: src/interface.c:363
|
|
35828 |
+msgid "Clear the URL box (middle-click to paste an URL)."
|
|
35829 |
+msgstr "URLボックスをクリア(中クリックでURLを貼り付け)"
|
|
35830 |
+
|
|
35831 |
+#: src/interface.c:385
|
|
35832 |
+msgid "Search the Web"
|
|
35833 |
+msgstr "Webを検索"
|
|
35834 |
+
|
|
35835 |
+#: src/interface.c:417 src/menu.c:231 src/menu.c:280
|
|
35836 |
+msgid "Back"
|
|
35837 |
+msgstr "戻る"
|
|
35838 |
+
|
|
35839 |
+#: src/interface.c:421
|
|
35840 |
+msgid "Go to previous page (right-click for menu)."
|
|
35841 |
+msgstr "前のページに戻る(右クリックでメニュー)"
|
|
35842 |
+
|
|
35843 |
+#: src/interface.c:450 src/menu.c:233 src/menu.c:282
|
|
35844 |
+msgid "Forward"
|
|
35845 |
+msgstr "進む"
|
|
35846 |
+
|
|
35847 |
+#: src/interface.c:454
|
|
35848 |
+msgid "Go to next page (right-click for menu)."
|
|
35849 |
+msgstr "次のページに進む(右クリックでメニュー)"
|
|
35850 |
+
|
|
35851 |
+#: src/interface.c:481
|
|
35852 |
+msgid "Home"
|
|
35853 |
+msgstr "ホーム"
|
|
35854 |
+
|
|
35855 |
+#: src/interface.c:485
|
|
35856 |
+msgid "Go to the Home page"
|
|
35857 |
+msgstr "ホームページを開く"
|
|
35858 |
+
|
|
35859 |
+#: src/interface.c:499 config/dillocfg.c:82
|
|
35860 |
+msgid "Reload"
|
|
35861 |
+msgstr "再読込"
|
|
35862 |
+
|
|
35863 |
+#: src/interface.c:500
|
|
35864 |
+msgid "Reload this page"
|
|
35865 |
+msgstr "このページを再読込する"
|
|
35866 |
+
|
|
35867 |
+#: src/interface.c:512 config/dillocfg.c:83
|
|
35868 |
+msgid "Save"
|
|
35869 |
+msgstr "保存"
|
|
35870 |
+
|
|
35871 |
+#: src/interface.c:513
|
|
35872 |
+msgid "Save this page"
|
|
35873 |
+msgstr "このページを保存する"
|
|
35874 |
+
|
|
35875 |
+#: src/interface.c:520 src/menu.c:235 src/menu.c:284
|
|
35876 |
+msgid "Stop"
|
|
35877 |
+msgstr "中止"
|
|
35878 |
+
|
|
35879 |
+#: src/interface.c:521
|
|
35880 |
+msgid "Stop the current transfer"
|
|
35881 |
+msgstr "読み込みを中止する"
|
|
35882 |
+
|
|
35883 |
+#: src/interface.c:534
|
|
35884 |
+msgid "Book"
|
|
35885 |
+msgstr "ブックマーク"
|
|
35886 |
+
|
|
35887 |
+#: src/interface.c:538
|
|
35888 |
+msgid "View bookmarks"
|
|
35889 |
+msgstr "ブックマークの表示"
|
|
35890 |
+
|
|
35891 |
+#: src/interface.c:655 src/interface.c:826
|
|
35892 |
+msgid "Hide Controls"
|
|
35893 |
+msgstr "コントロールの非表示"
|
|
35894 |
+
|
|
35895 |
+#: src/interface.c:655 src/interface.c:826
|
|
35896 |
+msgid "Show Controls"
|
|
35897 |
+msgstr "コントロールの表示"
|
|
35898 |
+
|
|
35899 |
+#: src/interface.c:929
|
|
35900 |
+msgid "Show HTML bugs (right-click for menu)."
|
|
35901 |
+msgstr "HTMLのバグを表示(右クリックでメニュー)"
|
|
35902 |
+
|
|
35903 |
+#: src/interface.c:1231
|
|
35904 |
+#, c-format
|
|
35905 |
+msgid "Warning: search_url ends with '%%'\n"
|
|
35906 |
+msgstr "警告: search_urlの終端に'%%'があります。\n"
|
|
35907 |
+
|
|
35908 |
+#: src/interface.c:1233
|
|
35909 |
+#, c-format
|
|
35910 |
+msgid "Warning: illegal specifier '%%%c' in search_url\n"
|
|
35911 |
+msgstr "警告: 無効な指定子'%%%c'がsearch_urlの中にあります。\n"
|
|
35912 |
+
|
|
35913 |
+#: src/interface.c:1298
|
|
35914 |
+msgid "Dillo: Open File"
|
|
35915 |
+msgstr "Dillo: ファイルを開く"
|
|
35916 |
+
|
|
35917 |
+#: src/interface.c:1374
|
|
35918 |
+msgid "Clear"
|
|
35919 |
+msgstr "クリア"
|
|
35920 |
+
|
|
35921 |
+#: src/interface.c:1382 src/interface.c:1536 src/nav.c:453
|
|
35922 |
+msgid "Cancel"
|
|
35923 |
+msgstr "取消"
|
|
35924 |
+
|
|
35925 |
+#: src/interface.c:1513
|
|
35926 |
+msgid "User Name:"
|
|
35927 |
+msgstr "ユーザー名:"
|
|
35928 |
+
|
|
35929 |
+#: src/interface.c:1520
|
|
35930 |
+msgid "Password:"
|
|
35931 |
+msgstr "パスワード:"
|
|
35932 |
+
|
|
35933 |
+#: src/interface.c:1529 src/interface.c:1604 src/interface.c:2073
|
|
35934 |
+#: src/nav.c:453
|
|
35935 |
+msgid "OK"
|
|
35936 |
+msgstr "了解"
|
|
35937 |
+
|
|
35938 |
+#: src/interface.c:1566
|
|
35939 |
+msgid "Dillo: Enter Authentication"
|
|
35940 |
+msgstr "Dillo: 認証"
|
|
35941 |
+
|
|
35942 |
+#: src/interface.c:1586
|
|
35943 |
+msgid "Dillo: Question"
|
|
35944 |
+msgstr "Dillo: 質問"
|
|
35945 |
+
|
|
35946 |
+#: src/interface.c:1602
|
|
35947 |
+msgid "Dillo: Open URL"
|
|
35948 |
+msgstr "Dillo: URLを開く"
|
|
35949 |
+
|
|
35950 |
+#: src/interface.c:1626
|
|
35951 |
+#, c-format
|
|
35952 |
+msgid "File saved (%d Bytes)"
|
|
35953 |
+msgstr "ファイルに保存しました。(%d バイト)"
|
|
35954 |
+
|
|
35955 |
+#: src/interface.c:1708
|
|
35956 |
+#, c-format
|
|
35957 |
+msgid "Error trying to save: %s\n"
|
|
35958 |
+msgstr "%sの書き込んでいる時にエラーが発生しました。\n"
|
|
35959 |
+
|
|
35960 |
+#: src/interface.c:1761
|
|
35961 |
+msgid "Dillo: Save URL as File..."
|
|
35962 |
+msgstr "Dillo: URLをファイルに保存..."
|
|
35963 |
+
|
|
35964 |
+#: src/interface.c:1788
|
|
35965 |
+msgid "Dillo: Save link as File..."
|
|
35966 |
+msgstr "Dillo: リンクをファイルに保存..."
|
|
35967 |
+
|
|
35968 |
+#: src/interface.c:1843 src/interface.c:1857
|
|
35969 |
+msgid "Dillo: Find text"
|
|
35970 |
+msgstr "Dillo: テキストの検索"
|
|
35971 |
+
|
|
35972 |
+#: src/interface.c:1844 src/interface.c:1850
|
|
35973 |
+#, c-format
|
|
35974 |
+msgid "Cannot find \"%s\"."
|
|
35975 |
+msgstr "\"%s\"は見つかりませんでした。"
|
|
35976 |
+
|
|
35977 |
+#: src/interface.c:1858
|
|
35978 |
+#, c-format
|
|
35979 |
+msgid "No further occurence of \"%s\". Restarting from the beginning."
|
|
35980 |
+msgstr "\"%s\"を最後まで検索しました。 先頭から再検索します。"
|
|
35981 |
+
|
|
35982 |
+#: src/interface.c:1866
|
|
35983 |
+#, c-format
|
|
35984 |
+msgid "(Find) \"%s\": restart from beginning"
|
|
35985 |
+msgstr "(検索) \"%s\": 最初から再開します"
|
|
35986 |
+
|
|
35987 |
+#: src/interface.c:1879
|
|
35988 |
+#, c-format
|
|
35989 |
+msgid "(Find) \"%s\""
|
|
35990 |
+msgstr "(検索) \"%s\""
|
|
35991 |
+
|
|
35992 |
+#: src/interface.c:1885
|
|
35993 |
+msgid "Unexpected return from a_Dw_gtk_scrolled_window_search()\n"
|
|
35994 |
+msgstr "予期しないa_Dw_gtk_scrolled_window_search()からの戻り値\n"
|
|
35995 |
+
|
|
35996 |
+#: src/interface.c:1937
|
|
35997 |
+msgid "press <Enter> to (repeat) search, <Esc> to close search"
|
|
35998 |
+msgstr "<Enter>を押すと(続けて)検索、<Esc>で検索を終了"
|
|
35999 |
+
|
|
36000 |
+#: src/interface.c:1938 src/interface.c:2031
|
|
36001 |
+msgid "Search"
|
|
36002 |
+msgstr "検索"
|
|
36003 |
+
|
|
36004 |
+#: src/interface.c:1940 src/interface.c:1941 src/interface.c:1977
|
|
36005 |
+msgid "Case sensitive"
|
|
36006 |
+msgstr "大文字/小文字を区別する"
|
|
36007 |
+
|
|
36008 |
+#: src/interface.c:1975
|
|
36009 |
+msgid "Dillo: Find text in page"
|
|
36010 |
+msgstr "Dillo: テキストの検索"
|
|
36011 |
+
|
|
36012 |
+#: src/interface.c:1978
|
|
36013 |
+msgid "Find"
|
|
36014 |
+msgstr "検索"
|
|
36015 |
+
|
|
36016 |
+#: src/interface.c:2029
|
|
36017 |
+msgid "Dillo"
|
|
36018 |
+msgstr "Dillo"
|
|
36019 |
+
|
|
36020 |
+#: src/interface.c:2029
|
|
36021 |
+msgid "Dillo: Search the Web"
|
|
36022 |
+msgstr "Dillo: Webを検索"
|
|
36023 |
+
|
|
36024 |
+#: src/interface.c:2066
|
|
36025 |
+#, c-format
|
|
36026 |
+msgid "Dillo: Enter proxy password for '%s'"
|
|
36027 |
+msgstr "Dillo: '%s'へのプロキシパスワードを入力してください"
|
|
36028 |
+
|
|
36029 |
+#: src/interface.c:2151
|
|
36030 |
+msgid "Close"
|
|
36031 |
+msgstr "閉じる"
|
|
36032 |
+
|
|
36033 |
+#: src/interface.c:2226
|
|
36034 |
+msgid "close"
|
|
36035 |
+msgstr "閉じる"
|
|
36036 |
+
|
|
36037 |
+#: src/nav.c:383
|
|
36038 |
+#, c-format
|
|
36039 |
+msgid "Unhandled switch type %d in a_Nav_jump_callback in src/nav.c\n"
|
|
36040 |
+msgstr "src/nav.cのa_Nav_jump_callbackで処理できないswitchの種類 %d\n"
|
|
36041 |
+
|
|
36042 |
+#: src/nav.c:452
|
|
36043 |
+msgid "Repost form data?"
|
|
36044 |
+msgstr "データを再送信しますか?"
|
|
36045 |
+
|
|
36046 |
+#: src/menu.c:173
|
|
36047 |
+msgid "_File"
|
|
36048 |
+msgstr "ファイル(_F)"
|
|
36049 |
+
|
|
36050 |
+#: src/menu.c:174
|
|
36051 |
+msgid "_New Window"
|
|
36052 |
+msgstr "新規Window(_N)"
|
|
36053 |
+
|
|
36054 |
+#: src/menu.c:177
|
|
36055 |
+msgid "New _Tab"
|
|
36056 |
+msgstr "新規タブ(_T)"
|
|
36057 |
+
|
|
36058 |
+#: src/menu.c:181
|
|
36059 |
+msgid "_Open File..."
|
|
36060 |
+msgstr "ファイルを開く(_O)..."
|
|
36061 |
+
|
|
36062 |
+#: src/menu.c:183
|
|
36063 |
+msgid "Open _URL..."
|
|
36064 |
+msgstr "URLを開く(_U)..."
|
|
36065 |
+
|
|
36066 |
+#: src/menu.c:189
|
|
36067 |
+msgid "Close Window"
|
|
36068 |
+msgstr "Windowを閉じる"
|
|
36069 |
+
|
|
36070 |
+#: src/menu.c:192 src/menu.c:359
|
|
36071 |
+msgid "Close Tab"
|
|
36072 |
+msgstr "タブを閉じる"
|
|
36073 |
+
|
|
36074 |
+#: src/menu.c:196
|
|
36075 |
+msgid "Exit Dillo"
|
|
36076 |
+msgstr "Dilloを終了する"
|
|
36077 |
+
|
|
36078 |
+#: src/menu.c:200
|
|
36079 |
+msgid "_View"
|
|
36080 |
+msgstr "表示(_V)"
|
|
36081 |
+
|
|
36082 |
+#: src/menu.c:202
|
|
36083 |
+msgid "Previous tab"
|
|
36084 |
+msgstr "前のタブ"
|
|
36085 |
+
|
|
36086 |
+#: src/menu.c:204
|
|
36087 |
+msgid "Next tab"
|
|
36088 |
+msgstr "次のタブ"
|
|
36089 |
+
|
|
36090 |
+#: src/menu.c:208
|
|
36091 |
+msgid "_Options..."
|
|
36092 |
+msgstr "設定(_O)..."
|
|
36093 |
+
|
|
36094 |
+#: src/menu.c:228
|
|
36095 |
+msgid "PAGE OPTIONS"
|
|
36096 |
+msgstr "ページオプション"
|
|
36097 |
+
|
|
36098 |
+#: src/menu.c:237 src/menu.c:286
|
|
36099 |
+msgid "_Reload"
|
|
36100 |
+msgstr "再読込(_R)"
|
|
36101 |
+
|
|
36102 |
+#: src/menu.c:241
|
|
36103 |
+msgid "View page So_urce"
|
|
36104 |
+msgstr "ページのソースを表示(_u)"
|
|
36105 |
+
|
|
36106 |
+#: src/menu.c:243
|
|
36107 |
+msgid "View page Bugs"
|
|
36108 |
+msgstr "ページのバグを表示(_u)"
|
|
36109 |
+
|
|
36110 |
+#: src/menu.c:244
|
|
36111 |
+msgid "_Bookmark this Page"
|
|
36112 |
+msgstr "このページをブックマークする(_B)"
|
|
36113 |
+
|
|
36114 |
+#: src/menu.c:247
|
|
36115 |
+msgid "Duplicate this Page"
|
|
36116 |
+msgstr "このページを複製する"
|
|
36117 |
+
|
|
36118 |
+#: src/menu.c:250
|
|
36119 |
+msgid "Duplicate this tab"
|
|
36120 |
+msgstr "このタブを複製する"
|
|
36121 |
+
|
|
36122 |
+#: src/menu.c:254
|
|
36123 |
+msgid "_Find Text"
|
|
36124 |
+msgstr "テキストの検索(_F)"
|
|
36125 |
+
|
|
36126 |
+#: src/menu.c:257
|
|
36127 |
+msgid "Jump to..."
|
|
36128 |
+msgstr "ジャンプ..."
|
|
36129 |
+
|
|
36130 |
+#: src/menu.c:258
|
|
36131 |
+msgid "This Frame..."
|
|
36132 |
+msgstr "このフレーム..."
|
|
36133 |
+
|
|
36134 |
+#: src/menu.c:259
|
|
36135 |
+msgid "This Frameset..."
|
|
36136 |
+msgstr "このフレームセット..."
|
|
36137 |
+
|
|
36138 |
+#: src/menu.c:262
|
|
36139 |
+msgid "Save Page As..."
|
|
36140 |
+msgstr "ページに名前を付けて保存..."
|
|
36141 |
+
|
|
36142 |
+#: src/menu.c:277
|
|
36143 |
+msgid "FRAME OPTIONS"
|
|
36144 |
+msgstr "フレームオプション"
|
|
36145 |
+
|
|
36146 |
+#: src/menu.c:290
|
|
36147 |
+msgid "View frame Source"
|
|
36148 |
+msgstr "フレームのソースを表示"
|
|
36149 |
+
|
|
36150 |
+#: src/menu.c:292
|
|
36151 |
+msgid "Bookmark this Frame"
|
|
36152 |
+msgstr "このフレームをブックマークする"
|
|
36153 |
+
|
|
36154 |
+#: src/menu.c:294
|
|
36155 |
+msgid "Reload this Frame"
|
|
36156 |
+msgstr "このフレームを再読込する"
|
|
36157 |
+
|
|
36158 |
+#: src/menu.c:297
|
|
36159 |
+msgid "Show only this Frame"
|
|
36160 |
+msgstr "このフレームのみ表示"
|
|
36161 |
+
|
|
36162 |
+#: src/menu.c:299
|
|
36163 |
+msgid "Open Frame in new Window"
|
|
36164 |
+msgstr "フレームを新しいWindowで開く"
|
|
36165 |
+
|
|
36166 |
+#: src/menu.c:302
|
|
36167 |
+msgid "Open Frame in new Tab"
|
|
36168 |
+msgstr "フレームを新しいタブで開く"
|
|
36169 |
+
|
|
36170 |
+#: src/menu.c:306
|
|
36171 |
+msgid "_Find Text in this Frame..."
|
|
36172 |
+msgstr "このフレーム内をテキスト検索(_F)..."
|
|
36173 |
+
|
|
36174 |
+#: src/menu.c:309 src/menu.c:340
|
|
36175 |
+msgid "Save Frame As..."
|
|
36176 |
+msgstr "フレームに名前を付けて保存..."
|
|
36177 |
+
|
|
36178 |
+#: src/menu.c:325
|
|
36179 |
+msgid "FRAMESET OPTIONS"
|
|
36180 |
+msgstr "フレームセットオプション"
|
|
36181 |
+
|
|
36182 |
+#: src/menu.c:327
|
|
36183 |
+msgid "View Frameset Source"
|
|
36184 |
+msgstr "フレームセットのソースを表示"
|
|
36185 |
+
|
|
36186 |
+#: src/menu.c:329
|
|
36187 |
+msgid "Bookmark this Frameset"
|
|
36188 |
+msgstr "このフレームセットをブックマークする"
|
|
36189 |
+
|
|
36190 |
+#: src/menu.c:331
|
|
36191 |
+msgid "Reload this Frameset"
|
|
36192 |
+msgstr "このフレームセットを再読込する"
|
|
36193 |
+
|
|
36194 |
+#: src/menu.c:334
|
|
36195 |
+msgid "Show only this Frameset"
|
|
36196 |
+msgstr "このフレームセットのみ表示"
|
|
36197 |
+
|
|
36198 |
+#: src/menu.c:337
|
|
36199 |
+msgid "_Find Text in this Frameset..."
|
|
36200 |
+msgstr "このフレームセット内をテキスト検索(_F)..."
|
|
36201 |
+
|
|
36202 |
+#: src/menu.c:357
|
|
36203 |
+msgid "TAB OPTIONS"
|
|
36204 |
+msgstr "タブオプション"
|
|
36205 |
+
|
|
36206 |
+#: src/menu.c:361
|
|
36207 |
+msgid "New Tab"
|
|
36208 |
+msgstr "新規タブ"
|
|
36209 |
+
|
|
36210 |
+#: src/menu.c:363
|
|
36211 |
+msgid "Reload Tab"
|
|
36212 |
+msgstr "タブを再読込"
|
|
36213 |
+
|
|
36214 |
+#: src/menu.c:460
|
|
36215 |
+msgid "FOLLOWING PAGES"
|
|
36216 |
+msgstr "次のページ"
|
|
36217 |
+
|
|
36218 |
+#: src/menu.c:463
|
|
36219 |
+msgid "PREVIOUS PAGES"
|
|
36220 |
+msgstr "前のページ"
|
|
36221 |
+
|
|
36222 |
+#: src/menu.c:531
|
|
36223 |
+msgid "LINK OPTIONS"
|
|
36224 |
+msgstr "リンクオプション"
|
|
36225 |
+
|
|
36226 |
+#: src/menu.c:533
|
|
36227 |
+msgid "Open Link in New Window"
|
|
36228 |
+msgstr "リンクを新しいWindowで開く"
|
|
36229 |
+
|
|
36230 |
+#: src/menu.c:536
|
|
36231 |
+msgid "Open Link in New Tab"
|
|
36232 |
+msgstr "リンクを新しいタブで開く"
|
|
36233 |
+
|
|
36234 |
+#: src/menu.c:539
|
|
36235 |
+msgid "Open Link"
|
|
36236 |
+msgstr "リンクを開く"
|
|
36237 |
+
|
|
36238 |
+#: src/menu.c:542
|
|
36239 |
+msgid "Bookmark this Link"
|
|
36240 |
+msgstr "このリンクをブックマーク(_B)"
|
|
36241 |
+
|
|
36242 |
+#: src/menu.c:544
|
|
36243 |
+msgid "Copy Link location"
|
|
36244 |
+msgstr "リンクの場所をコピー"
|
|
36245 |
+
|
|
36246 |
+#: src/menu.c:549
|
|
36247 |
+msgid "Save Link As..."
|
|
36248 |
+msgstr "リンクに名前を付けて保存..."
|
|
36249 |
+
|
|
36250 |
+#: src/menu.c:553
|
|
36251 |
+msgid "Image Menu..."
|
|
36252 |
+msgstr "画像メニュー..."
|
|
36253 |
+
|
|
36254 |
+#: src/menu.c:571
|
|
36255 |
+msgid "IMAGE OPTIONS"
|
|
36256 |
+msgstr "画像オプション"
|
|
36257 |
+
|
|
36258 |
+#: src/menu.c:573
|
|
36259 |
+msgid "Isolate Image"
|
|
36260 |
+msgstr "画像だけを表示"
|
|
36261 |
+
|
|
36262 |
+#: src/menu.c:575
|
|
36263 |
+msgid "Open Image in New Window"
|
|
36264 |
+msgstr "画像を新しいWindowで開く"
|
|
36265 |
+
|
|
36266 |
+#: src/menu.c:578
|
|
36267 |
+msgid "Open Image in New Tab"
|
|
36268 |
+msgstr "画像を新しいタブで開く"
|
|
36269 |
+
|
|
36270 |
+#: src/menu.c:581
|
|
36271 |
+msgid "Open Image"
|
|
36272 |
+msgstr "画像を開く"
|
|
36273 |
+
|
|
36274 |
+#: src/menu.c:584
|
|
36275 |
+msgid "Bookmark this Image"
|
|
36276 |
+msgstr "この画像をブックマークする"
|
|
36277 |
+
|
|
36278 |
+#: src/menu.c:586
|
|
36279 |
+msgid "Copy Image location"
|
|
36280 |
+msgstr "画像の場所をコピーする"
|
|
36281 |
+
|
|
36282 |
+#: src/menu.c:591
|
|
36283 |
+msgid "Save Image As..."
|
|
36284 |
+msgstr "画像に名前を付けて保存..."
|
|
36285 |
+
|
|
36286 |
+#: src/menu.c:605
|
|
36287 |
+msgid "BUG METER OPTIONS"
|
|
36288 |
+msgstr "バグメーターオプション"
|
|
36289 |
+
|
|
36290 |
+#: src/menu.c:607
|
|
36291 |
+msgid "Validate URL with W3C"
|
|
36292 |
+msgstr "URLをW3Cで検査する"
|
|
36293 |
+
|
|
36294 |
+#: src/menu.c:609
|
|
36295 |
+msgid "Validate URL with WDG"
|
|
36296 |
+msgstr "URLをWDGで検査する"
|
|
36297 |
+
|
|
36298 |
+#: src/menu.c:612
|
|
36299 |
+msgid "About Bug Meter..."
|
|
36300 |
+msgstr "バグメーターについて..."
|
|
36301 |
+
|
|
36302 |
+#: src/prefs.c:431
|
|
36303 |
+msgid "Error: Can't open specified config file. default file is used.\n"
|
|
36304 |
+msgstr "エラー: 設定ファイルを開けません。デフォルトのファイルが使用中です。\n"
|
|
36305 |
+
|
|
36306 |
+#: src/i18n.c:359
|
|
36307 |
+msgid "charset detect may mistake...\n"
|
|
36308 |
+msgstr "文字コード認識に失敗したかもしれません...\n"
|
|
36309 |
+
|
|
36310 |
+#: src/i18n.c:447
|
|
36311 |
+msgid "<meta> outside of <head>!\n"
|
|
36312 |
+msgstr "<meta>が<head>の外側にあります\n"
|
|
36313 |
+
|
|
36314 |
+#: src/i18n.c:493
|
|
36315 |
+msgid "all ascii code\n"
|
|
36316 |
+msgstr "全てASCIIコードです。\n"
|
|
36317 |
+
|
|
36318 |
+#: src/i18n.c:526
|
|
36319 |
+msgid "unable to fully convert between character encodings\n"
|
|
36320 |
+msgstr "文字コードを完全に変換できませんでした\n"
|
|
36321 |
+
|
|
36322 |
+#: src/i18n.c:565
|
|
36323 |
+msgid "no support enc\n"
|
|
36324 |
+msgstr "サポートしてないエンコードです。\n"
|
|
36325 |
+
|
|
36326 |
+#: src/tab.c:293 src/tab.c:425 dpi/bookmarks.c:1653
|
|
36327 |
+msgid "(Untitled)"
|
|
36328 |
+msgstr "(無題)"
|
|
36329 |
+
|
|
36330 |
+#: src/IO/https.c:168
|
|
36331 |
+msgid "--Error detected\n"
|
|
36332 |
+msgstr "--エラーを検出しました\n"
|
|
36333 |
+
|
|
36334 |
+#: src/IO/https.c:173 src/IO/https.c:204 src/IO/http.c:294
|
|
36335 |
+msgid "ERROR: unable to connect to remote host"
|
|
36336 |
+msgstr "エラー: リモートホストに接続できません"
|
|
36337 |
+
|
|
36338 |
+#: src/IO/https.c:179 src/IO/http.c:309
|
|
36339 |
+msgid "--Connection established\n"
|
|
36340 |
+msgstr "--接続を確立しました\n"
|
|
36341 |
+
|
|
36342 |
+#: src/IO/https.c:280 src/IO/http.c:417
|
|
36343 |
+#, c-format
|
|
36344 |
+msgid "Sending query to %s..."
|
|
36345 |
+msgstr "クエリを%sに送信しています..."
|
|
36346 |
+
|
|
36347 |
+#: src/IO/https.c:333 src/IO/http.c:486
|
|
36348 |
+#, c-format
|
|
36349 |
+msgid "DNS solving %s"
|
|
36350 |
+msgstr "DNSは%sを解決しています"
|
|
36351 |
+
|
|
36352 |
+#: src/IO/https.c:363
|
|
36353 |
+msgid " HTTPS: new abort handler! #2\n"
|
|
36354 |
+msgstr " HTTPS: 新規のabortハンドラです! #2\n"
|
|
36355 |
+
|
|
36356 |
+#: src/IO/https.c:365 src/IO/https.c:387 src/IO/http.c:301 src/IO/http.c:520
|
|
36357 |
+#: src/IO/http.c:551
|
|
36358 |
+#, c-format
|
|
36359 |
+msgid "ERROR: %s"
|
|
36360 |
+msgstr "エラー: %s"
|
|
36361 |
+
|
|
36362 |
+#: src/IO/https.c:386
|
|
36363 |
+msgid " HTTP: new abort handler! #1\n"
|
|
36364 |
+msgstr " HTTP: 新規のabortハンドラです! #1\n"
|
|
36365 |
+
|
|
36366 |
+#: src/IO/https.c:400 src/IO/http.c:564
|
|
36367 |
+#, c-format
|
|
36368 |
+msgid "ERROR: Dns can't solve %s"
|
|
36369 |
+msgstr "エラー: DNSは%sを解決できません"
|
|
36370 |
+
|
|
36371 |
+#: src/IO/https.c:421 src/IO/http.c:591
|
|
36372 |
+msgid "Query sent, waiting for reply..."
|
|
36373 |
+msgstr "クエリを送信しました 応答を待っています..."
|
|
36374 |
+
|
|
36375 |
+#: src/IO/http.c:190
|
|
36376 |
+#, c-format
|
|
36377 |
+msgid "Getting %1$s, referer %2$s\n"
|
|
36378 |
+msgstr "%1$sを取得中 リファラ %2$s\n"
|
|
36379 |
+
|
|
36380 |
+#: src/IO/http.c:259
|
|
36381 |
+#, c-format
|
|
36382 |
+msgid ""
|
|
36383 |
+"Query:\n"
|
|
36384 |
+"%s"
|
|
36385 |
+msgstr ""
|
|
36386 |
+"クエリ:\n"
|
|
36387 |
+"%s"
|
|
36388 |
+
|
|
36389 |
+#: src/IO/http.c:286
|
|
36390 |
+msgid "--Connection broken\n"
|
|
36391 |
+msgstr "--切断されました\n"
|
|
36392 |
+
|
|
36393 |
+#: src/IO/http.c:342
|
|
36394 |
+#, c-format
|
|
36395 |
+msgid "Http_connect_socket ERROR: %s\n"
|
|
36396 |
+msgstr "Http_connect_socketでエラー: %s\n"
|
|
36397 |
+
|
|
36398 |
+#: src/IO/http.c:363 src/IO/http.c:377
|
|
36399 |
+#, c-format
|
|
36400 |
+msgid "Connecting to %s\n"
|
|
36401 |
+msgstr "%sに接続しています\n"
|
|
36402 |
+
|
|
36403 |
+#: src/IO/http.c:396
|
|
36404 |
+msgid "Contacting host..."
|
|
36405 |
+msgstr "ホストに接続しています..."
|
|
36406 |
+
|
|
36407 |
+#: src/IO/http.c:529
|
|
36408 |
+msgid "Http: OpAbort [1B]\n"
|
|
36409 |
+msgstr "Http: OpAbort [1B]\n"
|
|
36410 |
+
|
|
36411 |
+#: src/IO/dpi.c:188
|
|
36412 |
+msgid "ERROR: [Dpi_get_token] Can't find token start\n"
|
|
36413 |
+msgstr "エラー: [Dpi_get_token] トークンの開始を見つけられません。\n"
|
|
36414 |
+
|
|
36415 |
+#: src/IO/dpi.c:221
|
|
36416 |
+msgid "ERROR: [Dpi_get_token] *** NULL code here ***\n"
|
|
36417 |
+msgstr "エラー: [Dpi_get_token] *** ここにNULLコードがあります ***\n"
|
|
36418 |
+
|
|
36419 |
+#: src/IO/dpi.c:312
|
|
36420 |
+msgid "Dpi: [Dpi_process_io] IOClose\n"
|
|
36421 |
+msgstr "Dpi: [Dpi_process_io] IOClose\n"
|
|
36422 |
+
|
|
36423 |
+#: src/IO/dpi.c:338
|
|
36424 |
+#, c-format
|
|
36425 |
+msgid "Dpi_start_dpid (child): %s\n"
|
|
36426 |
+msgstr "Dpi_start_dpid (child): %s\n"
|
|
36427 |
+
|
|
36428 |
+#: src/IO/dpi.c:348 src/IO/dpi.c:363
|
|
36429 |
+#, c-format
|
|
36430 |
+msgid "Dpi_start_dpid: %s\n"
|
|
36431 |
+msgstr "Dpi_start_dpid: %s\n"
|
|
36432 |
+
|
|
36433 |
+#: src/IO/dpi.c:359
|
|
36434 |
+#, c-format
|
|
36435 |
+msgid "Dpi_start_dpid: n = %d\n"
|
|
36436 |
+msgstr "Dpi_start_dpid: n = %d\n"
|
|
36437 |
+
|
|
36438 |
+#: src/IO/dpi.c:386
|
|
36439 |
+#, c-format
|
|
36440 |
+msgid "Dpi_check_uds: %1$s %2$s\n"
|
|
36441 |
+msgstr "Dpi_check_uds: %1$s %2$s\n"
|
|
36442 |
+
|
|
36443 |
+#: src/IO/dpi.c:673
|
|
36444 |
+msgid "dpi.c: ERROR, can't start dpi daemon\n"
|
|
36445 |
+msgstr "dpi.c: エラー, dpiデーモンを開始できません\n"
|
|
36446 |
+
|
|
36447 |
+#: src/IO/dpi.c:686
|
|
36448 |
+msgid "a_Dpi_ccc: OpAbort[2B], Not implemented\n"
|
|
36449 |
+msgstr "a_Dpi_ccc: OpAbort[2B], 実装されていません\n"
|
|
36450 |
+
|
|
36451 |
+#: src/IO/dpi.c:790 src/IO/dpi.c:794
|
|
36452 |
+#, c-format
|
|
36453 |
+msgid "a_Dpi_bye_dpid: %s\n"
|
|
36454 |
+msgstr "a_Dpi_bye_dpid: %s\n"
|
|
36455 |
+
|
|
36456 |
+#: dpid/dpi_socket_dir.c:106
|
|
36457 |
+#, c-format
|
|
36458 |
+msgid "The dpi_socket_dir file does not exist\n"
|
|
36459 |
+msgstr "dpi_socket_dirファイルが存在しません\n"
|
|
36460 |
+
|
|
36461 |
+#: dpid/dpi_socket_dir.c:110 dpid/dpi_socket_dir.c:114
|
|
36462 |
+#, c-format
|
|
36463 |
+msgid "debug_msg - init_sockdir: The socket directory "
|
|
36464 |
+msgstr "debug_msg - init_sockdir: socketディレクトリは"
|
|
36465 |
+
|
|
36466 |
+#: dpid/dpi_socket_dir.c:111
|
|
36467 |
+#, c-format
|
|
36468 |
+msgid "%s exists and is OK\n"
|
|
36469 |
+msgstr "%sは存在していてOKです\n"
|
|
36470 |
+
|
|
36471 |
+#: dpid/dpi_socket_dir.c:115
|
|
36472 |
+#, c-format
|
|
36473 |
+msgid "%s does not exist or is not a directory\n"
|
|
36474 |
+msgstr "%sは存在しないか、ディレクトリではありません\n"
|
|
36475 |
+
|
|
36476 |
+#: dpid/dpi_socket_dir.c:124
|
|
36477 |
+#, c-format
|
|
36478 |
+msgid " - Failed to create dpi socket directory\n"
|
|
36479 |
+msgstr " - dpi socketディレクトリの作成に失敗しました\n"
|
|
36480 |
+
|
|
36481 |
+#: dpid/dpi_socket_dir.c:127
|
|
36482 |
+#, c-format
|
|
36483 |
+msgid " - failed to save %s\n"
|
|
36484 |
+msgstr " - %sの保存に失敗しました\n"
|
|
36485 |
+
|
|
36486 |
+#: dpid/main.c:59 dpid/main.c:66 dpid/main.c:77 dpid/main.c:85 dpid/main.c:99
|
|
36487 |
+#: dpid/main.c:104 dpid/main.c:109
|
|
36488 |
+#, c-format
|
|
36489 |
+msgid "ERROR in child proc for %s\n"
|
|
36490 |
+msgstr "%sで子プロセスがエラー\n"
|
|
36491 |
+
|
|
36492 |
+#: dpid/main.c:166
|
|
36493 |
+#, c-format
|
|
36494 |
+msgid ": dpid failed to parse cmd in %s\n"
|
|
36495 |
+msgstr ": dpidが%sのコマンド解析に失敗しました\n"
|
|
36496 |
+
|
|
36497 |
+#: dpid/main.c:265
|
|
36498 |
+#, c-format
|
|
36499 |
+msgid "Failed to create socket directory\n"
|
|
36500 |
+msgstr "socketディレクトリの作成に失敗しました\n"
|
|
36501 |
+
|
|
36502 |
+#: dpid/main.c:275
|
|
36503 |
+#, c-format
|
|
36504 |
+msgid "dpid refuses to start, possibly because:\n"
|
|
36505 |
+msgstr "dpidは開始を拒否しました。予想される原因:\n"
|
|
36506 |
+
|
|
36507 |
+#: dpid/main.c:276
|
|
36508 |
+#, c-format
|
|
36509 |
+msgid "\t1) An instance of dpid is already running.\n"
|
|
36510 |
+msgstr "\t1) dpidのインスタンスが既に起動している。\n"
|
|
36511 |
+
|
|
36512 |
+#: dpid/main.c:277
|
|
36513 |
+#, c-format
|
|
36514 |
+msgid "\t2) A previous dpid didn't clean up on exit.\n"
|
|
36515 |
+msgstr "\t2) 前のdpidが不正終了した。\n"
|
|
36516 |
+
|
|
36517 |
+#: dpid/main.c:280
|
|
36518 |
+msgid "init_srs_sockets failed\n"
|
|
36519 |
+msgstr "init_srs_socketsが失敗しました\n"
|
|
36520 |
+
|
|
36521 |
+#: dpid/main.c:294
|
|
36522 |
+#, c-format
|
|
36523 |
+msgid "dpid started\n"
|
|
36524 |
+msgstr "dpidが開始しました\n"
|
|
36525 |
+
|
|
36526 |
+#: dpid/main.c:340
|
|
36527 |
+#, c-format
|
|
36528 |
+msgid "accept on srs socket failed\n"
|
|
36529 |
+msgstr "srs socketの受理に失敗しました\n"
|
|
36530 |
+
|
|
36531 |
+#: dpid/main.c:341
|
|
36532 |
+#, c-format
|
|
36533 |
+msgid "service pending connections, and continue\n"
|
|
36534 |
+msgstr "未解決の接続をを供給し、継続します\n"
|
|
36535 |
+
|
|
36536 |
+#: dpi/bookmarks.c:96
|
|
36537 |
+msgid ""
|
|
36538 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36539 |
+"<html>\n"
|
|
36540 |
+"<head>\n"
|
|
36541 |
+"<title>Bookmarks</title>\n"
|
|
36542 |
+"</head>\n"
|
|
36543 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36544 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36545 |
+" <tr><td>\n"
|
|
36546 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36547 |
+" <tr>\n"
|
|
36548 |
+" <td> Bookmarks::</td>\n"
|
|
36549 |
+" <td width='100%' align='right'>\n"
|
|
36550 |
+" [<a href='dpi:/bm/modify'>modify</a>]\n"
|
|
36551 |
+" </td></tr>\n"
|
|
36552 |
+" </table></td></tr>\n"
|
|
36553 |
+"</table>\n"
|
|
36554 |
+"<br>\n"
|
|
36555 |
+msgstr ""
|
|
36556 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36557 |
+"<html>\n"
|
|
36558 |
+"<head>\n"
|
|
36559 |
+"<title>ブックマーク</title>\n"
|
|
36560 |
+"</head>\n"
|
|
36561 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36562 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36563 |
+" <tr><td>\n"
|
|
36564 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36565 |
+" <tr>\n"
|
|
36566 |
+" <td><pre> ブックマーク::</pre></td>\n"
|
|
36567 |
+" <td width='100%' align='right'>\n"
|
|
36568 |
+" <pre>[<a href='dpi:/bm/modify'>変更</a>]</pre>\n"
|
|
36569 |
+" </td></tr>\n"
|
|
36570 |
+" </table></td></tr>\n"
|
|
36571 |
+"</table>\n"
|
|
36572 |
+"<br>\n"
|
|
36573 |
+
|
|
36574 |
+#: dpi/bookmarks.c:115
|
|
36575 |
+msgid ""
|
|
36576 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36577 |
+"<html>\n"
|
|
36578 |
+"<head>\n"
|
|
36579 |
+"<title>Bookmarks</title>\n"
|
|
36580 |
+"</head>\n"
|
|
36581 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36582 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36583 |
+" <tr><td>\n"
|
|
36584 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36585 |
+" <tr>\n"
|
|
36586 |
+" <td> Bookmarks :: modify</td></tr>\n"
|
|
36587 |
+" </table></td></tr> \n"
|
|
36588 |
+"</table> \n"
|
|
36589 |
+"\n"
|
|
36590 |
+"<form>\n"
|
|
36591 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
36592 |
+" <tr><td>\n"
|
|
36593 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
36594 |
+" <tr>\n"
|
|
36595 |
+" <td><b>Select an operation </b></td>\n"
|
|
36596 |
+" <td><select name='operation'>\n"
|
|
36597 |
+" <option value='none' selected>--\n"
|
|
36598 |
+" <option value='delete'>Delete\n"
|
|
36599 |
+" <option value='move'>Move\n"
|
|
36600 |
+" <option value='modify'>Modify\n"
|
|
36601 |
+" <option value='add_sec'>Add Section\n"
|
|
36602 |
+" <option value='add_url'>Add URL\n"
|
|
36603 |
+" </select></td>\n"
|
|
36604 |
+" <td><b>, mark its operands, and </b></td>\n"
|
|
36605 |
+" <td><input type='submit' name='submit' value='submit.'></td>\n"
|
|
36606 |
+" <td width='100%'></td>\n"
|
|
36607 |
+" </tr>\n"
|
|
36608 |
+" </table></td></tr>\n"
|
|
36609 |
+"</table>\n"
|
|
36610 |
+msgstr ""
|
|
36611 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36612 |
+"<html>\n"
|
|
36613 |
+"<head>\n"
|
|
36614 |
+"<title>ブックマーク</title>\n"
|
|
36615 |
+"</head>\n"
|
|
36616 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36617 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36618 |
+" <tr><td>\n"
|
|
36619 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36620 |
+" <tr>\n"
|
|
36621 |
+" <td><pre> ブックマーク :: 変更</pre></td></tr>\n"
|
|
36622 |
+" </table></td></tr> \n"
|
|
36623 |
+"</table> \n"
|
|
36624 |
+"\n"
|
|
36625 |
+"<form>\n"
|
|
36626 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
36627 |
+" <tr><td>\n"
|
|
36628 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
36629 |
+" <tr>\n"
|
|
36630 |
+" <td><pre><b>命令を選択 </b></pre></td>\n"
|
|
36631 |
+" <td><select name='operation'>\n"
|
|
36632 |
+" <option value='none' selected>--\n"
|
|
36633 |
+" <option value='delete'>削除\n"
|
|
36634 |
+" <option value='move'>移動\n"
|
|
36635 |
+" <option value='modify'>変更\n"
|
|
36636 |
+" <option value='add_sec'>セクションを追加\n"
|
|
36637 |
+" <option value='add_url'>URLを追加\n"
|
|
36638 |
+" </select></td>\n"
|
|
36639 |
+" <td><pre><b>、対象をチェックして、</b></pre></td>\n"
|
|
36640 |
+" <td><input type='submit' name='submit' value='適用'></td>\n"
|
|
36641 |
+" <td width='100%'></td>\n"
|
|
36642 |
+" </tr>\n"
|
|
36643 |
+" </table></td></tr>\n"
|
|
36644 |
+"</table>\n"
|
|
36645 |
+
|
|
36646 |
+#: dpi/bookmarks.c:151
|
|
36647 |
+msgid ""
|
|
36648 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
36649 |
+" <tr valign='top'>\n"
|
|
36650 |
+" <td>\n"
|
|
36651 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
36652 |
+" <tr><td>\n"
|
|
36653 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36654 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
36655 |
+msgstr ""
|
|
36656 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
36657 |
+" <tr valign='top'>\n"
|
|
36658 |
+" <td>\n"
|
|
36659 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
36660 |
+" <tr><td>\n"
|
|
36661 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36662 |
+" <tr><td><pre>セクション:</pre></td></tr></table></td></tr>\n"
|
|
36663 |
+
|
|
36664 |
+#: dpi/bookmarks.c:160
|
|
36665 |
+msgid ""
|
|
36666 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
36667 |
+" <tr valign='top'>\n"
|
|
36668 |
+" <td>\n"
|
|
36669 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
36670 |
+" <tr><td>\n"
|
|
36671 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36672 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
36673 |
+msgstr ""
|
|
36674 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
36675 |
+" <tr valign='top'>\n"
|
|
36676 |
+" <td>\n"
|
|
36677 |
+" <table bgcolor='#b4b4b4' border='1' cellpadding='4' cellspacing='1'>\n"
|
|
36678 |
+" <tr><td>\n"
|
|
36679 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
36680 |
+" <tr><td><pre>セクション:</pre></td></tr></table></td></tr>\n"
|
|
36681 |
+
|
|
36682 |
+#: dpi/bookmarks.c:243
|
|
36683 |
+msgid ""
|
|
36684 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36685 |
+"<html>\n"
|
|
36686 |
+"<head>\n"
|
|
36687 |
+"<title>Bookmarks</title>\n"
|
|
36688 |
+"</head>\n"
|
|
36689 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36690 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36691 |
+" <tr><td colspan='2'>\n"
|
|
36692 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
36693 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add section\n"
|
|
36694 |
+" </td></tr></table></td></tr>\n"
|
|
36695 |
+"</table>\n"
|
|
36696 |
+"<br>\n"
|
|
36697 |
+"<form>\n"
|
|
36698 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
36699 |
+"<table border='1' width='100%'>\n"
|
|
36700 |
+" <tr>\n"
|
|
36701 |
+" <td bgcolor='olive'><b>New section:</b></td>\n"
|
|
36702 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
36703 |
+"</table>\n"
|
|
36704 |
+"<table width='100%' cellpadding='10'>\n"
|
|
36705 |
+"<tr><td>\n"
|
|
36706 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
36707 |
+" <tr>\n"
|
|
36708 |
+" <td>Title:</td>\n"
|
|
36709 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
36710 |
+" </table>\n"
|
|
36711 |
+" </td></tr>\n"
|
|
36712 |
+"</table>\n"
|
|
36713 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
36714 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
36715 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
36716 |
+"</table>\n"
|
|
36717 |
+"</form>\n"
|
|
36718 |
+"</body>\n"
|
|
36719 |
+"</html>\n"
|
|
36720 |
+"\n"
|
|
36721 |
+msgstr ""
|
|
36722 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36723 |
+"<html>\n"
|
|
36724 |
+"<head>\n"
|
|
36725 |
+"<title>ブックマーク</title>\n"
|
|
36726 |
+"</head>\n"
|
|
36727 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36728 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36729 |
+" <tr><td colspan='2'>\n"
|
|
36730 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
36731 |
+" <tr><td bgcolor='#b4b4b4'><pre> ブックマークの変更:: セクションを追加"
|
|
36732 |
+"</pre>\n"
|
|
36733 |
+" </td></tr></table></td></tr>\n"
|
|
36734 |
+"</table>\n"
|
|
36735 |
+"<br>\n"
|
|
36736 |
+"<form>\n"
|
|
36737 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
36738 |
+"<table border='1' width='100%'>\n"
|
|
36739 |
+" <tr>\n"
|
|
36740 |
+" <td bgcolor='olive'><pre><b>新規 セクション:</b></pre></td>\n"
|
|
36741 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
36742 |
+"</table>\n"
|
|
36743 |
+"<table width='100%' cellpadding='10'>\n"
|
|
36744 |
+"<tr><td>\n"
|
|
36745 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
36746 |
+" <tr>\n"
|
|
36747 |
+" <td><pre>タイトル:</pre></td>\n"
|
|
36748 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
36749 |
+" </table>\n"
|
|
36750 |
+" </td></tr>\n"
|
|
36751 |
+"</table>\n"
|
|
36752 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
36753 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
36754 |
+" <input type='submit' name='submit' value='適用'></td></tr>\n"
|
|
36755 |
+"</table>\n"
|
|
36756 |
+"</form>\n"
|
|
36757 |
+"</body>\n"
|
|
36758 |
+"</html>\n"
|
|
36759 |
+"\n"
|
|
36760 |
+
|
|
36761 |
+#: dpi/bookmarks.c:283
|
|
36762 |
+msgid ""
|
|
36763 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36764 |
+"<html>\n"
|
|
36765 |
+"<head>\n"
|
|
36766 |
+"<title>Bookmarks</title>\n"
|
|
36767 |
+"</head>\n"
|
|
36768 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36769 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36770 |
+" <tr><td colspan='2'>\n"
|
|
36771 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
36772 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: update\n"
|
|
36773 |
+" </td></tr></table></td></tr>\n"
|
|
36774 |
+"</table>\n"
|
|
36775 |
+"<br>\n"
|
|
36776 |
+"<form>\n"
|
|
36777 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
36778 |
+msgstr ""
|
|
36779 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36780 |
+"<html>\n"
|
|
36781 |
+"<head>\n"
|
|
36782 |
+"<title>ブックマーク</title>\n"
|
|
36783 |
+"</head>\n"
|
|
36784 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36785 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36786 |
+" <tr><td colspan='2'>\n"
|
|
36787 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
36788 |
+" <tr><td bgcolor='#b4b4b4'><pre> ブックマークの変更:: アップデート</"
|
|
36789 |
+"pre>\n"
|
|
36790 |
+" </td></tr></table></td></tr>\n"
|
|
36791 |
+"</table>\n"
|
|
36792 |
+"<br>\n"
|
|
36793 |
+"<form>\n"
|
|
36794 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
36795 |
+
|
|
36796 |
+#: dpi/bookmarks.c:310
|
|
36797 |
+#, c-format
|
|
36798 |
+msgid ""
|
|
36799 |
+"<tr><td>\n"
|
|
36800 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
36801 |
+" <tr>\n"
|
|
36802 |
+" <td>Title:</td>\n"
|
|
36803 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
36804 |
+" value='%s'></td></tr>\n"
|
|
36805 |
+" <tr>\n"
|
|
36806 |
+" <td>URL:</td>\n"
|
|
36807 |
+" <td>%s</td></tr>\n"
|
|
36808 |
+" </table>\n"
|
|
36809 |
+" </td></tr>\n"
|
|
36810 |
+msgstr ""
|
|
36811 |
+"<tr><td>\n"
|
|
36812 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
36813 |
+" <tr>\n"
|
|
36814 |
+" <td><pre>タイトル:</pre></td>\n"
|
|
36815 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
36816 |
+" value='%s'></td></tr>\n"
|
|
36817 |
+" <tr>\n"
|
|
36818 |
+" <td>URL:</td>\n"
|
|
36819 |
+" <td>%s</td></tr>\n"
|
|
36820 |
+" </table>\n"
|
|
36821 |
+" </td></tr>\n"
|
|
36822 |
+
|
|
36823 |
+#: dpi/bookmarks.c:323
|
|
36824 |
+#, c-format
|
|
36825 |
+msgid ""
|
|
36826 |
+"<tr><td>\n"
|
|
36827 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
36828 |
+" <tr>\n"
|
|
36829 |
+" <td>Title:</td>\n"
|
|
36830 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
36831 |
+" value='%s'></td></tr>\n"
|
|
36832 |
+" </table>\n"
|
|
36833 |
+" </td></tr>\n"
|
|
36834 |
+msgstr ""
|
|
36835 |
+"<tr><td>\n"
|
|
36836 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
36837 |
+" <tr>\n"
|
|
36838 |
+" <td><pre>タイトル:</pre></td>\n"
|
|
36839 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
36840 |
+" value='%s'></td></tr>\n"
|
|
36841 |
+" </table>\n"
|
|
36842 |
+" </td></tr>\n"
|
|
36843 |
+
|
|
36844 |
+#: dpi/bookmarks.c:336
|
|
36845 |
+#, c-format
|
|
36846 |
+msgid ""
|
|
36847 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
36848 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
36849 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
36850 |
+"</table>\n"
|
|
36851 |
+"</form>\n"
|
|
36852 |
+"</body>\n"
|
|
36853 |
+"</html>\n"
|
|
36854 |
+msgstr ""
|
|
36855 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
36856 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
36857 |
+" <input type='submit' name='submit' value='適用'></td></tr>\n"
|
|
36858 |
+"</table>\n"
|
|
36859 |
+"</form>\n"
|
|
36860 |
+"</body>\n"
|
|
36861 |
+"</html>\n"
|
|
36862 |
+
|
|
36863 |
+#: dpi/bookmarks.c:346
|
|
36864 |
+msgid ""
|
|
36865 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36866 |
+"<html>\n"
|
|
36867 |
+"<head>\n"
|
|
36868 |
+"<title>Bookmarks</title>\n"
|
|
36869 |
+"</head>\n"
|
|
36870 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36871 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36872 |
+" <tr><td colspan='2'>\n"
|
|
36873 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
36874 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add url\n"
|
|
36875 |
+" </td></tr></table></td></tr>\n"
|
|
36876 |
+"</table>\n"
|
|
36877 |
+"<br>\n"
|
|
36878 |
+"<form>\n"
|
|
36879 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
36880 |
+"<table border='1' width='100%'>\n"
|
|
36881 |
+" <tr>\n"
|
|
36882 |
+" <td bgcolor='olive'><b>Add url:</b></td>\n"
|
|
36883 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
36884 |
+"</table>\n"
|
|
36885 |
+"<table width='100%' cellpadding='10'>\n"
|
|
36886 |
+"<tr><td>\n"
|
|
36887 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
36888 |
+" <tr>\n"
|
|
36889 |
+" <td>Title:</td>\n"
|
|
36890 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
36891 |
+" <tr>\n"
|
|
36892 |
+" <td>URL:</td>\n"
|
|
36893 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
36894 |
+" </table>\n"
|
|
36895 |
+" </td></tr>\n"
|
|
36896 |
+"</table>\n"
|
|
36897 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
36898 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
36899 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
36900 |
+"</table>\n"
|
|
36901 |
+"</form>\n"
|
|
36902 |
+"</body>\n"
|
|
36903 |
+"</html>\n"
|
|
36904 |
+msgstr ""
|
|
36905 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
36906 |
+"<html>\n"
|
|
36907 |
+"<head>\n"
|
|
36908 |
+"<title>ブックマーク</title>\n"
|
|
36909 |
+"</head>\n"
|
|
36910 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
36911 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
36912 |
+" <tr><td colspan='2'>\n"
|
|
36913 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
36914 |
+" <tr><td bgcolor='#b4b4b4'><pre> ブックマークの変更:: URLの追加</"
|
|
36915 |
+"pre>\n"
|
|
36916 |
+" </td></tr></table></td></tr>\n"
|
|
36917 |
+"</table>\n"
|
|
36918 |
+"<br>\n"
|
|
36919 |
+"<form>\n"
|
|
36920 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
36921 |
+"<table border='1' width='100%'>\n"
|
|
36922 |
+" <tr>\n"
|
|
36923 |
+" <td bgcolor='olive'><pre><b>URLの追加:</b></pre></td>\n"
|
|
36924 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
36925 |
+"</table>\n"
|
|
36926 |
+"<table width='100%' cellpadding='10'>\n"
|
|
36927 |
+"<tr><td>\n"
|
|
36928 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
36929 |
+" <tr>\n"
|
|
36930 |
+" <td><pre>タイトル:</pre></td>\n"
|
|
36931 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
36932 |
+" <tr>\n"
|
|
36933 |
+" <td>URL:</td>\n"
|
|
36934 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
36935 |
+" </table>\n"
|
|
36936 |
+" </td></tr>\n"
|
|
36937 |
+"</table>\n"
|
|
36938 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
36939 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
36940 |
+" <input type='submit' name='submit' value='適用'></td></tr>\n"
|
|
36941 |
+"</table>\n"
|
|
36942 |
+"</form>\n"
|
|
36943 |
+"</body>\n"
|
|
36944 |
+"</html>\n"
|
|
36945 |
+
|
|
36946 |
+#: dpi/bookmarks.c:691
|
|
36947 |
+msgid "Unclassified"
|
|
36948 |
+msgstr "未分類"
|
|
36949 |
+
|
|
36950 |
+#: dpi/bookmarks.c:724
|
|
36951 |
+#, c-format
|
|
36952 |
+msgid "echo \":s0: Unclassified\" > %s"
|
|
36953 |
+msgstr "echo \":s0: 未分類\" > %s"
|
|
36954 |
+
|
|
36955 |
+#: dpi/bookmarks.c:786
|
|
36956 |
+#, c-format
|
|
36957 |
+msgid ""
|
|
36958 |
+"Syntax error in bookmarks file:\n"
|
|
36959 |
+" %s"
|
|
36960 |
+msgstr "ブックマークファイルで構文エラー: %s"
|
|
36961 |
+
|
|
36962 |
+#: dpi/bookmarks.c:898
|
|
36963 |
+msgid "Added bookmark!"
|
|
36964 |
+msgstr "ブックマークに追加しました!"
|
|
36965 |
+
|
|
36966 |
+#: dpi/bookmarks.c:1087
|
|
36967 |
+msgid "Update sections:"
|
|
36968 |
+msgstr "<pre>セクションの更新:</pre>"
|
|
36969 |
+
|
|
36970 |
+#: dpi/bookmarks.c:1107
|
|
36971 |
+msgid "Update titles:"
|
|
36972 |
+msgstr "<pre>タイトルの更新:</pre>"
|
|
36973 |
+
|
|
36974 |
+#: dpi/bookmarks.c:1404
|
|
36975 |
+msgid "Delete: you must mark what to delete!"
|
|
36976 |
+msgstr "削除: 削除したい項目をマークして下さい!"
|
|
36977 |
+
|
|
36978 |
+#: dpi/bookmarks.c:1410
|
|
36979 |
+msgid "Move: you must mark a target section!"
|
|
36980 |
+msgstr "移動: 移動先のセクションをマークして下さい!"
|
|
36981 |
+
|
|
36982 |
+#: dpi/bookmarks.c:1412
|
|
36983 |
+msgid "Move: can not move a section (yet)."
|
|
36984 |
+msgstr "移動: (まだ)セクションを移動できません。"
|
|
36985 |
+
|
|
36986 |
+#: dpi/bookmarks.c:1414
|
|
36987 |
+msgid "Move: you must mark some urls, and a target section!"
|
|
36988 |
+msgstr "移動: URL(複数可)と移動先のセクションを選択して下さい!"
|
|
36989 |
+
|
|
36990 |
+#: dpi/bookmarks.c:1419
|
|
36991 |
+msgid "Modify: you must mark what to update!"
|
|
36992 |
+msgstr "変更: 更新したい項目をマークして下さい!"
|
|
36993 |
+
|
|
36994 |
+#: dpi/bookmarks.c:1436
|
|
36995 |
+msgid "Add url: only one target section is allowed!"
|
|
36996 |
+msgstr "URLの追加: セクションを一つだけ選択して下さい!"
|
|
36997 |
+
|
|
36998 |
+#: dpi/bookmarks.c:1443
|
|
36999 |
+msgid "No operation, just do nothing!"
|
|
37000 |
+msgstr "命令が何も選択されていません!"
|
|
37001 |
+
|
|
37002 |
+#: dpi/bookmarks.c:1446
|
|
37003 |
+msgid "Sorry, not implemented yet."
|
|
37004 |
+msgstr "すみません、まだ実装されていません。"
|
|
37005 |
+
|
|
37006 |
+#: dpi/bookmarks.c:1614
|
|
37007 |
+msgid "Haven't got a full tag!\n"
|
|
37008 |
+msgstr "十分なタグを得ていません!\n"
|
|
37009 |
+
|
|
37010 |
+#: dpi/bookmarks.c:1690
|
|
37011 |
+msgid ""
|
|
37012 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
37013 |
+"<HTML><body> Error on the bookmarks server...</body></html>"
|
|
37014 |
+msgstr ""
|
|
37015 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
37016 |
+"<HTML><body> ブックマークサーバーのエラーです...</body></html>"
|
|
37017 |
+
|
|
37018 |
+#: config/dillocfg.c:84
|
|
37019 |
+msgid "Quit"
|
|
37020 |
+msgstr "終了"
|
|
37021 |
+
|
|
37022 |
+#: config/dillocfg.c:86 config/dillocfg.c:92
|
|
37023 |
+msgid "Dillo Preferences"
|
|
37024 |
+msgstr "Dillo 設定"
|
|
37025 |
+
|
|
37026 |
+#: config/dillocfg.c:115
|
|
37027 |
+msgid "Interface"
|
|
37028 |
+msgstr "インターフェース"
|
|
37029 |
+
|
|
37030 |
+#: config/dillocfg.c:116
|
|
37031 |
+msgid " Font "
|
|
37032 |
+msgstr " フォント "
|
|
37033 |
+
|
|
37034 |
+#: config/dillocfg.c:117
|
|
37035 |
+msgid " Color "
|
|
37036 |
+msgstr " 色 "
|
|
37037 |
+
|
|
37038 |
+#: config/dillocfg.c:118
|
|
37039 |
+msgid " Network "
|
|
37040 |
+msgstr " ネットワーク "
|
|
37041 |
+
|
|
37042 |
+#: config/dillocfg.c:120
|
|
37043 |
+msgid " Tab "
|
|
37044 |
+msgstr " タブ "
|
|
37045 |
+
|
|
37046 |
+#: config/dillocfg.c:123
|
|
37047 |
+msgid " Other "
|
|
37048 |
+msgstr " その他 "
|
|
37049 |
+
|
|
37050 |
+#: config/dillocfg.c:331
|
|
37051 |
+msgid "Add"
|
|
37052 |
+msgstr "追加"
|
|
37053 |
+
|
|
37054 |
+#: config/dillocfg.c:332
|
|
37055 |
+msgid "Delete"
|
|
37056 |
+msgstr "削除"
|
|
37057 |
+
|
|
37058 |
+#: config/dillocfg.c:338
|
|
37059 |
+msgid "Address"
|
|
37060 |
+msgstr "アドレス"
|
|
37061 |
+
|
|
37062 |
+#: config/dillocfg.c:339
|
|
37063 |
+msgid "Rule"
|
|
37064 |
+msgstr "ルール"
|
|
37065 |
+
|
|
37066 |
+#: config/dillocfg.c:365 config/dillocfg.c:371
|
|
37067 |
+#, c-format
|
|
37068 |
+msgid "Read failed <%s>\n"
|
|
37069 |
+msgstr "<%s>の読み込みに失敗しました\n"
|
|
37070 |
+
|
|
37071 |
+#: config/dillocfg.c:452 config/dillocfg.c:460
|
|
37072 |
+#, c-format
|
|
37073 |
+msgid "can't write <%s>\n"
|
|
37074 |
+msgstr "<%s>に書き込めません\n"
|
|
37075 |
+
|
|
37076 |
+#: config/dillocfg_token.c:60
|
|
37077 |
+msgid "Window Size"
|
|
37078 |
+msgstr "Windowの大きさ"
|
|
37079 |
+
|
|
37080 |
+#: config/dillocfg_token.c:68
|
|
37081 |
+msgid "HTTP Proxy"
|
|
37082 |
+msgstr "HTTPプロキシ"
|
|
37083 |
+
|
|
37084 |
+#: config/dillocfg_token.c:76
|
|
37085 |
+msgid "HTTP Proxy User"
|
|
37086 |
+msgstr "HTTPプロキシユーザー"
|
|
37087 |
+
|
|
37088 |
+#: config/dillocfg_token.c:84
|
|
37089 |
+msgid "NO Proxy"
|
|
37090 |
+msgstr "プロキシを使わないのは"
|
|
37091 |
+
|
|
37092 |
+#: config/dillocfg_token.c:92
|
|
37093 |
+msgid "User-Agent"
|
|
37094 |
+msgstr "ユーザーエージェント"
|
|
37095 |
+
|
|
37096 |
+#: config/dillocfg_token.c:100
|
|
37097 |
+msgid "Send referer header"
|
|
37098 |
+msgstr "リファラヘッダを送信する"
|
|
37099 |
+
|
|
37100 |
+#: config/dillocfg_token.c:108
|
|
37101 |
+msgid "Link color"
|
|
37102 |
+msgstr "未訪問リンクの色"
|
|
37103 |
+
|
|
37104 |
+#: config/dillocfg_token.c:116
|
|
37105 |
+msgid "Visited color"
|
|
37106 |
+msgstr "訪問済みリンクの色"
|
|
37107 |
+
|
|
37108 |
+#: config/dillocfg_token.c:124
|
|
37109 |
+msgid "BackGround color"
|
|
37110 |
+msgstr "背景の色"
|
|
37111 |
+
|
|
37112 |
+#: config/dillocfg_token.c:132
|
|
37113 |
+msgid "Allow white bg"
|
|
37114 |
+msgstr "白い背景を許可する"
|
|
37115 |
+
|
|
37116 |
+#: config/dillocfg_token.c:140
|
|
37117 |
+msgid "Force my colors"
|
|
37118 |
+msgstr "常に設定した色で表示する"
|
|
37119 |
+
|
|
37120 |
+#: config/dillocfg_token.c:148
|
|
37121 |
+msgid "Contrast visited color"
|
|
37122 |
+msgstr "訪問済みリンクを正反対の色で表示する"
|
|
37123 |
+
|
|
37124 |
+#: config/dillocfg_token.c:156
|
|
37125 |
+msgid "Text color"
|
|
37126 |
+msgstr "テキストの色"
|
|
37127 |
+
|
|
37128 |
+#: config/dillocfg_token.c:164
|
|
37129 |
+msgid "Use oblique"
|
|
37130 |
+msgstr "イタリックではなく斜体を使う"
|
|
37131 |
+
|
|
37132 |
+#: config/dillocfg_token.c:172
|
|
37133 |
+msgid "Start Page"
|
|
37134 |
+msgstr "開始ページ"
|
|
37135 |
+
|
|
37136 |
+#: config/dillocfg_token.c:180
|
|
37137 |
+msgid "HOMEPAGE"
|
|
37138 |
+msgstr "ホームページ"
|
|
37139 |
+
|
|
37140 |
+#: config/dillocfg_token.c:188
|
|
37141 |
+msgid "Search-engine's URL"
|
|
37142 |
+msgstr "検索エンジンのURL"
|
|
37143 |
+
|
|
37144 |
+#: config/dillocfg_token.c:196
|
|
37145 |
+msgid "Search-engine's charset"
|
|
37146 |
+msgstr "検索エンジンの文字コード"
|
|
37147 |
+
|
|
37148 |
+#: config/dillocfg_token.c:204
|
|
37149 |
+msgid "Show Tooltip"
|
|
37150 |
+msgstr "ツールチップを表示"
|
|
37151 |
+
|
|
37152 |
+#: config/dillocfg_token.c:212
|
|
37153 |
+msgid "Panel Size"
|
|
37154 |
+msgstr "パネルの大きさ"
|
|
37155 |
+
|
|
37156 |
+#: config/dillocfg_token.c:220
|
|
37157 |
+msgid "Small icons"
|
|
37158 |
+msgstr "小さいアイコン"
|
|
37159 |
+
|
|
37160 |
+#: config/dillocfg_token.c:228
|
|
37161 |
+msgid "Limit text width"
|
|
37162 |
+msgstr "テキストの幅を制限する"
|
|
37163 |
+
|
|
37164 |
+#: config/dillocfg_token.c:236
|
|
37165 |
+msgid "Limit font decoration"
|
|
37166 |
+msgstr "フォントの飾りを制限する"
|
|
37167 |
+
|
|
37168 |
+#: config/dillocfg_token.c:244
|
|
37169 |
+msgid "Font factor"
|
|
37170 |
+msgstr "フォントの倍率"
|
|
37171 |
+
|
|
37172 |
+#: config/dillocfg_token.c:252
|
|
37173 |
+msgid "Font Sizes"
|
|
37174 |
+msgstr "フォントの大きさ"
|
|
37175 |
+
|
|
37176 |
+#: config/dillocfg_token.c:260
|
|
37177 |
+msgid "W3C+heuristics"
|
|
37178 |
+msgstr "W3C+ヒューリスティック"
|
|
37179 |
+
|
|
37180 |
+#: config/dillocfg_token.c:268
|
|
37181 |
+msgid "Use dicache"
|
|
37182 |
+msgstr "画像を非圧縮でキャッシュする"
|
|
37183 |
+
|
|
37184 |
+#: config/dillocfg_token.c:276
|
|
37185 |
+msgid "Show Back"
|
|
37186 |
+msgstr "戻るを表示"
|
|
37187 |
+
|
|
37188 |
+#: config/dillocfg_token.c:284
|
|
37189 |
+msgid "Show Forw"
|
|
37190 |
+msgstr "進むを表示"
|
|
37191 |
+
|
|
37192 |
+#: config/dillocfg_token.c:292
|
|
37193 |
+msgid "Show Home"
|
|
37194 |
+msgstr "ホームを表示"
|
|
37195 |
+
|
|
37196 |
+#: config/dillocfg_token.c:300
|
|
37197 |
+msgid "Show Reload"
|
|
37198 |
+msgstr "再読込を表示"
|
|
37199 |
+
|
|
37200 |
+#: config/dillocfg_token.c:308
|
|
37201 |
+msgid "Show Save"
|
|
37202 |
+msgstr "保存を表示"
|
|
37203 |
+
|
|
37204 |
+#: config/dillocfg_token.c:316
|
|
37205 |
+msgid "Show Stop"
|
|
37206 |
+msgstr "停止を表示"
|
|
37207 |
+
|
|
37208 |
+#: config/dillocfg_token.c:324
|
|
37209 |
+msgid "Show Bookmarks"
|
|
37210 |
+msgstr "ブックマークを表示"
|
|
37211 |
+
|
|
37212 |
+#: config/dillocfg_token.c:332
|
|
37213 |
+msgid "Show Menubar"
|
|
37214 |
+msgstr "メニューバーを表示"
|
|
37215 |
+
|
|
37216 |
+#: config/dillocfg_token.c:340
|
|
37217 |
+msgid "Show ClearURL"
|
|
37218 |
+msgstr "URLクリアを表示"
|
|
37219 |
+
|
|
37220 |
+#: config/dillocfg_token.c:348
|
|
37221 |
+msgid "Show URL box"
|
|
37222 |
+msgstr "URLボックスを表示"
|
|
37223 |
+
|
|
37224 |
+#: config/dillocfg_token.c:356
|
|
37225 |
+msgid "Show Web Search"
|
|
37226 |
+msgstr "Web検索を表示"
|
|
37227 |
+
|
|
37228 |
+#: config/dillocfg_token.c:364
|
|
37229 |
+msgid "Show Progress box"
|
|
37230 |
+msgstr "プログレスボックスを表示"
|
|
37231 |
+
|
|
37232 |
+#: config/dillocfg_token.c:372
|
|
37233 |
+msgid "Show Popup navigation"
|
|
37234 |
+msgstr "ポップアップナビゲーションを表示"
|
|
37235 |
+
|
|
37236 |
+#: config/dillocfg_token.c:380
|
|
37237 |
+msgid "Fullwindow start"
|
|
37238 |
+msgstr "フルウインドウで開始する"
|
|
37239 |
+
|
|
37240 |
+#: config/dillocfg_token.c:388
|
|
37241 |
+msgid "Transient dialogs"
|
|
37242 |
+msgstr "一時的なダイアログを許可する"
|
|
37243 |
+
|
|
37244 |
+#: config/dillocfg_token.c:396
|
|
37245 |
+msgid "Popup dialogs"
|
|
37246 |
+msgstr "ダイアログをポップアップする"
|
|
37247 |
+
|
|
37248 |
+#: config/dillocfg_token.c:404
|
|
37249 |
+msgid "vw_aafontname"
|
|
37250 |
+msgstr "AA時のプロポーショナルフォント"
|
|
37251 |
+
|
|
37252 |
+#: config/dillocfg_token.c:412
|
|
37253 |
+msgid "fw_aafontname"
|
|
37254 |
+msgstr "AA時の固定幅フォント"
|
|
37255 |
+
|
|
37256 |
+#: config/dillocfg_token.c:420
|
|
37257 |
+msgid "vw_fontname"
|
|
37258 |
+msgstr "プロポーショナルフォント"
|
|
37259 |
+
|
|
37260 |
+#: config/dillocfg_token.c:428
|
|
37261 |
+msgid "fw_fontname"
|
|
37262 |
+msgstr "固定幅フォント"
|
|
37263 |
+
|
|
37264 |
+#: config/dillocfg_token.c:436
|
|
37265 |
+msgid "Generate submit"
|
|
37266 |
+msgstr "送信ボタンの自動生成"
|
|
37267 |
+
|
|
37268 |
+#: config/dillocfg_token.c:444
|
|
37269 |
+msgid "Enterpress forces submit"
|
|
37270 |
+msgstr "Enterキーでフォームの送信"
|
|
37271 |
+
|
|
37272 |
+#: config/dillocfg_token.c:452
|
|
37273 |
+msgid "Show debugging messsages"
|
|
37274 |
+msgstr "デバッグメッセージの表示"
|
|
37275 |
+
|
|
37276 |
+#: config/dillocfg_token.c:460
|
|
37277 |
+msgid "Show Extra Warnings"
|
|
37278 |
+msgstr "余分な警告を表示"
|
|
37279 |
+
|
|
37280 |
+#: config/dillocfg_token.c:468
|
|
37281 |
+msgid "Focus location on new"
|
|
37282 |
+msgstr "新規WindowでURLバーにフォーカスする"
|
|
37283 |
+
|
|
37284 |
+#: config/dillocfg_token.c:476 config/dillocfg_token.c:484
|
|
37285 |
+msgid "Accept Language"
|
|
37286 |
+msgstr "Accept Language"
|
|
37287 |
+
|
|
37288 |
+#: config/dillocfg_token.c:493
|
|
37289 |
+msgid "Tab load in background"
|
|
37290 |
+msgstr "タブを裏で開く"
|
|
37291 |
+
|
|
37292 |
+#: config/dillocfg_token.c:501
|
|
37293 |
+msgid "Tab close middle click"
|
|
37294 |
+msgstr "タブを中クリックで閉じる"
|
|
37295 |
+
|
|
37296 |
+#: config/dillocfg_token.c:509
|
|
37297 |
+msgid "Tab instead of window"
|
|
37298 |
+msgstr "Windowの代わりにタブで開く"
|
|
37299 |
+
|
|
37300 |
+#: config/dillocfg_token.c:517
|
|
37301 |
+msgid "Tab bar show fullscreen"
|
|
37302 |
+msgstr "フルスクリーンでタブバーを表示"
|
|
37303 |
+
|
|
37304 |
+#: config/dillocfg_token.c:525
|
|
37305 |
+msgid "Tab bar show single tab"
|
|
37306 |
+msgstr "タブが一つでも表示する"
|
|
37307 |
+
|
|
37308 |
+#: config/dillocfg_token.c:533
|
|
37309 |
+msgid "Tab bar scroller"
|
|
37310 |
+msgstr "タブバーにスクロールボタンを表示"
|
|
37311 |
+
|
|
37312 |
+#: config/dillocfg_token.c:541
|
|
37313 |
+msgid "Tab bar homogeneous"
|
|
37314 |
+msgstr "タブを全て同じ幅にする"
|
|
37315 |
+
|
|
37316 |
+#: config/dillocfg_token.c:549
|
|
37317 |
+msgid "Tab title compress"
|
|
37318 |
+msgstr "タブのタイトルを圧縮する"
|
|
37319 |
+
|
|
37320 |
+#: config/dillocfg_token.c:557
|
|
37321 |
+msgid "Compress vowels"
|
|
37322 |
+msgstr "省略する文字"
|
|
37323 |
+
|
|
37324 |
+#: config/dillocfg_token.c:565
|
|
37325 |
+msgid "Compress_common_prefixes"
|
|
37326 |
+msgstr "省略する接頭語"
|
|
37327 |
+
|
|
37328 |
+#: config/dillocfg_token.c:574
|
|
37329 |
+msgid "Default"
|
|
37330 |
+msgstr "デフォルト"
|
|
37331 |
+
|
|
37332 |
+#~ msgid ""
|
|
37333 |
+#~ " URL URL to browse.\n"
|
|
37334 |
+#~ " FILE Local FILE to view.\n"
|
|
37335 |
+#~ msgstr ""
|
|
37336 |
+#~ " URL ブラウズするURL\n"
|
|
37337 |
+#~ " FILE 表示するローカルファイル\n"
|
|
37338 |
+
|
|
37339 |
+#~ msgid "realm"
|
|
37340 |
+#~ msgstr "領域"
|
|
37341 |
+
|
|
37342 |
+#~ msgid " -f, --fullwindow Start in full window mode."
|
|
37343 |
+#~ msgstr " -f, --fullwindow フルウインドウで開始します"
|
|
37344 |
+
|
|
37345 |
+#~ msgid "Character entities for ASCII [129-159] are 'undefined' for HTML\n"
|
|
37346 |
+#~ msgstr "HTMLではASCII [129-159]の文字実体参照が未定義です。\n"
|
|
37347 |
+
|
|
37348 |
+#~ msgid "first character of '%s' value is outside the [A-Za-z] set\n"
|
|
37349 |
+#~ msgstr "'%s'の最初の文字が[A-Za-z]以外です\n"
|
|
37350 |
+
|
|
37351 |
+#~ msgid "not found ' or \" in <meta> tag!\n"
|
|
37352 |
+#~ msgstr "<meta>タグ内に ' または \" が見つかりません。\n"
|
|
37353 |
+
|
|
37354 |
+#~ msgid "<meta> outside of <head>! or not found charset.\n"
|
|
37355 |
+#~ msgstr "<head>の外側に<meta>があるか、charsetが見つかりません。\n"
|
|
37356 |
+
|
|
37357 |
+#~ msgid "Close Find Text"
|
|
37358 |
+#~ msgstr "テキストの検索を閉じる"
|
|
37359 |
+
|
|
37360 |
+#~ msgid "get_command failed\n"
|
|
37361 |
+#~ msgstr "get_commandが失敗しました\n"
|
|
37362 |
+
|
|
37363 |
+#~ msgid "Clear the url-box!"
|
|
37364 |
+#~ msgstr "URLボックスをクリア"
|
|
37365 |
+
|
|
37366 |
+#~ msgid "Go to next page"
|
|
37367 |
+#~ msgstr "次のページに進む"
|
|
37368 |
+
|
|
37369 |
+#~ msgid "Show HTML bugs"
|
|
37370 |
+#~ msgstr "HTMLのバグを表示"
|
|
37371 |
+
|
|
37372 |
+#~ msgid "Directory listing of"
|
|
37373 |
+#~ msgstr "ディレクトリの一覧 "
|
|
37374 |
+
|
|
37375 |
+#~ msgid "Parent directory"
|
|
37376 |
+#~ msgstr "上のディレクトリ"
|
|
37377 |
+
|
|
37378 |
+#~ msgid "ERROR: Can't find %s %s"
|
|
37379 |
+#~ msgstr "エラー: %s %sを見つけられません"
|
|
37380 |
+
|
|
37381 |
+#~ msgid "Warning: Can't find <%s>\n"
|
|
37382 |
+#~ msgstr "警告: <%s>を見つけられません\n"
|
|
37383 |
+
|
|
37384 |
+#~ msgid "Add Bookmark for Link"
|
|
37385 |
+#~ msgstr "リンクをブックマークに追加"
|
|
37386 |
+
|
|
37387 |
+#~ msgid "ERROR: suspicious username: %s\n"
|
|
37388 |
+#~ msgstr "エラー: 疑わしいユーザー名: %s\n"
|
|
37389 |
+
|
|
37390 |
+#~ msgid "Server NOT running\n"
|
|
37391 |
+#~ msgstr "サーバーが起動していません。\n"
|
|
37392 |
+
|
|
37393 |
+#~ msgid "<waited %d cycles for server to be on line>\n"
|
|
37394 |
+#~ msgstr "<サーバーをこの行で%dサイクル待ちました>\n"
|
|
37395 |
+
|
|
37396 |
+#~ msgid "Tab"
|
|
37397 |
+#~ msgstr "タブ"
|
|
37398 |
+
|
|
37399 |
+#~ msgid "Window Width"
|
|
37400 |
+#~ msgstr "Windowの横幅"
|
|
37401 |
+
|
|
37402 |
+#~ msgid "Window Height"
|
|
37403 |
+#~ msgstr "Windowの高さ"
|
|
37404 |
+
|
|
37405 |
+#~ msgid "broken JIS code!\n"
|
|
37406 |
+#~ msgstr "破損したJISコードです\n"
|
|
37407 |
+
|
|
37408 |
+#~ msgid "guess maybe mistaken. recheck charset.\n"
|
|
37409 |
+#~ msgstr "推測に失敗した可能性があります。文字コードを再チェックします。\n"
|
|
37410 |
+
|
|
37411 |
+#~ msgid "not found meta tag charset.\n"
|
|
37412 |
+#~ msgstr "metaタグにcharsetが見つかりません。\n"
|
|
37413 |
+
|
|
37414 |
+#~ msgid "Setting locale to %s...\n"
|
|
37415 |
+#~ msgstr "LOCALEを%sに設定しています...\n"
|
|
37416 |
diff -pruN dillo-0.8.6/po/quot.sed dillo-0.8.6-i18n-misc-20070916/po/quot.sed
|
|
37417 |
--- dillo-0.8.6/po/quot.sed 1970-01-01 09:00:00.000000000 +0900
|
|
37418 |
+++ dillo-0.8.6-i18n-misc-20070916/po/quot.sed 2006-05-16 01:21:06.000000000 +0900
|
|
37419 |
@@ -0,0 +1,6 @@
|
|
37420 |
+s/"\([^"]*\)"/“\1”/g
|
|
37421 |
+s/`\([^`']*\)'/‘\1’/g
|
|
37422 |
+s/ '\([^`']*\)' / ‘\1’ /g
|
|
37423 |
+s/ '\([^`']*\)'$/ ‘\1’/g
|
|
37424 |
+s/^'\([^`']*\)' /‘\1’ /g
|
|
37425 |
+s/“”/""/g
|
|
37426 |
diff -pruN dillo-0.8.6/po/remove-potcdate.sin dillo-0.8.6-i18n-misc-20070916/po/remove-potcdate.sin
|
|
37427 |
--- dillo-0.8.6/po/remove-potcdate.sin 1970-01-01 09:00:00.000000000 +0900
|
|
37428 |
+++ dillo-0.8.6-i18n-misc-20070916/po/remove-potcdate.sin 2006-05-16 01:21:06.000000000 +0900
|
|
37429 |
@@ -0,0 +1,19 @@
|
|
37430 |
+# Sed script that remove the POT-Creation-Date line in the header entry
|
|
37431 |
+# from a POT file.
|
|
37432 |
+#
|
|
37433 |
+# The distinction between the first and the following occurrences of the
|
|
37434 |
+# pattern is achieved by looking at the hold space.
|
|
37435 |
+/^"POT-Creation-Date: .*"$/{
|
|
37436 |
+x
|
|
37437 |
+# Test if the hold space is empty.
|
|
37438 |
+s/P/P/
|
|
37439 |
+ta
|
|
37440 |
+# Yes it was empty. First occurrence. Remove the line.
|
|
37441 |
+g
|
|
37442 |
+d
|
|
37443 |
+bb
|
|
37444 |
+:a
|
|
37445 |
+# The hold space was nonempty. Following occurrences. Do nothing.
|
|
37446 |
+x
|
|
37447 |
+:b
|
|
37448 |
+}
|
|
37449 |
バイナリー・ファイルdillo-0.8.6/po/zh_CN.gmoとdillo-0.8.6-i18n-misc-20070916/po/zh_CN.gmoは違います
|
|
37450 |
diff -pruN dillo-0.8.6/po/zh_CN.po dillo-0.8.6-i18n-misc-20070916/po/zh_CN.po
|
|
37451 |
--- dillo-0.8.6/po/zh_CN.po 1970-01-01 09:00:00.000000000 +0900
|
|
37452 |
+++ dillo-0.8.6-i18n-misc-20070916/po/zh_CN.po 2007-09-09 15:45:04.000000000 +0900
|
|
37453 |
@@ -0,0 +1,2129 @@
|
|
37454 |
+# Dillo Chinese Translation.
|
|
37455 |
+# Copyright (C) YEAR Free Software Foundation, Inc.
|
|
37456 |
+# This file is distributed under the same license as the PACKAGE package.
|
|
37457 |
+# Babyfai Cheung <babyfai1@yahoo.com.hk>, 2005.
|
|
37458 |
+msgid ""
|
|
37459 |
+msgstr ""
|
|
37460 |
+"Project-Id-Version: Dillo 0.8.4-i18n-misc\n"
|
|
37461 |
+"Report-Msgid-Bugs-To: \n"
|
|
37462 |
+"POT-Creation-Date: 2007-09-09 15:45+0900\n"
|
|
37463 |
+"PO-Revision-Date: 2005-02-06 22:00+0800\n"
|
|
37464 |
+"Last-Translator: Babyfai Cheung <babyfai1@yahoo.com.hk>\n"
|
|
37465 |
+"Language-Team: NONE\n"
|
|
37466 |
+"MIME-Version: 1.0\n"
|
|
37467 |
+"Content-Type: text/plain; charset=UTF-8\n"
|
|
37468 |
+"Content-Transfer-Encoding: 8bit\n"
|
|
37469 |
+
|
|
37470 |
+#: src/msg.h:27
|
|
37471 |
+msgid "HTTP warning: "
|
|
37472 |
+msgstr ""
|
|
37473 |
+
|
|
37474 |
+#: src/auth.c:87
|
|
37475 |
+msgid "Browser Url has changed\n"
|
|
37476 |
+msgstr "浏览器位址已变更\n"
|
|
37477 |
+
|
|
37478 |
+#: src/cache.c:253
|
|
37479 |
+msgid "WARNING: Cache_entry_add, leaking an entry.\n"
|
|
37480 |
+msgstr ""
|
|
37481 |
+
|
|
37482 |
+#: src/cache.c:316
|
|
37483 |
+msgid "## Aborting CCCQuery\n"
|
|
37484 |
+msgstr "## 退出 CCCQuery\n"
|
|
37485 |
+
|
|
37486 |
+#: src/cache.c:319
|
|
37487 |
+msgid "## Aborting CCCAnswer\n"
|
|
37488 |
+msgstr "## 退出 CCCAnswer\n"
|
|
37489 |
+
|
|
37490 |
+#: src/cache.c:322
|
|
37491 |
+msgid "## Aborting raw2\n"
|
|
37492 |
+msgstr "## 退出 raw2\n"
|
|
37493 |
+
|
|
37494 |
+#: src/cache.c:365
|
|
37495 |
+msgid "## No more clients for this entry\n"
|
|
37496 |
+msgstr ""
|
|
37497 |
+
|
|
37498 |
+#: src/cache.c:369
|
|
37499 |
+msgid "Cache_prepare_reload: ERROR, entry still has clients\n"
|
|
37500 |
+msgstr ""
|
|
37501 |
+
|
|
37502 |
+#: src/cache.c:398
|
|
37503 |
+#, c-format
|
|
37504 |
+msgid "Reloading >%s< because it shouldn't be cached\n"
|
|
37505 |
+msgstr ""
|
|
37506 |
+
|
|
37507 |
+#: src/cache.c:418
|
|
37508 |
+msgid "ERROR: unsupported protocol"
|
|
37509 |
+msgstr "错误: 尚未支援的通讯协定"
|
|
37510 |
+
|
|
37511 |
+#: src/cache.c:488
|
|
37512 |
+#, c-format
|
|
37513 |
+msgid "Redirect loop for URL: >%s<\n"
|
|
37514 |
+msgstr "重导向回圈予 URL: >%s<\n"
|
|
37515 |
+
|
|
37516 |
+#: src/cache.c:590
|
|
37517 |
+#, c-format
|
|
37518 |
+msgid "Bad clocks, ignore expire on >%s<\n"
|
|
37519 |
+msgstr ""
|
|
37520 |
+
|
|
37521 |
+#: src/cache.c:594
|
|
37522 |
+#, c-format
|
|
37523 |
+msgid "Forcing min expire %d on >%s< instead %ld\n"
|
|
37524 |
+msgstr ""
|
|
37525 |
+
|
|
37526 |
+#: src/cache.c:678
|
|
37527 |
+msgid "'Cache-Control: max-age=' without 'Date: ' header"
|
|
37528 |
+msgstr ""
|
|
37529 |
+
|
|
37530 |
+#: src/cache.c:722
|
|
37531 |
+msgid "Server didn't send Content-Type in header.\n"
|
|
37532 |
+msgstr "服务器并未在标头中送出内容.\n"
|
|
37533 |
+
|
|
37534 |
+#: src/cache.c:743
|
|
37535 |
+#, c-format
|
|
37536 |
+msgid "Forcing default expire to query url >%s<\n"
|
|
37537 |
+msgstr ""
|
|
37538 |
+
|
|
37539 |
+#: src/cache.c:831
|
|
37540 |
+#, c-format
|
|
37541 |
+msgid "Cache_decode_data: got all data -- decodinging %s\n"
|
|
37542 |
+msgstr "Cache_decode_data: 收到全部资料 -- 正在解码 %s\n"
|
|
37543 |
+
|
|
37544 |
+#: src/cache.c:840
|
|
37545 |
+msgid "Cache_decode_data: not gzip data!\n"
|
|
37546 |
+msgstr "Cache_decode_data: 没有压缩资料!\n"
|
|
37547 |
+
|
|
37548 |
+#: src/cache.c:846
|
|
37549 |
+msgid "Cache_decode_data: invalid gzip data!\n"
|
|
37550 |
+msgstr "Cache_decode_data: 无效的压缩资料!\n"
|
|
37551 |
+
|
|
37552 |
+#: src/cache.c:898
|
|
37553 |
+msgid "not x-gzip\n"
|
|
37554 |
+msgstr "没有 X-压缩资料\n"
|
|
37555 |
+
|
|
37556 |
+#: src/cache.c:931
|
|
37557 |
+#, c-format
|
|
37558 |
+msgid ""
|
|
37559 |
+"Content-Length does NOT match message body,\n"
|
|
37560 |
+" at: %s\n"
|
|
37561 |
+msgstr ""
|
|
37562 |
+"发现不符长度的内容,\n"
|
|
37563 |
+" 在: %s\n"
|
|
37564 |
+
|
|
37565 |
+#: src/cache.c:950
|
|
37566 |
+msgid "Cache_process_io Op = IOAbort; not implemented yet\n"
|
|
37567 |
+msgstr ""
|
|
37568 |
+
|
|
37569 |
+#: src/cache.c:1004
|
|
37570 |
+#, c-format
|
|
37571 |
+msgid "ERROR: redirect loop for: %s"
|
|
37572 |
+msgstr "错误: 重导向回圈予: %s"
|
|
37573 |
+
|
|
37574 |
+#: src/cache.c:1015
|
|
37575 |
+#, c-format
|
|
37576 |
+msgid ""
|
|
37577 |
+">>>Redirect from: %s\n"
|
|
37578 |
+" to %s\n"
|
|
37579 |
+msgstr ""
|
|
37580 |
+">>>重导向从: %s\n"
|
|
37581 |
+" 至 %s\n"
|
|
37582 |
+
|
|
37583 |
+#: src/cache.c:1035
|
|
37584 |
+msgid ">>>Image redirection without entity-content<<<\n"
|
|
37585 |
+msgstr ">>>重导向影像,在无实质主题下<<<\n"
|
|
37586 |
+
|
|
37587 |
+#: src/cache.c:1037
|
|
37588 |
+msgid ">>>Image redirection with entity-content<<<\n"
|
|
37589 |
+msgstr ">>>重导向影像,在实质主题下<<<\n"
|
|
37590 |
+
|
|
37591 |
+#: src/cache.c:1103
|
|
37592 |
+msgid "FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n"
|
|
37593 |
+msgstr "重大错误:*** >>>> Cache_process_queue 系统繁忙 !!!\n"
|
|
37594 |
+
|
|
37595 |
+#: src/cache.c:1111
|
|
37596 |
+#, c-format
|
|
37597 |
+msgid "Content-Type '%s' doesn't match the real data.\n"
|
|
37598 |
+msgstr ""
|
|
37599 |
+
|
|
37600 |
+#: src/cache.c:1140
|
|
37601 |
+#, c-format
|
|
37602 |
+msgid "HTTP warning: Content-Type '%s' doesn't match the real data."
|
|
37603 |
+msgstr ""
|
|
37604 |
+
|
|
37605 |
+#: src/cache.c:1177
|
|
37606 |
+#, fuzzy, c-format
|
|
37607 |
+msgid "Unhandled MIME type: <%s>\n"
|
|
37608 |
+msgstr ""
|
|
37609 |
+"\n"
|
|
37610 |
+" 不明的 MIME 类型: <%s>\n"
|
|
37611 |
+
|
|
37612 |
+#: src/cache.c:1202
|
|
37613 |
+msgid "Client Callback is NULL"
|
|
37614 |
+msgstr ""
|
|
37615 |
+
|
|
37616 |
+#: src/cache.c:1303
|
|
37617 |
+msgid "WARNING: Cache_stop_client, inexistent client\n"
|
|
37618 |
+msgstr ""
|
|
37619 |
+
|
|
37620 |
+#: src/cache.c:1445 src/capi.c:428 src/capi.c:481 src/capi.c:536
|
|
37621 |
+#: src/capi.c:570 src/IO/dpi.c:720 src/IO/dpi.c:760
|
|
37622 |
+msgid " Not implemented\n"
|
|
37623 |
+msgstr "没有实行\n"
|
|
37624 |
+
|
|
37625 |
+#: src/capi.c:229
|
|
37626 |
+msgid "Capi_verify_dpi_url_request: Permission Denied!\n"
|
|
37627 |
+msgstr ""
|
|
37628 |
+
|
|
37629 |
+#: src/capi.c:324
|
|
37630 |
+#, c-format
|
|
37631 |
+msgid " reload=%d URL_E2EReload=%d\n"
|
|
37632 |
+msgstr ""
|
|
37633 |
+
|
|
37634 |
+#: src/capi.c:389
|
|
37635 |
+msgid " ERROR: [a_Capi_dpi_send_cmd] No open connection found\n"
|
|
37636 |
+msgstr ""
|
|
37637 |
+
|
|
37638 |
+#: src/capi.c:457
|
|
37639 |
+msgid "ERROR: can't start dpid daemon!"
|
|
37640 |
+msgstr ""
|
|
37641 |
+
|
|
37642 |
+#: src/capi.c:492
|
|
37643 |
+msgid " ** Capi 2F catched an invalid 'web' structure\n"
|
|
37644 |
+msgstr ""
|
|
37645 |
+
|
|
37646 |
+#: src/capi.c:552
|
|
37647 |
+msgid " Error with pipe\n"
|
|
37648 |
+msgstr ""
|
|
37649 |
+
|
|
37650 |
+#: src/commands.c:166
|
|
37651 |
+msgid "View Source"
|
|
37652 |
+msgstr "检视源始档"
|
|
37653 |
+
|
|
37654 |
+#: src/commands.c:183
|
|
37655 |
+msgid "Detected HTML errors"
|
|
37656 |
+msgstr "发现 HTML 错误"
|
|
37657 |
+
|
|
37658 |
+#: src/commands.c:265
|
|
37659 |
+msgid "Stopped"
|
|
37660 |
+msgstr "已停止"
|
|
37661 |
+
|
|
37662 |
+#: src/dillo.c:109
|
|
37663 |
+msgid ""
|
|
37664 |
+" -x, --xid XID Open first Dillo window in an existing\n"
|
|
37665 |
+" GtkSocket which window ID is XID (decimal)."
|
|
37666 |
+msgstr ""
|
|
37667 |
+
|
|
37668 |
+#: src/dillo.c:112
|
|
37669 |
+msgid " -v, --version Display version info and exit."
|
|
37670 |
+msgstr ""
|
|
37671 |
+
|
|
37672 |
+#: src/dillo.c:114
|
|
37673 |
+msgid " -h, --help Display this help text and exit."
|
|
37674 |
+msgstr ""
|
|
37675 |
+
|
|
37676 |
+#: src/dillo.c:116
|
|
37677 |
+msgid ""
|
|
37678 |
+" -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
37679 |
+" navigation buttons, menu, and status bar."
|
|
37680 |
+msgstr ""
|
|
37681 |
+
|
|
37682 |
+#: src/dillo.c:119
|
|
37683 |
+msgid " -l, --local Don't follow links for this URL(s)."
|
|
37684 |
+msgstr ""
|
|
37685 |
+
|
|
37686 |
+#: src/dillo.c:121
|
|
37687 |
+msgid ""
|
|
37688 |
+" -g, -geometry GEO Set initial window position where GEO is\n"
|
|
37689 |
+" <width>x<height>{+-}<x>{+-}<y>"
|
|
37690 |
+msgstr ""
|
|
37691 |
+
|
|
37692 |
+#: src/dillo.c:125
|
|
37693 |
+msgid ""
|
|
37694 |
+" -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
37695 |
+" representing its structure. For debugging. "
|
|
37696 |
+msgstr ""
|
|
37697 |
+
|
|
37698 |
+#: src/dillo.c:129
|
|
37699 |
+msgid " -R, --rcfile FILE Use alternative rcfile."
|
|
37700 |
+msgstr ""
|
|
37701 |
+
|
|
37702 |
+#: src/dillo.c:266
|
|
37703 |
+#, c-format
|
|
37704 |
+msgid ""
|
|
37705 |
+"Error: the XID must be an unsigned decimal numerical value.\n"
|
|
37706 |
+"The offending value was: %s\n"
|
|
37707 |
+msgstr ""
|
|
37708 |
+
|
|
37709 |
+#: src/dillo.c:284
|
|
37710 |
+msgid "Error in command line options.\n"
|
|
37711 |
+msgstr ""
|
|
37712 |
+
|
|
37713 |
+#: src/dillo.c:291
|
|
37714 |
+#, c-format
|
|
37715 |
+msgid "Setting gtk charset to %s...\n"
|
|
37716 |
+msgstr ""
|
|
37717 |
+
|
|
37718 |
+#: src/dillo.c:395
|
|
37719 |
+#, fuzzy
|
|
37720 |
+msgid "Dillo: normal exit!\n"
|
|
37721 |
+msgstr "Dillo: 找寻字串"
|
|
37722 |
+
|
|
37723 |
+#: src/dillo.c:409
|
|
37724 |
+#, c-format
|
|
37725 |
+msgid "Dillo: error creating directory %s: %s\n"
|
|
37726 |
+msgstr ""
|
|
37727 |
+
|
|
37728 |
+#: src/dillo.c:412
|
|
37729 |
+#, c-format
|
|
37730 |
+msgid "Dillo: error reading %s: %s\n"
|
|
37731 |
+msgstr ""
|
|
37732 |
+
|
|
37733 |
+#: src/dillo.c:461
|
|
37734 |
+#, c-format
|
|
37735 |
+msgid "Option %s requires %d argument(s)\n"
|
|
37736 |
+msgstr ""
|
|
37737 |
+
|
|
37738 |
+#: src/dillo.c:496
|
|
37739 |
+msgid ""
|
|
37740 |
+"\n"
|
|
37741 |
+"Usage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
37742 |
+"Options:\n"
|
|
37743 |
+msgstr ""
|
|
37744 |
+
|
|
37745 |
+#: src/dillo.c:503
|
|
37746 |
+#, c-format
|
|
37747 |
+msgid " %s, %s *Undocumented*\n"
|
|
37748 |
+msgstr ""
|
|
37749 |
+
|
|
37750 |
+#: src/dillo.c:506
|
|
37751 |
+msgid ""
|
|
37752 |
+" URL URL to browse.\n"
|
|
37753 |
+" FILE Local FILE to view.\n"
|
|
37754 |
+msgstr ""
|
|
37755 |
+
|
|
37756 |
+#: src/html.c:182
|
|
37757 |
+#, c-format
|
|
37758 |
+msgid "HTML warning: line %d, "
|
|
37759 |
+msgstr ""
|
|
37760 |
+
|
|
37761 |
+#: src/html.c:212
|
|
37762 |
+#, c-format
|
|
37763 |
+msgid "URL has %d illegal character [%d space]\n"
|
|
37764 |
+msgstr ""
|
|
37765 |
+
|
|
37766 |
+#: src/html.c:213
|
|
37767 |
+#, c-format
|
|
37768 |
+msgid "URL has %d illegal characters [%d spaces]\n"
|
|
37769 |
+msgstr ""
|
|
37770 |
+
|
|
37771 |
+#: src/html.c:216
|
|
37772 |
+#, c-format
|
|
37773 |
+msgid "URL has %d illegal character [%d in (00-1F or 7F)]\n"
|
|
37774 |
+msgstr ""
|
|
37775 |
+
|
|
37776 |
+#: src/html.c:218
|
|
37777 |
+#, c-format
|
|
37778 |
+msgid "URL has %d illegal characters [%d in (00-1F or 7F)]\n"
|
|
37779 |
+msgstr ""
|
|
37780 |
+
|
|
37781 |
+#: src/html.c:222
|
|
37782 |
+#, c-format
|
|
37783 |
+msgid "URL has %d illegal character [%d space and %d in (00-1F or 7F)]\n"
|
|
37784 |
+msgstr ""
|
|
37785 |
+
|
|
37786 |
+#: src/html.c:224
|
|
37787 |
+#, c-format
|
|
37788 |
+msgid "URL has %d illegal characters [%d space and %d in (00-1F or 7F)]\n"
|
|
37789 |
+msgstr ""
|
|
37790 |
+
|
|
37791 |
+#: src/html.c:228
|
|
37792 |
+#, c-format
|
|
37793 |
+msgid "URL has %d illegal character [%d spaces and %d in (00-1F or 7F)]\n"
|
|
37794 |
+msgstr ""
|
|
37795 |
+
|
|
37796 |
+#: src/html.c:230
|
|
37797 |
+#, c-format
|
|
37798 |
+msgid "URL has %d illegal characters [%d spaces and %d in (00-1F or 7F)]\n"
|
|
37799 |
+msgstr ""
|
|
37800 |
+
|
|
37801 |
+#: src/html.c:1237
|
|
37802 |
+msgid "numeric character reference out of range\n"
|
|
37803 |
+msgstr ""
|
|
37804 |
+
|
|
37805 |
+#: src/html.c:1245
|
|
37806 |
+msgid "numeric character reference without trailing ';'\n"
|
|
37807 |
+msgstr ""
|
|
37808 |
+
|
|
37809 |
+#: src/html.c:1257
|
|
37810 |
+#, c-format
|
|
37811 |
+msgid "undefined character entity '%s'\n"
|
|
37812 |
+msgstr ""
|
|
37813 |
+
|
|
37814 |
+#: src/html.c:1265
|
|
37815 |
+msgid "character entity reference without trailing ';'\n"
|
|
37816 |
+msgstr ""
|
|
37817 |
+
|
|
37818 |
+#: src/html.c:1273
|
|
37819 |
+msgid "code positions 128-159 are not defined for ISO Latin-1\n"
|
|
37820 |
+msgstr ""
|
|
37821 |
+
|
|
37822 |
+#: src/html.c:1281
|
|
37823 |
+msgid "literal '&'\n"
|
|
37824 |
+msgstr ""
|
|
37825 |
+
|
|
37826 |
+#: src/html.c:1390
|
|
37827 |
+msgid "TAB character inside <PRE>\n"
|
|
37828 |
+msgstr ""
|
|
37829 |
+
|
|
37830 |
+#: src/html.c:1626
|
|
37831 |
+#, c-format
|
|
37832 |
+msgid " - forcing close of open tag: <%s>\n"
|
|
37833 |
+msgstr ""
|
|
37834 |
+
|
|
37835 |
+#: src/html.c:1635
|
|
37836 |
+#, c-format
|
|
37837 |
+msgid "unexpected closing tag: </%1$s>. -- expected </%2$s>\n"
|
|
37838 |
+msgstr ""
|
|
37839 |
+
|
|
37840 |
+#: src/html.c:1707
|
|
37841 |
+#, c-format
|
|
37842 |
+msgid "Garbage after length: %s\n"
|
|
37843 |
+msgstr ""
|
|
37844 |
+
|
|
37845 |
+#: src/html.c:1726
|
|
37846 |
+msgid "color is not in \"#RRGGBB\" format\n"
|
|
37847 |
+msgstr ""
|
|
37848 |
+
|
|
37849 |
+#: src/html.c:1746
|
|
37850 |
+#, c-format
|
|
37851 |
+msgid "'%s' value is not of the form [A-Za-z][A-Za-z0-9:_.-]*\n"
|
|
37852 |
+msgstr ""
|
|
37853 |
+
|
|
37854 |
+#: src/html.c:1850
|
|
37855 |
+msgid "HTML element was already open\n"
|
|
37856 |
+msgstr ""
|
|
37857 |
+
|
|
37858 |
+#: src/html.c:1877
|
|
37859 |
+msgid "HEAD element must go before the BODY section\n"
|
|
37860 |
+msgstr ""
|
|
37861 |
+
|
|
37862 |
+#: src/html.c:1887
|
|
37863 |
+msgid "HEAD element was already open\n"
|
|
37864 |
+msgstr ""
|
|
37865 |
+
|
|
37866 |
+#: src/html.c:1900
|
|
37867 |
+msgid "HEAD section lacks the TITLE element\n"
|
|
37868 |
+msgstr ""
|
|
37869 |
+
|
|
37870 |
+#: src/html.c:1928
|
|
37871 |
+msgid "the TITLE element must be inside the HEAD section\n"
|
|
37872 |
+msgstr ""
|
|
37873 |
+
|
|
37874 |
+#: src/html.c:1997
|
|
37875 |
+msgid "BODY element was already open\n"
|
|
37876 |
+msgstr ""
|
|
37877 |
+
|
|
37878 |
+#: src/html.c:2002
|
|
37879 |
+msgid "unclosed HEAD element\n"
|
|
37880 |
+msgstr ""
|
|
37881 |
+
|
|
37882 |
+#: src/html.c:2198
|
|
37883 |
+msgid "<td> or <th> outside <table>\n"
|
|
37884 |
+msgstr ""
|
|
37885 |
+
|
|
37886 |
+#: src/html.c:2202
|
|
37887 |
+msgid "<td> or <th> outside <tr>\n"
|
|
37888 |
+msgstr ""
|
|
37889 |
+
|
|
37890 |
+#: src/html.c:2320
|
|
37891 |
+msgid "Invalid HTML syntax: <tr> outside <table>\n"
|
|
37892 |
+msgstr ""
|
|
37893 |
+
|
|
37894 |
+#: src/html.c:2378
|
|
37895 |
+msgid "<noframes> outside of <frameset>!!!\n"
|
|
37896 |
+msgstr ""
|
|
37897 |
+
|
|
37898 |
+#: src/html.c:2386
|
|
37899 |
+msgid "<noframe> is illegal tag !!! use <noframes>.\n"
|
|
37900 |
+msgstr ""
|
|
37901 |
+
|
|
37902 |
+#: src/html.c:2573
|
|
37903 |
+msgid "<frame> outside of <frameset>\n"
|
|
37904 |
+msgstr ""
|
|
37905 |
+
|
|
37906 |
+#: src/html.c:2576
|
|
37907 |
+msgid "<frame> inside of <noframes>\n"
|
|
37908 |
+msgstr ""
|
|
37909 |
+
|
|
37910 |
+#: src/html.c:2579
|
|
37911 |
+msgid "<frame> inside of <iframe>\n"
|
|
37912 |
+msgstr ""
|
|
37913 |
+
|
|
37914 |
+#: src/html.c:2631
|
|
37915 |
+msgid "incorrectly placed <frameset>\n"
|
|
37916 |
+msgstr ""
|
|
37917 |
+
|
|
37918 |
+#: src/html.c:2647
|
|
37919 |
+msgid "<frameset> inside of <noframes>\n"
|
|
37920 |
+msgstr ""
|
|
37921 |
+
|
|
37922 |
+#: src/html.c:2652
|
|
37923 |
+msgid "<frameset> inside of <iframe>\n"
|
|
37924 |
+msgstr ""
|
|
37925 |
+
|
|
37926 |
+#: src/html.c:3134
|
|
37927 |
+msgid " Html_tag_open_img: server-side map (ISMAP)\n"
|
|
37928 |
+msgstr ""
|
|
37929 |
+
|
|
37930 |
+#: src/html.c:3160
|
|
37931 |
+msgid "nested <map>\n"
|
|
37932 |
+msgstr ""
|
|
37933 |
+
|
|
37934 |
+#: src/html.c:3212
|
|
37935 |
+msgid "usemap coords MUST be separated with ','\n"
|
|
37936 |
+msgstr ""
|
|
37937 |
+
|
|
37938 |
+#: src/html.c:3256
|
|
37939 |
+msgid "nohref"
|
|
37940 |
+msgstr ""
|
|
37941 |
+
|
|
37942 |
+#: src/html.c:3295
|
|
37943 |
+msgid "link depends on javascript()\n"
|
|
37944 |
+msgstr ""
|
|
37945 |
+
|
|
37946 |
+#: src/html.c:3311
|
|
37947 |
+#, c-format
|
|
37948 |
+msgid "Registering ANCHOR: %s\n"
|
|
37949 |
+msgstr ""
|
|
37950 |
+
|
|
37951 |
+#: src/html.c:3316
|
|
37952 |
+msgid "Anchor names must be unique within the document\n"
|
|
37953 |
+msgstr ""
|
|
37954 |
+
|
|
37955 |
+#: src/html.c:3523
|
|
37956 |
+msgid "it is strongly recommended using <UL> instead of <MENU>\n"
|
|
37957 |
+msgstr ""
|
|
37958 |
+
|
|
37959 |
+#: src/html.c:3585
|
|
37960 |
+msgid "<li> outside <ul> or <ol>\n"
|
|
37961 |
+msgstr ""
|
|
37962 |
+
|
|
37963 |
+#: src/html.c:3781
|
|
37964 |
+msgid "nested forms\n"
|
|
37965 |
+msgstr ""
|
|
37966 |
+
|
|
37967 |
+#: src/html.c:3828
|
|
37968 |
+msgid "FORM lacks a Submit button\n"
|
|
37969 |
+msgstr ""
|
|
37970 |
+
|
|
37971 |
+#: src/html.c:3830
|
|
37972 |
+msgid " (added a submit button internally)\n"
|
|
37973 |
+msgstr ""
|
|
37974 |
+
|
|
37975 |
+#: src/html.c:3934
|
|
37976 |
+msgid "META elements must be inside the HEAD section\n"
|
|
37977 |
+msgstr ""
|
|
37978 |
+
|
|
37979 |
+#: src/html.c:3986
|
|
37980 |
+#, c-format
|
|
37981 |
+msgid ""
|
|
37982 |
+"The NON-STANDARD meta refresh tag. The HTML 4.01 SPEC (sec 7.4.4) recommends "
|
|
37983 |
+"explicitly to avoid it. The author wanted you to go <%s>\n"
|
|
37984 |
+msgstr ""
|
|
37985 |
+
|
|
37986 |
+#: src/html.c:4356
|
|
37987 |
+msgid "Html_submit_form: Method unknown\n"
|
|
37988 |
+msgstr ""
|
|
37989 |
+
|
|
37990 |
+#: src/html.c:4438
|
|
37991 |
+msgid "Html_input_image: unable to create image submit.\n"
|
|
37992 |
+msgstr ""
|
|
37993 |
+
|
|
37994 |
+#: src/html.c:4460
|
|
37995 |
+msgid "input camp outside <form>\n"
|
|
37996 |
+msgstr ""
|
|
37997 |
+
|
|
37998 |
+#: src/html.c:4540
|
|
37999 |
+msgid "submit"
|
|
38000 |
+msgstr "提交"
|
|
38001 |
+
|
|
38002 |
+#: src/html.c:4547 config/dillocfg.c:81
|
|
38003 |
+msgid "Reset"
|
|
38004 |
+msgstr "重设"
|
|
38005 |
+
|
|
38006 |
+#: src/html.c:4557
|
|
38007 |
+msgid "Submit"
|
|
38008 |
+msgstr "提交"
|
|
38009 |
+
|
|
38010 |
+#: src/html.c:4574
|
|
38011 |
+msgid "An input of the type \"file\" wasn't rendered!\n"
|
|
38012 |
+msgstr ""
|
|
38013 |
+
|
|
38014 |
+#: src/html.c:4748
|
|
38015 |
+msgid "<textarea> outside <form>\n"
|
|
38016 |
+msgstr ""
|
|
38017 |
+
|
|
38018 |
+#: src/html.c:4753
|
|
38019 |
+msgid "nested <textarea>\n"
|
|
38020 |
+msgstr ""
|
|
38021 |
+
|
|
38022 |
+#: src/html.c:4825
|
|
38023 |
+msgid "<select> outside <form>\n"
|
|
38024 |
+msgstr ""
|
|
38025 |
+
|
|
38026 |
+#: src/html.c:4829
|
|
38027 |
+msgid "nested <select>\n"
|
|
38028 |
+msgstr ""
|
|
38029 |
+
|
|
38030 |
+#: src/html.c:5053
|
|
38031 |
+msgid "base URI is relative (it MUST be absolute)\n"
|
|
38032 |
+msgstr ""
|
|
38033 |
+
|
|
38034 |
+#: src/html.c:5060
|
|
38035 |
+msgid "the BASE element must appear in the HEAD section\n"
|
|
38036 |
+msgstr ""
|
|
38037 |
+
|
|
38038 |
+#: src/html.c:5411
|
|
38039 |
+#, c-format
|
|
38040 |
+msgid "<%1$s> is not allowed to contain <%2$s>. -- closing <%3$s>\n"
|
|
38041 |
+msgstr ""
|
|
38042 |
+
|
|
38043 |
+#: src/html.c:5435
|
|
38044 |
+msgid "the required DOCTYPE declaration is missing (or invalid)\n"
|
|
38045 |
+msgstr ""
|
|
38046 |
+
|
|
38047 |
+#: src/html.c:5526
|
|
38048 |
+#, c-format
|
|
38049 |
+msgid "<pre> is not allowed to contain <%s>\n"
|
|
38050 |
+msgstr ""
|
|
38051 |
+
|
|
38052 |
+#: src/html.c:5548
|
|
38053 |
+msgid "'id' and 'name' attribute of <a> tag differ\n"
|
|
38054 |
+msgstr ""
|
|
38055 |
+
|
|
38056 |
+#: src/html.c:5775
|
|
38057 |
+msgid "Html_write_raw : bufsize is negative!\n"
|
|
38058 |
+msgstr ""
|
|
38059 |
+
|
|
38060 |
+#: src/html.c:5853
|
|
38061 |
+msgid "attribute lacks closing quote\n"
|
|
38062 |
+msgstr ""
|
|
38063 |
+
|
|
38064 |
+#: src/html.c:5861
|
|
38065 |
+#, c-format
|
|
38066 |
+msgid "<%s> element lacks its closing '>'\n"
|
|
38067 |
+msgstr ""
|
|
38068 |
+
|
|
38069 |
+#: src/html.c:6155
|
|
38070 |
+msgid "could not allocate character encoding converter"
|
|
38071 |
+msgstr ""
|
|
38072 |
+
|
|
38073 |
+#: src/misc.c:455
|
|
38074 |
+msgid "Untitled"
|
|
38075 |
+msgstr "未命名"
|
|
38076 |
+
|
|
38077 |
+#: src/interface.c:249
|
|
38078 |
+msgid "Selection retrieval failed\n"
|
|
38079 |
+msgstr "选择回收失败\n"
|
|
38080 |
+
|
|
38081 |
+#: src/interface.c:363
|
|
38082 |
+msgid "Clear the URL box (middle-click to paste an URL)."
|
|
38083 |
+msgstr "清空位址栏(点击中键)."
|
|
38084 |
+
|
|
38085 |
+#: src/interface.c:385
|
|
38086 |
+msgid "Search the Web"
|
|
38087 |
+msgstr "搜寻网页"
|
|
38088 |
+
|
|
38089 |
+#: src/interface.c:417 src/menu.c:231 src/menu.c:280
|
|
38090 |
+msgid "Back"
|
|
38091 |
+msgstr "返回"
|
|
38092 |
+
|
|
38093 |
+#: src/interface.c:421
|
|
38094 |
+msgid "Go to previous page (right-click for menu)."
|
|
38095 |
+msgstr "回到上一页(右击菜单)."
|
|
38096 |
+
|
|
38097 |
+#: src/interface.c:450 src/menu.c:233 src/menu.c:282
|
|
38098 |
+msgid "Forward"
|
|
38099 |
+msgstr "往前"
|
|
38100 |
+
|
|
38101 |
+#: src/interface.c:454
|
|
38102 |
+msgid "Go to next page (right-click for menu)."
|
|
38103 |
+msgstr "移至下一页(右击菜单)."
|
|
38104 |
+
|
|
38105 |
+#: src/interface.c:481
|
|
38106 |
+msgid "Home"
|
|
38107 |
+msgstr "首页"
|
|
38108 |
+
|
|
38109 |
+#: src/interface.c:485
|
|
38110 |
+msgid "Go to the Home page"
|
|
38111 |
+msgstr "移至首页"
|
|
38112 |
+
|
|
38113 |
+#: src/interface.c:499 config/dillocfg.c:82
|
|
38114 |
+msgid "Reload"
|
|
38115 |
+msgstr "重载"
|
|
38116 |
+
|
|
38117 |
+#: src/interface.c:500
|
|
38118 |
+msgid "Reload this page"
|
|
38119 |
+msgstr "重新载入"
|
|
38120 |
+
|
|
38121 |
+#: src/interface.c:512 config/dillocfg.c:83
|
|
38122 |
+msgid "Save"
|
|
38123 |
+msgstr "储存"
|
|
38124 |
+
|
|
38125 |
+#: src/interface.c:513
|
|
38126 |
+msgid "Save this page"
|
|
38127 |
+msgstr "储存网页"
|
|
38128 |
+
|
|
38129 |
+#: src/interface.c:520 src/menu.c:235 src/menu.c:284
|
|
38130 |
+msgid "Stop"
|
|
38131 |
+msgstr "停止"
|
|
38132 |
+
|
|
38133 |
+#: src/interface.c:521
|
|
38134 |
+msgid "Stop the current transfer"
|
|
38135 |
+msgstr "停止当前的传送"
|
|
38136 |
+
|
|
38137 |
+#: src/interface.c:534
|
|
38138 |
+msgid "Book"
|
|
38139 |
+msgstr "书签"
|
|
38140 |
+
|
|
38141 |
+#: src/interface.c:538
|
|
38142 |
+msgid "View bookmarks"
|
|
38143 |
+msgstr "检视书签"
|
|
38144 |
+
|
|
38145 |
+#: src/interface.c:655 src/interface.c:826
|
|
38146 |
+msgid "Hide Controls"
|
|
38147 |
+msgstr "隐藏控制栏"
|
|
38148 |
+
|
|
38149 |
+#: src/interface.c:655 src/interface.c:826
|
|
38150 |
+msgid "Show Controls"
|
|
38151 |
+msgstr "显示控制栏"
|
|
38152 |
+
|
|
38153 |
+#: src/interface.c:929
|
|
38154 |
+msgid "Show HTML bugs (right-click for menu)."
|
|
38155 |
+msgstr "显示 HTML 错误(右击菜单)."
|
|
38156 |
+
|
|
38157 |
+#: src/interface.c:1231
|
|
38158 |
+#, c-format
|
|
38159 |
+msgid "Warning: search_url ends with '%%'\n"
|
|
38160 |
+msgstr "警告: search_url 结尾为 '%%'\n"
|
|
38161 |
+
|
|
38162 |
+#: src/interface.c:1233
|
|
38163 |
+#, c-format
|
|
38164 |
+msgid "Warning: illegal specifier '%%%c' in search_url\n"
|
|
38165 |
+msgstr "警告: 在 search_url 中,有非法的指定符 '%%%c'\n"
|
|
38166 |
+
|
|
38167 |
+#: src/interface.c:1298
|
|
38168 |
+msgid "Dillo: Open File"
|
|
38169 |
+msgstr "Dillo: 开启文件"
|
|
38170 |
+
|
|
38171 |
+#: src/interface.c:1374
|
|
38172 |
+msgid "Clear"
|
|
38173 |
+msgstr "清除"
|
|
38174 |
+
|
|
38175 |
+#: src/interface.c:1382 src/interface.c:1536 src/nav.c:453
|
|
38176 |
+msgid "Cancel"
|
|
38177 |
+msgstr "取消"
|
|
38178 |
+
|
|
38179 |
+#: src/interface.c:1513
|
|
38180 |
+msgid "User Name:"
|
|
38181 |
+msgstr "用户名称:"
|
|
38182 |
+
|
|
38183 |
+#: src/interface.c:1520
|
|
38184 |
+msgid "Password:"
|
|
38185 |
+msgstr "口令:"
|
|
38186 |
+
|
|
38187 |
+#: src/interface.c:1529 src/interface.c:1604 src/interface.c:2073
|
|
38188 |
+#: src/nav.c:453
|
|
38189 |
+msgid "OK"
|
|
38190 |
+msgstr "确定"
|
|
38191 |
+
|
|
38192 |
+#: src/interface.c:1566
|
|
38193 |
+msgid "Dillo: Enter Authentication"
|
|
38194 |
+msgstr "Dillo: 进入验证"
|
|
38195 |
+
|
|
38196 |
+#: src/interface.c:1586
|
|
38197 |
+msgid "Dillo: Question"
|
|
38198 |
+msgstr "Dillo: 问题"
|
|
38199 |
+
|
|
38200 |
+#: src/interface.c:1602
|
|
38201 |
+msgid "Dillo: Open URL"
|
|
38202 |
+msgstr "Dillo: 开启网页"
|
|
38203 |
+
|
|
38204 |
+#: src/interface.c:1626
|
|
38205 |
+#, c-format
|
|
38206 |
+msgid "File saved (%d Bytes)"
|
|
38207 |
+msgstr "文件已存入(%d Bytes)"
|
|
38208 |
+
|
|
38209 |
+#: src/interface.c:1708
|
|
38210 |
+#, c-format
|
|
38211 |
+msgid "Error trying to save: %s\n"
|
|
38212 |
+msgstr "错误於储存: %s\n"
|
|
38213 |
+
|
|
38214 |
+#: src/interface.c:1761
|
|
38215 |
+msgid "Dillo: Save URL as File..."
|
|
38216 |
+msgstr "Dillo: 储存网页为..."
|
|
38217 |
+
|
|
38218 |
+#: src/interface.c:1788
|
|
38219 |
+msgid "Dillo: Save link as File..."
|
|
38220 |
+msgstr "Dillo: 储存连接为..."
|
|
38221 |
+
|
|
38222 |
+#: src/interface.c:1843 src/interface.c:1857
|
|
38223 |
+msgid "Dillo: Find text"
|
|
38224 |
+msgstr "Dillo: 找寻字串"
|
|
38225 |
+
|
|
38226 |
+#: src/interface.c:1844 src/interface.c:1850
|
|
38227 |
+#, c-format
|
|
38228 |
+msgid "Cannot find \"%s\"."
|
|
38229 |
+msgstr "找不到 \"%s\"."
|
|
38230 |
+
|
|
38231 |
+#: src/interface.c:1858
|
|
38232 |
+#, c-format
|
|
38233 |
+msgid "No further occurence of \"%s\". Restarting from the beginning."
|
|
38234 |
+msgstr "找不到更多符合 \"%s\". 重开端再找寻"
|
|
38235 |
+
|
|
38236 |
+#: src/interface.c:1866
|
|
38237 |
+#, c-format
|
|
38238 |
+msgid "(Find) \"%s\": restart from beginning"
|
|
38239 |
+msgstr "(找寻) \"%s\": 重开端再找寻 "
|
|
38240 |
+
|
|
38241 |
+#: src/interface.c:1879
|
|
38242 |
+#, c-format
|
|
38243 |
+msgid "(Find) \"%s\""
|
|
38244 |
+msgstr "(找寻) \"%s\""
|
|
38245 |
+
|
|
38246 |
+#: src/interface.c:1885
|
|
38247 |
+msgid "Unexpected return from a_Dw_gtk_scrolled_window_search()\n"
|
|
38248 |
+msgstr "意外回传从 a_Dw_gtk_scrolled_window_search()\n"
|
|
38249 |
+
|
|
38250 |
+#: src/interface.c:1937
|
|
38251 |
+msgid "press <Enter> to (repeat) search, <Esc> to close search"
|
|
38252 |
+msgstr "按 <Enter> 重新搜寻, <Esc> 退出"
|
|
38253 |
+
|
|
38254 |
+#: src/interface.c:1938 src/interface.c:2031
|
|
38255 |
+msgid "Search"
|
|
38256 |
+msgstr "搜寻"
|
|
38257 |
+
|
|
38258 |
+#: src/interface.c:1940 src/interface.c:1941 src/interface.c:1977
|
|
38259 |
+msgid "Case sensitive"
|
|
38260 |
+msgstr "区分大小写"
|
|
38261 |
+
|
|
38262 |
+#: src/interface.c:1975
|
|
38263 |
+msgid "Dillo: Find text in page"
|
|
38264 |
+msgstr "Dillo: 在页面中找寻文字"
|
|
38265 |
+
|
|
38266 |
+#: src/interface.c:1978
|
|
38267 |
+msgid "Find"
|
|
38268 |
+msgstr "找寻"
|
|
38269 |
+
|
|
38270 |
+#: src/interface.c:2029
|
|
38271 |
+msgid "Dillo"
|
|
38272 |
+msgstr "Dillo"
|
|
38273 |
+
|
|
38274 |
+#: src/interface.c:2029
|
|
38275 |
+msgid "Dillo: Search the Web"
|
|
38276 |
+msgstr "Dillo: 搜寻网页"
|
|
38277 |
+
|
|
38278 |
+#: src/interface.c:2066
|
|
38279 |
+#, c-format
|
|
38280 |
+msgid "Dillo: Enter proxy password for '%s'"
|
|
38281 |
+msgstr "Dillo: 输入 '%s' 的服务器口令"
|
|
38282 |
+
|
|
38283 |
+#: src/interface.c:2151
|
|
38284 |
+msgid "Close"
|
|
38285 |
+msgstr "关闭"
|
|
38286 |
+
|
|
38287 |
+#: src/interface.c:2226
|
|
38288 |
+msgid "close"
|
|
38289 |
+msgstr "关闭"
|
|
38290 |
+
|
|
38291 |
+#: src/nav.c:383
|
|
38292 |
+#, c-format
|
|
38293 |
+msgid "Unhandled switch type %d in a_Nav_jump_callback in src/nav.c\n"
|
|
38294 |
+msgstr ""
|
|
38295 |
+
|
|
38296 |
+#: src/nav.c:452
|
|
38297 |
+msgid "Repost form data?"
|
|
38298 |
+msgstr "再列出表单资料?"
|
|
38299 |
+
|
|
38300 |
+#: src/menu.c:173
|
|
38301 |
+msgid "_File"
|
|
38302 |
+msgstr "文件(_F)"
|
|
38303 |
+
|
|
38304 |
+#: src/menu.c:174
|
|
38305 |
+msgid "_New Window"
|
|
38306 |
+msgstr "新窗口(_N)"
|
|
38307 |
+
|
|
38308 |
+#: src/menu.c:177
|
|
38309 |
+msgid "New _Tab"
|
|
38310 |
+msgstr "新分页(_T)"
|
|
38311 |
+
|
|
38312 |
+#: src/menu.c:181
|
|
38313 |
+msgid "_Open File..."
|
|
38314 |
+msgstr "开启文件(_O)..."
|
|
38315 |
+
|
|
38316 |
+#: src/menu.c:183
|
|
38317 |
+msgid "Open _URL..."
|
|
38318 |
+msgstr "开启位址(_U)..."
|
|
38319 |
+
|
|
38320 |
+#: src/menu.c:189
|
|
38321 |
+msgid "Close Window"
|
|
38322 |
+msgstr "关闭窗口"
|
|
38323 |
+
|
|
38324 |
+#: src/menu.c:192 src/menu.c:359
|
|
38325 |
+msgid "Close Tab"
|
|
38326 |
+msgstr "关闭分页"
|
|
38327 |
+
|
|
38328 |
+#: src/menu.c:196
|
|
38329 |
+msgid "Exit Dillo"
|
|
38330 |
+msgstr "关闭 Dillo"
|
|
38331 |
+
|
|
38332 |
+#: src/menu.c:200
|
|
38333 |
+msgid "_View"
|
|
38334 |
+msgstr "检视(_V)"
|
|
38335 |
+
|
|
38336 |
+#: src/menu.c:202
|
|
38337 |
+msgid "Previous tab"
|
|
38338 |
+msgstr "上一分页"
|
|
38339 |
+
|
|
38340 |
+#: src/menu.c:204
|
|
38341 |
+msgid "Next tab"
|
|
38342 |
+msgstr "下一分页"
|
|
38343 |
+
|
|
38344 |
+#: src/menu.c:208
|
|
38345 |
+msgid "_Options..."
|
|
38346 |
+msgstr "选项(_O)..."
|
|
38347 |
+
|
|
38348 |
+#: src/menu.c:228
|
|
38349 |
+msgid "PAGE OPTIONS"
|
|
38350 |
+msgstr "页面选项"
|
|
38351 |
+
|
|
38352 |
+#: src/menu.c:237 src/menu.c:286
|
|
38353 |
+msgid "_Reload"
|
|
38354 |
+msgstr "重载(_R)"
|
|
38355 |
+
|
|
38356 |
+#: src/menu.c:241
|
|
38357 |
+msgid "View page So_urce"
|
|
38358 |
+msgstr "检视源始档(_S)"
|
|
38359 |
+
|
|
38360 |
+#: src/menu.c:243
|
|
38361 |
+msgid "View page Bugs"
|
|
38362 |
+msgstr "检视页面错误"
|
|
38363 |
+
|
|
38364 |
+#: src/menu.c:244
|
|
38365 |
+msgid "_Bookmark this Page"
|
|
38366 |
+msgstr "加进书签(_B)"
|
|
38367 |
+
|
|
38368 |
+#: src/menu.c:247
|
|
38369 |
+msgid "Duplicate this Page"
|
|
38370 |
+msgstr "复制至新窗口"
|
|
38371 |
+
|
|
38372 |
+#: src/menu.c:250
|
|
38373 |
+msgid "Duplicate this tab"
|
|
38374 |
+msgstr "复制至新分页"
|
|
38375 |
+
|
|
38376 |
+#: src/menu.c:254
|
|
38377 |
+msgid "_Find Text"
|
|
38378 |
+msgstr "找寻文字(_F)"
|
|
38379 |
+
|
|
38380 |
+#: src/menu.c:257
|
|
38381 |
+msgid "Jump to..."
|
|
38382 |
+msgstr "跳至..."
|
|
38383 |
+
|
|
38384 |
+#: src/menu.c:258
|
|
38385 |
+msgid "This Frame..."
|
|
38386 |
+msgstr "此框架..."
|
|
38387 |
+
|
|
38388 |
+#: src/menu.c:259
|
|
38389 |
+msgid "This Frameset..."
|
|
38390 |
+msgstr "此框架布局..."
|
|
38391 |
+
|
|
38392 |
+#: src/menu.c:262
|
|
38393 |
+msgid "Save Page As..."
|
|
38394 |
+msgstr "储存为..."
|
|
38395 |
+
|
|
38396 |
+#: src/menu.c:277
|
|
38397 |
+msgid "FRAME OPTIONS"
|
|
38398 |
+msgstr "框架选项"
|
|
38399 |
+
|
|
38400 |
+#: src/menu.c:290
|
|
38401 |
+msgid "View frame Source"
|
|
38402 |
+msgstr "检视框架源始档"
|
|
38403 |
+
|
|
38404 |
+#: src/menu.c:292
|
|
38405 |
+msgid "Bookmark this Frame"
|
|
38406 |
+msgstr "框架加进书签"
|
|
38407 |
+
|
|
38408 |
+#: src/menu.c:294
|
|
38409 |
+msgid "Reload this Frame"
|
|
38410 |
+msgstr "重新载入"
|
|
38411 |
+
|
|
38412 |
+#: src/menu.c:297
|
|
38413 |
+msgid "Show only this Frame"
|
|
38414 |
+msgstr "只显示此框架"
|
|
38415 |
+
|
|
38416 |
+#: src/menu.c:299
|
|
38417 |
+msgid "Open Frame in new Window"
|
|
38418 |
+msgstr "在新窗口开启框架"
|
|
38419 |
+
|
|
38420 |
+#: src/menu.c:302
|
|
38421 |
+msgid "Open Frame in new Tab"
|
|
38422 |
+msgstr "在新分页开启框架"
|
|
38423 |
+
|
|
38424 |
+#: src/menu.c:306
|
|
38425 |
+msgid "_Find Text in this Frame..."
|
|
38426 |
+msgstr "於框架找寻字串(_F)..."
|
|
38427 |
+
|
|
38428 |
+#: src/menu.c:309 src/menu.c:340
|
|
38429 |
+msgid "Save Frame As..."
|
|
38430 |
+msgstr "储存框架为..."
|
|
38431 |
+
|
|
38432 |
+#: src/menu.c:325
|
|
38433 |
+msgid "FRAMESET OPTIONS"
|
|
38434 |
+msgstr "框架布局选项"
|
|
38435 |
+
|
|
38436 |
+#: src/menu.c:327
|
|
38437 |
+msgid "View Frameset Source"
|
|
38438 |
+msgstr "检视源始档"
|
|
38439 |
+
|
|
38440 |
+#: src/menu.c:329
|
|
38441 |
+msgid "Bookmark this Frameset"
|
|
38442 |
+msgstr "加进书签"
|
|
38443 |
+
|
|
38444 |
+#: src/menu.c:331
|
|
38445 |
+msgid "Reload this Frameset"
|
|
38446 |
+msgstr "重新载入"
|
|
38447 |
+
|
|
38448 |
+#: src/menu.c:334
|
|
38449 |
+msgid "Show only this Frameset"
|
|
38450 |
+msgstr "只显示此框架"
|
|
38451 |
+
|
|
38452 |
+#: src/menu.c:337
|
|
38453 |
+msgid "_Find Text in this Frameset..."
|
|
38454 |
+msgstr "找寻字串(_F)..."
|
|
38455 |
+
|
|
38456 |
+#: src/menu.c:357
|
|
38457 |
+msgid "TAB OPTIONS"
|
|
38458 |
+msgstr "分页选项"
|
|
38459 |
+
|
|
38460 |
+#: src/menu.c:361
|
|
38461 |
+msgid "New Tab"
|
|
38462 |
+msgstr "新分页"
|
|
38463 |
+
|
|
38464 |
+#: src/menu.c:363
|
|
38465 |
+msgid "Reload Tab"
|
|
38466 |
+msgstr "重载分页"
|
|
38467 |
+
|
|
38468 |
+#: src/menu.c:460
|
|
38469 |
+msgid "FOLLOWING PAGES"
|
|
38470 |
+msgstr "下一页"
|
|
38471 |
+
|
|
38472 |
+#: src/menu.c:463
|
|
38473 |
+msgid "PREVIOUS PAGES"
|
|
38474 |
+msgstr "上一页"
|
|
38475 |
+
|
|
38476 |
+#: src/menu.c:531
|
|
38477 |
+msgid "LINK OPTIONS"
|
|
38478 |
+msgstr "连接选项"
|
|
38479 |
+
|
|
38480 |
+#: src/menu.c:533
|
|
38481 |
+msgid "Open Link in New Window"
|
|
38482 |
+msgstr "在新窗口开启连接"
|
|
38483 |
+
|
|
38484 |
+#: src/menu.c:536
|
|
38485 |
+msgid "Open Link in New Tab"
|
|
38486 |
+msgstr "在新分页开启连接"
|
|
38487 |
+
|
|
38488 |
+#: src/menu.c:539
|
|
38489 |
+msgid "Open Link"
|
|
38490 |
+msgstr "开启连接"
|
|
38491 |
+
|
|
38492 |
+#: src/menu.c:542
|
|
38493 |
+msgid "Bookmark this Link"
|
|
38494 |
+msgstr "连接加进书签"
|
|
38495 |
+
|
|
38496 |
+#: src/menu.c:544
|
|
38497 |
+msgid "Copy Link location"
|
|
38498 |
+msgstr "复制连接位址"
|
|
38499 |
+
|
|
38500 |
+#: src/menu.c:549
|
|
38501 |
+msgid "Save Link As..."
|
|
38502 |
+msgstr "储存连接为..."
|
|
38503 |
+
|
|
38504 |
+#: src/menu.c:553
|
|
38505 |
+msgid "Image Menu..."
|
|
38506 |
+msgstr "影像菜单.."
|
|
38507 |
+
|
|
38508 |
+#: src/menu.c:571
|
|
38509 |
+msgid "IMAGE OPTIONS"
|
|
38510 |
+msgstr "影像选项"
|
|
38511 |
+
|
|
38512 |
+#: src/menu.c:573
|
|
38513 |
+msgid "Isolate Image"
|
|
38514 |
+msgstr "检视影像"
|
|
38515 |
+
|
|
38516 |
+#: src/menu.c:575
|
|
38517 |
+msgid "Open Image in New Window"
|
|
38518 |
+msgstr "在新窗口开启影像"
|
|
38519 |
+
|
|
38520 |
+#: src/menu.c:578
|
|
38521 |
+msgid "Open Image in New Tab"
|
|
38522 |
+msgstr "在新分页开启影像"
|
|
38523 |
+
|
|
38524 |
+#: src/menu.c:581
|
|
38525 |
+msgid "Open Image"
|
|
38526 |
+msgstr "开启影像"
|
|
38527 |
+
|
|
38528 |
+#: src/menu.c:584
|
|
38529 |
+msgid "Bookmark this Image"
|
|
38530 |
+msgstr "将影像加入书签"
|
|
38531 |
+
|
|
38532 |
+#: src/menu.c:586
|
|
38533 |
+msgid "Copy Image location"
|
|
38534 |
+msgstr "复制影像位址"
|
|
38535 |
+
|
|
38536 |
+#: src/menu.c:591
|
|
38537 |
+msgid "Save Image As..."
|
|
38538 |
+msgstr "储存影像为..."
|
|
38539 |
+
|
|
38540 |
+#: src/menu.c:605
|
|
38541 |
+msgid "BUG METER OPTIONS"
|
|
38542 |
+msgstr "错误侦测选项"
|
|
38543 |
+
|
|
38544 |
+#: src/menu.c:607
|
|
38545 |
+msgid "Validate URL with W3C"
|
|
38546 |
+msgstr "以 W3C 错误侦测"
|
|
38547 |
+
|
|
38548 |
+#: src/menu.c:609
|
|
38549 |
+msgid "Validate URL with WDG"
|
|
38550 |
+msgstr "以 WDG 错误侦测"
|
|
38551 |
+
|
|
38552 |
+#: src/menu.c:612
|
|
38553 |
+msgid "About Bug Meter..."
|
|
38554 |
+msgstr "关於错误侦测..."
|
|
38555 |
+
|
|
38556 |
+#: src/prefs.c:431
|
|
38557 |
+msgid "Error: Can't open specified config file. default file is used.\n"
|
|
38558 |
+msgstr ""
|
|
38559 |
+
|
|
38560 |
+#: src/i18n.c:359
|
|
38561 |
+msgid "charset detect may mistake...\n"
|
|
38562 |
+msgstr "文字检测可能错误...\n"
|
|
38563 |
+
|
|
38564 |
+#: src/i18n.c:447
|
|
38565 |
+msgid "<meta> outside of <head>!\n"
|
|
38566 |
+msgstr ""
|
|
38567 |
+
|
|
38568 |
+#: src/i18n.c:493
|
|
38569 |
+msgid "all ascii code\n"
|
|
38570 |
+msgstr "全为 ASCII 编码\n"
|
|
38571 |
+
|
|
38572 |
+#: src/i18n.c:526
|
|
38573 |
+msgid "unable to fully convert between character encodings\n"
|
|
38574 |
+msgstr "未能完全转换文字间的编码\n"
|
|
38575 |
+
|
|
38576 |
+#: src/i18n.c:565
|
|
38577 |
+msgid "no support enc\n"
|
|
38578 |
+msgstr "不支援的编码\n"
|
|
38579 |
+
|
|
38580 |
+#: src/tab.c:293 src/tab.c:425 dpi/bookmarks.c:1653
|
|
38581 |
+msgid "(Untitled)"
|
|
38582 |
+msgstr "(无题)"
|
|
38583 |
+
|
|
38584 |
+#: src/IO/https.c:168
|
|
38585 |
+msgid "--Error detected\n"
|
|
38586 |
+msgstr "--错误检测\n"
|
|
38587 |
+
|
|
38588 |
+#: src/IO/https.c:173 src/IO/https.c:204 src/IO/http.c:294
|
|
38589 |
+msgid "ERROR: unable to connect to remote host"
|
|
38590 |
+msgstr "错误: 未能连接远端主机"
|
|
38591 |
+
|
|
38592 |
+#: src/IO/https.c:179 src/IO/http.c:309
|
|
38593 |
+msgid "--Connection established\n"
|
|
38594 |
+msgstr "--连线已建立\n"
|
|
38595 |
+
|
|
38596 |
+#: src/IO/https.c:280 src/IO/http.c:417
|
|
38597 |
+#, c-format
|
|
38598 |
+msgid "Sending query to %s..."
|
|
38599 |
+msgstr "正送出请求至 %s..."
|
|
38600 |
+
|
|
38601 |
+#: src/IO/https.c:333 src/IO/http.c:486
|
|
38602 |
+#, c-format
|
|
38603 |
+msgid "DNS solving %s"
|
|
38604 |
+msgstr "DNS 正查释域名 %s"
|
|
38605 |
+
|
|
38606 |
+#: src/IO/https.c:363
|
|
38607 |
+msgid " HTTPS: new abort handler! #2\n"
|
|
38608 |
+msgstr ""
|
|
38609 |
+
|
|
38610 |
+#: src/IO/https.c:365 src/IO/https.c:387 src/IO/http.c:301 src/IO/http.c:520
|
|
38611 |
+#: src/IO/http.c:551
|
|
38612 |
+#, c-format
|
|
38613 |
+msgid "ERROR: %s"
|
|
38614 |
+msgstr "错误: %s"
|
|
38615 |
+
|
|
38616 |
+#: src/IO/https.c:386
|
|
38617 |
+msgid " HTTP: new abort handler! #1\n"
|
|
38618 |
+msgstr ""
|
|
38619 |
+
|
|
38620 |
+#: src/IO/https.c:400 src/IO/http.c:564
|
|
38621 |
+#, c-format
|
|
38622 |
+msgid "ERROR: Dns can't solve %s"
|
|
38623 |
+msgstr "错误: Dns 未能查释域名 %s"
|
|
38624 |
+
|
|
38625 |
+#: src/IO/https.c:421 src/IO/http.c:591
|
|
38626 |
+msgid "Query sent, waiting for reply..."
|
|
38627 |
+msgstr "请求已送出, 正等侯回覆中..."
|
|
38628 |
+
|
|
38629 |
+#: src/IO/http.c:190
|
|
38630 |
+#, c-format
|
|
38631 |
+msgid "Getting %1$s, referer %2$s\n"
|
|
38632 |
+msgstr "提取 %1$s 中, 因应 %2$s\n"
|
|
38633 |
+
|
|
38634 |
+#: src/IO/http.c:259
|
|
38635 |
+#, c-format
|
|
38636 |
+msgid ""
|
|
38637 |
+"Query:\n"
|
|
38638 |
+"%s"
|
|
38639 |
+msgstr ""
|
|
38640 |
+"查询: \n"
|
|
38641 |
+"%s"
|
|
38642 |
+
|
|
38643 |
+#: src/IO/http.c:286
|
|
38644 |
+msgid "--Connection broken\n"
|
|
38645 |
+msgstr "--连线被中断 \n"
|
|
38646 |
+
|
|
38647 |
+#: src/IO/http.c:342
|
|
38648 |
+#, c-format
|
|
38649 |
+msgid "Http_connect_socket ERROR: %s\n"
|
|
38650 |
+msgstr "连接端口 错误: %s\n"
|
|
38651 |
+
|
|
38652 |
+#: src/IO/http.c:363 src/IO/http.c:377
|
|
38653 |
+#, c-format
|
|
38654 |
+msgid "Connecting to %s\n"
|
|
38655 |
+msgstr "正在连接 %s\n"
|
|
38656 |
+
|
|
38657 |
+#: src/IO/http.c:396
|
|
38658 |
+msgid "Contacting host..."
|
|
38659 |
+msgstr "正在联系主机..."
|
|
38660 |
+
|
|
38661 |
+#: src/IO/http.c:529
|
|
38662 |
+msgid "Http: OpAbort [1B]\n"
|
|
38663 |
+msgstr "Http: OpAbort [1B]\n"
|
|
38664 |
+
|
|
38665 |
+#: src/IO/dpi.c:188
|
|
38666 |
+msgid "ERROR: [Dpi_get_token] Can't find token start\n"
|
|
38667 |
+msgstr ""
|
|
38668 |
+
|
|
38669 |
+#: src/IO/dpi.c:221
|
|
38670 |
+msgid "ERROR: [Dpi_get_token] *** NULL code here ***\n"
|
|
38671 |
+msgstr ""
|
|
38672 |
+
|
|
38673 |
+#: src/IO/dpi.c:312
|
|
38674 |
+msgid "Dpi: [Dpi_process_io] IOClose\n"
|
|
38675 |
+msgstr ""
|
|
38676 |
+
|
|
38677 |
+#: src/IO/dpi.c:338
|
|
38678 |
+#, c-format
|
|
38679 |
+msgid "Dpi_start_dpid (child): %s\n"
|
|
38680 |
+msgstr ""
|
|
38681 |
+
|
|
38682 |
+#: src/IO/dpi.c:348 src/IO/dpi.c:363
|
|
38683 |
+#, c-format
|
|
38684 |
+msgid "Dpi_start_dpid: %s\n"
|
|
38685 |
+msgstr ""
|
|
38686 |
+
|
|
38687 |
+#: src/IO/dpi.c:359
|
|
38688 |
+#, c-format
|
|
38689 |
+msgid "Dpi_start_dpid: n = %d\n"
|
|
38690 |
+msgstr ""
|
|
38691 |
+
|
|
38692 |
+#: src/IO/dpi.c:386
|
|
38693 |
+#, c-format
|
|
38694 |
+msgid "Dpi_check_uds: %1$s %2$s\n"
|
|
38695 |
+msgstr ""
|
|
38696 |
+
|
|
38697 |
+#: src/IO/dpi.c:673
|
|
38698 |
+msgid "dpi.c: ERROR, can't start dpi daemon\n"
|
|
38699 |
+msgstr ""
|
|
38700 |
+
|
|
38701 |
+#: src/IO/dpi.c:686
|
|
38702 |
+msgid "a_Dpi_ccc: OpAbort[2B], Not implemented\n"
|
|
38703 |
+msgstr ""
|
|
38704 |
+
|
|
38705 |
+#: src/IO/dpi.c:790 src/IO/dpi.c:794
|
|
38706 |
+#, c-format
|
|
38707 |
+msgid "a_Dpi_bye_dpid: %s\n"
|
|
38708 |
+msgstr ""
|
|
38709 |
+
|
|
38710 |
+#: dpid/dpi_socket_dir.c:106
|
|
38711 |
+#, c-format
|
|
38712 |
+msgid "The dpi_socket_dir file does not exist\n"
|
|
38713 |
+msgstr "dpi_socket_dir 文件并不存在\n"
|
|
38714 |
+
|
|
38715 |
+#: dpid/dpi_socket_dir.c:110 dpid/dpi_socket_dir.c:114
|
|
38716 |
+#, c-format
|
|
38717 |
+msgid "debug_msg - init_sockdir: The socket directory "
|
|
38718 |
+msgstr ""
|
|
38719 |
+
|
|
38720 |
+#: dpid/dpi_socket_dir.c:111
|
|
38721 |
+#, c-format
|
|
38722 |
+msgid "%s exists and is OK\n"
|
|
38723 |
+msgstr "%s 存在并可正常使用\n"
|
|
38724 |
+
|
|
38725 |
+#: dpid/dpi_socket_dir.c:115
|
|
38726 |
+#, c-format
|
|
38727 |
+msgid "%s does not exist or is not a directory\n"
|
|
38728 |
+msgstr "%s 不存在且不是一个目录\n"
|
|
38729 |
+
|
|
38730 |
+#: dpid/dpi_socket_dir.c:124
|
|
38731 |
+#, c-format
|
|
38732 |
+msgid " - Failed to create dpi socket directory\n"
|
|
38733 |
+msgstr ""
|
|
38734 |
+
|
|
38735 |
+#: dpid/dpi_socket_dir.c:127
|
|
38736 |
+#, c-format
|
|
38737 |
+msgid " - failed to save %s\n"
|
|
38738 |
+msgstr ""
|
|
38739 |
+
|
|
38740 |
+#: dpid/main.c:59 dpid/main.c:66 dpid/main.c:77 dpid/main.c:85 dpid/main.c:99
|
|
38741 |
+#: dpid/main.c:104 dpid/main.c:109
|
|
38742 |
+#, c-format
|
|
38743 |
+msgid "ERROR in child proc for %s\n"
|
|
38744 |
+msgstr ""
|
|
38745 |
+
|
|
38746 |
+#: dpid/main.c:166
|
|
38747 |
+#, c-format
|
|
38748 |
+msgid ": dpid failed to parse cmd in %s\n"
|
|
38749 |
+msgstr ""
|
|
38750 |
+
|
|
38751 |
+#: dpid/main.c:265
|
|
38752 |
+#, c-format
|
|
38753 |
+msgid "Failed to create socket directory\n"
|
|
38754 |
+msgstr ""
|
|
38755 |
+
|
|
38756 |
+#: dpid/main.c:275
|
|
38757 |
+#, c-format
|
|
38758 |
+msgid "dpid refuses to start, possibly because:\n"
|
|
38759 |
+msgstr ""
|
|
38760 |
+
|
|
38761 |
+#: dpid/main.c:276
|
|
38762 |
+#, c-format
|
|
38763 |
+msgid "\t1) An instance of dpid is already running.\n"
|
|
38764 |
+msgstr ""
|
|
38765 |
+
|
|
38766 |
+#: dpid/main.c:277
|
|
38767 |
+#, c-format
|
|
38768 |
+msgid "\t2) A previous dpid didn't clean up on exit.\n"
|
|
38769 |
+msgstr ""
|
|
38770 |
+
|
|
38771 |
+#: dpid/main.c:280
|
|
38772 |
+msgid "init_srs_sockets failed\n"
|
|
38773 |
+msgstr ""
|
|
38774 |
+
|
|
38775 |
+#: dpid/main.c:294
|
|
38776 |
+#, c-format
|
|
38777 |
+msgid "dpid started\n"
|
|
38778 |
+msgstr ""
|
|
38779 |
+
|
|
38780 |
+#: dpid/main.c:340
|
|
38781 |
+#, c-format
|
|
38782 |
+msgid "accept on srs socket failed\n"
|
|
38783 |
+msgstr ""
|
|
38784 |
+
|
|
38785 |
+#: dpid/main.c:341
|
|
38786 |
+#, c-format
|
|
38787 |
+msgid "service pending connections, and continue\n"
|
|
38788 |
+msgstr ""
|
|
38789 |
+
|
|
38790 |
+#: dpi/bookmarks.c:96
|
|
38791 |
+#, fuzzy
|
|
38792 |
+msgid ""
|
|
38793 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
38794 |
+"<html>\n"
|
|
38795 |
+"<head>\n"
|
|
38796 |
+"<title>Bookmarks</title>\n"
|
|
38797 |
+"</head>\n"
|
|
38798 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
38799 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
38800 |
+" <tr><td>\n"
|
|
38801 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38802 |
+" <tr>\n"
|
|
38803 |
+" <td> Bookmarks::</td>\n"
|
|
38804 |
+" <td width='100%' align='right'>\n"
|
|
38805 |
+" [<a href='dpi:/bm/modify'>modify</a>]\n"
|
|
38806 |
+" </td></tr>\n"
|
|
38807 |
+" </table></td></tr>\n"
|
|
38808 |
+"</table>\n"
|
|
38809 |
+"<br>\n"
|
|
38810 |
+msgstr ""
|
|
38811 |
+"<html>\n"
|
|
38812 |
+"<head>\n"
|
|
38813 |
+"<title>书签</title>\n"
|
|
38814 |
+"</head>\n"
|
|
38815 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
38816 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
38817 |
+" <tr><td>\n"
|
|
38818 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38819 |
+" <tr>\n"
|
|
38820 |
+" <td><pre> 书签::</pre></td>\n"
|
|
38821 |
+" <td width='100%' align='right'>\n"
|
|
38822 |
+" <pre>[<a href='dpi:/bm/modify'>编辑</a>]</pre>\n"
|
|
38823 |
+" </td></tr>\n"
|
|
38824 |
+" </table></td></tr>\n"
|
|
38825 |
+"</table>\n"
|
|
38826 |
+"<br>\n"
|
|
38827 |
+
|
|
38828 |
+#: dpi/bookmarks.c:115
|
|
38829 |
+#, fuzzy
|
|
38830 |
+msgid ""
|
|
38831 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
38832 |
+"<html>\n"
|
|
38833 |
+"<head>\n"
|
|
38834 |
+"<title>Bookmarks</title>\n"
|
|
38835 |
+"</head>\n"
|
|
38836 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
38837 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
38838 |
+" <tr><td>\n"
|
|
38839 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38840 |
+" <tr>\n"
|
|
38841 |
+" <td> Bookmarks :: modify</td></tr>\n"
|
|
38842 |
+" </table></td></tr> \n"
|
|
38843 |
+"</table> \n"
|
|
38844 |
+"\n"
|
|
38845 |
+"<form>\n"
|
|
38846 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
38847 |
+" <tr><td>\n"
|
|
38848 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
38849 |
+" <tr>\n"
|
|
38850 |
+" <td><b>Select an operation </b></td>\n"
|
|
38851 |
+" <td><select name='operation'>\n"
|
|
38852 |
+" <option value='none' selected>--\n"
|
|
38853 |
+" <option value='delete'>Delete\n"
|
|
38854 |
+" <option value='move'>Move\n"
|
|
38855 |
+" <option value='modify'>Modify\n"
|
|
38856 |
+" <option value='add_sec'>Add Section\n"
|
|
38857 |
+" <option value='add_url'>Add URL\n"
|
|
38858 |
+" </select></td>\n"
|
|
38859 |
+" <td><b>, mark its operands, and </b></td>\n"
|
|
38860 |
+" <td><input type='submit' name='submit' value='submit.'></td>\n"
|
|
38861 |
+" <td width='100%'></td>\n"
|
|
38862 |
+" </tr>\n"
|
|
38863 |
+" </table></td></tr>\n"
|
|
38864 |
+"</table>\n"
|
|
38865 |
+msgstr ""
|
|
38866 |
+"<html>\n"
|
|
38867 |
+"<head>\n"
|
|
38868 |
+"<title>书签</title>\n"
|
|
38869 |
+"</head>\n"
|
|
38870 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
38871 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
38872 |
+" <tr><td>\n"
|
|
38873 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38874 |
+" <tr>\n"
|
|
38875 |
+" <td><pre> 书签 :: 编辑</pre></td></tr>\n"
|
|
38876 |
+" </table></td></tr> \n"
|
|
38877 |
+"</table> \n"
|
|
38878 |
+"\n"
|
|
38879 |
+"<form>\n"
|
|
38880 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
38881 |
+" <tr><td>\n"
|
|
38882 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
38883 |
+" <tr>\n"
|
|
38884 |
+" <td><pre><b>选择动作 </b></pre></td>\n"
|
|
38885 |
+" <td><select name='operation'>\n"
|
|
38886 |
+" <option value='none' selected>--\n"
|
|
38887 |
+" <option value='delete'>删除\n"
|
|
38888 |
+" <option value='move'>移动\n"
|
|
38889 |
+" <option value='modify'>修改\n"
|
|
38890 |
+" <option value='add_sec'>加入项目\n"
|
|
38891 |
+" <option value='add_url'>加入 URL\n"
|
|
38892 |
+" </select></td>\n"
|
|
38893 |
+" <td><pre><b>套用已选动作</b></pre></td>\n"
|
|
38894 |
+" <td><input type='submit' name='submit' value='套用.'></td>\n"
|
|
38895 |
+" <td width='100%'></td>\n"
|
|
38896 |
+" </tr>\n"
|
|
38897 |
+" </table></td></tr>\n"
|
|
38898 |
+"</table>\n"
|
|
38899 |
+
|
|
38900 |
+#: dpi/bookmarks.c:151
|
|
38901 |
+msgid ""
|
|
38902 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
38903 |
+" <tr valign='top'>\n"
|
|
38904 |
+" <td>\n"
|
|
38905 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
38906 |
+" <tr><td>\n"
|
|
38907 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38908 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
38909 |
+msgstr ""
|
|
38910 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
38911 |
+" <tr valign='top'>\n"
|
|
38912 |
+" <td>\n"
|
|
38913 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
38914 |
+" <tr><td>\n"
|
|
38915 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38916 |
+" <tr><td><pre>项目:</pre></td></tr></table></td></tr>\n"
|
|
38917 |
+
|
|
38918 |
+#: dpi/bookmarks.c:160
|
|
38919 |
+msgid ""
|
|
38920 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
38921 |
+" <tr valign='top'>\n"
|
|
38922 |
+" <td>\n"
|
|
38923 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
38924 |
+" <tr><td>\n"
|
|
38925 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38926 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
38927 |
+msgstr ""
|
|
38928 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
38929 |
+" <tr valign='top'>\n"
|
|
38930 |
+" <td>\n"
|
|
38931 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
38932 |
+" <tr><td>\n"
|
|
38933 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
38934 |
+" <tr><td><pre>项目:</pre></td></tr></table></td></tr>\n"
|
|
38935 |
+
|
|
38936 |
+#: dpi/bookmarks.c:243
|
|
38937 |
+#, fuzzy
|
|
38938 |
+msgid ""
|
|
38939 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
38940 |
+"<html>\n"
|
|
38941 |
+"<head>\n"
|
|
38942 |
+"<title>Bookmarks</title>\n"
|
|
38943 |
+"</head>\n"
|
|
38944 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
38945 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
38946 |
+" <tr><td colspan='2'>\n"
|
|
38947 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
38948 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add section\n"
|
|
38949 |
+" </td></tr></table></td></tr>\n"
|
|
38950 |
+"</table>\n"
|
|
38951 |
+"<br>\n"
|
|
38952 |
+"<form>\n"
|
|
38953 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
38954 |
+"<table border='1' width='100%'>\n"
|
|
38955 |
+" <tr>\n"
|
|
38956 |
+" <td bgcolor='olive'><b>New section:</b></td>\n"
|
|
38957 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
38958 |
+"</table>\n"
|
|
38959 |
+"<table width='100%' cellpadding='10'>\n"
|
|
38960 |
+"<tr><td>\n"
|
|
38961 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
38962 |
+" <tr>\n"
|
|
38963 |
+" <td>Title:</td>\n"
|
|
38964 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
38965 |
+" </table>\n"
|
|
38966 |
+" </td></tr>\n"
|
|
38967 |
+"</table>\n"
|
|
38968 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
38969 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
38970 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
38971 |
+"</table>\n"
|
|
38972 |
+"</form>\n"
|
|
38973 |
+"</body>\n"
|
|
38974 |
+"</html>\n"
|
|
38975 |
+"\n"
|
|
38976 |
+msgstr ""
|
|
38977 |
+"<html>\n"
|
|
38978 |
+"<head>\n"
|
|
38979 |
+"<title>书签</title>\n"
|
|
38980 |
+"</head>\n"
|
|
38981 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
38982 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
38983 |
+" <tr><td colspan='2'>\n"
|
|
38984 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
38985 |
+" <tr><td bgcolor='#b4b4b4'><pre> 编辑书签:: 加入项目</pre>\n"
|
|
38986 |
+" </td></tr></table></td></tr>\n"
|
|
38987 |
+"</table>\n"
|
|
38988 |
+"<br>\n"
|
|
38989 |
+"<form>\n"
|
|
38990 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
38991 |
+"<table border='1' width='100%'>\n"
|
|
38992 |
+" <tr>\n"
|
|
38993 |
+" <td bgcolor='olive'><pre><b>新加入项目:</b></pre></td>\n"
|
|
38994 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
38995 |
+"</table>\n"
|
|
38996 |
+"<table width='100%' cellpadding='10'>\n"
|
|
38997 |
+"<tr><td>\n"
|
|
38998 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
38999 |
+" <tr>\n"
|
|
39000 |
+" <td><pre>标题:</pre></td>\n"
|
|
39001 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
39002 |
+" </table>\n"
|
|
39003 |
+" </td></tr>\n"
|
|
39004 |
+"</table>\n"
|
|
39005 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
39006 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
39007 |
+" <input type='submit' name='submit' value='套用.'></td></tr>\n"
|
|
39008 |
+"</table>\n"
|
|
39009 |
+"</form>\n"
|
|
39010 |
+"</body>\n"
|
|
39011 |
+"</html>\n"
|
|
39012 |
+"\n"
|
|
39013 |
+
|
|
39014 |
+#: dpi/bookmarks.c:283
|
|
39015 |
+#, fuzzy
|
|
39016 |
+msgid ""
|
|
39017 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
39018 |
+"<html>\n"
|
|
39019 |
+"<head>\n"
|
|
39020 |
+"<title>Bookmarks</title>\n"
|
|
39021 |
+"</head>\n"
|
|
39022 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
39023 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
39024 |
+" <tr><td colspan='2'>\n"
|
|
39025 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
39026 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: update\n"
|
|
39027 |
+" </td></tr></table></td></tr>\n"
|
|
39028 |
+"</table>\n"
|
|
39029 |
+"<br>\n"
|
|
39030 |
+"<form>\n"
|
|
39031 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
39032 |
+msgstr ""
|
|
39033 |
+"<html>\n"
|
|
39034 |
+"<head>\n"
|
|
39035 |
+"<title>书签</title>\n"
|
|
39036 |
+"</head>\n"
|
|
39037 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
39038 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
39039 |
+" <tr><td colspan='2'>\n"
|
|
39040 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
39041 |
+" <tr><td bgcolor='#b4b4b4'><pre> 编辑书签:: 更新</pre>\n"
|
|
39042 |
+" </td></tr></table></td></tr>\n"
|
|
39043 |
+"</table>\n"
|
|
39044 |
+"<br>\n"
|
|
39045 |
+"<form>\n"
|
|
39046 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
39047 |
+
|
|
39048 |
+#: dpi/bookmarks.c:310
|
|
39049 |
+#, c-format
|
|
39050 |
+msgid ""
|
|
39051 |
+"<tr><td>\n"
|
|
39052 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
39053 |
+" <tr>\n"
|
|
39054 |
+" <td>Title:</td>\n"
|
|
39055 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
39056 |
+" value='%s'></td></tr>\n"
|
|
39057 |
+" <tr>\n"
|
|
39058 |
+" <td>URL:</td>\n"
|
|
39059 |
+" <td>%s</td></tr>\n"
|
|
39060 |
+" </table>\n"
|
|
39061 |
+" </td></tr>\n"
|
|
39062 |
+msgstr ""
|
|
39063 |
+"<tr><td>\n"
|
|
39064 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
39065 |
+" <tr>\n"
|
|
39066 |
+" <td><pre>标题:</pre></td>\n"
|
|
39067 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
39068 |
+" value='%s'></td></tr>\n"
|
|
39069 |
+" <tr>\n"
|
|
39070 |
+" <td>URL:</td>\n"
|
|
39071 |
+" <td>%s</td></tr>\n"
|
|
39072 |
+" </table>\n"
|
|
39073 |
+" </td></tr>\n"
|
|
39074 |
+
|
|
39075 |
+#: dpi/bookmarks.c:323
|
|
39076 |
+#, c-format
|
|
39077 |
+msgid ""
|
|
39078 |
+"<tr><td>\n"
|
|
39079 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
39080 |
+" <tr>\n"
|
|
39081 |
+" <td>Title:</td>\n"
|
|
39082 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
39083 |
+" value='%s'></td></tr>\n"
|
|
39084 |
+" </table>\n"
|
|
39085 |
+" </td></tr>\n"
|
|
39086 |
+msgstr ""
|
|
39087 |
+"<tr><td>\n"
|
|
39088 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
39089 |
+" <tr>\n"
|
|
39090 |
+" <td><pre>标题:</pre></td>\n"
|
|
39091 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
39092 |
+" value='%s'></td></tr>\n"
|
|
39093 |
+" </table>\n"
|
|
39094 |
+" </td></tr>\n"
|
|
39095 |
+
|
|
39096 |
+#: dpi/bookmarks.c:336
|
|
39097 |
+#, c-format
|
|
39098 |
+msgid ""
|
|
39099 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
39100 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
39101 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
39102 |
+"</table>\n"
|
|
39103 |
+"</form>\n"
|
|
39104 |
+"</body>\n"
|
|
39105 |
+"</html>\n"
|
|
39106 |
+msgstr ""
|
|
39107 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
39108 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
39109 |
+" <input type='submit' name='submit' value='套用.'></td></tr>\n"
|
|
39110 |
+"</table>\n"
|
|
39111 |
+"</form>\n"
|
|
39112 |
+"</body>\n"
|
|
39113 |
+"</html>\n"
|
|
39114 |
+
|
|
39115 |
+#: dpi/bookmarks.c:346
|
|
39116 |
+#, fuzzy
|
|
39117 |
+msgid ""
|
|
39118 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
39119 |
+"<html>\n"
|
|
39120 |
+"<head>\n"
|
|
39121 |
+"<title>Bookmarks</title>\n"
|
|
39122 |
+"</head>\n"
|
|
39123 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
39124 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
39125 |
+" <tr><td colspan='2'>\n"
|
|
39126 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
39127 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add url\n"
|
|
39128 |
+" </td></tr></table></td></tr>\n"
|
|
39129 |
+"</table>\n"
|
|
39130 |
+"<br>\n"
|
|
39131 |
+"<form>\n"
|
|
39132 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
39133 |
+"<table border='1' width='100%'>\n"
|
|
39134 |
+" <tr>\n"
|
|
39135 |
+" <td bgcolor='olive'><b>Add url:</b></td>\n"
|
|
39136 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
39137 |
+"</table>\n"
|
|
39138 |
+"<table width='100%' cellpadding='10'>\n"
|
|
39139 |
+"<tr><td>\n"
|
|
39140 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
39141 |
+" <tr>\n"
|
|
39142 |
+" <td>Title:</td>\n"
|
|
39143 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
39144 |
+" <tr>\n"
|
|
39145 |
+" <td>URL:</td>\n"
|
|
39146 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
39147 |
+" </table>\n"
|
|
39148 |
+" </td></tr>\n"
|
|
39149 |
+"</table>\n"
|
|
39150 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
39151 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
39152 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
39153 |
+"</table>\n"
|
|
39154 |
+"</form>\n"
|
|
39155 |
+"</body>\n"
|
|
39156 |
+"</html>\n"
|
|
39157 |
+msgstr ""
|
|
39158 |
+"<html>\n"
|
|
39159 |
+"<head>\n"
|
|
39160 |
+"<title>书签</title>\n"
|
|
39161 |
+"</head>\n"
|
|
39162 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
39163 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
39164 |
+" <tr><td colspan='2'>\n"
|
|
39165 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
39166 |
+" <tr><td bgcolor='#b4b4b4'><pre> 编辑书签:: 加入网页</pre>\n"
|
|
39167 |
+" </td></tr></table></td></tr>\n"
|
|
39168 |
+"</table>\n"
|
|
39169 |
+"<br>\n"
|
|
39170 |
+"<form>\n"
|
|
39171 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
39172 |
+"<table border='1' width='100%'>\n"
|
|
39173 |
+" <tr>\n"
|
|
39174 |
+" <td bgcolor='olive'><pre><b>加入网页l:</b></pre></td>\n"
|
|
39175 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
39176 |
+"</table>\n"
|
|
39177 |
+"<table width='100%' cellpadding='10'>\n"
|
|
39178 |
+"<tr><td>\n"
|
|
39179 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
39180 |
+" <tr>\n"
|
|
39181 |
+" <td><pre>标题:</pre></td>\n"
|
|
39182 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
39183 |
+" <tr>\n"
|
|
39184 |
+" <td>URL:</td>\n"
|
|
39185 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
39186 |
+" </table>\n"
|
|
39187 |
+" </td></tr>\n"
|
|
39188 |
+"</table>\n"
|
|
39189 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
39190 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
39191 |
+" <input type='submit' name='submit' value='套用.'></td></tr>\n"
|
|
39192 |
+"</table>\n"
|
|
39193 |
+"</form>\n"
|
|
39194 |
+"</body>\n"
|
|
39195 |
+"</html>\n"
|
|
39196 |
+
|
|
39197 |
+#: dpi/bookmarks.c:691
|
|
39198 |
+msgid "Unclassified"
|
|
39199 |
+msgstr "未经分类"
|
|
39200 |
+
|
|
39201 |
+#: dpi/bookmarks.c:724
|
|
39202 |
+#, c-format
|
|
39203 |
+msgid "echo \":s0: Unclassified\" > %s"
|
|
39204 |
+msgstr "echo \":s0: 未经分类\" > %s"
|
|
39205 |
+
|
|
39206 |
+#: dpi/bookmarks.c:786
|
|
39207 |
+#, c-format
|
|
39208 |
+msgid ""
|
|
39209 |
+"Syntax error in bookmarks file:\n"
|
|
39210 |
+" %s"
|
|
39211 |
+msgstr ""
|
|
39212 |
+"语法错误於书签档:\n"
|
|
39213 |
+" %s"
|
|
39214 |
+
|
|
39215 |
+#: dpi/bookmarks.c:898
|
|
39216 |
+msgid "Added bookmark!"
|
|
39217 |
+msgstr "加进书签!"
|
|
39218 |
+
|
|
39219 |
+#: dpi/bookmarks.c:1087
|
|
39220 |
+msgid "Update sections:"
|
|
39221 |
+msgstr "<pre>更新项目:</pre>"
|
|
39222 |
+
|
|
39223 |
+#: dpi/bookmarks.c:1107
|
|
39224 |
+msgid "Update titles:"
|
|
39225 |
+msgstr "<pre>更新标题:</pre>"
|
|
39226 |
+
|
|
39227 |
+#: dpi/bookmarks.c:1404
|
|
39228 |
+msgid "Delete: you must mark what to delete!"
|
|
39229 |
+msgstr "删除: 请先选择项目!"
|
|
39230 |
+
|
|
39231 |
+#: dpi/bookmarks.c:1410
|
|
39232 |
+msgid "Move: you must mark a target section!"
|
|
39233 |
+msgstr "移动: 请先选择项目!"
|
|
39234 |
+
|
|
39235 |
+#: dpi/bookmarks.c:1412
|
|
39236 |
+msgid "Move: can not move a section (yet)."
|
|
39237 |
+msgstr "移动: 移动项目失败!"
|
|
39238 |
+
|
|
39239 |
+#: dpi/bookmarks.c:1414
|
|
39240 |
+msgid "Move: you must mark some urls, and a target section!"
|
|
39241 |
+msgstr "移动: 请先选择网页及项目!"
|
|
39242 |
+
|
|
39243 |
+#: dpi/bookmarks.c:1419
|
|
39244 |
+msgid "Modify: you must mark what to update!"
|
|
39245 |
+msgstr "修改: 请先选择要更新的项目!"
|
|
39246 |
+
|
|
39247 |
+#: dpi/bookmarks.c:1436
|
|
39248 |
+msgid "Add url: only one target section is allowed!"
|
|
39249 |
+msgstr "加入网页: 只可选择一个项目!"
|
|
39250 |
+
|
|
39251 |
+#: dpi/bookmarks.c:1443
|
|
39252 |
+msgid "No operation, just do nothing!"
|
|
39253 |
+msgstr "没有指示,操作无效!"
|
|
39254 |
+
|
|
39255 |
+#: dpi/bookmarks.c:1446
|
|
39256 |
+msgid "Sorry, not implemented yet."
|
|
39257 |
+msgstr "操作尚未完成."
|
|
39258 |
+
|
|
39259 |
+#: dpi/bookmarks.c:1614
|
|
39260 |
+msgid "Haven't got a full tag!\n"
|
|
39261 |
+msgstr "找不到完整标签!\n"
|
|
39262 |
+
|
|
39263 |
+#: dpi/bookmarks.c:1690
|
|
39264 |
+#, fuzzy
|
|
39265 |
+msgid ""
|
|
39266 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
39267 |
+"<HTML><body> Error on the bookmarks server...</body></html>"
|
|
39268 |
+msgstr "<HTML><body> 书签系统错误...</body></html>"
|
|
39269 |
+
|
|
39270 |
+#: config/dillocfg.c:84
|
|
39271 |
+msgid "Quit"
|
|
39272 |
+msgstr "退出"
|
|
39273 |
+
|
|
39274 |
+#: config/dillocfg.c:86 config/dillocfg.c:92
|
|
39275 |
+msgid "Dillo Preferences"
|
|
39276 |
+msgstr "偏好设定"
|
|
39277 |
+
|
|
39278 |
+#: config/dillocfg.c:115
|
|
39279 |
+msgid "Interface"
|
|
39280 |
+msgstr "介面"
|
|
39281 |
+
|
|
39282 |
+#: config/dillocfg.c:116
|
|
39283 |
+msgid " Font "
|
|
39284 |
+msgstr "字型"
|
|
39285 |
+
|
|
39286 |
+#: config/dillocfg.c:117
|
|
39287 |
+msgid " Color "
|
|
39288 |
+msgstr "颜色"
|
|
39289 |
+
|
|
39290 |
+#: config/dillocfg.c:118
|
|
39291 |
+msgid " Network "
|
|
39292 |
+msgstr "网络"
|
|
39293 |
+
|
|
39294 |
+#: config/dillocfg.c:120
|
|
39295 |
+msgid " Tab "
|
|
39296 |
+msgstr "分页"
|
|
39297 |
+
|
|
39298 |
+#: config/dillocfg.c:123
|
|
39299 |
+msgid " Other "
|
|
39300 |
+msgstr "其他"
|
|
39301 |
+
|
|
39302 |
+#: config/dillocfg.c:331
|
|
39303 |
+msgid "Add"
|
|
39304 |
+msgstr "加入"
|
|
39305 |
+
|
|
39306 |
+#: config/dillocfg.c:332
|
|
39307 |
+msgid "Delete"
|
|
39308 |
+msgstr "删除"
|
|
39309 |
+
|
|
39310 |
+#: config/dillocfg.c:338
|
|
39311 |
+msgid "Address"
|
|
39312 |
+msgstr "位址"
|
|
39313 |
+
|
|
39314 |
+#: config/dillocfg.c:339
|
|
39315 |
+msgid "Rule"
|
|
39316 |
+msgstr "规则"
|
|
39317 |
+
|
|
39318 |
+#: config/dillocfg.c:365 config/dillocfg.c:371
|
|
39319 |
+#, c-format
|
|
39320 |
+msgid "Read failed <%s>\n"
|
|
39321 |
+msgstr "错误读取 <%s>\n"
|
|
39322 |
+
|
|
39323 |
+#: config/dillocfg.c:452 config/dillocfg.c:460
|
|
39324 |
+#, c-format
|
|
39325 |
+msgid "can't write <%s>\n"
|
|
39326 |
+msgstr "不能写入 <%s>\n"
|
|
39327 |
+
|
|
39328 |
+#: config/dillocfg_token.c:60
|
|
39329 |
+msgid "Window Size"
|
|
39330 |
+msgstr "窗口大小"
|
|
39331 |
+
|
|
39332 |
+#: config/dillocfg_token.c:68
|
|
39333 |
+msgid "HTTP Proxy"
|
|
39334 |
+msgstr "代理服务器"
|
|
39335 |
+
|
|
39336 |
+#: config/dillocfg_token.c:76
|
|
39337 |
+msgid "HTTP Proxy User"
|
|
39338 |
+msgstr "服务器用户"
|
|
39339 |
+
|
|
39340 |
+#: config/dillocfg_token.c:84
|
|
39341 |
+msgid "NO Proxy"
|
|
39342 |
+msgstr "没有服务器"
|
|
39343 |
+
|
|
39344 |
+#: config/dillocfg_token.c:92
|
|
39345 |
+msgid "User-Agent"
|
|
39346 |
+msgstr "浏览器-相容识别"
|
|
39347 |
+
|
|
39348 |
+#: config/dillocfg_token.c:100
|
|
39349 |
+msgid "Send referer header"
|
|
39350 |
+msgstr ""
|
|
39351 |
+
|
|
39352 |
+#: config/dillocfg_token.c:108
|
|
39353 |
+msgid "Link color"
|
|
39354 |
+msgstr "连接"
|
|
39355 |
+
|
|
39356 |
+#: config/dillocfg_token.c:116
|
|
39357 |
+msgid "Visited color"
|
|
39358 |
+msgstr "已到网页"
|
|
39359 |
+
|
|
39360 |
+#: config/dillocfg_token.c:124
|
|
39361 |
+msgid "BackGround color"
|
|
39362 |
+msgstr "背景"
|
|
39363 |
+
|
|
39364 |
+#: config/dillocfg_token.c:132
|
|
39365 |
+msgid "Allow white bg"
|
|
39366 |
+msgstr "空白背景"
|
|
39367 |
+
|
|
39368 |
+#: config/dillocfg_token.c:140
|
|
39369 |
+msgid "Force my colors"
|
|
39370 |
+msgstr "使用自选颜色"
|
|
39371 |
+
|
|
39372 |
+#: config/dillocfg_token.c:148
|
|
39373 |
+msgid "Contrast visited color"
|
|
39374 |
+msgstr "加亮已到网页颜色"
|
|
39375 |
+
|
|
39376 |
+#: config/dillocfg_token.c:156
|
|
39377 |
+msgid "Text color"
|
|
39378 |
+msgstr "文字颜色"
|
|
39379 |
+
|
|
39380 |
+#: config/dillocfg_token.c:164
|
|
39381 |
+msgid "Use oblique"
|
|
39382 |
+msgstr "兼容斜体"
|
|
39383 |
+
|
|
39384 |
+#: config/dillocfg_token.c:172
|
|
39385 |
+msgid "Start Page"
|
|
39386 |
+msgstr "起始页"
|
|
39387 |
+
|
|
39388 |
+#: config/dillocfg_token.c:180
|
|
39389 |
+msgid "HOMEPAGE"
|
|
39390 |
+msgstr "首页"
|
|
39391 |
+
|
|
39392 |
+#: config/dillocfg_token.c:188
|
|
39393 |
+msgid "Search-engine's URL"
|
|
39394 |
+msgstr "搜寻引擎网址"
|
|
39395 |
+
|
|
39396 |
+#: config/dillocfg_token.c:196
|
|
39397 |
+msgid "Search-engine's charset"
|
|
39398 |
+msgstr "搜寻引擎字体"
|
|
39399 |
+
|
|
39400 |
+#: config/dillocfg_token.c:204
|
|
39401 |
+msgid "Show Tooltip"
|
|
39402 |
+msgstr "显示提示"
|
|
39403 |
+
|
|
39404 |
+#: config/dillocfg_token.c:212
|
|
39405 |
+msgid "Panel Size"
|
|
39406 |
+msgstr "板面大小"
|
|
39407 |
+
|
|
39408 |
+#: config/dillocfg_token.c:220
|
|
39409 |
+msgid "Small icons"
|
|
39410 |
+msgstr "小型图示"
|
|
39411 |
+
|
|
39412 |
+#: config/dillocfg_token.c:228
|
|
39413 |
+msgid "Limit text width"
|
|
39414 |
+msgstr "限制文字宽度"
|
|
39415 |
+
|
|
39416 |
+#: config/dillocfg_token.c:236
|
|
39417 |
+msgid "Limit font decoration"
|
|
39418 |
+msgstr "限制文字装饰"
|
|
39419 |
+
|
|
39420 |
+#: config/dillocfg_token.c:244
|
|
39421 |
+msgid "Font factor"
|
|
39422 |
+msgstr "文字系数"
|
|
39423 |
+
|
|
39424 |
+#: config/dillocfg_token.c:252
|
|
39425 |
+msgid "Font Sizes"
|
|
39426 |
+msgstr "文字大小"
|
|
39427 |
+
|
|
39428 |
+#: config/dillocfg_token.c:260
|
|
39429 |
+msgid "W3C+heuristics"
|
|
39430 |
+msgstr "W3C+试探程序"
|
|
39431 |
+
|
|
39432 |
+#: config/dillocfg_token.c:268
|
|
39433 |
+msgid "Use dicache"
|
|
39434 |
+msgstr "使用磁碟缓存"
|
|
39435 |
+
|
|
39436 |
+#: config/dillocfg_token.c:276
|
|
39437 |
+msgid "Show Back"
|
|
39438 |
+msgstr "显示返回"
|
|
39439 |
+
|
|
39440 |
+#: config/dillocfg_token.c:284
|
|
39441 |
+msgid "Show Forw"
|
|
39442 |
+msgstr "显示往前"
|
|
39443 |
+
|
|
39444 |
+#: config/dillocfg_token.c:292
|
|
39445 |
+msgid "Show Home"
|
|
39446 |
+msgstr "显示首页"
|
|
39447 |
+
|
|
39448 |
+#: config/dillocfg_token.c:300
|
|
39449 |
+msgid "Show Reload"
|
|
39450 |
+msgstr "显示重载"
|
|
39451 |
+
|
|
39452 |
+#: config/dillocfg_token.c:308
|
|
39453 |
+msgid "Show Save"
|
|
39454 |
+msgstr "显示储存"
|
|
39455 |
+
|
|
39456 |
+#: config/dillocfg_token.c:316
|
|
39457 |
+msgid "Show Stop"
|
|
39458 |
+msgstr "显示停止"
|
|
39459 |
+
|
|
39460 |
+#: config/dillocfg_token.c:324
|
|
39461 |
+msgid "Show Bookmarks"
|
|
39462 |
+msgstr "显示书签"
|
|
39463 |
+
|
|
39464 |
+#: config/dillocfg_token.c:332
|
|
39465 |
+msgid "Show Menubar"
|
|
39466 |
+msgstr "显示菜单拦"
|
|
39467 |
+
|
|
39468 |
+#: config/dillocfg_token.c:340
|
|
39469 |
+msgid "Show ClearURL"
|
|
39470 |
+msgstr "显示清空位址"
|
|
39471 |
+
|
|
39472 |
+#: config/dillocfg_token.c:348
|
|
39473 |
+msgid "Show URL box"
|
|
39474 |
+msgstr "显示位址栏"
|
|
39475 |
+
|
|
39476 |
+#: config/dillocfg_token.c:356
|
|
39477 |
+msgid "Show Web Search"
|
|
39478 |
+msgstr "显示搜寻框"
|
|
39479 |
+
|
|
39480 |
+#: config/dillocfg_token.c:364
|
|
39481 |
+msgid "Show Progress box"
|
|
39482 |
+msgstr "显示进度框"
|
|
39483 |
+
|
|
39484 |
+#: config/dillocfg_token.c:372
|
|
39485 |
+msgid "Show Popup navigation"
|
|
39486 |
+msgstr "显示弹出浏览"
|
|
39487 |
+
|
|
39488 |
+#: config/dillocfg_token.c:380
|
|
39489 |
+msgid "Fullwindow start"
|
|
39490 |
+msgstr "全屏幕开始"
|
|
39491 |
+
|
|
39492 |
+#: config/dillocfg_token.c:388
|
|
39493 |
+msgid "Transient dialogs"
|
|
39494 |
+msgstr "短暂对话框"
|
|
39495 |
+
|
|
39496 |
+#: config/dillocfg_token.c:396
|
|
39497 |
+msgid "Popup dialogs"
|
|
39498 |
+msgstr "弹出对话框"
|
|
39499 |
+
|
|
39500 |
+#: config/dillocfg_token.c:404
|
|
39501 |
+msgid "vw_aafontname"
|
|
39502 |
+msgstr "一般字体(平滑化)"
|
|
39503 |
+
|
|
39504 |
+#: config/dillocfg_token.c:412
|
|
39505 |
+msgid "fw_aafontname"
|
|
39506 |
+msgstr "固定字体(平滑化)"
|
|
39507 |
+
|
|
39508 |
+#: config/dillocfg_token.c:420
|
|
39509 |
+msgid "vw_fontname"
|
|
39510 |
+msgstr "一般字体"
|
|
39511 |
+
|
|
39512 |
+#: config/dillocfg_token.c:428
|
|
39513 |
+msgid "fw_fontname"
|
|
39514 |
+msgstr "固定字体"
|
|
39515 |
+
|
|
39516 |
+#: config/dillocfg_token.c:436
|
|
39517 |
+msgid "Generate submit"
|
|
39518 |
+msgstr "发放提交"
|
|
39519 |
+
|
|
39520 |
+#: config/dillocfg_token.c:444
|
|
39521 |
+msgid "Enterpress forces submit"
|
|
39522 |
+msgstr "按 Enter 键提交"
|
|
39523 |
+
|
|
39524 |
+#: config/dillocfg_token.c:452
|
|
39525 |
+msgid "Show debugging messsages"
|
|
39526 |
+msgstr "显示除错讯息"
|
|
39527 |
+
|
|
39528 |
+#: config/dillocfg_token.c:460
|
|
39529 |
+msgid "Show Extra Warnings"
|
|
39530 |
+msgstr "显示重大警告讯息"
|
|
39531 |
+
|
|
39532 |
+#: config/dillocfg_token.c:468
|
|
39533 |
+msgid "Focus location on new"
|
|
39534 |
+msgstr "聚焦位址於新窗口"
|
|
39535 |
+
|
|
39536 |
+#: config/dillocfg_token.c:476 config/dillocfg_token.c:484
|
|
39537 |
+msgid "Accept Language"
|
|
39538 |
+msgstr "接受语言"
|
|
39539 |
+
|
|
39540 |
+#: config/dillocfg_token.c:493
|
|
39541 |
+msgid "Tab load in background"
|
|
39542 |
+msgstr "在背景开启分页"
|
|
39543 |
+
|
|
39544 |
+#: config/dillocfg_token.c:501
|
|
39545 |
+msgid "Tab close middle click"
|
|
39546 |
+msgstr "以中键关闭分页"
|
|
39547 |
+
|
|
39548 |
+#: config/dillocfg_token.c:509
|
|
39549 |
+msgid "Tab instead of window"
|
|
39550 |
+msgstr "以分页替代窗口"
|
|
39551 |
+
|
|
39552 |
+#: config/dillocfg_token.c:517
|
|
39553 |
+msgid "Tab bar show fullscreen"
|
|
39554 |
+msgstr "分页标题栏显示全屏幕"
|
|
39555 |
+
|
|
39556 |
+#: config/dillocfg_token.c:525
|
|
39557 |
+msgid "Tab bar show single tab"
|
|
39558 |
+msgstr "分页标题栏只显示单一分页"
|
|
39559 |
+
|
|
39560 |
+#: config/dillocfg_token.c:533
|
|
39561 |
+msgid "Tab bar scroller"
|
|
39562 |
+msgstr "显示分页标题栏卷轴"
|
|
39563 |
+
|
|
39564 |
+#: config/dillocfg_token.c:541
|
|
39565 |
+msgid "Tab bar homogeneous"
|
|
39566 |
+msgstr "分页标题栏平均化"
|
|
39567 |
+
|
|
39568 |
+#: config/dillocfg_token.c:549
|
|
39569 |
+msgid "Tab title compress"
|
|
39570 |
+msgstr "简化分页标题"
|
|
39571 |
+
|
|
39572 |
+#: config/dillocfg_token.c:557
|
|
39573 |
+msgid "Compress vowels"
|
|
39574 |
+msgstr "压缩母音字元"
|
|
39575 |
+
|
|
39576 |
+#: config/dillocfg_token.c:565
|
|
39577 |
+msgid "Compress_common_prefixes"
|
|
39578 |
+msgstr "压缩标头文字"
|
|
39579 |
+
|
|
39580 |
+#: config/dillocfg_token.c:574
|
|
39581 |
+msgid "Default"
|
|
39582 |
+msgstr "缺省值"
|
|
39583 |
バイナリー・ファイルdillo-0.8.6/po/zh_TW.gmoとdillo-0.8.6-i18n-misc-20070916/po/zh_TW.gmoは違います
|
|
39584 |
diff -pruN dillo-0.8.6/po/zh_TW.po dillo-0.8.6-i18n-misc-20070916/po/zh_TW.po
|
|
39585 |
--- dillo-0.8.6/po/zh_TW.po 1970-01-01 09:00:00.000000000 +0900
|
|
39586 |
+++ dillo-0.8.6-i18n-misc-20070916/po/zh_TW.po 2007-09-09 15:45:04.000000000 +0900
|
|
39587 |
@@ -0,0 +1,2129 @@
|
|
39588 |
+# Dillo Chinese Translation.
|
|
39589 |
+# Copyright (C) YEAR Free Software Foundation, Inc.
|
|
39590 |
+# This file is distributed under the same license as the PACKAGE package.
|
|
39591 |
+# Babyfai Cheung <babyfai1@yahoo.com.hk>, 2005.
|
|
39592 |
+msgid ""
|
|
39593 |
+msgstr ""
|
|
39594 |
+"Project-Id-Version: Dillo 0.8.4-i18n-misc\n"
|
|
39595 |
+"Report-Msgid-Bugs-To: \n"
|
|
39596 |
+"POT-Creation-Date: 2007-09-09 15:45+0900\n"
|
|
39597 |
+"PO-Revision-Date: 2005-02-06 22:00+0800\n"
|
|
39598 |
+"Last-Translator: Babyfai Cheung <babyfai1@yahoo.com.hk>\n"
|
|
39599 |
+"Language-Team: NONE\n"
|
|
39600 |
+"MIME-Version: 1.0\n"
|
|
39601 |
+"Content-Type: text/plain; charset=UTF-8\n"
|
|
39602 |
+"Content-Transfer-Encoding: 8bit\n"
|
|
39603 |
+
|
|
39604 |
+#: src/msg.h:27
|
|
39605 |
+msgid "HTTP warning: "
|
|
39606 |
+msgstr ""
|
|
39607 |
+
|
|
39608 |
+#: src/auth.c:87
|
|
39609 |
+msgid "Browser Url has changed\n"
|
|
39610 |
+msgstr "瀏覽器位址已變更\n"
|
|
39611 |
+
|
|
39612 |
+#: src/cache.c:253
|
|
39613 |
+msgid "WARNING: Cache_entry_add, leaking an entry.\n"
|
|
39614 |
+msgstr ""
|
|
39615 |
+
|
|
39616 |
+#: src/cache.c:316
|
|
39617 |
+msgid "## Aborting CCCQuery\n"
|
|
39618 |
+msgstr "## 退出 CCCQuery\n"
|
|
39619 |
+
|
|
39620 |
+#: src/cache.c:319
|
|
39621 |
+msgid "## Aborting CCCAnswer\n"
|
|
39622 |
+msgstr "## 退出 CCCAnswer\n"
|
|
39623 |
+
|
|
39624 |
+#: src/cache.c:322
|
|
39625 |
+msgid "## Aborting raw2\n"
|
|
39626 |
+msgstr "## 退出 raw2\n"
|
|
39627 |
+
|
|
39628 |
+#: src/cache.c:365
|
|
39629 |
+msgid "## No more clients for this entry\n"
|
|
39630 |
+msgstr ""
|
|
39631 |
+
|
|
39632 |
+#: src/cache.c:369
|
|
39633 |
+msgid "Cache_prepare_reload: ERROR, entry still has clients\n"
|
|
39634 |
+msgstr ""
|
|
39635 |
+
|
|
39636 |
+#: src/cache.c:398
|
|
39637 |
+#, c-format
|
|
39638 |
+msgid "Reloading >%s< because it shouldn't be cached\n"
|
|
39639 |
+msgstr ""
|
|
39640 |
+
|
|
39641 |
+#: src/cache.c:418
|
|
39642 |
+msgid "ERROR: unsupported protocol"
|
|
39643 |
+msgstr "錯誤: 尚未支援的通訊協定"
|
|
39644 |
+
|
|
39645 |
+#: src/cache.c:488
|
|
39646 |
+#, c-format
|
|
39647 |
+msgid "Redirect loop for URL: >%s<\n"
|
|
39648 |
+msgstr "重導向回圈予 URL: >%s<\n"
|
|
39649 |
+
|
|
39650 |
+#: src/cache.c:590
|
|
39651 |
+#, c-format
|
|
39652 |
+msgid "Bad clocks, ignore expire on >%s<\n"
|
|
39653 |
+msgstr ""
|
|
39654 |
+
|
|
39655 |
+#: src/cache.c:594
|
|
39656 |
+#, c-format
|
|
39657 |
+msgid "Forcing min expire %d on >%s< instead %ld\n"
|
|
39658 |
+msgstr ""
|
|
39659 |
+
|
|
39660 |
+#: src/cache.c:678
|
|
39661 |
+msgid "'Cache-Control: max-age=' without 'Date: ' header"
|
|
39662 |
+msgstr ""
|
|
39663 |
+
|
|
39664 |
+#: src/cache.c:722
|
|
39665 |
+msgid "Server didn't send Content-Type in header.\n"
|
|
39666 |
+msgstr "伺服器並未在標頭中送出內容.\n"
|
|
39667 |
+
|
|
39668 |
+#: src/cache.c:743
|
|
39669 |
+#, c-format
|
|
39670 |
+msgid "Forcing default expire to query url >%s<\n"
|
|
39671 |
+msgstr ""
|
|
39672 |
+
|
|
39673 |
+#: src/cache.c:831
|
|
39674 |
+#, c-format
|
|
39675 |
+msgid "Cache_decode_data: got all data -- decodinging %s\n"
|
|
39676 |
+msgstr "Cache_decode_data: 收到全部資料 -- 正在解碼 %s\n"
|
|
39677 |
+
|
|
39678 |
+#: src/cache.c:840
|
|
39679 |
+msgid "Cache_decode_data: not gzip data!\n"
|
|
39680 |
+msgstr "Cache_decode_data: 沒有壓縮資料!\n"
|
|
39681 |
+
|
|
39682 |
+#: src/cache.c:846
|
|
39683 |
+msgid "Cache_decode_data: invalid gzip data!\n"
|
|
39684 |
+msgstr "Cache_decode_data: 無效的壓縮資料!\n"
|
|
39685 |
+
|
|
39686 |
+#: src/cache.c:898
|
|
39687 |
+msgid "not x-gzip\n"
|
|
39688 |
+msgstr "沒有 X-壓縮資料\n"
|
|
39689 |
+
|
|
39690 |
+#: src/cache.c:931
|
|
39691 |
+#, c-format
|
|
39692 |
+msgid ""
|
|
39693 |
+"Content-Length does NOT match message body,\n"
|
|
39694 |
+" at: %s\n"
|
|
39695 |
+msgstr ""
|
|
39696 |
+"發現不符長度的內容,\n"
|
|
39697 |
+" 在: %s\n"
|
|
39698 |
+
|
|
39699 |
+#: src/cache.c:950
|
|
39700 |
+msgid "Cache_process_io Op = IOAbort; not implemented yet\n"
|
|
39701 |
+msgstr ""
|
|
39702 |
+
|
|
39703 |
+#: src/cache.c:1004
|
|
39704 |
+#, c-format
|
|
39705 |
+msgid "ERROR: redirect loop for: %s"
|
|
39706 |
+msgstr "錯誤: 重導向回圈予: %s"
|
|
39707 |
+
|
|
39708 |
+#: src/cache.c:1015
|
|
39709 |
+#, c-format
|
|
39710 |
+msgid ""
|
|
39711 |
+">>>Redirect from: %s\n"
|
|
39712 |
+" to %s\n"
|
|
39713 |
+msgstr ""
|
|
39714 |
+">>>重導向從: %s\n"
|
|
39715 |
+" 至 %s\n"
|
|
39716 |
+
|
|
39717 |
+#: src/cache.c:1035
|
|
39718 |
+msgid ">>>Image redirection without entity-content<<<\n"
|
|
39719 |
+msgstr ">>>重導向影像,在無實質主題下<<<\n"
|
|
39720 |
+
|
|
39721 |
+#: src/cache.c:1037
|
|
39722 |
+msgid ">>>Image redirection with entity-content<<<\n"
|
|
39723 |
+msgstr ">>>重導向影像,在實質主題下<<<\n"
|
|
39724 |
+
|
|
39725 |
+#: src/cache.c:1103
|
|
39726 |
+msgid "FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n"
|
|
39727 |
+msgstr "重大錯誤:*** >>>> Cache_process_queue 系統繁忙 !!!\n"
|
|
39728 |
+
|
|
39729 |
+#: src/cache.c:1111
|
|
39730 |
+#, c-format
|
|
39731 |
+msgid "Content-Type '%s' doesn't match the real data.\n"
|
|
39732 |
+msgstr ""
|
|
39733 |
+
|
|
39734 |
+#: src/cache.c:1140
|
|
39735 |
+#, c-format
|
|
39736 |
+msgid "HTTP warning: Content-Type '%s' doesn't match the real data."
|
|
39737 |
+msgstr ""
|
|
39738 |
+
|
|
39739 |
+#: src/cache.c:1177
|
|
39740 |
+#, fuzzy, c-format
|
|
39741 |
+msgid "Unhandled MIME type: <%s>\n"
|
|
39742 |
+msgstr ""
|
|
39743 |
+"\n"
|
|
39744 |
+" 不明的 MIME 類型: <%s>\n"
|
|
39745 |
+
|
|
39746 |
+#: src/cache.c:1202
|
|
39747 |
+msgid "Client Callback is NULL"
|
|
39748 |
+msgstr ""
|
|
39749 |
+
|
|
39750 |
+#: src/cache.c:1303
|
|
39751 |
+msgid "WARNING: Cache_stop_client, inexistent client\n"
|
|
39752 |
+msgstr ""
|
|
39753 |
+
|
|
39754 |
+#: src/cache.c:1445 src/capi.c:428 src/capi.c:481 src/capi.c:536
|
|
39755 |
+#: src/capi.c:570 src/IO/dpi.c:720 src/IO/dpi.c:760
|
|
39756 |
+msgid " Not implemented\n"
|
|
39757 |
+msgstr "沒有實行\n"
|
|
39758 |
+
|
|
39759 |
+#: src/capi.c:229
|
|
39760 |
+msgid "Capi_verify_dpi_url_request: Permission Denied!\n"
|
|
39761 |
+msgstr ""
|
|
39762 |
+
|
|
39763 |
+#: src/capi.c:324
|
|
39764 |
+#, c-format
|
|
39765 |
+msgid " reload=%d URL_E2EReload=%d\n"
|
|
39766 |
+msgstr ""
|
|
39767 |
+
|
|
39768 |
+#: src/capi.c:389
|
|
39769 |
+msgid " ERROR: [a_Capi_dpi_send_cmd] No open connection found\n"
|
|
39770 |
+msgstr ""
|
|
39771 |
+
|
|
39772 |
+#: src/capi.c:457
|
|
39773 |
+msgid "ERROR: can't start dpid daemon!"
|
|
39774 |
+msgstr ""
|
|
39775 |
+
|
|
39776 |
+#: src/capi.c:492
|
|
39777 |
+msgid " ** Capi 2F catched an invalid 'web' structure\n"
|
|
39778 |
+msgstr ""
|
|
39779 |
+
|
|
39780 |
+#: src/capi.c:552
|
|
39781 |
+msgid " Error with pipe\n"
|
|
39782 |
+msgstr ""
|
|
39783 |
+
|
|
39784 |
+#: src/commands.c:166
|
|
39785 |
+msgid "View Source"
|
|
39786 |
+msgstr "檢視源始檔"
|
|
39787 |
+
|
|
39788 |
+#: src/commands.c:183
|
|
39789 |
+msgid "Detected HTML errors"
|
|
39790 |
+msgstr "發現 HTML 錯誤"
|
|
39791 |
+
|
|
39792 |
+#: src/commands.c:265
|
|
39793 |
+msgid "Stopped"
|
|
39794 |
+msgstr "已停止"
|
|
39795 |
+
|
|
39796 |
+#: src/dillo.c:109
|
|
39797 |
+msgid ""
|
|
39798 |
+" -x, --xid XID Open first Dillo window in an existing\n"
|
|
39799 |
+" GtkSocket which window ID is XID (decimal)."
|
|
39800 |
+msgstr ""
|
|
39801 |
+
|
|
39802 |
+#: src/dillo.c:112
|
|
39803 |
+msgid " -v, --version Display version info and exit."
|
|
39804 |
+msgstr ""
|
|
39805 |
+
|
|
39806 |
+#: src/dillo.c:114
|
|
39807 |
+msgid " -h, --help Display this help text and exit."
|
|
39808 |
+msgstr ""
|
|
39809 |
+
|
|
39810 |
+#: src/dillo.c:116
|
|
39811 |
+msgid ""
|
|
39812 |
+" -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
39813 |
+" navigation buttons, menu, and status bar."
|
|
39814 |
+msgstr ""
|
|
39815 |
+
|
|
39816 |
+#: src/dillo.c:119
|
|
39817 |
+msgid " -l, --local Don't follow links for this URL(s)."
|
|
39818 |
+msgstr ""
|
|
39819 |
+
|
|
39820 |
+#: src/dillo.c:121
|
|
39821 |
+msgid ""
|
|
39822 |
+" -g, -geometry GEO Set initial window position where GEO is\n"
|
|
39823 |
+" <width>x<height>{+-}<x>{+-}<y>"
|
|
39824 |
+msgstr ""
|
|
39825 |
+
|
|
39826 |
+#: src/dillo.c:125
|
|
39827 |
+msgid ""
|
|
39828 |
+" -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
39829 |
+" representing its structure. For debugging. "
|
|
39830 |
+msgstr ""
|
|
39831 |
+
|
|
39832 |
+#: src/dillo.c:129
|
|
39833 |
+msgid " -R, --rcfile FILE Use alternative rcfile."
|
|
39834 |
+msgstr ""
|
|
39835 |
+
|
|
39836 |
+#: src/dillo.c:266
|
|
39837 |
+#, c-format
|
|
39838 |
+msgid ""
|
|
39839 |
+"Error: the XID must be an unsigned decimal numerical value.\n"
|
|
39840 |
+"The offending value was: %s\n"
|
|
39841 |
+msgstr ""
|
|
39842 |
+
|
|
39843 |
+#: src/dillo.c:284
|
|
39844 |
+msgid "Error in command line options.\n"
|
|
39845 |
+msgstr ""
|
|
39846 |
+
|
|
39847 |
+#: src/dillo.c:291
|
|
39848 |
+#, c-format
|
|
39849 |
+msgid "Setting gtk charset to %s...\n"
|
|
39850 |
+msgstr ""
|
|
39851 |
+
|
|
39852 |
+#: src/dillo.c:395
|
|
39853 |
+#, fuzzy
|
|
39854 |
+msgid "Dillo: normal exit!\n"
|
|
39855 |
+msgstr "Dillo: 找尋字串"
|
|
39856 |
+
|
|
39857 |
+#: src/dillo.c:409
|
|
39858 |
+#, c-format
|
|
39859 |
+msgid "Dillo: error creating directory %s: %s\n"
|
|
39860 |
+msgstr ""
|
|
39861 |
+
|
|
39862 |
+#: src/dillo.c:412
|
|
39863 |
+#, c-format
|
|
39864 |
+msgid "Dillo: error reading %s: %s\n"
|
|
39865 |
+msgstr ""
|
|
39866 |
+
|
|
39867 |
+#: src/dillo.c:461
|
|
39868 |
+#, c-format
|
|
39869 |
+msgid "Option %s requires %d argument(s)\n"
|
|
39870 |
+msgstr ""
|
|
39871 |
+
|
|
39872 |
+#: src/dillo.c:496
|
|
39873 |
+msgid ""
|
|
39874 |
+"\n"
|
|
39875 |
+"Usage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
39876 |
+"Options:\n"
|
|
39877 |
+msgstr ""
|
|
39878 |
+
|
|
39879 |
+#: src/dillo.c:503
|
|
39880 |
+#, c-format
|
|
39881 |
+msgid " %s, %s *Undocumented*\n"
|
|
39882 |
+msgstr ""
|
|
39883 |
+
|
|
39884 |
+#: src/dillo.c:506
|
|
39885 |
+msgid ""
|
|
39886 |
+" URL URL to browse.\n"
|
|
39887 |
+" FILE Local FILE to view.\n"
|
|
39888 |
+msgstr ""
|
|
39889 |
+
|
|
39890 |
+#: src/html.c:182
|
|
39891 |
+#, c-format
|
|
39892 |
+msgid "HTML warning: line %d, "
|
|
39893 |
+msgstr ""
|
|
39894 |
+
|
|
39895 |
+#: src/html.c:212
|
|
39896 |
+#, c-format
|
|
39897 |
+msgid "URL has %d illegal character [%d space]\n"
|
|
39898 |
+msgstr ""
|
|
39899 |
+
|
|
39900 |
+#: src/html.c:213
|
|
39901 |
+#, c-format
|
|
39902 |
+msgid "URL has %d illegal characters [%d spaces]\n"
|
|
39903 |
+msgstr ""
|
|
39904 |
+
|
|
39905 |
+#: src/html.c:216
|
|
39906 |
+#, c-format
|
|
39907 |
+msgid "URL has %d illegal character [%d in (00-1F or 7F)]\n"
|
|
39908 |
+msgstr ""
|
|
39909 |
+
|
|
39910 |
+#: src/html.c:218
|
|
39911 |
+#, c-format
|
|
39912 |
+msgid "URL has %d illegal characters [%d in (00-1F or 7F)]\n"
|
|
39913 |
+msgstr ""
|
|
39914 |
+
|
|
39915 |
+#: src/html.c:222
|
|
39916 |
+#, c-format
|
|
39917 |
+msgid "URL has %d illegal character [%d space and %d in (00-1F or 7F)]\n"
|
|
39918 |
+msgstr ""
|
|
39919 |
+
|
|
39920 |
+#: src/html.c:224
|
|
39921 |
+#, c-format
|
|
39922 |
+msgid "URL has %d illegal characters [%d space and %d in (00-1F or 7F)]\n"
|
|
39923 |
+msgstr ""
|
|
39924 |
+
|
|
39925 |
+#: src/html.c:228
|
|
39926 |
+#, c-format
|
|
39927 |
+msgid "URL has %d illegal character [%d spaces and %d in (00-1F or 7F)]\n"
|
|
39928 |
+msgstr ""
|
|
39929 |
+
|
|
39930 |
+#: src/html.c:230
|
|
39931 |
+#, c-format
|
|
39932 |
+msgid "URL has %d illegal characters [%d spaces and %d in (00-1F or 7F)]\n"
|
|
39933 |
+msgstr ""
|
|
39934 |
+
|
|
39935 |
+#: src/html.c:1237
|
|
39936 |
+msgid "numeric character reference out of range\n"
|
|
39937 |
+msgstr ""
|
|
39938 |
+
|
|
39939 |
+#: src/html.c:1245
|
|
39940 |
+msgid "numeric character reference without trailing ';'\n"
|
|
39941 |
+msgstr ""
|
|
39942 |
+
|
|
39943 |
+#: src/html.c:1257
|
|
39944 |
+#, c-format
|
|
39945 |
+msgid "undefined character entity '%s'\n"
|
|
39946 |
+msgstr ""
|
|
39947 |
+
|
|
39948 |
+#: src/html.c:1265
|
|
39949 |
+msgid "character entity reference without trailing ';'\n"
|
|
39950 |
+msgstr ""
|
|
39951 |
+
|
|
39952 |
+#: src/html.c:1273
|
|
39953 |
+msgid "code positions 128-159 are not defined for ISO Latin-1\n"
|
|
39954 |
+msgstr ""
|
|
39955 |
+
|
|
39956 |
+#: src/html.c:1281
|
|
39957 |
+msgid "literal '&'\n"
|
|
39958 |
+msgstr ""
|
|
39959 |
+
|
|
39960 |
+#: src/html.c:1390
|
|
39961 |
+msgid "TAB character inside <PRE>\n"
|
|
39962 |
+msgstr ""
|
|
39963 |
+
|
|
39964 |
+#: src/html.c:1626
|
|
39965 |
+#, c-format
|
|
39966 |
+msgid " - forcing close of open tag: <%s>\n"
|
|
39967 |
+msgstr ""
|
|
39968 |
+
|
|
39969 |
+#: src/html.c:1635
|
|
39970 |
+#, c-format
|
|
39971 |
+msgid "unexpected closing tag: </%1$s>. -- expected </%2$s>\n"
|
|
39972 |
+msgstr ""
|
|
39973 |
+
|
|
39974 |
+#: src/html.c:1707
|
|
39975 |
+#, c-format
|
|
39976 |
+msgid "Garbage after length: %s\n"
|
|
39977 |
+msgstr ""
|
|
39978 |
+
|
|
39979 |
+#: src/html.c:1726
|
|
39980 |
+msgid "color is not in \"#RRGGBB\" format\n"
|
|
39981 |
+msgstr ""
|
|
39982 |
+
|
|
39983 |
+#: src/html.c:1746
|
|
39984 |
+#, c-format
|
|
39985 |
+msgid "'%s' value is not of the form [A-Za-z][A-Za-z0-9:_.-]*\n"
|
|
39986 |
+msgstr ""
|
|
39987 |
+
|
|
39988 |
+#: src/html.c:1850
|
|
39989 |
+msgid "HTML element was already open\n"
|
|
39990 |
+msgstr ""
|
|
39991 |
+
|
|
39992 |
+#: src/html.c:1877
|
|
39993 |
+msgid "HEAD element must go before the BODY section\n"
|
|
39994 |
+msgstr ""
|
|
39995 |
+
|
|
39996 |
+#: src/html.c:1887
|
|
39997 |
+msgid "HEAD element was already open\n"
|
|
39998 |
+msgstr ""
|
|
39999 |
+
|
|
40000 |
+#: src/html.c:1900
|
|
40001 |
+msgid "HEAD section lacks the TITLE element\n"
|
|
40002 |
+msgstr ""
|
|
40003 |
+
|
|
40004 |
+#: src/html.c:1928
|
|
40005 |
+msgid "the TITLE element must be inside the HEAD section\n"
|
|
40006 |
+msgstr ""
|
|
40007 |
+
|
|
40008 |
+#: src/html.c:1997
|
|
40009 |
+msgid "BODY element was already open\n"
|
|
40010 |
+msgstr ""
|
|
40011 |
+
|
|
40012 |
+#: src/html.c:2002
|
|
40013 |
+msgid "unclosed HEAD element\n"
|
|
40014 |
+msgstr ""
|
|
40015 |
+
|
|
40016 |
+#: src/html.c:2198
|
|
40017 |
+msgid "<td> or <th> outside <table>\n"
|
|
40018 |
+msgstr ""
|
|
40019 |
+
|
|
40020 |
+#: src/html.c:2202
|
|
40021 |
+msgid "<td> or <th> outside <tr>\n"
|
|
40022 |
+msgstr ""
|
|
40023 |
+
|
|
40024 |
+#: src/html.c:2320
|
|
40025 |
+msgid "Invalid HTML syntax: <tr> outside <table>\n"
|
|
40026 |
+msgstr ""
|
|
40027 |
+
|
|
40028 |
+#: src/html.c:2378
|
|
40029 |
+msgid "<noframes> outside of <frameset>!!!\n"
|
|
40030 |
+msgstr ""
|
|
40031 |
+
|
|
40032 |
+#: src/html.c:2386
|
|
40033 |
+msgid "<noframe> is illegal tag !!! use <noframes>.\n"
|
|
40034 |
+msgstr ""
|
|
40035 |
+
|
|
40036 |
+#: src/html.c:2573
|
|
40037 |
+msgid "<frame> outside of <frameset>\n"
|
|
40038 |
+msgstr ""
|
|
40039 |
+
|
|
40040 |
+#: src/html.c:2576
|
|
40041 |
+msgid "<frame> inside of <noframes>\n"
|
|
40042 |
+msgstr ""
|
|
40043 |
+
|
|
40044 |
+#: src/html.c:2579
|
|
40045 |
+msgid "<frame> inside of <iframe>\n"
|
|
40046 |
+msgstr ""
|
|
40047 |
+
|
|
40048 |
+#: src/html.c:2631
|
|
40049 |
+msgid "incorrectly placed <frameset>\n"
|
|
40050 |
+msgstr ""
|
|
40051 |
+
|
|
40052 |
+#: src/html.c:2647
|
|
40053 |
+msgid "<frameset> inside of <noframes>\n"
|
|
40054 |
+msgstr ""
|
|
40055 |
+
|
|
40056 |
+#: src/html.c:2652
|
|
40057 |
+msgid "<frameset> inside of <iframe>\n"
|
|
40058 |
+msgstr ""
|
|
40059 |
+
|
|
40060 |
+#: src/html.c:3134
|
|
40061 |
+msgid " Html_tag_open_img: server-side map (ISMAP)\n"
|
|
40062 |
+msgstr ""
|
|
40063 |
+
|
|
40064 |
+#: src/html.c:3160
|
|
40065 |
+msgid "nested <map>\n"
|
|
40066 |
+msgstr ""
|
|
40067 |
+
|
|
40068 |
+#: src/html.c:3212
|
|
40069 |
+msgid "usemap coords MUST be separated with ','\n"
|
|
40070 |
+msgstr ""
|
|
40071 |
+
|
|
40072 |
+#: src/html.c:3256
|
|
40073 |
+msgid "nohref"
|
|
40074 |
+msgstr ""
|
|
40075 |
+
|
|
40076 |
+#: src/html.c:3295
|
|
40077 |
+msgid "link depends on javascript()\n"
|
|
40078 |
+msgstr ""
|
|
40079 |
+
|
|
40080 |
+#: src/html.c:3311
|
|
40081 |
+#, c-format
|
|
40082 |
+msgid "Registering ANCHOR: %s\n"
|
|
40083 |
+msgstr ""
|
|
40084 |
+
|
|
40085 |
+#: src/html.c:3316
|
|
40086 |
+msgid "Anchor names must be unique within the document\n"
|
|
40087 |
+msgstr ""
|
|
40088 |
+
|
|
40089 |
+#: src/html.c:3523
|
|
40090 |
+msgid "it is strongly recommended using <UL> instead of <MENU>\n"
|
|
40091 |
+msgstr ""
|
|
40092 |
+
|
|
40093 |
+#: src/html.c:3585
|
|
40094 |
+msgid "<li> outside <ul> or <ol>\n"
|
|
40095 |
+msgstr ""
|
|
40096 |
+
|
|
40097 |
+#: src/html.c:3781
|
|
40098 |
+msgid "nested forms\n"
|
|
40099 |
+msgstr ""
|
|
40100 |
+
|
|
40101 |
+#: src/html.c:3828
|
|
40102 |
+msgid "FORM lacks a Submit button\n"
|
|
40103 |
+msgstr ""
|
|
40104 |
+
|
|
40105 |
+#: src/html.c:3830
|
|
40106 |
+msgid " (added a submit button internally)\n"
|
|
40107 |
+msgstr ""
|
|
40108 |
+
|
|
40109 |
+#: src/html.c:3934
|
|
40110 |
+msgid "META elements must be inside the HEAD section\n"
|
|
40111 |
+msgstr ""
|
|
40112 |
+
|
|
40113 |
+#: src/html.c:3986
|
|
40114 |
+#, c-format
|
|
40115 |
+msgid ""
|
|
40116 |
+"The NON-STANDARD meta refresh tag. The HTML 4.01 SPEC (sec 7.4.4) recommends "
|
|
40117 |
+"explicitly to avoid it. The author wanted you to go <%s>\n"
|
|
40118 |
+msgstr ""
|
|
40119 |
+
|
|
40120 |
+#: src/html.c:4356
|
|
40121 |
+msgid "Html_submit_form: Method unknown\n"
|
|
40122 |
+msgstr ""
|
|
40123 |
+
|
|
40124 |
+#: src/html.c:4438
|
|
40125 |
+msgid "Html_input_image: unable to create image submit.\n"
|
|
40126 |
+msgstr ""
|
|
40127 |
+
|
|
40128 |
+#: src/html.c:4460
|
|
40129 |
+msgid "input camp outside <form>\n"
|
|
40130 |
+msgstr ""
|
|
40131 |
+
|
|
40132 |
+#: src/html.c:4540
|
|
40133 |
+msgid "submit"
|
|
40134 |
+msgstr "提交"
|
|
40135 |
+
|
|
40136 |
+#: src/html.c:4547 config/dillocfg.c:81
|
|
40137 |
+msgid "Reset"
|
|
40138 |
+msgstr "重設"
|
|
40139 |
+
|
|
40140 |
+#: src/html.c:4557
|
|
40141 |
+msgid "Submit"
|
|
40142 |
+msgstr "提交"
|
|
40143 |
+
|
|
40144 |
+#: src/html.c:4574
|
|
40145 |
+msgid "An input of the type \"file\" wasn't rendered!\n"
|
|
40146 |
+msgstr ""
|
|
40147 |
+
|
|
40148 |
+#: src/html.c:4748
|
|
40149 |
+msgid "<textarea> outside <form>\n"
|
|
40150 |
+msgstr ""
|
|
40151 |
+
|
|
40152 |
+#: src/html.c:4753
|
|
40153 |
+msgid "nested <textarea>\n"
|
|
40154 |
+msgstr ""
|
|
40155 |
+
|
|
40156 |
+#: src/html.c:4825
|
|
40157 |
+msgid "<select> outside <form>\n"
|
|
40158 |
+msgstr ""
|
|
40159 |
+
|
|
40160 |
+#: src/html.c:4829
|
|
40161 |
+msgid "nested <select>\n"
|
|
40162 |
+msgstr ""
|
|
40163 |
+
|
|
40164 |
+#: src/html.c:5053
|
|
40165 |
+msgid "base URI is relative (it MUST be absolute)\n"
|
|
40166 |
+msgstr ""
|
|
40167 |
+
|
|
40168 |
+#: src/html.c:5060
|
|
40169 |
+msgid "the BASE element must appear in the HEAD section\n"
|
|
40170 |
+msgstr ""
|
|
40171 |
+
|
|
40172 |
+#: src/html.c:5411
|
|
40173 |
+#, c-format
|
|
40174 |
+msgid "<%1$s> is not allowed to contain <%2$s>. -- closing <%3$s>\n"
|
|
40175 |
+msgstr ""
|
|
40176 |
+
|
|
40177 |
+#: src/html.c:5435
|
|
40178 |
+msgid "the required DOCTYPE declaration is missing (or invalid)\n"
|
|
40179 |
+msgstr ""
|
|
40180 |
+
|
|
40181 |
+#: src/html.c:5526
|
|
40182 |
+#, c-format
|
|
40183 |
+msgid "<pre> is not allowed to contain <%s>\n"
|
|
40184 |
+msgstr ""
|
|
40185 |
+
|
|
40186 |
+#: src/html.c:5548
|
|
40187 |
+msgid "'id' and 'name' attribute of <a> tag differ\n"
|
|
40188 |
+msgstr ""
|
|
40189 |
+
|
|
40190 |
+#: src/html.c:5775
|
|
40191 |
+msgid "Html_write_raw : bufsize is negative!\n"
|
|
40192 |
+msgstr ""
|
|
40193 |
+
|
|
40194 |
+#: src/html.c:5853
|
|
40195 |
+msgid "attribute lacks closing quote\n"
|
|
40196 |
+msgstr ""
|
|
40197 |
+
|
|
40198 |
+#: src/html.c:5861
|
|
40199 |
+#, c-format
|
|
40200 |
+msgid "<%s> element lacks its closing '>'\n"
|
|
40201 |
+msgstr ""
|
|
40202 |
+
|
|
40203 |
+#: src/html.c:6155
|
|
40204 |
+msgid "could not allocate character encoding converter"
|
|
40205 |
+msgstr ""
|
|
40206 |
+
|
|
40207 |
+#: src/misc.c:455
|
|
40208 |
+msgid "Untitled"
|
|
40209 |
+msgstr "未命名"
|
|
40210 |
+
|
|
40211 |
+#: src/interface.c:249
|
|
40212 |
+msgid "Selection retrieval failed\n"
|
|
40213 |
+msgstr "選擇回收失敗\n"
|
|
40214 |
+
|
|
40215 |
+#: src/interface.c:363
|
|
40216 |
+msgid "Clear the URL box (middle-click to paste an URL)."
|
|
40217 |
+msgstr "清空位址欄(點擊中鍵)."
|
|
40218 |
+
|
|
40219 |
+#: src/interface.c:385
|
|
40220 |
+msgid "Search the Web"
|
|
40221 |
+msgstr "搜尋網頁"
|
|
40222 |
+
|
|
40223 |
+#: src/interface.c:417 src/menu.c:231 src/menu.c:280
|
|
40224 |
+msgid "Back"
|
|
40225 |
+msgstr "返回"
|
|
40226 |
+
|
|
40227 |
+#: src/interface.c:421
|
|
40228 |
+msgid "Go to previous page (right-click for menu)."
|
|
40229 |
+msgstr "回到上一頁(右擊選單)."
|
|
40230 |
+
|
|
40231 |
+#: src/interface.c:450 src/menu.c:233 src/menu.c:282
|
|
40232 |
+msgid "Forward"
|
|
40233 |
+msgstr "往前"
|
|
40234 |
+
|
|
40235 |
+#: src/interface.c:454
|
|
40236 |
+msgid "Go to next page (right-click for menu)."
|
|
40237 |
+msgstr "移至下一頁(右擊選單)."
|
|
40238 |
+
|
|
40239 |
+#: src/interface.c:481
|
|
40240 |
+msgid "Home"
|
|
40241 |
+msgstr "首頁"
|
|
40242 |
+
|
|
40243 |
+#: src/interface.c:485
|
|
40244 |
+msgid "Go to the Home page"
|
|
40245 |
+msgstr "移至首頁"
|
|
40246 |
+
|
|
40247 |
+#: src/interface.c:499 config/dillocfg.c:82
|
|
40248 |
+msgid "Reload"
|
|
40249 |
+msgstr "重載"
|
|
40250 |
+
|
|
40251 |
+#: src/interface.c:500
|
|
40252 |
+msgid "Reload this page"
|
|
40253 |
+msgstr "重新載入"
|
|
40254 |
+
|
|
40255 |
+#: src/interface.c:512 config/dillocfg.c:83
|
|
40256 |
+msgid "Save"
|
|
40257 |
+msgstr "儲存"
|
|
40258 |
+
|
|
40259 |
+#: src/interface.c:513
|
|
40260 |
+msgid "Save this page"
|
|
40261 |
+msgstr "儲存網頁"
|
|
40262 |
+
|
|
40263 |
+#: src/interface.c:520 src/menu.c:235 src/menu.c:284
|
|
40264 |
+msgid "Stop"
|
|
40265 |
+msgstr "停止"
|
|
40266 |
+
|
|
40267 |
+#: src/interface.c:521
|
|
40268 |
+msgid "Stop the current transfer"
|
|
40269 |
+msgstr "停止當前的傳送"
|
|
40270 |
+
|
|
40271 |
+#: src/interface.c:534
|
|
40272 |
+msgid "Book"
|
|
40273 |
+msgstr "書籤"
|
|
40274 |
+
|
|
40275 |
+#: src/interface.c:538
|
|
40276 |
+msgid "View bookmarks"
|
|
40277 |
+msgstr "檢視書籤"
|
|
40278 |
+
|
|
40279 |
+#: src/interface.c:655 src/interface.c:826
|
|
40280 |
+msgid "Hide Controls"
|
|
40281 |
+msgstr "隱藏控制欄"
|
|
40282 |
+
|
|
40283 |
+#: src/interface.c:655 src/interface.c:826
|
|
40284 |
+msgid "Show Controls"
|
|
40285 |
+msgstr "顯示控制欄"
|
|
40286 |
+
|
|
40287 |
+#: src/interface.c:929
|
|
40288 |
+msgid "Show HTML bugs (right-click for menu)."
|
|
40289 |
+msgstr "顯示 HTML 錯誤(右擊選單)."
|
|
40290 |
+
|
|
40291 |
+#: src/interface.c:1231
|
|
40292 |
+#, c-format
|
|
40293 |
+msgid "Warning: search_url ends with '%%'\n"
|
|
40294 |
+msgstr "警告: search_url 結尾為 '%%'\n"
|
|
40295 |
+
|
|
40296 |
+#: src/interface.c:1233
|
|
40297 |
+#, c-format
|
|
40298 |
+msgid "Warning: illegal specifier '%%%c' in search_url\n"
|
|
40299 |
+msgstr "警告: 在 search_url 中,有非法的指定符 '%%%c'\n"
|
|
40300 |
+
|
|
40301 |
+#: src/interface.c:1298
|
|
40302 |
+msgid "Dillo: Open File"
|
|
40303 |
+msgstr "Dillo: 開啟檔案"
|
|
40304 |
+
|
|
40305 |
+#: src/interface.c:1374
|
|
40306 |
+msgid "Clear"
|
|
40307 |
+msgstr "清除"
|
|
40308 |
+
|
|
40309 |
+#: src/interface.c:1382 src/interface.c:1536 src/nav.c:453
|
|
40310 |
+msgid "Cancel"
|
|
40311 |
+msgstr "取消"
|
|
40312 |
+
|
|
40313 |
+#: src/interface.c:1513
|
|
40314 |
+msgid "User Name:"
|
|
40315 |
+msgstr "用戶名稱:"
|
|
40316 |
+
|
|
40317 |
+#: src/interface.c:1520
|
|
40318 |
+msgid "Password:"
|
|
40319 |
+msgstr "密碼:"
|
|
40320 |
+
|
|
40321 |
+#: src/interface.c:1529 src/interface.c:1604 src/interface.c:2073
|
|
40322 |
+#: src/nav.c:453
|
|
40323 |
+msgid "OK"
|
|
40324 |
+msgstr "確定"
|
|
40325 |
+
|
|
40326 |
+#: src/interface.c:1566
|
|
40327 |
+msgid "Dillo: Enter Authentication"
|
|
40328 |
+msgstr "Dillo: 進入驗証"
|
|
40329 |
+
|
|
40330 |
+#: src/interface.c:1586
|
|
40331 |
+msgid "Dillo: Question"
|
|
40332 |
+msgstr "Dillo: 問題"
|
|
40333 |
+
|
|
40334 |
+#: src/interface.c:1602
|
|
40335 |
+msgid "Dillo: Open URL"
|
|
40336 |
+msgstr "Dillo: 開啟網頁"
|
|
40337 |
+
|
|
40338 |
+#: src/interface.c:1626
|
|
40339 |
+#, c-format
|
|
40340 |
+msgid "File saved (%d Bytes)"
|
|
40341 |
+msgstr "檔案已存入(%d Bytes)"
|
|
40342 |
+
|
|
40343 |
+#: src/interface.c:1708
|
|
40344 |
+#, c-format
|
|
40345 |
+msgid "Error trying to save: %s\n"
|
|
40346 |
+msgstr "錯誤於儲存: %s\n"
|
|
40347 |
+
|
|
40348 |
+#: src/interface.c:1761
|
|
40349 |
+msgid "Dillo: Save URL as File..."
|
|
40350 |
+msgstr "Dillo: 儲存網頁為..."
|
|
40351 |
+
|
|
40352 |
+#: src/interface.c:1788
|
|
40353 |
+msgid "Dillo: Save link as File..."
|
|
40354 |
+msgstr "Dillo: 儲存連結為..."
|
|
40355 |
+
|
|
40356 |
+#: src/interface.c:1843 src/interface.c:1857
|
|
40357 |
+msgid "Dillo: Find text"
|
|
40358 |
+msgstr "Dillo: 找尋字串"
|
|
40359 |
+
|
|
40360 |
+#: src/interface.c:1844 src/interface.c:1850
|
|
40361 |
+#, c-format
|
|
40362 |
+msgid "Cannot find \"%s\"."
|
|
40363 |
+msgstr "找不到 \"%s\"."
|
|
40364 |
+
|
|
40365 |
+#: src/interface.c:1858
|
|
40366 |
+#, c-format
|
|
40367 |
+msgid "No further occurence of \"%s\". Restarting from the beginning."
|
|
40368 |
+msgstr "找不到更多符合 \"%s\". 重開端再找尋"
|
|
40369 |
+
|
|
40370 |
+#: src/interface.c:1866
|
|
40371 |
+#, c-format
|
|
40372 |
+msgid "(Find) \"%s\": restart from beginning"
|
|
40373 |
+msgstr "(找尋) \"%s\": 重開端再找尋 "
|
|
40374 |
+
|
|
40375 |
+#: src/interface.c:1879
|
|
40376 |
+#, c-format
|
|
40377 |
+msgid "(Find) \"%s\""
|
|
40378 |
+msgstr "(找尋) \"%s\""
|
|
40379 |
+
|
|
40380 |
+#: src/interface.c:1885
|
|
40381 |
+msgid "Unexpected return from a_Dw_gtk_scrolled_window_search()\n"
|
|
40382 |
+msgstr "意外回傳從 a_Dw_gtk_scrolled_window_search()\n"
|
|
40383 |
+
|
|
40384 |
+#: src/interface.c:1937
|
|
40385 |
+msgid "press <Enter> to (repeat) search, <Esc> to close search"
|
|
40386 |
+msgstr "按 <Enter> 重新搜尋, <Esc> 退出"
|
|
40387 |
+
|
|
40388 |
+#: src/interface.c:1938 src/interface.c:2031
|
|
40389 |
+msgid "Search"
|
|
40390 |
+msgstr "搜尋"
|
|
40391 |
+
|
|
40392 |
+#: src/interface.c:1940 src/interface.c:1941 src/interface.c:1977
|
|
40393 |
+msgid "Case sensitive"
|
|
40394 |
+msgstr "區分大小寫"
|
|
40395 |
+
|
|
40396 |
+#: src/interface.c:1975
|
|
40397 |
+msgid "Dillo: Find text in page"
|
|
40398 |
+msgstr "Dillo: 在頁面中找尋文字"
|
|
40399 |
+
|
|
40400 |
+#: src/interface.c:1978
|
|
40401 |
+msgid "Find"
|
|
40402 |
+msgstr "找尋"
|
|
40403 |
+
|
|
40404 |
+#: src/interface.c:2029
|
|
40405 |
+msgid "Dillo"
|
|
40406 |
+msgstr "Dillo"
|
|
40407 |
+
|
|
40408 |
+#: src/interface.c:2029
|
|
40409 |
+msgid "Dillo: Search the Web"
|
|
40410 |
+msgstr "Dillo: 搜尋網頁"
|
|
40411 |
+
|
|
40412 |
+#: src/interface.c:2066
|
|
40413 |
+#, c-format
|
|
40414 |
+msgid "Dillo: Enter proxy password for '%s'"
|
|
40415 |
+msgstr "Dillo: 輸入 '%s' 的伺服器密碼"
|
|
40416 |
+
|
|
40417 |
+#: src/interface.c:2151
|
|
40418 |
+msgid "Close"
|
|
40419 |
+msgstr "關閉"
|
|
40420 |
+
|
|
40421 |
+#: src/interface.c:2226
|
|
40422 |
+msgid "close"
|
|
40423 |
+msgstr "關閉"
|
|
40424 |
+
|
|
40425 |
+#: src/nav.c:383
|
|
40426 |
+#, c-format
|
|
40427 |
+msgid "Unhandled switch type %d in a_Nav_jump_callback in src/nav.c\n"
|
|
40428 |
+msgstr ""
|
|
40429 |
+
|
|
40430 |
+#: src/nav.c:452
|
|
40431 |
+msgid "Repost form data?"
|
|
40432 |
+msgstr "再列出表單資料?"
|
|
40433 |
+
|
|
40434 |
+#: src/menu.c:173
|
|
40435 |
+msgid "_File"
|
|
40436 |
+msgstr "檔案(_F)"
|
|
40437 |
+
|
|
40438 |
+#: src/menu.c:174
|
|
40439 |
+msgid "_New Window"
|
|
40440 |
+msgstr "新窗口(_N)"
|
|
40441 |
+
|
|
40442 |
+#: src/menu.c:177
|
|
40443 |
+msgid "New _Tab"
|
|
40444 |
+msgstr "新分頁(_T)"
|
|
40445 |
+
|
|
40446 |
+#: src/menu.c:181
|
|
40447 |
+msgid "_Open File..."
|
|
40448 |
+msgstr "開啟檔案(_O)..."
|
|
40449 |
+
|
|
40450 |
+#: src/menu.c:183
|
|
40451 |
+msgid "Open _URL..."
|
|
40452 |
+msgstr "開啟位址(_U)..."
|
|
40453 |
+
|
|
40454 |
+#: src/menu.c:189
|
|
40455 |
+msgid "Close Window"
|
|
40456 |
+msgstr "關閉窗口"
|
|
40457 |
+
|
|
40458 |
+#: src/menu.c:192 src/menu.c:359
|
|
40459 |
+msgid "Close Tab"
|
|
40460 |
+msgstr "關閉分頁"
|
|
40461 |
+
|
|
40462 |
+#: src/menu.c:196
|
|
40463 |
+msgid "Exit Dillo"
|
|
40464 |
+msgstr "關閉 Dillo"
|
|
40465 |
+
|
|
40466 |
+#: src/menu.c:200
|
|
40467 |
+msgid "_View"
|
|
40468 |
+msgstr "檢視(_V)"
|
|
40469 |
+
|
|
40470 |
+#: src/menu.c:202
|
|
40471 |
+msgid "Previous tab"
|
|
40472 |
+msgstr "上一分頁"
|
|
40473 |
+
|
|
40474 |
+#: src/menu.c:204
|
|
40475 |
+msgid "Next tab"
|
|
40476 |
+msgstr "下一分頁"
|
|
40477 |
+
|
|
40478 |
+#: src/menu.c:208
|
|
40479 |
+msgid "_Options..."
|
|
40480 |
+msgstr "選項(_O)..."
|
|
40481 |
+
|
|
40482 |
+#: src/menu.c:228
|
|
40483 |
+msgid "PAGE OPTIONS"
|
|
40484 |
+msgstr "頁面選項"
|
|
40485 |
+
|
|
40486 |
+#: src/menu.c:237 src/menu.c:286
|
|
40487 |
+msgid "_Reload"
|
|
40488 |
+msgstr "重載(_R)"
|
|
40489 |
+
|
|
40490 |
+#: src/menu.c:241
|
|
40491 |
+msgid "View page So_urce"
|
|
40492 |
+msgstr "檢視源始檔(_S)"
|
|
40493 |
+
|
|
40494 |
+#: src/menu.c:243
|
|
40495 |
+msgid "View page Bugs"
|
|
40496 |
+msgstr "檢視頁面錯誤"
|
|
40497 |
+
|
|
40498 |
+#: src/menu.c:244
|
|
40499 |
+msgid "_Bookmark this Page"
|
|
40500 |
+msgstr "加進書籤(_B)"
|
|
40501 |
+
|
|
40502 |
+#: src/menu.c:247
|
|
40503 |
+msgid "Duplicate this Page"
|
|
40504 |
+msgstr "複製至新窗口"
|
|
40505 |
+
|
|
40506 |
+#: src/menu.c:250
|
|
40507 |
+msgid "Duplicate this tab"
|
|
40508 |
+msgstr "複製至新分頁"
|
|
40509 |
+
|
|
40510 |
+#: src/menu.c:254
|
|
40511 |
+msgid "_Find Text"
|
|
40512 |
+msgstr "找尋文字(_F)"
|
|
40513 |
+
|
|
40514 |
+#: src/menu.c:257
|
|
40515 |
+msgid "Jump to..."
|
|
40516 |
+msgstr "跳至..."
|
|
40517 |
+
|
|
40518 |
+#: src/menu.c:258
|
|
40519 |
+msgid "This Frame..."
|
|
40520 |
+msgstr "此框架..."
|
|
40521 |
+
|
|
40522 |
+#: src/menu.c:259
|
|
40523 |
+msgid "This Frameset..."
|
|
40524 |
+msgstr "此框架佈局..."
|
|
40525 |
+
|
|
40526 |
+#: src/menu.c:262
|
|
40527 |
+msgid "Save Page As..."
|
|
40528 |
+msgstr "儲存為..."
|
|
40529 |
+
|
|
40530 |
+#: src/menu.c:277
|
|
40531 |
+msgid "FRAME OPTIONS"
|
|
40532 |
+msgstr "框架選項"
|
|
40533 |
+
|
|
40534 |
+#: src/menu.c:290
|
|
40535 |
+msgid "View frame Source"
|
|
40536 |
+msgstr "檢視框架源始檔"
|
|
40537 |
+
|
|
40538 |
+#: src/menu.c:292
|
|
40539 |
+msgid "Bookmark this Frame"
|
|
40540 |
+msgstr "框架加進書籤"
|
|
40541 |
+
|
|
40542 |
+#: src/menu.c:294
|
|
40543 |
+msgid "Reload this Frame"
|
|
40544 |
+msgstr "重新載入"
|
|
40545 |
+
|
|
40546 |
+#: src/menu.c:297
|
|
40547 |
+msgid "Show only this Frame"
|
|
40548 |
+msgstr "只顯示此框架"
|
|
40549 |
+
|
|
40550 |
+#: src/menu.c:299
|
|
40551 |
+msgid "Open Frame in new Window"
|
|
40552 |
+msgstr "在新窗口開啟框架"
|
|
40553 |
+
|
|
40554 |
+#: src/menu.c:302
|
|
40555 |
+msgid "Open Frame in new Tab"
|
|
40556 |
+msgstr "在新分頁開啟框架"
|
|
40557 |
+
|
|
40558 |
+#: src/menu.c:306
|
|
40559 |
+msgid "_Find Text in this Frame..."
|
|
40560 |
+msgstr "於框架找尋字串(_F)..."
|
|
40561 |
+
|
|
40562 |
+#: src/menu.c:309 src/menu.c:340
|
|
40563 |
+msgid "Save Frame As..."
|
|
40564 |
+msgstr "儲存框架為..."
|
|
40565 |
+
|
|
40566 |
+#: src/menu.c:325
|
|
40567 |
+msgid "FRAMESET OPTIONS"
|
|
40568 |
+msgstr "框架佈局選項"
|
|
40569 |
+
|
|
40570 |
+#: src/menu.c:327
|
|
40571 |
+msgid "View Frameset Source"
|
|
40572 |
+msgstr "檢視源始檔"
|
|
40573 |
+
|
|
40574 |
+#: src/menu.c:329
|
|
40575 |
+msgid "Bookmark this Frameset"
|
|
40576 |
+msgstr "加進書籤"
|
|
40577 |
+
|
|
40578 |
+#: src/menu.c:331
|
|
40579 |
+msgid "Reload this Frameset"
|
|
40580 |
+msgstr "重新載入"
|
|
40581 |
+
|
|
40582 |
+#: src/menu.c:334
|
|
40583 |
+msgid "Show only this Frameset"
|
|
40584 |
+msgstr "只顯示此框架"
|
|
40585 |
+
|
|
40586 |
+#: src/menu.c:337
|
|
40587 |
+msgid "_Find Text in this Frameset..."
|
|
40588 |
+msgstr "找尋字串(_F)..."
|
|
40589 |
+
|
|
40590 |
+#: src/menu.c:357
|
|
40591 |
+msgid "TAB OPTIONS"
|
|
40592 |
+msgstr "分頁選項"
|
|
40593 |
+
|
|
40594 |
+#: src/menu.c:361
|
|
40595 |
+msgid "New Tab"
|
|
40596 |
+msgstr "新分頁"
|
|
40597 |
+
|
|
40598 |
+#: src/menu.c:363
|
|
40599 |
+msgid "Reload Tab"
|
|
40600 |
+msgstr "重載分頁"
|
|
40601 |
+
|
|
40602 |
+#: src/menu.c:460
|
|
40603 |
+msgid "FOLLOWING PAGES"
|
|
40604 |
+msgstr "下一頁"
|
|
40605 |
+
|
|
40606 |
+#: src/menu.c:463
|
|
40607 |
+msgid "PREVIOUS PAGES"
|
|
40608 |
+msgstr "上一頁"
|
|
40609 |
+
|
|
40610 |
+#: src/menu.c:531
|
|
40611 |
+msgid "LINK OPTIONS"
|
|
40612 |
+msgstr "連結選項"
|
|
40613 |
+
|
|
40614 |
+#: src/menu.c:533
|
|
40615 |
+msgid "Open Link in New Window"
|
|
40616 |
+msgstr "在新窗口開啟連結"
|
|
40617 |
+
|
|
40618 |
+#: src/menu.c:536
|
|
40619 |
+msgid "Open Link in New Tab"
|
|
40620 |
+msgstr "在新分頁開啟連結"
|
|
40621 |
+
|
|
40622 |
+#: src/menu.c:539
|
|
40623 |
+msgid "Open Link"
|
|
40624 |
+msgstr "開啟連結"
|
|
40625 |
+
|
|
40626 |
+#: src/menu.c:542
|
|
40627 |
+msgid "Bookmark this Link"
|
|
40628 |
+msgstr "連結加進書籤"
|
|
40629 |
+
|
|
40630 |
+#: src/menu.c:544
|
|
40631 |
+msgid "Copy Link location"
|
|
40632 |
+msgstr "複製連結位址"
|
|
40633 |
+
|
|
40634 |
+#: src/menu.c:549
|
|
40635 |
+msgid "Save Link As..."
|
|
40636 |
+msgstr "儲存連結為..."
|
|
40637 |
+
|
|
40638 |
+#: src/menu.c:553
|
|
40639 |
+msgid "Image Menu..."
|
|
40640 |
+msgstr "影像選單.."
|
|
40641 |
+
|
|
40642 |
+#: src/menu.c:571
|
|
40643 |
+msgid "IMAGE OPTIONS"
|
|
40644 |
+msgstr "影像選項"
|
|
40645 |
+
|
|
40646 |
+#: src/menu.c:573
|
|
40647 |
+msgid "Isolate Image"
|
|
40648 |
+msgstr "檢視影像"
|
|
40649 |
+
|
|
40650 |
+#: src/menu.c:575
|
|
40651 |
+msgid "Open Image in New Window"
|
|
40652 |
+msgstr "在新窗口開啟影像"
|
|
40653 |
+
|
|
40654 |
+#: src/menu.c:578
|
|
40655 |
+msgid "Open Image in New Tab"
|
|
40656 |
+msgstr "在新分頁開啟影像"
|
|
40657 |
+
|
|
40658 |
+#: src/menu.c:581
|
|
40659 |
+msgid "Open Image"
|
|
40660 |
+msgstr "開啟影像"
|
|
40661 |
+
|
|
40662 |
+#: src/menu.c:584
|
|
40663 |
+msgid "Bookmark this Image"
|
|
40664 |
+msgstr "將影像加入書籤"
|
|
40665 |
+
|
|
40666 |
+#: src/menu.c:586
|
|
40667 |
+msgid "Copy Image location"
|
|
40668 |
+msgstr "複製影像位址"
|
|
40669 |
+
|
|
40670 |
+#: src/menu.c:591
|
|
40671 |
+msgid "Save Image As..."
|
|
40672 |
+msgstr "儲存影像為..."
|
|
40673 |
+
|
|
40674 |
+#: src/menu.c:605
|
|
40675 |
+msgid "BUG METER OPTIONS"
|
|
40676 |
+msgstr "錯誤偵測選項"
|
|
40677 |
+
|
|
40678 |
+#: src/menu.c:607
|
|
40679 |
+msgid "Validate URL with W3C"
|
|
40680 |
+msgstr "以 W3C 錯誤偵測"
|
|
40681 |
+
|
|
40682 |
+#: src/menu.c:609
|
|
40683 |
+msgid "Validate URL with WDG"
|
|
40684 |
+msgstr "以 WDG 錯誤偵測"
|
|
40685 |
+
|
|
40686 |
+#: src/menu.c:612
|
|
40687 |
+msgid "About Bug Meter..."
|
|
40688 |
+msgstr "關於錯誤偵測..."
|
|
40689 |
+
|
|
40690 |
+#: src/prefs.c:431
|
|
40691 |
+msgid "Error: Can't open specified config file. default file is used.\n"
|
|
40692 |
+msgstr ""
|
|
40693 |
+
|
|
40694 |
+#: src/i18n.c:359
|
|
40695 |
+msgid "charset detect may mistake...\n"
|
|
40696 |
+msgstr "文字檢測可能錯誤...\n"
|
|
40697 |
+
|
|
40698 |
+#: src/i18n.c:447
|
|
40699 |
+msgid "<meta> outside of <head>!\n"
|
|
40700 |
+msgstr ""
|
|
40701 |
+
|
|
40702 |
+#: src/i18n.c:493
|
|
40703 |
+msgid "all ascii code\n"
|
|
40704 |
+msgstr "全為 ASCII 編碼\n"
|
|
40705 |
+
|
|
40706 |
+#: src/i18n.c:526
|
|
40707 |
+msgid "unable to fully convert between character encodings\n"
|
|
40708 |
+msgstr "未能完全轉換文字間的編碼\n"
|
|
40709 |
+
|
|
40710 |
+#: src/i18n.c:565
|
|
40711 |
+msgid "no support enc\n"
|
|
40712 |
+msgstr "不支援的編碼\n"
|
|
40713 |
+
|
|
40714 |
+#: src/tab.c:293 src/tab.c:425 dpi/bookmarks.c:1653
|
|
40715 |
+msgid "(Untitled)"
|
|
40716 |
+msgstr "(無題)"
|
|
40717 |
+
|
|
40718 |
+#: src/IO/https.c:168
|
|
40719 |
+msgid "--Error detected\n"
|
|
40720 |
+msgstr "--錯誤檢測\n"
|
|
40721 |
+
|
|
40722 |
+#: src/IO/https.c:173 src/IO/https.c:204 src/IO/http.c:294
|
|
40723 |
+msgid "ERROR: unable to connect to remote host"
|
|
40724 |
+msgstr "錯誤: 未能連接遠端主機"
|
|
40725 |
+
|
|
40726 |
+#: src/IO/https.c:179 src/IO/http.c:309
|
|
40727 |
+msgid "--Connection established\n"
|
|
40728 |
+msgstr "--連線已建立\n"
|
|
40729 |
+
|
|
40730 |
+#: src/IO/https.c:280 src/IO/http.c:417
|
|
40731 |
+#, c-format
|
|
40732 |
+msgid "Sending query to %s..."
|
|
40733 |
+msgstr "正送出請求至 %s..."
|
|
40734 |
+
|
|
40735 |
+#: src/IO/https.c:333 src/IO/http.c:486
|
|
40736 |
+#, c-format
|
|
40737 |
+msgid "DNS solving %s"
|
|
40738 |
+msgstr "DNS 正查釋域名 %s"
|
|
40739 |
+
|
|
40740 |
+#: src/IO/https.c:363
|
|
40741 |
+msgid " HTTPS: new abort handler! #2\n"
|
|
40742 |
+msgstr ""
|
|
40743 |
+
|
|
40744 |
+#: src/IO/https.c:365 src/IO/https.c:387 src/IO/http.c:301 src/IO/http.c:520
|
|
40745 |
+#: src/IO/http.c:551
|
|
40746 |
+#, c-format
|
|
40747 |
+msgid "ERROR: %s"
|
|
40748 |
+msgstr "錯誤: %s"
|
|
40749 |
+
|
|
40750 |
+#: src/IO/https.c:386
|
|
40751 |
+msgid " HTTP: new abort handler! #1\n"
|
|
40752 |
+msgstr ""
|
|
40753 |
+
|
|
40754 |
+#: src/IO/https.c:400 src/IO/http.c:564
|
|
40755 |
+#, c-format
|
|
40756 |
+msgid "ERROR: Dns can't solve %s"
|
|
40757 |
+msgstr "錯誤: Dns 未能查釋域名 %s"
|
|
40758 |
+
|
|
40759 |
+#: src/IO/https.c:421 src/IO/http.c:591
|
|
40760 |
+msgid "Query sent, waiting for reply..."
|
|
40761 |
+msgstr "請求已送出, 正等侯回覆中..."
|
|
40762 |
+
|
|
40763 |
+#: src/IO/http.c:190
|
|
40764 |
+#, c-format
|
|
40765 |
+msgid "Getting %1$s, referer %2$s\n"
|
|
40766 |
+msgstr "提取 %1$s 中, 因應 %2$s\n"
|
|
40767 |
+
|
|
40768 |
+#: src/IO/http.c:259
|
|
40769 |
+#, c-format
|
|
40770 |
+msgid ""
|
|
40771 |
+"Query:\n"
|
|
40772 |
+"%s"
|
|
40773 |
+msgstr ""
|
|
40774 |
+"查詢: \n"
|
|
40775 |
+"%s"
|
|
40776 |
+
|
|
40777 |
+#: src/IO/http.c:286
|
|
40778 |
+msgid "--Connection broken\n"
|
|
40779 |
+msgstr "--連線被中斷 \n"
|
|
40780 |
+
|
|
40781 |
+#: src/IO/http.c:342
|
|
40782 |
+#, c-format
|
|
40783 |
+msgid "Http_connect_socket ERROR: %s\n"
|
|
40784 |
+msgstr "連接端口 錯誤: %s\n"
|
|
40785 |
+
|
|
40786 |
+#: src/IO/http.c:363 src/IO/http.c:377
|
|
40787 |
+#, c-format
|
|
40788 |
+msgid "Connecting to %s\n"
|
|
40789 |
+msgstr "正在連接 %s\n"
|
|
40790 |
+
|
|
40791 |
+#: src/IO/http.c:396
|
|
40792 |
+msgid "Contacting host..."
|
|
40793 |
+msgstr "正在聯系主機..."
|
|
40794 |
+
|
|
40795 |
+#: src/IO/http.c:529
|
|
40796 |
+msgid "Http: OpAbort [1B]\n"
|
|
40797 |
+msgstr "Http: OpAbort [1B]\n"
|
|
40798 |
+
|
|
40799 |
+#: src/IO/dpi.c:188
|
|
40800 |
+msgid "ERROR: [Dpi_get_token] Can't find token start\n"
|
|
40801 |
+msgstr ""
|
|
40802 |
+
|
|
40803 |
+#: src/IO/dpi.c:221
|
|
40804 |
+msgid "ERROR: [Dpi_get_token] *** NULL code here ***\n"
|
|
40805 |
+msgstr ""
|
|
40806 |
+
|
|
40807 |
+#: src/IO/dpi.c:312
|
|
40808 |
+msgid "Dpi: [Dpi_process_io] IOClose\n"
|
|
40809 |
+msgstr ""
|
|
40810 |
+
|
|
40811 |
+#: src/IO/dpi.c:338
|
|
40812 |
+#, c-format
|
|
40813 |
+msgid "Dpi_start_dpid (child): %s\n"
|
|
40814 |
+msgstr ""
|
|
40815 |
+
|
|
40816 |
+#: src/IO/dpi.c:348 src/IO/dpi.c:363
|
|
40817 |
+#, c-format
|
|
40818 |
+msgid "Dpi_start_dpid: %s\n"
|
|
40819 |
+msgstr ""
|
|
40820 |
+
|
|
40821 |
+#: src/IO/dpi.c:359
|
|
40822 |
+#, c-format
|
|
40823 |
+msgid "Dpi_start_dpid: n = %d\n"
|
|
40824 |
+msgstr ""
|
|
40825 |
+
|
|
40826 |
+#: src/IO/dpi.c:386
|
|
40827 |
+#, c-format
|
|
40828 |
+msgid "Dpi_check_uds: %1$s %2$s\n"
|
|
40829 |
+msgstr ""
|
|
40830 |
+
|
|
40831 |
+#: src/IO/dpi.c:673
|
|
40832 |
+msgid "dpi.c: ERROR, can't start dpi daemon\n"
|
|
40833 |
+msgstr ""
|
|
40834 |
+
|
|
40835 |
+#: src/IO/dpi.c:686
|
|
40836 |
+msgid "a_Dpi_ccc: OpAbort[2B], Not implemented\n"
|
|
40837 |
+msgstr ""
|
|
40838 |
+
|
|
40839 |
+#: src/IO/dpi.c:790 src/IO/dpi.c:794
|
|
40840 |
+#, c-format
|
|
40841 |
+msgid "a_Dpi_bye_dpid: %s\n"
|
|
40842 |
+msgstr ""
|
|
40843 |
+
|
|
40844 |
+#: dpid/dpi_socket_dir.c:106
|
|
40845 |
+#, c-format
|
|
40846 |
+msgid "The dpi_socket_dir file does not exist\n"
|
|
40847 |
+msgstr "dpi_socket_dir 檔案並不存在\n"
|
|
40848 |
+
|
|
40849 |
+#: dpid/dpi_socket_dir.c:110 dpid/dpi_socket_dir.c:114
|
|
40850 |
+#, c-format
|
|
40851 |
+msgid "debug_msg - init_sockdir: The socket directory "
|
|
40852 |
+msgstr ""
|
|
40853 |
+
|
|
40854 |
+#: dpid/dpi_socket_dir.c:111
|
|
40855 |
+#, c-format
|
|
40856 |
+msgid "%s exists and is OK\n"
|
|
40857 |
+msgstr "%s 存在並可正常使用\n"
|
|
40858 |
+
|
|
40859 |
+#: dpid/dpi_socket_dir.c:115
|
|
40860 |
+#, c-format
|
|
40861 |
+msgid "%s does not exist or is not a directory\n"
|
|
40862 |
+msgstr "%s 不存在且不是一個目錄\n"
|
|
40863 |
+
|
|
40864 |
+#: dpid/dpi_socket_dir.c:124
|
|
40865 |
+#, c-format
|
|
40866 |
+msgid " - Failed to create dpi socket directory\n"
|
|
40867 |
+msgstr ""
|
|
40868 |
+
|
|
40869 |
+#: dpid/dpi_socket_dir.c:127
|
|
40870 |
+#, c-format
|
|
40871 |
+msgid " - failed to save %s\n"
|
|
40872 |
+msgstr ""
|
|
40873 |
+
|
|
40874 |
+#: dpid/main.c:59 dpid/main.c:66 dpid/main.c:77 dpid/main.c:85 dpid/main.c:99
|
|
40875 |
+#: dpid/main.c:104 dpid/main.c:109
|
|
40876 |
+#, c-format
|
|
40877 |
+msgid "ERROR in child proc for %s\n"
|
|
40878 |
+msgstr ""
|
|
40879 |
+
|
|
40880 |
+#: dpid/main.c:166
|
|
40881 |
+#, c-format
|
|
40882 |
+msgid ": dpid failed to parse cmd in %s\n"
|
|
40883 |
+msgstr ""
|
|
40884 |
+
|
|
40885 |
+#: dpid/main.c:265
|
|
40886 |
+#, c-format
|
|
40887 |
+msgid "Failed to create socket directory\n"
|
|
40888 |
+msgstr ""
|
|
40889 |
+
|
|
40890 |
+#: dpid/main.c:275
|
|
40891 |
+#, c-format
|
|
40892 |
+msgid "dpid refuses to start, possibly because:\n"
|
|
40893 |
+msgstr ""
|
|
40894 |
+
|
|
40895 |
+#: dpid/main.c:276
|
|
40896 |
+#, c-format
|
|
40897 |
+msgid "\t1) An instance of dpid is already running.\n"
|
|
40898 |
+msgstr ""
|
|
40899 |
+
|
|
40900 |
+#: dpid/main.c:277
|
|
40901 |
+#, c-format
|
|
40902 |
+msgid "\t2) A previous dpid didn't clean up on exit.\n"
|
|
40903 |
+msgstr ""
|
|
40904 |
+
|
|
40905 |
+#: dpid/main.c:280
|
|
40906 |
+msgid "init_srs_sockets failed\n"
|
|
40907 |
+msgstr ""
|
|
40908 |
+
|
|
40909 |
+#: dpid/main.c:294
|
|
40910 |
+#, c-format
|
|
40911 |
+msgid "dpid started\n"
|
|
40912 |
+msgstr ""
|
|
40913 |
+
|
|
40914 |
+#: dpid/main.c:340
|
|
40915 |
+#, c-format
|
|
40916 |
+msgid "accept on srs socket failed\n"
|
|
40917 |
+msgstr ""
|
|
40918 |
+
|
|
40919 |
+#: dpid/main.c:341
|
|
40920 |
+#, c-format
|
|
40921 |
+msgid "service pending connections, and continue\n"
|
|
40922 |
+msgstr ""
|
|
40923 |
+
|
|
40924 |
+#: dpi/bookmarks.c:96
|
|
40925 |
+#, fuzzy
|
|
40926 |
+msgid ""
|
|
40927 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
40928 |
+"<html>\n"
|
|
40929 |
+"<head>\n"
|
|
40930 |
+"<title>Bookmarks</title>\n"
|
|
40931 |
+"</head>\n"
|
|
40932 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
40933 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
40934 |
+" <tr><td>\n"
|
|
40935 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
40936 |
+" <tr>\n"
|
|
40937 |
+" <td> Bookmarks::</td>\n"
|
|
40938 |
+" <td width='100%' align='right'>\n"
|
|
40939 |
+" [<a href='dpi:/bm/modify'>modify</a>]\n"
|
|
40940 |
+" </td></tr>\n"
|
|
40941 |
+" </table></td></tr>\n"
|
|
40942 |
+"</table>\n"
|
|
40943 |
+"<br>\n"
|
|
40944 |
+msgstr ""
|
|
40945 |
+"<html>\n"
|
|
40946 |
+"<head>\n"
|
|
40947 |
+"<title>書籤</title>\n"
|
|
40948 |
+"</head>\n"
|
|
40949 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
40950 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
40951 |
+" <tr><td>\n"
|
|
40952 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
40953 |
+" <tr>\n"
|
|
40954 |
+" <td><pre> 書籤::</pre></td>\n"
|
|
40955 |
+" <td width='100%' align='right'>\n"
|
|
40956 |
+" <pre>[<a href='dpi:/bm/modify'>編輯</a>]</pre>\n"
|
|
40957 |
+" </td></tr>\n"
|
|
40958 |
+" </table></td></tr>\n"
|
|
40959 |
+"</table>\n"
|
|
40960 |
+"<br>\n"
|
|
40961 |
+
|
|
40962 |
+#: dpi/bookmarks.c:115
|
|
40963 |
+#, fuzzy
|
|
40964 |
+msgid ""
|
|
40965 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
40966 |
+"<html>\n"
|
|
40967 |
+"<head>\n"
|
|
40968 |
+"<title>Bookmarks</title>\n"
|
|
40969 |
+"</head>\n"
|
|
40970 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
40971 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
40972 |
+" <tr><td>\n"
|
|
40973 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
40974 |
+" <tr>\n"
|
|
40975 |
+" <td> Bookmarks :: modify</td></tr>\n"
|
|
40976 |
+" </table></td></tr> \n"
|
|
40977 |
+"</table> \n"
|
|
40978 |
+"\n"
|
|
40979 |
+"<form>\n"
|
|
40980 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
40981 |
+" <tr><td>\n"
|
|
40982 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
40983 |
+" <tr>\n"
|
|
40984 |
+" <td><b>Select an operation </b></td>\n"
|
|
40985 |
+" <td><select name='operation'>\n"
|
|
40986 |
+" <option value='none' selected>--\n"
|
|
40987 |
+" <option value='delete'>Delete\n"
|
|
40988 |
+" <option value='move'>Move\n"
|
|
40989 |
+" <option value='modify'>Modify\n"
|
|
40990 |
+" <option value='add_sec'>Add Section\n"
|
|
40991 |
+" <option value='add_url'>Add URL\n"
|
|
40992 |
+" </select></td>\n"
|
|
40993 |
+" <td><b>, mark its operands, and </b></td>\n"
|
|
40994 |
+" <td><input type='submit' name='submit' value='submit.'></td>\n"
|
|
40995 |
+" <td width='100%'></td>\n"
|
|
40996 |
+" </tr>\n"
|
|
40997 |
+" </table></td></tr>\n"
|
|
40998 |
+"</table>\n"
|
|
40999 |
+msgstr ""
|
|
41000 |
+"<html>\n"
|
|
41001 |
+"<head>\n"
|
|
41002 |
+"<title>書籤</title>\n"
|
|
41003 |
+"</head>\n"
|
|
41004 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41005 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41006 |
+" <tr><td>\n"
|
|
41007 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
41008 |
+" <tr>\n"
|
|
41009 |
+" <td><pre> 書籤 :: 編輯</pre></td></tr>\n"
|
|
41010 |
+" </table></td></tr> \n"
|
|
41011 |
+"</table> \n"
|
|
41012 |
+"\n"
|
|
41013 |
+"<form>\n"
|
|
41014 |
+"<table width='100%' border='1' cellpadding='0'>\n"
|
|
41015 |
+" <tr><td>\n"
|
|
41016 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
41017 |
+" <tr>\n"
|
|
41018 |
+" <td><pre><b>選擇動作 </b></pre></td>\n"
|
|
41019 |
+" <td><select name='operation'>\n"
|
|
41020 |
+" <option value='none' selected>--\n"
|
|
41021 |
+" <option value='delete'>刪除\n"
|
|
41022 |
+" <option value='move'>移動\n"
|
|
41023 |
+" <option value='modify'>修改\n"
|
|
41024 |
+" <option value='add_sec'>加入目錄\n"
|
|
41025 |
+" <option value='add_url'>加入 URL\n"
|
|
41026 |
+" </select></td>\n"
|
|
41027 |
+" <td><pre><b>套用已選動作</b></pre></td>\n"
|
|
41028 |
+" <td><input type='submit' name='submit' value='套用.'></td>\n"
|
|
41029 |
+" <td width='100%'></td>\n"
|
|
41030 |
+" </tr>\n"
|
|
41031 |
+" </table></td></tr>\n"
|
|
41032 |
+"</table>\n"
|
|
41033 |
+
|
|
41034 |
+#: dpi/bookmarks.c:151
|
|
41035 |
+msgid ""
|
|
41036 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
41037 |
+" <tr valign='top'>\n"
|
|
41038 |
+" <td>\n"
|
|
41039 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
41040 |
+" <tr><td>\n"
|
|
41041 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
41042 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
41043 |
+msgstr ""
|
|
41044 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
41045 |
+" <tr valign='top'>\n"
|
|
41046 |
+" <td>\n"
|
|
41047 |
+" <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
|
|
41048 |
+" <tr><td>\n"
|
|
41049 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
41050 |
+" <tr><td><pre>項目:</pre></td></tr></table></td></tr>\n"
|
|
41051 |
+
|
|
41052 |
+#: dpi/bookmarks.c:160
|
|
41053 |
+msgid ""
|
|
41054 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
41055 |
+" <tr valign='top'>\n"
|
|
41056 |
+" <td>\n"
|
|
41057 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
41058 |
+" <tr><td>\n"
|
|
41059 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
41060 |
+" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n"
|
|
41061 |
+msgstr ""
|
|
41062 |
+"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
|
|
41063 |
+" <tr valign='top'>\n"
|
|
41064 |
+" <td>\n"
|
|
41065 |
+" <table bgcolor='#b4b4b4' border='1'>\n"
|
|
41066 |
+" <tr><td>\n"
|
|
41067 |
+" <table width='100%' bgcolor='#b4b4b4'>\n"
|
|
41068 |
+" <tr><td><pre>項目:</pre></td></tr></table></td></tr>\n"
|
|
41069 |
+
|
|
41070 |
+#: dpi/bookmarks.c:243
|
|
41071 |
+#, fuzzy
|
|
41072 |
+msgid ""
|
|
41073 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
41074 |
+"<html>\n"
|
|
41075 |
+"<head>\n"
|
|
41076 |
+"<title>Bookmarks</title>\n"
|
|
41077 |
+"</head>\n"
|
|
41078 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41079 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41080 |
+" <tr><td colspan='2'>\n"
|
|
41081 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
41082 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add section\n"
|
|
41083 |
+" </td></tr></table></td></tr>\n"
|
|
41084 |
+"</table>\n"
|
|
41085 |
+"<br>\n"
|
|
41086 |
+"<form>\n"
|
|
41087 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
41088 |
+"<table border='1' width='100%'>\n"
|
|
41089 |
+" <tr>\n"
|
|
41090 |
+" <td bgcolor='olive'><b>New section:</b></td>\n"
|
|
41091 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
41092 |
+"</table>\n"
|
|
41093 |
+"<table width='100%' cellpadding='10'>\n"
|
|
41094 |
+"<tr><td>\n"
|
|
41095 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
41096 |
+" <tr>\n"
|
|
41097 |
+" <td>Title:</td>\n"
|
|
41098 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
41099 |
+" </table>\n"
|
|
41100 |
+" </td></tr>\n"
|
|
41101 |
+"</table>\n"
|
|
41102 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
41103 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
41104 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
41105 |
+"</table>\n"
|
|
41106 |
+"</form>\n"
|
|
41107 |
+"</body>\n"
|
|
41108 |
+"</html>\n"
|
|
41109 |
+"\n"
|
|
41110 |
+msgstr ""
|
|
41111 |
+"<html>\n"
|
|
41112 |
+"<head>\n"
|
|
41113 |
+"<title>書籤</title>\n"
|
|
41114 |
+"</head>\n"
|
|
41115 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41116 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41117 |
+" <tr><td colspan='2'>\n"
|
|
41118 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
41119 |
+" <tr><td bgcolor='#b4b4b4'><pre> 編輯書籤:: 加入項目</pre>\n"
|
|
41120 |
+" </td></tr></table></td></tr>\n"
|
|
41121 |
+"</table>\n"
|
|
41122 |
+"<br>\n"
|
|
41123 |
+"<form>\n"
|
|
41124 |
+" <input type='hidden' name='operation' value='add_section'>\n"
|
|
41125 |
+"<table border='1' width='100%'>\n"
|
|
41126 |
+" <tr>\n"
|
|
41127 |
+" <td bgcolor='olive'><pre><b>新加入項目:</b></pre></td>\n"
|
|
41128 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
41129 |
+"</table>\n"
|
|
41130 |
+"<table width='100%' cellpadding='10'>\n"
|
|
41131 |
+"<tr><td>\n"
|
|
41132 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
41133 |
+" <tr>\n"
|
|
41134 |
+" <td><pre>標題:</pre></td>\n"
|
|
41135 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
41136 |
+" </table>\n"
|
|
41137 |
+" </td></tr>\n"
|
|
41138 |
+"</table>\n"
|
|
41139 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
41140 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
41141 |
+" <input type='submit' name='submit' value='套用.'></td></tr>\n"
|
|
41142 |
+"</table>\n"
|
|
41143 |
+"</form>\n"
|
|
41144 |
+"</body>\n"
|
|
41145 |
+"</html>\n"
|
|
41146 |
+"\n"
|
|
41147 |
+
|
|
41148 |
+#: dpi/bookmarks.c:283
|
|
41149 |
+#, fuzzy
|
|
41150 |
+msgid ""
|
|
41151 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
41152 |
+"<html>\n"
|
|
41153 |
+"<head>\n"
|
|
41154 |
+"<title>Bookmarks</title>\n"
|
|
41155 |
+"</head>\n"
|
|
41156 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41157 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41158 |
+" <tr><td colspan='2'>\n"
|
|
41159 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
41160 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: update\n"
|
|
41161 |
+" </td></tr></table></td></tr>\n"
|
|
41162 |
+"</table>\n"
|
|
41163 |
+"<br>\n"
|
|
41164 |
+"<form>\n"
|
|
41165 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
41166 |
+msgstr ""
|
|
41167 |
+"<html>\n"
|
|
41168 |
+"<head>\n"
|
|
41169 |
+"<title>書籤</title>\n"
|
|
41170 |
+"</head>\n"
|
|
41171 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41172 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41173 |
+" <tr><td colspan='2'>\n"
|
|
41174 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
41175 |
+" <tr><td bgcolor='#b4b4b4'><pre> 編輯書籤:: 更新</pre>\n"
|
|
41176 |
+" </td></tr></table></td></tr>\n"
|
|
41177 |
+"</table>\n"
|
|
41178 |
+"<br>\n"
|
|
41179 |
+"<form>\n"
|
|
41180 |
+"<input type='hidden' name='operation' value='modify2'>\n"
|
|
41181 |
+
|
|
41182 |
+#: dpi/bookmarks.c:310
|
|
41183 |
+#, c-format
|
|
41184 |
+msgid ""
|
|
41185 |
+"<tr><td>\n"
|
|
41186 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
41187 |
+" <tr>\n"
|
|
41188 |
+" <td>Title:</td>\n"
|
|
41189 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
41190 |
+" value='%s'></td></tr>\n"
|
|
41191 |
+" <tr>\n"
|
|
41192 |
+" <td>URL:</td>\n"
|
|
41193 |
+" <td>%s</td></tr>\n"
|
|
41194 |
+" </table>\n"
|
|
41195 |
+" </td></tr>\n"
|
|
41196 |
+msgstr ""
|
|
41197 |
+"<tr><td>\n"
|
|
41198 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
41199 |
+" <tr>\n"
|
|
41200 |
+" <td><pre>標題:</pre></td>\n"
|
|
41201 |
+" <td><input type='text' name='title%d' size='64'\n"
|
|
41202 |
+" value='%s'></td></tr>\n"
|
|
41203 |
+" <tr>\n"
|
|
41204 |
+" <td>URL:</td>\n"
|
|
41205 |
+" <td>%s</td></tr>\n"
|
|
41206 |
+" </table>\n"
|
|
41207 |
+" </td></tr>\n"
|
|
41208 |
+
|
|
41209 |
+#: dpi/bookmarks.c:323
|
|
41210 |
+#, c-format
|
|
41211 |
+msgid ""
|
|
41212 |
+"<tr><td>\n"
|
|
41213 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
41214 |
+" <tr>\n"
|
|
41215 |
+" <td>Title:</td>\n"
|
|
41216 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
41217 |
+" value='%s'></td></tr>\n"
|
|
41218 |
+" </table>\n"
|
|
41219 |
+" </td></tr>\n"
|
|
41220 |
+msgstr ""
|
|
41221 |
+"<tr><td>\n"
|
|
41222 |
+" <table width='100%%' bgcolor='teal'>\n"
|
|
41223 |
+" <tr>\n"
|
|
41224 |
+" <td><pre>標題:</pre></td>\n"
|
|
41225 |
+" <td><input type='text' name='s%d' size='64'\n"
|
|
41226 |
+" value='%s'></td></tr>\n"
|
|
41227 |
+" </table>\n"
|
|
41228 |
+" </td></tr>\n"
|
|
41229 |
+
|
|
41230 |
+#: dpi/bookmarks.c:336
|
|
41231 |
+#, c-format
|
|
41232 |
+msgid ""
|
|
41233 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
41234 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
41235 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
41236 |
+"</table>\n"
|
|
41237 |
+"</form>\n"
|
|
41238 |
+"</body>\n"
|
|
41239 |
+"</html>\n"
|
|
41240 |
+msgstr ""
|
|
41241 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
41242 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
41243 |
+" <input type='submit' name='submit' value='套用.'></td></tr>\n"
|
|
41244 |
+"</table>\n"
|
|
41245 |
+"</form>\n"
|
|
41246 |
+"</body>\n"
|
|
41247 |
+"</html>\n"
|
|
41248 |
+
|
|
41249 |
+#: dpi/bookmarks.c:346
|
|
41250 |
+#, fuzzy
|
|
41251 |
+msgid ""
|
|
41252 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
41253 |
+"<html>\n"
|
|
41254 |
+"<head>\n"
|
|
41255 |
+"<title>Bookmarks</title>\n"
|
|
41256 |
+"</head>\n"
|
|
41257 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41258 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41259 |
+" <tr><td colspan='2'>\n"
|
|
41260 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
41261 |
+" <tr><td bgcolor='#b4b4b4'> Modify bookmarks:: add url\n"
|
|
41262 |
+" </td></tr></table></td></tr>\n"
|
|
41263 |
+"</table>\n"
|
|
41264 |
+"<br>\n"
|
|
41265 |
+"<form>\n"
|
|
41266 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
41267 |
+"<table border='1' width='100%'>\n"
|
|
41268 |
+" <tr>\n"
|
|
41269 |
+" <td bgcolor='olive'><b>Add url:</b></td>\n"
|
|
41270 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
41271 |
+"</table>\n"
|
|
41272 |
+"<table width='100%' cellpadding='10'>\n"
|
|
41273 |
+"<tr><td>\n"
|
|
41274 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
41275 |
+" <tr>\n"
|
|
41276 |
+" <td>Title:</td>\n"
|
|
41277 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
41278 |
+" <tr>\n"
|
|
41279 |
+" <td>URL:</td>\n"
|
|
41280 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
41281 |
+" </table>\n"
|
|
41282 |
+" </td></tr>\n"
|
|
41283 |
+"</table>\n"
|
|
41284 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
41285 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
41286 |
+" <input type='submit' name='submit' value='submit.'></td></tr>\n"
|
|
41287 |
+"</table>\n"
|
|
41288 |
+"</form>\n"
|
|
41289 |
+"</body>\n"
|
|
41290 |
+"</html>\n"
|
|
41291 |
+msgstr ""
|
|
41292 |
+"<html>\n"
|
|
41293 |
+"<head>\n"
|
|
41294 |
+"<title>書籤</title>\n"
|
|
41295 |
+"</head>\n"
|
|
41296 |
+"<body bgcolor='#778899' link='black' vlink='brown'>\n"
|
|
41297 |
+"<table border='1' cellpadding='0' width='100%'>\n"
|
|
41298 |
+" <tr><td colspan='2'>\n"
|
|
41299 |
+" <table bgcolor='#b4b4b4' width='100%'>\n"
|
|
41300 |
+" <tr><td bgcolor='#b4b4b4'><pre> 編輯書籤:: 加入網頁</pre>\n"
|
|
41301 |
+" </td></tr></table></td></tr>\n"
|
|
41302 |
+"</table>\n"
|
|
41303 |
+"<br>\n"
|
|
41304 |
+"<form>\n"
|
|
41305 |
+"<input type='hidden' name='operation' value='add_url2'>\n"
|
|
41306 |
+"<table border='1' width='100%'>\n"
|
|
41307 |
+" <tr>\n"
|
|
41308 |
+" <td bgcolor='olive'><pre><b>加入網頁l:</b></pre></td>\n"
|
|
41309 |
+" <td bgcolor='white' width='100%'></td></tr>\n"
|
|
41310 |
+"</table>\n"
|
|
41311 |
+"<table width='100%' cellpadding='10'>\n"
|
|
41312 |
+"<tr><td>\n"
|
|
41313 |
+" <table width='100%' bgcolor='teal'>\n"
|
|
41314 |
+" <tr>\n"
|
|
41315 |
+" <td><pre>標題:</pre></td>\n"
|
|
41316 |
+" <td><input type='text' name='title' size='64'></td></tr>\n"
|
|
41317 |
+" <tr>\n"
|
|
41318 |
+" <td>URL:</td>\n"
|
|
41319 |
+" <td><input type='text' name='url' size='64'></td></tr>\n"
|
|
41320 |
+" </table>\n"
|
|
41321 |
+" </td></tr>\n"
|
|
41322 |
+"</table>\n"
|
|
41323 |
+"<table width='100%' cellpadding='4' border='0'>\n"
|
|
41324 |
+"<tr><td bgcolor='#a0a0a0'>\n"
|
|
41325 |
+" <input type='submit' name='submit' value='套用.'></td></tr>\n"
|
|
41326 |
+"</table>\n"
|
|
41327 |
+"</form>\n"
|
|
41328 |
+"</body>\n"
|
|
41329 |
+"</html>\n"
|
|
41330 |
+
|
|
41331 |
+#: dpi/bookmarks.c:691
|
|
41332 |
+msgid "Unclassified"
|
|
41333 |
+msgstr "未經分類"
|
|
41334 |
+
|
|
41335 |
+#: dpi/bookmarks.c:724
|
|
41336 |
+#, c-format
|
|
41337 |
+msgid "echo \":s0: Unclassified\" > %s"
|
|
41338 |
+msgstr "echo \":s0: 未經分類\" > %s"
|
|
41339 |
+
|
|
41340 |
+#: dpi/bookmarks.c:786
|
|
41341 |
+#, c-format
|
|
41342 |
+msgid ""
|
|
41343 |
+"Syntax error in bookmarks file:\n"
|
|
41344 |
+" %s"
|
|
41345 |
+msgstr ""
|
|
41346 |
+"語法錯誤於書籤檔:\n"
|
|
41347 |
+" %s"
|
|
41348 |
+
|
|
41349 |
+#: dpi/bookmarks.c:898
|
|
41350 |
+msgid "Added bookmark!"
|
|
41351 |
+msgstr "加進書籤!"
|
|
41352 |
+
|
|
41353 |
+#: dpi/bookmarks.c:1087
|
|
41354 |
+msgid "Update sections:"
|
|
41355 |
+msgstr "<pre>更新項目:</pre>"
|
|
41356 |
+
|
|
41357 |
+#: dpi/bookmarks.c:1107
|
|
41358 |
+msgid "Update titles:"
|
|
41359 |
+msgstr "<pre>更新標題:</pre>"
|
|
41360 |
+
|
|
41361 |
+#: dpi/bookmarks.c:1404
|
|
41362 |
+msgid "Delete: you must mark what to delete!"
|
|
41363 |
+msgstr "刪除: 請先選擇項目!"
|
|
41364 |
+
|
|
41365 |
+#: dpi/bookmarks.c:1410
|
|
41366 |
+msgid "Move: you must mark a target section!"
|
|
41367 |
+msgstr "移動: 請先選擇項目!"
|
|
41368 |
+
|
|
41369 |
+#: dpi/bookmarks.c:1412
|
|
41370 |
+msgid "Move: can not move a section (yet)."
|
|
41371 |
+msgstr "移動: 移動項目失敗!"
|
|
41372 |
+
|
|
41373 |
+#: dpi/bookmarks.c:1414
|
|
41374 |
+msgid "Move: you must mark some urls, and a target section!"
|
|
41375 |
+msgstr "移動: 請先選擇網頁及項目!"
|
|
41376 |
+
|
|
41377 |
+#: dpi/bookmarks.c:1419
|
|
41378 |
+msgid "Modify: you must mark what to update!"
|
|
41379 |
+msgstr "修改: 請先選擇要更新的項目!"
|
|
41380 |
+
|
|
41381 |
+#: dpi/bookmarks.c:1436
|
|
41382 |
+msgid "Add url: only one target section is allowed!"
|
|
41383 |
+msgstr "加入網頁: 只可選擇一個項目!"
|
|
41384 |
+
|
|
41385 |
+#: dpi/bookmarks.c:1443
|
|
41386 |
+msgid "No operation, just do nothing!"
|
|
41387 |
+msgstr "沒有指示,操作無效!"
|
|
41388 |
+
|
|
41389 |
+#: dpi/bookmarks.c:1446
|
|
41390 |
+msgid "Sorry, not implemented yet."
|
|
41391 |
+msgstr "操作尚未完成."
|
|
41392 |
+
|
|
41393 |
+#: dpi/bookmarks.c:1614
|
|
41394 |
+msgid "Haven't got a full tag!\n"
|
|
41395 |
+msgstr "找不到完整標籤!\n"
|
|
41396 |
+
|
|
41397 |
+#: dpi/bookmarks.c:1690
|
|
41398 |
+#, fuzzy
|
|
41399 |
+msgid ""
|
|
41400 |
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
|
|
41401 |
+"<HTML><body> Error on the bookmarks server...</body></html>"
|
|
41402 |
+msgstr "<HTML><body> 書籤系統錯誤...</body></html>"
|
|
41403 |
+
|
|
41404 |
+#: config/dillocfg.c:84
|
|
41405 |
+msgid "Quit"
|
|
41406 |
+msgstr "退出"
|
|
41407 |
+
|
|
41408 |
+#: config/dillocfg.c:86 config/dillocfg.c:92
|
|
41409 |
+msgid "Dillo Preferences"
|
|
41410 |
+msgstr "偏好設定"
|
|
41411 |
+
|
|
41412 |
+#: config/dillocfg.c:115
|
|
41413 |
+msgid "Interface"
|
|
41414 |
+msgstr "介面"
|
|
41415 |
+
|
|
41416 |
+#: config/dillocfg.c:116
|
|
41417 |
+msgid " Font "
|
|
41418 |
+msgstr " 字型 "
|
|
41419 |
+
|
|
41420 |
+#: config/dillocfg.c:117
|
|
41421 |
+msgid " Color "
|
|
41422 |
+msgstr " 顏色 "
|
|
41423 |
+
|
|
41424 |
+#: config/dillocfg.c:118
|
|
41425 |
+msgid " Network "
|
|
41426 |
+msgstr " 網絡 "
|
|
41427 |
+
|
|
41428 |
+#: config/dillocfg.c:120
|
|
41429 |
+msgid " Tab "
|
|
41430 |
+msgstr " 分頁 "
|
|
41431 |
+
|
|
41432 |
+#: config/dillocfg.c:123
|
|
41433 |
+msgid " Other "
|
|
41434 |
+msgstr " 其他 "
|
|
41435 |
+
|
|
41436 |
+#: config/dillocfg.c:331
|
|
41437 |
+msgid "Add"
|
|
41438 |
+msgstr "加入"
|
|
41439 |
+
|
|
41440 |
+#: config/dillocfg.c:332
|
|
41441 |
+msgid "Delete"
|
|
41442 |
+msgstr "刪除"
|
|
41443 |
+
|
|
41444 |
+#: config/dillocfg.c:338
|
|
41445 |
+msgid "Address"
|
|
41446 |
+msgstr "位址"
|
|
41447 |
+
|
|
41448 |
+#: config/dillocfg.c:339
|
|
41449 |
+msgid "Rule"
|
|
41450 |
+msgstr "規則"
|
|
41451 |
+
|
|
41452 |
+#: config/dillocfg.c:365 config/dillocfg.c:371
|
|
41453 |
+#, c-format
|
|
41454 |
+msgid "Read failed <%s>\n"
|
|
41455 |
+msgstr "錯誤讀取 <%s>\n"
|
|
41456 |
+
|
|
41457 |
+#: config/dillocfg.c:452 config/dillocfg.c:460
|
|
41458 |
+#, c-format
|
|
41459 |
+msgid "can't write <%s>\n"
|
|
41460 |
+msgstr "不能寫入 <%s>\n"
|
|
41461 |
+
|
|
41462 |
+#: config/dillocfg_token.c:60
|
|
41463 |
+msgid "Window Size"
|
|
41464 |
+msgstr "窗口大小"
|
|
41465 |
+
|
|
41466 |
+#: config/dillocfg_token.c:68
|
|
41467 |
+msgid "HTTP Proxy"
|
|
41468 |
+msgstr "代理伺服器"
|
|
41469 |
+
|
|
41470 |
+#: config/dillocfg_token.c:76
|
|
41471 |
+msgid "HTTP Proxy User"
|
|
41472 |
+msgstr "伺服器用戶"
|
|
41473 |
+
|
|
41474 |
+#: config/dillocfg_token.c:84
|
|
41475 |
+msgid "NO Proxy"
|
|
41476 |
+msgstr "沒有伺服器"
|
|
41477 |
+
|
|
41478 |
+#: config/dillocfg_token.c:92
|
|
41479 |
+msgid "User-Agent"
|
|
41480 |
+msgstr "瀏覽器-相容識別"
|
|
41481 |
+
|
|
41482 |
+#: config/dillocfg_token.c:100
|
|
41483 |
+msgid "Send referer header"
|
|
41484 |
+msgstr ""
|
|
41485 |
+
|
|
41486 |
+#: config/dillocfg_token.c:108
|
|
41487 |
+msgid "Link color"
|
|
41488 |
+msgstr "連結"
|
|
41489 |
+
|
|
41490 |
+#: config/dillocfg_token.c:116
|
|
41491 |
+msgid "Visited color"
|
|
41492 |
+msgstr "已到網頁"
|
|
41493 |
+
|
|
41494 |
+#: config/dillocfg_token.c:124
|
|
41495 |
+msgid "BackGround color"
|
|
41496 |
+msgstr "背景"
|
|
41497 |
+
|
|
41498 |
+#: config/dillocfg_token.c:132
|
|
41499 |
+msgid "Allow white bg"
|
|
41500 |
+msgstr "空白背景"
|
|
41501 |
+
|
|
41502 |
+#: config/dillocfg_token.c:140
|
|
41503 |
+msgid "Force my colors"
|
|
41504 |
+msgstr "使用自選顏色"
|
|
41505 |
+
|
|
41506 |
+#: config/dillocfg_token.c:148
|
|
41507 |
+msgid "Contrast visited color"
|
|
41508 |
+msgstr "加亮已到網頁顏色"
|
|
41509 |
+
|
|
41510 |
+#: config/dillocfg_token.c:156
|
|
41511 |
+msgid "Text color"
|
|
41512 |
+msgstr "文字顏色"
|
|
41513 |
+
|
|
41514 |
+#: config/dillocfg_token.c:164
|
|
41515 |
+msgid "Use oblique"
|
|
41516 |
+msgstr "兼容斜體"
|
|
41517 |
+
|
|
41518 |
+#: config/dillocfg_token.c:172
|
|
41519 |
+msgid "Start Page"
|
|
41520 |
+msgstr "起始頁"
|
|
41521 |
+
|
|
41522 |
+#: config/dillocfg_token.c:180
|
|
41523 |
+msgid "HOMEPAGE"
|
|
41524 |
+msgstr "首頁"
|
|
41525 |
+
|
|
41526 |
+#: config/dillocfg_token.c:188
|
|
41527 |
+msgid "Search-engine's URL"
|
|
41528 |
+msgstr "搜尋引擎網址"
|
|
41529 |
+
|
|
41530 |
+#: config/dillocfg_token.c:196
|
|
41531 |
+msgid "Search-engine's charset"
|
|
41532 |
+msgstr "搜尋引擎字體"
|
|
41533 |
+
|
|
41534 |
+#: config/dillocfg_token.c:204
|
|
41535 |
+msgid "Show Tooltip"
|
|
41536 |
+msgstr "顯示提示"
|
|
41537 |
+
|
|
41538 |
+#: config/dillocfg_token.c:212
|
|
41539 |
+msgid "Panel Size"
|
|
41540 |
+msgstr "板面大小"
|
|
41541 |
+
|
|
41542 |
+#: config/dillocfg_token.c:220
|
|
41543 |
+msgid "Small icons"
|
|
41544 |
+msgstr "小型圖示"
|
|
41545 |
+
|
|
41546 |
+#: config/dillocfg_token.c:228
|
|
41547 |
+msgid "Limit text width"
|
|
41548 |
+msgstr "限制文字寬度"
|
|
41549 |
+
|
|
41550 |
+#: config/dillocfg_token.c:236
|
|
41551 |
+msgid "Limit font decoration"
|
|
41552 |
+msgstr "限制文字裝飾"
|
|
41553 |
+
|
|
41554 |
+#: config/dillocfg_token.c:244
|
|
41555 |
+msgid "Font factor"
|
|
41556 |
+msgstr "文字系數"
|
|
41557 |
+
|
|
41558 |
+#: config/dillocfg_token.c:252
|
|
41559 |
+msgid "Font Sizes"
|
|
41560 |
+msgstr "文字大小"
|
|
41561 |
+
|
|
41562 |
+#: config/dillocfg_token.c:260
|
|
41563 |
+msgid "W3C+heuristics"
|
|
41564 |
+msgstr "W3C+試探程序"
|
|
41565 |
+
|
|
41566 |
+#: config/dillocfg_token.c:268
|
|
41567 |
+msgid "Use dicache"
|
|
41568 |
+msgstr "使用磁碟緩存"
|
|
41569 |
+
|
|
41570 |
+#: config/dillocfg_token.c:276
|
|
41571 |
+msgid "Show Back"
|
|
41572 |
+msgstr "顯示返回"
|
|
41573 |
+
|
|
41574 |
+#: config/dillocfg_token.c:284
|
|
41575 |
+msgid "Show Forw"
|
|
41576 |
+msgstr "顯示往前"
|
|
41577 |
+
|
|
41578 |
+#: config/dillocfg_token.c:292
|
|
41579 |
+msgid "Show Home"
|
|
41580 |
+msgstr "顯示首頁"
|
|
41581 |
+
|
|
41582 |
+#: config/dillocfg_token.c:300
|
|
41583 |
+msgid "Show Reload"
|
|
41584 |
+msgstr "顯示重載"
|
|
41585 |
+
|
|
41586 |
+#: config/dillocfg_token.c:308
|
|
41587 |
+msgid "Show Save"
|
|
41588 |
+msgstr "顯示儲存"
|
|
41589 |
+
|
|
41590 |
+#: config/dillocfg_token.c:316
|
|
41591 |
+msgid "Show Stop"
|
|
41592 |
+msgstr "顯示停止"
|
|
41593 |
+
|
|
41594 |
+#: config/dillocfg_token.c:324
|
|
41595 |
+msgid "Show Bookmarks"
|
|
41596 |
+msgstr "顯示書籤"
|
|
41597 |
+
|
|
41598 |
+#: config/dillocfg_token.c:332
|
|
41599 |
+msgid "Show Menubar"
|
|
41600 |
+msgstr "顯示選單攔"
|
|
41601 |
+
|
|
41602 |
+#: config/dillocfg_token.c:340
|
|
41603 |
+msgid "Show ClearURL"
|
|
41604 |
+msgstr "顯示清空位址"
|
|
41605 |
+
|
|
41606 |
+#: config/dillocfg_token.c:348
|
|
41607 |
+msgid "Show URL box"
|
|
41608 |
+msgstr "顯示位址欄"
|
|
41609 |
+
|
|
41610 |
+#: config/dillocfg_token.c:356
|
|
41611 |
+msgid "Show Web Search"
|
|
41612 |
+msgstr "顯示搜尋框"
|
|
41613 |
+
|
|
41614 |
+#: config/dillocfg_token.c:364
|
|
41615 |
+msgid "Show Progress box"
|
|
41616 |
+msgstr "顯示進度框"
|
|
41617 |
+
|
|
41618 |
+#: config/dillocfg_token.c:372
|
|
41619 |
+msgid "Show Popup navigation"
|
|
41620 |
+msgstr "顯示彈出瀏覽"
|
|
41621 |
+
|
|
41622 |
+#: config/dillocfg_token.c:380
|
|
41623 |
+msgid "Fullwindow start"
|
|
41624 |
+msgstr "全螢幕開始"
|
|
41625 |
+
|
|
41626 |
+#: config/dillocfg_token.c:388
|
|
41627 |
+msgid "Transient dialogs"
|
|
41628 |
+msgstr "短暫對話框"
|
|
41629 |
+
|
|
41630 |
+#: config/dillocfg_token.c:396
|
|
41631 |
+msgid "Popup dialogs"
|
|
41632 |
+msgstr "彈出對話框"
|
|
41633 |
+
|
|
41634 |
+#: config/dillocfg_token.c:404
|
|
41635 |
+msgid "vw_aafontname"
|
|
41636 |
+msgstr "一般字體(平滑化)"
|
|
41637 |
+
|
|
41638 |
+#: config/dillocfg_token.c:412
|
|
41639 |
+msgid "fw_aafontname"
|
|
41640 |
+msgstr "固定字體(平滑化)"
|
|
41641 |
+
|
|
41642 |
+#: config/dillocfg_token.c:420
|
|
41643 |
+msgid "vw_fontname"
|
|
41644 |
+msgstr "一般字體"
|
|
41645 |
+
|
|
41646 |
+#: config/dillocfg_token.c:428
|
|
41647 |
+msgid "fw_fontname"
|
|
41648 |
+msgstr "固定字體"
|
|
41649 |
+
|
|
41650 |
+#: config/dillocfg_token.c:436
|
|
41651 |
+msgid "Generate submit"
|
|
41652 |
+msgstr "發放提交"
|
|
41653 |
+
|
|
41654 |
+#: config/dillocfg_token.c:444
|
|
41655 |
+msgid "Enterpress forces submit"
|
|
41656 |
+msgstr "按 Enter 鍵提交"
|
|
41657 |
+
|
|
41658 |
+#: config/dillocfg_token.c:452
|
|
41659 |
+msgid "Show debugging messsages"
|
|
41660 |
+msgstr "顯示除錯訊息"
|
|
41661 |
+
|
|
41662 |
+#: config/dillocfg_token.c:460
|
|
41663 |
+msgid "Show Extra Warnings"
|
|
41664 |
+msgstr "顯示重大警告訊息"
|
|
41665 |
+
|
|
41666 |
+#: config/dillocfg_token.c:468
|
|
41667 |
+msgid "Focus location on new"
|
|
41668 |
+msgstr "聚焦位址於新窗口"
|
|
41669 |
+
|
|
41670 |
+#: config/dillocfg_token.c:476 config/dillocfg_token.c:484
|
|
41671 |
+msgid "Accept Language"
|
|
41672 |
+msgstr "接受語言"
|
|
41673 |
+
|
|
41674 |
+#: config/dillocfg_token.c:493
|
|
41675 |
+msgid "Tab load in background"
|
|
41676 |
+msgstr "在背景開啟分頁"
|
|
41677 |
+
|
|
41678 |
+#: config/dillocfg_token.c:501
|
|
41679 |
+msgid "Tab close middle click"
|
|
41680 |
+msgstr "以中鍵關閉分頁"
|
|
41681 |
+
|
|
41682 |
+#: config/dillocfg_token.c:509
|
|
41683 |
+msgid "Tab instead of window"
|
|
41684 |
+msgstr "以分頁替代窗口"
|
|
41685 |
+
|
|
41686 |
+#: config/dillocfg_token.c:517
|
|
41687 |
+msgid "Tab bar show fullscreen"
|
|
41688 |
+msgstr "分頁標題欄顯示全螢幕"
|
|
41689 |
+
|
|
41690 |
+#: config/dillocfg_token.c:525
|
|
41691 |
+msgid "Tab bar show single tab"
|
|
41692 |
+msgstr "分頁標題欄只顯示單一分頁"
|
|
41693 |
+
|
|
41694 |
+#: config/dillocfg_token.c:533
|
|
41695 |
+msgid "Tab bar scroller"
|
|
41696 |
+msgstr "顯示分頁標題欄卷軸"
|
|
41697 |
+
|
|
41698 |
+#: config/dillocfg_token.c:541
|
|
41699 |
+msgid "Tab bar homogeneous"
|
|
41700 |
+msgstr "分頁標題欄平均化"
|
|
41701 |
+
|
|
41702 |
+#: config/dillocfg_token.c:549
|
|
41703 |
+msgid "Tab title compress"
|
|
41704 |
+msgstr "簡化分頁標題"
|
|
41705 |
+
|
|
41706 |
+#: config/dillocfg_token.c:557
|
|
41707 |
+msgid "Compress vowels"
|
|
41708 |
+msgstr "壓縮母音字元"
|
|
41709 |
+
|
|
41710 |
+#: config/dillocfg_token.c:565
|
|
41711 |
+msgid "Compress_common_prefixes"
|
|
41712 |
+msgstr "壓縮標頭文字"
|
|
41713 |
+
|
|
41714 |
+#: config/dillocfg_token.c:574
|
|
41715 |
+msgid "Default"
|
|
41716 |
+msgstr "預設"
|
|
41717 |
diff -pruN dillo-0.8.6/src/IO/DBIO.c dillo-0.8.6-i18n-misc-20070916/src/IO/DBIO.c
|
|
41718 |
--- dillo-0.8.6/src/IO/DBIO.c 1970-01-01 09:00:00.000000000 +0900
|
|
41719 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/DBIO.c 2006-05-16 01:21:09.000000000 +0900
|
|
41720 |
@@ -0,0 +1,290 @@
|
|
41721 |
+/*
|
|
41722 |
+ * File: DBIO.c
|
|
41723 |
+ *
|
|
41724 |
+ * Copyright (C) 2000, 2001 Jorge Arellano Cid <jcid@inf.utfsm.cl>
|
|
41725 |
+ * Copyright (C) 2002 Jonathan P Springer <jonathan.springer@verizon.net>
|
|
41726 |
+ *
|
|
41727 |
+ * This program is free software; you can redistribute it and/or modify
|
|
41728 |
+ * it under the terms of the GNU General Public License as published by
|
|
41729 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
41730 |
+ * (at your option) any later version.
|
|
41731 |
+ *
|
|
41732 |
+ * This program is distributed in the hope that it will be useful, but WITHOUT
|
|
41733 |
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
41734 |
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
41735 |
+ * more details.
|
|
41736 |
+ *
|
|
41737 |
+ * You should have received a copy of the GNU General Public License along
|
|
41738 |
+ * with this program; if not, write to the Free Software Foundation, Inc., 59
|
|
41739 |
+ * Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
41740 |
+ *
|
|
41741 |
+ * In addition, as a special exception, Jorge Arellano Cid and Jonathan
|
|
41742 |
+ * Springer give permission to link the code of this program with the OpenSSL
|
|
41743 |
+ * library (or modified versions of OpenSSL that use the same license as
|
|
41744 |
+ * OpenSSL), and distribute linked combinations including the two. You must
|
|
41745 |
+ * obey the GNU General Public License in all respects for all of the code
|
|
41746 |
+ * used other than OpenSSL. If you modify this file, you may extend this
|
|
41747 |
+ * exception to your version of the file, but you are not obligated to do so.
|
|
41748 |
+ * If you do not wish to do so, delete this exception from your version.
|
|
41749 |
+ *
|
|
41750 |
+ */
|
|
41751 |
+
|
|
41752 |
+/*
|
|
41753 |
+ * Dillo's signal driven BIO engine
|
|
41754 |
+ */
|
|
41755 |
+
|
|
41756 |
+#include <config.h>
|
|
41757 |
+
|
|
41758 |
+#ifdef DILLO_SSL
|
|
41759 |
+
|
|
41760 |
+#include <stdio.h>
|
|
41761 |
+#include <errno.h>
|
|
41762 |
+#include <fcntl.h>
|
|
41763 |
+#include <unistd.h>
|
|
41764 |
+#include <sys/stat.h>
|
|
41765 |
+#include <sys/uio.h>
|
|
41766 |
+#include <sys/socket.h>
|
|
41767 |
+#include <glib.h>
|
|
41768 |
+#include <gdk/gdk.h>
|
|
41769 |
+#include "../chain.h"
|
|
41770 |
+#include "DBIO.h"
|
|
41771 |
+
|
|
41772 |
+#include <openssl/bio.h>
|
|
41773 |
+#include <openssl/err.h>
|
|
41774 |
+
|
|
41775 |
+//#define DEBUG_LEVEL 3
|
|
41776 |
+#include "../debug.h"
|
|
41777 |
+
|
|
41778 |
+
|
|
41779 |
+/*
|
|
41780 |
+ * Symbolic defines for shutdown() function
|
|
41781 |
+ * (Not defined in the same header file, for all distros --Jcid)
|
|
41782 |
+ */
|
|
41783 |
+#define IO_StopRd 0
|
|
41784 |
+#define IO_StopWr 1
|
|
41785 |
+#define IO_StopRdWr 2
|
|
41786 |
+
|
|
41787 |
+extern void IO_submit(IOData_t *r_io);
|
|
41788 |
+extern void IO_del(IOData_t *io);
|
|
41789 |
+extern void IO_ins(IOData_t *io);
|
|
41790 |
+extern IOData_t *IO_get(gint Key);
|
|
41791 |
+
|
|
41792 |
+/*
|
|
41793 |
+ * IO-module data
|
|
41794 |
+ */
|
|
41795 |
+
|
|
41796 |
+
|
|
41797 |
+/*
|
|
41798 |
+ * Return a newly created, and initialized, 'io' struct
|
|
41799 |
+ */
|
|
41800 |
+IOData_t *a_DBIO_new(BIO *bioin)
|
|
41801 |
+{
|
|
41802 |
+ IOData_t *io = g_new0(IOData_t, 1);
|
|
41803 |
+ io->GioCh = NULL;
|
|
41804 |
+ io->FD = -1;
|
|
41805 |
+ io->Flags = 0;
|
|
41806 |
+ io->bio = bioin;
|
|
41807 |
+ return io;
|
|
41808 |
+}
|
|
41809 |
+
|
|
41810 |
+/*
|
|
41811 |
+ * Free an 'io' struct
|
|
41812 |
+ */
|
|
41813 |
+void DBIO_free(IOData_t *io)
|
|
41814 |
+{
|
|
41815 |
+ if (io->Flags & IOFlag_FreeIOBuf) g_free(io->Buf);
|
|
41816 |
+ g_free(io);
|
|
41817 |
+}
|
|
41818 |
+
|
|
41819 |
+/*
|
|
41820 |
+ * Close an open BIO, and remove io controls.
|
|
41821 |
+ * (This function can be used for Close and Abort operations)
|
|
41822 |
+ */
|
|
41823 |
+void DBIO_close_fd(IOData_t *io, gint CloseCode)
|
|
41824 |
+{
|
|
41825 |
+ if (io->bio) BIO_free_all(io->bio);
|
|
41826 |
+
|
|
41827 |
+ IO_del(io);
|
|
41828 |
+}
|
|
41829 |
+
|
|
41830 |
+/*
|
|
41831 |
+ * Abort an open FD.
|
|
41832 |
+ * This function is called to abort a BIO connection due to an IO error
|
|
41833 |
+ * or just because the connection is not required anymore.
|
|
41834 |
+ */
|
|
41835 |
+gboolean DBIO_abort(IOData_t *io)
|
|
41836 |
+{
|
|
41837 |
+ /* Close and finish this FD's activity */
|
|
41838 |
+ DBIO_close_fd(io, IO_StopRdWr);
|
|
41839 |
+
|
|
41840 |
+ return FALSE;
|
|
41841 |
+}
|
|
41842 |
+
|
|
41843 |
+/*
|
|
41844 |
+ * Read data from a BIO into a specific buffer
|
|
41845 |
+ */
|
|
41846 |
+gboolean DBIO_Callback_Read(gpointer data)
|
|
41847 |
+{
|
|
41848 |
+ ssize_t St;
|
|
41849 |
+ gboolean ret;
|
|
41850 |
+ IOData_t *io = (IOData_t *) data;
|
|
41851 |
+
|
|
41852 |
+ DEBUG_MSG(3, " IO_read2\n");
|
|
41853 |
+
|
|
41854 |
+ /* Sometimes glib delivers events on already aborted FDs --Jcid */
|
|
41855 |
+ if ( IO_get(io->Key) == NULL ) return FALSE;
|
|
41856 |
+
|
|
41857 |
+ St = BIO_read(io->bio, io->Buf, io->BufSize);
|
|
41858 |
+
|
|
41859 |
+ if ( St < 0 ) {
|
|
41860 |
+ if (BIO_should_retry(io->bio)) {
|
|
41861 |
+ ret = TRUE;
|
|
41862 |
+ } else {
|
|
41863 |
+ io->Status = ERR_get_error();
|
|
41864 |
+ ret = FALSE;
|
|
41865 |
+ }
|
|
41866 |
+ } else if ( St == 0 ) {
|
|
41867 |
+ if (BIO_should_retry(io->bio)) {
|
|
41868 |
+ ret = TRUE;
|
|
41869 |
+ } else {
|
|
41870 |
+ a_DBIO_ccc(OpEnd, 2,0, io->Info, io, NULL);
|
|
41871 |
+ ret = FALSE;
|
|
41872 |
+ }
|
|
41873 |
+ } else {
|
|
41874 |
+ io->Status = St; /* Status is used for length */
|
|
41875 |
+ a_DBIO_ccc(OpSend, 2,0, io->Info, io, NULL);
|
|
41876 |
+ ret = TRUE;
|
|
41877 |
+ }
|
|
41878 |
+
|
|
41879 |
+ return ret;
|
|
41880 |
+}
|
|
41881 |
+
|
|
41882 |
+/*
|
|
41883 |
+ * Write data, from a specific buffer, into a file descriptor
|
|
41884 |
+ * (** Write operations MUST NOT free the buffer because the buffer
|
|
41885 |
+ * start is modified.)
|
|
41886 |
+ * todo: Implement IOWrites, remove the constraint stated above.
|
|
41887 |
+ */
|
|
41888 |
+gboolean DBIO_Callback_Write(gpointer data)
|
|
41889 |
+{
|
|
41890 |
+ ssize_t St;
|
|
41891 |
+ gboolean ret = FALSE;
|
|
41892 |
+ IOData_t *io = (IOData_t *) data;
|
|
41893 |
+
|
|
41894 |
+ DEBUG_MSG(3, " IO_write\n");
|
|
41895 |
+
|
|
41896 |
+ /* Sometimes glib delivers events on already aborted FDs --Jcid */
|
|
41897 |
+ if ( IO_get(io->Key) == NULL ) return FALSE;
|
|
41898 |
+
|
|
41899 |
+ St = BIO_write(io->bio, io->Buf, io->BufSize);
|
|
41900 |
+ io->Status = St;
|
|
41901 |
+
|
|
41902 |
+ DEBUG_MSG(3, " IO_write: %s [errno %d] [St %d]\n",
|
|
41903 |
+ g_strerror(errno), errno, St);
|
|
41904 |
+
|
|
41905 |
+ if ( St <= 0 ) {
|
|
41906 |
+ if (BIO_should_retry(io->bio)) {
|
|
41907 |
+ ret = TRUE;
|
|
41908 |
+ } else {
|
|
41909 |
+ io->Status = ERR_get_error();
|
|
41910 |
+ ret = FALSE;
|
|
41911 |
+ }
|
|
41912 |
+ } else if ( St < (ssize_t)io->BufSize ){
|
|
41913 |
+ // Not all data written
|
|
41914 |
+ io->BufSize -= St;
|
|
41915 |
+ io->Buf = ((gchar *)io->Buf) + St;
|
|
41916 |
+ ret = TRUE;
|
|
41917 |
+ } else {
|
|
41918 |
+ // All data in buffer written
|
|
41919 |
+ if ( io->Op == IOWrite ) {
|
|
41920 |
+ /* Single write */
|
|
41921 |
+ a_DBIO_ccc(OpEnd, 1,0, io->Info, io, NULL);
|
|
41922 |
+ ret = FALSE;
|
|
41923 |
+ } else if ( io->Op == IOWrites ) {
|
|
41924 |
+ /* todo: Writing in small chunks (not implemented) */
|
|
41925 |
+ }
|
|
41926 |
+ }
|
|
41927 |
+
|
|
41928 |
+ return ret;
|
|
41929 |
+}
|
|
41930 |
+
|
|
41931 |
+/*
|
|
41932 |
+ * Receive an IO request (IORead | IOWrite | IOWrites),
|
|
41933 |
+ */
|
|
41934 |
+void DBIO_submit(IOData_t *r_io)
|
|
41935 |
+{
|
|
41936 |
+ if ( r_io->Op == IORead ) {
|
|
41937 |
+ g_idle_add(DBIO_Callback_Read, (gpointer) r_io);
|
|
41938 |
+ } else if (r_io->Op == IOWrite || r_io->Op == IOWrites ) {
|
|
41939 |
+ g_idle_add(DBIO_Callback_Write, (gpointer) r_io);
|
|
41940 |
+ }
|
|
41941 |
+
|
|
41942 |
+ /* Add a reference pointer to this request */
|
|
41943 |
+ IO_ins(r_io);
|
|
41944 |
+}
|
|
41945 |
+
|
|
41946 |
+/*
|
|
41947 |
+ * CCC function for the IO module
|
|
41948 |
+ * ( Data = IOData_t* ; ExtraData = NULL )
|
|
41949 |
+ */
|
|
41950 |
+void a_DBIO_ccc(int Op, int Branch,int Dir, ChainLink *Info, void *Data, void *ExtraData)
|
|
41951 |
+{
|
|
41952 |
+ IOData_t *io = Data;
|
|
41953 |
+
|
|
41954 |
+ if ( Branch == 1 ) {
|
|
41955 |
+ /* Send query */
|
|
41956 |
+ switch (Op) {
|
|
41957 |
+ case OpStart:
|
|
41958 |
+ io->Info = Info;
|
|
41959 |
+ Info->LocalKey = io;
|
|
41960 |
+ DBIO_submit(io);
|
|
41961 |
+ break;
|
|
41962 |
+ case OpEnd:
|
|
41963 |
+ a_Chain_fcb(OpEnd, Info, io, NULL);
|
|
41964 |
+ DBIO_free(io);
|
|
41965 |
+ break;
|
|
41966 |
+ case OpAbort:
|
|
41967 |
+ a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
41968 |
+ DBIO_free(io);
|
|
41969 |
+ break;
|
|
41970 |
+ }
|
|
41971 |
+
|
|
41972 |
+ } else if ( Branch == 2 ) {
|
|
41973 |
+ /* Receive answer */
|
|
41974 |
+ switch (Op) {
|
|
41975 |
+ case OpStart:
|
|
41976 |
+ io->Info = Info;
|
|
41977 |
+ Info->LocalKey = io;
|
|
41978 |
+ a_Chain_link_new(Info, a_DBIO_ccc, FWD, a_Cache_ccc,2,2);
|
|
41979 |
+ a_Chain_fcb(OpStart, Info, io, io->ExtData);
|
|
41980 |
+ DBIO_submit(io);
|
|
41981 |
+ break;
|
|
41982 |
+ case OpSend:
|
|
41983 |
+ a_Chain_fcb(OpSend, Info, io, NULL);
|
|
41984 |
+ break;
|
|
41985 |
+ case OpEnd:
|
|
41986 |
+ a_Chain_fcb(OpEnd, Info, io, NULL);
|
|
41987 |
+ DBIO_free(io);
|
|
41988 |
+ break;
|
|
41989 |
+ case OpAbort:
|
|
41990 |
+ a_Chain_fcb(OpAbort, Info, io, NULL);
|
|
41991 |
+ DBIO_free(io);
|
|
41992 |
+ break;
|
|
41993 |
+ }
|
|
41994 |
+
|
|
41995 |
+ } else if ( Branch == -1 ) {
|
|
41996 |
+ /* Backwards call */
|
|
41997 |
+ switch (Op) {
|
|
41998 |
+ case OpAbort:
|
|
41999 |
+ DEBUG_MSG(3, "IO : OpAbort [-1]\n");
|
|
42000 |
+ io = Info->LocalKey;
|
|
42001 |
+ DBIO_abort(io);
|
|
42002 |
+ DBIO_free(io);
|
|
42003 |
+ g_free(Info);
|
|
42004 |
+ break;
|
|
42005 |
+ }
|
|
42006 |
+ }
|
|
42007 |
+}
|
|
42008 |
+
|
|
42009 |
+#endif
|
|
42010 |
+
|
|
42011 |
diff -pruN dillo-0.8.6/src/IO/DBIO.h dillo-0.8.6-i18n-misc-20070916/src/IO/DBIO.h
|
|
42012 |
--- dillo-0.8.6/src/IO/DBIO.h 1970-01-01 09:00:00.000000000 +0900
|
|
42013 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/DBIO.h 2006-05-16 01:21:09.000000000 +0900
|
|
42014 |
@@ -0,0 +1,22 @@
|
|
42015 |
+#ifndef __DBIO_h
|
|
42016 |
+#define __DBIO_h
|
|
42017 |
+
|
|
42018 |
+#include <config.h>
|
|
42019 |
+
|
|
42020 |
+#ifdef DILLO_SSL
|
|
42021 |
+
|
|
42022 |
+#include <openssl/bio.h>
|
|
42023 |
+
|
|
42024 |
+#include "IO.h"
|
|
42025 |
+
|
|
42026 |
+/*
|
|
42027 |
+ * Exported functions
|
|
42028 |
+ */
|
|
42029 |
+IOData_t* a_DBIO_new(BIO *bio);
|
|
42030 |
+void a_DBIO_ccc(int Op, int Br,int Dir, ChainLink *Info, void *Data, void *ExtraData);
|
|
42031 |
+
|
|
42032 |
+#endif /* DILLO_SSL */
|
|
42033 |
+
|
|
42034 |
+#endif /* __DBIO_h */
|
|
42035 |
+
|
|
42036 |
+
|
|
42037 |
diff -pruN dillo-0.8.6/src/IO/IO.c dillo-0.8.6-i18n-misc-20070916/src/IO/IO.c
|
|
42038 |
--- dillo-0.8.6/src/IO/IO.c 2006-01-03 03:21:56.000000000 +0900
|
|
42039 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/IO.c 2006-05-16 01:21:09.000000000 +0900
|
|
42040 |
@@ -15,6 +15,7 @@
|
|
42041 |
|
|
42042 |
#include <pthread.h>
|
|
42043 |
|
|
42044 |
+#include <config.h>
|
|
42045 |
#include <stdio.h>
|
|
42046 |
#include <string.h>
|
|
42047 |
#include <errno.h>
|
|
42048 |
@@ -86,6 +87,9 @@ IOData_t *a_IO_new(gint op, gint fd)
|
|
42049 |
io->GioCh = g_io_channel_unix_new(fd);
|
|
42050 |
io->Flags = 0;
|
|
42051 |
io->Key = 0;
|
|
42052 |
+#ifdef DILLO_SSL
|
|
42053 |
+ io->bio = NULL;
|
|
42054 |
+#endif
|
|
42055 |
return io;
|
|
42056 |
}
|
|
42057 |
|
|
42058 |
@@ -376,7 +380,7 @@ void a_IO_write_chunk(gint FD, void *Key
|
|
42059 |
/*
|
|
42060 |
* Register an IO in ValidIOs
|
|
42061 |
*/
|
|
42062 |
-static void IO_ins(IOData_t *io)
|
|
42063 |
+void IO_ins(IOData_t *io)
|
|
42064 |
{
|
|
42065 |
io->Key = a_Klist_insert(&ValidIOs, (gpointer)io);
|
|
42066 |
}
|
|
42067 |
@@ -384,7 +388,7 @@ static void IO_ins(IOData_t *io)
|
|
42068 |
/*
|
|
42069 |
* Remove an IO from ValidIOs
|
|
42070 |
*/
|
|
42071 |
-static void IO_del(IOData_t *io)
|
|
42072 |
+void IO_del(IOData_t *io)
|
|
42073 |
{
|
|
42074 |
a_Klist_remove(ValidIOs, io->Key);
|
|
42075 |
}
|
|
42076 |
@@ -392,7 +396,7 @@ static void IO_del(IOData_t *io)
|
|
42077 |
/*
|
|
42078 |
* Return a io by its Key (NULL if not found)
|
|
42079 |
*/
|
|
42080 |
-static IOData_t *IO_get(gint Key)
|
|
42081 |
+IOData_t *IO_get(gint Key)
|
|
42082 |
{
|
|
42083 |
return a_Klist_get_data(ValidIOs, Key);
|
|
42084 |
}
|
|
42085 |
@@ -403,7 +407,7 @@ static IOData_t *IO_get(gint Key)
|
|
42086 |
static void IO_free(IOData_t *io)
|
|
42087 |
{
|
|
42088 |
g_return_if_fail(IO_get(io->Key) == NULL);
|
|
42089 |
-
|
|
42090 |
+
|
|
42091 |
if (io->Flags & IOFlag_FreeIOBuf)
|
|
42092 |
a_IO_set_buf(io, NULL, 0);
|
|
42093 |
g_free(io);
|
|
42094 |
@@ -597,7 +601,7 @@ static gboolean IO_callback(GIOChannel *
|
|
42095 |
* Receive an IO request (IORead | IOWrite | IOWrites),
|
|
42096 |
* Set the GIOChannel and let it flow!
|
|
42097 |
*/
|
|
42098 |
-static void IO_submit(IOData_t *r_io)
|
|
42099 |
+void IO_submit(IOData_t *r_io)
|
|
42100 |
{
|
|
42101 |
/* Insert this IO in ValidIOs */
|
|
42102 |
IO_ins(r_io);
|
|
42103 |
diff -pruN dillo-0.8.6/src/IO/IO.h dillo-0.8.6-i18n-misc-20070916/src/IO/IO.h
|
|
42104 |
--- dillo-0.8.6/src/IO/IO.h 2005-10-28 01:20:22.000000000 +0900
|
|
42105 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/IO.h 2006-05-16 01:21:09.000000000 +0900
|
|
42106 |
@@ -1,10 +1,16 @@
|
|
42107 |
#ifndef __IO_H__
|
|
42108 |
#define __IO_H__
|
|
42109 |
|
|
42110 |
+#include<config.h>
|
|
42111 |
+
|
|
42112 |
#include<unistd.h>
|
|
42113 |
#include<sys/uio.h>
|
|
42114 |
#include <glib.h>
|
|
42115 |
|
|
42116 |
+#ifdef DILLO_SSL
|
|
42117 |
+#include <openssl/bio.h>
|
|
42118 |
+#endif
|
|
42119 |
+
|
|
42120 |
#include "../chain.h"
|
|
42121 |
|
|
42122 |
/*
|
|
42123 |
@@ -31,6 +37,7 @@
|
|
42124 |
#define IOBufLen_File 4096
|
|
42125 |
#define IOBufLen_Proto 4096
|
|
42126 |
#define IOBufLen_About 4096
|
|
42127 |
+#define IOBufLen_Matrix 4096
|
|
42128 |
|
|
42129 |
|
|
42130 |
typedef struct {
|
|
42131 |
@@ -46,6 +53,9 @@ typedef struct {
|
|
42132 |
|
|
42133 |
void *ExtData; /* External data reference (not used by IO.c) */
|
|
42134 |
void *Info; /* CCC Info structure for this IO */
|
|
42135 |
+#ifdef DILLO_SSL
|
|
42136 |
+ BIO *bio;
|
|
42137 |
+#endif
|
|
42138 |
GIOChannel *GioCh; /* IO channel */
|
|
42139 |
guint watch_id; /* glib's event source id */
|
|
42140 |
} IOData_t;
|
|
42141 |
diff -pruN dillo-0.8.6/src/IO/Makefile.am dillo-0.8.6-i18n-misc-20070916/src/IO/Makefile.am
|
|
42142 |
--- dillo-0.8.6/src/IO/Makefile.am 2004-08-04 22:58:25.000000000 +0900
|
|
42143 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/Makefile.am 2006-05-16 01:21:09.000000000 +0900
|
|
42144 |
@@ -4,6 +4,9 @@ AM_LIBS = @GTK_LIBS@
|
|
42145 |
noinst_LIBRARIES = libDio.a
|
|
42146 |
|
|
42147 |
libDio_a_SOURCES = \
|
|
42148 |
+ https.c \
|
|
42149 |
+ DBIO.h \
|
|
42150 |
+ DBIO.c \
|
|
42151 |
mime.c \
|
|
42152 |
mime.h \
|
|
42153 |
about.c \
|
|
42154 |
diff -pruN dillo-0.8.6/src/IO/Makefile.in dillo-0.8.6-i18n-misc-20070916/src/IO/Makefile.in
|
|
42155 |
--- dillo-0.8.6/src/IO/Makefile.in 2006-04-27 01:07:22.000000000 +0900
|
|
42156 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/Makefile.in 2007-09-07 01:04:08.000000000 +0900
|
|
42157 |
@@ -1,8 +1,8 @@
|
|
42158 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
42159 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
42160 |
# @configure_input@
|
|
42161 |
|
|
42162 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
42163 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
42164 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
42165 |
+# Free Software Foundation, Inc.
|
|
42166 |
# This Makefile.in is free software; the Free Software Foundation
|
|
42167 |
# gives unlimited permission to copy and/or distribute it,
|
|
42168 |
# with or without modifications, as long as this notice is preserved.
|
|
42169 |
@@ -14,8 +14,6 @@
|
|
42170 |
|
|
42171 |
@SET_MAKE@
|
|
42172 |
|
|
42173 |
-SOURCES = $(libDio_a_SOURCES)
|
|
42174 |
-
|
|
42175 |
srcdir = @srcdir@
|
|
42176 |
top_srcdir = @top_srcdir@
|
|
42177 |
VPATH = @srcdir@
|
|
42178 |
@@ -23,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
42179 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
42180 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
42181 |
top_builddir = ../..
|
|
42182 |
+
|
|
42183 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
42184 |
INSTALL = @INSTALL@
|
|
42185 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
42186 |
@@ -39,35 +38,6 @@ POST_UNINSTALL = :
|
|
42187 |
build_triplet = @build@
|
|
42188 |
host_triplet = @host@
|
|
42189 |
target_triplet = @target@
|
|
42190 |
-subdir = src/IO
|
|
42191 |
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
42192 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
42193 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
42194 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
42195 |
- $(ACLOCAL_M4)
|
|
42196 |
-mkinstalldirs = $(install_sh) -d
|
|
42197 |
-CONFIG_HEADER = $(top_builddir)/config.h
|
|
42198 |
-CONFIG_CLEAN_FILES =
|
|
42199 |
-LIBRARIES = $(noinst_LIBRARIES)
|
|
42200 |
-AR = ar
|
|
42201 |
-ARFLAGS = cru
|
|
42202 |
-libDio_a_AR = $(AR) $(ARFLAGS)
|
|
42203 |
-libDio_a_LIBADD =
|
|
42204 |
-am_libDio_a_OBJECTS = mime.$(OBJEXT) about.$(OBJEXT) Url.$(OBJEXT) \
|
|
42205 |
- proto.$(OBJEXT) http.$(OBJEXT) dpi.$(OBJEXT) IO.$(OBJEXT)
|
|
42206 |
-libDio_a_OBJECTS = $(am_libDio_a_OBJECTS)
|
|
42207 |
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
42208 |
-depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
42209 |
-am__depfiles_maybe = depfiles
|
|
42210 |
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
42211 |
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
42212 |
-CCLD = $(CC)
|
|
42213 |
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
42214 |
-SOURCES = $(libDio_a_SOURCES)
|
|
42215 |
-DIST_SOURCES = $(libDio_a_SOURCES)
|
|
42216 |
-ETAGS = etags
|
|
42217 |
-CTAGS = ctags
|
|
42218 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
42219 |
ACLOCAL = @ACLOCAL@
|
|
42220 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
42221 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
42222 |
@@ -97,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
42223 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
42224 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
42225 |
GLIB_LIBS = @GLIB_LIBS@
|
|
42226 |
+GMSGFMT = @GMSGFMT@
|
|
42227 |
+GREP = @GREP@
|
|
42228 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
42229 |
GTK_CONFIG = @GTK_CONFIG@
|
|
42230 |
GTK_LIBS = @GTK_LIBS@
|
|
42231 |
@@ -104,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
42232 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
42233 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
42234 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
42235 |
+INTLLIBS = @INTLLIBS@
|
|
42236 |
LDFLAGS = @LDFLAGS@
|
|
42237 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
42238 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
42239 |
+LIBICONV = @LIBICONV@
|
|
42240 |
+LIBINTL = @LIBINTL@
|
|
42241 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
42242 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
42243 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
42244 |
@@ -118,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
42245 |
LIBS = @LIBS@
|
|
42246 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
42247 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
42248 |
+LTLIBICONV = @LTLIBICONV@
|
|
42249 |
+LTLIBINTL = @LTLIBINTL@
|
|
42250 |
LTLIBOBJS = @LTLIBOBJS@
|
|
42251 |
MAKEINFO = @MAKEINFO@
|
|
42252 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
42253 |
+MSGFMT = @MSGFMT@
|
|
42254 |
+MSGMERGE = @MSGMERGE@
|
|
42255 |
OBJEXT = @OBJEXT@
|
|
42256 |
PACKAGE = @PACKAGE@
|
|
42257 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
42258 |
@@ -128,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
42259 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
42260 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
42261 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
42262 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
42263 |
+POSUB = @POSUB@
|
|
42264 |
RANLIB = @RANLIB@
|
|
42265 |
SET_MAKE = @SET_MAKE@
|
|
42266 |
SHELL = @SHELL@
|
|
42267 |
STRIP = @STRIP@
|
|
42268 |
+USE_NLS = @USE_NLS@
|
|
42269 |
VERSION = @VERSION@
|
|
42270 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
42271 |
+XGETTEXT = @XGETTEXT@
|
|
42272 |
ac_ct_CC = @ac_ct_CC@
|
|
42273 |
ac_ct_CXX = @ac_ct_CXX@
|
|
42274 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
42275 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
42276 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
42277 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
42278 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
42279 |
@@ -144,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
42280 |
am__include = @am__include@
|
|
42281 |
am__leading_dot = @am__leading_dot@
|
|
42282 |
am__quote = @am__quote@
|
|
42283 |
-am__tar = @am__tar@
|
|
42284 |
-am__untar = @am__untar@
|
|
42285 |
bindir = @bindir@
|
|
42286 |
build = @build@
|
|
42287 |
build_alias = @build_alias@
|
|
42288 |
@@ -153,23 +134,29 @@ build_cpu = @build_cpu@
|
|
42289 |
build_os = @build_os@
|
|
42290 |
build_vendor = @build_vendor@
|
|
42291 |
datadir = @datadir@
|
|
42292 |
+datarootdir = @datarootdir@
|
|
42293 |
+docdir = @docdir@
|
|
42294 |
+dvidir = @dvidir@
|
|
42295 |
exec_prefix = @exec_prefix@
|
|
42296 |
host = @host@
|
|
42297 |
host_alias = @host_alias@
|
|
42298 |
host_cpu = @host_cpu@
|
|
42299 |
host_os = @host_os@
|
|
42300 |
host_vendor = @host_vendor@
|
|
42301 |
+htmldir = @htmldir@
|
|
42302 |
includedir = @includedir@
|
|
42303 |
infodir = @infodir@
|
|
42304 |
install_sh = @install_sh@
|
|
42305 |
libdir = @libdir@
|
|
42306 |
libexecdir = @libexecdir@
|
|
42307 |
+localedir = @localedir@
|
|
42308 |
localstatedir = @localstatedir@
|
|
42309 |
mandir = @mandir@
|
|
42310 |
-mkdir_p = @mkdir_p@
|
|
42311 |
oldincludedir = @oldincludedir@
|
|
42312 |
+pdfdir = @pdfdir@
|
|
42313 |
prefix = @prefix@
|
|
42314 |
program_transform_name = @program_transform_name@
|
|
42315 |
+psdir = @psdir@
|
|
42316 |
sbindir = @sbindir@
|
|
42317 |
sharedstatedir = @sharedstatedir@
|
|
42318 |
sysconfdir = @sysconfdir@
|
|
42319 |
@@ -180,8 +167,13 @@ target_os = @target_os@
|
|
42320 |
target_vendor = @target_vendor@
|
|
42321 |
AM_CFLAGS = @GTK_CFLAGS@
|
|
42322 |
AM_LIBS = @GTK_LIBS@
|
|
42323 |
+
|
|
42324 |
noinst_LIBRARIES = libDio.a
|
|
42325 |
+
|
|
42326 |
libDio_a_SOURCES = \
|
|
42327 |
+ https.c \
|
|
42328 |
+ DBIO.h \
|
|
42329 |
+ DBIO.c \
|
|
42330 |
mime.c \
|
|
42331 |
mime.h \
|
|
42332 |
about.c \
|
|
42333 |
@@ -193,39 +185,47 @@ libDio_a_SOURCES = \
|
|
42334 |
IO.c \
|
|
42335 |
IO.h
|
|
42336 |
|
|
42337 |
+subdir = src/IO
|
|
42338 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
42339 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
42340 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
42341 |
+CONFIG_CLEAN_FILES =
|
|
42342 |
+LIBRARIES = $(noinst_LIBRARIES)
|
|
42343 |
+
|
|
42344 |
+libDio_a_AR = $(AR) cru
|
|
42345 |
+libDio_a_LIBADD =
|
|
42346 |
+am_libDio_a_OBJECTS = https.$(OBJEXT) DBIO.$(OBJEXT) mime.$(OBJEXT) \
|
|
42347 |
+ about.$(OBJEXT) Url.$(OBJEXT) proto.$(OBJEXT) http.$(OBJEXT) \
|
|
42348 |
+ dpi.$(OBJEXT) IO.$(OBJEXT)
|
|
42349 |
+libDio_a_OBJECTS = $(am_libDio_a_OBJECTS)
|
|
42350 |
+
|
|
42351 |
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
42352 |
+depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
42353 |
+am__depfiles_maybe = depfiles
|
|
42354 |
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/DBIO.Po ./$(DEPDIR)/IO.Po \
|
|
42355 |
+@AMDEP_TRUE@ ./$(DEPDIR)/Url.Po ./$(DEPDIR)/about.Po \
|
|
42356 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dpi.Po ./$(DEPDIR)/http.Po \
|
|
42357 |
+@AMDEP_TRUE@ ./$(DEPDIR)/https.Po ./$(DEPDIR)/mime.Po \
|
|
42358 |
+@AMDEP_TRUE@ ./$(DEPDIR)/proto.Po
|
|
42359 |
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
42360 |
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
42361 |
+CCLD = $(CC)
|
|
42362 |
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
42363 |
+DIST_SOURCES = $(libDio_a_SOURCES)
|
|
42364 |
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
|
|
42365 |
+SOURCES = $(libDio_a_SOURCES)
|
|
42366 |
+
|
|
42367 |
all: all-am
|
|
42368 |
|
|
42369 |
.SUFFIXES:
|
|
42370 |
.SUFFIXES: .c .o .obj
|
|
42371 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
42372 |
- @for dep in $?; do \
|
|
42373 |
- case '$(am__configure_deps)' in \
|
|
42374 |
- *$$dep*) \
|
|
42375 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
|
42376 |
- && exit 0; \
|
|
42377 |
- exit 1;; \
|
|
42378 |
- esac; \
|
|
42379 |
- done; \
|
|
42380 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/IO/Makefile'; \
|
|
42381 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
42382 |
cd $(top_srcdir) && \
|
|
42383 |
$(AUTOMAKE) --gnu src/IO/Makefile
|
|
42384 |
-.PRECIOUS: Makefile
|
|
42385 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
42386 |
- @case '$?' in \
|
|
42387 |
- *config.status*) \
|
|
42388 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
|
42389 |
- *) \
|
|
42390 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
|
42391 |
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
|
42392 |
- esac;
|
|
42393 |
-
|
|
42394 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
42395 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
42396 |
-
|
|
42397 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
42398 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
42399 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
42400 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
42401 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
42402 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
42403 |
+
|
|
42404 |
+AR = ar
|
|
42405 |
|
|
42406 |
clean-noinstLIBRARIES:
|
|
42407 |
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
|
|
42408 |
@@ -235,34 +235,52 @@ libDio.a: $(libDio_a_OBJECTS) $(libDio_a
|
|
42409 |
$(RANLIB) libDio.a
|
|
42410 |
|
|
42411 |
mostlyclean-compile:
|
|
42412 |
- -rm -f *.$(OBJEXT)
|
|
42413 |
+ -rm -f *.$(OBJEXT) core *.core
|
|
42414 |
|
|
42415 |
distclean-compile:
|
|
42416 |
-rm -f *.tab.c
|
|
42417 |
|
|
42418 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DBIO.Po@am__quote@
|
|
42419 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IO.Po@am__quote@
|
|
42420 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Url.Po@am__quote@
|
|
42421 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about.Po@am__quote@
|
|
42422 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpi.Po@am__quote@
|
|
42423 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@
|
|
42424 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/https.Po@am__quote@
|
|
42425 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Po@am__quote@
|
|
42426 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto.Po@am__quote@
|
|
42427 |
|
|
42428 |
.c.o:
|
|
42429 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
|
42430 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
42431 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
42432 |
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
42433 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
42434 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
42435 |
+@am__fastdepCC_TRUE@ fi
|
|
42436 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
42437 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
42438 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
42439 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
42440 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
42441 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
|
|
42442 |
|
|
42443 |
.c.obj:
|
|
42444 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
|
42445 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
42446 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
42447 |
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
42448 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
42449 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
42450 |
+@am__fastdepCC_TRUE@ fi
|
|
42451 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
42452 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
42453 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
42454 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
42455 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
42456 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
42457 |
uninstall-info-am:
|
|
42458 |
|
|
42459 |
+ETAGS = etags
|
|
42460 |
+ETAGSFLAGS =
|
|
42461 |
+
|
|
42462 |
+CTAGS = ctags
|
|
42463 |
+CTAGSFLAGS =
|
|
42464 |
+
|
|
42465 |
+tags: TAGS
|
|
42466 |
+
|
|
42467 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
42468 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
42469 |
unique=`for i in $$list; do \
|
|
42470 |
@@ -271,7 +289,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
|
|
42471 |
$(AWK) ' { files[$$0] = 1; } \
|
|
42472 |
END { for (i in files) print i; }'`; \
|
|
42473 |
mkid -fID $$unique
|
|
42474 |
-tags: TAGS
|
|
42475 |
|
|
42476 |
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
42477 |
$(TAGS_FILES) $(LISP)
|
|
42478 |
@@ -283,11 +300,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
|
|
42479 |
done | \
|
|
42480 |
$(AWK) ' { files[$$0] = 1; } \
|
|
42481 |
END { for (i in files) print i; }'`; \
|
|
42482 |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
42483 |
- test -n "$$unique" || unique=$$empty_fix; \
|
|
42484 |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
42485 |
- $$tags $$unique; \
|
|
42486 |
- fi
|
|
42487 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
42488 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
42489 |
+ $$tags $$unique
|
|
42490 |
+
|
|
42491 |
ctags: CTAGS
|
|
42492 |
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
42493 |
$(TAGS_FILES) $(LISP)
|
|
42494 |
@@ -310,6 +326,10 @@ GTAGS:
|
|
42495 |
|
|
42496 |
distclean-tags:
|
|
42497 |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
42498 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
42499 |
+
|
|
42500 |
+top_distdir = ../..
|
|
42501 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
42502 |
|
|
42503 |
distdir: $(DISTFILES)
|
|
42504 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
42505 |
@@ -323,7 +343,7 @@ distdir: $(DISTFILES)
|
|
42506 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
42507 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
42508 |
dir="/$$dir"; \
|
|
42509 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
42510 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
42511 |
else \
|
|
42512 |
dir=''; \
|
|
42513 |
fi; \
|
|
42514 |
@@ -341,6 +361,7 @@ distdir: $(DISTFILES)
|
|
42515 |
check-am: all-am
|
|
42516 |
check: check-am
|
|
42517 |
all-am: Makefile $(LIBRARIES)
|
|
42518 |
+
|
|
42519 |
installdirs:
|
|
42520 |
install: install-am
|
|
42521 |
install-exec: install-exec-am
|
|
42522 |
@@ -361,7 +382,7 @@ mostlyclean-generic:
|
|
42523 |
clean-generic:
|
|
42524 |
|
|
42525 |
distclean-generic:
|
|
42526 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
42527 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
42528 |
|
|
42529 |
maintainer-clean-generic:
|
|
42530 |
@echo "This command is intended for maintainers to use"
|
|
42531 |
@@ -380,8 +401,6 @@ dvi: dvi-am
|
|
42532 |
|
|
42533 |
dvi-am:
|
|
42534 |
|
|
42535 |
-html: html-am
|
|
42536 |
-
|
|
42537 |
info: info-am
|
|
42538 |
|
|
42539 |
info-am:
|
|
42540 |
@@ -417,14 +436,13 @@ uninstall-am: uninstall-info-am
|
|
42541 |
|
|
42542 |
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
|
42543 |
clean-noinstLIBRARIES ctags distclean distclean-compile \
|
|
42544 |
- distclean-generic distclean-tags distdir dvi dvi-am html \
|
|
42545 |
- html-am info info-am install install-am install-data \
|
|
42546 |
- install-data-am install-exec install-exec-am install-info \
|
|
42547 |
- install-info-am install-man install-strip installcheck \
|
|
42548 |
- installcheck-am installdirs maintainer-clean \
|
|
42549 |
- maintainer-clean-generic mostlyclean mostlyclean-compile \
|
|
42550 |
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
|
42551 |
- uninstall-am uninstall-info-am
|
|
42552 |
+ distclean-generic distclean-tags distdir dvi dvi-am info \
|
|
42553 |
+ info-am install install-am install-data install-data-am \
|
|
42554 |
+ install-exec install-exec-am install-info install-info-am \
|
|
42555 |
+ install-man install-strip installcheck installcheck-am \
|
|
42556 |
+ installdirs maintainer-clean maintainer-clean-generic \
|
|
42557 |
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
|
|
42558 |
+ ps ps-am tags uninstall uninstall-am uninstall-info-am
|
|
42559 |
|
|
42560 |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
42561 |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
42562 |
diff -pruN dillo-0.8.6/src/IO/Url.c dillo-0.8.6-i18n-misc-20070916/src/IO/Url.c
|
|
42563 |
--- dillo-0.8.6/src/IO/Url.c 2006-01-04 04:44:32.000000000 +0900
|
|
42564 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/Url.c 2006-05-16 01:21:09.000000000 +0900
|
|
42565 |
@@ -16,6 +16,7 @@
|
|
42566 |
* This module selects the apropriate CCC-function for a given URL.
|
|
42567 |
*/
|
|
42568 |
|
|
42569 |
+#include <config.h>
|
|
42570 |
|
|
42571 |
#include <glib.h>
|
|
42572 |
#include <stdlib.h>
|
|
42573 |
@@ -87,7 +88,11 @@ ChainFunction_t a_Url_get_ccc_funct(cons
|
|
42574 |
{"about", a_About_ccc},
|
|
42575 |
{"dpi" , a_Dpi_ccc},
|
|
42576 |
{"ftp" , a_Dpi_ccc},
|
|
42577 |
+#ifdef DILLO_SSL
|
|
42578 |
+ {"https", a_Https_ccc},
|
|
42579 |
+#else
|
|
42580 |
{"https" , a_Dpi_ccc},
|
|
42581 |
+#endif
|
|
42582 |
{"data" , a_Dpi_ccc} };
|
|
42583 |
#define LSIZE (sizeof(cccList) / sizeof(cccList[0]))
|
|
42584 |
|
|
42585 |
diff -pruN dillo-0.8.6/src/IO/Url.h dillo-0.8.6-i18n-misc-20070916/src/IO/Url.h
|
|
42586 |
--- dillo-0.8.6/src/IO/Url.h 2005-10-28 01:20:22.000000000 +0900
|
|
42587 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/Url.h 2006-05-16 01:21:09.000000000 +0900
|
|
42588 |
@@ -38,6 +38,11 @@ void a_Dpi_ccc (int Op, int Branch, int
|
|
42589 |
|
|
42590 |
char *a_Dpi_send_blocking_cmd(const gchar *server_name, const gchar *cmd);
|
|
42591 |
void a_Dpi_bye_dpid(void);
|
|
42592 |
+#ifdef DILLO_SSL
|
|
42593 |
+void a_Https_ccc(int Op, int Branch, int Dir, ChainLink *Info,
|
|
42594 |
+ void *Data1, void *Data2);
|
|
42595 |
+void a_Https_freeall(void);
|
|
42596 |
+#endif
|
|
42597 |
|
|
42598 |
|
|
42599 |
#ifdef __cplusplus
|
|
42600 |
diff -pruN dillo-0.8.6/src/IO/about.c dillo-0.8.6-i18n-misc-20070916/src/IO/about.c
|
|
42601 |
--- dillo-0.8.6/src/IO/about.c 2006-04-27 01:17:48.000000000 +0900
|
|
42602 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/about.c 2006-05-16 01:21:09.000000000 +0900
|
|
42603 |
@@ -11,6 +11,7 @@
|
|
42604 |
*/
|
|
42605 |
|
|
42606 |
#include <config.h>
|
|
42607 |
+#include "../intl.h"
|
|
42608 |
#include "IO.h"
|
|
42609 |
#include "Url.h"
|
|
42610 |
#include "../nav.h"
|
|
42611 |
@@ -27,6 +28,9 @@ struct _SplashInfo {
|
|
42612 |
/*
|
|
42613 |
* HTML text for startup screen
|
|
42614 |
*/
|
|
42615 |
+static char *Blank=
|
|
42616 |
+"Content-type: text/html\n"
|
|
42617 |
+"\n";
|
|
42618 |
static char *Splash=
|
|
42619 |
"Content-type: text/html\n"
|
|
42620 |
"\n"
|
|
42621 |
@@ -222,6 +226,24 @@ static char *Splash=
|
|
42622 |
"\n"
|
|
42623 |
"\n"
|
|
42624 |
"<!-- Main Part of the page -->\n"
|
|
42625 |
+"<table border='0' cellpadding='0' cellspacing='0' align='center' bgcolor='#000000' width='100%'><tr><td>\n"
|
|
42626 |
+"<table border='0' cellpadding='5' cellspacing='1' width='100%'>\n"
|
|
42627 |
+"<tr>\n"
|
|
42628 |
+" <td bgcolor='#CCCCCC'>\n"
|
|
42629 |
+" <h4>This is Unofficial Version</h4>\n"
|
|
42630 |
+"<tr>\n"
|
|
42631 |
+" <td bgcolor='#FFFFFF'>\n"
|
|
42632 |
+" <table border='0' cellspacing='0' cellpadding='5'><tr><td>\n"
|
|
42633 |
+" This is Unofficial Version.<br>\n"
|
|
42634 |
+" <font color='RED'>Please do not ask the dillo team for help.</font><br>\n"
|
|
42635 |
+" Report problems to Kiyo<webmaster@teki.jpn.ph>.<br>\n"
|
|
42636 |
+" Latest version can be downloaded from \n"
|
|
42637 |
+" <a href=\"http://teki.jpn.ph/pc/software/index-e.shtml\">http://teki.jpn.ph/pc/software/index-e.shtml</a>\n"
|
|
42638 |
+" </table>\n"
|
|
42639 |
+"</table>\n"
|
|
42640 |
+"</table>\n"
|
|
42641 |
+"\n"
|
|
42642 |
+"<br>\n"
|
|
42643 |
"\n"
|
|
42644 |
"<table border='0' cellpadding='0' cellspacing='0' align='center' bgcolor='#000000' width='100%'><tr><td>\n"
|
|
42645 |
"<table border='0' cellpadding='5' cellspacing='1' width='100%'>\n"
|
|
42646 |
@@ -393,7 +415,7 @@ static char *Splash=
|
|
42647 |
/*
|
|
42648 |
* Send the splash screen through the IO using a pipe.
|
|
42649 |
*/
|
|
42650 |
-static gint About_send_splash(ChainLink *Info, DilloUrl *Url)
|
|
42651 |
+static gint About_send_page(ChainLink *Info, DilloUrl *Url, char *Data)
|
|
42652 |
{
|
|
42653 |
gint SplashPipe[2];
|
|
42654 |
IOData_t *io1;
|
|
42655 |
@@ -409,7 +431,7 @@ static gint About_send_splash(ChainLink
|
|
42656 |
|
|
42657 |
/* send splash */
|
|
42658 |
io1 = a_IO_new(IOWrite, SpInfo->FD_Write);
|
|
42659 |
- a_IO_set_buf(io1, Splash, strlen(Splash));
|
|
42660 |
+ a_IO_set_buf(io1, Data, strlen(Data));
|
|
42661 |
io1->Flags |= (IOFlag_ForceClose + IOFlag_SingleWrite);
|
|
42662 |
a_Chain_link_new(Info, a_About_ccc, BCK, a_IO_ccc, 1, 1);
|
|
42663 |
a_Chain_bcb(OpStart, Info, io1, NULL);
|
|
42664 |
@@ -439,7 +461,11 @@ static gint About_get(ChainLink *Info, v
|
|
42665 |
tail = URL_PATH(Url);
|
|
42666 |
|
|
42667 |
if (!strcmp(tail, "splash")) {
|
|
42668 |
- return About_send_splash(Info, Url);
|
|
42669 |
+ return About_send_page(Info, Url, _(Splash));
|
|
42670 |
+ }
|
|
42671 |
+
|
|
42672 |
+ if (!strcmp(tail, "blank")) {
|
|
42673 |
+ return About_send_page(Info, Url, Blank);
|
|
42674 |
}
|
|
42675 |
|
|
42676 |
if (!strcmp(tail, "jwz"))
|
|
42677 |
@@ -458,7 +484,7 @@ static gint About_get(ChainLink *Info, v
|
|
42678 |
loc = "http://www.google.com/";
|
|
42679 |
|
|
42680 |
LocUrl = a_Url_new(loc, NULL, 0, 0, 0);
|
|
42681 |
- a_Nav_push(web->bw, LocUrl);
|
|
42682 |
+ a_Nav_push(web->dd, LocUrl);
|
|
42683 |
a_Url_free(LocUrl);
|
|
42684 |
return -1;
|
|
42685 |
}
|
|
42686 |
diff -pruN dillo-0.8.6/src/IO/dpi.c dillo-0.8.6-i18n-misc-20070916/src/IO/dpi.c
|
|
42687 |
--- dillo-0.8.6/src/IO/dpi.c 2006-03-16 00:50:04.000000000 +0900
|
|
42688 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/dpi.c 2006-05-16 01:21:09.000000000 +0900
|
|
42689 |
@@ -19,6 +19,7 @@
|
|
42690 |
*/
|
|
42691 |
|
|
42692 |
|
|
42693 |
+#include <config.h>
|
|
42694 |
#include <unistd.h>
|
|
42695 |
#include <stdlib.h>
|
|
42696 |
#include <sys/types.h>
|
|
42697 |
@@ -35,6 +36,7 @@
|
|
42698 |
#include <arpa/inet.h>
|
|
42699 |
#include <netdb.h>
|
|
42700 |
|
|
42701 |
+#include "../intl.h"
|
|
42702 |
#include "../msg.h"
|
|
42703 |
#include "IO.h"
|
|
42704 |
#include "Url.h"
|
|
42705 |
@@ -171,9 +173,9 @@ static gint Dpi_get_token(conn_data_t *c
|
|
42706 |
/* search for start of tag */
|
|
42707 |
/*
|
|
42708 |
gchar *pbuf=NULL;
|
|
42709 |
-MSG("conn->BufIdx = %d; conn->BufSize = %d\n", conn->BufIdx,conn->BufSize);
|
|
42710 |
+MSG(_("conn->BufIdx = %d; conn->BufSize = %d\n"), conn->BufIdx,conn->BufSize);
|
|
42711 |
pbuf = g_strndup(buf, conn->BufSize - conn->BufIdx);
|
|
42712 |
-MSG("buf: [%s]\n", pbuf);
|
|
42713 |
+MSG(_("buf: [%s]\n"), pbuf);
|
|
42714 |
g_free(pbuf);
|
|
42715 |
*/
|
|
42716 |
while (conn->BufIdx < conn->BufSize && buf[conn->BufIdx] != '<')
|
|
42717 |
@@ -183,7 +185,7 @@ g_free(pbuf);
|
|
42718 |
conn->InTag = 1;
|
|
42719 |
conn->TokIdx = conn->BufIdx;
|
|
42720 |
} else {
|
|
42721 |
- MSG("ERROR: [Dpi_get_token] Can't find token start\n");
|
|
42722 |
+ MSG(_("ERROR: [Dpi_get_token] Can't find token start\n"));
|
|
42723 |
conn->FreeBuf = 1;
|
|
42724 |
return Dpi_get_token(conn);
|
|
42725 |
}
|
|
42726 |
@@ -216,7 +218,7 @@ g_free(pbuf);
|
|
42727 |
resp = 0;
|
|
42728 |
} else {
|
|
42729 |
/* srch end of data */
|
|
42730 |
- MSG("ERROR: [Dpi_get_token] *** NULL code here ***\n");
|
|
42731 |
+ MSG(_("ERROR: [Dpi_get_token] *** NULL code here ***\n"));
|
|
42732 |
while (conn->BufIdx < conn->BufSize)
|
|
42733 |
++conn->BufIdx;
|
|
42734 |
resp = -1;
|
|
42735 |
@@ -243,7 +245,7 @@ static void Dpi_parse_token(conn_data_t
|
|
42736 |
}
|
|
42737 |
|
|
42738 |
tag = g_strndup(conn->Buf + conn->TokIdx, (guint)conn->TokSize);
|
|
42739 |
- MSG("Dpi_parse_token: {%s}\n", tag);
|
|
42740 |
+ _MSG("Dpi_parse_token: {%s}\n", tag);
|
|
42741 |
|
|
42742 |
cmd = a_Dpip_get_attr(conn->Buf + conn->TokIdx, conn->TokSize, "cmd");
|
|
42743 |
if (strcmp(cmd, "send_status_message") == 0) {
|
|
42744 |
@@ -307,7 +309,7 @@ static void Dpi_process_io(int Op, void
|
|
42745 |
}
|
|
42746 |
|
|
42747 |
} else if (Op == IOClose) {
|
|
42748 |
- MSG("Dpi: [Dpi_process_io] IOClose\n");
|
|
42749 |
+ DEBUG_MSG(3, _("Dpi: [Dpi_process_io] IOClose\n"));
|
|
42750 |
}
|
|
42751 |
}
|
|
42752 |
|
|
42753 |
@@ -333,7 +335,7 @@ static gint Dpi_start_dpid(void)
|
|
42754 |
if (execl(path1, "dpid", NULL) == -1) {
|
|
42755 |
g_free(path1);
|
|
42756 |
if (execlp("dpid", "dpid", NULL) == -1) {
|
|
42757 |
- DEBUG_MSG(4, "Dpi_start_dpid (child): %s\n", g_strerror(errno));
|
|
42758 |
+ DEBUG_MSG(4, _("Dpi_start_dpid (child): %s\n"), g_strerror(errno));
|
|
42759 |
do
|
|
42760 |
n = write(st_pipe[1], "ERROR", 5);
|
|
42761 |
while (n == -1 && errno == EINTR);
|
|
42762 |
@@ -343,7 +345,7 @@ static gint Dpi_start_dpid(void)
|
|
42763 |
}
|
|
42764 |
} else if (pid < 0) {
|
|
42765 |
/* The fork failed. Report failure. */
|
|
42766 |
- DEBUG_MSG(4, "Dpi_start_dpid: %s\n", g_strerror(errno));
|
|
42767 |
+ DEBUG_MSG(4, _("Dpi_start_dpid: %s\n"), g_strerror(errno));
|
|
42768 |
/* close the unused pipe */
|
|
42769 |
Dpi_close_fd(st_pipe[0]);
|
|
42770 |
Dpi_close_fd(st_pipe[1]);
|
|
42771 |
@@ -354,11 +356,11 @@ static gint Dpi_start_dpid(void)
|
|
42772 |
do
|
|
42773 |
n = read(st_pipe[0], buf, 16);
|
|
42774 |
while (n == -1 && errno == EINTR);
|
|
42775 |
- DEBUG_MSG(2, "Dpi_start_dpid: n = %d\n", n);
|
|
42776 |
+ DEBUG_MSG(2, _("Dpi_start_dpid: n = %d\n"), n);
|
|
42777 |
if (n != 5)
|
|
42778 |
ret = 0;
|
|
42779 |
else
|
|
42780 |
- DEBUG_MSG(4, "Dpi_start_dpid: %s\n", g_strerror(errno));
|
|
42781 |
+ DEBUG_MSG(4, _("Dpi_start_dpid: %s\n"), g_strerror(errno));
|
|
42782 |
}
|
|
42783 |
|
|
42784 |
return ret;
|
|
42785 |
@@ -381,7 +383,7 @@ static gint Dpi_check_uds(gchar *uds_nam
|
|
42786 |
|
|
42787 |
if ((SockFD = socket(AF_LOCAL, SOCK_STREAM, 0)) == -1 ||
|
|
42788 |
connect(SockFD, (void*)&pun, D_SUN_LEN(&pun)) == -1) {
|
|
42789 |
- DEBUG_MSG(4, "Dpi_check_uds: %s %s\n", g_strerror(errno), uds_name);
|
|
42790 |
+ DEBUG_MSG(4, _("Dpi_check_uds: %1$s %2$s\n"), g_strerror(errno), uds_name);
|
|
42791 |
} else {
|
|
42792 |
Dpi_close_fd(SockFD);
|
|
42793 |
ret = 0;
|
|
42794 |
@@ -668,7 +670,7 @@ void a_Dpi_ccc(int Op, int Branch, int D
|
|
42795 |
else if (st == 1)
|
|
42796 |
a_Chain_fcb(OpSend, Info, NULL, (void*)"DpidEAGAIN");
|
|
42797 |
else {
|
|
42798 |
- DEBUG_MSG(4, "dpi.c: ERROR, can't start dpi daemon\n");
|
|
42799 |
+ DEBUG_MSG(4, _("dpi.c: ERROR, can't start dpi daemon\n"));
|
|
42800 |
a_Dpi_ccc(OpAbort, 2, FWD, Info, "ERR_dpid", NULL);
|
|
42801 |
}
|
|
42802 |
break;
|
|
42803 |
@@ -681,7 +683,7 @@ void a_Dpi_ccc(int Op, int Branch, int D
|
|
42804 |
g_free(Info);
|
|
42805 |
break;
|
|
42806 |
case OpAbort:
|
|
42807 |
- MSG("a_Dpi_ccc: OpAbort[2B], Not implemented\n");
|
|
42808 |
+ MSG(_("a_Dpi_ccc: OpAbort[2B], Not implemented\n"));
|
|
42809 |
g_free(Info->LocalKey);
|
|
42810 |
g_free(Info);
|
|
42811 |
break;
|
|
42812 |
@@ -715,7 +717,7 @@ void a_Dpi_ccc(int Op, int Branch, int D
|
|
42813 |
a_Chain_fcb(OpEnd, Info, NULL, NULL);
|
|
42814 |
break;
|
|
42815 |
case OpAbort:
|
|
42816 |
- MSG(" Not implemented\n");
|
|
42817 |
+ MSG(_(" Not implemented\n"));
|
|
42818 |
break;
|
|
42819 |
}
|
|
42820 |
} else { /* BCK */
|
|
42821 |
@@ -755,7 +757,7 @@ void a_Dpi_ccc(int Op, int Branch, int D
|
|
42822 |
}
|
|
42823 |
break;
|
|
42824 |
case OpAbort:
|
|
42825 |
- MSG(" Not implemented\n");
|
|
42826 |
+ MSG(_(" Not implemented\n"));
|
|
42827 |
break;
|
|
42828 |
}
|
|
42829 |
}
|
|
42830 |
@@ -785,11 +787,11 @@ void a_Dpi_bye_dpid()
|
|
42831 |
sa.sun_family = AF_LOCAL;
|
|
42832 |
|
|
42833 |
if ((new_socket = socket(AF_LOCAL, SOCK_STREAM, 0)) == -1) {
|
|
42834 |
- DEBUG_MSG(4, "a_Dpi_bye_dpid: %s\n", g_strerror(errno));
|
|
42835 |
+ DEBUG_MSG(4, _("a_Dpi_bye_dpid: %s\n"), g_strerror(errno));
|
|
42836 |
}
|
|
42837 |
strncpy(sa.sun_path, srs_name, sizeof (sa.sun_path));
|
|
42838 |
if (connect(new_socket, (struct sockaddr *) &sa, addr_len) == -1) {
|
|
42839 |
- DEBUG_MSG(4, "a_Dpi_bye_dpid: %s\n", g_strerror(errno));
|
|
42840 |
+ DEBUG_MSG(4, _("a_Dpi_bye_dpid: %s\n"), g_strerror(errno));
|
|
42841 |
fprintf(stderr, "%s\n", sa.sun_path);
|
|
42842 |
}
|
|
42843 |
DpiBye_cmd = a_Dpip_build_cmd("cmd=%s", "DpiBye");
|
|
42844 |
diff -pruN dillo-0.8.6/src/IO/http.c dillo-0.8.6-i18n-misc-20070916/src/IO/http.c
|
|
42845 |
--- dillo-0.8.6/src/IO/http.c 2005-10-28 01:20:22.000000000 +0900
|
|
42846 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/http.c 2006-06-19 03:03:03.000000000 +0900
|
|
42847 |
@@ -27,8 +27,10 @@
|
|
42848 |
#include <netinet/in.h> /* for ntohl and stuff */
|
|
42849 |
#include <arpa/inet.h> /* for inet_ntop */
|
|
42850 |
|
|
42851 |
+#include "../intl.h"
|
|
42852 |
#include "IO.h"
|
|
42853 |
#include "Url.h"
|
|
42854 |
+#include "../i18n.h"
|
|
42855 |
#include "../klist.h"
|
|
42856 |
#include "../dns.h"
|
|
42857 |
#include "../cache.h"
|
|
42858 |
@@ -36,13 +38,15 @@
|
|
42859 |
#include "../interface.h"
|
|
42860 |
#include "../cookies.h"
|
|
42861 |
#include "../prefs.h"
|
|
42862 |
+#include "../auth.h"
|
|
42863 |
+
|
|
42864 |
#include "../misc.h"
|
|
42865 |
|
|
42866 |
/* Used to send a message to the bw's status bar */
|
|
42867 |
#define BW_MSG(web, root, fmt...) \
|
|
42868 |
G_STMT_START { \
|
|
42869 |
if (a_Web_valid((web)) && (!(root) || (web)->flags & WEB_RootUrl)) \
|
|
42870 |
- a_Interface_msg((web)->bw, fmt); \
|
|
42871 |
+ a_Interface_msg((web)->dd->bw, fmt); \
|
|
42872 |
} G_STMT_END
|
|
42873 |
|
|
42874 |
#define DEBUG_LEVEL 5
|
|
42875 |
@@ -72,6 +76,7 @@ static Klist_t *ValidSocks = NULL; /* Ac
|
|
42876 |
* SocketData_t structures. */
|
|
42877 |
|
|
42878 |
static DilloUrl *HTTP_Proxy = NULL;
|
|
42879 |
+
|
|
42880 |
static gchar *HTTP_Proxy_Auth_base64 = NULL;
|
|
42881 |
|
|
42882 |
/*
|
|
42883 |
@@ -153,8 +158,10 @@ gchar *a_Http_make_query_str(const Dillo
|
|
42884 |
gchar *str, *ptr, *cookies;
|
|
42885 |
GString *s_port = g_string_new(""),
|
|
42886 |
*query = g_string_new(""),
|
|
42887 |
+ *referer = g_string_new(""),
|
|
42888 |
*full_path = g_string_new(""),
|
|
42889 |
- *proxy_auth = g_string_new("");
|
|
42890 |
+ *proxy_auth = g_string_new(""),
|
|
42891 |
+ *auth = g_string_new("");
|
|
42892 |
|
|
42893 |
/* Sending the default port in the query may cause a 302-answer. --Jcid */
|
|
42894 |
if (URL_PORT(url) && URL_PORT(url) != DILLO_URL_HTTP_PORT)
|
|
42895 |
@@ -177,6 +184,16 @@ gchar *a_Http_make_query_str(const Dillo
|
|
42896 |
(URL_PATH_(url) || URL_QUERY_(url)) ? "" : "/");
|
|
42897 |
}
|
|
42898 |
|
|
42899 |
+ if (prefs.send_referer && url->referer) {
|
|
42900 |
+ g_string_sprintfa(referer, "Referer: %s\r\n", url->referer);
|
|
42901 |
+ }
|
|
42902 |
+ DEBUG_MSG(4,_("Getting %1$s, referer %2$s\n"), URL_STR(url), referer->str);
|
|
42903 |
+
|
|
42904 |
+ if (a_Auth_byurl((DilloUrl *) url)) {
|
|
42905 |
+ g_string_sprintfa(auth, "Authorization: %s\r\n",
|
|
42906 |
+ a_Auth_byurl((DilloUrl *) url)->str);
|
|
42907 |
+ }
|
|
42908 |
+
|
|
42909 |
cookies = a_Cookies_get(url);
|
|
42910 |
if ( URL_FLAGS(url) & URL_Post ){
|
|
42911 |
g_string_sprintfa(
|
|
42912 |
@@ -184,16 +201,22 @@ gchar *a_Http_make_query_str(const Dillo
|
|
42913 |
"POST %s HTTP/1.0\r\n"
|
|
42914 |
"Host: %s%s\r\n"
|
|
42915 |
"%s"
|
|
42916 |
- "User-Agent: Dillo/%s\r\n"
|
|
42917 |
+ "User-Agent: %s\r\n"
|
|
42918 |
"Cookie2: $Version=\"1\"\r\n"
|
|
42919 |
"%s"
|
|
42920 |
+ "%s"
|
|
42921 |
"Content-type: application/x-www-form-urlencoded\r\n"
|
|
42922 |
"Content-length: %ld\r\n"
|
|
42923 |
+ "%s"
|
|
42924 |
"\r\n"
|
|
42925 |
"%s",
|
|
42926 |
- full_path->str, URL_HOST(url), s_port->str,
|
|
42927 |
- proxy_auth->str, VERSION, cookies,
|
|
42928 |
+ full_path->str,
|
|
42929 |
+ URL_HOST(url), s_port->str, proxy_auth->str,
|
|
42930 |
+ (prefs.user_agent)? prefs.user_agent : "Dillo/" VERSION,
|
|
42931 |
+ cookies,
|
|
42932 |
+ auth->str,
|
|
42933 |
(glong)strlen(URL_DATA(url)),
|
|
42934 |
+ referer->str,
|
|
42935 |
URL_DATA(url));
|
|
42936 |
|
|
42937 |
} else {
|
|
42938 |
@@ -203,26 +226,37 @@ gchar *a_Http_make_query_str(const Dillo
|
|
42939 |
"%s"
|
|
42940 |
"Host: %s%s\r\n"
|
|
42941 |
"%s"
|
|
42942 |
- "User-Agent: Dillo/%s\r\n"
|
|
42943 |
+ "User-Agent: %s\r\n"
|
|
42944 |
+ "Accept-Language: %s\r\n"
|
|
42945 |
+ "Accept-Encoding:gzip\r\n"
|
|
42946 |
+ "Accept-Charset:utf-8,%s\r\n"
|
|
42947 |
+ "%s"
|
|
42948 |
"Cookie2: $Version=\"1\"\r\n"
|
|
42949 |
"%s"
|
|
42950 |
+ "%s"
|
|
42951 |
"\r\n",
|
|
42952 |
full_path->str,
|
|
42953 |
(URL_FLAGS(url) & URL_E2EReload) ?
|
|
42954 |
"Cache-Control: no-cache\r\nPragma: no-cache\r\n" : "",
|
|
42955 |
URL_HOST(url), s_port->str,
|
|
42956 |
proxy_auth->str,
|
|
42957 |
- VERSION,
|
|
42958 |
- cookies);
|
|
42959 |
+ (prefs.user_agent)? prefs.user_agent : "Dillo/" VERSION,
|
|
42960 |
+ prefs.accept_language,
|
|
42961 |
+ DW_CHARSET,
|
|
42962 |
+ referer->str,
|
|
42963 |
+ cookies,
|
|
42964 |
+ auth->str
|
|
42965 |
+ );
|
|
42966 |
}
|
|
42967 |
g_free(cookies);
|
|
42968 |
|
|
42969 |
str = query->str;
|
|
42970 |
g_string_free(query, FALSE);
|
|
42971 |
g_string_free(s_port, TRUE);
|
|
42972 |
+ g_string_free(referer, TRUE);
|
|
42973 |
g_string_free(full_path, TRUE);
|
|
42974 |
g_string_free(proxy_auth, TRUE);
|
|
42975 |
- DEBUG_MSG(4, "Query:\n%s", str);
|
|
42976 |
+ DEBUG_MSG(4, _("Query:\n%s"), str);
|
|
42977 |
return str;
|
|
42978 |
}
|
|
42979 |
|
|
42980 |
@@ -237,6 +271,7 @@ static gboolean
|
|
42981 |
ChainLink *Info;
|
|
42982 |
SocketData_t *S;
|
|
42983 |
gint SKey = GPOINTER_TO_INT(data);
|
|
42984 |
+ gchar *msg_enc;
|
|
42985 |
|
|
42986 |
DEBUG_MSG(3, "Http_use_socket: %s [errno %d] [GIOcond %d]\n",
|
|
42987 |
g_strerror(errno), errno, cond);
|
|
42988 |
@@ -248,25 +283,30 @@ static gboolean
|
|
42989 |
|
|
42990 |
Info = S->Info;
|
|
42991 |
if ( cond & G_IO_HUP ) {
|
|
42992 |
- DEBUG_MSG(3, "--Connection broken\n");
|
|
42993 |
+ DEBUG_MSG(3, _("--Connection broken\n"));
|
|
42994 |
/* get rid of S->GioCh */
|
|
42995 |
g_io_channel_close(S->GioCh);
|
|
42996 |
g_io_channel_unref(S->GioCh);
|
|
42997 |
S->GioCh = NULL;
|
|
42998 |
S->addr_list_iter = S->addr_list_iter->next;
|
|
42999 |
if (!S->addr_list_iter || Http_connect_socket(Info) < 0) {
|
|
43000 |
- BW_MSG(S->web, 0, "ERROR: unable to connect to remote host");
|
|
43001 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(
|
|
43002 |
+ _("ERROR: unable to connect to remote host"));
|
|
43003 |
+ BW_MSG(S->web, 0, msg_enc);
|
|
43004 |
+ g_free(msg_enc);
|
|
43005 |
Http_socket_free(SKey);
|
|
43006 |
a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43007 |
}
|
|
43008 |
} else if ( S->Err ) {
|
|
43009 |
- BW_MSG(S->web, 0, "ERROR: %s", g_strerror(S->Err));
|
|
43010 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: %s"));
|
|
43011 |
+ BW_MSG(S->web, 0, msg_enc, g_strerror(S->Err));
|
|
43012 |
+ g_free(msg_enc);
|
|
43013 |
DEBUG_MSG(3, "Http_use_socket ERROR: %s\n", g_strerror(S->Err));
|
|
43014 |
a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43015 |
g_io_channel_close(S->GioCh);
|
|
43016 |
Http_socket_free(SKey);
|
|
43017 |
} else if ( cond & G_IO_OUT ) {
|
|
43018 |
- DEBUG_MSG(3, "--Connection established\n");
|
|
43019 |
+ DEBUG_MSG(3, _("--Connection established\n"));
|
|
43020 |
g_io_channel_unref(S->GioCh);
|
|
43021 |
S->GioCh = NULL;
|
|
43022 |
Http_send_query(Info, S);
|
|
43023 |
@@ -291,6 +331,7 @@ static int Http_connect_socket(ChainLink
|
|
43024 |
SocketData_t *S;
|
|
43025 |
DilloHost *dh;
|
|
43026 |
socklen_t socket_len = 0;
|
|
43027 |
+ gchar *msg_enc;
|
|
43028 |
|
|
43029 |
S = a_Klist_get_data(ValidSocks, GPOINTER_TO_INT(Info->LocalKey));
|
|
43030 |
|
|
43031 |
@@ -298,7 +339,7 @@ static int Http_connect_socket(ChainLink
|
|
43032 |
|
|
43033 |
if ( (S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0 ) {
|
|
43034 |
S->Err = errno;
|
|
43035 |
- DEBUG_MSG(5, "Http_connect_socket ERROR: %s\n", g_strerror(errno));
|
|
43036 |
+ DEBUG_MSG(5, _("Http_connect_socket ERROR: %s\n"), g_strerror(errno));
|
|
43037 |
return -1;
|
|
43038 |
}
|
|
43039 |
/* set NONBLOCKING and close on exec. */
|
|
43040 |
@@ -319,7 +360,7 @@ static int Http_connect_socket(ChainLink
|
|
43041 |
sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
|
|
43042 |
memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
|
|
43043 |
if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
|
|
43044 |
- DEBUG_MSG(5, "Connecting to %s\n", inet_ntoa(sin->sin_addr));
|
|
43045 |
+ DEBUG_MSG(4, _("Connecting to %s\n"), inet_ntoa(sin->sin_addr));
|
|
43046 |
break;
|
|
43047 |
}
|
|
43048 |
#ifdef ENABLE_IPV6
|
|
43049 |
@@ -333,7 +374,7 @@ static int Http_connect_socket(ChainLink
|
|
43050 |
memcpy(&sin6->sin6_addr, dh->data, dh->alen);
|
|
43051 |
inet_ntop(dh->af, dh->data, buf, sizeof(buf));
|
|
43052 |
if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
|
|
43053 |
- DEBUG_MSG(5, "Connecting to %s\n", buf);
|
|
43054 |
+ DEBUG_MSG(5, _("Connecting to %s\n"), buf);
|
|
43055 |
break;
|
|
43056 |
}
|
|
43057 |
#endif
|
|
43058 |
@@ -351,8 +392,10 @@ static int Http_connect_socket(ChainLink
|
|
43059 |
S->Err = errno;
|
|
43060 |
return -1;
|
|
43061 |
}
|
|
43062 |
-
|
|
43063 |
- BW_MSG(S->web, 1, "Contacting host...");
|
|
43064 |
+
|
|
43065 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("Contacting host..."));
|
|
43066 |
+ BW_MSG(S->web, 1, msg_enc);
|
|
43067 |
+ g_free(msg_enc);
|
|
43068 |
|
|
43069 |
return 0; /* Success */
|
|
43070 |
}
|
|
43071 |
@@ -364,14 +407,16 @@ static int Http_connect_socket(ChainLink
|
|
43072 |
static void Http_send_query(ChainLink *Info, SocketData_t *S)
|
|
43073 |
{
|
|
43074 |
IOData_t *io;
|
|
43075 |
- gchar *query;
|
|
43076 |
+ gchar *query, *msg_enc;
|
|
43077 |
void *link;
|
|
43078 |
|
|
43079 |
/* Create the query */
|
|
43080 |
query = a_Http_make_query_str(S->Url, S->use_proxy);
|
|
43081 |
|
|
43082 |
/* send query */
|
|
43083 |
- BW_MSG(S->web, 1, "Sending query to %s...", URL_HOST_(S->Url));
|
|
43084 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("Sending query to %s..."));
|
|
43085 |
+ BW_MSG(S->web, 1, msg_enc, URL_HOST_(S->Url));
|
|
43086 |
+ g_free(msg_enc);
|
|
43087 |
io = a_IO_new(IOWrite, S->SockFD);
|
|
43088 |
a_IO_set_buf(io, query, strlen(query));
|
|
43089 |
io->Flags |= IOFlag_FreeIOBuf;
|
|
43090 |
@@ -414,7 +459,7 @@ static gint Http_get(ChainLink *Info, vo
|
|
43091 |
void *link;
|
|
43092 |
const DilloUrl *Url = Data1;
|
|
43093 |
SocketData_t *S;
|
|
43094 |
- gchar *hostname;
|
|
43095 |
+ gchar *hostname, *msg_enc;
|
|
43096 |
|
|
43097 |
S = a_Klist_get_data(ValidSocks, GPOINTER_TO_INT(Info->LocalKey));
|
|
43098 |
|
|
43099 |
@@ -438,7 +483,9 @@ static gint Http_get(ChainLink *Info, vo
|
|
43100 |
S->Url = Url;
|
|
43101 |
|
|
43102 |
/* Let the user know what we'll do */
|
|
43103 |
- BW_MSG(S->web, 1, "DNS solving %s", URL_HOST_(S->Url));
|
|
43104 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("DNS solving %s"));
|
|
43105 |
+ BW_MSG(S->web, 1, msg_enc, URL_HOST_(S->Url));
|
|
43106 |
+ g_free(msg_enc);
|
|
43107 |
|
|
43108 |
/* Let the DNS engine solve the hostname, and when done,
|
|
43109 |
* we'll try to connect the socket */
|
|
43110 |
@@ -457,6 +504,7 @@ void a_Http_ccc(int Op, int Branch, int
|
|
43111 |
{
|
|
43112 |
gint SKey = GPOINTER_TO_INT(Info->LocalKey);
|
|
43113 |
SocketData_t *S = a_Klist_get_data(ValidSocks, SKey);
|
|
43114 |
+ gchar *msg_enc;
|
|
43115 |
|
|
43116 |
a_Chain_debug_msg("a_Http_ccc", Op, Branch, Dir);
|
|
43117 |
|
|
43118 |
@@ -469,14 +517,16 @@ void a_Http_ccc(int Op, int Branch, int
|
|
43119 |
Info->LocalKey = GINT_TO_POINTER(SKey);
|
|
43120 |
if (Http_get(Info, Data1, Data2) < 0) {
|
|
43121 |
S = a_Klist_get_data(ValidSocks, SKey);
|
|
43122 |
- BW_MSG(S->web, 1, "ERROR: %s", g_strerror(S->Err));
|
|
43123 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: %s"));
|
|
43124 |
+ BW_MSG(S->web, 1, msg_enc, g_strerror(S->Err));
|
|
43125 |
+ g_free(msg_enc);
|
|
43126 |
Http_socket_free(SKey);
|
|
43127 |
a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43128 |
}
|
|
43129 |
break;
|
|
43130 |
case OpAbort:
|
|
43131 |
/* something bad happened... */
|
|
43132 |
- DEBUG_MSG(2, "Http: OpAbort [1B]\n");
|
|
43133 |
+ DEBUG_MSG(2, _("Http: OpAbort [1B]\n"));
|
|
43134 |
Http_socket_free(SKey);
|
|
43135 |
a_Chain_bcb(OpAbort, Info, NULL, NULL);
|
|
43136 |
g_free(Info);
|
|
43137 |
@@ -498,7 +548,9 @@ void a_Http_ccc(int Op, int Branch, int
|
|
43138 |
a_Chain_del_link(Info, BCK);
|
|
43139 |
/* start connecting the socket */
|
|
43140 |
if (Http_connect_socket(Info) < 0) {
|
|
43141 |
- BW_MSG(S->web, 1, "ERROR: %s", g_strerror(S->Err));
|
|
43142 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: %s"));
|
|
43143 |
+ BW_MSG(S->web, 1, msg_enc, g_strerror(S->Err));
|
|
43144 |
+ g_free(msg_enc);
|
|
43145 |
Http_socket_free(SKey);
|
|
43146 |
a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43147 |
}
|
|
43148 |
@@ -509,8 +561,10 @@ void a_Http_ccc(int Op, int Branch, int
|
|
43149 |
if (S) {
|
|
43150 |
/* Unlink DNS_Info */
|
|
43151 |
a_Chain_del_link(Info, BCK);
|
|
43152 |
- BW_MSG(S->web, 0, "ERROR: Dns can't solve %s",
|
|
43153 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: Dns can't solve %s"));
|
|
43154 |
+ BW_MSG(S->web, 0, msg_enc,
|
|
43155 |
(S->use_proxy) ? URL_HOST_(HTTP_Proxy) : URL_HOST_(S->Url));
|
|
43156 |
+ g_free(msg_enc);
|
|
43157 |
Http_socket_free(SKey);
|
|
43158 |
/* send abort message to higher-level functions */
|
|
43159 |
a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43160 |
@@ -534,7 +588,9 @@ void a_Http_ccc(int Op, int Branch, int
|
|
43161 |
if (S) {
|
|
43162 |
a_Chain_del_link(Info, BCK);
|
|
43163 |
a_Chain_fcb(OpEnd, Info, &S->SockFD, (void *)S->Url);
|
|
43164 |
- BW_MSG(S->web, 1, "Query sent, waiting for reply...");
|
|
43165 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("Query sent, waiting for reply..."));
|
|
43166 |
+ BW_MSG(S->web, 1, msg_enc);
|
|
43167 |
+ g_free(msg_enc);
|
|
43168 |
Http_socket_free(SKey);
|
|
43169 |
}
|
|
43170 |
break;
|
|
43171 |
@@ -560,6 +616,7 @@ void a_Http_ccc(int Op, int Branch, int
|
|
43172 |
*/
|
|
43173 |
void a_Http_freeall(void)
|
|
43174 |
{
|
|
43175 |
+ a_Auth_freeall();
|
|
43176 |
a_Klist_free(&ValidSocks);
|
|
43177 |
a_Url_free(HTTP_Proxy);
|
|
43178 |
g_free(HTTP_Proxy_Auth_base64);
|
|
43179 |
diff -pruN dillo-0.8.6/src/IO/https.c dillo-0.8.6-i18n-misc-20070916/src/IO/https.c
|
|
43180 |
--- dillo-0.8.6/src/IO/https.c 1970-01-01 09:00:00.000000000 +0900
|
|
43181 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/https.c 2006-05-16 01:21:09.000000000 +0900
|
|
43182 |
@@ -0,0 +1,466 @@
|
|
43183 |
+/*
|
|
43184 |
+ * File: https.c
|
|
43185 |
+ *
|
|
43186 |
+ * Copyright (C) 2000, 2001 Jorge Arellano Cid <jcid@inf.utfsm.cl>
|
|
43187 |
+ * Copyright (C) 2002 Jonathan P Springer <jonathan.springer@verizon.net>
|
|
43188 |
+ *
|
|
43189 |
+ * This program is free software; you can redistribute it and/or modify
|
|
43190 |
+ * it under the terms of the GNU General Public License as published by
|
|
43191 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
43192 |
+ * (at your option) any later version.
|
|
43193 |
+ *
|
|
43194 |
+ * This program is distributed in the hope that it will be useful, but WITHOUT
|
|
43195 |
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
43196 |
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
43197 |
+ * more details.
|
|
43198 |
+ *
|
|
43199 |
+ * You should have received a copy of the GNU General Public License along
|
|
43200 |
+ * with this program; if not, write to the Free Software Foundation, Inc., 59
|
|
43201 |
+ * Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
43202 |
+ *
|
|
43203 |
+ * In addition, as a special exception, Jorge Arellano Cid and Jonathan
|
|
43204 |
+ * Springer give permission to link the code of this program with the OpenSSL
|
|
43205 |
+ * library (or modified versions of OpenSSL that use the same license as
|
|
43206 |
+ * OpenSSL), and distribute linked combinations including the two. You must
|
|
43207 |
+ * obey the GNU General Public License in all respects for all of the code
|
|
43208 |
+ * used other than OpenSSL. If you modify this file, you may extend this
|
|
43209 |
+ * exception to your version of the file, but you are not obligated to do so.
|
|
43210 |
+ * If you do not wish to do so, delete this exception from your version.
|
|
43211 |
+ *
|
|
43212 |
+ */
|
|
43213 |
+
|
|
43214 |
+/*
|
|
43215 |
+ * This program exploits code originally published under the OpenSSL demos/bio
|
|
43216 |
+ * directory. I am uncertain as to the copyright status of this code, as no
|
|
43217 |
+ * notice was included. If you own the copyright on this code and object to
|
|
43218 |
+ * its use in this GPL program, please contact me. -- JPS
|
|
43219 |
+ */
|
|
43220 |
+
|
|
43221 |
+/*
|
|
43222 |
+ * HTTPS connect functions
|
|
43223 |
+ */
|
|
43224 |
+
|
|
43225 |
+#include <config.h>
|
|
43226 |
+
|
|
43227 |
+#ifdef DILLO_SSL
|
|
43228 |
+
|
|
43229 |
+#include <unistd.h>
|
|
43230 |
+#include <errno.h> /* for errno */
|
|
43231 |
+#include <string.h> /* for strstr */
|
|
43232 |
+#include <stdlib.h>
|
|
43233 |
+#include <signal.h>
|
|
43234 |
+#include <fcntl.h>
|
|
43235 |
+#include <sys/wait.h>
|
|
43236 |
+#include <sys/socket.h> /* for lots of socket stuff */
|
|
43237 |
+#include <netinet/in.h> /* for ntohl and stuff */
|
|
43238 |
+#include <openssl/ssl.h>
|
|
43239 |
+#include <openssl/err.h>
|
|
43240 |
+
|
|
43241 |
+#include <glib.h>
|
|
43242 |
+
|
|
43243 |
+#include "../intl.h"
|
|
43244 |
+#include "../i18n.h"
|
|
43245 |
+#include "Url.h"
|
|
43246 |
+#include "DBIO.h"
|
|
43247 |
+#include "../klist.h"
|
|
43248 |
+#include "../dns.h"
|
|
43249 |
+#include "../cache.h"
|
|
43250 |
+#include "../web.h"
|
|
43251 |
+#include "../interface.h"
|
|
43252 |
+extern char *Http_query(const DilloUrl *url, gboolean use_proxy);
|
|
43253 |
+
|
|
43254 |
+
|
|
43255 |
+/* Used to send a message to the bw's status bar */
|
|
43256 |
+#define BW_MSG(web, root, fmt...) \
|
|
43257 |
+ (a_Web_valid(web) && (!(root) || (web)->flags & WEB_RootUrl)) ? \
|
|
43258 |
+ a_Interface_msg((web)->dd->bw, fmt) : (root)
|
|
43259 |
+
|
|
43260 |
+#define DEBUG_LEVEL 5
|
|
43261 |
+#include "../debug.h"
|
|
43262 |
+
|
|
43263 |
+
|
|
43264 |
+/* 'Url' and 'web' are just references (no need to deallocate them here). */
|
|
43265 |
+typedef struct {
|
|
43266 |
+ BIO* bio;
|
|
43267 |
+ SSL* ssl;
|
|
43268 |
+ const DilloUrl *Url; /* reference to original URL */
|
|
43269 |
+ DilloWeb *web; /* reference to client's web structure */
|
|
43270 |
+ guint32 ip_addr; /* Holds the DNS answer */
|
|
43271 |
+ gint Err; /* Holds the errno of the connect() call */
|
|
43272 |
+ ChainLink *Info; /* Used for CCC asynchronous operations */
|
|
43273 |
+} SSLData_t;
|
|
43274 |
+
|
|
43275 |
+
|
|
43276 |
+/*
|
|
43277 |
+ * Local data
|
|
43278 |
+ */
|
|
43279 |
+static Klist_t *ValidSSLs = NULL; /* Active sockets list. It holds pointers to
|
|
43280 |
+ * SSLData_t structures. */
|
|
43281 |
+
|
|
43282 |
+static gboolean Https_init = FALSE;
|
|
43283 |
+
|
|
43284 |
+static SSL_CTX* ssl_ctx;
|
|
43285 |
+
|
|
43286 |
+/*
|
|
43287 |
+ * Forward declarations
|
|
43288 |
+ */
|
|
43289 |
+static void Https_send_query(ChainLink *Info, SSLData_t *S);
|
|
43290 |
+static void Https_expect_answer(SSLData_t *S);
|
|
43291 |
+
|
|
43292 |
+/*
|
|
43293 |
+ * If it hasn't been initialized already, initialize
|
|
43294 |
+ * the SSL-specific stuff.
|
|
43295 |
+ */
|
|
43296 |
+void Https_SSL_init(void)
|
|
43297 |
+{
|
|
43298 |
+ if (!Https_init) {
|
|
43299 |
+ SSL_load_error_strings();
|
|
43300 |
+ OpenSSL_add_ssl_algorithms();
|
|
43301 |
+ ssl_ctx = SSL_CTX_new(SSLv23_client_method());
|
|
43302 |
+ Https_init = TRUE;
|
|
43303 |
+ }
|
|
43304 |
+}
|
|
43305 |
+
|
|
43306 |
+/*
|
|
43307 |
+ * Create and init a new SSLData_t struct, insert into ValidSSLs,
|
|
43308 |
+ * and return a primary key for it.
|
|
43309 |
+ */
|
|
43310 |
+gint Https_SSL_new(void)
|
|
43311 |
+{
|
|
43312 |
+ SSLData_t *S = g_new0(SSLData_t, 1);
|
|
43313 |
+ return a_Klist_insert(&ValidSSLs, (gpointer)S);
|
|
43314 |
+}
|
|
43315 |
+
|
|
43316 |
+/*
|
|
43317 |
+ * Free SSLData_t struct
|
|
43318 |
+ */
|
|
43319 |
+void Https_SSL_free(gint SKey)
|
|
43320 |
+{
|
|
43321 |
+ SSLData_t *S;
|
|
43322 |
+
|
|
43323 |
+ if ((S = a_Klist_get_data(ValidSSLs, SKey))) {
|
|
43324 |
+ a_Klist_remove(ValidSSLs, SKey);
|
|
43325 |
+ if (S->bio) BIO_free_all(S->bio);
|
|
43326 |
+ g_free(S);
|
|
43327 |
+ }
|
|
43328 |
+}
|
|
43329 |
+
|
|
43330 |
+/*
|
|
43331 |
+ * This function is called after the socket has been successfuly connected,
|
|
43332 |
+ * or upon an error condition on the connecting process.
|
|
43333 |
+ * Task: use the socket to send the HTTP-query and expect its answer
|
|
43334 |
+ */
|
|
43335 |
+static gboolean Https_Callback_Use(gpointer data)
|
|
43336 |
+{
|
|
43337 |
+ ChainLink *Info;
|
|
43338 |
+ SSLData_t *S;
|
|
43339 |
+ gint SKey = (gint) data;
|
|
43340 |
+ gchar *msg_enc;
|
|
43341 |
+
|
|
43342 |
+ DEBUG_MSG(3, "Https_Callback_Use\n");
|
|
43343 |
+
|
|
43344 |
+ /* This check is required because glib may asynchronously
|
|
43345 |
+ * call this function with data that's no longer used --Jcid */
|
|
43346 |
+ if ( !(S = a_Klist_get_data(ValidSSLs, SKey)) ) return FALSE;
|
|
43347 |
+
|
|
43348 |
+ Info = S->Info;
|
|
43349 |
+ if ( S->Err ) {
|
|
43350 |
+ DEBUG_MSG(3, _("--Error detected\n"));
|
|
43351 |
+ DEBUG_MSG(3, "%d:%s:%s:%s\n", S->Err,
|
|
43352 |
+ ERR_lib_error_string(S->Err),
|
|
43353 |
+ ERR_func_error_string(S->Err),
|
|
43354 |
+ ERR_reason_error_string(S->Err));
|
|
43355 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: unable to connect to remote host"));
|
|
43356 |
+ BW_MSG(S->web, 0, msg_enc);
|
|
43357 |
+ g_free(msg_enc);
|
|
43358 |
+ a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43359 |
+ Https_SSL_free(SKey);
|
|
43360 |
+ } else {
|
|
43361 |
+ DEBUG_MSG(3, _("--Connection established\n"));
|
|
43362 |
+ Https_send_query(Info, S);
|
|
43363 |
+ Https_expect_answer(S);
|
|
43364 |
+ }
|
|
43365 |
+ return FALSE;
|
|
43366 |
+}
|
|
43367 |
+
|
|
43368 |
+gboolean Https_Callback_Connect(gpointer data) {
|
|
43369 |
+
|
|
43370 |
+ gint SKey = (gint) data;
|
|
43371 |
+ SSLData_t *S;
|
|
43372 |
+ gchar *msg_enc;
|
|
43373 |
+
|
|
43374 |
+ /* This check is required because glib may asynchronously
|
|
43375 |
+ * call this function with data that's no longer used --Jcid */
|
|
43376 |
+ if ( !(S = a_Klist_get_data(ValidSSLs, SKey)) ) return FALSE;
|
|
43377 |
+
|
|
43378 |
+ S->Err = 0;
|
|
43379 |
+ if (BIO_do_connect(S->bio) != 1) {
|
|
43380 |
+ if (BIO_should_retry(S->bio)) return TRUE;
|
|
43381 |
+ S->Err = ERR_get_error();
|
|
43382 |
+ DEBUG_MSG(3, "%d:%s:%s:%s\n", S->Err,
|
|
43383 |
+ ERR_lib_error_string(S->Err),
|
|
43384 |
+ ERR_func_error_string(S->Err),
|
|
43385 |
+ ERR_reason_error_string(S->Err));
|
|
43386 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: unable to connect to remote host"));
|
|
43387 |
+ BW_MSG(S->web, 0, msg_enc);
|
|
43388 |
+ g_free(msg_enc);
|
|
43389 |
+ return FALSE;
|
|
43390 |
+ }
|
|
43391 |
+ g_idle_add(Https_Callback_Use, data);
|
|
43392 |
+ return FALSE;
|
|
43393 |
+}
|
|
43394 |
+
|
|
43395 |
+/*
|
|
43396 |
+ * This function gets called after the DNS succeeds solving a hostname.
|
|
43397 |
+ * Task: Finish socket setup and start connecting the socket.
|
|
43398 |
+ * Return value: 0 on success; -1 on error.
|
|
43399 |
+*/
|
|
43400 |
+static int Https_connect_SSL(ChainLink *Info)
|
|
43401 |
+{
|
|
43402 |
+ SSLData_t *S = a_Klist_get_data(ValidSSLs, (gint)Info->LocalKey);
|
|
43403 |
+
|
|
43404 |
+ BIO *ssl_bio;
|
|
43405 |
+ union {
|
|
43406 |
+ guint32 i;
|
|
43407 |
+ guchar c[4];
|
|
43408 |
+ } U;
|
|
43409 |
+ gchar *tmp_str;
|
|
43410 |
+ int port = DILLO_URL_HTTPS_PORT;
|
|
43411 |
+
|
|
43412 |
+ /* TODO - Better error checking */
|
|
43413 |
+
|
|
43414 |
+ /* Initialize some SSL stuff if this is our first connection */
|
|
43415 |
+ Https_SSL_init();
|
|
43416 |
+
|
|
43417 |
+ /* Create an SSL structure */
|
|
43418 |
+ S->ssl = SSL_new(ssl_ctx);
|
|
43419 |
+ SSL_set_connect_state(S->ssl);
|
|
43420 |
+
|
|
43421 |
+ /* Create a BIO structure */
|
|
43422 |
+ ssl_bio = BIO_new(BIO_f_ssl());
|
|
43423 |
+ BIO_set_ssl(ssl_bio, S->ssl, BIO_CLOSE);
|
|
43424 |
+
|
|
43425 |
+ /* Create and configure the connection BIO */
|
|
43426 |
+ S->bio = BIO_new(BIO_s_connect());
|
|
43427 |
+
|
|
43428 |
+#if 0
|
|
43429 |
+ U.i = htonl(S->ip_addr);
|
|
43430 |
+#else
|
|
43431 |
+ U.i = S->ip_addr; /* should already be in the right order */
|
|
43432 |
+#endif
|
|
43433 |
+ tmp_str = g_strdup_printf("%u.%u.%u.%u", U.c[0], U.c[1], U.c[2], U.c[3]);
|
|
43434 |
+ BIO_set_conn_hostname(S->bio, tmp_str);
|
|
43435 |
+ g_free(tmp_str);
|
|
43436 |
+ BIO_set_conn_int_port(S->bio, &port);
|
|
43437 |
+
|
|
43438 |
+ BIO_set_nbio(S->bio, 1); /* non-blocking ON */
|
|
43439 |
+
|
|
43440 |
+ /* Chain the socket & SSL BIOs together */
|
|
43441 |
+ S->bio = BIO_push(ssl_bio, S->bio); /* chain this with the SSL BIO */
|
|
43442 |
+
|
|
43443 |
+ /* And set up a looping idle event to connect it... */
|
|
43444 |
+ g_idle_add(Https_Callback_Connect, (gpointer) Info->LocalKey);
|
|
43445 |
+
|
|
43446 |
+ return 0; /* Success */
|
|
43447 |
+}
|
|
43448 |
+
|
|
43449 |
+/*
|
|
43450 |
+ * Create and submit the HTTP query to the IO engine
|
|
43451 |
+ */
|
|
43452 |
+static void Https_send_query(ChainLink *Info, SSLData_t *S)
|
|
43453 |
+{
|
|
43454 |
+ IOData_t *io;
|
|
43455 |
+ gchar *query, *msg_enc;
|
|
43456 |
+ void *link;
|
|
43457 |
+
|
|
43458 |
+ /* Create the query */
|
|
43459 |
+ query = a_Http_make_query_str(S->Url, FALSE);
|
|
43460 |
+
|
|
43461 |
+ /* send query */
|
|
43462 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("Sending query to %s..."));
|
|
43463 |
+ BW_MSG(S->web, 1, msg_enc, URL_HOST(S->Url));
|
|
43464 |
+ g_free(msg_enc);
|
|
43465 |
+ io = a_DBIO_new(S->bio);
|
|
43466 |
+ io->Op = IOWrite;
|
|
43467 |
+ a_IO_set_buf(io, query, strlen(query));
|
|
43468 |
+ io->Flags |= IOFlag_FreeIOBuf;
|
|
43469 |
+ io->ExtData = NULL;
|
|
43470 |
+ link = a_Chain_link_new(Info, a_Https_ccc, BCK, a_DBIO_ccc,2,2);
|
|
43471 |
+ a_DBIO_ccc(OpStart, 1,0, link, io, NULL);
|
|
43472 |
+}
|
|
43473 |
+
|
|
43474 |
+/*
|
|
43475 |
+ * Expect the HTTP query's answer
|
|
43476 |
+ */
|
|
43477 |
+static void Https_expect_answer(SSLData_t *S)
|
|
43478 |
+{
|
|
43479 |
+ IOData_t *io2;
|
|
43480 |
+
|
|
43481 |
+ /* receive answer */
|
|
43482 |
+ io2 = a_DBIO_new(S->bio);
|
|
43483 |
+ io2->Op = IORead;
|
|
43484 |
+ a_IO_set_buf(io2,g_malloc(IOBufLen_Http),IOBufLen_Http);
|
|
43485 |
+ io2->Flags |= IOFlag_FreeIOBuf;
|
|
43486 |
+ io2->ExtData = (void *) S->Url;
|
|
43487 |
+ a_DBIO_ccc(OpStart, 2, 0,a_Chain_new(), io2, NULL);
|
|
43488 |
+}
|
|
43489 |
+
|
|
43490 |
+/*
|
|
43491 |
+ * Asynchronously create a new http connection for 'Url'
|
|
43492 |
+ * We'll set some socket parameters; the rest will be set later
|
|
43493 |
+ * when the IP is known.
|
|
43494 |
+ * ( Data = Requested Url; ExtraData = Web structure )
|
|
43495 |
+ * Return value: 0 on success, -1 otherwise
|
|
43496 |
+ */
|
|
43497 |
+gint Https_get(ChainLink *Info, void *Data1, void *Data2)
|
|
43498 |
+{
|
|
43499 |
+ void *link;
|
|
43500 |
+ const DilloUrl *Url = Data1;
|
|
43501 |
+ SSLData_t *S = a_Klist_get_data(ValidSSLs, (gint)Info->LocalKey);
|
|
43502 |
+ gchar hostname[256], *Host = hostname, *msg_enc;
|
|
43503 |
+
|
|
43504 |
+ /* Reference Info data */
|
|
43505 |
+ S->Info = Info;
|
|
43506 |
+ /* Reference Web data */
|
|
43507 |
+ S->web = Data2;
|
|
43508 |
+
|
|
43509 |
+ Host = (gchar *)URL_HOST(Url);
|
|
43510 |
+
|
|
43511 |
+ /* Set more socket parameters */
|
|
43512 |
+ S->Url = Url;
|
|
43513 |
+
|
|
43514 |
+ /* Let the user know what we'll do */
|
|
43515 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("DNS solving %s"));
|
|
43516 |
+ BW_MSG(S->web, 1, msg_enc, URL_HOST(S->Url));
|
|
43517 |
+ g_free(msg_enc);
|
|
43518 |
+
|
|
43519 |
+ /* Let the DNS engine solve the hostname, and when done,
|
|
43520 |
+ * we'll try to connect the socket */
|
|
43521 |
+ link = a_Chain_link_new(Info, a_Https_ccc, BCK, a_Dns_ccc, 1, 1);
|
|
43522 |
+ a_Chain_bcb(OpStart,Info, Host,NULL);
|
|
43523 |
+
|
|
43524 |
+ return 0;
|
|
43525 |
+}
|
|
43526 |
+
|
|
43527 |
+/*
|
|
43528 |
+ * CCC function for the HTTP module
|
|
43529 |
+ */
|
|
43530 |
+void
|
|
43531 |
+a_Https_ccc(int Op, int Branch, int Dir, ChainLink *Info,
|
|
43532 |
+ void *Data1, void *Data2)
|
|
43533 |
+{
|
|
43534 |
+ gint SKey = (gint)Info->LocalKey;
|
|
43535 |
+ SSLData_t *S = a_Klist_get_data(ValidSSLs, SKey);
|
|
43536 |
+ gchar *msg_enc;
|
|
43537 |
+
|
|
43538 |
+ if ( Branch == 1 ) {
|
|
43539 |
+ /* DNS query branch */
|
|
43540 |
+ switch (Op) {
|
|
43541 |
+ case OpStart:
|
|
43542 |
+ SKey = Https_SSL_new();
|
|
43543 |
+ Info->LocalKey = (void *) SKey;
|
|
43544 |
+ if (Https_get(Info, Data1, Data2) < 0) {
|
|
43545 |
+ DEBUG_MSG(2, _(" HTTPS: new abort handler! #2\n"));
|
|
43546 |
+ S = a_Klist_get_data(ValidSSLs, SKey);
|
|
43547 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: %s"));
|
|
43548 |
+ BW_MSG(S->web, 1, msg_enc, g_strerror(S->Err));
|
|
43549 |
+ g_free(msg_enc);
|
|
43550 |
+ Https_SSL_free(SKey);
|
|
43551 |
+ a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43552 |
+ }
|
|
43553 |
+ break;
|
|
43554 |
+ case OpSend:
|
|
43555 |
+ /* Successful DNS answer; save the IP */
|
|
43556 |
+ if (S)
|
|
43557 |
+ {
|
|
43558 |
+ DilloHost *dh=(DilloHost *)(((GSList *)Data1)->data);
|
|
43559 |
+ S->ip_addr = *(int *)dh->data;
|
|
43560 |
+ }
|
|
43561 |
+ break;
|
|
43562 |
+ case OpEnd:
|
|
43563 |
+ if (S) {
|
|
43564 |
+ /* Unlink DNS_Info */
|
|
43565 |
+ a_Chain_del_link(Info, BCK);
|
|
43566 |
+ /* start connecting the socket */
|
|
43567 |
+ if (Https_connect_SSL(Info) < 0) {
|
|
43568 |
+ DEBUG_MSG(2, _(" HTTP: new abort handler! #1\n"));
|
|
43569 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: %s"));
|
|
43570 |
+ BW_MSG(S->web, 1, msg_enc, g_strerror(S->Err));
|
|
43571 |
+ g_free(msg_enc);
|
|
43572 |
+ Https_SSL_free(SKey);
|
|
43573 |
+ a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43574 |
+ }
|
|
43575 |
+ }
|
|
43576 |
+ break;
|
|
43577 |
+ case OpAbort:
|
|
43578 |
+ /* DNS wasn't able to resolve the hostname */
|
|
43579 |
+ if (S) {
|
|
43580 |
+ /* Unlink DNS_Info */
|
|
43581 |
+ a_Chain_del_link(Info, BCK);
|
|
43582 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: Dns can't solve %s"));
|
|
43583 |
+ BW_MSG(S->web, 0, msg_enc, URL_HOST(S->Url));
|
|
43584 |
+ g_free(msg_enc);
|
|
43585 |
+ BIO_free_all(S->bio);
|
|
43586 |
+ Https_SSL_free(SKey);
|
|
43587 |
+ /* send abort message to higher-level functions */
|
|
43588 |
+ a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43589 |
+ }
|
|
43590 |
+ break;
|
|
43591 |
+
|
|
43592 |
+ }
|
|
43593 |
+
|
|
43594 |
+ } else if ( Branch == 2 ) {
|
|
43595 |
+ /* IO send-query branch */
|
|
43596 |
+ switch (Op) {
|
|
43597 |
+ case OpStart:
|
|
43598 |
+ /* LocalKey was set by branch 1 */
|
|
43599 |
+ break;
|
|
43600 |
+ case OpEnd:
|
|
43601 |
+ /* finished sending the HTTP query */
|
|
43602 |
+ if (S) {
|
|
43603 |
+ msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("Query sent, waiting for reply..."));
|
|
43604 |
+ BW_MSG(S->web, 1, msg_enc);
|
|
43605 |
+ g_free(msg_enc);
|
|
43606 |
+ a_Chain_del_link(Info, BCK);
|
|
43607 |
+ a_Chain_fcb(OpEnd, Info, NULL, NULL);
|
|
43608 |
+ }
|
|
43609 |
+ break;
|
|
43610 |
+ case OpAbort:
|
|
43611 |
+ /* something bad happened... */
|
|
43612 |
+ /* unlink IO_Info */
|
|
43613 |
+ if (S) {
|
|
43614 |
+ a_Chain_del_link(Info, BCK);
|
|
43615 |
+ a_Chain_fcb(OpAbort, Info, NULL, NULL);
|
|
43616 |
+ Https_SSL_free(SKey);
|
|
43617 |
+ }
|
|
43618 |
+ break;
|
|
43619 |
+ }
|
|
43620 |
+
|
|
43621 |
+ } else if ( Branch == -1 ) {
|
|
43622 |
+ /* Backwards abort */
|
|
43623 |
+ switch (Op) {
|
|
43624 |
+ case OpAbort:
|
|
43625 |
+ /* something bad happened... */
|
|
43626 |
+ DEBUG_MSG(2, "Http: OpAbort [-1]\n");
|
|
43627 |
+ Https_SSL_free(SKey);
|
|
43628 |
+ a_Chain_bcb(OpAbort, Info, NULL, NULL);
|
|
43629 |
+ g_free(Info);
|
|
43630 |
+ break;
|
|
43631 |
+ }
|
|
43632 |
+ }
|
|
43633 |
+}
|
|
43634 |
+
|
|
43635 |
+
|
|
43636 |
+
|
|
43637 |
+/*
|
|
43638 |
+ * Deallocate memory used by http module
|
|
43639 |
+ * (Call this one at exit time)
|
|
43640 |
+ */
|
|
43641 |
+void a_Https_freeall(void)
|
|
43642 |
+{
|
|
43643 |
+ if (ssl_ctx) SSL_CTX_free(ssl_ctx);
|
|
43644 |
+ a_Klist_free(&ValidSSLs);
|
|
43645 |
+}
|
|
43646 |
+
|
|
43647 |
+#endif
|
|
43648 |
+
|
|
43649 |
diff -pruN dillo-0.8.6/src/IO/mime.c dillo-0.8.6-i18n-misc-20070916/src/IO/mime.c
|
|
43650 |
--- dillo-0.8.6/src/IO/mime.c 2006-03-30 03:30:01.000000000 +0900
|
|
43651 |
+++ dillo-0.8.6-i18n-misc-20070916/src/IO/mime.c 2006-05-16 01:21:09.000000000 +0900
|
|
43652 |
@@ -9,6 +9,8 @@
|
|
43653 |
* (at your option) any later version.
|
|
43654 |
*/
|
|
43655 |
|
|
43656 |
+#include <config.h>
|
|
43657 |
+#include "../intl.h"
|
|
43658 |
#include "mime.h"
|
|
43659 |
#include "../msg.h"
|
|
43660 |
#include "../list.h"
|
|
43661 |
diff -pruN dillo-0.8.6/src/Makefile.am dillo-0.8.6-i18n-misc-20070916/src/Makefile.am
|
|
43662 |
--- dillo-0.8.6/src/Makefile.am 2005-05-08 05:19:59.000000000 +0900
|
|
43663 |
+++ dillo-0.8.6-i18n-misc-20070916/src/Makefile.am 2006-05-16 01:21:08.000000000 +0900
|
|
43664 |
@@ -1,4 +1,4 @@
|
|
43665 |
-AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@
|
|
43666 |
+AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@ -DLOCALEDIR='"$(localedir)"' -D__NO_STRING_INLINES
|
|
43667 |
AM_CFLAGS = @GTK_CFLAGS@ @LIBPNG_CFLAGS@
|
|
43668 |
|
|
43669 |
SUBDIRS = IO
|
|
43670 |
@@ -11,17 +11,38 @@ dillo_LDFLAGS = @LIBJPEG_LDFLAGS@ @LIBPT
|
|
43671 |
dillo_SOURCES = \
|
|
43672 |
msg.h \
|
|
43673 |
acconfig.h \
|
|
43674 |
- chain.h \
|
|
43675 |
- chain.c \
|
|
43676 |
- commands.c \
|
|
43677 |
- commands.h \
|
|
43678 |
+ adblock.c \
|
|
43679 |
+ adblock.h \
|
|
43680 |
+ auth.c \
|
|
43681 |
+ auth.h \
|
|
43682 |
+ bitvec.c \
|
|
43683 |
+ bitvec.h \
|
|
43684 |
+ bookmark.c \
|
|
43685 |
+ bookmark.h \
|
|
43686 |
+ browser.h \
|
|
43687 |
cache.c \
|
|
43688 |
cache.h \
|
|
43689 |
capi.c \
|
|
43690 |
capi.h \
|
|
43691 |
+ chain.c \
|
|
43692 |
+ chain.h \
|
|
43693 |
+ colors.c \
|
|
43694 |
+ colors.h \
|
|
43695 |
+ commands.c \
|
|
43696 |
+ commands.h \
|
|
43697 |
+ cookies.c \
|
|
43698 |
+ cookies.h \
|
|
43699 |
debug.h \
|
|
43700 |
- dw.h \
|
|
43701 |
+ dicache.c \
|
|
43702 |
+ dicache.h \
|
|
43703 |
+ dillo.c \
|
|
43704 |
+ dillo.h \
|
|
43705 |
+ dns.c \
|
|
43706 |
+ dns.h \
|
|
43707 |
+ doc.c \
|
|
43708 |
+ doc.h \
|
|
43709 |
dw.c \
|
|
43710 |
+ dw.h \
|
|
43711 |
dw_aligned_page.c \
|
|
43712 |
dw_aligned_page.h \
|
|
43713 |
dw_bullet.c \
|
|
43714 |
@@ -32,8 +53,8 @@ dillo_SOURCES = \
|
|
43715 |
dw_container.h \
|
|
43716 |
dw_embed_gtk.c \
|
|
43717 |
dw_embed_gtk.h \
|
|
43718 |
- dw_ext_iterator.h \
|
|
43719 |
dw_ext_iterator.c \
|
|
43720 |
+ dw_ext_iterator.h \
|
|
43721 |
dw_gtk_scrolled_frame.c \
|
|
43722 |
dw_gtk_scrolled_frame.h \
|
|
43723 |
dw_gtk_scrolled_window.c \
|
|
43724 |
@@ -70,15 +91,6 @@ dillo_SOURCES = \
|
|
43725 |
web.h \
|
|
43726 |
progressbar.c \
|
|
43727 |
progressbar.h \
|
|
43728 |
- dillo.c \
|
|
43729 |
- dillo.h \
|
|
43730 |
- bookmark.c \
|
|
43731 |
- bookmark.h \
|
|
43732 |
- browser.h \
|
|
43733 |
- dicache.c \
|
|
43734 |
- dicache.h \
|
|
43735 |
- dns.c \
|
|
43736 |
- dns.h \
|
|
43737 |
gtk_ext_button.c \
|
|
43738 |
gtk_ext_button.h \
|
|
43739 |
gtk_ext_menu.c \
|
|
43740 |
@@ -107,22 +119,25 @@ dillo_SOURCES = \
|
|
43741 |
menu.h \
|
|
43742 |
prefs.c \
|
|
43743 |
prefs.h \
|
|
43744 |
- colors.c \
|
|
43745 |
- colors.h \
|
|
43746 |
- bitvec.c \
|
|
43747 |
- bitvec.h \
|
|
43748 |
klist.c \
|
|
43749 |
klist.h \
|
|
43750 |
strbuf.c \
|
|
43751 |
strbuf.h \
|
|
43752 |
url.c \
|
|
43753 |
url.h \
|
|
43754 |
- cookies.c \
|
|
43755 |
- cookies.h \
|
|
43756 |
list.h \
|
|
43757 |
binaryconst.h \
|
|
43758 |
pixmaps.h \
|
|
43759 |
dpiapi.c \
|
|
43760 |
- dpiapi.h
|
|
43761 |
+ dpiapi.h \
|
|
43762 |
+ i18n.c \
|
|
43763 |
+ i18n.h \
|
|
43764 |
+ i18n_gtk.c \
|
|
43765 |
+ i18n_gtk.h \
|
|
43766 |
+ gtkframeset.c \
|
|
43767 |
+ gtkframeset.h \
|
|
43768 |
+ intl.h \
|
|
43769 |
+ tab.c \
|
|
43770 |
+ tab.h
|
|
43771 |
|
|
43772 |
EXTRA_DIST = chg srch
|
|
43773 |
diff -pruN dillo-0.8.6/src/Makefile.in dillo-0.8.6-i18n-misc-20070916/src/Makefile.in
|
|
43774 |
--- dillo-0.8.6/src/Makefile.in 2006-04-27 01:07:25.000000000 +0900
|
|
43775 |
+++ dillo-0.8.6-i18n-misc-20070916/src/Makefile.in 2007-09-07 01:03:37.000000000 +0900
|
|
43776 |
@@ -1,8 +1,8 @@
|
|
43777 |
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
|
43778 |
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
|
43779 |
# @configure_input@
|
|
43780 |
|
|
43781 |
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
43782 |
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
43783 |
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
|
43784 |
+# Free Software Foundation, Inc.
|
|
43785 |
# This Makefile.in is free software; the Free Software Foundation
|
|
43786 |
# gives unlimited permission to copy and/or distribute it,
|
|
43787 |
# with or without modifications, as long as this notice is preserved.
|
|
43788 |
@@ -14,8 +14,6 @@
|
|
43789 |
|
|
43790 |
@SET_MAKE@
|
|
43791 |
|
|
43792 |
-SOURCES = $(dillo_SOURCES)
|
|
43793 |
-
|
|
43794 |
srcdir = @srcdir@
|
|
43795 |
top_srcdir = @top_srcdir@
|
|
43796 |
VPATH = @srcdir@
|
|
43797 |
@@ -23,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
|
43798 |
pkglibdir = $(libdir)/@PACKAGE@
|
|
43799 |
pkgincludedir = $(includedir)/@PACKAGE@
|
|
43800 |
top_builddir = ..
|
|
43801 |
+
|
|
43802 |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
|
43803 |
INSTALL = @INSTALL@
|
|
43804 |
install_sh_DATA = $(install_sh) -c -m 644
|
|
43805 |
@@ -39,61 +38,6 @@ POST_UNINSTALL = :
|
|
43806 |
build_triplet = @build@
|
|
43807 |
host_triplet = @host@
|
|
43808 |
target_triplet = @target@
|
|
43809 |
-bin_PROGRAMS = dillo$(EXEEXT)
|
|
43810 |
-subdir = src
|
|
43811 |
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
|
43812 |
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
43813 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
|
43814 |
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
43815 |
- $(ACLOCAL_M4)
|
|
43816 |
-mkinstalldirs = $(install_sh) -d
|
|
43817 |
-CONFIG_HEADER = $(top_builddir)/config.h
|
|
43818 |
-CONFIG_CLEAN_FILES =
|
|
43819 |
-am__installdirs = "$(DESTDIR)$(bindir)"
|
|
43820 |
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
43821 |
-PROGRAMS = $(bin_PROGRAMS)
|
|
43822 |
-am_dillo_OBJECTS = chain.$(OBJEXT) commands.$(OBJEXT) cache.$(OBJEXT) \
|
|
43823 |
- capi.$(OBJEXT) dw.$(OBJEXT) dw_aligned_page.$(OBJEXT) \
|
|
43824 |
- dw_bullet.$(OBJEXT) dw_button.$(OBJEXT) dw_container.$(OBJEXT) \
|
|
43825 |
- dw_embed_gtk.$(OBJEXT) dw_ext_iterator.$(OBJEXT) \
|
|
43826 |
- dw_gtk_scrolled_frame.$(OBJEXT) \
|
|
43827 |
- dw_gtk_scrolled_window.$(OBJEXT) dw_gtk_statuslabel.$(OBJEXT) \
|
|
43828 |
- dw_gtk_viewport.$(OBJEXT) dw_hruler.$(OBJEXT) \
|
|
43829 |
- dw_image.$(OBJEXT) dw_list_item.$(OBJEXT) dw_marshal.$(OBJEXT) \
|
|
43830 |
- dw_page.$(OBJEXT) dw_style.$(OBJEXT) dw_table.$(OBJEXT) \
|
|
43831 |
- dw_table_cell.$(OBJEXT) dw_tooltip.$(OBJEXT) \
|
|
43832 |
- dw_widget.$(OBJEXT) findtext.$(OBJEXT) selection.$(OBJEXT) \
|
|
43833 |
- web.$(OBJEXT) progressbar.$(OBJEXT) dillo.$(OBJEXT) \
|
|
43834 |
- bookmark.$(OBJEXT) dicache.$(OBJEXT) dns.$(OBJEXT) \
|
|
43835 |
- gtk_ext_button.$(OBJEXT) gtk_ext_menu.$(OBJEXT) \
|
|
43836 |
- gtk_ext_menu_item.$(OBJEXT) gtk_menu_title.$(OBJEXT) \
|
|
43837 |
- gif.$(OBJEXT) jpeg.$(OBJEXT) png.$(OBJEXT) html.$(OBJEXT) \
|
|
43838 |
- image.$(OBJEXT) misc.$(OBJEXT) interface.$(OBJEXT) \
|
|
43839 |
- history.$(OBJEXT) nav.$(OBJEXT) plain.$(OBJEXT) menu.$(OBJEXT) \
|
|
43840 |
- prefs.$(OBJEXT) colors.$(OBJEXT) bitvec.$(OBJEXT) \
|
|
43841 |
- klist.$(OBJEXT) strbuf.$(OBJEXT) url.$(OBJEXT) \
|
|
43842 |
- cookies.$(OBJEXT) dpiapi.$(OBJEXT)
|
|
43843 |
-dillo_OBJECTS = $(am_dillo_OBJECTS)
|
|
43844 |
-dillo_DEPENDENCIES = ../dpip/libDpip.a IO/libDio.a
|
|
43845 |
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
43846 |
-depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
43847 |
-am__depfiles_maybe = depfiles
|
|
43848 |
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
43849 |
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
43850 |
-CCLD = $(CC)
|
|
43851 |
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
43852 |
-SOURCES = $(dillo_SOURCES)
|
|
43853 |
-DIST_SOURCES = $(dillo_SOURCES)
|
|
43854 |
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
43855 |
- html-recursive info-recursive install-data-recursive \
|
|
43856 |
- install-exec-recursive install-info-recursive \
|
|
43857 |
- install-recursive installcheck-recursive installdirs-recursive \
|
|
43858 |
- pdf-recursive ps-recursive uninstall-info-recursive \
|
|
43859 |
- uninstall-recursive
|
|
43860 |
-ETAGS = etags
|
|
43861 |
-CTAGS = ctags
|
|
43862 |
-DIST_SUBDIRS = $(SUBDIRS)
|
|
43863 |
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
43864 |
ACLOCAL = @ACLOCAL@
|
|
43865 |
AMDEP_FALSE = @AMDEP_FALSE@
|
|
43866 |
AMDEP_TRUE = @AMDEP_TRUE@
|
|
43867 |
@@ -123,6 +67,8 @@ EXEEXT = @EXEEXT@
|
|
43868 |
GLIB_CFLAGS = @GLIB_CFLAGS@
|
|
43869 |
GLIB_CONFIG = @GLIB_CONFIG@
|
|
43870 |
GLIB_LIBS = @GLIB_LIBS@
|
|
43871 |
+GMSGFMT = @GMSGFMT@
|
|
43872 |
+GREP = @GREP@
|
|
43873 |
GTK_CFLAGS = @GTK_CFLAGS@
|
|
43874 |
GTK_CONFIG = @GTK_CONFIG@
|
|
43875 |
GTK_LIBS = @GTK_LIBS@
|
|
43876 |
@@ -130,9 +76,12 @@ INSTALL_DATA = @INSTALL_DATA@
|
|
43877 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
43878 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
43879 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
|
43880 |
+INTLLIBS = @INTLLIBS@
|
|
43881 |
LDFLAGS = @LDFLAGS@
|
|
43882 |
LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
|
|
43883 |
LIBFLTK_LIBS = @LIBFLTK_LIBS@
|
|
43884 |
+LIBICONV = @LIBICONV@
|
|
43885 |
+LIBINTL = @LIBINTL@
|
|
43886 |
LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
|
|
43887 |
LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
|
|
43888 |
LIBJPEG_LIBS = @LIBJPEG_LIBS@
|
|
43889 |
@@ -144,8 +93,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
|
|
43890 |
LIBS = @LIBS@
|
|
43891 |
LIBSSL_LIBS = @LIBSSL_LIBS@
|
|
43892 |
LIBZ_LIBS = @LIBZ_LIBS@
|
|
43893 |
+LTLIBICONV = @LTLIBICONV@
|
|
43894 |
+LTLIBINTL = @LTLIBINTL@
|
|
43895 |
LTLIBOBJS = @LTLIBOBJS@
|
|
43896 |
MAKEINFO = @MAKEINFO@
|
|
43897 |
+MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
43898 |
+MSGFMT = @MSGFMT@
|
|
43899 |
+MSGMERGE = @MSGMERGE@
|
|
43900 |
OBJEXT = @OBJEXT@
|
|
43901 |
PACKAGE = @PACKAGE@
|
|
43902 |
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
|
43903 |
@@ -154,15 +108,18 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|
43904 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
43905 |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
43906 |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
|
43907 |
+PKG_CONFIG = @PKG_CONFIG@
|
|
43908 |
+POSUB = @POSUB@
|
|
43909 |
RANLIB = @RANLIB@
|
|
43910 |
SET_MAKE = @SET_MAKE@
|
|
43911 |
SHELL = @SHELL@
|
|
43912 |
STRIP = @STRIP@
|
|
43913 |
+USE_NLS = @USE_NLS@
|
|
43914 |
VERSION = @VERSION@
|
|
43915 |
+XFT_CONFIG = @XFT_CONFIG@
|
|
43916 |
+XGETTEXT = @XGETTEXT@
|
|
43917 |
ac_ct_CC = @ac_ct_CC@
|
|
43918 |
ac_ct_CXX = @ac_ct_CXX@
|
|
43919 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
43920 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
43921 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
43922 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
43923 |
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
|
43924 |
@@ -170,8 +127,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
|
|
43925 |
am__include = @am__include@
|
|
43926 |
am__leading_dot = @am__leading_dot@
|
|
43927 |
am__quote = @am__quote@
|
|
43928 |
-am__tar = @am__tar@
|
|
43929 |
-am__untar = @am__untar@
|
|
43930 |
bindir = @bindir@
|
|
43931 |
build = @build@
|
|
43932 |
build_alias = @build_alias@
|
|
43933 |
@@ -179,23 +134,29 @@ build_cpu = @build_cpu@
|
|
43934 |
build_os = @build_os@
|
|
43935 |
build_vendor = @build_vendor@
|
|
43936 |
datadir = @datadir@
|
|
43937 |
+datarootdir = @datarootdir@
|
|
43938 |
+docdir = @docdir@
|
|
43939 |
+dvidir = @dvidir@
|
|
43940 |
exec_prefix = @exec_prefix@
|
|
43941 |
host = @host@
|
|
43942 |
host_alias = @host_alias@
|
|
43943 |
host_cpu = @host_cpu@
|
|
43944 |
host_os = @host_os@
|
|
43945 |
host_vendor = @host_vendor@
|
|
43946 |
+htmldir = @htmldir@
|
|
43947 |
includedir = @includedir@
|
|
43948 |
infodir = @infodir@
|
|
43949 |
install_sh = @install_sh@
|
|
43950 |
libdir = @libdir@
|
|
43951 |
libexecdir = @libexecdir@
|
|
43952 |
+localedir = @localedir@
|
|
43953 |
localstatedir = @localstatedir@
|
|
43954 |
mandir = @mandir@
|
|
43955 |
-mkdir_p = @mkdir_p@
|
|
43956 |
oldincludedir = @oldincludedir@
|
|
43957 |
+pdfdir = @pdfdir@
|
|
43958 |
prefix = @prefix@
|
|
43959 |
program_transform_name = @program_transform_name@
|
|
43960 |
+psdir = @psdir@
|
|
43961 |
sbindir = @sbindir@
|
|
43962 |
sharedstatedir = @sharedstatedir@
|
|
43963 |
sysconfdir = @sysconfdir@
|
|
43964 |
@@ -204,25 +165,51 @@ target_alias = @target_alias@
|
|
43965 |
target_cpu = @target_cpu@
|
|
43966 |
target_os = @target_os@
|
|
43967 |
target_vendor = @target_vendor@
|
|
43968 |
-AM_CPPFLAGS = -DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@
|
|
43969 |
+AM_CPPFLAGS = -DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@ -DLOCALEDIR='"$(localedir)"' -D__NO_STRING_INLINES
|
|
43970 |
AM_CFLAGS = @GTK_CFLAGS@ @LIBPNG_CFLAGS@
|
|
43971 |
+
|
|
43972 |
SUBDIRS = IO
|
|
43973 |
+
|
|
43974 |
+bin_PROGRAMS = dillo
|
|
43975 |
+
|
|
43976 |
dillo_LDADD = ../dpip/libDpip.a IO/libDio.a @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @GTK_LIBS@ @LIBZ_LIBS@ @LIBPTHREAD_LIBS@
|
|
43977 |
dillo_LDFLAGS = @LIBJPEG_LDFLAGS@ @LIBPTHREAD_LDFLAGS@
|
|
43978 |
+
|
|
43979 |
dillo_SOURCES = \
|
|
43980 |
msg.h \
|
|
43981 |
acconfig.h \
|
|
43982 |
- chain.h \
|
|
43983 |
- chain.c \
|
|
43984 |
- commands.c \
|
|
43985 |
- commands.h \
|
|
43986 |
+ adblock.c \
|
|
43987 |
+ adblock.h \
|
|
43988 |
+ auth.c \
|
|
43989 |
+ auth.h \
|
|
43990 |
+ bitvec.c \
|
|
43991 |
+ bitvec.h \
|
|
43992 |
+ bookmark.c \
|
|
43993 |
+ bookmark.h \
|
|
43994 |
+ browser.h \
|
|
43995 |
cache.c \
|
|
43996 |
cache.h \
|
|
43997 |
capi.c \
|
|
43998 |
capi.h \
|
|
43999 |
+ chain.c \
|
|
44000 |
+ chain.h \
|
|
44001 |
+ colors.c \
|
|
44002 |
+ colors.h \
|
|
44003 |
+ commands.c \
|
|
44004 |
+ commands.h \
|
|
44005 |
+ cookies.c \
|
|
44006 |
+ cookies.h \
|
|
44007 |
debug.h \
|
|
44008 |
- dw.h \
|
|
44009 |
+ dicache.c \
|
|
44010 |
+ dicache.h \
|
|
44011 |
+ dillo.c \
|
|
44012 |
+ dillo.h \
|
|
44013 |
+ dns.c \
|
|
44014 |
+ dns.h \
|
|
44015 |
+ doc.c \
|
|
44016 |
+ doc.h \
|
|
44017 |
dw.c \
|
|
44018 |
+ dw.h \
|
|
44019 |
dw_aligned_page.c \
|
|
44020 |
dw_aligned_page.h \
|
|
44021 |
dw_bullet.c \
|
|
44022 |
@@ -233,8 +220,8 @@ dillo_SOURCES = \
|
|
44023 |
dw_container.h \
|
|
44024 |
dw_embed_gtk.c \
|
|
44025 |
dw_embed_gtk.h \
|
|
44026 |
- dw_ext_iterator.h \
|
|
44027 |
dw_ext_iterator.c \
|
|
44028 |
+ dw_ext_iterator.h \
|
|
44029 |
dw_gtk_scrolled_frame.c \
|
|
44030 |
dw_gtk_scrolled_frame.h \
|
|
44031 |
dw_gtk_scrolled_window.c \
|
|
44032 |
@@ -271,15 +258,6 @@ dillo_SOURCES = \
|
|
44033 |
web.h \
|
|
44034 |
progressbar.c \
|
|
44035 |
progressbar.h \
|
|
44036 |
- dillo.c \
|
|
44037 |
- dillo.h \
|
|
44038 |
- bookmark.c \
|
|
44039 |
- bookmark.h \
|
|
44040 |
- browser.h \
|
|
44041 |
- dicache.c \
|
|
44042 |
- dicache.h \
|
|
44043 |
- dns.c \
|
|
44044 |
- dns.h \
|
|
44045 |
gtk_ext_button.c \
|
|
44046 |
gtk_ext_button.h \
|
|
44047 |
gtk_ext_menu.c \
|
|
44048 |
@@ -308,68 +286,140 @@ dillo_SOURCES = \
|
|
44049 |
menu.h \
|
|
44050 |
prefs.c \
|
|
44051 |
prefs.h \
|
|
44052 |
- colors.c \
|
|
44053 |
- colors.h \
|
|
44054 |
- bitvec.c \
|
|
44055 |
- bitvec.h \
|
|
44056 |
klist.c \
|
|
44057 |
klist.h \
|
|
44058 |
strbuf.c \
|
|
44059 |
strbuf.h \
|
|
44060 |
url.c \
|
|
44061 |
url.h \
|
|
44062 |
- cookies.c \
|
|
44063 |
- cookies.h \
|
|
44064 |
list.h \
|
|
44065 |
binaryconst.h \
|
|
44066 |
pixmaps.h \
|
|
44067 |
dpiapi.c \
|
|
44068 |
- dpiapi.h
|
|
44069 |
+ dpiapi.h \
|
|
44070 |
+ i18n.c \
|
|
44071 |
+ i18n.h \
|
|
44072 |
+ i18n_gtk.c \
|
|
44073 |
+ i18n_gtk.h \
|
|
44074 |
+ gtkframeset.c \
|
|
44075 |
+ gtkframeset.h \
|
|
44076 |
+ intl.h \
|
|
44077 |
+ tab.c \
|
|
44078 |
+ tab.h
|
|
44079 |
+
|
|
44080 |
|
|
44081 |
EXTRA_DIST = chg srch
|
|
44082 |
+subdir = src
|
|
44083 |
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
44084 |
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
44085 |
+CONFIG_HEADER = $(top_builddir)/config.h
|
|
44086 |
+CONFIG_CLEAN_FILES =
|
|
44087 |
+bin_PROGRAMS = dillo$(EXEEXT)
|
|
44088 |
+PROGRAMS = $(bin_PROGRAMS)
|
|
44089 |
+
|
|
44090 |
+am_dillo_OBJECTS = adblock.$(OBJEXT) auth.$(OBJEXT) bitvec.$(OBJEXT) \
|
|
44091 |
+ bookmark.$(OBJEXT) cache.$(OBJEXT) capi.$(OBJEXT) \
|
|
44092 |
+ chain.$(OBJEXT) colors.$(OBJEXT) commands.$(OBJEXT) \
|
|
44093 |
+ cookies.$(OBJEXT) dicache.$(OBJEXT) dillo.$(OBJEXT) \
|
|
44094 |
+ dns.$(OBJEXT) doc.$(OBJEXT) dw.$(OBJEXT) \
|
|
44095 |
+ dw_aligned_page.$(OBJEXT) dw_bullet.$(OBJEXT) \
|
|
44096 |
+ dw_button.$(OBJEXT) dw_container.$(OBJEXT) \
|
|
44097 |
+ dw_embed_gtk.$(OBJEXT) dw_ext_iterator.$(OBJEXT) \
|
|
44098 |
+ dw_gtk_scrolled_frame.$(OBJEXT) \
|
|
44099 |
+ dw_gtk_scrolled_window.$(OBJEXT) dw_gtk_statuslabel.$(OBJEXT) \
|
|
44100 |
+ dw_gtk_viewport.$(OBJEXT) dw_hruler.$(OBJEXT) \
|
|
44101 |
+ dw_image.$(OBJEXT) dw_list_item.$(OBJEXT) dw_marshal.$(OBJEXT) \
|
|
44102 |
+ dw_page.$(OBJEXT) dw_style.$(OBJEXT) dw_table.$(OBJEXT) \
|
|
44103 |
+ dw_table_cell.$(OBJEXT) dw_tooltip.$(OBJEXT) \
|
|
44104 |
+ dw_widget.$(OBJEXT) findtext.$(OBJEXT) selection.$(OBJEXT) \
|
|
44105 |
+ web.$(OBJEXT) progressbar.$(OBJEXT) gtk_ext_button.$(OBJEXT) \
|
|
44106 |
+ gtk_ext_menu.$(OBJEXT) gtk_ext_menu_item.$(OBJEXT) \
|
|
44107 |
+ gtk_menu_title.$(OBJEXT) gif.$(OBJEXT) jpeg.$(OBJEXT) \
|
|
44108 |
+ png.$(OBJEXT) html.$(OBJEXT) image.$(OBJEXT) misc.$(OBJEXT) \
|
|
44109 |
+ interface.$(OBJEXT) history.$(OBJEXT) nav.$(OBJEXT) \
|
|
44110 |
+ plain.$(OBJEXT) menu.$(OBJEXT) prefs.$(OBJEXT) klist.$(OBJEXT) \
|
|
44111 |
+ strbuf.$(OBJEXT) url.$(OBJEXT) dpiapi.$(OBJEXT) i18n.$(OBJEXT) \
|
|
44112 |
+ i18n_gtk.$(OBJEXT) gtkframeset.$(OBJEXT) tab.$(OBJEXT)
|
|
44113 |
+dillo_OBJECTS = $(am_dillo_OBJECTS)
|
|
44114 |
+dillo_DEPENDENCIES = ../dpip/libDpip.a IO/libDio.a
|
|
44115 |
+
|
|
44116 |
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
44117 |
+depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
44118 |
+am__depfiles_maybe = depfiles
|
|
44119 |
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/adblock.Po ./$(DEPDIR)/auth.Po \
|
|
44120 |
+@AMDEP_TRUE@ ./$(DEPDIR)/bitvec.Po ./$(DEPDIR)/bookmark.Po \
|
|
44121 |
+@AMDEP_TRUE@ ./$(DEPDIR)/cache.Po ./$(DEPDIR)/capi.Po \
|
|
44122 |
+@AMDEP_TRUE@ ./$(DEPDIR)/chain.Po ./$(DEPDIR)/colors.Po \
|
|
44123 |
+@AMDEP_TRUE@ ./$(DEPDIR)/commands.Po ./$(DEPDIR)/cookies.Po \
|
|
44124 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dicache.Po ./$(DEPDIR)/dillo.Po \
|
|
44125 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dns.Po ./$(DEPDIR)/doc.Po \
|
|
44126 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dpiapi.Po ./$(DEPDIR)/dw.Po \
|
|
44127 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_aligned_page.Po \
|
|
44128 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_bullet.Po ./$(DEPDIR)/dw_button.Po \
|
|
44129 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_container.Po \
|
|
44130 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_embed_gtk.Po \
|
|
44131 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_ext_iterator.Po \
|
|
44132 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_scrolled_frame.Po \
|
|
44133 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_scrolled_window.Po \
|
|
44134 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_statuslabel.Po \
|
|
44135 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_viewport.Po \
|
|
44136 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_hruler.Po ./$(DEPDIR)/dw_image.Po \
|
|
44137 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_list_item.Po \
|
|
44138 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_marshal.Po ./$(DEPDIR)/dw_page.Po \
|
|
44139 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_style.Po ./$(DEPDIR)/dw_table.Po \
|
|
44140 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_table_cell.Po \
|
|
44141 |
+@AMDEP_TRUE@ ./$(DEPDIR)/dw_tooltip.Po ./$(DEPDIR)/dw_widget.Po \
|
|
44142 |
+@AMDEP_TRUE@ ./$(DEPDIR)/findtext.Po ./$(DEPDIR)/gif.Po \
|
|
44143 |
+@AMDEP_TRUE@ ./$(DEPDIR)/gtk_ext_button.Po \
|
|
44144 |
+@AMDEP_TRUE@ ./$(DEPDIR)/gtk_ext_menu.Po \
|
|
44145 |
+@AMDEP_TRUE@ ./$(DEPDIR)/gtk_ext_menu_item.Po \
|
|
44146 |
+@AMDEP_TRUE@ ./$(DEPDIR)/gtk_menu_title.Po \
|
|
44147 |
+@AMDEP_TRUE@ ./$(DEPDIR)/gtkframeset.Po ./$(DEPDIR)/history.Po \
|
|
44148 |
+@AMDEP_TRUE@ ./$(DEPDIR)/html.Po ./$(DEPDIR)/i18n.Po \
|
|
44149 |
+@AMDEP_TRUE@ ./$(DEPDIR)/i18n_gtk.Po ./$(DEPDIR)/image.Po \
|
|
44150 |
+@AMDEP_TRUE@ ./$(DEPDIR)/interface.Po ./$(DEPDIR)/jpeg.Po \
|
|
44151 |
+@AMDEP_TRUE@ ./$(DEPDIR)/klist.Po ./$(DEPDIR)/menu.Po \
|
|
44152 |
+@AMDEP_TRUE@ ./$(DEPDIR)/misc.Po ./$(DEPDIR)/nav.Po \
|
|
44153 |
+@AMDEP_TRUE@ ./$(DEPDIR)/plain.Po ./$(DEPDIR)/png.Po \
|
|
44154 |
+@AMDEP_TRUE@ ./$(DEPDIR)/prefs.Po ./$(DEPDIR)/progressbar.Po \
|
|
44155 |
+@AMDEP_TRUE@ ./$(DEPDIR)/selection.Po ./$(DEPDIR)/strbuf.Po \
|
|
44156 |
+@AMDEP_TRUE@ ./$(DEPDIR)/tab.Po ./$(DEPDIR)/url.Po \
|
|
44157 |
+@AMDEP_TRUE@ ./$(DEPDIR)/web.Po
|
|
44158 |
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
44159 |
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
44160 |
+CCLD = $(CC)
|
|
44161 |
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
44162 |
+DIST_SOURCES = $(dillo_SOURCES)
|
|
44163 |
+
|
|
44164 |
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
|
|
44165 |
+ ps-recursive install-info-recursive uninstall-info-recursive \
|
|
44166 |
+ all-recursive install-data-recursive install-exec-recursive \
|
|
44167 |
+ installdirs-recursive install-recursive uninstall-recursive \
|
|
44168 |
+ check-recursive installcheck-recursive
|
|
44169 |
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
|
|
44170 |
+DIST_SUBDIRS = $(SUBDIRS)
|
|
44171 |
+SOURCES = $(dillo_SOURCES)
|
|
44172 |
+
|
|
44173 |
all: all-recursive
|
|
44174 |
|
|
44175 |
.SUFFIXES:
|
|
44176 |
.SUFFIXES: .c .o .obj
|
|
44177 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|
44178 |
- @for dep in $?; do \
|
|
44179 |
- case '$(am__configure_deps)' in \
|
|
44180 |
- *$$dep*) \
|
|
44181 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
|
44182 |
- && exit 0; \
|
|
44183 |
- exit 1;; \
|
|
44184 |
- esac; \
|
|
44185 |
- done; \
|
|
44186 |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
|
44187 |
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
44188 |
cd $(top_srcdir) && \
|
|
44189 |
$(AUTOMAKE) --gnu src/Makefile
|
|
44190 |
-.PRECIOUS: Makefile
|
|
44191 |
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
44192 |
- @case '$?' in \
|
|
44193 |
- *config.status*) \
|
|
44194 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
|
44195 |
- *) \
|
|
44196 |
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
|
44197 |
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
|
44198 |
- esac;
|
|
44199 |
-
|
|
44200 |
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|
44201 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
44202 |
-
|
|
44203 |
-$(top_srcdir)/configure: $(am__configure_deps)
|
|
44204 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
44205 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
|
44206 |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
|
44207 |
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
44208 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
|
|
44209 |
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|
44210 |
install-binPROGRAMS: $(bin_PROGRAMS)
|
|
44211 |
@$(NORMAL_INSTALL)
|
|
44212 |
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
|
44213 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
44214 |
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
44215 |
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
|
44216 |
if test -f $$p \
|
|
44217 |
; then \
|
|
44218 |
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
44219 |
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
|
44220 |
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
|
|
44221 |
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
|
|
44222 |
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
|
|
44223 |
else :; fi; \
|
|
44224 |
done
|
|
44225 |
|
|
44226 |
@@ -377,8 +427,8 @@ uninstall-binPROGRAMS:
|
|
44227 |
@$(NORMAL_UNINSTALL)
|
|
44228 |
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
|
44229 |
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
|
|
44230 |
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
|
44231 |
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
|
44232 |
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
|
|
44233 |
+ rm -f $(DESTDIR)$(bindir)/$$f; \
|
|
44234 |
done
|
|
44235 |
|
|
44236 |
clean-binPROGRAMS:
|
|
44237 |
@@ -388,11 +438,13 @@ dillo$(EXEEXT): $(dillo_OBJECTS) $(dillo
|
|
44238 |
$(LINK) $(dillo_LDFLAGS) $(dillo_OBJECTS) $(dillo_LDADD) $(LIBS)
|
|
44239 |
|
|
44240 |
mostlyclean-compile:
|
|
44241 |
- -rm -f *.$(OBJEXT)
|
|
44242 |
+ -rm -f *.$(OBJEXT) core *.core
|
|
44243 |
|
|
44244 |
distclean-compile:
|
|
44245 |
-rm -f *.tab.c
|
|
44246 |
|
|
44247 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adblock.Po@am__quote@
|
|
44248 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@
|
|
44249 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitvec.Po@am__quote@
|
|
44250 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmark.Po@am__quote@
|
|
44251 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
|
|
44252 |
@@ -404,6 +456,7 @@ distclean-compile:
|
|
44253 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dicache.Po@am__quote@
|
|
44254 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillo.Po@am__quote@
|
|
44255 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
|
|
44256 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doc.Po@am__quote@
|
|
44257 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpiapi.Po@am__quote@
|
|
44258 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw.Po@am__quote@
|
|
44259 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_aligned_page.Po@am__quote@
|
|
44260 |
@@ -432,8 +485,11 @@ distclean-compile:
|
|
44261 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_ext_menu.Po@am__quote@
|
|
44262 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_ext_menu_item.Po@am__quote@
|
|
44263 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_menu_title.Po@am__quote@
|
|
44264 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkframeset.Po@am__quote@
|
|
44265 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Po@am__quote@
|
|
44266 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html.Po@am__quote@
|
|
44267 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i18n.Po@am__quote@
|
|
44268 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i18n_gtk.Po@am__quote@
|
|
44269 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@
|
|
44270 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
|
|
44271 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg.Po@am__quote@
|
|
44272 |
@@ -447,22 +503,31 @@ distclean-compile:
|
|
44273 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progressbar.Po@am__quote@
|
|
44274 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection.Po@am__quote@
|
|
44275 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strbuf.Po@am__quote@
|
|
44276 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tab.Po@am__quote@
|
|
44277 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
|
|
44278 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web.Po@am__quote@
|
|
44279 |
|
|
44280 |
.c.o:
|
|
44281 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
|
44282 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
44283 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
44284 |
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
|
|
44285 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
44286 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
44287 |
+@am__fastdepCC_TRUE@ fi
|
|
44288 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
44289 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
44290 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
|
44291 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
44292 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
44293 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
|
|
44294 |
|
|
44295 |
.c.obj:
|
|
44296 |
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
|
44297 |
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
|
44298 |
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
|
|
44299 |
+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
|
|
44300 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
|
|
44301 |
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
|
44302 |
+@am__fastdepCC_TRUE@ fi
|
|
44303 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
44304 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
44305 |
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
44306 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
|
44307 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
44308 |
+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
|
|
44309 |
uninstall-info-am:
|
|
44310 |
|
|
44311 |
# This directory's subdirectories are mostly independent; you can cd
|
|
44312 |
@@ -472,13 +537,7 @@ uninstall-info-am:
|
|
44313 |
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
44314 |
# (2) otherwise, pass the desired values on the `make' command line.
|
|
44315 |
$(RECURSIVE_TARGETS):
|
|
44316 |
- @failcom='exit 1'; \
|
|
44317 |
- for f in x $$MAKEFLAGS; do \
|
|
44318 |
- case $$f in \
|
|
44319 |
- *=* | --[!k]*);; \
|
|
44320 |
- *k*) failcom='fail=yes';; \
|
|
44321 |
- esac; \
|
|
44322 |
- done; \
|
|
44323 |
+ @set fnord $$MAKEFLAGS; amf=$$2; \
|
|
44324 |
dot_seen=no; \
|
|
44325 |
target=`echo $@ | sed s/-recursive//`; \
|
|
44326 |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
44327 |
@@ -490,7 +549,7 @@ $(RECURSIVE_TARGETS):
|
|
44328 |
local_target="$$target"; \
|
|
44329 |
fi; \
|
|
44330 |
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
44331 |
- || eval $$failcom; \
|
|
44332 |
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
|
44333 |
done; \
|
|
44334 |
if test "$$dot_seen" = "no"; then \
|
|
44335 |
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
|
44336 |
@@ -498,13 +557,7 @@ $(RECURSIVE_TARGETS):
|
|
44337 |
|
|
44338 |
mostlyclean-recursive clean-recursive distclean-recursive \
|
|
44339 |
maintainer-clean-recursive:
|
|
44340 |
- @failcom='exit 1'; \
|
|
44341 |
- for f in x $$MAKEFLAGS; do \
|
|
44342 |
- case $$f in \
|
|
44343 |
- *=* | --[!k]*);; \
|
|
44344 |
- *k*) failcom='fail=yes';; \
|
|
44345 |
- esac; \
|
|
44346 |
- done; \
|
|
44347 |
+ @set fnord $$MAKEFLAGS; amf=$$2; \
|
|
44348 |
dot_seen=no; \
|
|
44349 |
case "$@" in \
|
|
44350 |
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
|
44351 |
@@ -525,7 +578,7 @@ maintainer-clean-recursive:
|
|
44352 |
local_target="$$target"; \
|
|
44353 |
fi; \
|
|
44354 |
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
|
44355 |
- || eval $$failcom; \
|
|
44356 |
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|
|
44357 |
done && test -z "$$fail"
|
|
44358 |
tags-recursive:
|
|
44359 |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
44360 |
@@ -536,6 +589,14 @@ ctags-recursive:
|
|
44361 |
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
44362 |
done
|
|
44363 |
|
|
44364 |
+ETAGS = etags
|
|
44365 |
+ETAGSFLAGS =
|
|
44366 |
+
|
|
44367 |
+CTAGS = ctags
|
|
44368 |
+CTAGSFLAGS =
|
|
44369 |
+
|
|
44370 |
+tags: TAGS
|
|
44371 |
+
|
|
44372 |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
44373 |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
44374 |
unique=`for i in $$list; do \
|
|
44375 |
@@ -544,22 +605,19 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
|
|
44376 |
$(AWK) ' { files[$$0] = 1; } \
|
|
44377 |
END { for (i in files) print i; }'`; \
|
|
44378 |
mkid -fID $$unique
|
|
44379 |
-tags: TAGS
|
|
44380 |
|
|
44381 |
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
44382 |
$(TAGS_FILES) $(LISP)
|
|
44383 |
tags=; \
|
|
44384 |
here=`pwd`; \
|
|
44385 |
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
44386 |
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
|
|
44387 |
include_option=--etags-include; \
|
|
44388 |
- empty_fix=.; \
|
|
44389 |
else \
|
|
44390 |
include_option=--include; \
|
|
44391 |
- empty_fix=; \
|
|
44392 |
fi; \
|
|
44393 |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
44394 |
if test "$$subdir" = .; then :; else \
|
|
44395 |
- test ! -f $$subdir/TAGS || \
|
|
44396 |
+ test -f $$subdir/TAGS && \
|
|
44397 |
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
|
44398 |
fi; \
|
|
44399 |
done; \
|
|
44400 |
@@ -569,11 +627,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
|
|
44401 |
done | \
|
|
44402 |
$(AWK) ' { files[$$0] = 1; } \
|
|
44403 |
END { for (i in files) print i; }'`; \
|
|
44404 |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
|
44405 |
- test -n "$$unique" || unique=$$empty_fix; \
|
|
44406 |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
44407 |
- $$tags $$unique; \
|
|
44408 |
- fi
|
|
44409 |
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
|
44410 |
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
|
44411 |
+ $$tags $$unique
|
|
44412 |
+
|
|
44413 |
ctags: CTAGS
|
|
44414 |
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
44415 |
$(TAGS_FILES) $(LISP)
|
|
44416 |
@@ -596,6 +653,10 @@ GTAGS:
|
|
44417 |
|
|
44418 |
distclean-tags:
|
|
44419 |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
|
44420 |
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
44421 |
+
|
|
44422 |
+top_distdir = ..
|
|
44423 |
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
|
44424 |
|
|
44425 |
distdir: $(DISTFILES)
|
|
44426 |
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
|
44427 |
@@ -609,7 +670,7 @@ distdir: $(DISTFILES)
|
|
44428 |
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
|
44429 |
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
|
44430 |
dir="/$$dir"; \
|
|
44431 |
- $(mkdir_p) "$(distdir)$$dir"; \
|
|
44432 |
+ $(mkinstalldirs) "$(distdir)$$dir"; \
|
|
44433 |
else \
|
|
44434 |
dir=''; \
|
|
44435 |
fi; \
|
|
44436 |
@@ -624,17 +685,15 @@ distdir: $(DISTFILES)
|
|
44437 |
|| exit 1; \
|
|
44438 |
fi; \
|
|
44439 |
done
|
|
44440 |
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
|
44441 |
+ list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
44442 |
if test "$$subdir" = .; then :; else \
|
|
44443 |
- test -d "$(distdir)/$$subdir" \
|
|
44444 |
- || $(mkdir_p) "$(distdir)/$$subdir" \
|
|
44445 |
+ test -d $(distdir)/$$subdir \
|
|
44446 |
+ || mkdir $(distdir)/$$subdir \
|
|
44447 |
|| exit 1; \
|
|
44448 |
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
|
44449 |
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
|
44450 |
(cd $$subdir && \
|
|
44451 |
$(MAKE) $(AM_MAKEFLAGS) \
|
|
44452 |
- top_distdir="$$top_distdir" \
|
|
44453 |
- distdir="$$distdir/$$subdir" \
|
|
44454 |
+ top_distdir="$(top_distdir)" \
|
|
44455 |
+ distdir=../$(distdir)/$$subdir \
|
|
44456 |
distdir) \
|
|
44457 |
|| exit 1; \
|
|
44458 |
fi; \
|
|
44459 |
@@ -644,9 +703,8 @@ check: check-recursive
|
|
44460 |
all-am: Makefile $(PROGRAMS)
|
|
44461 |
installdirs: installdirs-recursive
|
|
44462 |
installdirs-am:
|
|
44463 |
- for dir in "$(DESTDIR)$(bindir)"; do \
|
|
44464 |
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
|
44465 |
- done
|
|
44466 |
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
44467 |
+
|
|
44468 |
install: install-recursive
|
|
44469 |
install-exec: install-exec-recursive
|
|
44470 |
install-data: install-data-recursive
|
|
44471 |
@@ -666,7 +724,7 @@ mostlyclean-generic:
|
|
44472 |
clean-generic:
|
|
44473 |
|
|
44474 |
distclean-generic:
|
|
44475 |
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
|
44476 |
+ -rm -f $(CONFIG_CLEAN_FILES)
|
|
44477 |
|
|
44478 |
maintainer-clean-generic:
|
|
44479 |
@echo "This command is intended for maintainers to use"
|
|
44480 |
@@ -685,8 +743,6 @@ dvi: dvi-recursive
|
|
44481 |
|
|
44482 |
dvi-am:
|
|
44483 |
|
|
44484 |
-html: html-recursive
|
|
44485 |
-
|
|
44486 |
info: info-recursive
|
|
44487 |
|
|
44488 |
info-am:
|
|
44489 |
@@ -722,19 +778,22 @@ uninstall-am: uninstall-binPROGRAMS unin
|
|
44490 |
|
|
44491 |
uninstall-info: uninstall-info-recursive
|
|
44492 |
|
|
44493 |
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
|
|
44494 |
- clean clean-binPROGRAMS clean-generic clean-recursive ctags \
|
|
44495 |
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
|
|
44496 |
+ clean-binPROGRAMS clean-generic clean-recursive ctags \
|
|
44497 |
ctags-recursive distclean distclean-compile distclean-generic \
|
|
44498 |
- distclean-recursive distclean-tags distdir dvi dvi-am html \
|
|
44499 |
- html-am info info-am install install-am install-binPROGRAMS \
|
|
44500 |
- install-data install-data-am install-exec install-exec-am \
|
|
44501 |
- install-info install-info-am install-man install-strip \
|
|
44502 |
- installcheck installcheck-am installdirs installdirs-am \
|
|
44503 |
- maintainer-clean maintainer-clean-generic \
|
|
44504 |
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
|
|
44505 |
- mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
|
|
44506 |
- tags tags-recursive uninstall uninstall-am \
|
|
44507 |
- uninstall-binPROGRAMS uninstall-info-am
|
|
44508 |
+ distclean-recursive distclean-tags distdir dvi dvi-am \
|
|
44509 |
+ dvi-recursive info info-am info-recursive install install-am \
|
|
44510 |
+ install-binPROGRAMS install-data install-data-am \
|
|
44511 |
+ install-data-recursive install-exec install-exec-am \
|
|
44512 |
+ install-exec-recursive install-info install-info-am \
|
|
44513 |
+ install-info-recursive install-man install-recursive \
|
|
44514 |
+ install-strip installcheck installcheck-am installdirs \
|
|
44515 |
+ installdirs-am installdirs-recursive maintainer-clean \
|
|
44516 |
+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
|
|
44517 |
+ mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
|
|
44518 |
+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
|
|
44519 |
+ tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
|
|
44520 |
+ uninstall-info-am uninstall-info-recursive uninstall-recursive
|
|
44521 |
|
|
44522 |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
44523 |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
44524 |
diff -pruN dillo-0.8.6/src/adblock.c dillo-0.8.6-i18n-misc-20070916/src/adblock.c
|
|
44525 |
--- dillo-0.8.6/src/adblock.c 1970-01-01 09:00:00.000000000 +0900
|
|
44526 |
+++ dillo-0.8.6-i18n-misc-20070916/src/adblock.c 2006-05-16 01:21:08.000000000 +0900
|
|
44527 |
@@ -0,0 +1,143 @@
|
|
44528 |
+/*
|
|
44529 |
+ * File: adblock.c
|
|
44530 |
+ *
|
|
44531 |
+ * Copyright 2005 Rudolf Polzer <atfield-dt@durchnull.de>
|
|
44532 |
+ *
|
|
44533 |
+ * This program is free software; you can redistribute it and/or modify
|
|
44534 |
+ * it under the terms of the GNU General Public License as published by
|
|
44535 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
44536 |
+ * (at your option) any later version.
|
|
44537 |
+ */
|
|
44538 |
+
|
|
44539 |
+/* Adblock implementation.
|
|
44540 |
+ * This implementation uses a simple file ~/.dillo/adblock.txt which contains a
|
|
44541 |
+ * list of wildcard expressions to be matched. To be compatible with Firefox,
|
|
44542 |
+ * lines starting with [ will be ignored.
|
|
44543 |
+ */
|
|
44544 |
+
|
|
44545 |
+#include <sys/types.h>
|
|
44546 |
+#include <sys/stat.h>
|
|
44547 |
+#include <sys/file.h>
|
|
44548 |
+#include <fcntl.h>
|
|
44549 |
+#include <stdlib.h>
|
|
44550 |
+#include <stdio.h>
|
|
44551 |
+#include <unistd.h>
|
|
44552 |
+#include <fnmatch.h>
|
|
44553 |
+
|
|
44554 |
+#include <glib.h>
|
|
44555 |
+
|
|
44556 |
+#include "debug.h"
|
|
44557 |
+#include "misc.h"
|
|
44558 |
+#include "url.h"
|
|
44559 |
+
|
|
44560 |
+#include "adblock.h"
|
|
44561 |
+
|
|
44562 |
+#define DEBUG_LEVEL 1
|
|
44563 |
+
|
|
44564 |
+#define LINE_MAXLEN 4096
|
|
44565 |
+static gboolean disabled;
|
|
44566 |
+static GPtrArray *blocked;
|
|
44567 |
+
|
|
44568 |
+static FILE *Adblock_fopen(const char *file, gchar *init_str);
|
|
44569 |
+
|
|
44570 |
+/*
|
|
44571 |
+ * Return a file pointer. If the file doesn't exist, try to create it,
|
|
44572 |
+ * with the optional 'init_str' as its content.
|
|
44573 |
+ */
|
|
44574 |
+static FILE *Adblock_fopen(const char *filename, gchar *init_str)
|
|
44575 |
+{
|
|
44576 |
+ FILE *F_in;
|
|
44577 |
+ int fd;
|
|
44578 |
+
|
|
44579 |
+ if ((F_in = fopen(filename, "r+")) == NULL) {
|
|
44580 |
+ /* Create the file */
|
|
44581 |
+ fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
|
|
44582 |
+ if (fd != -1) {
|
|
44583 |
+ if (init_str)
|
|
44584 |
+ write(fd, init_str, strlen(init_str));
|
|
44585 |
+ close(fd);
|
|
44586 |
+
|
|
44587 |
+ DEBUG_MSG(10, "Adblock: Created file: %s\n", filename);
|
|
44588 |
+ F_in = Adblock_fopen(filename, NULL);
|
|
44589 |
+ } else {
|
|
44590 |
+ DEBUG_MSG(10, "Adblock: Could not create file: %s!\n", filename);
|
|
44591 |
+ }
|
|
44592 |
+ }
|
|
44593 |
+
|
|
44594 |
+ /* set close on exec */
|
|
44595 |
+ fcntl(fileno(F_in), F_SETFD, FD_CLOEXEC | fcntl(fileno(F_in), F_GETFD));
|
|
44596 |
+
|
|
44597 |
+ return F_in;
|
|
44598 |
+}
|
|
44599 |
+
|
|
44600 |
+void a_Adblock_init()
|
|
44601 |
+{
|
|
44602 |
+ char *filename;
|
|
44603 |
+ char line[LINE_MAXLEN];
|
|
44604 |
+ FILE *file_stream;
|
|
44605 |
+ guint urls;
|
|
44606 |
+
|
|
44607 |
+ disabled = TRUE;
|
|
44608 |
+
|
|
44609 |
+ filename = a_Misc_prepend_user_home(".dillo/adblock.txt");
|
|
44610 |
+ file_stream = Adblock_fopen(filename, "[Adblock]\n");
|
|
44611 |
+ g_free(filename);
|
|
44612 |
+
|
|
44613 |
+ if (!file_stream) {
|
|
44614 |
+ DEBUG_MSG(10, "ERROR: Can't open ~/.dillo/adblock.txt, disabling adblock\n");
|
|
44615 |
+ return;
|
|
44616 |
+ }
|
|
44617 |
+
|
|
44618 |
+ blocked = g_ptr_array_new();
|
|
44619 |
+
|
|
44620 |
+ urls = 0;
|
|
44621 |
+ DEBUG_MSG(10, "Loading Adblock list...\n");
|
|
44622 |
+ while (!feof(file_stream)) {
|
|
44623 |
+ line[0] = '\0';
|
|
44624 |
+ fgets(line, LINE_MAXLEN, file_stream);
|
|
44625 |
+ g_strstrip(line);
|
|
44626 |
+ if(line[0] == '\0')
|
|
44627 |
+ continue;
|
|
44628 |
+ if(line[0] == '[')
|
|
44629 |
+ continue;
|
|
44630 |
+ g_ptr_array_add(blocked, g_strdup(line));
|
|
44631 |
+ ++urls;
|
|
44632 |
+ }
|
|
44633 |
+ DEBUG_MSG(10, "loaded %u adblock entries.\n", urls);
|
|
44634 |
+
|
|
44635 |
+ disabled = FALSE;
|
|
44636 |
+}
|
|
44637 |
+
|
|
44638 |
+void a_Adblock_freeall( void )
|
|
44639 |
+{
|
|
44640 |
+ guint i;
|
|
44641 |
+ if(disabled)
|
|
44642 |
+ return;
|
|
44643 |
+ for(i = 0; i != blocked->len; ++i)
|
|
44644 |
+ g_free(g_ptr_array_index(blocked, i));
|
|
44645 |
+ g_ptr_array_free(blocked, TRUE);
|
|
44646 |
+}
|
|
44647 |
+
|
|
44648 |
+gboolean a_Adblock_isblocked(const DilloUrl *request_url)
|
|
44649 |
+{
|
|
44650 |
+ guint i;
|
|
44651 |
+ DEBUG_MSG(10, "running adblock on %s\n", URL_STR(request_url));
|
|
44652 |
+// g_print("running adblock on %s\n", URL_STR(request_url));
|
|
44653 |
+ if(disabled)
|
|
44654 |
+ return FALSE;
|
|
44655 |
+ if(request_url == NULL)
|
|
44656 |
+ return FALSE;
|
|
44657 |
+ else
|
|
44658 |
+ {
|
|
44659 |
+ const char *url = URL_STR(request_url);
|
|
44660 |
+ for(i = 0; i != blocked->len; ++i)
|
|
44661 |
+ {
|
|
44662 |
+ const char *pattern = (const char *) g_ptr_array_index(blocked, i);
|
|
44663 |
+ if(!fnmatch(pattern, url, 0))
|
|
44664 |
+ return TRUE;
|
|
44665 |
+ }
|
|
44666 |
+ return FALSE;
|
|
44667 |
+ }
|
|
44668 |
+}
|
|
44669 |
+
|
|
44670 |
+// vim: sw=3 et ts=3
|
|
44671 |
diff -pruN dillo-0.8.6/src/adblock.h dillo-0.8.6-i18n-misc-20070916/src/adblock.h
|
|
44672 |
--- dillo-0.8.6/src/adblock.h 1970-01-01 09:00:00.000000000 +0900
|
|
44673 |
+++ dillo-0.8.6-i18n-misc-20070916/src/adblock.h 2006-05-16 01:21:08.000000000 +0900
|
|
44674 |
@@ -0,0 +1,10 @@
|
|
44675 |
+#ifndef __ADBLOCK_H__
|
|
44676 |
+#define __ADBLOCK_H__
|
|
44677 |
+
|
|
44678 |
+#include "url.h"
|
|
44679 |
+
|
|
44680 |
+void a_Adblock_init( void );
|
|
44681 |
+gboolean a_Adblock_isblocked(const DilloUrl *request_url);
|
|
44682 |
+void a_Adblock_freeall( void );
|
|
44683 |
+
|
|
44684 |
+#endif
|
|
44685 |
diff -pruN dillo-0.8.6/src/auth.c dillo-0.8.6-i18n-misc-20070916/src/auth.c
|
|
44686 |
--- dillo-0.8.6/src/auth.c 1970-01-01 09:00:00.000000000 +0900
|
|
44687 |
+++ dillo-0.8.6-i18n-misc-20070916/src/auth.c 2006-05-16 01:21:08.000000000 +0900
|
|
44688 |
@@ -0,0 +1,134 @@
|
|
44689 |
+#include <config.h>
|
|
44690 |
+#include "auth.h"
|
|
44691 |
+#include <stdio.h>
|
|
44692 |
+#include <stdlib.h>
|
|
44693 |
+#include <string.h>
|
|
44694 |
+#include "msg.h"
|
|
44695 |
+#include "intl.h"
|
|
44696 |
+#include "klist.h"
|
|
44697 |
+#include "list.h"
|
|
44698 |
+#include "cache.h"
|
|
44699 |
+#include "web.h"
|
|
44700 |
+#include "interface.h"
|
|
44701 |
+#include "nav.h"
|
|
44702 |
+#include "history.h"
|
|
44703 |
+#include "misc.h"
|
|
44704 |
+
|
|
44705 |
+void Auth_confirmed(DilloDoc *dd);
|
|
44706 |
+void Auth_refused(DilloDoc *dd);
|
|
44707 |
+void Auth_load_authenticated(DilloDoc *dd, DilloUrl *url);
|
|
44708 |
+
|
|
44709 |
+typedef struct _Realm Realm;
|
|
44710 |
+
|
|
44711 |
+struct _Realm {
|
|
44712 |
+ DilloUrl *base_url;
|
|
44713 |
+ GString *auth;
|
|
44714 |
+};
|
|
44715 |
+
|
|
44716 |
+static Realm *realms = NULL;
|
|
44717 |
+static gint num_realms;
|
|
44718 |
+static gint realms_max = 16;
|
|
44719 |
+
|
|
44720 |
+void a_Auth_byrealm(GString *auth_realm, DilloUrl *NewUrl, DilloDoc *dd)
|
|
44721 |
+{
|
|
44722 |
+ /* we already have a password dialogue open */
|
|
44723 |
+ if (dd->auth_await_url)
|
|
44724 |
+ return;
|
|
44725 |
+
|
|
44726 |
+ dd->auth_await_url = a_Url_dup(NewUrl);
|
|
44727 |
+ auth_realm = g_string_append(auth_realm, "\n");
|
|
44728 |
+ a_Interface_passwd_dialog(dd->bw, auth_realm->str,
|
|
44729 |
+ Auth_confirmed, dd,
|
|
44730 |
+ Auth_refused, dd);
|
|
44731 |
+}
|
|
44732 |
+
|
|
44733 |
+GString *a_Auth_byurl(DilloUrl *n)
|
|
44734 |
+{
|
|
44735 |
+ gchar *offset;
|
|
44736 |
+ int i, longest = -1, len = 0, longlen = 0;
|
|
44737 |
+ gchar *ptr;
|
|
44738 |
+
|
|
44739 |
+ if (!n)
|
|
44740 |
+ return NULL;
|
|
44741 |
+
|
|
44742 |
+ for (i = 0; i < num_realms; i++) {
|
|
44743 |
+ ptr = URL_STR(realms[i].base_url);
|
|
44744 |
+ offset = strrchr(ptr, '/');
|
|
44745 |
+ if (!offset)
|
|
44746 |
+ offset = ptr + strlen(ptr);
|
|
44747 |
+ if (strncmp(URL_STR(n), ptr, (char*) offset - (char*) ptr) == 0) {
|
|
44748 |
+ len = (gchar *) offset - (gchar *) ptr;
|
|
44749 |
+ if (longlen <= len) {
|
|
44750 |
+ longlen=len;
|
|
44751 |
+ longest=i;
|
|
44752 |
+ }
|
|
44753 |
+ }
|
|
44754 |
+ }
|
|
44755 |
+ return longest == -1 ? NULL : realms[longest].auth;
|
|
44756 |
+}
|
|
44757 |
+
|
|
44758 |
+void Auth_confirmed(DilloDoc *dd)
|
|
44759 |
+{
|
|
44760 |
+ DilloUrl *NewUrl;
|
|
44761 |
+ GString *new_auth;
|
|
44762 |
+ GtkEntry *uentry,*pentry;
|
|
44763 |
+ GString *up = g_string_new("");
|
|
44764 |
+ gchar *encoded;
|
|
44765 |
+
|
|
44766 |
+ if (!dd->auth_await_url)
|
|
44767 |
+ return;
|
|
44768 |
+
|
|
44769 |
+ NewUrl = dd->auth_await_url;
|
|
44770 |
+
|
|
44771 |
+ /* are we still trying to browse the url that wants authentication? */
|
|
44772 |
+
|
|
44773 |
+ if (a_Nav_stack_size(dd) != 0
|
|
44774 |
+ && a_Url_cmp(a_History_get_url(NAV_TOP(dd)), NewUrl) != 0) {
|
|
44775 |
+ MSG(_("Browser Url has changed\n"));
|
|
44776 |
+ /* free the url here, maybe ? */
|
|
44777 |
+ a_Url_free(NewUrl);
|
|
44778 |
+ dd->auth_await_url = NULL;
|
|
44779 |
+ return;
|
|
44780 |
+ }
|
|
44781 |
+
|
|
44782 |
+ /* fetch and encode authorization */
|
|
44783 |
+ uentry = GTK_ENTRY(dd->bw->passwd_dialog_uentry);
|
|
44784 |
+ pentry = GTK_ENTRY(dd->bw->passwd_dialog_pentry);
|
|
44785 |
+ /* ... */
|
|
44786 |
+ g_string_sprintfa(up, "%s:%s", gtk_entry_get_text(uentry),
|
|
44787 |
+ gtk_entry_get_text(pentry));
|
|
44788 |
+ new_auth = g_string_new("");
|
|
44789 |
+ encoded = a_Misc_encode_base64(up->str);
|
|
44790 |
+ g_string_sprintfa(new_auth, "Basic %s", encoded);
|
|
44791 |
+ g_free(encoded);
|
|
44792 |
+ a_List_add(realms, num_realms, realms_max);
|
|
44793 |
+ realms[num_realms].base_url = a_Url_dup(NewUrl);
|
|
44794 |
+ realms[num_realms].auth = new_auth;
|
|
44795 |
+ num_realms++;
|
|
44796 |
+ Auth_load_authenticated(dd, NewUrl);
|
|
44797 |
+ dd->auth_await_url = NULL;
|
|
44798 |
+}
|
|
44799 |
+
|
|
44800 |
+void Auth_refused(DilloDoc *dd)
|
|
44801 |
+{
|
|
44802 |
+ DilloUrl *NewUrl;
|
|
44803 |
+
|
|
44804 |
+ if (!dd->auth_await_url)
|
|
44805 |
+ return;
|
|
44806 |
+ NewUrl = dd->auth_await_url;
|
|
44807 |
+ g_return_if_fail(NewUrl);
|
|
44808 |
+ a_Url_free(NewUrl);
|
|
44809 |
+ dd->auth_await_url = NULL;
|
|
44810 |
+}
|
|
44811 |
+
|
|
44812 |
+void Auth_load_authenticated(DilloDoc *dd, DilloUrl *NewUrl)
|
|
44813 |
+{
|
|
44814 |
+ a_Url_set_flags(NewUrl, URL_FLAGS(NewUrl) | URL_E2EReload | URL_RealmAccess);
|
|
44815 |
+ a_Nav_push(dd, NewUrl);
|
|
44816 |
+ a_Url_free(NewUrl);
|
|
44817 |
+}
|
|
44818 |
+
|
|
44819 |
+void a_Auth_freeall(void)
|
|
44820 |
+{
|
|
44821 |
+}
|
|
44822 |
+
|
|
44823 |
diff -pruN dillo-0.8.6/src/auth.h dillo-0.8.6-i18n-misc-20070916/src/auth.h
|
|
44824 |
--- dillo-0.8.6/src/auth.h 1970-01-01 09:00:00.000000000 +0900
|
|
44825 |
+++ dillo-0.8.6-i18n-misc-20070916/src/auth.h 2006-05-16 01:21:08.000000000 +0900
|
|
44826 |
@@ -0,0 +1,14 @@
|
|
44827 |
+#ifndef __AUTH_H__
|
|
44828 |
+#define __AUTH_H__
|
|
44829 |
+
|
|
44830 |
+#include <glib.h>
|
|
44831 |
+#include <gtk/gtk.h>
|
|
44832 |
+#include "url.h"
|
|
44833 |
+#include "doc.h"
|
|
44834 |
+
|
|
44835 |
+void a_Auth_byrealm(GString *auth_realm,DilloUrl *NewUrl, DilloDoc *dd);
|
|
44836 |
+GString *a_Auth_byurl(DilloUrl *url);
|
|
44837 |
+void a_Auth_freeall(void);
|
|
44838 |
+
|
|
44839 |
+#endif /* AUTH_H */
|
|
44840 |
+
|
|
44841 |
diff -pruN dillo-0.8.6/src/bookmark.c dillo-0.8.6-i18n-misc-20070916/src/bookmark.c
|
|
44842 |
--- dillo-0.8.6/src/bookmark.c 2005-10-28 01:20:06.000000000 +0900
|
|
44843 |
+++ dillo-0.8.6-i18n-misc-20070916/src/bookmark.c 2006-07-08 21:00:09.000000000 +0900
|
|
44844 |
@@ -14,6 +14,7 @@
|
|
44845 |
#include <stdlib.h>
|
|
44846 |
#include <string.h>
|
|
44847 |
|
|
44848 |
+#include "i18n.h"
|
|
44849 |
#include "msg.h"
|
|
44850 |
#include "browser.h"
|
|
44851 |
#include "history.h"
|
|
44852 |
@@ -39,10 +40,10 @@ void a_Bookmarks_init(void)
|
|
44853 |
* and finally ask it to add a new bookmark.
|
|
44854 |
* (this is an example of dpi chat)
|
|
44855 |
*/
|
|
44856 |
-void a_Bookmarks_chat_add(BrowserWindow *Bw, char *Cmd, char *answer)
|
|
44857 |
+void a_Bookmarks_chat_add(DilloDoc *Dd, char *Cmd, char *answer)
|
|
44858 |
{
|
|
44859 |
static char *cmd1 = NULL, *cmd2 = NULL, *cmd3 = NULL, *cmd4 = NULL;
|
|
44860 |
- static BrowserWindow *bw = NULL;
|
|
44861 |
+ static DilloDoc *dd = NULL;
|
|
44862 |
|
|
44863 |
if (!cmd1) {
|
|
44864 |
cmd1 = a_Dpip_build_cmd("cmd=%s msg=%s", "chat", "Hi server");
|
|
44865 |
@@ -53,26 +54,26 @@ void a_Bookmarks_chat_add(BrowserWindow
|
|
44866 |
|
|
44867 |
_MSG("a_Bookmarks_chat_add\n answer=%s\n", answer ? answer : "(null)");
|
|
44868 |
|
|
44869 |
- if (Bw)
|
|
44870 |
- bw = Bw;
|
|
44871 |
+ if (Dd)
|
|
44872 |
+ dd = Dd;
|
|
44873 |
if (!cmd4 && Cmd)
|
|
44874 |
cmd4 = g_strdup(Cmd);
|
|
44875 |
|
|
44876 |
if (!answer) {
|
|
44877 |
- a_Capi_dpi_send_cmd(NULL, bw, cmd1, "bookmarks", 1);
|
|
44878 |
+ a_Capi_dpi_send_cmd(NULL, dd, cmd1, "bookmarks", 1);
|
|
44879 |
|
|
44880 |
} else {
|
|
44881 |
/* we have an answer */
|
|
44882 |
if (answer) {
|
|
44883 |
if (*answer == 'H') {
|
|
44884 |
/* "Hi browser" */
|
|
44885 |
- a_Capi_dpi_send_cmd(NULL, bw, cmd2, "bookmarks", 0);
|
|
44886 |
+ a_Capi_dpi_send_cmd(NULL, dd, cmd2, "bookmarks", 0);
|
|
44887 |
} else if (*answer == 'I') {
|
|
44888 |
/* "Is it worth?" */
|
|
44889 |
- a_Capi_dpi_send_cmd(NULL, bw, cmd3, "bookmarks", 0);
|
|
44890 |
+ a_Capi_dpi_send_cmd(NULL, dd, cmd3, "bookmarks", 0);
|
|
44891 |
} else if (*answer == 'O') {
|
|
44892 |
/* "OK, send it!" */
|
|
44893 |
- a_Capi_dpi_send_cmd(NULL, bw, cmd4, "bookmarks", 0);
|
|
44894 |
+ a_Capi_dpi_send_cmd(NULL, dd, cmd4, "bookmarks", 0);
|
|
44895 |
g_free(cmd4);
|
|
44896 |
cmd4 = NULL;
|
|
44897 |
}
|
|
44898 |
@@ -83,34 +84,31 @@ void a_Bookmarks_chat_add(BrowserWindow
|
|
44899 |
/*
|
|
44900 |
* Add the new bookmark through the bookmarks server
|
|
44901 |
*/
|
|
44902 |
-void a_Bookmarks_add(GtkWidget *widget, gpointer client_data)
|
|
44903 |
+void a_Bookmarks_add(DilloDoc *dd, DilloUrl *url)
|
|
44904 |
{
|
|
44905 |
- BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
44906 |
- DilloUrl *url;
|
|
44907 |
const gchar *title;
|
|
44908 |
gchar *cmd;
|
|
44909 |
|
|
44910 |
- url = a_Menu_popup_get_url(bw);
|
|
44911 |
- g_return_if_fail(url != NULL);
|
|
44912 |
+ g_return_if_fail(url != NULL && dd != NULL);
|
|
44913 |
|
|
44914 |
/* if the page has no title, we'll use the url string */
|
|
44915 |
title = a_History_get_title_by_url(url, 1);
|
|
44916 |
|
|
44917 |
cmd = a_Dpip_build_cmd("cmd=%s url=%s title=%s",
|
|
44918 |
"add_bookmark", URL_STR(url), title);
|
|
44919 |
- a_Bookmarks_chat_add(bw, cmd, NULL);
|
|
44920 |
+ a_Bookmarks_chat_add(dd, cmd, NULL);
|
|
44921 |
g_free(cmd);
|
|
44922 |
}
|
|
44923 |
|
|
44924 |
/*
|
|
44925 |
* Request the server to show the bookmarks
|
|
44926 |
*/
|
|
44927 |
-void a_Bookmarks_show(BrowserWindow *bw)
|
|
44928 |
+void a_Bookmarks_show(DilloDoc *dd)
|
|
44929 |
{
|
|
44930 |
DilloUrl *url;
|
|
44931 |
|
|
44932 |
url = a_Url_new("dpi:/bm/", NULL, 0, 0, 0);
|
|
44933 |
- a_Nav_push(bw, url);
|
|
44934 |
+ a_Nav_push(dd, url);
|
|
44935 |
a_Url_free(url);
|
|
44936 |
}
|
|
44937 |
|
|
44938 |
diff -pruN dillo-0.8.6/src/bookmark.h dillo-0.8.6-i18n-misc-20070916/src/bookmark.h
|
|
44939 |
--- dillo-0.8.6/src/bookmark.h 2005-10-28 01:20:06.000000000 +0900
|
|
44940 |
+++ dillo-0.8.6-i18n-misc-20070916/src/bookmark.h 2006-05-16 01:21:08.000000000 +0900
|
|
44941 |
@@ -5,10 +5,11 @@
|
|
44942 |
|
|
44943 |
|
|
44944 |
void a_Bookmarks_init(void);
|
|
44945 |
-void a_Bookmarks_add(GtkWidget *widget, gpointer client_data);
|
|
44946 |
-void a_Bookmarks_show(BrowserWindow *bw);
|
|
44947 |
+//void a_Bookmarks_add(GtkWidget *widget, gpointer client_data);
|
|
44948 |
+void a_Bookmarks_add(DilloDoc *dd, DilloUrl *url);
|
|
44949 |
+void a_Bookmarks_show(DilloDoc *dd);
|
|
44950 |
|
|
44951 |
/* todo: this is for testing purposes */
|
|
44952 |
-void a_Bookmarks_chat_add(BrowserWindow *Bw, char *Cmd, char *answer);
|
|
44953 |
+void a_Bookmarks_chat_add(DilloDoc *Dd, char *Cmd, char *answer);
|
|
44954 |
|
|
44955 |
#endif /* __BOOKMARK_H__ */
|
|
44956 |
diff -pruN dillo-0.8.6/src/browser.h dillo-0.8.6-i18n-misc-20070916/src/browser.h
|
|
44957 |
--- dillo-0.8.6/src/browser.h 2005-10-28 01:20:06.000000000 +0900
|
|
44958 |
+++ dillo-0.8.6-i18n-misc-20070916/src/browser.h 2006-05-16 01:21:08.000000000 +0900
|
|
44959 |
@@ -4,17 +4,17 @@
|
|
44960 |
#include <sys/types.h>
|
|
44961 |
#include <gdk/gdk.h>
|
|
44962 |
#include <gtk/gtk.h>
|
|
44963 |
-
|
|
44964 |
-#include "url.h" /* for DilloUrl */
|
|
44965 |
-
|
|
44966 |
+#include "url.h" /* for DilloUrl */
|
|
44967 |
+#include "dw_style.h" /* for DwStyle */
|
|
44968 |
|
|
44969 |
typedef struct _BrowserWindow BrowserWindow;
|
|
44970 |
typedef struct _DilloMenuPopup DilloMenuPopup;
|
|
44971 |
+typedef struct _DilloDoc DilloDoc;
|
|
44972 |
|
|
44973 |
typedef struct {
|
|
44974 |
DilloUrl *Url; /* URL-key for this cache connection */
|
|
44975 |
gint Flags; /* {WEB_RootUrl, WEB_Image, WEB_Download} */
|
|
44976 |
-} BwUrls;
|
|
44977 |
+} DdUrls;
|
|
44978 |
|
|
44979 |
/* The popup menus so that we can call them. */
|
|
44980 |
struct _DilloMenuPopup
|
|
44981 |
@@ -25,12 +25,16 @@ struct _DilloMenuPopup
|
|
44982 |
GtkWidget *over_back;
|
|
44983 |
GtkWidget *over_forw;
|
|
44984 |
GtkWidget *over_bug;
|
|
44985 |
+ GtkWidget *over_frame;
|
|
44986 |
+#ifndef DISABLE_TABS
|
|
44987 |
+ GtkWidget *over_tab;
|
|
44988 |
+#endif /* !DISABLE_TABS */
|
|
44989 |
DilloUrl *url;
|
|
44990 |
DilloUrl *url2;
|
|
44991 |
GtkWidget *ol_oi_submenu;
|
|
44992 |
};
|
|
44993 |
|
|
44994 |
-/* browser_window contains all widgets to create a single window */
|
|
44995 |
+/* browser_window contains everything related to a window */
|
|
44996 |
struct _BrowserWindow
|
|
44997 |
{
|
|
44998 |
/* Control-Panel handleboxes --used for hiding */
|
|
44999 |
@@ -38,6 +42,9 @@ struct _BrowserWindow
|
|
45000 |
/* Flag: TRUE when control-panel is hidden */
|
|
45001 |
gboolean fullwindow;
|
|
45002 |
|
|
45003 |
+ /* The tag for the idle function that sets button sensitivity. */
|
|
45004 |
+ guint sens_idle_tag;
|
|
45005 |
+
|
|
45006 |
/* widgets for the main window */
|
|
45007 |
GtkWidget *main_window;
|
|
45008 |
GtkWidget *back_button;
|
|
45009 |
@@ -59,23 +66,111 @@ struct _BrowserWindow
|
|
45010 |
GtkWidget *imgprogress;
|
|
45011 |
GtkWidget *progress;
|
|
45012 |
|
|
45013 |
+ /* popup menu navigation widgets */
|
|
45014 |
+ GtkWidget *back_op_menu_button;
|
|
45015 |
+ GtkWidget *forw_op_menu_button;
|
|
45016 |
+ GtkWidget *stop_op_menu_button;
|
|
45017 |
+
|
|
45018 |
/* the keyboard accelerator table */
|
|
45019 |
GtkAccelGroup *accel_group;
|
|
45020 |
|
|
45021 |
+ /* the tooltips group */
|
|
45022 |
+ GtkTooltips *tooltips;
|
|
45023 |
+
|
|
45024 |
/* Popup menu for this BrowserWindow */
|
|
45025 |
DilloMenuPopup menu_popup;
|
|
45026 |
|
|
45027 |
- /* The "Headings" and "Anchors" menus */
|
|
45028 |
+ /* The Pagemark menu_item (points to individual document's pagemark menus */
|
|
45029 |
GtkWidget *pagemarks_menuitem;
|
|
45030 |
- GtkWidget *pagemarks_menu;
|
|
45031 |
- GtkWidget *pagemarks_last;
|
|
45032 |
|
|
45033 |
/* "View page Bugs" menuitem so we can set its sensitivity */
|
|
45034 |
GtkWidget *viewbugs_menuitem;
|
|
45035 |
|
|
45036 |
+ /* The Frame menu_item (points to individual frame menus */
|
|
45037 |
+ GtkWidget *frame_menuitem;
|
|
45038 |
+
|
|
45039 |
+ /* The Frameset menu_item (points to nested frameset menus */
|
|
45040 |
+ GtkWidget *frameset_menuitem;
|
|
45041 |
+
|
|
45042 |
+ /* widgets for dialog boxes off main window */
|
|
45043 |
+ GtkWidget *open_dialog_window;
|
|
45044 |
+ GtkWidget *open_dialog_entry;
|
|
45045 |
+ GtkWidget *openfile_dialog_window;
|
|
45046 |
+ GtkWidget *quit_dialog_window;
|
|
45047 |
+ GtkWidget *save_dialog_window;
|
|
45048 |
+ GtkWidget *save_link_dialog_window;
|
|
45049 |
+ GtkWidget *findtext_dialog;
|
|
45050 |
+ GtkWidget *findtext_dialog_check;
|
|
45051 |
+ GtkWidget *findtext_dialog_entry;
|
|
45052 |
+ GtkWidget *search_dialog_window;
|
|
45053 |
+ GtkWidget *search_dialog_entry;
|
|
45054 |
+ GtkWidget *proxy_passwd_dialog_window;
|
|
45055 |
+ GtkWidget *proxy_passwd_dialog_entry;
|
|
45056 |
+ GtkWidget *question_dialog_window;
|
|
45057 |
+ gpointer question_dialog_data;
|
|
45058 |
+ gpointer question_dialog_answer;
|
|
45059 |
+ GtkWidget *passwd_dialog_window;
|
|
45060 |
+ GtkWidget *passwd_dialog_uentry;
|
|
45061 |
+ GtkWidget *passwd_dialog_pentry;
|
|
45062 |
+ GtkWidget *viewsource_window;
|
|
45063 |
+ GtkWidget *pagebugs_window;
|
|
45064 |
+ GtkWidget *full_screen_off_button;
|
|
45065 |
+
|
|
45066 |
+ /* the container widget, this contains either the tabbrowser
|
|
45067 |
+ * or the docwin
|
|
45068 |
+ */
|
|
45069 |
+ GtkContainer *container;
|
|
45070 |
+
|
|
45071 |
+ /* tab width adjustment magic. Yes, it is magic. In essence,
|
|
45072 |
+ * this contains the average width of a character in a string
|
|
45073 |
+ * in the current display context and with the current language.
|
|
45074 |
+ * This is used to calculate the expected width of tab labels
|
|
45075 |
+ *
|
|
45076 |
+ * the value is calculated when the tabbrowser is loaded
|
|
45077 |
+ */
|
|
45078 |
+ gfloat tab_label_average_character_width;
|
|
45079 |
+
|
|
45080 |
+ /* the currently displayed document */
|
|
45081 |
+ DilloDoc *dd;
|
|
45082 |
+
|
|
45083 |
+ /* the findtext state (TRUE if search string has been found
|
|
45084 |
+ * in the document or any of its children
|
|
45085 |
+ */
|
|
45086 |
+ gboolean found;
|
|
45087 |
+
|
|
45088 |
+ /* the list of documents to search through in findtext */
|
|
45089 |
+ GList *dd_list;
|
|
45090 |
+ /* the current index for dd_list */
|
|
45091 |
+ guint dd_list_index;
|
|
45092 |
+ /* The id for the idle function that sets button sensitivity. */
|
|
45093 |
+ guint sens_idle_id;
|
|
45094 |
+};
|
|
45095 |
+
|
|
45096 |
+/* dillo_doc contains all data pertaining to a single document */
|
|
45097 |
+struct _DilloDoc
|
|
45098 |
+{
|
|
45099 |
+ /* the BrowserWindow this document is currently part of */
|
|
45100 |
+ BrowserWindow *bw;
|
|
45101 |
+
|
|
45102 |
/* This is the main document widget. (HTML rendering or whatever) */
|
|
45103 |
GtkWidget *docwin;
|
|
45104 |
|
|
45105 |
+ /* The initial style for the widget */
|
|
45106 |
+ DwStyle *style;
|
|
45107 |
+
|
|
45108 |
+ /* for nested documents, points to parent document */
|
|
45109 |
+ DilloDoc *parent;
|
|
45110 |
+
|
|
45111 |
+ /* This is the frameset widget. */
|
|
45112 |
+ GtkWidget *frameset;
|
|
45113 |
+
|
|
45114 |
+ /* document name (as used in 'target=window_or_frame_name' attribute */
|
|
45115 |
+ gchar *name;
|
|
45116 |
+
|
|
45117 |
+ /* The "Headings" and "Anchors" menus */
|
|
45118 |
+ GtkWidget *pagemarks_menu;
|
|
45119 |
+ GtkWidget *pagemarks_last;
|
|
45120 |
+
|
|
45121 |
/* Current cursor type */
|
|
45122 |
GdkCursorType CursorType;
|
|
45123 |
|
|
45124 |
@@ -92,33 +187,16 @@ struct _BrowserWindow
|
|
45125 |
gint NumImages;
|
|
45126 |
/* Number of different images already loaded */
|
|
45127 |
gint NumImagesGot;
|
|
45128 |
+ /* the current document progress */
|
|
45129 |
+ gfloat progress;
|
|
45130 |
+ /* 'ready' is true when the root document has finished loading */
|
|
45131 |
+ gboolean ready;
|
|
45132 |
|
|
45133 |
/* List of all Urls requested by this page (and its types) */
|
|
45134 |
- BwUrls *PageUrls;
|
|
45135 |
+ DdUrls *PageUrls;
|
|
45136 |
gint NumPageUrls;
|
|
45137 |
gint MaxPageUrls;
|
|
45138 |
|
|
45139 |
- /* widgets for dialog boxes off main window */
|
|
45140 |
- GtkWidget *open_dialog_window;
|
|
45141 |
- GtkWidget *open_dialog_entry;
|
|
45142 |
- GtkWidget *openfile_dialog_window;
|
|
45143 |
- GtkWidget *quit_dialog_window;
|
|
45144 |
- GtkWidget *save_dialog_window;
|
|
45145 |
- GtkWidget *save_link_dialog_window;
|
|
45146 |
- GtkWidget *findtext_dialog_window;
|
|
45147 |
- GtkWidget *findtext_dialog_check;
|
|
45148 |
- GtkWidget *findtext_dialog_entry;
|
|
45149 |
- GtkWidget *search_dialog_window;
|
|
45150 |
- GtkWidget *search_dialog_entry;
|
|
45151 |
- GtkWidget *proxy_passwd_dialog_window;
|
|
45152 |
- GtkWidget *proxy_passwd_dialog_entry;
|
|
45153 |
- GtkWidget *question_dialog_window;
|
|
45154 |
- gpointer question_dialog_data;
|
|
45155 |
- gpointer question_dialog_answer;
|
|
45156 |
- GtkWidget *viewsource_window;
|
|
45157 |
- GtkWidget *pagebugs_window;
|
|
45158 |
- GtkWidget *full_screen_off_button;
|
|
45159 |
-
|
|
45160 |
/* Dillo navigation stack (holds indexes to history list) */
|
|
45161 |
gint *nav_stack;
|
|
45162 |
gint nav_stack_size; /* [1 based] */
|
|
45163 |
@@ -137,11 +215,8 @@ struct _BrowserWindow
|
|
45164 |
* redirection loops (accounts for WEB_RootUrl only) */
|
|
45165 |
gint redirect_level;
|
|
45166 |
|
|
45167 |
- /* The id for the idle function that sets button sensitivity. */
|
|
45168 |
- guint sens_idle_id;
|
|
45169 |
+ DilloUrl *auth_await_url;
|
|
45170 |
};
|
|
45171 |
|
|
45172 |
-
|
|
45173 |
-
|
|
45174 |
#endif /* __BROWSER_H__ */
|
|
45175 |
|
|
45176 |
diff -pruN dillo-0.8.6/src/cache.c dillo-0.8.6-i18n-misc-20070916/src/cache.c
|
|
45177 |
--- dillo-0.8.6/src/cache.c 2006-04-08 21:15:11.000000000 +0900
|
|
45178 |
+++ dillo-0.8.6-i18n-misc-20070916/src/cache.c 2006-05-16 01:21:08.000000000 +0900
|
|
45179 |
@@ -13,25 +13,34 @@
|
|
45180 |
* Dillo's cache module
|
|
45181 |
*/
|
|
45182 |
|
|
45183 |
+#include <config.h>
|
|
45184 |
#include <ctype.h> /* for tolower */
|
|
45185 |
#include <sys/types.h>
|
|
45186 |
|
|
45187 |
#include <sys/stat.h>
|
|
45188 |
+#include <time.h>
|
|
45189 |
#include <stdlib.h>
|
|
45190 |
#include <string.h>
|
|
45191 |
#include <fcntl.h>
|
|
45192 |
#include <unistd.h>
|
|
45193 |
|
|
45194 |
+#include "intl.h"
|
|
45195 |
#include "msg.h"
|
|
45196 |
#include "list.h"
|
|
45197 |
#include "IO/Url.h"
|
|
45198 |
#include "IO/IO.h"
|
|
45199 |
+#include <zlib.h>
|
|
45200 |
+
|
|
45201 |
+#include "i18n.h"
|
|
45202 |
#include "web.h"
|
|
45203 |
+#include "doc.h"
|
|
45204 |
#include "dicache.h"
|
|
45205 |
#include "interface.h"
|
|
45206 |
#include "nav.h"
|
|
45207 |
+#include "auth.h"
|
|
45208 |
#include "cookies.h"
|
|
45209 |
#include "misc.h"
|
|
45210 |
+#include "prefs.h"
|
|
45211 |
|
|
45212 |
#define NULLKey 0
|
|
45213 |
|
|
45214 |
@@ -46,7 +55,9 @@ typedef struct {
|
|
45215 |
const DilloUrl *Url; /* Cached Url. Url is used as a primary Key */
|
|
45216 |
char *TypeDet; /* MIME type string (detected from data) */
|
|
45217 |
char *TypeHdr; /* MIME type string as from the HTTP Header */
|
|
45218 |
+ const char *Encoding; /* Data encoding */
|
|
45219 |
GString *Header; /* HTTP header */
|
|
45220 |
+ GString *AuthRealm; /* Authentication realm */
|
|
45221 |
const DilloUrl *Location; /* New URI for redirects */
|
|
45222 |
void *Data; /* Pointer to raw data */
|
|
45223 |
size_t ValidSize, /* Actually size of valid range */
|
|
45224 |
@@ -56,6 +67,7 @@ typedef struct {
|
|
45225 |
IOData_t *io; /* Pointer to IO data */
|
|
45226 |
ChainLink *CCCQuery; /* CCC link for querying branch */
|
|
45227 |
ChainLink *CCCAnswer; /* CCC link for answering branch */
|
|
45228 |
+ time_t Expires; /* when this data should be reloaded */
|
|
45229 |
} CacheData_t;
|
|
45230 |
|
|
45231 |
|
|
45232 |
@@ -206,16 +218,19 @@ static void Cache_entry_init(CacheData_t
|
|
45233 |
NewEntry->Url = a_Url_dup(Url);
|
|
45234 |
NewEntry->TypeDet = NULL;
|
|
45235 |
NewEntry->TypeHdr = NULL;
|
|
45236 |
+ NewEntry->Encoding = NULL;
|
|
45237 |
NewEntry->Header = g_string_new("");
|
|
45238 |
NewEntry->Location = NULL;
|
|
45239 |
NewEntry->Data = NULL;
|
|
45240 |
NewEntry->ValidSize = 0;
|
|
45241 |
NewEntry->TotalSize = 0;
|
|
45242 |
NewEntry->BuffSize = 4096;
|
|
45243 |
- NewEntry->Flags = 0;
|
|
45244 |
+ NewEntry->Flags = URL_FLAGS_(Url) & URL_Post ? CA_Expires : 0;
|
|
45245 |
NewEntry->io = NULL;
|
|
45246 |
NewEntry->CCCQuery = a_Chain_new();
|
|
45247 |
NewEntry->CCCAnswer = NULL;
|
|
45248 |
+ NewEntry->AuthRealm = NULL;
|
|
45249 |
+ NewEntry->Expires = 0;
|
|
45250 |
}
|
|
45251 |
|
|
45252 |
/*
|
|
45253 |
@@ -235,7 +250,7 @@ static CacheData_t *Cache_entry_add(cons
|
|
45254 |
CacheData_t *new_entry = g_new(CacheData_t, 1);
|
|
45255 |
|
|
45256 |
if (Cache_entry_search(Url))
|
|
45257 |
- DEBUG_MSG(5, "WARNING: Cache_entry_add, leaking an entry.\n");
|
|
45258 |
+ DEBUG_MSG(5, _("WARNING: Cache_entry_add, leaking an entry.\n"));
|
|
45259 |
|
|
45260 |
Cache_entry_init(new_entry, Url); /* Set safe values */
|
|
45261 |
g_hash_table_insert(CacheHash, (gpointer)new_entry->Url, new_entry);
|
|
45262 |
@@ -251,6 +266,7 @@ static void Cache_entry_free(CacheData_t
|
|
45263 |
g_free(entry->TypeDet);
|
|
45264 |
g_free(entry->TypeHdr);
|
|
45265 |
g_string_free(entry->Header, TRUE);
|
|
45266 |
+ g_free((gchar *)entry->Encoding);
|
|
45267 |
a_Url_free((DilloUrl *)entry->Location);
|
|
45268 |
g_free(entry->Data);
|
|
45269 |
g_free(entry);
|
|
45270 |
@@ -297,13 +313,13 @@ static void Cache_entry_remove(CacheData
|
|
45271 |
InfoAnswer = entry->CCCAnswer;
|
|
45272 |
|
|
45273 |
if (InfoQuery) {
|
|
45274 |
- DEBUG_MSG(2, "## Aborting CCCQuery\n");
|
|
45275 |
+ DEBUG_MSG(2, _("## Aborting CCCQuery\n"));
|
|
45276 |
a_Cache_ccc(OpAbort, 1, BCK, InfoQuery, NULL, NULL);
|
|
45277 |
} else if (InfoAnswer) {
|
|
45278 |
- DEBUG_MSG(2, "## Aborting CCCAnswer\n");
|
|
45279 |
+ DEBUG_MSG(2, _("## Aborting CCCAnswer\n"));
|
|
45280 |
a_Cache_ccc(OpAbort, 2, BCK, InfoAnswer, NULL, NULL);
|
|
45281 |
} else {
|
|
45282 |
- DEBUG_MSG(2, "## Aborting raw2\n");
|
|
45283 |
+ DEBUG_MSG(2, _("## Aborting raw2\n"));
|
|
45284 |
Cache_entry_remove_raw(entry, NULL);
|
|
45285 |
}
|
|
45286 |
}
|
|
45287 |
@@ -346,11 +362,11 @@ static gint Cache_prepare_reload(DilloUr
|
|
45288 |
|
|
45289 |
if (!g_slist_find_custom(ClientQueue, url, Cache_client_url_cmp)) {
|
|
45290 |
/* There're no clients for this entry */
|
|
45291 |
- DEBUG_MSG(2, "## No more clients for this entry\n");
|
|
45292 |
+ DEBUG_MSG(2, _("## No more clients for this entry\n"));
|
|
45293 |
Cache_entry_remove(NULL, url);
|
|
45294 |
return 1;
|
|
45295 |
} else {
|
|
45296 |
- MSG("Cache_prepare_reload: ERROR, entry still has clients\n");
|
|
45297 |
+ MSG(_("Cache_prepare_reload: ERROR, entry still has clients\n"));
|
|
45298 |
}
|
|
45299 |
|
|
45300 |
return 0;
|
|
45301 |
@@ -364,18 +380,28 @@ static gint Cache_prepare_reload(DilloUr
|
|
45302 |
static gint Cache_open_url(DilloWeb *Web, CA_Callback_t Call, void *CbData)
|
|
45303 |
{
|
|
45304 |
void *link;
|
|
45305 |
- gint ClientKey;
|
|
45306 |
+ gint ClientKey, imgOnOtherHost;
|
|
45307 |
ChainFunction_t cccFunct;
|
|
45308 |
DilloUrl *Url = Web->url;
|
|
45309 |
CacheData_t *entry = Cache_entry_search(Url);
|
|
45310 |
|
|
45311 |
_MSG("Cache_open_url: %s %sFOUND\n", URL_STR(Url), entry ? "" : "NOT ");
|
|
45312 |
|
|
45313 |
+ imgOnOtherHost = ((URL_FLAGS(Url) & (URL_IsImage | URL_OnOtherHost))
|
|
45314 |
+ != (URL_IsImage | URL_OnOtherHost));
|
|
45315 |
+ if (entry && (entry->Flags & CA_Expires) &&
|
|
45316 |
+ (!entry->Expires || entry->Expires <= time(NULL)) &&
|
|
45317 |
+ !(URL_FLAGS(Url) & URL_MustCache) && imgOnOtherHost &&
|
|
45318 |
+ !g_slist_find_custom(ClientQueue, Url, Cache_client_url_cmp)) {
|
|
45319 |
+ Cache_entry_remove(entry, Url);
|
|
45320 |
+ entry = NULL;
|
|
45321 |
+ MSG_HTTP(_("Reloading >%s< because it shouldn't be cached\n"),
|
|
45322 |
+ URL_STR(Url));
|
|
45323 |
+ }
|
|
45324 |
if ( entry ) {
|
|
45325 |
/* URL is cached: feed our client with cached data */
|
|
45326 |
ClientKey = Cache_client_enqueue(entry->Url, Web, Call, CbData);
|
|
45327 |
Cache_delayed_process_queue(entry);
|
|
45328 |
-
|
|
45329 |
} else {
|
|
45330 |
/* URL not cached: create an entry, send our client to the queue,
|
|
45331 |
* and open a new connection */
|
|
45332 |
@@ -388,7 +414,10 @@ static gint Cache_open_url(DilloWeb *Web
|
|
45333 |
a_Cache_ccc, BCK, cccFunct, 1, 1);
|
|
45334 |
a_Chain_bcb(OpStart, entry->CCCQuery, (void *)entry->Url, Web);
|
|
45335 |
} else {
|
|
45336 |
- a_Interface_msg(Web->bw, "ERROR: unsupported protocol");
|
|
45337 |
+ gchar *msg_enc = a_I18n_locale_to_DILLO_CHARSET(
|
|
45338 |
+ _("ERROR: unsupported protocol"));
|
|
45339 |
+ a_Interface_msg(Web->dd->bw, msg_enc);
|
|
45340 |
+ g_free(msg_enc);
|
|
45341 |
a_Cache_ccc(OpAbort, 1, FWD, entry->CCCQuery, NULL, NULL);
|
|
45342 |
ClientKey = 0; /* aborted */
|
|
45343 |
}
|
|
45344 |
@@ -456,11 +485,12 @@ gint a_Cache_get_buf(const DilloUrl *Url
|
|
45345 |
|
|
45346 |
/* Test for a redirection loop */
|
|
45347 |
if (entry->Flags & CA_RedirectLoop) {
|
|
45348 |
- g_warning ("Redirect loop for URL: >%s<\n", URL_STR_(Url));
|
|
45349 |
+ g_warning (_("Redirect loop for URL: >%s<\n"), URL_STR_(Url));
|
|
45350 |
break;
|
|
45351 |
}
|
|
45352 |
/* Test for a working redirection */
|
|
45353 |
- if (entry && entry->Flags & CA_Redirect && entry->Location) {
|
|
45354 |
+ if (entry && entry->Flags & CA_Redirect && entry->Location
|
|
45355 |
+ && !entry->AuthRealm) {
|
|
45356 |
Url = entry->Location;
|
|
45357 |
} else
|
|
45358 |
break;
|
|
45359 |
@@ -542,6 +572,32 @@ static GList *Cache_parse_multiple_field
|
|
45360 |
}
|
|
45361 |
#endif /* !DISABLE_COOKIES */
|
|
45362 |
|
|
45363 |
+static void Cache_force_min_expire(CacheData_t *entry, int min, guint stdExp) {
|
|
45364 |
+ time_t t;
|
|
45365 |
+
|
|
45366 |
+ if (!(entry->Flags & CA_Expires) || (URL_FLAGS_(entry->Url) & URL_Post))
|
|
45367 |
+ return;
|
|
45368 |
+ if (min < 0) {
|
|
45369 |
+ entry->Flags &= ~CA_Expires;
|
|
45370 |
+ entry->Expires = 0;
|
|
45371 |
+ return;
|
|
45372 |
+ }
|
|
45373 |
+ t = time(0);
|
|
45374 |
+ if (entry->Expires && t > entry->Expires + 1000) {
|
|
45375 |
+ if (!stdExp)
|
|
45376 |
+ entry->Flags &= ~CA_Expires;
|
|
45377 |
+ entry->Expires = 0;
|
|
45378 |
+ MSG_HTTP(_("Bad clocks, ignore expire on >%s<\n"), URL_STR(entry->Url));
|
|
45379 |
+ return;
|
|
45380 |
+ }
|
|
45381 |
+ if (min && (t += min) > entry->Expires) {
|
|
45382 |
+ _MSG_HTTP(_("Forcing min expire %d on >%s< instead %ld\n"), min,
|
|
45383 |
+ URL_STR(entry->Url), entry->Expires ?
|
|
45384 |
+ entry->Expires - (t - min) : 0);
|
|
45385 |
+ entry->Expires = t;
|
|
45386 |
+ }
|
|
45387 |
+}
|
|
45388 |
+
|
|
45389 |
/*
|
|
45390 |
* Scan, allocate, and set things according to header info.
|
|
45391 |
* (This function needs the whole header to work)
|
|
45392 |
@@ -549,10 +605,13 @@ static GList *Cache_parse_multiple_field
|
|
45393 |
static void Cache_parse_header(CacheData_t *entry, IOData_t *io, gint HdrLen)
|
|
45394 |
{
|
|
45395 |
gchar *header = entry->Header->str;
|
|
45396 |
- gchar *Length, *Type, *location_str;
|
|
45397 |
+ gchar *Length, *Type, *CacheControl, *Date, *CC_ptr, *location_str;
|
|
45398 |
+ guint expFlag;
|
|
45399 |
+ gchar *Encoding;
|
|
45400 |
#ifndef DISABLE_COOKIES
|
|
45401 |
GList *Cookies;
|
|
45402 |
#endif
|
|
45403 |
+ gchar *auth_type_realm;
|
|
45404 |
|
|
45405 |
if ( HdrLen < 12 ) {
|
|
45406 |
/* Not enough info. */
|
|
45407 |
@@ -564,15 +623,29 @@ static void Cache_parse_header(CacheData
|
|
45408 |
entry->Flags |= CA_ForceRedirect; /* 301 Moved Permanently */
|
|
45409 |
else if ( header[11] == '2' )
|
|
45410 |
entry->Flags |= CA_TempRedirect; /* 302 Temporal Redirect */
|
|
45411 |
-
|
|
45412 |
+ else if ( header[11] == '3' )
|
|
45413 |
+ entry->Flags |= CA_Expires; /* 303 See Other */
|
|
45414 |
+ else if ( header[11] == '7' )
|
|
45415 |
+ entry->Flags |= CA_Expires; /* 307 Moved Temporarely */
|
|
45416 |
+ /* TODO: should be here a_Url_free(entry->Location) ? */
|
|
45417 |
+
|
|
45418 |
location_str = Cache_parse_field(header, "Location");
|
|
45419 |
entry->Location = a_Url_new(location_str, URL_STR_(entry->Url), 0, 0, 0);
|
|
45420 |
g_free(location_str);
|
|
45421 |
|
|
45422 |
} else if ( strncmp(header + 9, "404", 3) == 0 ) {
|
|
45423 |
entry->Flags |= CA_NotFound;
|
|
45424 |
+ } else if ( strncmp(header + 9, "401", 3) == 0 ) {
|
|
45425 |
+ auth_type_realm = Cache_parse_field(header,"WWW-Authenticate");
|
|
45426 |
+ entry->Flags |= CA_Redirect;
|
|
45427 |
+ if (entry->Location)
|
|
45428 |
+ a_Url_free((DilloUrl*) entry->Location);
|
|
45429 |
+ entry->Location = a_Url_dup(entry->Url);
|
|
45430 |
+ entry->AuthRealm = g_string_new(auth_type_realm);
|
|
45431 |
}
|
|
45432 |
|
|
45433 |
+ expFlag = entry->Flags & CA_Expires;
|
|
45434 |
+
|
|
45435 |
entry->ValidSize = io->Status - HdrLen;
|
|
45436 |
if ( (Length = Cache_parse_field(header, "Content-Length")) != NULL ) {
|
|
45437 |
entry->Flags |= CA_GotLength;
|
|
45438 |
@@ -582,6 +655,41 @@ static void Cache_parse_header(CacheData
|
|
45439 |
entry->TotalSize = 0;
|
|
45440 |
}
|
|
45441 |
|
|
45442 |
+ if ( (CacheControl = Cache_parse_field(header, "Expires")) != NULL ) {
|
|
45443 |
+ entry->Flags |= CA_Expires;
|
|
45444 |
+ entry->Expires = a_Cookies_create_timestamp(CacheControl);
|
|
45445 |
+ g_free(CacheControl);
|
|
45446 |
+ }
|
|
45447 |
+
|
|
45448 |
+ if ( (CacheControl = Cache_parse_field(header, "Cache-Control")) != NULL ) {
|
|
45449 |
+ CC_ptr = CacheControl;
|
|
45450 |
+ do {
|
|
45451 |
+ while (*CC_ptr == ' ')
|
|
45452 |
+ ++CC_ptr;
|
|
45453 |
+ if ( !g_strncasecmp(CacheControl, "no-cache", 8) ) {
|
|
45454 |
+ entry->Flags |= CA_Expires;
|
|
45455 |
+ entry->Expires = 0;
|
|
45456 |
+ break;
|
|
45457 |
+ } else if ( !g_strncasecmp(CacheControl, "max-age=", 8) ) {
|
|
45458 |
+ char *e;
|
|
45459 |
+ long n;
|
|
45460 |
+
|
|
45461 |
+ if ( !(Date = Cache_parse_field(header, "Date")) ) {
|
|
45462 |
+ MSG_HTTP(_("'Cache-Control: max-age=' without 'Date: ' header"));
|
|
45463 |
+ break;
|
|
45464 |
+ }
|
|
45465 |
+ n = strtoul(CacheControl + 8, &e, 10);
|
|
45466 |
+ if (e > CacheControl + 8 && n >= 0) {
|
|
45467 |
+ entry->Flags |= CA_Expires;
|
|
45468 |
+ entry->Expires = n + a_Cookies_create_timestamp(Date);
|
|
45469 |
+ }
|
|
45470 |
+ g_free(Date);
|
|
45471 |
+ break;
|
|
45472 |
+ }
|
|
45473 |
+ } while ( (CC_ptr = strchr(CC_ptr, ',')) && *++CC_ptr );
|
|
45474 |
+ g_free(CacheControl);
|
|
45475 |
+ }
|
|
45476 |
+
|
|
45477 |
#ifndef DISABLE_COOKIES
|
|
45478 |
/* BUG: If a server feels like mixing Set-Cookie2 and Set-Cookie
|
|
45479 |
* responses which aren't identical, then we have a problem. I don't
|
|
45480 |
@@ -611,13 +719,32 @@ static void Cache_parse_header(CacheData
|
|
45481 |
|
|
45482 |
/* Get Content-Type */
|
|
45483 |
if ( (Type = Cache_parse_field(header, "Content-Type")) == NULL ) {
|
|
45484 |
- MSG_HTTP("Server didn't send Content-Type in header.\n");
|
|
45485 |
+ MSG_HTTP(_("Server didn't send Content-Type in header.\n"));
|
|
45486 |
} else {
|
|
45487 |
entry->TypeHdr = Type;
|
|
45488 |
/* This Content-Type is not trusted. It's checked against real data
|
|
45489 |
* in Cache_process_queue(); only then CA_GotContentType becomes true.
|
|
45490 |
*/
|
|
45491 |
}
|
|
45492 |
+ /* Get Content-Encoding */
|
|
45493 |
+ if ( (Encoding = Cache_parse_field(header, "Content-Encoding")) == NULL ) {
|
|
45494 |
+ //MSG_HTTP(_("Server didn't send Content-Encoding in header.\n"));
|
|
45495 |
+ Encoding = NULL;
|
|
45496 |
+ }
|
|
45497 |
+ entry->Encoding = Encoding;
|
|
45498 |
+
|
|
45499 |
+ if (URL_FLAGS(entry->Url) & URL_IsImage || (Type && !strncmp(Type, "image/", 5))) {
|
|
45500 |
+ Cache_force_min_expire(entry, prefs.min_image_expire_time, expFlag);
|
|
45501 |
+ } else if (!(entry->Flags & CA_Expires) &&
|
|
45502 |
+ (entry->Location ? entry->Location->query : entry->Url->query) &&
|
|
45503 |
+ prefs.query_expire_time >= 0 && (Type && !strncmp(Type, "text/", 5))) {
|
|
45504 |
+ entry->Flags |= CA_Expires;
|
|
45505 |
+ entry->Expires = time(NULL) + prefs.query_expire_time;
|
|
45506 |
+ MSG(_("Forcing default expire to query url >%s<\n"),
|
|
45507 |
+ URL_STR(entry->Url));
|
|
45508 |
+ } else {
|
|
45509 |
+ Cache_force_min_expire(entry, prefs.min_page_expire_time, expFlag);
|
|
45510 |
+ }
|
|
45511 |
}
|
|
45512 |
|
|
45513 |
/*
|
|
45514 |
@@ -650,6 +777,134 @@ static gint Cache_get_header(IOData_t *i
|
|
45515 |
}
|
|
45516 |
|
|
45517 |
/*
|
|
45518 |
+ * CONTENT-ENCODING: Process any encoded data
|
|
45519 |
+ *
|
|
45520 |
+ * Unfortunately we need to provide a private uncompress function as
|
|
45521 |
+ * the one in zlib assumes that a zlib header will appear in the compressed
|
|
45522 |
+ * block -- gzip doesn't provide one so inflateInit2 must be called with
|
|
45523 |
+ * negative MAX_WBITS to get the library to cope.
|
|
45524 |
+ */
|
|
45525 |
+
|
|
45526 |
+static int
|
|
45527 |
+dillo_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
|
|
45528 |
+{
|
|
45529 |
+ z_stream stream;
|
|
45530 |
+ int err;
|
|
45531 |
+
|
|
45532 |
+ stream.next_in = (Bytef*)source;
|
|
45533 |
+ stream.avail_in = (uInt)sourceLen;
|
|
45534 |
+ /* Check for source > 64K on 16-bit machine: */
|
|
45535 |
+ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
|
|
45536 |
+
|
|
45537 |
+ stream.next_out = dest;
|
|
45538 |
+ stream.avail_out = (uInt)*destLen;
|
|
45539 |
+ if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
|
|
45540 |
+
|
|
45541 |
+ stream.zalloc = (alloc_func)0;
|
|
45542 |
+ stream.zfree = (free_func)0;
|
|
45543 |
+
|
|
45544 |
+ err = inflateInit2(&stream, -MAX_WBITS);
|
|
45545 |
+ if (err != Z_OK) return err;
|
|
45546 |
+
|
|
45547 |
+ err = inflate(&stream, Z_FINISH);
|
|
45548 |
+ if (err != Z_STREAM_END) {
|
|
45549 |
+ inflateEnd(&stream);
|
|
45550 |
+ return err == Z_OK ? Z_BUF_ERROR : err;
|
|
45551 |
+ }
|
|
45552 |
+ *destLen = stream.total_out;
|
|
45553 |
+
|
|
45554 |
+ err = inflateEnd(&stream);
|
|
45555 |
+ return err;
|
|
45556 |
+}
|
|
45557 |
+
|
|
45558 |
+
|
|
45559 |
+static void Cache_decode_data(CacheData_t *entry)
|
|
45560 |
+{
|
|
45561 |
+ void *new_Data = NULL;
|
|
45562 |
+ int rc;
|
|
45563 |
+ unsigned char *p;
|
|
45564 |
+ int method;
|
|
45565 |
+ int flags;
|
|
45566 |
+ int expand = 2;
|
|
45567 |
+ uLongf destLen;
|
|
45568 |
+
|
|
45569 |
+ DEBUG_MSG(4, _("Cache_decode_data: got all data -- decodinging %s\n"), entry->Encoding);
|
|
45570 |
+ if( strcmp(entry->Encoding, "x-gzip") == 0
|
|
45571 |
+ || strcmp(entry->Encoding, "gzip") == 0) {
|
|
45572 |
+
|
|
45573 |
+ /* entry->Data holds the data to expand */
|
|
45574 |
+ /* entry->TotalSize is length of data */
|
|
45575 |
+
|
|
45576 |
+ p = entry->Data;
|
|
45577 |
+ if ( (*p++ != 0x1f) || (*p++ != 0x8b) ) {
|
|
45578 |
+ DEBUG_MSG(5, _("Cache_decode_data: not gzip data!\n"));
|
|
45579 |
+ goto exit;
|
|
45580 |
+ }
|
|
45581 |
+ method = *p++;
|
|
45582 |
+ flags = *p++;
|
|
45583 |
+ if ( (method != Z_DEFLATED) || (flags & 0xE0) ) {
|
|
45584 |
+ DEBUG_MSG(5, _("Cache_decode_data: invalid gzip data!\n"));
|
|
45585 |
+ goto exit;
|
|
45586 |
+ }
|
|
45587 |
+
|
|
45588 |
+ /* skip some headers */
|
|
45589 |
+ p += 6;
|
|
45590 |
+ if( (flags & 0x04) != 0 ) {
|
|
45591 |
+ /* skip extra field */
|
|
45592 |
+ int i = (*p++);
|
|
45593 |
+ i += ((*p++)<<8);
|
|
45594 |
+ p += i;
|
|
45595 |
+ }
|
|
45596 |
+ if( (flags & 0x08) != 0 ) {
|
|
45597 |
+ /* skip name */
|
|
45598 |
+ while( *p != 0 )
|
|
45599 |
+ p++;
|
|
45600 |
+ p++;
|
|
45601 |
+ }
|
|
45602 |
+ if( (flags & 0x10) != 0 ) {
|
|
45603 |
+ /* skip comment */
|
|
45604 |
+ while( *p != 0 )
|
|
45605 |
+ p++;
|
|
45606 |
+ p++;
|
|
45607 |
+ }
|
|
45608 |
+ if( (flags & 0x02) != 0 ) {
|
|
45609 |
+ /* skip CRC */
|
|
45610 |
+ p += 2;
|
|
45611 |
+ }
|
|
45612 |
+
|
|
45613 |
+ /* finished with header, rest is compressed data without zlib header */
|
|
45614 |
+ rc = Z_BUF_ERROR; /* just to get started */
|
|
45615 |
+ while( rc == Z_BUF_ERROR ) {
|
|
45616 |
+ /* FIXME -- should limit times round loop? */
|
|
45617 |
+ expand++; /* start with 300% expansion */
|
|
45618 |
+ destLen = expand * entry->TotalSize;
|
|
45619 |
+ new_Data = g_realloc(new_Data, destLen);
|
|
45620 |
+ rc = dillo_uncompress((Bytef *)new_Data, &destLen, (Bytef *)p, (uLong)entry->TotalSize);
|
|
45621 |
+ }
|
|
45622 |
+ if( rc == Z_OK ) {
|
|
45623 |
+ DEBUG_MSG(4, "Cache_decode_data: %.2fKB -> %.2f KB (%ld%%)\n",
|
|
45624 |
+ (float)entry->TotalSize/1024, (float)destLen/1024, destLen * 100 /entry->TotalSize);
|
|
45625 |
+ g_free(entry->Data);
|
|
45626 |
+ entry->Data = g_realloc(new_Data, destLen);
|
|
45627 |
+ entry->TotalSize = destLen;
|
|
45628 |
+ entry->ValidSize = destLen;
|
|
45629 |
+ entry->BuffSize = destLen;
|
|
45630 |
+ }
|
|
45631 |
+ else {
|
|
45632 |
+ g_free(new_Data);
|
|
45633 |
+ }
|
|
45634 |
+
|
|
45635 |
+ }else{
|
|
45636 |
+ MSG(_("not x-gzip\n"));
|
|
45637 |
+ }
|
|
45638 |
+
|
|
45639 |
+exit:;
|
|
45640 |
+ g_free((void *)entry->Encoding);
|
|
45641 |
+ entry->Encoding = NULL;
|
|
45642 |
+}
|
|
45643 |
+
|
|
45644 |
+
|
|
45645 |
+/*
|
|
45646 |
* Receive new data, update the reception buffer (for next read), update the
|
|
45647 |
* cache, and service the client queue.
|
|
45648 |
*
|
|
45649 |
@@ -673,20 +928,26 @@ static void Cache_process_io(int Op, voi
|
|
45650 |
|
|
45651 |
if ( Op == IOClose ) {
|
|
45652 |
if (entry->Flags & CA_GotLength && entry->TotalSize != entry->ValidSize){
|
|
45653 |
- MSG_HTTP("Content-Length does NOT match message body,\n"
|
|
45654 |
- " at: %s\n", URL_STR_(entry->Url));
|
|
45655 |
+ MSG_HTTP(_("Content-Length does NOT match message body,\n"
|
|
45656 |
+ " at: %s\n"), URL_STR_(entry->Url));
|
|
45657 |
}
|
|
45658 |
entry->Flags |= CA_GotData;
|
|
45659 |
entry->Flags &= ~CA_Stopped; /* it may catch up! */
|
|
45660 |
entry->TotalSize = entry->ValidSize;
|
|
45661 |
entry->io = NULL;
|
|
45662 |
entry->CCCAnswer = NULL;
|
|
45663 |
+ /* CONTENT-ENCODING --
|
|
45664 |
+ if encoded then translate and clear client block */
|
|
45665 |
+ if ( entry->Encoding != NULL ) {
|
|
45666 |
+ Cache_decode_data(entry);
|
|
45667 |
+ }
|
|
45668 |
+
|
|
45669 |
Cache_process_queue(entry);
|
|
45670 |
return;
|
|
45671 |
} else if ( Op == IOAbort ) {
|
|
45672 |
/* todo: implement Abort
|
|
45673 |
* (eliminate cache entry and anything related) */
|
|
45674 |
- DEBUG_MSG(5, "Cache_process_io Op = IOAbort; not implemented yet\n");
|
|
45675 |
+ DEBUG_MSG(5, _("Cache_process_io Op = IOAbort; not implemented yet\n"));
|
|
45676 |
entry->io = NULL;
|
|
45677 |
entry->CCCAnswer = NULL;
|
|
45678 |
return;
|
|
45679 |
@@ -729,19 +990,21 @@ static void Cache_process_io(int Op, voi
|
|
45680 |
* Process redirections (HTTP 30x answers)
|
|
45681 |
* (This is a work in progress --not finished yet)
|
|
45682 |
*/
|
|
45683 |
-static gint Cache_redirect(CacheData_t *entry, gint Flags, BrowserWindow *bw)
|
|
45684 |
+static gint Cache_redirect(CacheData_t *entry, gint Flags, DilloDoc *dd)
|
|
45685 |
{
|
|
45686 |
DilloUrl *NewUrl;
|
|
45687 |
|
|
45688 |
_MSG(" Cache_redirect: redirect_level = %d\n", bw->redirect_level);
|
|
45689 |
|
|
45690 |
/* if there's a redirect loop, stop now */
|
|
45691 |
- if (bw->redirect_level >= 5)
|
|
45692 |
+ if (dd->redirect_level >= 5)
|
|
45693 |
entry->Flags |= CA_RedirectLoop;
|
|
45694 |
|
|
45695 |
if (entry->Flags & CA_RedirectLoop) {
|
|
45696 |
- a_Interface_msg(bw, "ERROR: redirect loop for: %s", URL_STR_(entry->Url));
|
|
45697 |
- bw->redirect_level = 0;
|
|
45698 |
+ gchar *msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("ERROR: redirect loop for: %s"));
|
|
45699 |
+ a_Interface_msg(dd->bw, msg_enc, URL_STR_(entry->Url));
|
|
45700 |
+ g_free(msg_enc);
|
|
45701 |
+ dd->redirect_level = 0;
|
|
45702 |
return 0;
|
|
45703 |
}
|
|
45704 |
|
|
45705 |
@@ -749,7 +1012,7 @@ static gint Cache_redirect(CacheData_t *
|
|
45706 |
(entry->Flags & CA_ForceRedirect || entry->Flags & CA_TempRedirect ||
|
|
45707 |
!entry->ValidSize || entry->ValidSize < 1024 )) {
|
|
45708 |
|
|
45709 |
- _MSG(">>>Redirect from: %s\n to %s\n",
|
|
45710 |
+ _MSG(_(">>>Redirect from: %s\n to %s\n"),
|
|
45711 |
URL_STR_(entry->Url), URL_STR_(entry->Location));
|
|
45712 |
_MSG("%s", entry->Header->str);
|
|
45713 |
|
|
45714 |
@@ -759,14 +1022,19 @@ static gint Cache_redirect(CacheData_t *
|
|
45715 |
0, 0, 0);
|
|
45716 |
if (entry->Flags & CA_TempRedirect)
|
|
45717 |
a_Url_set_flags(NewUrl, URL_FLAGS(NewUrl) | URL_E2EReload);
|
|
45718 |
- a_Nav_push(bw, NewUrl);
|
|
45719 |
+ if (entry->AuthRealm) {
|
|
45720 |
+ a_Auth_byrealm(entry->AuthRealm, NewUrl, dd);
|
|
45721 |
+ return 0;
|
|
45722 |
+ }
|
|
45723 |
+ a_Nav_remove_top_url(dd);
|
|
45724 |
+ a_Nav_push(dd, NewUrl);
|
|
45725 |
a_Url_free(NewUrl);
|
|
45726 |
} else {
|
|
45727 |
/* Sub entity redirection (most probably an image) */
|
|
45728 |
if ( !entry->ValidSize ) {
|
|
45729 |
- DEBUG_MSG(3,">>>Image redirection without entity-content<<<\n");
|
|
45730 |
+ DEBUG_MSG(3, _(">>>Image redirection without entity-content<<<\n"));
|
|
45731 |
} else {
|
|
45732 |
- DEBUG_MSG(3, ">>>Image redirection with entity-content<<<\n");
|
|
45733 |
+ DEBUG_MSG(3, _(">>>Image redirection with entity-content<<<\n"));
|
|
45734 |
}
|
|
45735 |
}
|
|
45736 |
}
|
|
45737 |
@@ -799,7 +1067,7 @@ void a_Cache_null_client(int Op, CacheCl
|
|
45738 |
if (Op == CA_Close) {
|
|
45739 |
if (Web->flags & WEB_RootUrl) {
|
|
45740 |
/* Remove this client from our active list */
|
|
45741 |
- a_Interface_close_client(Web->bw, Client->Key);
|
|
45742 |
+ a_Doc_close_client(Web->dd, Client->Key);
|
|
45743 |
}
|
|
45744 |
}
|
|
45745 |
|
|
45746 |
@@ -825,14 +1093,14 @@ static void Cache_process_queue(CacheDat
|
|
45747 |
const gchar *Type;
|
|
45748 |
CacheClient_t *Client;
|
|
45749 |
DilloWeb *ClientWeb;
|
|
45750 |
- BrowserWindow *Client_bw = NULL;
|
|
45751 |
+ DilloDoc *Client_dd = NULL;
|
|
45752 |
static gboolean Busy = FALSE;
|
|
45753 |
gboolean AbortEntry = FALSE;
|
|
45754 |
gboolean OfferDownload = FALSE;
|
|
45755 |
gboolean TypeMismatch = FALSE;
|
|
45756 |
|
|
45757 |
if ( Busy )
|
|
45758 |
- DEBUG_MSG(5, "FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n");
|
|
45759 |
+ DEBUG_MSG(5, _("FATAL!:*** >>>> Cache_process_queue Caught busy!!!\n"));
|
|
45760 |
if (!(entry->Flags & CA_GotHeader))
|
|
45761 |
return;
|
|
45762 |
if (!(entry->Flags & CA_GotContentType)) {
|
|
45763 |
@@ -840,7 +1108,7 @@ static void Cache_process_queue(CacheDat
|
|
45764 |
entry->Data, entry->ValidSize, &Type);
|
|
45765 |
if (st == 0 || entry->Flags & CA_GotData) {
|
|
45766 |
if (a_Misc_content_type_check(entry->TypeHdr, Type) < 0) {
|
|
45767 |
- MSG_HTTP("Content-Type '%s' doesn't match the real data.\n",
|
|
45768 |
+ MSG_HTTP(_("Content-Type '%s' doesn't match the real data.\n"),
|
|
45769 |
entry->TypeHdr);
|
|
45770 |
TypeMismatch = TRUE;
|
|
45771 |
}
|
|
45772 |
@@ -849,29 +1117,35 @@ static void Cache_process_queue(CacheDat
|
|
45773 |
} else
|
|
45774 |
return; /* i.e., wait for more data */
|
|
45775 |
}
|
|
45776 |
+
|
|
45777 |
+ /* CONTENT-ENCODING -- don't let clients process data yet */
|
|
45778 |
+ if ( entry->Encoding != NULL ) {
|
|
45779 |
+ Busy = FALSE;
|
|
45780 |
+ return;
|
|
45781 |
+ }
|
|
45782 |
|
|
45783 |
Busy = TRUE;
|
|
45784 |
for ( i = 0; (Client = g_slist_nth_data(ClientQueue, i)); ++i ) {
|
|
45785 |
if ( Client->Url == entry->Url ) {
|
|
45786 |
ClientWeb = Client->Web; /* It was a (void*) */
|
|
45787 |
- Client_bw = ClientWeb->bw; /* 'bw' in a local var */
|
|
45788 |
+ Client_dd = ClientWeb->dd; /* 'd' in a local var */
|
|
45789 |
|
|
45790 |
if (ClientWeb->flags & WEB_RootUrl) {
|
|
45791 |
if (!(entry->Flags & CA_MsgErased)) {
|
|
45792 |
/* clear the "expecting for reply..." message */
|
|
45793 |
- a_Interface_msg(Client_bw, "");
|
|
45794 |
+ a_Interface_msg(Client_dd->bw, "");
|
|
45795 |
entry->Flags |= CA_MsgErased;
|
|
45796 |
}
|
|
45797 |
if (TypeMismatch)
|
|
45798 |
- a_Interface_msg(Client_bw,"HTTP warning: Content-Type '%s' "
|
|
45799 |
- "doesn't match the real data.", entry->TypeHdr);
|
|
45800 |
- if (entry->Flags & CA_Redirect) {
|
|
45801 |
+ a_Interface_msg(Client_dd->bw,_("HTTP warning: Content-Type '%s' "
|
|
45802 |
+ "doesn't match the real data."), entry->TypeHdr);
|
|
45803 |
+ if (entry->Flags & CA_Redirect && !entry->AuthRealm) {
|
|
45804 |
if (!Client->Callback) {
|
|
45805 |
Client->Callback = a_Cache_null_client;
|
|
45806 |
- Client_bw->redirect_level++;
|
|
45807 |
+ Client_dd->redirect_level++;
|
|
45808 |
}
|
|
45809 |
} else {
|
|
45810 |
- Client_bw->redirect_level = 0;
|
|
45811 |
+ Client_dd->redirect_level = 0;
|
|
45812 |
}
|
|
45813 |
} else {
|
|
45814 |
/* For non root URLs, ignore redirections and 404 answers */
|
|
45815 |
@@ -900,13 +1174,13 @@ static void Cache_process_queue(CacheDat
|
|
45816 |
* Not aborted to avoid multiple connections on the same
|
|
45817 |
* resource. A better idea is to abort the connection and
|
|
45818 |
* to keep a failed-resource flag in the cache entry. */
|
|
45819 |
- MSG_HTTP("Unhandled MIME type: <%s>\n",
|
|
45820 |
+ MSG_HTTP(_("Unhandled MIME type: <%s>\n"),
|
|
45821 |
entry->TypeHdr ? entry->TypeHdr:entry->TypeDet);
|
|
45822 |
}
|
|
45823 |
}
|
|
45824 |
}
|
|
45825 |
if (AbortEntry) {
|
|
45826 |
- a_Interface_remove_client(Client_bw, Client->Key);
|
|
45827 |
+ a_Doc_remove_client(Client_dd, Client->Key);
|
|
45828 |
Cache_client_dequeue(Client, NULLKey);
|
|
45829 |
--i; /* Keep the index value in the next iteration */
|
|
45830 |
continue;
|
|
45831 |
@@ -925,7 +1199,7 @@ static void Cache_process_queue(CacheDat
|
|
45832 |
gint flags = ClientWeb->flags;
|
|
45833 |
/* We finished sending data, let the client know */
|
|
45834 |
if (!Client->Callback)
|
|
45835 |
- DEBUG_MSG(3, "Client Callback is NULL");
|
|
45836 |
+ DEBUG_MSG(3, _("Client Callback is NULL"));
|
|
45837 |
else
|
|
45838 |
(Client->Callback)(CA_Close, Client);
|
|
45839 |
Cache_client_dequeue(Client, NULLKey);
|
|
45840 |
@@ -933,10 +1207,10 @@ static void Cache_process_queue(CacheDat
|
|
45841 |
|
|
45842 |
/* call Cache_redirect() from this 'if' to assert one call only. */
|
|
45843 |
if ( entry->Flags & CA_Redirect )
|
|
45844 |
- Cache_redirect(entry, flags, Client_bw);
|
|
45845 |
+ Cache_redirect(entry, flags, Client_dd);
|
|
45846 |
|
|
45847 |
_MSG("Cache_process_queue: NumRootClients=%d sens_idle_id = %d\n",
|
|
45848 |
- Client_bw->NumRootClients, Client_bw->sens_idle_id);
|
|
45849 |
+ Client_dd->bw->NumRootClients, Client_dd->bw->sens_idle_id);
|
|
45850 |
}
|
|
45851 |
}
|
|
45852 |
} /* for */
|
|
45853 |
@@ -945,7 +1219,7 @@ static void Cache_process_queue(CacheDat
|
|
45854 |
/* Abort the entry, remove it from cache, and maybe offer download.
|
|
45855 |
* (the dialog is made before 'entry' is freed) */
|
|
45856 |
if (OfferDownload && Cache_download_enabled(entry->Url))
|
|
45857 |
- a_Interface_offer_link_download(Client_bw, entry->Url);
|
|
45858 |
+ a_Interface_offer_link_download(Client_dd->bw, entry->Url);
|
|
45859 |
Cache_entry_remove(entry, NULL);
|
|
45860 |
}
|
|
45861 |
|
|
45862 |
@@ -1008,7 +1282,7 @@ static void Cache_remove_interface_clien
|
|
45863 |
for ( i = 0; (Client = g_slist_nth_data(ClientQueue, i)); ++i ) {
|
|
45864 |
if ( Client->Url == Url ) {
|
|
45865 |
Web = Client->Web;
|
|
45866 |
- a_Interface_remove_client(Web->bw, Client->Key);
|
|
45867 |
+ a_Doc_remove_client(Web->dd, Client->Key);
|
|
45868 |
}
|
|
45869 |
}
|
|
45870 |
}
|
|
45871 |
@@ -1026,7 +1300,7 @@ static void Cache_stop_client(gint Key,
|
|
45872 |
|
|
45873 |
if (!(List = g_slist_find_custom(ClientQueue, GINT_TO_POINTER(Key),
|
|
45874 |
Cache_client_key_cmp))){
|
|
45875 |
- _MSG("WARNING: Cache_stop_client, inexistent client\n");
|
|
45876 |
+ _MSG(_("WARNING: Cache_stop_client, inexistent client\n"));
|
|
45877 |
return;
|
|
45878 |
}
|
|
45879 |
|
|
45880 |
@@ -1168,7 +1442,7 @@ void a_Cache_ccc(int Op, int Branch, int
|
|
45881 |
break;
|
|
45882 |
}
|
|
45883 |
case OpStop:
|
|
45884 |
- MSG(" Not implemented\n");
|
|
45885 |
+ MSG(_(" Not implemented\n"));
|
|
45886 |
break;
|
|
45887 |
case OpAbort:
|
|
45888 |
Cache_entry_remove_raw(NULL, Info->LocalKey);
|
|
45889 |
diff -pruN dillo-0.8.6/src/cache.h dillo-0.8.6-i18n-misc-20070916/src/cache.h
|
|
45890 |
--- dillo-0.8.6/src/cache.h 2005-10-28 01:20:06.000000000 +0900
|
|
45891 |
+++ dillo-0.8.6-i18n-misc-20070916/src/cache.h 2006-05-16 01:21:08.000000000 +0900
|
|
45892 |
@@ -27,6 +27,7 @@
|
|
45893 |
#define CA_Stopped (512) /* True if the entry has been stopped */
|
|
45894 |
#define CA_MsgErased (1024) /* Used to erase the bw's status bar */
|
|
45895 |
#define CA_RedirectLoop (2048) /* Redirect loop */
|
|
45896 |
+#define CA_Expires (4096) /* Should be reloaded, when expired */
|
|
45897 |
|
|
45898 |
/*
|
|
45899 |
* Callback type for cache clients
|
|
45900 |
diff -pruN dillo-0.8.6/src/capi.c dillo-0.8.6-i18n-misc-20070916/src/capi.c
|
|
45901 |
--- dillo-0.8.6/src/capi.c 2006-01-04 04:39:31.000000000 +0900
|
|
45902 |
+++ dillo-0.8.6-i18n-misc-20070916/src/capi.c 2006-07-08 21:49:11.000000000 +0900
|
|
45903 |
@@ -15,12 +15,16 @@
|
|
45904 |
* to get the requests served. Kind of a broker.
|
|
45905 |
*/
|
|
45906 |
|
|
45907 |
+#include <config.h>
|
|
45908 |
#include <string.h>
|
|
45909 |
#include <unistd.h> /* for pipe */
|
|
45910 |
|
|
45911 |
+#include "i18n.h"
|
|
45912 |
+#include "intl.h"
|
|
45913 |
#include "msg.h"
|
|
45914 |
#include "capi.h"
|
|
45915 |
#include "IO/Url.h"
|
|
45916 |
+#include "web.h"
|
|
45917 |
#include "chain.h"
|
|
45918 |
#include "list.h"
|
|
45919 |
#include "interface.h"
|
|
45920 |
@@ -39,7 +43,7 @@
|
|
45921 |
typedef struct {
|
|
45922 |
DilloWeb *web;
|
|
45923 |
DilloUrl *url; /* local copy of web->url. Used when the latter is freed */
|
|
45924 |
- void *bw;
|
|
45925 |
+ DilloDoc *dd;
|
|
45926 |
gchar *server;
|
|
45927 |
gchar *datastr;
|
|
45928 |
gint SockFD;
|
|
45929 |
@@ -83,14 +87,15 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
45930 |
* Create a new connection data structure
|
|
45931 |
*/
|
|
45932 |
static dpi_conn_t *
|
|
45933 |
- Capi_dpi_conn_new(DilloWeb *web, void *bw, char *server, gchar *datastr)
|
|
45934 |
+Capi_dpi_conn_new(DilloWeb *web, DilloDoc *dd, char *server, gchar *datastr)
|
|
45935 |
{
|
|
45936 |
dpi_conn_t *conn;
|
|
45937 |
|
|
45938 |
conn = g_new(dpi_conn_t, 1);
|
|
45939 |
conn->web = web;
|
|
45940 |
conn->url = (web) ? a_Url_dup(web->url) : NULL;
|
|
45941 |
- conn->bw = bw;
|
|
45942 |
+ conn->dd = dd;
|
|
45943 |
+ conn->server = server;
|
|
45944 |
conn->server = g_strdup(server);
|
|
45945 |
conn->datastr = g_strdup(datastr);
|
|
45946 |
conn->SockFD = -1;
|
|
45947 |
@@ -211,8 +216,8 @@ static gint Capi_verify_dpi_url_request(
|
|
45948 |
/* test POST and GET */
|
|
45949 |
if (strchr(URL_STR(web->url), '?') || URL_DATA_(web->url)) {
|
|
45950 |
/* safety measure: only allow dpi requests from dpi-generated urls */
|
|
45951 |
- if (a_Nav_stack_size(web->bw)) {
|
|
45952 |
- referer = a_History_get_url(NAV_TOP(web->bw));
|
|
45953 |
+ if (a_Nav_stack_size(web->dd)) {
|
|
45954 |
+ referer = a_History_get_url(NAV_TOP(web->dd));
|
|
45955 |
if (g_strncasecmp(URL_STR(referer), "dpi:/", 5) == 0)
|
|
45956 |
allow = TRUE;
|
|
45957 |
}
|
|
45958 |
@@ -221,7 +226,7 @@ static gint Capi_verify_dpi_url_request(
|
|
45959 |
}
|
|
45960 |
|
|
45961 |
if (!allow) {
|
|
45962 |
- MSG("Capi_verify_dpi_url_request: Permission Denied!\n");
|
|
45963 |
+ MSG(_("Capi_verify_dpi_url_request: Permission Denied!\n"));
|
|
45964 |
MSG(" URL_STR : %s\n", URL_STR(web->url));
|
|
45965 |
if (URL_DATA_(web->url))
|
|
45966 |
MSG(" URL_DATA: %s\n", URL_DATA(web->url));
|
|
45967 |
@@ -250,9 +255,10 @@ gint a_Capi_url_uses_dpi(gchar *url_str,
|
|
45968 |
|
|
45969 |
} else if (g_strncasecmp(url_str, "ftp:/", 5) == 0) {
|
|
45970 |
server = g_strdup("ftp");
|
|
45971 |
-
|
|
45972 |
+#ifndef DILLO_SSL
|
|
45973 |
} else if (g_strncasecmp(url_str, "https:/", 7) == 0) {
|
|
45974 |
server = g_strdup("https");
|
|
45975 |
+#endif
|
|
45976 |
} else if (g_strncasecmp(url_str, "file:", 5) == 0) {
|
|
45977 |
server = g_strdup("file");
|
|
45978 |
} else if (g_strncasecmp(url_str, "data:", 5) == 0) {
|
|
45979 |
@@ -315,13 +321,13 @@ gint a_Capi_open_url(DilloWeb *web, CA_C
|
|
45980 |
safe = 1;
|
|
45981 |
}
|
|
45982 |
|
|
45983 |
- _MSG(" reload=%d URL_E2EReload=%d\n", reload,
|
|
45984 |
+ _MSG(_(" reload=%d URL_E2EReload=%d\n"), reload,
|
|
45985 |
(URL_FLAGS(web->url) & URL_E2EReload));
|
|
45986 |
|
|
45987 |
if (safe && reload) {
|
|
45988 |
/* Send dpip command */
|
|
45989 |
cmd = Capi_dpi_build_cmd(web->url, server);
|
|
45990 |
- a_Capi_dpi_send_cmd(web, web->bw, cmd, server, 1);
|
|
45991 |
+ a_Capi_dpi_send_cmd(web, web->dd, cmd, server, 1);
|
|
45992 |
g_free(cmd);
|
|
45993 |
|
|
45994 |
/* test the new dpi-cache connection! */
|
|
45995 |
@@ -357,7 +363,7 @@ gint a_Capi_get_buf(const DilloUrl *Url,
|
|
45996 |
* Send a dpi cmd.
|
|
45997 |
* (For instance: add_bookmark, open_url, send_preferences, ...)
|
|
45998 |
*/
|
|
45999 |
-gint a_Capi_dpi_send_cmd(DilloWeb *web, void *bw, char *cmd, char *server,
|
|
46000 |
+gint a_Capi_dpi_send_cmd(DilloWeb *web, void *dd, char *cmd, char *server,
|
|
46001 |
gint flags)
|
|
46002 |
{
|
|
46003 |
dpi_conn_t *conn;
|
|
46004 |
@@ -367,7 +373,7 @@ gint a_Capi_dpi_send_cmd(DilloWeb *web,
|
|
46005 |
/* open a new connection to server */
|
|
46006 |
|
|
46007 |
/* Create a new connection data struct and add it to the list */
|
|
46008 |
- conn = Capi_dpi_conn_new(web, bw, server, cmd);
|
|
46009 |
+ conn = Capi_dpi_conn_new(web, dd, server, cmd);
|
|
46010 |
/* start the CCC operations */
|
|
46011 |
a_Capi_ccc(OpStart, 1, BCK, conn->InfoSend, conn, server);
|
|
46012 |
|
|
46013 |
@@ -380,7 +386,7 @@ gint a_Capi_dpi_send_cmd(DilloWeb *web,
|
|
46014 |
a_Capi_ccc(OpSend, 1, BCK, conn->InfoSend, dbuf, NULL);
|
|
46015 |
g_free(dbuf);
|
|
46016 |
} else {
|
|
46017 |
- MSG(" ERROR: [a_Capi_dpi_send_cmd] No open connection found\n");
|
|
46018 |
+ MSG(_(" ERROR: [a_Capi_dpi_send_cmd] No open connection found\n"));
|
|
46019 |
}
|
|
46020 |
}
|
|
46021 |
|
|
46022 |
@@ -419,7 +425,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46023 |
break;
|
|
46024 |
case OpStop:
|
|
46025 |
case OpAbort:
|
|
46026 |
- MSG(" Not implemented\n");
|
|
46027 |
+ MSG(_(" Not implemented\n"));
|
|
46028 |
break;
|
|
46029 |
}
|
|
46030 |
} else { /* FWD */
|
|
46031 |
@@ -448,7 +454,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46032 |
case OpAbort:
|
|
46033 |
conn = Info->LocalKey;
|
|
46034 |
if (Data1 && !strcmp(Data1, "ERR_dpid"))
|
|
46035 |
- a_Interface_msg(conn->bw, "ERROR: can't start dpid daemon!");
|
|
46036 |
+ a_Interface_msg(conn->dd->bw, _("ERROR: can't start dpid daemon!"));
|
|
46037 |
Capi_dpi_conn_unref(conn);
|
|
46038 |
g_free(Info);
|
|
46039 |
break;
|
|
46040 |
@@ -472,7 +478,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46041 |
case OpStop:
|
|
46042 |
case OpAbort:
|
|
46043 |
Capi_dpi_conn_unref(Info->LocalKey);
|
|
46044 |
- MSG(" Not implemented\n");
|
|
46045 |
+ MSG(_(" Not implemented\n"));
|
|
46046 |
break;
|
|
46047 |
}
|
|
46048 |
} else { /* FWD */
|
|
46049 |
@@ -483,7 +489,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46050 |
if (conn->Flags & ABORTED ||
|
|
46051 |
(conn->web && !a_Web_valid(conn->web))) {
|
|
46052 |
/* there's no client for this transfer!*/
|
|
46053 |
- _MSG(" ** Capi 2F catched an invalid 'web' structure\n");
|
|
46054 |
+ _MSG(_(" ** Capi 2F catched an invalid 'web' structure\n"));
|
|
46055 |
/* this flag is used just in case the same memory address
|
|
46056 |
* is reused for a new 'web' and the test passes */
|
|
46057 |
conn->Flags &= ABORTED;
|
|
46058 |
@@ -491,12 +497,12 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46059 |
a_Chain_bcb(OpStop, Info, conn->url, NULL);
|
|
46060 |
|
|
46061 |
} else if (strcmp(Data2, "send_status_message") == 0) {
|
|
46062 |
- a_Interface_msg(conn->bw, "%s", Data1);
|
|
46063 |
+ a_Interface_msg(conn->dd->bw, "%s", Data1);
|
|
46064 |
} else if (strcmp(Data2, "chat") == 0) {
|
|
46065 |
- a_Interface_msg(conn->bw, "%s", Data1);
|
|
46066 |
+ a_Interface_msg(conn->dd->bw, "%s", Data1);
|
|
46067 |
a_Bookmarks_chat_add(NULL, NULL, Data1);
|
|
46068 |
} else if (strcmp(Data2, "dialog") == 0) {
|
|
46069 |
- a_Dpiapi_dialog(conn->bw, conn->server, Data1);
|
|
46070 |
+ a_Dpiapi_dialog(conn->dd, conn->server, Data1);
|
|
46071 |
} else if (strcmp(Data2, "start_send_page") == 0) {
|
|
46072 |
/* start the pipe-writing chain */
|
|
46073 |
a_Capi_ccc(OpStart, 3, BCK, a_Chain_new(), Info->LocalKey,NULL);
|
|
46074 |
@@ -505,7 +511,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46075 |
} else if (strcmp(Data2, "send_page_2eof") == 0) {
|
|
46076 |
a_Capi_ccc(OpSend, 3, BCK, conn->InfoPipe, Data1, NULL);
|
|
46077 |
} else if (strcmp(Data2, "reload_request") == 0) {
|
|
46078 |
- a_Nav_reload(conn->bw);
|
|
46079 |
+ a_Nav_reload(conn->dd);
|
|
46080 |
}
|
|
46081 |
break;
|
|
46082 |
case OpEnd:
|
|
46083 |
@@ -527,7 +533,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46084 |
}
|
|
46085 |
case OpStop:
|
|
46086 |
case OpAbort:
|
|
46087 |
- MSG(" Not implemented\n");
|
|
46088 |
+ MSG(_(" Not implemented\n"));
|
|
46089 |
break;
|
|
46090 |
}
|
|
46091 |
}
|
|
46092 |
@@ -543,7 +549,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46093 |
Capi_dpi_conn_ref(conn);
|
|
46094 |
conn->InfoPipe = Info;
|
|
46095 |
if (pipe(conn->DpiPipe)) {
|
|
46096 |
- MSG(" Error with pipe\n");
|
|
46097 |
+ MSG(_(" Error with pipe\n"));
|
|
46098 |
return;
|
|
46099 |
}
|
|
46100 |
a_Chain_link_new(Info, a_Capi_ccc, BCK, a_IO_ccc, 3, 3);
|
|
46101 |
@@ -561,7 +567,7 @@ void a_Capi_ccc(int Op, int Branch, int
|
|
46102 |
case OpStop:
|
|
46103 |
case OpAbort:
|
|
46104 |
Capi_dpi_conn_unref(Info->LocalKey);
|
|
46105 |
- MSG(" Not implemented\n");
|
|
46106 |
+ MSG(_(" Not implemented\n"));
|
|
46107 |
break;
|
|
46108 |
}
|
|
46109 |
} else { /* FWD */
|
|
46110 |
diff -pruN dillo-0.8.6/src/capi.h dillo-0.8.6-i18n-misc-20070916/src/capi.h
|
|
46111 |
--- dillo-0.8.6/src/capi.h 2005-10-28 01:20:06.000000000 +0900
|
|
46112 |
+++ dillo-0.8.6-i18n-misc-20070916/src/capi.h 2006-05-16 01:21:08.000000000 +0900
|
|
46113 |
@@ -10,7 +10,7 @@
|
|
46114 |
*/
|
|
46115 |
gint a_Capi_open_url(DilloWeb *web, CA_Callback_t Call, void *CbData);
|
|
46116 |
gint a_Capi_get_buf(const DilloUrl *Url, gchar **PBuf, gint *BufSize);
|
|
46117 |
-gint a_Capi_dpi_send_cmd(DilloWeb *web, void *bw, char *cmd, char *server,
|
|
46118 |
+gint a_Capi_dpi_send_cmd(DilloWeb *web, void *dd, char *cmd, char *server,
|
|
46119 |
gint flags);
|
|
46120 |
gint a_Capi_url_uses_dpi(gchar *url_str, gchar **server_ptr);
|
|
46121 |
|
|
46122 |
diff -pruN dillo-0.8.6/src/colors.c dillo-0.8.6-i18n-misc-20070916/src/colors.c
|
|
46123 |
--- dillo-0.8.6/src/colors.c 2005-10-28 01:20:07.000000000 +0900
|
|
46124 |
+++ dillo-0.8.6-i18n-misc-20070916/src/colors.c 2006-05-16 01:21:08.000000000 +0900
|
|
46125 |
@@ -308,7 +308,7 @@ static int Color_distance3(long c1, long
|
|
46126 |
|
|
46127 |
/*
|
|
46128 |
* Return a suitable "visited link" color
|
|
46129 |
- * Return value:
|
|
46130 |
+ * Return value:
|
|
46131 |
* if candidate has good contrast with C_txt, C_lnk and C_bg -> candidate
|
|
46132 |
* else another color (from the internal list)
|
|
46133 |
*/
|
|
46134 |
diff -pruN dillo-0.8.6/src/commands.c dillo-0.8.6-i18n-misc-20070916/src/commands.c
|
|
46135 |
--- dillo-0.8.6/src/commands.c 2005-10-28 01:20:07.000000000 +0900
|
|
46136 |
+++ dillo-0.8.6-i18n-misc-20070916/src/commands.c 2006-05-16 01:21:08.000000000 +0900
|
|
46137 |
@@ -10,17 +10,23 @@
|
|
46138 |
* (at your option) any later version.
|
|
46139 |
*/
|
|
46140 |
|
|
46141 |
+#include <config.h>
|
|
46142 |
#include <gtk/gtk.h>
|
|
46143 |
#include <stdio.h> /* for sprintf */
|
|
46144 |
#include <sys/time.h> /* for gettimeofday (testing gorp only) */
|
|
46145 |
#include <unistd.h>
|
|
46146 |
#include <string.h> /* for strcat() */
|
|
46147 |
|
|
46148 |
+#include "intl.h"
|
|
46149 |
#include "msg.h"
|
|
46150 |
#include "bookmark.h"
|
|
46151 |
#include "interface.h"
|
|
46152 |
+#ifndef DISABLE_TABS
|
|
46153 |
+#include "tab.h"
|
|
46154 |
+#endif /* !DISABLE_TABS */
|
|
46155 |
#include "history.h"
|
|
46156 |
#include "nav.h"
|
|
46157 |
+#include "doc.h"
|
|
46158 |
#include "misc.h"
|
|
46159 |
#include "commands.h"
|
|
46160 |
#include "prefs.h"
|
|
46161 |
@@ -28,6 +34,9 @@
|
|
46162 |
#include "capi.h"
|
|
46163 |
#include "selection.h"
|
|
46164 |
|
|
46165 |
+#include <gdk/gdkkeysyms.h>
|
|
46166 |
+#include "i18n.h"
|
|
46167 |
+
|
|
46168 |
/* FILE MENU */
|
|
46169 |
|
|
46170 |
/*
|
|
46171 |
@@ -43,6 +52,17 @@ void a_Commands_new_callback(GtkWidget *
|
|
46172 |
gtk_widget_grab_focus(nbw->location);
|
|
46173 |
}
|
|
46174 |
|
|
46175 |
+#ifndef DISABLE_TABS
|
|
46176 |
+/*
|
|
46177 |
+ * Create a new browser tab
|
|
46178 |
+ */
|
|
46179 |
+void a_Commands_new_tab_callback(GtkWidget *widget, gpointer client_data)
|
|
46180 |
+{
|
|
46181 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46182 |
+ a_Tab_new(bw);
|
|
46183 |
+}
|
|
46184 |
+
|
|
46185 |
+#endif
|
|
46186 |
/*
|
|
46187 |
* Create and show the "Open file" dialog
|
|
46188 |
*/
|
|
46189 |
@@ -55,18 +75,26 @@ void a_Commands_openfile_callback(GtkWid
|
|
46190 |
|
|
46191 |
/*
|
|
46192 |
* Create and show the "Open Url" dialog window
|
|
46193 |
+ * OR (when prefs.popup_dialogs = FALSE)
|
|
46194 |
+ * focus location bar and select contents
|
|
46195 |
*/
|
|
46196 |
void a_Commands_openurl_callback(GtkWidget *widget, gpointer client_data)
|
|
46197 |
{
|
|
46198 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46199 |
- a_Interface_open_dialog(widget, bw);
|
|
46200 |
+ if (prefs.popup_dialogs)
|
|
46201 |
+ a_Interface_open_dialog(widget, bw);
|
|
46202 |
+ else
|
|
46203 |
+ gtk_widget_grab_focus(bw->location);
|
|
46204 |
}
|
|
46205 |
|
|
46206 |
/*
|
|
46207 |
- * ?
|
|
46208 |
+ * Show Configurarion Script
|
|
46209 |
*/
|
|
46210 |
void a_Commands_prefs_callback(GtkWidget *widget, gpointer client_data)
|
|
46211 |
{
|
|
46212 |
+ gchar *cmd = g_strdup_printf("dillocfg&\n");
|
|
46213 |
+ system(cmd);
|
|
46214 |
+ g_free(cmd);
|
|
46215 |
}
|
|
46216 |
|
|
46217 |
/*
|
|
46218 |
@@ -75,9 +103,34 @@ void a_Commands_prefs_callback(GtkWidget
|
|
46219 |
void a_Commands_close_callback(GtkWidget *widget, gpointer client_data)
|
|
46220 |
{
|
|
46221 |
BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46222 |
+ a_Interface_findtext_dialog_close();
|
|
46223 |
gtk_widget_destroy(bw->main_window);
|
|
46224 |
}
|
|
46225 |
|
|
46226 |
+#ifndef DISABLE_TABS
|
|
46227 |
+/*
|
|
46228 |
+ * Close current browser tab, and exit dillo if it's the last one.
|
|
46229 |
+ */
|
|
46230 |
+void a_Commands_close_current_tab_callback(GtkWidget *widget, gpointer client_data)
|
|
46231 |
+{
|
|
46232 |
+ BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46233 |
+ a_Tab_close(bw->dd);
|
|
46234 |
+}
|
|
46235 |
+
|
|
46236 |
+/*
|
|
46237 |
+ * Close a browser tab, and exit dillo if it's the last one.
|
|
46238 |
+ *
|
|
46239 |
+ * The difference with a_Commands_close_current_tab_callback is that this
|
|
46240 |
+ * callback is called with a specific dd as parameter, while the former is
|
|
46241 |
+ * called with only a bw
|
|
46242 |
+ */
|
|
46243 |
+void a_Commands_close_tab_callback(GtkWidget *widget, gpointer client_data)
|
|
46244 |
+{
|
|
46245 |
+ DilloDoc *dd = (DilloDoc *)client_data;
|
|
46246 |
+ a_Tab_close(dd);
|
|
46247 |
+}
|
|
46248 |
+
|
|
46249 |
+#endif /* DISABLE_TABS */
|
|
46250 |
/*
|
|
46251 |
* Free memory and quit dillo
|
|
46252 |
*/
|
|
46253 |
@@ -90,21 +143,32 @@ void a_Commands_exit_callback(GtkWidget
|
|
46254 |
/* PAGE MENU */
|
|
46255 |
|
|
46256 |
/*
|
|
46257 |
- * Show current page's source code.
|
|
46258 |
+ * Show current root document's source
|
|
46259 |
*/
|
|
46260 |
-void a_Commands_viewsource_callback (GtkWidget *widget, gpointer client_data)
|
|
46261 |
+void a_Commands_viewsource_callback(GtkWidget *widget, gpointer client_data)
|
|
46262 |
{
|
|
46263 |
- BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46264 |
- gchar *buf;
|
|
46265 |
- gint buf_size;
|
|
46266 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46267 |
+ a_Commands_viewsource_doc_callback(widget, (gpointer) bw->dd);
|
|
46268 |
+}
|
|
46269 |
|
|
46270 |
+/*
|
|
46271 |
+ * Show document's source code.
|
|
46272 |
+ */
|
|
46273 |
+void a_Commands_viewsource_doc_callback (GtkWidget *widget, gpointer client_data)
|
|
46274 |
+{
|
|
46275 |
+ DilloDoc *dd = (DilloDoc *)client_data;
|
|
46276 |
+ gchar *title, *buf;
|
|
46277 |
+ gint buf_size;
|
|
46278 |
+
|
|
46279 |
/* Get page source data */
|
|
46280 |
- a_Capi_get_buf(a_History_get_url(NAV_TOP(bw)), &buf, &buf_size);
|
|
46281 |
+ a_Capi_get_buf(a_History_get_url(NAV_TOP(dd)), &buf, &buf_size);
|
|
46282 |
/* Show it */
|
|
46283 |
- a_Interface_text_window (&bw->viewsource_window,
|
|
46284 |
- "View Source", "view_source",
|
|
46285 |
+ title = a_I18n_locale_to_DILLO_CHARSET(_("View Source"));
|
|
46286 |
+ a_Interface_text_window (&dd->bw->viewsource_window,
|
|
46287 |
+ title, "view_source",
|
|
46288 |
buf, buf_size,
|
|
46289 |
530, 500);
|
|
46290 |
+ g_free(title);
|
|
46291 |
}
|
|
46292 |
|
|
46293 |
/*
|
|
46294 |
@@ -114,12 +178,15 @@ void a_Commands_view_page_bugs_callback
|
|
46295 |
gpointer client_data)
|
|
46296 |
{
|
|
46297 |
DilloHtmlLB *html_lb = client_data;
|
|
46298 |
+ gchar *title;
|
|
46299 |
|
|
46300 |
- a_Interface_text_window (&html_lb->bw->pagebugs_window,
|
|
46301 |
- "Detected HTML errors", "page_bugs",
|
|
46302 |
+ title = a_I18n_locale_to_DILLO_CHARSET(_("Detected HTML errors"));
|
|
46303 |
+ a_Interface_text_window (&html_lb->dd->bw->pagebugs_window,
|
|
46304 |
+ title, "page_bugs",
|
|
46305 |
html_lb->page_bugs->str,
|
|
46306 |
html_lb->page_bugs->len,
|
|
46307 |
530, 500);
|
|
46308 |
+ g_free(title);
|
|
46309 |
}
|
|
46310 |
|
|
46311 |
/*
|
|
46312 |
@@ -130,7 +197,7 @@ void a_Commands_selectall_callback(GtkWi
|
|
46313 |
}
|
|
46314 |
|
|
46315 |
/*
|
|
46316 |
- * Create and show the "Find Text" dialog window
|
|
46317 |
+ * Create and show the "Find Text" dialog window for this page
|
|
46318 |
*/
|
|
46319 |
void a_Commands_findtext_callback(GtkWidget *widget, gpointer client_data)
|
|
46320 |
{
|
|
46321 |
@@ -148,20 +215,56 @@ void a_Commands_print_callback(GtkWidget
|
|
46322 |
{
|
|
46323 |
}
|
|
46324 |
|
|
46325 |
+/* DOCUMENT (FRAME/IFRAME) MENU */
|
|
46326 |
+/*
|
|
46327 |
+ * Create and show the "Find Text" dialog window for this document
|
|
46328 |
+ */
|
|
46329 |
+void a_Commands_findtext_doc_callback(GtkWidget *widget, gpointer client_data)
|
|
46330 |
+{
|
|
46331 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
46332 |
|
|
46333 |
-/* TOOLBAR MENU */
|
|
46334 |
+ /* set search list to this document's visible children */
|
|
46335 |
+ dd->bw->dd_list = a_Doc_get_visible_children(dd);
|
|
46336 |
+ a_Interface_findtext_dialog( dd->bw );
|
|
46337 |
+}
|
|
46338 |
|
|
46339 |
/*
|
|
46340 |
+ * Bring up the save doc dialog
|
|
46341 |
+ */
|
|
46342 |
+void a_Commands_save_doc_callback(GtkWidget *widget, gpointer client_data)
|
|
46343 |
+{
|
|
46344 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
46345 |
+
|
|
46346 |
+ a_Menu_popup_set_url(dd->bw, a_History_get_url(NAV_TOP(dd)));
|
|
46347 |
+ a_Interface_save_link_dialog(widget, dd->bw);
|
|
46348 |
+}
|
|
46349 |
+
|
|
46350 |
+/*
|
|
46351 |
+ * Show only this doc in the page
|
|
46352 |
+ */
|
|
46353 |
+void a_Commands_showonly_doc_callback(GtkWidget *widget, gpointer client_data)
|
|
46354 |
+{
|
|
46355 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
46356 |
+
|
|
46357 |
+ a_Nav_push(dd->bw->dd, a_History_get_url(NAV_TOP(dd)));
|
|
46358 |
+}
|
|
46359 |
+
|
|
46360 |
+/* TOOLBAR MENU */
|
|
46361 |
+/*
|
|
46362 |
* Abort all active connections for this page
|
|
46363 |
* (Downloads MUST keep flowing)
|
|
46364 |
*/
|
|
46365 |
void a_Commands_stop_callback(GtkWidget *widget, gpointer client_data)
|
|
46366 |
{
|
|
46367 |
BrowserWindow *bw = client_data;
|
|
46368 |
- a_Nav_cancel_expect(bw);
|
|
46369 |
- a_Interface_stop(bw);
|
|
46370 |
+ gchar *msg_enc;
|
|
46371 |
+
|
|
46372 |
+ a_Nav_cancel_expect(bw->dd);
|
|
46373 |
+ a_Doc_stop(bw->dd);
|
|
46374 |
a_Interface_set_button_sens(bw);
|
|
46375 |
- a_Interface_msg(bw, "Stopped");
|
|
46376 |
+ msg_enc= a_I18n_locale_to_DILLO_CHARSET(_("Stopped"));
|
|
46377 |
+ a_Interface_msg(bw, msg_enc);
|
|
46378 |
+ g_free(msg_enc);
|
|
46379 |
}
|
|
46380 |
|
|
46381 |
/*
|
|
46382 |
@@ -171,7 +274,7 @@ void a_Commands_back_callback(GtkWidget
|
|
46383 |
{
|
|
46384 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46385 |
|
|
46386 |
- a_Nav_back(bw);
|
|
46387 |
+ a_Nav_back(bw->dd);
|
|
46388 |
}
|
|
46389 |
|
|
46390 |
/*
|
|
46391 |
@@ -211,7 +314,7 @@ void a_Commands_history_callback_same_bw
|
|
46392 |
{
|
|
46393 |
BrowserWindow *bw = client_data;
|
|
46394 |
|
|
46395 |
- a_Nav_jump_callback(widget, bw, 0);
|
|
46396 |
+ a_Nav_jump_callback(widget, bw->dd, 0);
|
|
46397 |
}
|
|
46398 |
|
|
46399 |
/*
|
|
46400 |
@@ -223,7 +326,19 @@ void a_Commands_history_callback_new_bw(
|
|
46401 |
{
|
|
46402 |
BrowserWindow *bw = client_data;
|
|
46403 |
|
|
46404 |
- a_Nav_jump_callback(widget, bw, 1);
|
|
46405 |
+ a_Nav_jump_callback(widget, bw->dd, 1);
|
|
46406 |
+}
|
|
46407 |
+
|
|
46408 |
+/*
|
|
46409 |
+ * Handler for menu entries in the history menus. This one is called, when
|
|
46410 |
+ * the link should be opened in a new tab.
|
|
46411 |
+ */
|
|
46412 |
+void a_Commands_history_callback_new_tab(GtkWidget *widget,
|
|
46413 |
+ gpointer client_data)
|
|
46414 |
+{
|
|
46415 |
+ BrowserWindow *bw = client_data;
|
|
46416 |
+
|
|
46417 |
+ a_Nav_jump_callback(widget, bw->dd, 2);
|
|
46418 |
}
|
|
46419 |
|
|
46420 |
/*
|
|
46421 |
@@ -233,17 +348,28 @@ void a_Commands_forw_callback(GtkWidget
|
|
46422 |
{
|
|
46423 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46424 |
|
|
46425 |
- a_Nav_forw(bw);
|
|
46426 |
+ a_Nav_forw(bw->dd);
|
|
46427 |
}
|
|
46428 |
|
|
46429 |
/*
|
|
46430 |
- * Start the reload process
|
|
46431 |
+ * Start the reload process for a document
|
|
46432 |
+ */
|
|
46433 |
+void a_Commands_reload_doc_callback(GtkWidget *widget, gpointer client_data)
|
|
46434 |
+{
|
|
46435 |
+ DilloDoc *dd = (DilloDoc *)client_data;
|
|
46436 |
+
|
|
46437 |
+ a_Nav_reload(dd);
|
|
46438 |
+}
|
|
46439 |
+
|
|
46440 |
+/*
|
|
46441 |
+ * Start the reload process for the page
|
|
46442 |
*/
|
|
46443 |
void a_Commands_reload_callback(GtkWidget *widget, gpointer client_data)
|
|
46444 |
{
|
|
46445 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46446 |
|
|
46447 |
- a_Nav_reload(bw);
|
|
46448 |
+ a_Interface_findtext_dialog_close();
|
|
46449 |
+ a_Nav_reload(bw->dd);
|
|
46450 |
}
|
|
46451 |
|
|
46452 |
/*
|
|
46453 |
@@ -253,7 +379,36 @@ void a_Commands_home_callback(GtkWidget
|
|
46454 |
{
|
|
46455 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46456 |
|
|
46457 |
- a_Nav_home(bw);
|
|
46458 |
+ a_Nav_home(bw->dd);
|
|
46459 |
+}
|
|
46460 |
+
|
|
46461 |
+/*
|
|
46462 |
+ * Open home with new window/tab
|
|
46463 |
+ */
|
|
46464 |
+void a_Commands_home_nw_callback(GtkWidget *widget, gpointer client_data)
|
|
46465 |
+{
|
|
46466 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46467 |
+ DilloDoc *newdd;
|
|
46468 |
+
|
|
46469 |
+#ifndef DISABLE_TABS
|
|
46470 |
+ if (prefs.tab_instead_of_window) {
|
|
46471 |
+ newdd = a_Doc_new();
|
|
46472 |
+ a_Tab_add(bw, newdd);
|
|
46473 |
+ a_Tab_switch(newdd);
|
|
46474 |
+ a_Nav_home(newdd);
|
|
46475 |
+ return;
|
|
46476 |
+ }
|
|
46477 |
+#endif
|
|
46478 |
+ {
|
|
46479 |
+ gint width, height;
|
|
46480 |
+ BrowserWindow *newbw;
|
|
46481 |
+
|
|
46482 |
+ gdk_window_get_size (bw->main_window->window,
|
|
46483 |
+ &width, &height);
|
|
46484 |
+ newbw = a_Interface_browser_window_new(width, height, 0);
|
|
46485 |
+ newdd = newbw->dd;
|
|
46486 |
+ a_Nav_home(newdd);
|
|
46487 |
+ }
|
|
46488 |
}
|
|
46489 |
|
|
46490 |
/*
|
|
46491 |
@@ -261,11 +416,12 @@ void a_Commands_home_callback(GtkWidget
|
|
46492 |
*/
|
|
46493 |
void a_Commands_save_callback(GtkWidget *widget, gpointer client_data)
|
|
46494 |
{
|
|
46495 |
- BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46496 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46497 |
|
|
46498 |
a_Interface_save_dialog(widget, bw);
|
|
46499 |
}
|
|
46500 |
|
|
46501 |
+
|
|
46502 |
/*
|
|
46503 |
* Bring up the save link dialog
|
|
46504 |
*/
|
|
46505 |
@@ -276,15 +432,47 @@ void a_Commands_save_link_callback(GtkWi
|
|
46506 |
a_Interface_save_link_dialog(widget, bw);
|
|
46507 |
}
|
|
46508 |
|
|
46509 |
+#ifndef DISABLE_TABS
|
|
46510 |
+/* VIEW MENU */
|
|
46511 |
+void a_Commands_tab_prev_callback(GtkWidget *widget, gpointer client_data)
|
|
46512 |
+{
|
|
46513 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46514 |
+ gtk_notebook_prev_page(GTK_NOTEBOOK(bw->container));
|
|
46515 |
+}
|
|
46516 |
|
|
46517 |
-/* BOOKMARKS MENU */
|
|
46518 |
+void a_Commands_tab_next_callback(GtkWidget *widget, gpointer client_data)
|
|
46519 |
+{
|
|
46520 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46521 |
+ gtk_notebook_next_page(GTK_NOTEBOOK(bw->container));
|
|
46522 |
+}
|
|
46523 |
|
|
46524 |
+#endif
|
|
46525 |
+/* BOOKMARKS MENU */
|
|
46526 |
/*
|
|
46527 |
- * Add a bookmark to the current bookmark widget.
|
|
46528 |
+ * Add a bookmark for the current doc to the current bookmark widget.
|
|
46529 |
*/
|
|
46530 |
void a_Commands_addbm_callback(GtkWidget *widget, gpointer client_data)
|
|
46531 |
{
|
|
46532 |
- a_Bookmarks_add(widget, client_data);
|
|
46533 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46534 |
+
|
|
46535 |
+ a_Bookmarks_add(bw->dd, a_History_get_url(NAV_TOP(bw->dd)));
|
|
46536 |
+}
|
|
46537 |
+
|
|
46538 |
+void a_Commands_addbm_doc_callback(GtkWidget *widget, gpointer client_data)
|
|
46539 |
+{
|
|
46540 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
46541 |
+
|
|
46542 |
+ a_Bookmarks_add(dd, a_History_get_url(NAV_TOP(dd)));
|
|
46543 |
+}
|
|
46544 |
+
|
|
46545 |
+/*
|
|
46546 |
+ * add a bookmark for the current link
|
|
46547 |
+ */
|
|
46548 |
+void a_Commands_addbm_link_callback(GtkWidget *widget, gpointer client_data)
|
|
46549 |
+{
|
|
46550 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46551 |
+
|
|
46552 |
+ a_Bookmarks_add(bw->dd, a_Menu_popup_get_url(bw));
|
|
46553 |
}
|
|
46554 |
|
|
46555 |
/*
|
|
46556 |
@@ -294,7 +482,36 @@ void a_Commands_viewbm_callback(GtkWidge
|
|
46557 |
{
|
|
46558 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46559 |
|
|
46560 |
- a_Bookmarks_show(bw);
|
|
46561 |
+ a_Bookmarks_show(bw->dd);
|
|
46562 |
+}
|
|
46563 |
+
|
|
46564 |
+/*
|
|
46565 |
+ * Open bookmarks with new window/tab
|
|
46566 |
+ */
|
|
46567 |
+void a_Commands_viewbm_nw_callback(GtkWidget *widget, gpointer client_data)
|
|
46568 |
+{
|
|
46569 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46570 |
+ DilloDoc *newdd;
|
|
46571 |
+
|
|
46572 |
+#ifndef DISABLE_TABS
|
|
46573 |
+ if (prefs.tab_instead_of_window) {
|
|
46574 |
+ newdd = a_Doc_new();
|
|
46575 |
+ a_Tab_add(bw, newdd);
|
|
46576 |
+ a_Tab_switch(newdd);
|
|
46577 |
+ a_Bookmarks_show(newdd);
|
|
46578 |
+ return;
|
|
46579 |
+ }
|
|
46580 |
+#endif
|
|
46581 |
+ {
|
|
46582 |
+ gint width, height;
|
|
46583 |
+ BrowserWindow *newbw;
|
|
46584 |
+
|
|
46585 |
+ gdk_window_get_size (bw->main_window->window,
|
|
46586 |
+ &width, &height);
|
|
46587 |
+ newbw = a_Interface_browser_window_new(width, height, 0);
|
|
46588 |
+ newdd = newbw->dd;
|
|
46589 |
+ a_Bookmarks_show(newdd);
|
|
46590 |
+ }
|
|
46591 |
}
|
|
46592 |
|
|
46593 |
|
|
46594 |
@@ -309,7 +526,7 @@ void a_Commands_helphome_callback(GtkWid
|
|
46595 |
BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46596 |
DilloUrl *url = a_Url_new(DILLO_HOME, NULL, 0, 0, 0);
|
|
46597 |
|
|
46598 |
- a_Nav_push(bw, url);
|
|
46599 |
+ a_Nav_push(bw->dd, url);
|
|
46600 |
a_Url_free(url);
|
|
46601 |
}
|
|
46602 |
|
|
46603 |
@@ -323,7 +540,7 @@ void a_Commands_open_link_callback(GtkWi
|
|
46604 |
{
|
|
46605 |
BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46606 |
|
|
46607 |
- a_Nav_push(bw, a_Menu_popup_get_url(bw));
|
|
46608 |
+ a_Nav_push(bw->dd, a_Menu_popup_get_url(bw));
|
|
46609 |
}
|
|
46610 |
|
|
46611 |
/*
|
|
46612 |
@@ -337,10 +554,59 @@ void a_Commands_open_link_nw_callback(Gt
|
|
46613 |
|
|
46614 |
gdk_window_get_size (bw->main_window->window, &width, &height);
|
|
46615 |
newbw = a_Interface_browser_window_new(width, height, 0);
|
|
46616 |
- a_Nav_push(newbw, a_Menu_popup_get_url(bw));
|
|
46617 |
+ a_Nav_push(newbw->dd, a_Menu_popup_get_url(bw));
|
|
46618 |
}
|
|
46619 |
|
|
46620 |
/*
|
|
46621 |
+ * Duplicate current page in a new window
|
|
46622 |
+ */
|
|
46623 |
+void a_Commands_duplicate_callback(GtkWidget *widget, gpointer client_data)
|
|
46624 |
+{
|
|
46625 |
+ BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46626 |
+ if(bw->dd->nav_stack == NULL) {
|
|
46627 |
+ a_Commands_new_callback(widget, client_data);
|
|
46628 |
+ return;
|
|
46629 |
+ }
|
|
46630 |
+
|
|
46631 |
+ a_Menu_popup_set_url(bw, a_History_get_url(NAV_TOP(bw->dd)));
|
|
46632 |
+ a_Commands_open_link_nw_callback(widget, client_data);
|
|
46633 |
+}
|
|
46634 |
+
|
|
46635 |
+#ifndef DISABLE_TABS
|
|
46636 |
+/*
|
|
46637 |
+ * Open link in another tab
|
|
46638 |
+ */
|
|
46639 |
+void a_Commands_open_link_nw_tab_callback(GtkWidget *widget, gpointer client_data)
|
|
46640 |
+{
|
|
46641 |
+ BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46642 |
+ DilloDoc *newdd;
|
|
46643 |
+
|
|
46644 |
+ newdd = a_Doc_new();
|
|
46645 |
+ a_Tab_add(bw, newdd);
|
|
46646 |
+
|
|
46647 |
+ if (!prefs.tab_load_in_background)
|
|
46648 |
+ a_Tab_switch(newdd);
|
|
46649 |
+
|
|
46650 |
+ a_Nav_push(newdd, a_Menu_popup_get_url(bw));
|
|
46651 |
+}
|
|
46652 |
+
|
|
46653 |
+/*
|
|
46654 |
+ * Duplicate current page in a new tab
|
|
46655 |
+ */
|
|
46656 |
+void a_Commands_duplicate_tab_callback(GtkWidget *widget, gpointer client_data)
|
|
46657 |
+{
|
|
46658 |
+ BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
46659 |
+ if(bw->dd->nav_stack == NULL) {
|
|
46660 |
+ a_Commands_new_tab_callback(widget, client_data);
|
|
46661 |
+ return;
|
|
46662 |
+ }
|
|
46663 |
+
|
|
46664 |
+ a_Menu_popup_set_url(bw, a_History_get_url(NAV_TOP(bw->dd)));
|
|
46665 |
+ a_Commands_open_link_nw_tab_callback(widget, client_data);
|
|
46666 |
+}
|
|
46667 |
+#endif
|
|
46668 |
+
|
|
46669 |
+/*
|
|
46670 |
* Called when the user wants the popup's URL for pasting.
|
|
46671 |
*/
|
|
46672 |
void a_Commands_select_popup_url_callback(GtkWidget *widget, gpointer data)
|
|
46673 |
@@ -349,7 +615,6 @@ void a_Commands_select_popup_url_callbac
|
|
46674 |
a_Selection_set_selection(widget, URL_STR(a_Menu_popup_get_url(bw)));
|
|
46675 |
}
|
|
46676 |
|
|
46677 |
-
|
|
46678 |
/* BUG METER POP-UP MENU */
|
|
46679 |
|
|
46680 |
/*
|
|
46681 |
@@ -362,7 +627,7 @@ static void Commands_ob_validate_page(Br
|
|
46682 |
DilloUrl *url;
|
|
46683 |
|
|
46684 |
/* prepare the validation request URI */
|
|
46685 |
- o_url = URL_STR(a_History_get_url(NAV_TOP(bw)));
|
|
46686 |
+ o_url = URL_STR(a_History_get_url(NAV_TOP(bw->dd)));
|
|
46687 |
e_url = a_Misc_escape_chars(o_url, ":/?");
|
|
46688 |
n_url = e_url ? e_url : o_url;
|
|
46689 |
g_string_sprintf(gstr, fmt, n_url);
|
|
46690 |
@@ -371,7 +636,7 @@ static void Commands_ob_validate_page(Br
|
|
46691 |
url = a_Url_new(gstr->str, NULL, 0, 0, 0);
|
|
46692 |
g_string_free(gstr, TRUE);
|
|
46693 |
|
|
46694 |
- a_Nav_push(bw, url);
|
|
46695 |
+ a_Nav_push(bw->dd, url);
|
|
46696 |
a_Url_free(url);
|
|
46697 |
}
|
|
46698 |
|
|
46699 |
@@ -407,7 +672,58 @@ void a_Commands_ob_info_callback(GtkWidg
|
|
46700 |
const gchar *info_str = "http://www.dillo.org/help/bug_meter.html";
|
|
46701 |
DilloUrl *url = a_Url_new(info_str, NULL, 0, 0, 0);
|
|
46702 |
|
|
46703 |
- a_Nav_push(bw, url);
|
|
46704 |
+ /* here we should un-highlight the selected text */
|
|
46705 |
+ a_Nav_push(bw->dd, url);
|
|
46706 |
a_Url_free(url);
|
|
46707 |
}
|
|
46708 |
|
|
46709 |
+/* MAIN WINDOW */
|
|
46710 |
+
|
|
46711 |
+/*
|
|
46712 |
+ * callback for full screen toggle
|
|
46713 |
+ */
|
|
46714 |
+void a_Commands_full_screen_callback (gpointer client_data)
|
|
46715 |
+{
|
|
46716 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46717 |
+ a_Interface_toggle_panel(bw, TRUE);
|
|
46718 |
+}
|
|
46719 |
+
|
|
46720 |
+/*
|
|
46721 |
+ * Handler for double-mouse-clicks that don't belong to the viewport.
|
|
46722 |
+ */
|
|
46723 |
+gint a_Commands_click_callback(gpointer client_data, GdkEventButton *event)
|
|
46724 |
+{
|
|
46725 |
+ BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
46726 |
+ if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
|
|
46727 |
+ a_Interface_toggle_panel(bw, TRUE);
|
|
46728 |
+ return TRUE;
|
|
46729 |
+}
|
|
46730 |
+
|
|
46731 |
+/*
|
|
46732 |
+ * Handler for key presses that don't belong to the viewport.
|
|
46733 |
+ * (Used to customize the interface a bit)
|
|
46734 |
+ */
|
|
46735 |
+void a_Commands_key_press_handler(GtkWidget *widget,
|
|
46736 |
+ GdkEventKey *event,
|
|
46737 |
+ gpointer client_data)
|
|
46738 |
+{
|
|
46739 |
+ BrowserWindow *bw = client_data;
|
|
46740 |
+ switch (event->keyval) {
|
|
46741 |
+ case GDK_BackSpace:
|
|
46742 |
+ /* This key is handled here because GTK accel group ignores it */
|
|
46743 |
+ if (event->state & GDK_SHIFT_MASK)
|
|
46744 |
+ a_Commands_forw_callback(NULL, bw);
|
|
46745 |
+ else
|
|
46746 |
+ a_Commands_back_callback(NULL, bw);
|
|
46747 |
+ break;
|
|
46748 |
+ case GDK_slash:
|
|
46749 |
+ /* This key is handled here because GTK accel group ignores it */
|
|
46750 |
+ a_Commands_findtext_callback(NULL, bw);
|
|
46751 |
+ break;
|
|
46752 |
+ case GDK_Escape:
|
|
46753 |
+ a_Interface_findtext_dialog_close();
|
|
46754 |
+ default:
|
|
46755 |
+ /* g_print(">> Key pressed!\n"); */
|
|
46756 |
+ break;
|
|
46757 |
+ }
|
|
46758 |
+}
|
|
46759 |
diff -pruN dillo-0.8.6/src/commands.h dillo-0.8.6-i18n-misc-20070916/src/commands.h
|
|
46760 |
--- dillo-0.8.6/src/commands.h 2005-10-28 01:20:07.000000000 +0900
|
|
46761 |
+++ dillo-0.8.6-i18n-misc-20070916/src/commands.h 2006-05-16 01:21:08.000000000 +0900
|
|
46762 |
@@ -11,10 +11,13 @@ void a_Commands_close_callback(GtkWidget
|
|
46763 |
void a_Commands_exit_callback (GtkWidget *widget, gpointer client_data);
|
|
46764 |
|
|
46765 |
void a_Commands_viewsource_callback (GtkWidget *widget, gpointer client_data);
|
|
46766 |
+void a_Commands_viewsource_doc_callback (GtkWidget *widget, gpointer client_data);
|
|
46767 |
void a_Commands_view_page_bugs_callback (GtkWidget *button,
|
|
46768 |
gpointer client_data);
|
|
46769 |
void a_Commands_selectall_callback (GtkWidget *widget, gpointer client_data);
|
|
46770 |
void a_Commands_findtext_callback (GtkWidget *widget, gpointer client_data);
|
|
46771 |
+void a_Commands_findtext_doc_callback (GtkWidget *widget, gpointer client_data);
|
|
46772 |
+void a_Commands_showonly_doc_callback(GtkWidget *widget, gpointer client_data);
|
|
46773 |
void a_Commands_print_callback (GtkWidget *widget, gpointer client_data);
|
|
46774 |
|
|
46775 |
GtkMenu *a_Commands_forw_button_menu_creator_callback(GtkExtButton *button,
|
|
46776 |
@@ -29,22 +32,42 @@ void a_Commands_history_callback_new_bw(
|
|
46777 |
void a_Commands_back_callback (GtkWidget *widget, gpointer client_data);
|
|
46778 |
void a_Commands_forw_callback (GtkWidget *widget, gpointer client_data);
|
|
46779 |
void a_Commands_reload_callback (GtkWidget *widget, gpointer client_data);
|
|
46780 |
+void a_Commands_reload_doc_callback (GtkWidget *widget, gpointer client_data);
|
|
46781 |
void a_Commands_stop_callback (GtkWidget *widget, gpointer client_data);
|
|
46782 |
void a_Commands_home_callback (GtkWidget *widget, gpointer client_data);
|
|
46783 |
+void a_Commands_home_nw_callback(GtkWidget *widget, gpointer client_data);
|
|
46784 |
void a_Commands_save_callback (GtkWidget *widget, gpointer client_data);
|
|
46785 |
+void a_Commands_save_doc_callback (GtkWidget *widget, gpointer client_data);
|
|
46786 |
void a_Commands_save_link_callback (GtkWidget *widget, gpointer client_data);
|
|
46787 |
-
|
|
46788 |
void a_Commands_addbm_callback (GtkWidget *widget, gpointer client_data);
|
|
46789 |
+void a_Commands_addbm_doc_callback (GtkWidget *widget, gpointer client_data);
|
|
46790 |
+void a_Commands_addbm_link_callback (GtkWidget *widget, gpointer client_data);
|
|
46791 |
void a_Commands_viewbm_callback (GtkWidget *widget, gpointer client_data);
|
|
46792 |
+void a_Commands_viewbm_nw_callback(GtkWidget *widget, gpointer client_data);
|
|
46793 |
|
|
46794 |
void a_Commands_helphome_callback (GtkWidget *widget, gpointer client_data);
|
|
46795 |
|
|
46796 |
void a_Commands_open_link_callback(GtkWidget *widget, gpointer client_data);
|
|
46797 |
void a_Commands_open_link_nw_callback(GtkWidget *widget, gpointer client_data);
|
|
46798 |
void a_Commands_select_popup_url_callback(GtkWidget *widget, gpointer data);
|
|
46799 |
+void a_Commands_duplicate_callback(GtkWidget *widget, gpointer client_data);
|
|
46800 |
|
|
46801 |
void a_Commands_ob_w3c_callback(GtkWidget *widget, gpointer client_data);
|
|
46802 |
void a_Commands_ob_wdg_callback(GtkWidget *widget, gpointer client_data);
|
|
46803 |
void a_Commands_ob_info_callback(GtkWidget *widget, gpointer client_data);
|
|
46804 |
|
|
46805 |
+void a_Commands_full_screen_callback(gpointer client_data);
|
|
46806 |
+gint a_Commands_click_callback(gpointer client_data, GdkEventButton *event);
|
|
46807 |
+void a_Commands_key_press_handler(GtkWidget *widget,
|
|
46808 |
+ GdkEventKey *event, gpointer client_data);
|
|
46809 |
+
|
|
46810 |
+#ifndef DISABLE_TABS
|
|
46811 |
+void a_Commands_new_tab_callback(GtkWidget *widget, gpointer client_data);
|
|
46812 |
+void a_Commands_close_current_tab_callback(GtkWidget *widget, gpointer client_data);
|
|
46813 |
+void a_Commands_close_tab_callback(GtkWidget *widget, gpointer client_data);
|
|
46814 |
+void a_Commands_tab_prev_callback (GtkWidget *widget, gpointer client_data);
|
|
46815 |
+void a_Commands_tab_next_callback (GtkWidget *widget, gpointer client_data);
|
|
46816 |
+void a_Commands_open_link_nw_tab_callback(GtkWidget *widget, gpointer client_data);
|
|
46817 |
+void a_Commands_duplicate_tab_callback(GtkWidget *widget, gpointer client_data);
|
|
46818 |
+#endif
|
|
46819 |
#endif /* __COMMANDS_H__ */
|
|
46820 |
diff -pruN dillo-0.8.6/src/cookies.c dillo-0.8.6-i18n-misc-20070916/src/cookies.c
|
|
46821 |
--- dillo-0.8.6/src/cookies.c 2006-03-30 03:48:13.000000000 +0900
|
|
46822 |
+++ dillo-0.8.6-i18n-misc-20070916/src/cookies.c 2006-05-16 01:21:08.000000000 +0900
|
|
46823 |
@@ -15,7 +15,7 @@
|
|
46824 |
* http://www.cis.ohio-state.edu/cs/Services/rfc/rfc-text/rfc2965.txt
|
|
46825 |
*/
|
|
46826 |
|
|
46827 |
-#define DEBUG_LEVEL 10
|
|
46828 |
+#define DEBUG_LEVEL 0
|
|
46829 |
#include "debug.h"
|
|
46830 |
|
|
46831 |
|
|
46832 |
@@ -78,6 +78,109 @@ static CookieControlAction Cookies_contr
|
|
46833 |
static CookieControlAction Cookies_control_check_domain(const char *domain);
|
|
46834 |
static int Cookie_control_init(void);
|
|
46835 |
|
|
46836 |
+static char *months[] =
|
|
46837 |
+{ "",
|
|
46838 |
+ "Jan", "Feb", "Mar",
|
|
46839 |
+ "Apr", "May", "Jun",
|
|
46840 |
+ "Jul", "Aug", "Sep",
|
|
46841 |
+ "Oct", "Nov", "Dec"
|
|
46842 |
+};
|
|
46843 |
+
|
|
46844 |
+/*
|
|
46845 |
+ * Take a months name and return a number between 1-12.
|
|
46846 |
+ * E.g. 'April' -> 4
|
|
46847 |
+ */
|
|
46848 |
+static int Cookies_get_month(const char *month_name)
|
|
46849 |
+{
|
|
46850 |
+ int i;
|
|
46851 |
+
|
|
46852 |
+ for (i = 1; i <= 12; i++) {
|
|
46853 |
+ if (!g_strncasecmp(months[i], month_name, 3))
|
|
46854 |
+ return i;
|
|
46855 |
+ }
|
|
46856 |
+ return 0;
|
|
46857 |
+}
|
|
46858 |
+
|
|
46859 |
+/*
|
|
46860 |
+ * Return a local timestamp from a GMT date string
|
|
46861 |
+ * Accept: RFC-1123 | RFC-850 | ANSI asctime | Old Netscape format.
|
|
46862 |
+ *
|
|
46863 |
+ * Wdy, DD-Mon-YY HH:MM:SS GMT
|
|
46864 |
+ * Wdy, DD-Mon-YYYY HH:MM:SS GMT
|
|
46865 |
+ * Weekday, DD-Mon-YY HH:MM:SS GMT
|
|
46866 |
+ * Weekday, DD-Mon-YYYY HH:MM:SS GMT
|
|
46867 |
+ * Tue May 21 13:46:22 1991\n
|
|
46868 |
+ * Tue May 21 13:46:22 1991
|
|
46869 |
+ *
|
|
46870 |
+ * (return 0 on malformed date string syntax)
|
|
46871 |
+ */
|
|
46872 |
+time_t a_Cookies_create_timestamp(const char *expires)
|
|
46873 |
+{
|
|
46874 |
+ time_t ret;
|
|
46875 |
+ int day, month, year, hour, minutes, seconds;
|
|
46876 |
+ gchar *cp;
|
|
46877 |
+ gchar *E_msg =
|
|
46878 |
+ "Expire date is malformed!\n"
|
|
46879 |
+ " (should be RFC-1123 | RFC-850 | ANSI asctime)\n"
|
|
46880 |
+ " Ignoring cookie: ";
|
|
46881 |
+
|
|
46882 |
+ cp = strchr(expires, ',');
|
|
46883 |
+ if (!cp && (strlen(expires) == 24 || strlen(expires) == 25)) {
|
|
46884 |
+ /* Looks like ANSI asctime format... */
|
|
46885 |
+ cp = (gchar *)expires;
|
|
46886 |
+ day = strtol(cp + 8, NULL, 10); /* day */
|
|
46887 |
+ month = Cookies_get_month(cp + 4); /* month */
|
|
46888 |
+ year = strtol(cp + 20, NULL, 10); /* year */
|
|
46889 |
+ hour = strtol(cp + 11, NULL, 10); /* hour */
|
|
46890 |
+ minutes = strtol(cp + 14, NULL, 10); /* minutes */
|
|
46891 |
+ seconds = strtol(cp + 17, NULL, 10); /* seconds */
|
|
46892 |
+
|
|
46893 |
+ } else if (cp && (cp - expires == 3 || cp - expires > 5) &&
|
|
46894 |
+ (strlen(cp) == 24 || strlen(cp) == 26)) {
|
|
46895 |
+ /* RFC-1123 | RFC-850 format | Old Netscape format */
|
|
46896 |
+ day = strtol(cp + 2, NULL, 10);
|
|
46897 |
+ month = Cookies_get_month(cp + 5);
|
|
46898 |
+ year = strtol(cp + 9, &cp, 10);
|
|
46899 |
+ /* todo: tricky, because two digits for year IS ambiguous! */
|
|
46900 |
+ year += (year < 70) ? 2000 : ((year < 100) ? 1900 : 0);
|
|
46901 |
+ hour = strtol(cp + 1, NULL, 10);
|
|
46902 |
+ minutes = strtol(cp + 4, NULL, 10);
|
|
46903 |
+ seconds = strtol(cp + 7, NULL, 10);
|
|
46904 |
+
|
|
46905 |
+ } else {
|
|
46906 |
+ MSG("%s%s\n", E_msg, expires);
|
|
46907 |
+ return (time_t) 0;
|
|
46908 |
+ }
|
|
46909 |
+
|
|
46910 |
+ /* Error checks --this may be overkill */
|
|
46911 |
+ if (!(day > 0 && day < 32 && month > 0 && month < 13 && year > 1970 &&
|
|
46912 |
+ hour >= 0 && hour < 24 && minutes >= 0 && minutes < 60 &&
|
|
46913 |
+ seconds >= 0 && seconds < 60)) {
|
|
46914 |
+ MSG("%s%s\n", E_msg, expires);
|
|
46915 |
+ return (time_t) 0;
|
|
46916 |
+ }
|
|
46917 |
+
|
|
46918 |
+ /* Calculate local timestamp.
|
|
46919 |
+ * [stolen from Lynx... (http://lynx.browser.org)] */
|
|
46920 |
+ month -= 3;
|
|
46921 |
+ if (month < 0) {
|
|
46922 |
+ month += 12;
|
|
46923 |
+ year--;
|
|
46924 |
+ }
|
|
46925 |
+
|
|
46926 |
+ day += (year - 1968) * 1461 / 4;
|
|
46927 |
+ day += ((((month * 153) + 2) / 5) - 672);
|
|
46928 |
+ ret = (time_t)((day * 60 * 60 * 24) +
|
|
46929 |
+ (hour * 60 * 60) +
|
|
46930 |
+ (minutes * 60) +
|
|
46931 |
+ seconds);
|
|
46932 |
+
|
|
46933 |
+ MSG("Expires in %ld seconds, at %s",
|
|
46934 |
+ (long)ret - time(NULL), ctime(&ret));
|
|
46935 |
+
|
|
46936 |
+ return ret;
|
|
46937 |
+}
|
|
46938 |
+
|
|
46939 |
/*
|
|
46940 |
* Return a file pointer. If the file doesn't exist, try to create it,
|
|
46941 |
* with the optional 'init_str' as its content.
|
|
46942 |
@@ -230,7 +333,7 @@ static int Cookie_control_init(void)
|
|
46943 |
|
|
46944 |
/* Get a file pointer */
|
|
46945 |
filename = a_Misc_prepend_user_home(".dillo/cookiesrc");
|
|
46946 |
- stream = Cookies_fopen(filename, "DEFAULT DENY\n");
|
|
46947 |
+ stream = Cookies_fopen(filename, "DEFAULT ACCEPT\n");
|
|
46948 |
g_free(filename);
|
|
46949 |
|
|
46950 |
if (!stream)
|
|
46951 |
diff -pruN dillo-0.8.6/src/cookies.h dillo-0.8.6-i18n-misc-20070916/src/cookies.h
|
|
46952 |
--- dillo-0.8.6/src/cookies.h 2005-10-28 01:20:07.000000000 +0900
|
|
46953 |
+++ dillo-0.8.6-i18n-misc-20070916/src/cookies.h 2006-05-16 01:21:08.000000000 +0900
|
|
46954 |
@@ -4,12 +4,13 @@
|
|
46955 |
#ifdef DISABLE_COOKIES
|
|
46956 |
# define a_Cookies_get(url) g_strdup("")
|
|
46957 |
# define a_Cookies_freeall() ;
|
|
46958 |
- void a_Cookies_init( void );
|
|
46959 |
#else
|
|
46960 |
char *a_Cookies_get(const DilloUrl *request_url);
|
|
46961 |
void a_Cookies_set(GList *cookie_string, const DilloUrl *set_url);
|
|
46962 |
void a_Cookies_init( void );
|
|
46963 |
void a_Cookies_freeall( void );
|
|
46964 |
+ void a_Cookies_init( void );
|
|
46965 |
+ time_t a_Cookies_create_timestamp(const char *expires);
|
|
46966 |
#endif
|
|
46967 |
|
|
46968 |
#endif /* !__COOKIES_H__ */
|
|
46969 |
diff -pruN dillo-0.8.6/src/dicache.c dillo-0.8.6-i18n-misc-20070916/src/dicache.c
|
|
46970 |
--- dillo-0.8.6/src/dicache.c 2005-10-28 01:20:07.000000000 +0900
|
|
46971 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dicache.c 2006-05-16 01:21:08.000000000 +0900
|
|
46972 |
@@ -18,6 +18,7 @@
|
|
46973 |
|
|
46974 |
#include "image.h"
|
|
46975 |
#include "web.h"
|
|
46976 |
+#include "doc.h"
|
|
46977 |
#include "dicache.h"
|
|
46978 |
#include "cache.h"
|
|
46979 |
#include "interface.h"
|
|
46980 |
@@ -261,7 +262,7 @@ void a_Dicache_callback(int Op, CacheCli
|
|
46981 |
}
|
|
46982 |
} else if ( Op == CA_Close || Op == CA_Abort ) {
|
|
46983 |
a_Image_close(Web->Image);
|
|
46984 |
- a_Interface_close_client(Web->bw, Client->Key);
|
|
46985 |
+ a_Doc_close_client(Web->dd, Client->Key);
|
|
46986 |
}
|
|
46987 |
}
|
|
46988 |
|
|
46989 |
@@ -366,7 +367,7 @@ void a_Dicache_close(DilloUrl *url, gint
|
|
46990 |
DicEntry->cmap = NULL;
|
|
46991 |
}
|
|
46992 |
a_Image_close(Web->Image);
|
|
46993 |
- a_Interface_close_client(Web->bw, Client->Key);
|
|
46994 |
+ a_Doc_close_client(Web->dd, Client->Key);
|
|
46995 |
}
|
|
46996 |
|
|
46997 |
/* ------------------------------------------------------------------------- */
|
|
46998 |
diff -pruN dillo-0.8.6/src/dillo.c dillo-0.8.6-i18n-misc-20070916/src/dillo.c
|
|
46999 |
--- dillo-0.8.6/src/dillo.c 2006-01-03 03:20:08.000000000 +0900
|
|
47000 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dillo.c 2007-09-11 00:41:49.000000000 +0900
|
|
47001 |
@@ -19,6 +19,8 @@
|
|
47002 |
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
47003 |
*/
|
|
47004 |
|
|
47005 |
+#include <config.h>
|
|
47006 |
+
|
|
47007 |
#include <stdio.h>
|
|
47008 |
#include <gtk/gtk.h>
|
|
47009 |
|
|
47010 |
@@ -35,10 +37,13 @@
|
|
47011 |
#include <locale.h>
|
|
47012 |
|
|
47013 |
#include <config.h>
|
|
47014 |
+#include "intl.h"
|
|
47015 |
+#include "i18n.h"
|
|
47016 |
#include "msg.h"
|
|
47017 |
#include "dillo.h"
|
|
47018 |
#include "misc.h"
|
|
47019 |
#include "nav.h"
|
|
47020 |
+#include "doc.h"
|
|
47021 |
#include "history.h"
|
|
47022 |
#include "bookmark.h"
|
|
47023 |
#include "dicache.h"
|
|
47024 |
@@ -47,8 +52,12 @@
|
|
47025 |
#include "IO/Url.h"
|
|
47026 |
#include "prefs.h"
|
|
47027 |
#include "interface.h"
|
|
47028 |
+#ifndef DISABLE_TABS
|
|
47029 |
+#include "tab.h"
|
|
47030 |
+#endif /* !DISABLE_TABS */
|
|
47031 |
#include "dw.h"
|
|
47032 |
#include "cookies.h"
|
|
47033 |
+#include "adblock.h"
|
|
47034 |
|
|
47035 |
|
|
47036 |
/*
|
|
47037 |
@@ -70,6 +79,7 @@ enum {
|
|
47038 |
DILLO_CLI_LOCAL = 1 << 5,
|
|
47039 |
DILLO_CLI_GEOMETRY = 1 << 6,
|
|
47040 |
DILLO_CLI_DBG_RENDERING = 1 << 7,
|
|
47041 |
+ DILLO_CLI_RCFILE = 1 << 8,
|
|
47042 |
DILLO_CLI_ERROR = 1 << 15
|
|
47043 |
};
|
|
47044 |
|
|
47045 |
@@ -96,27 +106,31 @@ static void Dillo_print_version(void);
|
|
47046 |
*/
|
|
47047 |
static CLI_options Options[] = {
|
|
47048 |
{"-x", "--xid", 1, DILLO_CLI_XID,
|
|
47049 |
- " -x, --xid XID Open first Dillo window in an existing\n"
|
|
47050 |
- " GtkSocket which window ID is XID (decimal)."},
|
|
47051 |
+ N_(" -x, --xid XID Open first Dillo window in an existing\n"
|
|
47052 |
+ " GtkSocket which window ID is XID (decimal).")},
|
|
47053 |
{"-v", "--version", 0, DILLO_CLI_VERSION,
|
|
47054 |
- " -v, --version Display version info and exit."},
|
|
47055 |
+ N_(" -v, --version Display version info and exit.")},
|
|
47056 |
{"-h", "--help", 0, DILLO_CLI_HELP,
|
|
47057 |
- " -h, --help Display this help text and exit."},
|
|
47058 |
+ N_(" -h, --help Display this help text and exit.")},
|
|
47059 |
{"-f", "--fullwindow", 0, DILLO_CLI_FULLWINDOW,
|
|
47060 |
- " -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
47061 |
- " navigation buttons, menu, and status bar."},
|
|
47062 |
+ N_(" -f, --fullwindow Start in full window mode: hide address bar,\n"
|
|
47063 |
+ " navigation buttons, menu, and status bar.")},
|
|
47064 |
{"-l", "--local", 0, DILLO_CLI_LOCAL,
|
|
47065 |
- " -l, --local Don't follow links for this URL(s)."},
|
|
47066 |
+ N_(" -l, --local Don't follow links for this URL(s).")},
|
|
47067 |
{"-g", "-geometry", 1, DILLO_CLI_GEOMETRY,
|
|
47068 |
- " -g, -geometry GEO Set initial window position where GEO is\n"
|
|
47069 |
- " <width>x<height>{+-}<x>{+-}<y>"},
|
|
47070 |
+ N_(" -g, -geometry GEO Set initial window position where GEO is\n"
|
|
47071 |
+ " <width>x<height>{+-}<x>{+-}<y>")},
|
|
47072 |
{"-D", "--debug-rendering",
|
|
47073 |
0, DILLO_CLI_DBG_RENDERING,
|
|
47074 |
- " -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
47075 |
- " representing its structure. For debugging. "},
|
|
47076 |
+ N_(" -D, --debug-rendering Draw additionaly several lines in a web page,\n"
|
|
47077 |
+ " representing its structure. For debugging. ")},
|
|
47078 |
+ {"-R", "--rcfile",
|
|
47079 |
+ 1, DILLO_CLI_RCFILE,
|
|
47080 |
+ N_(" -R, --rcfile FILE Use alternative rcfile.")},
|
|
47081 |
{NULL, NULL, 0, 0, NULL}
|
|
47082 |
};
|
|
47083 |
|
|
47084 |
+
|
|
47085 |
/*
|
|
47086 |
* Return the maximum number of option arguments
|
|
47087 |
*/
|
|
47088 |
@@ -187,7 +201,7 @@ static void Dillo_sigchld_handler(int si
|
|
47089 |
while (1) {
|
|
47090 |
pid = waitpid (-1, &status, WNOHANG);
|
|
47091 |
if (pid < 0) {
|
|
47092 |
- perror ("waitpid");
|
|
47093 |
+ //perror ("waitpid");
|
|
47094 |
break;
|
|
47095 |
}
|
|
47096 |
if (pid == 0)
|
|
47097 |
@@ -206,6 +220,7 @@ gint main(int argc, char *argv[])
|
|
47098 |
gchar *dir, *curr_locale;
|
|
47099 |
DilloUrl *start_url;
|
|
47100 |
BrowserWindow *bw;
|
|
47101 |
+ DilloDoc *dd;
|
|
47102 |
guint32 xid = 0;
|
|
47103 |
guint options_got = 0;
|
|
47104 |
gint idx = 0;
|
|
47105 |
@@ -214,10 +229,18 @@ gint main(int argc, char *argv[])
|
|
47106 |
char **opt_argv = NULL;
|
|
47107 |
gint xpos = D_GEOMETRY_DEFAULT_XPOS, ypos = D_GEOMETRY_DEFAULT_YPOS;
|
|
47108 |
gint width = D_GEOMETRY_DEFAULT_WIDTH, height = D_GEOMETRY_DEFAULT_HEIGHT;
|
|
47109 |
+ char *rcfile = NULL;
|
|
47110 |
|
|
47111 |
/* set locale */
|
|
47112 |
curr_locale = g_strdup(setlocale(LC_ALL, NULL));
|
|
47113 |
gtk_set_locale();
|
|
47114 |
+#ifdef ENABLE_NLS
|
|
47115 |
+ /* Initialize Gettext */
|
|
47116 |
+ bindtextdomain (PACKAGE, LOCALEDIR);
|
|
47117 |
+ textdomain (PACKAGE);
|
|
47118 |
+#endif
|
|
47119 |
+ /* get locale */
|
|
47120 |
+ a_I18n_detect_DW_locale();
|
|
47121 |
/* Initialize GUI and parse GTK related args */
|
|
47122 |
gtk_init(&argc, &argv);
|
|
47123 |
gdk_rgb_init();
|
|
47124 |
@@ -240,8 +263,8 @@ gint main(int argc, char *argv[])
|
|
47125 |
if (opt_argv[0][0] >= '0' && opt_argv[0][0] <= '9') {
|
|
47126 |
xid = strtol(opt_argv[0], NULL, 10);
|
|
47127 |
} else {
|
|
47128 |
- g_printerr("Error: the XID must be an unsigned decimal numerical "
|
|
47129 |
- "value.\nThe offending value was: %s\n", opt_argv[0]);
|
|
47130 |
+ g_printerr(_("Error: the XID must be an unsigned decimal numerical "
|
|
47131 |
+ "value.\nThe offending value was: %s\n"), opt_argv[0]);
|
|
47132 |
return -1;
|
|
47133 |
}
|
|
47134 |
break;
|
|
47135 |
@@ -254,15 +277,18 @@ gint main(int argc, char *argv[])
|
|
47136 |
case DILLO_CLI_GEOMETRY:
|
|
47137 |
if (a_Misc_parse_geometry(opt_argv[0], &xpos, &ypos, &width, &height))
|
|
47138 |
break;
|
|
47139 |
+ case DILLO_CLI_RCFILE:
|
|
47140 |
+ rcfile = opt_argv[0];
|
|
47141 |
+ break;
|
|
47142 |
default:
|
|
47143 |
- g_printerr("Error in command line options.\n");
|
|
47144 |
+ g_printerr(_("Error in command line options.\n"));
|
|
47145 |
return -1;
|
|
47146 |
break;
|
|
47147 |
}
|
|
47148 |
}
|
|
47149 |
|
|
47150 |
/* Send a delayed locale-related message */
|
|
47151 |
- MSG("Setting locale to %s...\n", curr_locale);
|
|
47152 |
+ MSG(_("Setting gtk charset to %s...\n"), DW_CHARSET);
|
|
47153 |
g_free(curr_locale);
|
|
47154 |
|
|
47155 |
/* This lets threads in the file module end peacefully when aborted
|
|
47156 |
@@ -278,7 +304,7 @@ gint main(int argc, char *argv[])
|
|
47157 |
Dillo_check_home_dir(dir);
|
|
47158 |
g_free(dir);
|
|
47159 |
|
|
47160 |
- a_Prefs_init();
|
|
47161 |
+ a_Prefs_init(rcfile);
|
|
47162 |
a_Dns_init();
|
|
47163 |
a_Http_init();
|
|
47164 |
a_Mime_init();
|
|
47165 |
@@ -287,6 +313,8 @@ gint main(int argc, char *argv[])
|
|
47166 |
a_Interface_init();
|
|
47167 |
a_Dw_init();
|
|
47168 |
a_Cookies_init();
|
|
47169 |
+ a_Adblock_init();
|
|
47170 |
+ a_Doc_init();
|
|
47171 |
|
|
47172 |
/* -f overrides dillorc */
|
|
47173 |
if (options_got & DILLO_CLI_FULLWINDOW)
|
|
47174 |
@@ -308,18 +336,32 @@ gint main(int argc, char *argv[])
|
|
47175 |
|
|
47176 |
a_Bookmarks_init();
|
|
47177 |
|
|
47178 |
+ dd = bw->dd;
|
|
47179 |
/* Send dillo's startup screen */
|
|
47180 |
- a_Nav_push(bw, prefs.start_page);
|
|
47181 |
+ if (idx >= argc) a_Nav_push(dd, prefs.start_page);
|
|
47182 |
|
|
47183 |
for (i = idx; i < argc; i++) {
|
|
47184 |
- /* If more than one URL/FILE, open in new window */
|
|
47185 |
- if (i > idx)
|
|
47186 |
- bw = a_Interface_browser_window_new(prefs.width, prefs.height, 0);
|
|
47187 |
+ /* If more than one URL/FILE, open in new window/tab */
|
|
47188 |
+ if (i > idx) {
|
|
47189 |
+#ifndef DISABLE_TABS
|
|
47190 |
+ if (prefs.tab_instead_of_window) {
|
|
47191 |
+ dd = a_Doc_new();
|
|
47192 |
+ a_Tab_add(bw, dd);
|
|
47193 |
+ if (!prefs.tab_load_in_background)
|
|
47194 |
+ a_Tab_switch(dd);
|
|
47195 |
+ } else {
|
|
47196 |
+#endif /* !DISABLE_TABS */
|
|
47197 |
+ bw = a_Interface_browser_window_new(prefs.width, prefs.height, 0);
|
|
47198 |
+ dd = bw->dd;
|
|
47199 |
+#ifndef DISABLE_TABS
|
|
47200 |
+ }
|
|
47201 |
+#endif /* !DISABLE_TABS */
|
|
47202 |
+ }
|
|
47203 |
|
|
47204 |
start_url = Dillo_make_start_url(argv[i]);
|
|
47205 |
if (options_got & DILLO_CLI_LOCAL)
|
|
47206 |
a_Url_set_flags(start_url, URL_FLAGS(start_url) | URL_SpamSafe);
|
|
47207 |
- a_Nav_push(bw, start_url);
|
|
47208 |
+ a_Nav_push(dd, start_url);
|
|
47209 |
a_Url_free(start_url);
|
|
47210 |
}
|
|
47211 |
|
|
47212 |
@@ -334,17 +376,23 @@ gint main(int argc, char *argv[])
|
|
47213 |
* (This can be left to the OS, but we'll do it, with a view to test
|
|
47214 |
* and fix our memory management)
|
|
47215 |
*/
|
|
47216 |
+ a_Adblock_freeall();
|
|
47217 |
a_Cookies_freeall();
|
|
47218 |
a_Cache_freeall();
|
|
47219 |
a_Dicache_freeall();
|
|
47220 |
a_Http_freeall();
|
|
47221 |
+#ifdef DILLO_SSL
|
|
47222 |
+ a_Https_freeall();
|
|
47223 |
+#endif
|
|
47224 |
a_Dns_freeall();
|
|
47225 |
a_Prefs_freeall();
|
|
47226 |
a_Dw_freeall();
|
|
47227 |
a_History_free();
|
|
47228 |
-
|
|
47229 |
+#ifdef DEBUG
|
|
47230 |
+ g_mem_profile();
|
|
47231 |
+#endif
|
|
47232 |
/* a_Dpi_bye_dpid(); */
|
|
47233 |
- MSG("Dillo: normal exit!\n");
|
|
47234 |
+ _MSG(_("Dillo: normal exit!\n"));
|
|
47235 |
return 0;
|
|
47236 |
}
|
|
47237 |
|
|
47238 |
@@ -358,10 +406,10 @@ static void Dillo_check_home_dir(char *d
|
|
47239 |
|
|
47240 |
if ( stat(dir, &st) == -1 ) {
|
|
47241 |
if ( errno == ENOENT && mkdir(dir, 0700) < 0 ) {
|
|
47242 |
- MSG("Dillo: error creating directory %s: %s\n",
|
|
47243 |
- dir, g_strerror(errno));
|
|
47244 |
+ MSG(_("Dillo: error creating directory %s: %s\n"),
|
|
47245 |
+ dir, strerror(errno));
|
|
47246 |
} else
|
|
47247 |
- MSG("Dillo: error reading %s: %s\n", dir, g_strerror(errno));
|
|
47248 |
+ MSG(_("Dillo: error reading %s: %s\n"), dir, strerror(errno));
|
|
47249 |
}
|
|
47250 |
}
|
|
47251 |
|
|
47252 |
@@ -410,8 +458,8 @@ Dillo_get_opt(CLI_options *options, int
|
|
47253 |
|
|
47254 |
/* Optional arguments have opt_argc < 0 */
|
|
47255 |
if (i < n_arg) {
|
|
47256 |
- g_printerr("Option %s requires %d argument(s)\n",
|
|
47257 |
- argv[idx - i - 1], n_arg);
|
|
47258 |
+ g_printerr(_("Option %s requires %d argument(s)\n"),
|
|
47259 |
+ argv[idx - i - 1], n_arg);
|
|
47260 |
state = O_ERROR;
|
|
47261 |
} else
|
|
47262 |
state = O_OK;
|
|
47263 |
@@ -445,18 +493,18 @@ Dillo_get_opt(CLI_options *options, int
|
|
47264 |
*/
|
|
47265 |
static void Dillo_print_help(CLI_options *options)
|
|
47266 |
{
|
|
47267 |
- g_print("\nUsage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
47268 |
- "Options:\n");
|
|
47269 |
+ g_print(_("\nUsage: dillo [OPTIONS] [URL|FILE]...\n"
|
|
47270 |
+ "Options:\n"));
|
|
47271 |
|
|
47272 |
for (; options && options->sh_opt; options++) {
|
|
47273 |
if (options->help)
|
|
47274 |
- g_print("%s\n", options->help);
|
|
47275 |
+ g_print("%s\n", _(options->help));
|
|
47276 |
else
|
|
47277 |
- g_print(" %s, %s *Undocumented*\n", options->sh_opt,
|
|
47278 |
+ g_print(_(" %s, %s *Undocumented*\n"), options->sh_opt,
|
|
47279 |
options->lg_opt);
|
|
47280 |
}
|
|
47281 |
- g_print(" URL URL to browse.\n"
|
|
47282 |
- " FILE Local FILE to view.\n");
|
|
47283 |
+ g_print(_(" URL URL to browse.\n"
|
|
47284 |
+ " FILE Local FILE to view.\n"));
|
|
47285 |
g_print("\n");
|
|
47286 |
}
|
|
47287 |
|
|
47288 |
diff -pruN dillo-0.8.6/src/dns.c dillo-0.8.6-i18n-misc-20070916/src/dns.c
|
|
47289 |
--- dillo-0.8.6/src/dns.c 2006-03-16 02:01:00.000000000 +0900
|
|
47290 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dns.c 2006-05-16 01:21:08.000000000 +0900
|
|
47291 |
@@ -31,7 +31,8 @@
|
|
47292 |
#include "dns.h"
|
|
47293 |
#include "list.h"
|
|
47294 |
|
|
47295 |
-#define DEBUG_LEVEL 5
|
|
47296 |
+#define DEBUG_LEVEL 0
|
|
47297 |
+//#define DEBUG_LEVEL 5
|
|
47298 |
#include "debug.h"
|
|
47299 |
|
|
47300 |
|
|
47301 |
diff -pruN dillo-0.8.6/src/doc.c dillo-0.8.6-i18n-misc-20070916/src/doc.c
|
|
47302 |
--- dillo-0.8.6/src/doc.c 1970-01-01 09:00:00.000000000 +0900
|
|
47303 |
+++ dillo-0.8.6-i18n-misc-20070916/src/doc.c 2006-05-16 01:21:08.000000000 +0900
|
|
47304 |
@@ -0,0 +1,656 @@
|
|
47305 |
+/*
|
|
47306 |
+ *
|
|
47307 |
+ * Copyright (C) 2003 Frank de Lange
|
|
47308 |
+ *
|
|
47309 |
+ * This program is free software; you can redistribute it and/or modify
|
|
47310 |
+ * it under the terms of the GNU General Public License as published by
|
|
47311 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
47312 |
+ * (at your option) any later version.
|
|
47313 |
+ */
|
|
47314 |
+
|
|
47315 |
+#include "dw_widget.h"
|
|
47316 |
+#include "dw_gtk_scrolled_window.h"
|
|
47317 |
+#include "dw_gtk_viewport.h"
|
|
47318 |
+#include "dw_container.h"
|
|
47319 |
+#include "doc.h"
|
|
47320 |
+#include "list.h"
|
|
47321 |
+#include "debug.h"
|
|
47322 |
+#include "cache.h"
|
|
47323 |
+#include "nav.h"
|
|
47324 |
+#include "menu.h"
|
|
47325 |
+#include "interface.h"
|
|
47326 |
+#include "commands.h"
|
|
47327 |
+#include <math.h> /* for rint() */
|
|
47328 |
+#ifndef DISABLE_TABS
|
|
47329 |
+/* for a_Tab_title_set */
|
|
47330 |
+#include "tab.h"
|
|
47331 |
+#endif /* !DISABLE_TABS */
|
|
47332 |
+#include "progressbar.h"
|
|
47333 |
+#include "prefs.h"
|
|
47334 |
+
|
|
47335 |
+#define DEBUG_EVENT 0
|
|
47336 |
+#define DEBUG_SIZE 10
|
|
47337 |
+#define DEBUG_ALLOC 10
|
|
47338 |
+
|
|
47339 |
+/* #define DEBUG_LEVEL 0 */
|
|
47340 |
+#include "debug.h"
|
|
47341 |
+
|
|
47342 |
+/*
|
|
47343 |
+ * Local Data
|
|
47344 |
+ */
|
|
47345 |
+
|
|
47346 |
+/* DilloDoc holds everything pertaining to a single document */
|
|
47347 |
+static DilloDoc **dillo_doc;
|
|
47348 |
+static gint num_dd, num_dd_max;
|
|
47349 |
+
|
|
47350 |
+/*
|
|
47351 |
+ * Initialize global data
|
|
47352 |
+ */
|
|
47353 |
+void a_Doc_init(void)
|
|
47354 |
+{
|
|
47355 |
+ num_dd = 0;
|
|
47356 |
+ num_dd_max = 16;
|
|
47357 |
+ dillo_doc = NULL;
|
|
47358 |
+}
|
|
47359 |
+
|
|
47360 |
+/* callbacks */
|
|
47361 |
+
|
|
47362 |
+/*
|
|
47363 |
+ * callback for docwin delete
|
|
47364 |
+ *
|
|
47365 |
+ * this will call a_Doc_destroy for the associated DilloDoc
|
|
47366 |
+ */
|
|
47367 |
+void
|
|
47368 |
+Doc_docwin_destroy_callback(GtkWidget *widget,
|
|
47369 |
+ gpointer user_data)
|
|
47370 |
+{
|
|
47371 |
+ DilloDoc *dd = (DilloDoc *) user_data;
|
|
47372 |
+ /* aargh... get GTK to be quit about the non-existing gadget... */
|
|
47373 |
+ if (GTK_DW_SCROLLED_WINDOW(widget)->gadget)
|
|
47374 |
+ GTK_DW_SCROLLED_WINDOW(widget)->gadget = NULL;
|
|
47375 |
+
|
|
47376 |
+ a_Doc_destroy(dd);
|
|
47377 |
+}
|
|
47378 |
+
|
|
47379 |
+/* public functions */
|
|
47380 |
+
|
|
47381 |
+/*
|
|
47382 |
+ * Stop all active connections for the document (except downloads)
|
|
47383 |
+ */
|
|
47384 |
+void a_Doc_stop(DilloDoc *dd)
|
|
47385 |
+{
|
|
47386 |
+ g_return_if_fail ( dd != NULL );
|
|
47387 |
+ DEBUG_MSG(3, "a_Doc_stop: hi!\n");
|
|
47388 |
+
|
|
47389 |
+ /* Remove root clients */
|
|
47390 |
+ while ( dd->NumRootClients ) {
|
|
47391 |
+ a_Cache_stop_client(dd->RootClients[0]);
|
|
47392 |
+ a_List_remove(dd->RootClients, 0, dd->NumRootClients);
|
|
47393 |
+ }
|
|
47394 |
+ /* Remove image clients */
|
|
47395 |
+ while ( dd->NumImageClients ) {
|
|
47396 |
+ a_Cache_stop_client(dd->ImageClients[0]);
|
|
47397 |
+ a_List_remove(dd->ImageClients, 0, dd->NumImageClients);
|
|
47398 |
+ }
|
|
47399 |
+}
|
|
47400 |
+
|
|
47401 |
+/*
|
|
47402 |
+ * Empty RootClients, ImageClients and PageUrls lists and
|
|
47403 |
+ * reset progress bar data.
|
|
47404 |
+ */
|
|
47405 |
+void a_Doc_clean(DilloDoc *dd)
|
|
47406 |
+{
|
|
47407 |
+ g_return_if_fail ( dd != NULL );
|
|
47408 |
+
|
|
47409 |
+ while ( dd->NumRootClients )
|
|
47410 |
+ a_List_remove(dd->RootClients, 0, dd->NumRootClients);
|
|
47411 |
+
|
|
47412 |
+ while ( dd->NumImageClients )
|
|
47413 |
+ a_List_remove(dd->ImageClients, 0, dd->NumImageClients);
|
|
47414 |
+
|
|
47415 |
+ while ( dd->NumPageUrls ) {
|
|
47416 |
+ a_Url_free(dd->PageUrls[0].Url);
|
|
47417 |
+ a_List_remove(dd->PageUrls, 0, dd->NumPageUrls);
|
|
47418 |
+ }
|
|
47419 |
+
|
|
47420 |
+ /* Zero image-progressbar data */
|
|
47421 |
+ dd->NumImages = 0;
|
|
47422 |
+ dd->NumImagesGot = 0;
|
|
47423 |
+
|
|
47424 |
+ /* Zero progressbar data and ready state */
|
|
47425 |
+ dd->progress = 0.0;
|
|
47426 |
+ dd->ready = TRUE;
|
|
47427 |
+}
|
|
47428 |
+
|
|
47429 |
+/*
|
|
47430 |
+ * Remove the cache-client from the dd list
|
|
47431 |
+ * (client can be a image or a html page)
|
|
47432 |
+ */
|
|
47433 |
+void a_Doc_remove_client(DilloDoc *dd, gint ClientKey)
|
|
47434 |
+{
|
|
47435 |
+ gint i;
|
|
47436 |
+ gboolean Found = FALSE;
|
|
47437 |
+
|
|
47438 |
+ g_return_if_fail ( dd != NULL );
|
|
47439 |
+
|
|
47440 |
+ for ( i = 0; !Found && i < dd->NumRootClients; ++i)
|
|
47441 |
+ if ( dd->RootClients[i] == ClientKey ) {
|
|
47442 |
+ a_List_remove(dd->RootClients, i, dd->NumRootClients);
|
|
47443 |
+ Found = TRUE;
|
|
47444 |
+ }
|
|
47445 |
+
|
|
47446 |
+ for ( i = 0; !Found && i < dd->NumImageClients; ++i)
|
|
47447 |
+ if ( dd->ImageClients[i] == ClientKey ) {
|
|
47448 |
+ a_List_remove(dd->ImageClients, i, dd->NumImageClients);
|
|
47449 |
+ dd->NumImagesGot++;
|
|
47450 |
+ Found = TRUE;
|
|
47451 |
+ }
|
|
47452 |
+
|
|
47453 |
+ a_Interface_set_button_sens(dd->bw);
|
|
47454 |
+}
|
|
47455 |
+
|
|
47456 |
+
|
|
47457 |
+/*
|
|
47458 |
+ * Remove the cache-client from the dd list
|
|
47459 |
+ * (client can be a image or a html page)
|
|
47460 |
+ */
|
|
47461 |
+void a_Doc_close_client(DilloDoc *dd, gint ClientKey)
|
|
47462 |
+{
|
|
47463 |
+ g_return_if_fail ( dd != NULL );
|
|
47464 |
+
|
|
47465 |
+ a_Doc_remove_client(dd, ClientKey);
|
|
47466 |
+ a_Doc_progress_update(dd);
|
|
47467 |
+}
|
|
47468 |
+
|
|
47469 |
+/*
|
|
47470 |
+ * update progress bar, set button sensitivity
|
|
47471 |
+ */
|
|
47472 |
+void
|
|
47473 |
+a_Doc_progress_update(DilloDoc *dd)
|
|
47474 |
+{
|
|
47475 |
+ gchar progress[PBAR_L];
|
|
47476 |
+
|
|
47477 |
+ g_return_if_fail ( dd != NULL );
|
|
47478 |
+
|
|
47479 |
+ if(dd->bw->dd == dd) {
|
|
47480 |
+ a_Interface_set_button_sens(dd->bw);
|
|
47481 |
+ g_snprintf(progress, PBAR_L, "%s%d of %d",
|
|
47482 |
+ PBAR_ISTR(prefs.panel_size == 1),
|
|
47483 |
+ dd->NumImagesGot, dd->NumImages);
|
|
47484 |
+ a_Progressbar_update(dd->bw->imgprogress, progress,
|
|
47485 |
+ (dd->NumImagesGot == dd->NumImages) ? 0 : 1 );
|
|
47486 |
+ g_snprintf(progress, PBAR_L, "%s%.1f Kb",
|
|
47487 |
+ PBAR_PSTR(prefs.panel_size == 1),
|
|
47488 |
+ (float)dd->progress);
|
|
47489 |
+ a_Progressbar_update(dd->bw->progress, progress, (dd->ready) ? 0 : 1 );
|
|
47490 |
+ }
|
|
47491 |
+}
|
|
47492 |
+
|
|
47493 |
+
|
|
47494 |
+/*
|
|
47495 |
+ * Add a reference to the cache-client in the document's list.
|
|
47496 |
+ * This helps us keep track of which are active in the document so that it's
|
|
47497 |
+ * possible to abort them.
|
|
47498 |
+ * (Root: Flag, whether a Root URL or not)
|
|
47499 |
+ */
|
|
47500 |
+void a_Doc_add_client(DilloDoc *dd, gint Key, gint Root)
|
|
47501 |
+{
|
|
47502 |
+ gint nc;
|
|
47503 |
+
|
|
47504 |
+ g_return_if_fail ( dd != NULL );
|
|
47505 |
+
|
|
47506 |
+ if ( Root ) {
|
|
47507 |
+ nc = dd->NumRootClients;
|
|
47508 |
+ a_List_add(dd->RootClients, nc, dd->MaxRootClients);
|
|
47509 |
+ dd->RootClients[nc] = Key;
|
|
47510 |
+ dd->NumRootClients++;
|
|
47511 |
+ } else {
|
|
47512 |
+ nc = dd->NumImageClients;
|
|
47513 |
+ a_List_add(dd->ImageClients, nc, dd->MaxImageClients);
|
|
47514 |
+ dd->ImageClients[nc] = Key;
|
|
47515 |
+ dd->NumImageClients++;
|
|
47516 |
+ dd->NumImages++;
|
|
47517 |
+ }
|
|
47518 |
+ a_Doc_progress_update(dd);
|
|
47519 |
+}
|
|
47520 |
+
|
|
47521 |
+/*
|
|
47522 |
+ * Add an URL to the document's list.
|
|
47523 |
+ * This helps us keep track of page requested URLs so that it's
|
|
47524 |
+ * possible to stop, abort and reload them.)
|
|
47525 |
+ * Flags: Chosen from {DD_Root, DD_Image, DD_Download}
|
|
47526 |
+ */
|
|
47527 |
+void a_Doc_add_url(DilloDoc *dd, const DilloUrl *Url, gint Flags)
|
|
47528 |
+{
|
|
47529 |
+ gint nu, i;
|
|
47530 |
+ gboolean found = FALSE;
|
|
47531 |
+
|
|
47532 |
+ g_return_if_fail ( dd != NULL && Url != NULL );
|
|
47533 |
+
|
|
47534 |
+ nu = dd->NumPageUrls;
|
|
47535 |
+ for ( i = 0; i < nu; i++ ) {
|
|
47536 |
+ if ( !a_Url_cmp(Url, dd->PageUrls[i].Url) ) {
|
|
47537 |
+ found = TRUE;
|
|
47538 |
+ break;
|
|
47539 |
+ }
|
|
47540 |
+ }
|
|
47541 |
+ if ( !found ) {
|
|
47542 |
+ a_List_add(dd->PageUrls, nu, dd->MaxPageUrls);
|
|
47543 |
+ dd->PageUrls[nu].Url = a_Url_dup(Url);
|
|
47544 |
+ dd->PageUrls[nu].Flags = Flags;
|
|
47545 |
+ dd->NumPageUrls++;
|
|
47546 |
+ }
|
|
47547 |
+}
|
|
47548 |
+
|
|
47549 |
+/*
|
|
47550 |
+ * set document title
|
|
47551 |
+ *
|
|
47552 |
+ * this will propagate to the current interface element
|
|
47553 |
+ *
|
|
47554 |
+ * currently just forwards to a_Tab_title_set (when tabs
|
|
47555 |
+ * are compiled in) or a_Interface_set_page_title (when
|
|
47556 |
+ * compiled without tab support)
|
|
47557 |
+ */
|
|
47558 |
+void
|
|
47559 |
+a_Doc_title_set(DilloDoc *dd, gchar *title)
|
|
47560 |
+{
|
|
47561 |
+ g_return_if_fail ( dd != NULL && title != NULL );
|
|
47562 |
+
|
|
47563 |
+ /* only set title for top level document */
|
|
47564 |
+ if(dd->parent == NULL)
|
|
47565 |
+#ifndef DISABLE_TABS
|
|
47566 |
+ a_Tab_title_set(dd, title);
|
|
47567 |
+#else
|
|
47568 |
+ a_Interface_set_page_title(dd->bw, title);
|
|
47569 |
+#endif
|
|
47570 |
+}
|
|
47571 |
+
|
|
47572 |
+/*
|
|
47573 |
+ * set document location
|
|
47574 |
+ *
|
|
47575 |
+ * this will propagate to the current interface element
|
|
47576 |
+ *
|
|
47577 |
+ * currently just forwards to a_Interface_set_location_text
|
|
47578 |
+ */
|
|
47579 |
+void
|
|
47580 |
+a_Doc_location_set(DilloDoc *dd, gchar *location)
|
|
47581 |
+{
|
|
47582 |
+ g_return_if_fail ( dd != NULL && location != NULL );
|
|
47583 |
+
|
|
47584 |
+ /* only set location text if this is the current tab */
|
|
47585 |
+ if((dd->parent == NULL) && dd->bw->dd == dd) {
|
|
47586 |
+ a_Interface_set_location_text(dd->bw, location);
|
|
47587 |
+ }
|
|
47588 |
+}
|
|
47589 |
+
|
|
47590 |
+/*
|
|
47591 |
+ * destroy a document
|
|
47592 |
+ */
|
|
47593 |
+void a_Doc_destroy(DilloDoc *dd)
|
|
47594 |
+{
|
|
47595 |
+ gint i;
|
|
47596 |
+
|
|
47597 |
+ g_return_if_fail ( dd != NULL );
|
|
47598 |
+
|
|
47599 |
+ /* stop/abort open connections. */
|
|
47600 |
+ a_Doc_stop(dd);
|
|
47601 |
+
|
|
47602 |
+ for (i = 0; i < num_dd; i++)
|
|
47603 |
+ if (dillo_doc[i] == dd) {
|
|
47604 |
+ dillo_doc[i] = dillo_doc[--num_dd];
|
|
47605 |
+ break;
|
|
47606 |
+ }
|
|
47607 |
+
|
|
47608 |
+ /* free nav_stack and nav_expect stuff */
|
|
47609 |
+ a_Nav_free(dd);
|
|
47610 |
+
|
|
47611 |
+ /* unref the style */
|
|
47612 |
+ if(dd->style)
|
|
47613 |
+ a_Dw_style_unref(dd->style);
|
|
47614 |
+
|
|
47615 |
+ /* destroy pagemark menu */
|
|
47616 |
+ a_Menu_pagemarks_destroy(dd);
|
|
47617 |
+
|
|
47618 |
+ g_free(dd->RootClients);
|
|
47619 |
+ g_free(dd->ImageClients);
|
|
47620 |
+
|
|
47621 |
+ if(dd->name)
|
|
47622 |
+ g_free(dd->name);
|
|
47623 |
+
|
|
47624 |
+ for (i = 0; i < dd->NumPageUrls; i++)
|
|
47625 |
+ a_Url_free(dd->PageUrls[i].Url);
|
|
47626 |
+ g_free(dd->PageUrls);
|
|
47627 |
+ g_free(dd);
|
|
47628 |
+}
|
|
47629 |
+
|
|
47630 |
+/*
|
|
47631 |
+ * set the dd's cursor type, and update the docwin if it is
|
|
47632 |
+ * mapped.
|
|
47633 |
+ */
|
|
47634 |
+void a_Doc_set_cursor(DilloDoc *dd, GdkCursorType CursorType)
|
|
47635 |
+{
|
|
47636 |
+ GdkCursor *cursor;
|
|
47637 |
+
|
|
47638 |
+ g_return_if_fail ( dd != NULL );
|
|
47639 |
+
|
|
47640 |
+ if ( dd->CursorType != CursorType ) {
|
|
47641 |
+ if(GTK_WIDGET_MAPPED(dd->docwin)) {
|
|
47642 |
+ cursor = gdk_cursor_new(CursorType);
|
|
47643 |
+ gdk_window_set_cursor(dd->docwin->window, cursor);
|
|
47644 |
+ gdk_cursor_destroy(cursor);
|
|
47645 |
+ }
|
|
47646 |
+ dd->CursorType = CursorType;
|
|
47647 |
+ }
|
|
47648 |
+}
|
|
47649 |
+
|
|
47650 |
+/*
|
|
47651 |
+ * Get the DilloDoc which contains *docwin
|
|
47652 |
+ * returns NULL if dd not found
|
|
47653 |
+ */
|
|
47654 |
+DilloDoc *
|
|
47655 |
+a_Doc_get_by_docwin(GtkWidget *docwin)
|
|
47656 |
+{
|
|
47657 |
+ gint i;
|
|
47658 |
+
|
|
47659 |
+ g_return_val_if_fail ( docwin != NULL, NULL );
|
|
47660 |
+
|
|
47661 |
+ for (i = 0; i < num_dd; i++)
|
|
47662 |
+ if (dillo_doc[i]->docwin == docwin)
|
|
47663 |
+ return dillo_doc[i];
|
|
47664 |
+
|
|
47665 |
+ return NULL;
|
|
47666 |
+}
|
|
47667 |
+
|
|
47668 |
+/*
|
|
47669 |
+ * set the dd's name (used for targeted links)
|
|
47670 |
+ */
|
|
47671 |
+void a_Doc_set_name(DilloDoc *dd, gchar *name)
|
|
47672 |
+{
|
|
47673 |
+ g_return_if_fail((dd != NULL) && (name != NULL));
|
|
47674 |
+
|
|
47675 |
+ if (dd && name) {
|
|
47676 |
+ if (dd->name)
|
|
47677 |
+ g_free((gchar *)dd->name);
|
|
47678 |
+ dd->name = g_strdup(name);
|
|
47679 |
+ }
|
|
47680 |
+}
|
|
47681 |
+
|
|
47682 |
+/*
|
|
47683 |
+ * Get a named DilloDoc
|
|
47684 |
+ *
|
|
47685 |
+ * First checks if name is one of the reserved names
|
|
47686 |
+ * ("_blank", "_self", "_parent" and "_top") and acts
|
|
47687 |
+ * accordingly if so. If not, it searches for a document
|
|
47688 |
+ * with the same root as the document which initiated the
|
|
47689 |
+ * search. If still not found, it searches for the first
|
|
47690 |
+ * document with the given name.
|
|
47691 |
+ *
|
|
47692 |
+ * returns NULL if no matching document found
|
|
47693 |
+ */
|
|
47694 |
+DilloDoc *
|
|
47695 |
+a_Doc_get_by_name(DilloDoc *dd, gchar *name)
|
|
47696 |
+{
|
|
47697 |
+ gint i, n;
|
|
47698 |
+ DilloDoc *parent, *document;
|
|
47699 |
+ gint width, height;
|
|
47700 |
+ BrowserWindow *newbw;
|
|
47701 |
+
|
|
47702 |
+ g_return_val_if_fail((dd != NULL) && (name != NULL), NULL);
|
|
47703 |
+
|
|
47704 |
+ parent = a_Doc_get_root(dd);
|
|
47705 |
+ document = NULL;
|
|
47706 |
+
|
|
47707 |
+ /* first see if the target name is one of the reserved names,
|
|
47708 |
+ * if so act appropriately */
|
|
47709 |
+ if(!g_strcasecmp(name, "_blank")) {
|
|
47710 |
+
|
|
47711 |
+#ifndef DISABLE_TABS
|
|
47712 |
+ if(prefs.tab_instead_of_window)
|
|
47713 |
+ {
|
|
47714 |
+ document = a_Doc_new();
|
|
47715 |
+ a_Tab_add(parent->bw, document);
|
|
47716 |
+ }
|
|
47717 |
+ else
|
|
47718 |
+#endif /* !DISABLE_TABS */
|
|
47719 |
+ {
|
|
47720 |
+ gdk_window_get_size(parent->bw->main_window->window, &width, &height);
|
|
47721 |
+ newbw = a_Interface_browser_window_new(width, height, 0);
|
|
47722 |
+ document = newbw->dd;
|
|
47723 |
+ }
|
|
47724 |
+ }
|
|
47725 |
+ else if(!g_strcasecmp(name, "_self"))
|
|
47726 |
+ document = dd;
|
|
47727 |
+ else if(!g_strcasecmp(name, "_parent"))
|
|
47728 |
+ document = a_Doc_get_parent(dd);
|
|
47729 |
+ else if(!g_strcasecmp(name, "_top"))
|
|
47730 |
+ document = a_Doc_get_root(dd);
|
|
47731 |
+
|
|
47732 |
+ /* if previous search did not match, first try to find document with same parent,
|
|
47733 |
+ * if not found try to find first matching named document
|
|
47734 |
+ */
|
|
47735 |
+ if(!document)
|
|
47736 |
+ for (n = 1; n >= 0; n--) {
|
|
47737 |
+ for (i = 0; i < num_dd; i++)
|
|
47738 |
+ if (dillo_doc[i]->name &&
|
|
47739 |
+ (!g_strcasecmp(name, dillo_doc[i]->name)) &&
|
|
47740 |
+ (n ? (a_Doc_get_root(dillo_doc[i]) == parent) : TRUE)) {
|
|
47741 |
+ document = dillo_doc[i];
|
|
47742 |
+ break;
|
|
47743 |
+ }
|
|
47744 |
+ if(document)
|
|
47745 |
+ break;
|
|
47746 |
+ }
|
|
47747 |
+
|
|
47748 |
+ return document;
|
|
47749 |
+}
|
|
47750 |
+
|
|
47751 |
+/*
|
|
47752 |
+ * Get the parent document
|
|
47753 |
+ * For unparented documents it just returns the document itself
|
|
47754 |
+ */
|
|
47755 |
+DilloDoc *
|
|
47756 |
+a_Doc_get_parent(DilloDoc *dd)
|
|
47757 |
+{
|
|
47758 |
+ DilloDoc *parent;
|
|
47759 |
+
|
|
47760 |
+ g_return_val_if_fail(dd != NULL, NULL);
|
|
47761 |
+
|
|
47762 |
+ parent = dd;
|
|
47763 |
+ if(parent->parent)
|
|
47764 |
+ parent = parent->parent;
|
|
47765 |
+
|
|
47766 |
+ return parent;
|
|
47767 |
+}
|
|
47768 |
+
|
|
47769 |
+/*
|
|
47770 |
+ * Get the root document
|
|
47771 |
+ * For unparented documents it just returns the document itself.
|
|
47772 |
+ */
|
|
47773 |
+DilloDoc *
|
|
47774 |
+a_Doc_get_root(DilloDoc *dd)
|
|
47775 |
+{
|
|
47776 |
+ DilloDoc *parent;
|
|
47777 |
+
|
|
47778 |
+ g_return_val_if_fail(dd != NULL, NULL);
|
|
47779 |
+
|
|
47780 |
+ parent = dd;
|
|
47781 |
+ while(parent->parent)
|
|
47782 |
+ parent = parent->parent;
|
|
47783 |
+
|
|
47784 |
+ return parent;
|
|
47785 |
+}
|
|
47786 |
+
|
|
47787 |
+/*
|
|
47788 |
+ * get all visible children (nested documents) for this document
|
|
47789 |
+ *
|
|
47790 |
+ * returns: pointer to GList containing all visible descendants of
|
|
47791 |
+ * the document (including the document itself as the first
|
|
47792 |
+ * item if it is visible. Frameset documents are not visible,
|
|
47793 |
+ * so they are not included in the list).
|
|
47794 |
+ *
|
|
47795 |
+ * returned GList must be g_list_free()'d by caller
|
|
47796 |
+ */
|
|
47797 |
+GList *
|
|
47798 |
+a_Doc_get_visible_children(DilloDoc *dd)
|
|
47799 |
+{
|
|
47800 |
+ gint i;
|
|
47801 |
+ GList *children;
|
|
47802 |
+
|
|
47803 |
+ g_return_val_if_fail(dd != NULL, NULL);
|
|
47804 |
+
|
|
47805 |
+ children = NULL;
|
|
47806 |
+
|
|
47807 |
+ /* first add 'self' to list */
|
|
47808 |
+ if(GTK_WIDGET_VISIBLE(dd->docwin))
|
|
47809 |
+ children = g_list_append(children, dd);
|
|
47810 |
+ for (i = 0; i < num_dd; i++)
|
|
47811 |
+ if (dillo_doc[i]->parent == dd)
|
|
47812 |
+ children = g_list_concat(children,
|
|
47813 |
+ a_Doc_get_visible_children(dillo_doc[i]));
|
|
47814 |
+
|
|
47815 |
+ return children;
|
|
47816 |
+}
|
|
47817 |
+
|
|
47818 |
+/*
|
|
47819 |
+ * Set parent
|
|
47820 |
+ */
|
|
47821 |
+void
|
|
47822 |
+a_Doc_set_parent(DilloDoc *dd, DilloDoc *parent)
|
|
47823 |
+{
|
|
47824 |
+ g_return_if_fail (dd != NULL && parent != NULL);
|
|
47825 |
+
|
|
47826 |
+ dd->parent = parent;
|
|
47827 |
+ a_Doc_set_browserwindow(dd, parent->bw);
|
|
47828 |
+}
|
|
47829 |
+
|
|
47830 |
+/*
|
|
47831 |
+ * set browserwindow
|
|
47832 |
+ */
|
|
47833 |
+void
|
|
47834 |
+a_Doc_set_browserwindow(DilloDoc *dd, BrowserWindow *bw)
|
|
47835 |
+{
|
|
47836 |
+ DwStyle style_attrs;
|
|
47837 |
+ DwStyleFont font;
|
|
47838 |
+
|
|
47839 |
+ g_return_if_fail (dd != NULL && bw != NULL);
|
|
47840 |
+
|
|
47841 |
+ /* set dd's current window */
|
|
47842 |
+ dd->bw = bw;
|
|
47843 |
+
|
|
47844 |
+ /* Catch key_press event */
|
|
47845 |
+ gtk_signal_connect(GTK_OBJECT(GTK_BIN(dd->docwin)->child),
|
|
47846 |
+ "key_press_event",
|
|
47847 |
+ GTK_SIGNAL_FUNC(a_Commands_key_press_handler),
|
|
47848 |
+ bw);
|
|
47849 |
+
|
|
47850 |
+ /* Full screen mode via double click is done in two ways: First,
|
|
47851 |
+ * a feature of the selection is used, since in complex pages,
|
|
47852 |
+ * getting events back to the viewport is quite difficult. Second,
|
|
47853 |
+ * a simple callback, called e.g. when viewing image resources.
|
|
47854 |
+ */
|
|
47855 |
+ a_Selection_set_dclick_callback(
|
|
47856 |
+ GTK_DW_VIEWPORT(GTK_BIN(GTK_BIN(dd->docwin)->child)->child)->selection,
|
|
47857 |
+ (void(*)(gpointer))a_Commands_full_screen_callback,
|
|
47858 |
+ bw);
|
|
47859 |
+ /* Selection requires an owner widget */
|
|
47860 |
+ a_Selection_set_owner(
|
|
47861 |
+ GTK_DW_VIEWPORT(GTK_BIN(GTK_BIN(dd->docwin)->child)->child)->selection,
|
|
47862 |
+ GTK_BIN(dd->docwin)->child);
|
|
47863 |
+
|
|
47864 |
+#if 0
|
|
47865 |
+ /* deselect location bar contents when the scrolled_frame gets focus */
|
|
47866 |
+ gtk_signal_connect_object(GTK_OBJECT(GTK_BIN(dd->docwin)->child),
|
|
47867 |
+ "grab-focus",
|
|
47868 |
+ a_Interface_content_focus_callback,
|
|
47869 |
+ (gpointer) bw);
|
|
47870 |
+#endif
|
|
47871 |
+
|
|
47872 |
+ gtk_signal_connect_object_after(GTK_OBJECT(GTK_BIN(dd->docwin)->child),
|
|
47873 |
+ "button_press_event",
|
|
47874 |
+ GTK_SIGNAL_FUNC(a_Commands_click_callback),
|
|
47875 |
+ (gpointer) bw);
|
|
47876 |
+
|
|
47877 |
+ /* create style for Dw */
|
|
47878 |
+ font.name = prefs.vw_fontname; /* must be defined */
|
|
47879 |
+ font.size = rint(DOC_DEFAULT_FONT_SIZE * prefs.font_factor);
|
|
47880 |
+ font.weight = 400;
|
|
47881 |
+ font.style = DW_STYLE_FONT_STYLE_NORMAL;
|
|
47882 |
+
|
|
47883 |
+ a_Dw_style_init_values (&style_attrs, dd->bw->main_window->window);
|
|
47884 |
+ a_Dw_style_box_set_val (&style_attrs.margin, DOC_DEFAULT_MARGIN);
|
|
47885 |
+ style_attrs.font = a_Dw_style_font_new (&font);
|
|
47886 |
+ style_attrs.color =
|
|
47887 |
+ a_Dw_style_color_new (prefs.text_color, dd->bw->main_window->window);
|
|
47888 |
+ style_attrs.background_color =
|
|
47889 |
+ a_Dw_style_color_new (prefs.bg_color, dd->bw->main_window->window);
|
|
47890 |
+ dd->style = a_Dw_style_new (&style_attrs, dd->bw->main_window->window);
|
|
47891 |
+}
|
|
47892 |
+
|
|
47893 |
+/*
|
|
47894 |
+ * Create a new DilloDoc
|
|
47895 |
+ * (the new document is stored in dillo_doc)
|
|
47896 |
+ */
|
|
47897 |
+DilloDoc *
|
|
47898 |
+a_Doc_new(void)
|
|
47899 |
+{
|
|
47900 |
+ DilloDoc *dd;
|
|
47901 |
+ dd = g_new0(DilloDoc, 1);
|
|
47902 |
+ a_List_add(dillo_doc, num_dd, num_dd_max);
|
|
47903 |
+ dillo_doc[num_dd++] = dd;
|
|
47904 |
+
|
|
47905 |
+ a_Nav_init(dd);
|
|
47906 |
+
|
|
47907 |
+ dd->docwin = a_Dw_gtk_scrolled_window_new();
|
|
47908 |
+ dd->style = NULL;
|
|
47909 |
+ dd->parent = NULL;
|
|
47910 |
+
|
|
47911 |
+ dd->frameset = NULL;
|
|
47912 |
+ dd->name = NULL;
|
|
47913 |
+
|
|
47914 |
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dd->docwin),
|
|
47915 |
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
|
47916 |
+
|
|
47917 |
+ /* this callback NULLs the docwin->gadget (to keep GTK from
|
|
47918 |
+ * complaining when it tries to destroy a non-existing widget - there
|
|
47919 |
+ * should be a check in dw_gtk_scrolled_window to see if scrolled->gadget
|
|
47920 |
+ * really points at a GTK widget...
|
|
47921 |
+ *
|
|
47922 |
+ * it also destroys the DilloDoc by the way...
|
|
47923 |
+ */
|
|
47924 |
+ gtk_signal_connect(GTK_OBJECT(dd->docwin),
|
|
47925 |
+ "destroy",
|
|
47926 |
+ GTK_SIGNAL_FUNC(Doc_docwin_destroy_callback),
|
|
47927 |
+ (gpointer) dd);
|
|
47928 |
+
|
|
47929 |
+ gtk_widget_show(dd->docwin);
|
|
47930 |
+
|
|
47931 |
+ /* initialize the rest of the bt's data. */
|
|
47932 |
+ dd->redirect_level = 0;
|
|
47933 |
+ dd->RootClients = NULL;
|
|
47934 |
+ dd->NumRootClients = 0;
|
|
47935 |
+ dd->MaxRootClients = 8;
|
|
47936 |
+
|
|
47937 |
+ dd->ImageClients = NULL;
|
|
47938 |
+ dd->NumImageClients = 0;
|
|
47939 |
+ dd->MaxImageClients = 8;
|
|
47940 |
+ dd->NumImages = 0;
|
|
47941 |
+ dd->NumImagesGot = 0;
|
|
47942 |
+
|
|
47943 |
+ dd->PageUrls = NULL;
|
|
47944 |
+ dd->NumPageUrls = 0;
|
|
47945 |
+ dd->MaxPageUrls = 8;
|
|
47946 |
+
|
|
47947 |
+ dd->auth_await_url = NULL;
|
|
47948 |
+
|
|
47949 |
+ dd->pagemarks_menu = NULL;
|
|
47950 |
+ dd->pagemarks_last = NULL;
|
|
47951 |
+
|
|
47952 |
+ dd->CursorType = -1;
|
|
47953 |
+
|
|
47954 |
+ dd->progress = 0.0;
|
|
47955 |
+ dd->ready = TRUE;
|
|
47956 |
+
|
|
47957 |
+ return dd;
|
|
47958 |
+}
|
|
47959 |
+
|
|
47960 |
+
|
|
47961 |
diff -pruN dillo-0.8.6/src/doc.h dillo-0.8.6-i18n-misc-20070916/src/doc.h
|
|
47962 |
--- dillo-0.8.6/src/doc.h 1970-01-01 09:00:00.000000000 +0900
|
|
47963 |
+++ dillo-0.8.6-i18n-misc-20070916/src/doc.h 2006-05-16 01:21:08.000000000 +0900
|
|
47964 |
@@ -0,0 +1,35 @@
|
|
47965 |
+#ifndef __DOC_H__
|
|
47966 |
+#define __DOC_H__
|
|
47967 |
+
|
|
47968 |
+#include "browser.h" /* for DilloDoc */
|
|
47969 |
+
|
|
47970 |
+/* used to set default margin for documents */
|
|
47971 |
+#define DOC_DEFAULT_MARGIN 5
|
|
47972 |
+#define DOC_DEFAULT_FONT_SIZE 12.0
|
|
47973 |
+
|
|
47974 |
+/* macros for documents */
|
|
47975 |
+#define DD_HAS_FOCUS(dd,bw) bw->dd == dd
|
|
47976 |
+
|
|
47977 |
+void a_Doc_init(void);
|
|
47978 |
+void a_Doc_stop(DilloDoc *dd);
|
|
47979 |
+void a_Doc_clean(DilloDoc *dd);
|
|
47980 |
+void a_Doc_title_set(DilloDoc *dd, gchar *title);
|
|
47981 |
+void a_Doc_location_set(DilloDoc *dd, gchar *location);
|
|
47982 |
+void a_Doc_remove_client(DilloDoc *dd, gint ClientKey);
|
|
47983 |
+void a_Doc_close_client(DilloDoc *dd, gint ClientKey);
|
|
47984 |
+void a_Doc_add_client(DilloDoc *dd, gint Key, gint Root);
|
|
47985 |
+void a_Doc_add_url(DilloDoc *dd, const DilloUrl *Url, gint Flags);
|
|
47986 |
+void a_Doc_destroy(DilloDoc *dd);
|
|
47987 |
+void a_Doc_set_cursor(DilloDoc *dd, GdkCursorType CursorType);
|
|
47988 |
+void a_Doc_set_name(DilloDoc *dd, gchar *name);
|
|
47989 |
+DilloDoc * a_Doc_get_by_name(DilloDoc *dd, gchar *name);
|
|
47990 |
+void a_Doc_set_parent(DilloDoc *dd, DilloDoc *parent);
|
|
47991 |
+void a_Doc_set_browserwindow(DilloDoc *dd, BrowserWindow *bw);
|
|
47992 |
+void a_Doc_progress_update(DilloDoc *dd);
|
|
47993 |
+GList * a_Doc_get_visible_children(DilloDoc *dd);
|
|
47994 |
+DilloDoc * a_Doc_get_by_docwin(GtkWidget *docwin);
|
|
47995 |
+DilloDoc * a_Doc_get_parent(DilloDoc *dd);
|
|
47996 |
+DilloDoc * a_Doc_get_root(DilloDoc *dd);
|
|
47997 |
+DilloDoc * a_Doc_new(void);
|
|
47998 |
+
|
|
47999 |
+#endif /* __DOC_H__ */
|
|
48000 |
diff -pruN dillo-0.8.6/src/dpiapi.c dillo-0.8.6-i18n-misc-20070916/src/dpiapi.c
|
|
48001 |
--- dillo-0.8.6/src/dpiapi.c 2006-01-12 21:19:02.000000000 +0900
|
|
48002 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dpiapi.c 2006-05-16 01:21:09.000000000 +0900
|
|
48003 |
@@ -30,9 +30,9 @@ static char *dialog_server = NULL;
|
|
48004 |
/*
|
|
48005 |
* Generic callback function for dpip dialogs.
|
|
48006 |
*/
|
|
48007 |
-static void Dpiapi_dialog_answer_cb(BrowserWindow *bw)
|
|
48008 |
+static void Dpiapi_dialog_answer_cb(DilloDoc *dd)
|
|
48009 |
{
|
|
48010 |
- DialogAnswer *answer = bw->question_dialog_answer;
|
|
48011 |
+ DialogAnswer *answer = dd->bw->question_dialog_answer;
|
|
48012 |
char *cmd, numstr[16];
|
|
48013 |
|
|
48014 |
/* make dpip tag with the answer */
|
|
48015 |
@@ -41,18 +41,18 @@ static void Dpiapi_dialog_answer_cb(Brow
|
|
48016 |
"answer", "dialog", numstr);
|
|
48017 |
|
|
48018 |
/* Send answer */
|
|
48019 |
- a_Capi_dpi_send_cmd(NULL, bw, cmd, dialog_server, 0);
|
|
48020 |
+ a_Capi_dpi_send_cmd(NULL, dd, cmd, dialog_server, 0);
|
|
48021 |
|
|
48022 |
/* cleanup */
|
|
48023 |
- bw->question_dialog_data = NULL;
|
|
48024 |
+ dd->bw->question_dialog_data = NULL;
|
|
48025 |
g_free(answer->this);
|
|
48026 |
- bw->question_dialog_answer = NULL;
|
|
48027 |
+ dd->bw->question_dialog_answer = NULL;
|
|
48028 |
}
|
|
48029 |
|
|
48030 |
/*
|
|
48031 |
* Process a dpip "dialog" command from any dpi.
|
|
48032 |
*/
|
|
48033 |
-void a_Dpiapi_dialog(BrowserWindow *bw, char *server, char *dpip_tag)
|
|
48034 |
+void a_Dpiapi_dialog(DilloDoc *dd, char *server, char *dpip_tag)
|
|
48035 |
{
|
|
48036 |
char *question, *alt1, *alt2, *alt3, *alt4, *alt5;
|
|
48037 |
size_t dpip_tag_len;
|
|
48038 |
@@ -73,7 +73,7 @@ void a_Dpiapi_dialog(BrowserWindow *bw,
|
|
48039 |
alt5 = a_Dpip_get_attr(dpip_tag, dpip_tag_len, "alt5");
|
|
48040 |
|
|
48041 |
a_Interface_question_dialog(
|
|
48042 |
- bw, question, TRUE,
|
|
48043 |
+ dd, question, TRUE,
|
|
48044 |
alt1, alt2, alt3, alt4, alt5,
|
|
48045 |
(GtkSignalFunc) Dpiapi_dialog_answer_cb);
|
|
48046 |
|
|
48047 |
diff -pruN dillo-0.8.6/src/dpiapi.h dillo-0.8.6-i18n-misc-20070916/src/dpiapi.h
|
|
48048 |
--- dillo-0.8.6/src/dpiapi.h 2005-10-28 01:20:07.000000000 +0900
|
|
48049 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dpiapi.h 2006-05-16 01:21:09.000000000 +0900
|
|
48050 |
@@ -1,3 +1,3 @@
|
|
48051 |
|
|
48052 |
-void a_Dpiapi_dialog(BrowserWindow *bw, char *server, char *dpip_tag);
|
|
48053 |
+void a_Dpiapi_dialog(DilloDoc *dd, char *server, char *dpip_tag);
|
|
48054 |
|
|
48055 |
diff -pruN dillo-0.8.6/src/dw_gtk_scrolled_frame.c dillo-0.8.6-i18n-misc-20070916/src/dw_gtk_scrolled_frame.c
|
|
48056 |
--- dillo-0.8.6/src/dw_gtk_scrolled_frame.c 2006-01-03 03:18:34.000000000 +0900
|
|
48057 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_gtk_scrolled_frame.c 2006-05-16 01:21:08.000000000 +0900
|
|
48058 |
@@ -451,25 +451,29 @@ static gint Dw_gtk_scrolled_frame_key_pr
|
|
48059 |
case GDK_Up:
|
|
48060 |
case GDK_KP_Up:
|
|
48061 |
Dw_gtk_scrolled_frame_move_by (frame, 0,
|
|
48062 |
- - frame->vadjustment->step_increment);
|
|
48063 |
+ - frame->vadjustment->step_increment
|
|
48064 |
+ * ((event->state & GDK_SHIFT_MASK)?12:2));
|
|
48065 |
return TRUE;
|
|
48066 |
|
|
48067 |
case GDK_Down:
|
|
48068 |
case GDK_KP_Down:
|
|
48069 |
Dw_gtk_scrolled_frame_move_by (frame, 0,
|
|
48070 |
- + frame->vadjustment->step_increment);
|
|
48071 |
+ + frame->vadjustment->step_increment
|
|
48072 |
+ * ((event->state & GDK_SHIFT_MASK)?12:2));
|
|
48073 |
return TRUE;
|
|
48074 |
|
|
48075 |
case GDK_Left:
|
|
48076 |
case GDK_KP_Left:
|
|
48077 |
Dw_gtk_scrolled_frame_move_by (frame,
|
|
48078 |
- - frame->hadjustment->step_increment, 0);
|
|
48079 |
+ - frame->hadjustment->step_increment
|
|
48080 |
+ * ((event->state & GDK_SHIFT_MASK)?12:2), 0);
|
|
48081 |
return TRUE;
|
|
48082 |
|
|
48083 |
case GDK_Right:
|
|
48084 |
case GDK_KP_Right:
|
|
48085 |
Dw_gtk_scrolled_frame_move_by (frame,
|
|
48086 |
- + frame->hadjustment->step_increment, 0);
|
|
48087 |
+ + frame->hadjustment->step_increment
|
|
48088 |
+ * ((event->state & GDK_SHIFT_MASK)?12:2), 0);
|
|
48089 |
return TRUE;
|
|
48090 |
|
|
48091 |
case GDK_Tab:
|
|
48092 |
diff -pruN dillo-0.8.6/src/dw_gtk_scrolled_window.c dillo-0.8.6-i18n-misc-20070916/src/dw_gtk_scrolled_window.c
|
|
48093 |
--- dillo-0.8.6/src/dw_gtk_scrolled_window.c 2005-10-28 01:20:09.000000000 +0900
|
|
48094 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_gtk_scrolled_window.c 2006-05-16 01:21:08.000000000 +0900
|
|
48095 |
@@ -15,6 +15,7 @@
|
|
48096 |
#include "dw_gtk_scrolled_frame.h"
|
|
48097 |
#include "dw_gtk_viewport.h"
|
|
48098 |
#include "findtext.h"
|
|
48099 |
+#include "dw_tooltip.h"
|
|
48100 |
#include <gtk/gtk.h>
|
|
48101 |
|
|
48102 |
#include "debug.h"
|
|
48103 |
@@ -242,6 +243,7 @@ static void Dw_gtk_scrolled_window_size_
|
|
48104 |
GtkWidget *hscrollbar, *vscrollbar;
|
|
48105 |
gint gx, gy;
|
|
48106 |
|
|
48107 |
+ a_Dw_tooltip_count_reset();
|
|
48108 |
GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
|
|
48109 |
widget->allocation = *allocation;
|
|
48110 |
|
|
48111 |
@@ -465,7 +467,7 @@ gboolean a_Dw_gtk_scrolled_window_search
|
|
48112 |
void a_Dw_gtk_scrolled_window_reset_search (GtkDwScrolledWindow *scrolled)
|
|
48113 |
{
|
|
48114 |
GtkWidget *viewport;
|
|
48115 |
-
|
|
48116 |
+ //g_print("%d\n",(int)gtk_type_check_object_cast ((GtkTypeObject*) scrolled, gtk_bin_get_type ()));
|
|
48117 |
viewport = GTK_BIN(GTK_BIN(scrolled)->child)->child;
|
|
48118 |
a_Findtext_reset_search (GTK_DW_VIEWPORT(viewport)->findtext_state);
|
|
48119 |
}
|
|
48120 |
diff -pruN dillo-0.8.6/src/dw_gtk_viewport.c dillo-0.8.6-i18n-misc-20070916/src/dw_gtk_viewport.c
|
|
48121 |
--- dillo-0.8.6/src/dw_gtk_viewport.c 2005-10-28 01:20:09.000000000 +0900
|
|
48122 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_gtk_viewport.c 2006-05-16 01:21:08.000000000 +0900
|
|
48123 |
@@ -12,6 +12,7 @@
|
|
48124 |
#include <gtk/gtk.h>
|
|
48125 |
#include "msg.h"
|
|
48126 |
#include "dw_gtk_viewport.h"
|
|
48127 |
+#include "dw_tooltip.h"
|
|
48128 |
#include "dw_container.h"
|
|
48129 |
#include "list.h"
|
|
48130 |
|
|
48131 |
@@ -454,6 +455,7 @@ static gint Dw_gtk_viewport_enter_notify
|
|
48132 |
static gint Dw_gtk_viewport_leave_notify (GtkWidget *widget,
|
|
48133 |
GdkEventCrossing *event)
|
|
48134 |
{
|
|
48135 |
+ a_Dw_tooltip_count_reset();
|
|
48136 |
/* There will anyway be no Dw widget, thus this simple call */
|
|
48137 |
return Dw_widget_mouse_event (NULL, widget, 0, 0, NULL);
|
|
48138 |
}
|
|
48139 |
@@ -478,7 +480,8 @@ void Dw_gtk_viewport_update_background (
|
|
48140 |
/* The toplevel widget should always have a defined background color,
|
|
48141 |
* except at the beginning. Searching a defined background is not
|
|
48142 |
* necessary. */
|
|
48143 |
- if (viewport->child && viewport->child->style &&
|
|
48144 |
+ if (GTK_LAYOUT(viewport)->bin_window &&
|
|
48145 |
+ viewport->child && viewport->child->style &&
|
|
48146 |
viewport->child->style->background_color)
|
|
48147 |
gdk_window_set_background (GTK_LAYOUT(viewport)->bin_window,
|
|
48148 |
&viewport->child->style->background_color
|
|
48149 |
@@ -831,10 +834,10 @@ gchar* p_Dw_gtk_viewport_add_anchor (DwW
|
|
48150 |
anchor->name = g_strdup (name);
|
|
48151 |
anchor->widget = widget;
|
|
48152 |
anchor->y = y;
|
|
48153 |
-
|
|
48154 |
+
|
|
48155 |
g_hash_table_insert (viewport->anchors_table, anchor->name, anchor);
|
|
48156 |
Dw_gtk_viewport_update_anchor (viewport);
|
|
48157 |
-
|
|
48158 |
+
|
|
48159 |
return anchor->name;
|
|
48160 |
}
|
|
48161 |
}
|
|
48162 |
@@ -888,14 +891,14 @@ void p_Dw_gtk_viewport_remove_anchor (Dw
|
|
48163 |
g_return_if_fail (widget->viewport != NULL);
|
|
48164 |
viewport = GTK_DW_VIEWPORT (widget->viewport);
|
|
48165 |
|
|
48166 |
- exists =
|
|
48167 |
+ exists =
|
|
48168 |
g_hash_table_lookup_extended (viewport->anchors_table, name, NULL,
|
|
48169 |
&tmp_anchor);
|
|
48170 |
g_return_if_fail(exists);
|
|
48171 |
|
|
48172 |
anchor = tmp_anchor;
|
|
48173 |
g_return_if_fail(anchor->widget == widget);
|
|
48174 |
-
|
|
48175 |
+
|
|
48176 |
g_hash_table_remove (viewport->anchors_table, name);
|
|
48177 |
g_free (anchor->name);
|
|
48178 |
g_free (anchor);
|
|
48179 |
diff -pruN dillo-0.8.6/src/dw_image.c dillo-0.8.6-i18n-misc-20070916/src/dw_image.c
|
|
48180 |
--- dillo-0.8.6/src/dw_image.c 2005-10-28 01:20:10.000000000 +0900
|
|
48181 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_image.c 2006-05-16 01:21:08.000000000 +0900
|
|
48182 |
@@ -10,9 +10,16 @@
|
|
48183 |
* (at your option) any later version.
|
|
48184 |
*/
|
|
48185 |
|
|
48186 |
+#include "i18n_gtk.h"
|
|
48187 |
#include "msg.h"
|
|
48188 |
#include "dw_image.h"
|
|
48189 |
#include "dw_gtk_viewport.h"
|
|
48190 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48191 |
+ #include <X11/Xlib.h>
|
|
48192 |
+ #include <X11/Xft/Xft.h>
|
|
48193 |
+ #undef Status
|
|
48194 |
+ #include <gdk/gdkx.h>
|
|
48195 |
+#endif
|
|
48196 |
#include "prefs.h"
|
|
48197 |
#include "dw_marshal.h"
|
|
48198 |
#include "list.h"
|
|
48199 |
@@ -87,11 +94,15 @@ enum
|
|
48200 |
LINK_PRESSED,
|
|
48201 |
LINK_RELEASED,
|
|
48202 |
LINK_CLICKED,
|
|
48203 |
+ IMAGE_PRESSED,
|
|
48204 |
LAST_SIGNAL
|
|
48205 |
};
|
|
48206 |
|
|
48207 |
static guint image_signals[LAST_SIGNAL] = { 0 };
|
|
48208 |
static DwWidgetClass *parent_class;
|
|
48209 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48210 |
+static XftDraw *xftdraw = NULL;
|
|
48211 |
+#endif
|
|
48212 |
|
|
48213 |
|
|
48214 |
/*
|
|
48215 |
@@ -205,6 +216,14 @@ static void Dw_image_class_init (DwImage
|
|
48216 |
GTK_TYPE_BOOL,
|
|
48217 |
4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
|
|
48218 |
GTK_TYPE_GDK_EVENT);
|
|
48219 |
+ image_signals[IMAGE_PRESSED] =
|
|
48220 |
+ gtk_signal_new ("image_pressed",
|
|
48221 |
+ GTK_RUN_FIRST,
|
|
48222 |
+ object_class->type,
|
|
48223 |
+ GTK_SIGNAL_OFFSET (DwImageClass, image_pressed),
|
|
48224 |
+ gtk_marshal_NONE__POINTER,
|
|
48225 |
+ GTK_TYPE_NONE,
|
|
48226 |
+ 1, GTK_TYPE_GDK_EVENT);
|
|
48227 |
gtk_object_class_add_signals (object_class, image_signals, LAST_SIGNAL);
|
|
48228 |
|
|
48229 |
widget_class = (DwWidgetClass*)klass;
|
|
48230 |
@@ -245,6 +264,9 @@ static void Dw_image_size_request (DwWid
|
|
48231 |
DwRequisition *requisition)
|
|
48232 |
{
|
|
48233 |
DwImage *image;
|
|
48234 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48235 |
+ XGlyphInfo info;
|
|
48236 |
+#endif
|
|
48237 |
|
|
48238 |
image = DW_IMAGE (widget);
|
|
48239 |
|
|
48240 |
@@ -255,8 +277,14 @@ static void Dw_image_size_request (DwWid
|
|
48241 |
requisition->descent = 0;
|
|
48242 |
} else {
|
|
48243 |
if (image->alt_text_width == -1)
|
|
48244 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48245 |
+ XftTextExtentsUtf8(GDK_DISPLAY(), widget->style->font->font,
|
|
48246 |
+ image->alt_text, strlen(image->alt_text), &info);
|
|
48247 |
+ image->alt_text_width = info.xOff;
|
|
48248 |
+#else
|
|
48249 |
image->alt_text_width =
|
|
48250 |
gdk_string_width (widget->style->font->font, image->alt_text);
|
|
48251 |
+#endif
|
|
48252 |
|
|
48253 |
requisition->width = image->alt_text_width;
|
|
48254 |
requisition->ascent = widget->style->font->font->ascent;
|
|
48255 |
@@ -306,6 +334,11 @@ static void Dw_image_draw (DwWidget *wid
|
|
48256 |
guchar *buffer, *bstart;
|
|
48257 |
int i;
|
|
48258 |
gboolean selected = FALSE;
|
|
48259 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48260 |
+ XGlyphInfo info;
|
|
48261 |
+ XftColor xftcolor;
|
|
48262 |
+ GdkWindow *window;
|
|
48263 |
+#endif
|
|
48264 |
|
|
48265 |
if (image->buffer) {
|
|
48266 |
p_Dw_widget_draw_widget_box (widget, area, FALSE);
|
|
48267 |
@@ -339,8 +372,14 @@ static void Dw_image_draw (DwWidget *wid
|
|
48268 |
} else {
|
|
48269 |
if (image->alt_text && image->alt_text[0]) {
|
|
48270 |
if (image->alt_text_width == -1)
|
|
48271 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48272 |
+ XftTextExtentsUtf8(GDK_DISPLAY(), widget->style->font->font,
|
|
48273 |
+ image->alt_text, strlen(image->alt_text), &info);
|
|
48274 |
+ image->alt_text_width = info.xOff;
|
|
48275 |
+#else
|
|
48276 |
image->alt_text_width =
|
|
48277 |
gdk_string_width (widget->style->font->font, image->alt_text);
|
|
48278 |
+#endif
|
|
48279 |
|
|
48280 |
if (widget->allocation.width < image->alt_text_width ||
|
|
48281 |
widget->allocation.ascent + widget->allocation.descent
|
|
48282 |
@@ -349,13 +388,43 @@ static void Dw_image_draw (DwWidget *wid
|
|
48283 |
p_Dw_widget_will_clip (widget);
|
|
48284 |
|
|
48285 |
p_Dw_widget_draw_widget_box (widget, area, FALSE);
|
|
48286 |
- gdk_draw_string
|
|
48287 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48288 |
+ if (!xftdraw) {
|
|
48289 |
+ window = DW_WIDGET_WINDOW (widget);
|
|
48290 |
+ xftdraw = XftDrawCreate(GDK_DISPLAY(),
|
|
48291 |
+ GDK_WINDOW_XWINDOW(window),
|
|
48292 |
+ DefaultVisual(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY())),
|
|
48293 |
+ DefaultColormap(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY())));
|
|
48294 |
+#ifdef XFT_VERSION
|
|
48295 |
+ if (XftDrawDrawable(xftdraw) != GDK_WINDOW_XWINDOW(window)) {
|
|
48296 |
+#else
|
|
48297 |
+ if (xftdraw->drawable != GDK_WINDOW_XWINDOW(window)) {
|
|
48298 |
+#endif
|
|
48299 |
+ XftDrawChange(xftdraw, GDK_WINDOW_XWINDOW(window));
|
|
48300 |
+ }
|
|
48301 |
+ }
|
|
48302 |
+ xftcolor.pixel = widget->style->color->color.pixel;
|
|
48303 |
+ xftcolor.color.red = widget->style->color->color.red;
|
|
48304 |
+ xftcolor.color.green = widget->style->color->color.green;
|
|
48305 |
+ xftcolor.color.blue = widget->style->color->color.blue;
|
|
48306 |
+ xftcolor.color.alpha = 0xffff;
|
|
48307 |
+ XftDrawStringUtf8(xftdraw,
|
|
48308 |
+ &xftcolor,
|
|
48309 |
+ widget->style->font->font,
|
|
48310 |
+ p_Dw_widget_x_world_to_viewport (widget, widget->allocation.x),
|
|
48311 |
+ p_Dw_widget_y_world_to_viewport (widget, widget->allocation.y)
|
|
48312 |
+ + widget->style->font->font->ascent,
|
|
48313 |
+ image->alt_text,
|
|
48314 |
+ strlen(image->alt_text));
|
|
48315 |
+#else
|
|
48316 |
+ a_I18n_gdk_draw_string
|
|
48317 |
(DW_WIDGET_WINDOW (widget), widget->style->font->font,
|
|
48318 |
widget->style->color->gc,
|
|
48319 |
p_Dw_widget_x_world_to_viewport (widget, widget->allocation.x),
|
|
48320 |
p_Dw_widget_y_world_to_viewport (widget, widget->allocation.y)
|
|
48321 |
+ widget->style->font->font->ascent,
|
|
48322 |
image->alt_text);
|
|
48323 |
+#endif
|
|
48324 |
}
|
|
48325 |
}
|
|
48326 |
|
|
48327 |
@@ -387,6 +456,7 @@ static gboolean Dw_image_leave_notify (D
|
|
48328 |
DwImage *image = DW_IMAGE (widget);
|
|
48329 |
gboolean return_val = FALSE;
|
|
48330 |
|
|
48331 |
+ a_Dw_tooltip_count_reset();
|
|
48332 |
if (image->hover_link != -1) {
|
|
48333 |
image->hover_link = -1;
|
|
48334 |
gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_ENTERED],
|
|
48335 |
@@ -416,6 +486,14 @@ static gboolean Dw_image_button_press (D
|
|
48336 |
gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_PRESSED],
|
|
48337 |
image->pressed_link, link_x, link_y, event,
|
|
48338 |
&return_val);
|
|
48339 |
+
|
|
48340 |
+#if 0
|
|
48341 |
+ if (DW_WIDGET(widget)->button_sensitive) {
|
|
48342 |
+ gtk_signal_emit (GTK_OBJECT (widget), image_signals[IMAGE_PRESSED], event);
|
|
48343 |
+ return TRUE;
|
|
48344 |
+ } else
|
|
48345 |
+ return FALSE;
|
|
48346 |
+#endif
|
|
48347 |
|
|
48348 |
return return_val;
|
|
48349 |
}
|
|
48350 |
diff -pruN dillo-0.8.6/src/dw_image.h dillo-0.8.6-i18n-misc-20070916/src/dw_image.h
|
|
48351 |
--- dillo-0.8.6/src/dw_image.h 2005-10-28 01:20:10.000000000 +0900
|
|
48352 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_image.h 2006-05-16 01:21:08.000000000 +0900
|
|
48353 |
@@ -69,6 +69,10 @@ struct _DwImageClass
|
|
48354 |
gboolean (*link_clicked) (DwImage *page,
|
|
48355 |
gint link, gint x, gint y,
|
|
48356 |
GdkEventButton *event);
|
|
48357 |
+#if 1
|
|
48358 |
+ void (*image_pressed) (DwImage *page,
|
|
48359 |
+ GdkEventButton *event);
|
|
48360 |
+#endif
|
|
48361 |
};
|
|
48362 |
|
|
48363 |
|
|
48364 |
diff -pruN dillo-0.8.6/src/dw_page.c dillo-0.8.6-i18n-misc-20070916/src/dw_page.c
|
|
48365 |
--- dillo-0.8.6/src/dw_page.c 2006-01-03 03:17:52.000000000 +0900
|
|
48366 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_page.c 2006-05-16 01:21:08.000000000 +0900
|
|
48367 |
@@ -19,8 +19,10 @@
|
|
48368 |
#include <ctype.h>
|
|
48369 |
#include <string.h>
|
|
48370 |
#include <stdio.h>
|
|
48371 |
+#include <errno.h>
|
|
48372 |
+#include <iconv.h>
|
|
48373 |
|
|
48374 |
-#include <gtk/gtk.h>
|
|
48375 |
+#include "i18n_gtk.h"
|
|
48376 |
|
|
48377 |
#include "msg.h"
|
|
48378 |
#include "list.h"
|
|
48379 |
@@ -29,6 +31,7 @@
|
|
48380 |
#include "dw_gtk_viewport.h"
|
|
48381 |
|
|
48382 |
#include "prefs.h"
|
|
48383 |
+#include "i18n.h"
|
|
48384 |
|
|
48385 |
#define DEBUG_REWRAP_LEVEL 0
|
|
48386 |
#define DEBUG_SIZE_LEVEL 10
|
|
48387 |
@@ -203,6 +206,12 @@ static void Dw_page_init (DwPage *page)
|
|
48388 |
{
|
|
48389 |
DW_WIDGET_SET_FLAGS (page, DW_USES_HINTS);
|
|
48390 |
|
|
48391 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48392 |
+ page->xftdraw = NULL;
|
|
48393 |
+#endif
|
|
48394 |
+ if (strcmp(RENDER_CHARSET, DILLO_CHARSET) == 0)
|
|
48395 |
+ page->it = (iconv_t)-1;
|
|
48396 |
+ else page->it = iconv_open(RENDER_CHARSET, DILLO_CHARSET);
|
|
48397 |
page->list_item = FALSE;
|
|
48398 |
page->inner_padding = 0;
|
|
48399 |
page->line1_offset = 0;
|
|
48400 |
@@ -361,6 +370,11 @@ static void Dw_page_destroy (GtkObject *
|
|
48401 |
parent_class->destroy. */
|
|
48402 |
page->num_words = 0;
|
|
48403 |
page->num_lines = 0;
|
|
48404 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48405 |
+ if (page->xftdraw)
|
|
48406 |
+ XftDrawDestroy(page->xftdraw);
|
|
48407 |
+#endif
|
|
48408 |
+ if (page->it != (iconv_t)-1) iconv_close(page->it);
|
|
48409 |
|
|
48410 |
DBG_OBJ_SET_NUM(page, "num_lines", page->num_lines);
|
|
48411 |
|
|
48412 |
@@ -626,7 +640,7 @@ static void Dw_page_size_allocate (DwWid
|
|
48413 |
p_Dw_widget_size_allocate (word->content.data.widget,
|
|
48414 |
&child_allocation);
|
|
48415 |
break;
|
|
48416 |
-
|
|
48417 |
+
|
|
48418 |
case DW_CONTENT_ANCHOR:
|
|
48419 |
p_Dw_gtk_viewport_change_anchor
|
|
48420 |
(widget, word->content.data.anchor,
|
|
48421 |
@@ -1316,6 +1330,10 @@ static void Dw_page_draw_line (DwPage *p
|
|
48422 |
GdkWindow *window;
|
|
48423 |
GdkGC *gc, *hl_gc;
|
|
48424 |
DwStyleColor *page_bg_color, *word_bg_color;
|
|
48425 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48426 |
+ XftColor xftcolor;
|
|
48427 |
+ XGlyphInfo info;
|
|
48428 |
+#endif
|
|
48429 |
|
|
48430 |
/* Here's an idea on how to optimize this routine to minimize the number
|
|
48431 |
* of calls to gdk_draw_string:
|
|
48432 |
@@ -1328,7 +1346,7 @@ static void Dw_page_draw_line (DwPage *p
|
|
48433 |
widget = DW_WIDGET (page);
|
|
48434 |
window = DW_WIDGET_WINDOW (widget);
|
|
48435 |
page_bg_color = p_Dw_widget_get_bg_color (widget);
|
|
48436 |
-
|
|
48437 |
+
|
|
48438 |
x_widget = Dw_page_line_total_x_offset(page,line);
|
|
48439 |
x_viewport =
|
|
48440 |
p_Dw_widget_x_world_to_viewport (widget,
|
|
48441 |
@@ -1338,6 +1356,21 @@ static void Dw_page_draw_line (DwPage *p
|
|
48442 |
p_Dw_widget_y_world_to_viewport (widget,
|
|
48443 |
widget->allocation.y + y_widget);
|
|
48444 |
y_viewport_base = y_viewport + line->ascent;
|
|
48445 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48446 |
+ if (page->xftdraw == 0) {
|
|
48447 |
+ page->xftdraw = XftDrawCreate(GDK_DISPLAY(),
|
|
48448 |
+ GDK_WINDOW_XWINDOW(window),
|
|
48449 |
+ DefaultVisual(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY())),
|
|
48450 |
+ DefaultColormap(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY())));
|
|
48451 |
+ }
|
|
48452 |
+ #ifdef XFT_VERSION
|
|
48453 |
+ if (XftDrawDrawable(page->xftdraw) != GDK_WINDOW_XWINDOW(window)) {
|
|
48454 |
+ #else
|
|
48455 |
+ if (page->xftdraw->drawable != GDK_WINDOW_XWINDOW(window)) {
|
|
48456 |
+ #endif
|
|
48457 |
+ XftDrawChange(page->xftdraw, GDK_WINDOW_XWINDOW(window));
|
|
48458 |
+ }
|
|
48459 |
+#endif
|
|
48460 |
|
|
48461 |
for (word_index = line->first_word; word_index < line->last_word;
|
|
48462 |
word_index++) {
|
|
48463 |
@@ -1352,7 +1385,12 @@ static void Dw_page_draw_line (DwPage *p
|
|
48464 |
y_widget);
|
|
48465 |
|
|
48466 |
switch (word->content.type) {
|
|
48467 |
- case DW_CONTENT_TEXT:
|
|
48468 |
+ case DW_CONTENT_TEXT: {
|
|
48469 |
+ /* Change from internal charset to render charset. */
|
|
48470 |
+ gchar *word_str = word->content.data.text;
|
|
48471 |
+ if (page->it != (iconv_t)-1)
|
|
48472 |
+ word->content.data.text = a_I18n_convert_raw(&page->it,
|
|
48473 |
+ word->content.data.text, strlen(word->content.data.text));
|
|
48474 |
if (word->style->background_color)
|
|
48475 |
word_bg_color = word->style->background_color;
|
|
48476 |
else
|
|
48477 |
@@ -1388,9 +1426,24 @@ static void Dw_page_draw_line (DwPage *p
|
|
48478 |
word->size.ascent + word->size.descent,
|
|
48479 |
FALSE);
|
|
48480 |
|
|
48481 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48482 |
+ /* draw string using Xft */
|
|
48483 |
+ xftcolor.pixel = word->style->color->color.pixel;
|
|
48484 |
+ xftcolor.color.red = word->style->color->color.red;
|
|
48485 |
+ xftcolor.color.green = word->style->color->color.green;
|
|
48486 |
+ xftcolor.color.blue = word->style->color->color.blue;
|
|
48487 |
+ xftcolor.color.alpha = 0xffff;
|
|
48488 |
+ XftDrawStringUtf8(page->xftdraw,
|
|
48489 |
+ &xftcolor,
|
|
48490 |
+ word->style->font->font,
|
|
48491 |
+ x_viewport, y_viewport_base + diff,
|
|
48492 |
+ word->content.data.text,
|
|
48493 |
+ strlen(word->content.data.text));
|
|
48494 |
+#else
|
|
48495 |
gdk_draw_string (window, word->style->font->font, gc,
|
|
48496 |
x_viewport, y_viewport_base + diff,
|
|
48497 |
word->content.data.text);
|
|
48498 |
+#endif
|
|
48499 |
|
|
48500 |
/* underline */
|
|
48501 |
if (word->style->text_decoration & DW_STYLE_TEXT_DECORATION_UNDERLINE)
|
|
48502 |
@@ -1428,6 +1481,20 @@ static void Dw_page_draw_line (DwPage *p
|
|
48503 |
if (word->hl_start[layer] != -1) {
|
|
48504 |
word_len = strlen (word->content.data.text);
|
|
48505 |
eff_hl_end = MIN (word_len, word->hl_end[layer]);
|
|
48506 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48507 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48508 |
+ word->style->font->font,
|
|
48509 |
+ word->content.data.text,
|
|
48510 |
+ word->hl_start[layer],
|
|
48511 |
+ &info);
|
|
48512 |
+ start_hl = x_viewport + info.xOff;
|
|
48513 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48514 |
+ word->style->font->font,
|
|
48515 |
+ word->content.data.text + word->hl_start[layer],
|
|
48516 |
+ eff_hl_end - word->hl_start[layer],
|
|
48517 |
+ &info);
|
|
48518 |
+ width_hl = info.xOff;
|
|
48519 |
+#else
|
|
48520 |
start_hl = x_viewport +
|
|
48521 |
gdk_text_width (word->style->font->font,
|
|
48522 |
word->content.data.text,
|
|
48523 |
@@ -1437,6 +1504,7 @@ static void Dw_page_draw_line (DwPage *p
|
|
48524 |
word->content.data.text
|
|
48525 |
+ word->hl_start[layer],
|
|
48526 |
eff_hl_end - word->hl_start[layer]);
|
|
48527 |
+#endif
|
|
48528 |
|
|
48529 |
/* If the space after this word highlighted, and this word
|
|
48530 |
* is not the last one in this line, highlight also the
|
|
48531 |
@@ -1459,11 +1527,24 @@ static void Dw_page_draw_line (DwPage *p
|
|
48532 |
|
|
48533 |
/* Highlight the text. */
|
|
48534 |
hl_gc = word->style->color->inverse_gc;
|
|
48535 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48536 |
+ xftcolor.pixel = word->style->color->inverse_color.pixel;
|
|
48537 |
+ xftcolor.color.red = word->style->color->inverse_color.red;
|
|
48538 |
+ xftcolor.color.green = word->style->color->inverse_color.green;
|
|
48539 |
+ xftcolor.color.blue = word->style->color->inverse_color.blue;
|
|
48540 |
+ xftcolor.color.alpha = 0xffff;
|
|
48541 |
+ XftDrawStringUtf8(page->xftdraw,
|
|
48542 |
+ &xftcolor,
|
|
48543 |
+ word->style->font->font,
|
|
48544 |
+ start_hl, y_viewport_base + diff,
|
|
48545 |
+ word->content.data.text + word->hl_start[layer],
|
|
48546 |
+ eff_hl_end - word->hl_start[layer]);
|
|
48547 |
+#else
|
|
48548 |
gdk_draw_text (window, word->style->font->font, hl_gc,
|
|
48549 |
- start_hl, y_viewport_base + diff,
|
|
48550 |
- word->content.data.text
|
|
48551 |
- + word->hl_start[layer],
|
|
48552 |
- eff_hl_end - word->hl_start[layer]);
|
|
48553 |
+ start_hl, y_viewport_base + diff,
|
|
48554 |
+ word->content.data.text + word->hl_start[layer],
|
|
48555 |
+ eff_hl_end - word->hl_start[layer]);
|
|
48556 |
+#endif
|
|
48557 |
|
|
48558 |
/* underline and strike-through */
|
|
48559 |
if (word->style->text_decoration
|
|
48560 |
@@ -1484,8 +1565,12 @@ static void Dw_page_draw_line (DwPage *p
|
|
48561 |
}
|
|
48562 |
}
|
|
48563 |
}
|
|
48564 |
+ if (page->it != (iconv_t)-1) {
|
|
48565 |
+ g_free(word->content.data.text);
|
|
48566 |
+ word->content.data.text = word_str;
|
|
48567 |
+ }
|
|
48568 |
break;
|
|
48569 |
-
|
|
48570 |
+ }
|
|
48571 |
case DW_CONTENT_WIDGET:
|
|
48572 |
child = word->content.data.widget;
|
|
48573 |
if (p_Dw_widget_intersect (child, area, &child_area))
|
|
48574 |
@@ -1668,11 +1753,14 @@ static gboolean Dw_page_send_selection_e
|
|
48575 |
{
|
|
48576 |
DwIterator *it;
|
|
48577 |
DwPageLine *line, *last_line;
|
|
48578 |
- gint32 next_word_start_x, word_start_x, word_x, next_word_x, yfirst, ylast;
|
|
48579 |
+ gint32 next_word_start_x, word_start_x, word_x, next_word_x = 0, yfirst, ylast;
|
|
48580 |
gint char_pos = 0, word_index, line_index, link;
|
|
48581 |
DwPageWord *word;
|
|
48582 |
gboolean found;
|
|
48583 |
gboolean within_content;
|
|
48584 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48585 |
+ XGlyphInfo info;
|
|
48586 |
+#endif
|
|
48587 |
|
|
48588 |
DEBUG_MSG (DEBUG_EVENT_LEVEL,
|
|
48589 |
"Dw_page_send_selection_event: x = %d, y = %d\n", x, y);
|
|
48590 |
@@ -1747,20 +1835,40 @@ static gboolean Dw_page_send_selection_e
|
|
48591 |
if (word->content.type == DW_CONTENT_TEXT) {
|
|
48592 |
/* Search the character the mouse pointer is in.
|
|
48593 |
* next_word_x is the right side of this character. */
|
|
48594 |
+ int len = strlen(word->content.data.text);
|
|
48595 |
char_pos = 0;
|
|
48596 |
- while ((next_word_x = word_start_x +
|
|
48597 |
- gdk_text_width(word->style->font->font,
|
|
48598 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48599 |
+ while (char_pos < len){
|
|
48600 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48601 |
+ word->style->font->font,
|
|
48602 |
+ word->content.data.text,
|
|
48603 |
+ char_pos,
|
|
48604 |
+ &info);
|
|
48605 |
+ if(!((next_word_x = word_start_x + info.xOff) <= x))
|
|
48606 |
+ break;
|
|
48607 |
+ char_pos++;
|
|
48608 |
+ }
|
|
48609 |
+ /* The left side of this character. */
|
|
48610 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48611 |
+ word->style->font->font,
|
|
48612 |
+ word->content.data.text,
|
|
48613 |
+ char_pos - 1,
|
|
48614 |
+ &info);
|
|
48615 |
+ word_x = word_start_x + info.xOff;
|
|
48616 |
+#else
|
|
48617 |
+ while (((next_word_x = word_start_x +
|
|
48618 |
+ a_I18n_gdk_text_width(word->style->font->font,
|
|
48619 |
word->content.data.text,
|
|
48620 |
char_pos))
|
|
48621 |
- <= x)
|
|
48622 |
- char_pos++;
|
|
48623 |
-
|
|
48624 |
+ <= x) && char_pos < len)
|
|
48625 |
+ char_pos++;
|
|
48626 |
/* The left side of this character. */
|
|
48627 |
word_x =
|
|
48628 |
- word_start_x + gdk_text_width (word->style->font->font,
|
|
48629 |
+ word_start_x + a_I18n_gdk_text_width (word->style->font->font,
|
|
48630 |
word->content.data.text,
|
|
48631 |
char_pos - 1);
|
|
48632 |
|
|
48633 |
+#endif
|
|
48634 |
/* If the mouse pointer is left from the middle, use the left
|
|
48635 |
* position, otherwise, use the right one. */
|
|
48636 |
if (x <= (word_x + next_word_x) / 2)
|
|
48637 |
@@ -1860,6 +1968,7 @@ static gboolean Dw_page_motion_notify (D
|
|
48638 |
if (word_index == -1) {
|
|
48639 |
page->hover_link = -1;
|
|
48640 |
page->hover_tooltip = NULL;
|
|
48641 |
+ a_Dw_tooltip_count_reset();
|
|
48642 |
} else {
|
|
48643 |
page->hover_link = page->words[word_index].style->x_link;
|
|
48644 |
page->hover_tooltip = page->words[word_index].style->x_tooltip;
|
|
48645 |
@@ -1965,7 +2074,25 @@ static DwPageWord *Dw_page_add_word (DwP
|
|
48646 |
static void Dw_page_calc_text_size (DwPage *page, char *text, DwStyle *style,
|
|
48647 |
DwRequisition *size)
|
|
48648 |
{
|
|
48649 |
- size->width = gdk_string_width (style->font->font, text);
|
|
48650 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48651 |
+ XGlyphInfo info;
|
|
48652 |
+#endif
|
|
48653 |
+ gchar *render_str = text;
|
|
48654 |
+
|
|
48655 |
+ /* Change from internal charset to render charset. */
|
|
48656 |
+ if (page->it != (iconv_t)-1) {
|
|
48657 |
+ render_str = a_I18n_convert_raw(&page->it, text, strlen(text));
|
|
48658 |
+ }
|
|
48659 |
+
|
|
48660 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48661 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48662 |
+ style->font->font, render_str, strlen(render_str), &info);
|
|
48663 |
+ size->width = info.xOff;
|
|
48664 |
+#else
|
|
48665 |
+ size->width = gdk_string_width (style->font->font, render_str);
|
|
48666 |
+#endif
|
|
48667 |
+ if (page->it != (iconv_t)-1) g_free(render_str);
|
|
48668 |
+
|
|
48669 |
size->ascent = style->font->font->ascent;
|
|
48670 |
size->descent = style->font->font->descent;
|
|
48671 |
|
|
48672 |
@@ -2060,7 +2187,7 @@ gboolean a_Dw_page_add_anchor (DwPage *p
|
|
48673 |
y = Dw_page_line_total_y_offset_i (page, page->num_lines - 1);
|
|
48674 |
|
|
48675 |
/*
|
|
48676 |
- * Since an anchor does not take any space, it is safe to call
|
|
48677 |
+ * Since an anchor does not take any space, it is safe to call
|
|
48678 |
* p_Dw_gtk_viewport_add_anchor already here.
|
|
48679 |
*/
|
|
48680 |
if ((copy = p_Dw_gtk_viewport_add_anchor(DW_WIDGET(page), name, y)) == NULL)
|
|
48681 |
@@ -2070,7 +2197,7 @@ gboolean a_Dw_page_add_anchor (DwPage *p
|
|
48682 |
word->content.type = DW_CONTENT_ANCHOR;
|
|
48683 |
word->content.data.anchor = copy;
|
|
48684 |
Dw_page_word_wrap (page, page->num_words - 1);
|
|
48685 |
-
|
|
48686 |
+
|
|
48687 |
DBG_OBJ_ARRSET_STR (page, "words.%d.content.anchor", page->num_words - 1,
|
|
48688 |
word->content.data.anchor);
|
|
48689 |
|
|
48690 |
@@ -2485,6 +2612,9 @@ static void Dw_page_iterator_get_allocat
|
|
48691 |
DwPageLine *line;
|
|
48692 |
gint wi, l;
|
|
48693 |
gint32 diff;
|
|
48694 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48695 |
+ XGlyphInfo info;
|
|
48696 |
+#endif
|
|
48697 |
|
|
48698 |
line = &page->lines[Dw_page_find_line_of_word (page, ii->pos)];
|
|
48699 |
word = &page->words[ii->pos];
|
|
48700 |
@@ -2493,10 +2623,19 @@ static void Dw_page_iterator_get_allocat
|
|
48701 |
if (start == 0)
|
|
48702 |
diff = 0;
|
|
48703 |
else {
|
|
48704 |
- if (word->content.type == DW_CONTENT_TEXT)
|
|
48705 |
- diff = gdk_text_width (word->style->font->font,
|
|
48706 |
+ if (word->content.type == DW_CONTENT_TEXT) {
|
|
48707 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48708 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48709 |
+ word->style->font->font,
|
|
48710 |
+ word->content.data.text,
|
|
48711 |
+ start,
|
|
48712 |
+ &info);
|
|
48713 |
+ diff = info.xOff;
|
|
48714 |
+#else
|
|
48715 |
+ diff = a_I18n_gdk_text_width (word->style->font->font,
|
|
48716 |
word->content.data.text, start);
|
|
48717 |
- else
|
|
48718 |
+#endif
|
|
48719 |
+ } else
|
|
48720 |
diff = word->size.width;
|
|
48721 |
}
|
|
48722 |
|
|
48723 |
@@ -2520,9 +2659,19 @@ static void Dw_page_iterator_get_allocat
|
|
48724 |
allocation->width = word->size.width;
|
|
48725 |
else if (end >= l)
|
|
48726 |
allocation->width = word->size.width + word->eff_space;
|
|
48727 |
- else
|
|
48728 |
- allocation->width = gdk_text_width (word->style->font->font,
|
|
48729 |
+ else {
|
|
48730 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48731 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
48732 |
+ word->style->font->font,
|
|
48733 |
+ word->content.data.text,
|
|
48734 |
+ end,
|
|
48735 |
+ &info);
|
|
48736 |
+ allocation->width = info.xOff;
|
|
48737 |
+#else
|
|
48738 |
+ allocation->width = a_I18n_gdk_text_width (word->style->font->font,
|
|
48739 |
word->content.data.text, end);
|
|
48740 |
+#endif
|
|
48741 |
+ }
|
|
48742 |
} else {
|
|
48743 |
if (end == 1)
|
|
48744 |
allocation->width = word->size.width;
|
|
48745 |
diff -pruN dillo-0.8.6/src/dw_page.h dillo-0.8.6-i18n-misc-20070916/src/dw_page.h
|
|
48746 |
--- dillo-0.8.6/src/dw_page.h 2005-10-28 01:20:10.000000000 +0900
|
|
48747 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_page.h 2006-05-16 01:21:08.000000000 +0900
|
|
48748 |
@@ -5,6 +5,7 @@
|
|
48749 |
#define __DW_PAGE_H__
|
|
48750 |
|
|
48751 |
#include <gdk/gdk.h>
|
|
48752 |
+#include <iconv.h>
|
|
48753 |
#include "dw_container.h"
|
|
48754 |
#include "url.h"
|
|
48755 |
|
|
48756 |
@@ -72,7 +73,10 @@ struct _DwPageWord {
|
|
48757 |
struct _DwPage
|
|
48758 |
{
|
|
48759 |
DwContainer container;
|
|
48760 |
-
|
|
48761 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48762 |
+ XftDraw *xftdraw;
|
|
48763 |
+#endif
|
|
48764 |
+ iconv_t it;
|
|
48765 |
/* These fields provide some ad-hoc-functionality, used by sub-classes. */
|
|
48766 |
gboolean list_item; /* If TRUE, the first word of the page is treated
|
|
48767 |
specially (search in source). */
|
|
48768 |
diff -pruN dillo-0.8.6/src/dw_style.c dillo-0.8.6-i18n-misc-20070916/src/dw_style.c
|
|
48769 |
--- dillo-0.8.6/src/dw_style.c 2006-01-29 22:42:35.000000000 +0900
|
|
48770 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_style.c 2006-05-16 01:21:08.000000000 +0900
|
|
48771 |
@@ -11,6 +11,8 @@
|
|
48772 |
|
|
48773 |
#include "dw_style.h"
|
|
48774 |
#include "dw_widget.h"
|
|
48775 |
+#include "prefs.h"
|
|
48776 |
+#include "i18n.h"
|
|
48777 |
|
|
48778 |
#include <gdk/gdk.h>
|
|
48779 |
#include <stdio.h>
|
|
48780 |
@@ -286,61 +288,113 @@ static void Dw_style_font_realize (DwSty
|
|
48781 |
{
|
|
48782 |
char fontname[256], *style_char_1 = NULL, *style_char_2 = NULL;
|
|
48783 |
|
|
48784 |
- switch (font->style) {
|
|
48785 |
- case DW_STYLE_FONT_STYLE_NORMAL:
|
|
48786 |
- style_char_1 = style_char_2 = "r";
|
|
48787 |
- break;
|
|
48788 |
- case DW_STYLE_FONT_STYLE_ITALIC:
|
|
48789 |
- style_char_1 = "i";
|
|
48790 |
- style_char_2 = "o";
|
|
48791 |
- break;
|
|
48792 |
- case DW_STYLE_FONT_STYLE_OBLIQUE:
|
|
48793 |
- style_char_1 = "o";
|
|
48794 |
- style_char_2 = "i";
|
|
48795 |
- break;
|
|
48796 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48797 |
+ if (prefs.limit_font_decoration) {
|
|
48798 |
+ sprintf(fontname, "%s:style=Roman,Regular,Medium:size=%d",
|
|
48799 |
+ font->name, font->size);
|
|
48800 |
+ } else {
|
|
48801 |
+ switch (font->style) {
|
|
48802 |
+ case DW_STYLE_FONT_STYLE_NORMAL:
|
|
48803 |
+ style_char_1 = style_char_2 = "Roman";
|
|
48804 |
+ break;
|
|
48805 |
+ case DW_STYLE_FONT_STYLE_ITALIC:
|
|
48806 |
+ style_char_1 = "Italic";
|
|
48807 |
+ style_char_2 = "Oblique";
|
|
48808 |
+ break;
|
|
48809 |
+ case DW_STYLE_FONT_STYLE_OBLIQUE:
|
|
48810 |
+ style_char_1 = "Oblique";
|
|
48811 |
+ style_char_2 = "Italic";
|
|
48812 |
+ break;
|
|
48813 |
+ }
|
|
48814 |
+ if (font->weight >= 500 && font->style != DW_STYLE_FONT_STYLE_NORMAL)
|
|
48815 |
+ sprintf(fontname, "%s:style=Bold%s,Semibold%s:size=%d%s%s",
|
|
48816 |
+ font->name, style_char_1, style_char_1, font->size,
|
|
48817 |
+ strlen(font->lang) > 1 ? ":lang=" : "",
|
|
48818 |
+ strlen(font->lang) > 1 ? font->lang : "");
|
|
48819 |
+ else if (font->style != DW_STYLE_FONT_STYLE_NORMAL)
|
|
48820 |
+ sprintf(fontname, "%s:style=%s,Medium%s:size=%d%s%s",
|
|
48821 |
+ font->name, style_char_1, style_char_1, font->size,
|
|
48822 |
+ strlen(font->lang) > 1 ? ":lang=" : "",
|
|
48823 |
+ strlen(font->lang) > 1 ? font->lang : "");
|
|
48824 |
+ else if (font->weight >= 500)
|
|
48825 |
+ sprintf(fontname, "%s:style=Bold,Semibold:size=%d%s%s",
|
|
48826 |
+ font->name, font->size,
|
|
48827 |
+ strlen(font->lang) > 1 ? ":lang=" : "",
|
|
48828 |
+ strlen(font->lang) > 1 ? font->lang : "");
|
|
48829 |
+ else
|
|
48830 |
+ sprintf(fontname, "%s:style=Roman,Regular,Medium:size=%d%s%s",
|
|
48831 |
+ font->name, font->size,
|
|
48832 |
+ strlen(font->lang) > 1 ? ":lang=" : "",
|
|
48833 |
+ strlen(font->lang) > 1 ? font->lang : "");
|
|
48834 |
}
|
|
48835 |
-
|
|
48836 |
- sprintf (fontname, "-*-%s-%s-%s-*-*-%d-*-75-75-*-*-iso8859-1",
|
|
48837 |
- font->name,
|
|
48838 |
- (font->weight >= 500) ? "bold" : "medium",
|
|
48839 |
- style_char_1, font->size);
|
|
48840 |
- font->font = gdk_font_load (fontname);
|
|
48841 |
-
|
|
48842 |
- if (font->font == NULL && font->style != DW_STYLE_FONT_STYLE_NORMAL) {
|
|
48843 |
- sprintf (fontname, "-*-%s-%s-%s-*-*-%d-*-75-75-*-*-iso8859-1",
|
|
48844 |
+ font->font = XftFontOpenName(GDK_DISPLAY(),
|
|
48845 |
+ DefaultScreen(GDK_DISPLAY()),
|
|
48846 |
+ fontname);
|
|
48847 |
+
|
|
48848 |
+ if (font->font) {
|
|
48849 |
+ XGlyphInfo info;
|
|
48850 |
+ XftTextExtentsUtf8(GDK_DISPLAY(), font->font, " ", 1, &info);
|
|
48851 |
+ font->space_width = info.xOff;
|
|
48852 |
+ XftTextExtentsUtf8(GDK_DISPLAY(), font->font, "x", 1, &info);
|
|
48853 |
+ font->x_height = info.y;
|
|
48854 |
+ }
|
|
48855 |
+#else
|
|
48856 |
+ if (prefs.limit_font_decoration) {
|
|
48857 |
+ sprintf (fontname,
|
|
48858 |
+ "-%s-medium-r-*-*-%d-*-75-75-*-*-*-*",
|
|
48859 |
font->name,
|
|
48860 |
- (font->weight >= 500) ? "bold" : "medium",
|
|
48861 |
- style_char_2, font->size);
|
|
48862 |
- font->font = gdk_font_load (fontname);
|
|
48863 |
+ font->size
|
|
48864 |
+ );
|
|
48865 |
+ } else {
|
|
48866 |
+ switch (font->style) {
|
|
48867 |
+ case DW_STYLE_FONT_STYLE_NORMAL:
|
|
48868 |
+ style_char_1 = style_char_2 = "r";
|
|
48869 |
+ break;
|
|
48870 |
+ case DW_STYLE_FONT_STYLE_ITALIC:
|
|
48871 |
+ style_char_1 = "i";
|
|
48872 |
+ style_char_2 = "o";
|
|
48873 |
+ break;
|
|
48874 |
+ case DW_STYLE_FONT_STYLE_OBLIQUE:
|
|
48875 |
+ style_char_1 = "o";
|
|
48876 |
+ style_char_2 = "i";
|
|
48877 |
+ break;
|
|
48878 |
+ }
|
|
48879 |
+
|
|
48880 |
+ sprintf (fontname,
|
|
48881 |
+ "-%s-%s-%s-*-*-%d-*-75-75-*-*-*-*,"
|
|
48882 |
+ "-%s-%s-%s-*-*-%d-*-75-75-*-*-*-*",
|
|
48883 |
+ font->name,
|
|
48884 |
+ (font->weight >= 500) ? "bold" : "medium",
|
|
48885 |
+ style_char_1,
|
|
48886 |
+ font->size,
|
|
48887 |
+ font->name,
|
|
48888 |
+ (font->weight >= 500) ? "bold" : "medium",
|
|
48889 |
+ style_char_2,
|
|
48890 |
+ font->size
|
|
48891 |
+ );
|
|
48892 |
}
|
|
48893 |
-
|
|
48894 |
+ font->font = gdk_fontset_load (fontname);
|
|
48895 |
+
|
|
48896 |
if (try_all) {
|
|
48897 |
- if (font->font == NULL) {
|
|
48898 |
- /* Can't load the font - substitute the default instead. */
|
|
48899 |
- font->font =
|
|
48900 |
- gdk_font_load
|
|
48901 |
- ("-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-iso8859-1");
|
|
48902 |
+ if (!font->font) {
|
|
48903 |
+ /* Try any font this size. */
|
|
48904 |
+ sprintf (fontname,
|
|
48905 |
+ "-*-*-medium-r-*-*-%d-*-*-*-*-*-*-*",
|
|
48906 |
+ font->size);
|
|
48907 |
+ font->font = gdk_fontset_load(fontname);
|
|
48908 |
}
|
|
48909 |
-
|
|
48910 |
- if (font->font == NULL) {
|
|
48911 |
- /* Try another platform-font that should be available. (iPaq) */
|
|
48912 |
- font->font =
|
|
48913 |
- gdk_font_load
|
|
48914 |
- ("-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1");
|
|
48915 |
- }
|
|
48916 |
-
|
|
48917 |
- if (font->font == NULL) {
|
|
48918 |
- /* Can't load any suitable font! */
|
|
48919 |
- g_warning ("Can't load any ISO8859-1 font!?! :(");
|
|
48920 |
- font->font =
|
|
48921 |
- gdk_font_load ("-adobe-helvetica-*-*-*--*-*-*-*-*-*-*-*");
|
|
48922 |
+ if (!font->font) {
|
|
48923 |
+ /* Try all fonts! */
|
|
48924 |
+ g_warning ("Trouble loading fonts!?! :(");
|
|
48925 |
+ font->font = gdk_fontset_load("*");
|
|
48926 |
}
|
|
48927 |
}
|
|
48928 |
-
|
|
48929 |
+
|
|
48930 |
if (font->font) {
|
|
48931 |
font->space_width = gdk_char_width (font->font, ' ');
|
|
48932 |
font->x_height = gdk_char_height (font->font, 'x');
|
|
48933 |
}
|
|
48934 |
+#endif
|
|
48935 |
}
|
|
48936 |
|
|
48937 |
|
|
48938 |
@@ -354,6 +408,7 @@ static gint Dw_style_font_equal (gconstp
|
|
48939 |
return (font1->size == font2->size &&
|
|
48940 |
font1->weight == font2->weight &&
|
|
48941 |
font1->style == font2->style &&
|
|
48942 |
+ strncmp (font1->lang, font2->lang, 5) == 0 &&
|
|
48943 |
strcmp (font1->name, font2->name) == 0);
|
|
48944 |
}
|
|
48945 |
|
|
48946 |
@@ -365,11 +420,15 @@ static guint Dw_style_font_hash (gconstp
|
|
48947 |
{
|
|
48948 |
const DwStyleFont *font = (DwStyleFont*) key;
|
|
48949 |
guint h;
|
|
48950 |
+ gchar *lang;
|
|
48951 |
|
|
48952 |
h = g_str_hash (font->name);
|
|
48953 |
h = (h << 5) - h + font->size;
|
|
48954 |
h = (h << 5) - h + font->weight;
|
|
48955 |
h = (h << 5) - h + font->style;
|
|
48956 |
+ lang = g_strndup(font->lang, 5);
|
|
48957 |
+ h = h + g_str_hash (lang);
|
|
48958 |
+ g_free(lang);
|
|
48959 |
return h;
|
|
48960 |
}
|
|
48961 |
|
|
48962 |
@@ -393,11 +452,12 @@ static DwStyleFont* Dw_style_font_new_in
|
|
48963 |
if ((font = g_hash_table_lookup (fonts_table, font_attrs))) {
|
|
48964 |
return font;
|
|
48965 |
} else {
|
|
48966 |
- font = g_new (DwStyleFont, 1);
|
|
48967 |
+ font = g_new0 (DwStyleFont, 1);
|
|
48968 |
font->size = font_attrs->size;
|
|
48969 |
font->weight = font_attrs->weight;
|
|
48970 |
font->style = font_attrs->style;
|
|
48971 |
font->name = g_strdup (font_attrs->name);
|
|
48972 |
+ strncpy(font->lang, font_attrs->lang, 6);
|
|
48973 |
font->ref_count = 0;
|
|
48974 |
|
|
48975 |
Dw_style_font_realize (font, try_all);
|
|
48976 |
@@ -480,7 +540,11 @@ static void Dw_style_font_remove (DwStyl
|
|
48977 |
{
|
|
48978 |
g_hash_table_remove (fonts_table, font);
|
|
48979 |
g_free (font->name);
|
|
48980 |
- gdk_font_unref (font->font);
|
|
48981 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48982 |
+ XftFontClose (GDK_DISPLAY(), font->font);
|
|
48983 |
+#else
|
|
48984 |
+ gdk_font_unref (font->font);
|
|
48985 |
+#endif
|
|
48986 |
g_free (font);
|
|
48987 |
}
|
|
48988 |
|
|
48989 |
diff -pruN dillo-0.8.6/src/dw_style.h dillo-0.8.6-i18n-misc-20070916/src/dw_style.h
|
|
48990 |
--- dillo-0.8.6/src/dw_style.h 2005-10-28 01:20:10.000000000 +0900
|
|
48991 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_style.h 2006-05-16 01:21:08.000000000 +0900
|
|
48992 |
@@ -3,6 +3,13 @@
|
|
48993 |
|
|
48994 |
#include <gdk/gdktypes.h>
|
|
48995 |
#include "dw_tooltip.h"
|
|
48996 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
48997 |
+ #include <X11/Xlib.h>
|
|
48998 |
+ #include <X11/Xft/Xft.h>
|
|
48999 |
+ #undef Status
|
|
49000 |
+ #include <gdk/gdkx.h>
|
|
49001 |
+#endif
|
|
49002 |
+
|
|
49003 |
|
|
49004 |
#define DW_STYLE_ALIGN_LEFT 1
|
|
49005 |
#define DW_STYLE_ALIGN_RIGHT 2
|
|
49006 |
@@ -146,6 +153,35 @@ typedef gint DwStyleLength;
|
|
49007 |
|
|
49008 |
#define DW_STYLE_LENGTH_AUTO 0
|
|
49009 |
|
|
49010 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
49011 |
+ #ifndef XFT_VERSION
|
|
49012 |
+ #ifndef XFT_DRAW_N_SRC
|
|
49013 |
+ #define XFT_DRAW_N_SRC 2
|
|
49014 |
+ #endif
|
|
49015 |
+struct _XftDraw {
|
|
49016 |
+ Display *dpy;
|
|
49017 |
+ Drawable drawable;
|
|
49018 |
+ Visual *visual; /* NULL for bitmaps */
|
|
49019 |
+ Colormap colormap;
|
|
49020 |
+ Region clip;
|
|
49021 |
+ Bool core_set;
|
|
49022 |
+ Bool render_set;
|
|
49023 |
+ Bool render_able;
|
|
49024 |
+ struct {
|
|
49025 |
+ Picture pict;
|
|
49026 |
+ struct {
|
|
49027 |
+ Picture pict;
|
|
49028 |
+ XRenderColor color;
|
|
49029 |
+ } src[XFT_DRAW_N_SRC];
|
|
49030 |
+ } render;
|
|
49031 |
+ struct {
|
|
49032 |
+ GC draw_gc;
|
|
49033 |
+ unsigned long fg;
|
|
49034 |
+ Font font;
|
|
49035 |
+ } core;
|
|
49036 |
+};
|
|
49037 |
+ #endif
|
|
49038 |
+#endif
|
|
49039 |
|
|
49040 |
struct _DwStyleBox
|
|
49041 |
{
|
|
49042 |
@@ -189,13 +225,18 @@ struct _DwStyleFont
|
|
49043 |
gint weight;
|
|
49044 |
DwStyleFontStyle style;
|
|
49045 |
|
|
49046 |
-#ifdef USE_TYPE1
|
|
49047 |
- gint t1fontid;
|
|
49048 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
49049 |
+ XftFont *font;
|
|
49050 |
#else
|
|
49051 |
- GdkFont *font;
|
|
49052 |
+ #ifdef USE_TYPE1
|
|
49053 |
+ gint t1fontid;
|
|
49054 |
+ #else
|
|
49055 |
+ GdkFont *font;
|
|
49056 |
+ #endif
|
|
49057 |
#endif
|
|
49058 |
gint space_width;
|
|
49059 |
gint x_height;
|
|
49060 |
+ gchar lang[6];
|
|
49061 |
};
|
|
49062 |
|
|
49063 |
|
|
49064 |
diff -pruN dillo-0.8.6/src/dw_table.c dillo-0.8.6-i18n-misc-20070916/src/dw_table.c
|
|
49065 |
--- dillo-0.8.6/src/dw_table.c 2005-10-28 01:20:11.000000000 +0900
|
|
49066 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_table.c 2006-05-16 01:21:08.000000000 +0900
|
|
49067 |
@@ -1559,7 +1559,7 @@ static void Dw_table_sub_calc_col_widths
|
|
49068 |
num_nf_cols = num_cols;
|
|
49069 |
}
|
|
49070 |
|
|
49071 |
- diff_spacing =
|
|
49072 |
+ diff_spacing =
|
|
49073 |
(sub->end_col - sub->start_col - 1)
|
|
49074 |
* DW_WIDGET(sub->table)->style->border_spacing;
|
|
49075 |
|
|
49076 |
diff -pruN dillo-0.8.6/src/dw_table_cell.c dillo-0.8.6-i18n-misc-20070916/src/dw_table_cell.c
|
|
49077 |
--- dillo-0.8.6/src/dw_table_cell.c 2005-10-28 01:20:11.000000000 +0900
|
|
49078 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_table_cell.c 2006-05-16 01:21:08.000000000 +0900
|
|
49079 |
@@ -22,6 +22,7 @@
|
|
49080 |
*/
|
|
49081 |
|
|
49082 |
#include "dw_table_cell.h"
|
|
49083 |
+#include "i18n_gtk.h"
|
|
49084 |
|
|
49085 |
/*#define DEBUG_LEVEL 1*/
|
|
49086 |
#include "debug.h"
|
|
49087 |
@@ -147,6 +148,9 @@ static gint32 Dw_table_cell_get_value (D
|
|
49088 |
DwTableCell *cell = DW_TABLE_CELL (aligned_page);
|
|
49089 |
DwPage *page = DW_PAGE (aligned_page);
|
|
49090 |
DwPageWord *word;
|
|
49091 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
49092 |
+ XGlyphInfo info;
|
|
49093 |
+#endif
|
|
49094 |
int i, word_index;
|
|
49095 |
gint32 w;
|
|
49096 |
|
|
49097 |
@@ -168,8 +172,17 @@ static gint32 Dw_table_cell_get_value (D
|
|
49098 |
}
|
|
49099 |
} else {
|
|
49100 |
word = &page->words[cell->char_word_index];
|
|
49101 |
- w += gdk_text_width (word->style->font->font, word->content.data.text,
|
|
49102 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
49103 |
+ XftTextExtentsUtf8(GDK_DISPLAY(),
|
|
49104 |
+ word->style->font->font,
|
|
49105 |
+ word->content.data.text,
|
|
49106 |
+ cell->char_word_pos,
|
|
49107 |
+ &info);
|
|
49108 |
+ w += info.xOff;
|
|
49109 |
+#else
|
|
49110 |
+ w += a_I18n_gdk_text_width (word->style->font->font, word->content.data.text,
|
|
49111 |
cell->char_word_pos);
|
|
49112 |
+#endif
|
|
49113 |
}
|
|
49114 |
|
|
49115 |
return w;
|
|
49116 |
diff -pruN dillo-0.8.6/src/dw_tooltip.c dillo-0.8.6-i18n-misc-20070916/src/dw_tooltip.c
|
|
49117 |
--- dillo-0.8.6/src/dw_tooltip.c 2005-10-28 01:20:11.000000000 +0900
|
|
49118 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_tooltip.c 2006-05-16 01:21:08.000000000 +0900
|
|
49119 |
@@ -14,6 +14,7 @@
|
|
49120 |
|
|
49121 |
#include <gtk/gtk.h>
|
|
49122 |
#include "dw_tooltip.h"
|
|
49123 |
+#include "i18n.h"
|
|
49124 |
|
|
49125 |
/* The amount of space around the text, including the border. */
|
|
49126 |
#define PADDING 4
|
|
49127 |
@@ -22,17 +23,20 @@
|
|
49128 |
* tooltip. */
|
|
49129 |
#define DIFF 10
|
|
49130 |
|
|
49131 |
-static gboolean Dw_tooltip_draw (DwTooltip *tooltip);
|
|
49132 |
+static gint pop_count = 0;
|
|
49133 |
+static gboolean Dw_tooltip_draw (DwTooltip *tooltip);
|
|
49134 |
|
|
49135 |
static DwTooltip *Dw_tooltip_new0 (const char *text, gint ref_count)
|
|
49136 |
{
|
|
49137 |
DwTooltip *tooltip;
|
|
49138 |
|
|
49139 |
+ pop_count = 0;
|
|
49140 |
+
|
|
49141 |
tooltip = g_new (DwTooltip, 1);
|
|
49142 |
tooltip->ref_count = ref_count;
|
|
49143 |
tooltip->window = NULL;
|
|
49144 |
tooltip->timeout_id = 0;
|
|
49145 |
- tooltip->text = g_strdup (text);
|
|
49146 |
+ tooltip->text = a_I18n_DW_CHARSET_from_DILLO_CHARSET(text, -1);
|
|
49147 |
return tooltip;
|
|
49148 |
}
|
|
49149 |
|
|
49150 |
@@ -70,11 +74,14 @@ void Dw_tooltip_destroy (DwTooltip *tool
|
|
49151 |
void a_Dw_tooltip_on_enter (DwTooltip *tooltip)
|
|
49152 |
{
|
|
49153 |
a_Dw_tooltip_on_leave (tooltip);
|
|
49154 |
- tooltip->timeout_id = gtk_timeout_add (500, (GtkFunction)Dw_tooltip_draw,
|
|
49155 |
+
|
|
49156 |
+ /* Since it is called by switch without knowing why,
|
|
49157 |
+ * 2 times of the beginning ignore.
|
|
49158 |
+ */
|
|
49159 |
+ tooltip->timeout_id = gtk_timeout_add (500, (GtkFunction)Dw_tooltip_draw,
|
|
49160 |
tooltip);
|
|
49161 |
}
|
|
49162 |
|
|
49163 |
-
|
|
49164 |
/*
|
|
49165 |
* Call this function if the pointer has left the widget/word.
|
|
49166 |
*/
|
|
49167 |
@@ -91,12 +98,17 @@ void a_Dw_tooltip_on_leave (DwTooltip *t
|
|
49168 |
}
|
|
49169 |
}
|
|
49170 |
|
|
49171 |
+void a_Dw_tooltip_count_reset ()
|
|
49172 |
+{
|
|
49173 |
+ pop_count = 0;
|
|
49174 |
+}
|
|
49175 |
|
|
49176 |
/*
|
|
49177 |
* Call this function if the pointer has moved within the widget/word.
|
|
49178 |
*/
|
|
49179 |
void a_Dw_tooltip_on_motion (DwTooltip *tooltip)
|
|
49180 |
{
|
|
49181 |
+ pop_count++;
|
|
49182 |
a_Dw_tooltip_on_enter (tooltip);
|
|
49183 |
}
|
|
49184 |
|
|
49185 |
@@ -112,6 +124,8 @@ static gboolean Dw_tooltip_draw (DwToolt
|
|
49186 |
x = px + DIFF;
|
|
49187 |
y = py + DIFF;
|
|
49188 |
|
|
49189 |
+ if (pop_count == 0)
|
|
49190 |
+ return FALSE;
|
|
49191 |
tooltip->window = gtk_window_new (GTK_WINDOW_POPUP);
|
|
49192 |
gtk_widget_set_app_paintable (tooltip->window, TRUE);
|
|
49193 |
gtk_widget_set_name (tooltip->window, "gtk-tooltips");
|
|
49194 |
@@ -161,5 +175,3 @@ static gboolean Dw_tooltip_draw (DwToolt
|
|
49195 |
return FALSE;
|
|
49196 |
}
|
|
49197 |
|
|
49198 |
-
|
|
49199 |
-
|
|
49200 |
diff -pruN dillo-0.8.6/src/dw_tooltip.h dillo-0.8.6-i18n-misc-20070916/src/dw_tooltip.h
|
|
49201 |
--- dillo-0.8.6/src/dw_tooltip.h 2005-10-28 01:20:11.000000000 +0900
|
|
49202 |
+++ dillo-0.8.6-i18n-misc-20070916/src/dw_tooltip.h 2006-05-16 01:21:08.000000000 +0900
|
|
49203 |
@@ -19,12 +19,14 @@ DwTooltip* a_Dw_tooltip_new_no_ref (cons
|
|
49204 |
void a_Dw_tooltip_on_enter (DwTooltip *tooltip);
|
|
49205 |
void a_Dw_tooltip_on_leave (DwTooltip *tooltip);
|
|
49206 |
void a_Dw_tooltip_on_motion (DwTooltip *tooltip);
|
|
49207 |
+void a_Dw_tooltip_count_reset();
|
|
49208 |
|
|
49209 |
#define a_Dw_tooltip_ref(tooltip) ((tooltip)->ref_count++)
|
|
49210 |
#define a_Dw_tooltip_unref(tooltip) if (--((tooltip)->ref_count) == 0) \
|
|
49211 |
Dw_tooltip_destroy (tooltip)
|
|
49212 |
-
|
|
49213 |
+
|
|
49214 |
/* Don't use this function directly! */
|
|
49215 |
void Dw_tooltip_destroy (DwTooltip *tooltip);
|
|
49216 |
|
|
49217 |
+
|
|
49218 |
#endif /* __DW_TOOLTIP_H__ */
|
|
49219 |
diff -pruN dillo-0.8.6/src/findtext.c dillo-0.8.6-i18n-misc-20070916/src/findtext.c
|
|
49220 |
--- dillo-0.8.6/src/findtext.c 2005-10-28 01:20:11.000000000 +0900
|
|
49221 |
+++ dillo-0.8.6-i18n-misc-20070916/src/findtext.c 2006-05-16 01:21:09.000000000 +0900
|
|
49222 |
@@ -55,6 +55,7 @@
|
|
49223 |
#include "debug.h"
|
|
49224 |
#include <string.h>
|
|
49225 |
#include <ctype.h>
|
|
49226 |
+#include "i18n.h"
|
|
49227 |
|
|
49228 |
/*
|
|
49229 |
* Searches needle in haystack, according to type:
|
|
49230 |
@@ -297,8 +298,6 @@ static gboolean Findtext_search0 (Findte
|
|
49231 |
return FALSE;
|
|
49232 |
}
|
|
49233 |
|
|
49234 |
-
|
|
49235 |
-
|
|
49236 |
FindtextResult a_Findtext_search (FindtextState *state,
|
|
49237 |
gchar *str,
|
|
49238 |
gboolean case_sens)
|
|
49239 |
@@ -306,6 +305,7 @@ FindtextResult a_Findtext_search (Findte
|
|
49240 |
int i;
|
|
49241 |
gboolean new_key = FALSE, was_highlighted = FALSE, first_trial;
|
|
49242 |
FindtextResult result2;
|
|
49243 |
+ char *encStr;
|
|
49244 |
|
|
49245 |
if (state->widget == NULL)
|
|
49246 |
return FINDTEXT_NOT_FOUND;
|
|
49247 |
@@ -324,19 +324,21 @@ FindtextResult a_Findtext_search (Findte
|
|
49248 |
state->hl_iterator = NULL;
|
|
49249 |
}
|
|
49250 |
|
|
49251 |
+ encStr = a_Misc_add_space(str);
|
|
49252 |
+
|
|
49253 |
/* If the key (or the widget) changes (including case sensitivity),
|
|
49254 |
the search is started from the beginning. */
|
|
49255 |
if (state->keystr == NULL || state->case_sens != case_sens ||
|
|
49256 |
- strcmp(state->keystr, str) != 0) {
|
|
49257 |
+ strcmp(state->keystr, encStr) != 0) {
|
|
49258 |
new_key = TRUE;
|
|
49259 |
|
|
49260 |
g_free (state->keystr);
|
|
49261 |
- state->keystr = g_strdup (str);
|
|
49262 |
+ state->keystr = g_strdup (encStr);
|
|
49263 |
state->case_sens = case_sens;
|
|
49264 |
|
|
49265 |
if (state->key != NULL)
|
|
49266 |
Findtext_key_destroy (state->key);
|
|
49267 |
- state->key = Findtext_key_new (str, case_sens);
|
|
49268 |
+ state->key = Findtext_key_new (encStr, case_sens);
|
|
49269 |
|
|
49270 |
if (state->iterator)
|
|
49271 |
a_Dw_word_iterator_free (state->iterator);
|
|
49272 |
@@ -413,6 +415,7 @@ FindtextResult a_Findtext_search (Findte
|
|
49273 |
g_assert (result2 == FINDTEXT_SUCCESS);
|
|
49274 |
return FINDTEXT_RESTART;
|
|
49275 |
}
|
|
49276 |
+ g_free(encStr);
|
|
49277 |
}
|
|
49278 |
|
|
49279 |
/*
|
|
49280 |
@@ -437,3 +440,5 @@ void a_Findtext_reset_search (FindtextSt
|
|
49281 |
state->hl_iterator = NULL;
|
|
49282 |
}
|
|
49283 |
}
|
|
49284 |
+
|
|
49285 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
49286 |
diff -pruN dillo-0.8.6/src/gtk_ext_button.c dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_button.c
|
|
49287 |
--- dillo-0.8.6/src/gtk_ext_button.c 2005-10-28 01:20:12.000000000 +0900
|
|
49288 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_button.c 2006-05-16 01:21:09.000000000 +0900
|
|
49289 |
@@ -68,14 +68,14 @@ GtkWidget *a_Gtk_ext_button_new_with_lab
|
|
49290 |
{
|
|
49291 |
GtkWidget *button;
|
|
49292 |
GtkWidget *label_widget;
|
|
49293 |
-
|
|
49294 |
+
|
|
49295 |
button = a_Gtk_ext_button_new ();
|
|
49296 |
label_widget = gtk_label_new (label);
|
|
49297 |
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.5, 0.5);
|
|
49298 |
-
|
|
49299 |
+
|
|
49300 |
gtk_container_add (GTK_CONTAINER (button), label_widget);
|
|
49301 |
gtk_widget_show (label_widget);
|
|
49302 |
-
|
|
49303 |
+
|
|
49304 |
return button;
|
|
49305 |
}
|
|
49306 |
|
|
49307 |
@@ -166,7 +166,7 @@ static void Gtk_ext_button_init(GtkExtBu
|
|
49308 |
static void Gtk_ext_button_destroy (GtkObject *object)
|
|
49309 |
{
|
|
49310 |
GtkExtButton *button;
|
|
49311 |
-
|
|
49312 |
+
|
|
49313 |
button = GTK_EXT_BUTTON (object);
|
|
49314 |
if (button->menu_signal_id != -1)
|
|
49315 |
gtk_signal_disconnect (GTK_OBJECT (button->active_menu),
|
|
49316 |
@@ -213,10 +213,10 @@ static gint Gtk_ext_button_button_press
|
|
49317 |
GtkExtButton *ext_button;
|
|
49318 |
GtkStateType new_state;
|
|
49319 |
GtkMenu *menu;
|
|
49320 |
-
|
|
49321 |
+
|
|
49322 |
button = GTK_BUTTON (widget);
|
|
49323 |
ext_button = GTK_EXT_BUTTON (widget);
|
|
49324 |
-
|
|
49325 |
+
|
|
49326 |
if (ext_button->pressed_button) {
|
|
49327 |
/* Already a button pressed. */
|
|
49328 |
return FALSE;
|
|
49329 |
@@ -224,11 +224,11 @@ static gint Gtk_ext_button_button_press
|
|
49330 |
ext_button->action[event->button - 1]
|
|
49331 |
!= GTK_EXT_BUTTON_INACTIVE) {
|
|
49332 |
ext_button->pressed_button = event->button;
|
|
49333 |
-
|
|
49334 |
+
|
|
49335 |
gtk_grab_add (widget);
|
|
49336 |
button->button_down = TRUE;
|
|
49337 |
new_state = (button->in_button ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL);
|
|
49338 |
-
|
|
49339 |
+
|
|
49340 |
if (GTK_WIDGET_STATE (button) != new_state) {
|
|
49341 |
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
|
49342 |
gtk_widget_queue_draw (GTK_WIDGET (button));
|
|
49343 |
@@ -248,7 +248,7 @@ static gint Gtk_ext_button_button_press
|
|
49344 |
case GTK_EXT_BUTTON_MENU:
|
|
49345 |
menu = ext_button->action_data[event->button - 1].menu;
|
|
49346 |
break;
|
|
49347 |
-
|
|
49348 |
+
|
|
49349 |
case GTK_EXT_BUTTON_MENU_CREATOR:
|
|
49350 |
menu =
|
|
49351 |
ext_button->action_data[event->button - 1].creator.func (
|
|
49352 |
@@ -256,7 +256,7 @@ static gint Gtk_ext_button_button_press
|
|
49353 |
ext_button->action_data[event->button - 1].creator.data);
|
|
49354 |
break;
|
|
49355 |
}
|
|
49356 |
-
|
|
49357 |
+
|
|
49358 |
if (menu) {
|
|
49359 |
ext_button->active_menu = menu;
|
|
49360 |
gtk_menu_popup (menu, NULL, widget, Gtk_ext_button_position_menu,
|
|
49361 |
@@ -267,7 +267,7 @@ static gint Gtk_ext_button_button_press
|
|
49362 |
Gtk_ext_button_menu_hidden),
|
|
49363 |
(gpointer) button);
|
|
49364 |
}
|
|
49365 |
-
|
|
49366 |
+
|
|
49367 |
return TRUE;
|
|
49368 |
} else
|
|
49369 |
return FALSE;
|
|
49370 |
@@ -322,10 +322,10 @@ static gint Gtk_ext_button_enter_notify
|
|
49371 |
GtkButton *button;
|
|
49372 |
GtkWidget *event_widget;
|
|
49373 |
GtkStateType new_state;
|
|
49374 |
-
|
|
49375 |
+
|
|
49376 |
button = GTK_BUTTON (widget);
|
|
49377 |
event_widget = gtk_get_event_widget ((GdkEvent*) event);
|
|
49378 |
-
|
|
49379 |
+
|
|
49380 |
if ((event_widget == widget) && (event->detail != GDK_NOTIFY_INFERIOR)) {
|
|
49381 |
button->in_button = TRUE;
|
|
49382 |
new_state =
|
|
49383 |
@@ -350,10 +350,10 @@ static gint Gtk_ext_button_leave_notify
|
|
49384 |
GtkButton *button;
|
|
49385 |
GtkExtButton *ext_button;
|
|
49386 |
GtkWidget *event_widget;
|
|
49387 |
-
|
|
49388 |
+
|
|
49389 |
button = GTK_BUTTON (widget);
|
|
49390 |
event_widget = gtk_get_event_widget ((GdkEvent*) event);
|
|
49391 |
-
|
|
49392 |
+
|
|
49393 |
if ((event_widget == widget) &&
|
|
49394 |
(event->detail != GDK_NOTIFY_INFERIOR)) {
|
|
49395 |
button->in_button = FALSE;
|
|
49396 |
@@ -392,12 +392,12 @@ static void Gtk_ext_button_menu_hidden (
|
|
49397 |
ext_button->active_menu = NULL;
|
|
49398 |
|
|
49399 |
gtk_grab_remove (GTK_WIDGET (ext_button));
|
|
49400 |
-
|
|
49401 |
+
|
|
49402 |
button = GTK_BUTTON (ext_button);
|
|
49403 |
button->in_button = FALSE;
|
|
49404 |
button->button_down = FALSE;
|
|
49405 |
ext_button->pressed_button = 0;
|
|
49406 |
-
|
|
49407 |
+
|
|
49408 |
gtk_widget_set_state (GTK_WIDGET (button), GTK_STATE_NORMAL);
|
|
49409 |
gtk_widget_queue_draw (GTK_WIDGET (button));
|
|
49410 |
}
|
|
49411 |
diff -pruN dillo-0.8.6/src/gtk_ext_button.h dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_button.h
|
|
49412 |
--- dillo-0.8.6/src/gtk_ext_button.h 2005-10-28 01:20:12.000000000 +0900
|
|
49413 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_button.h 2006-05-16 01:21:09.000000000 +0900
|
|
49414 |
@@ -21,7 +21,7 @@ extern "C" {
|
|
49415 |
|
|
49416 |
typedef struct _GtkExtButton GtkExtButton;
|
|
49417 |
typedef struct _GtkExtButtonClass GtkExtButtonClass;
|
|
49418 |
-
|
|
49419 |
+
|
|
49420 |
typedef GtkMenu* (GtkExtButtonMenuCreator)(GtkExtButton *button,
|
|
49421 |
gpointer data);
|
|
49422 |
|
|
49423 |
diff -pruN dillo-0.8.6/src/gtk_ext_menu.c dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_menu.c
|
|
49424 |
--- dillo-0.8.6/src/gtk_ext_menu.c 2005-10-28 01:20:12.000000000 +0900
|
|
49425 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_menu.c 2006-05-16 01:21:09.000000000 +0900
|
|
49426 |
@@ -25,7 +25,7 @@
|
|
49427 |
*
|
|
49428 |
* GtkExtMenu changes dealing with release events a bit: if the affected
|
|
49429 |
* menu item is a GtkExtMenuItem, it is told to handle this event specially.
|
|
49430 |
- * The GtkExtMenuItem will simply change its activate signal temporally.
|
|
49431 |
+ * The GtkExtMenuItem will simply change its activate signal temporally.
|
|
49432 |
*
|
|
49433 |
* (This is a bit ugly, but still cleaner than listening to the low-level
|
|
49434 |
* events, like "button-release-event".)
|
|
49435 |
@@ -64,10 +64,10 @@ GtkType a_Gtk_ext_menu_get_type (void)
|
|
49436 |
(GtkArgGetFunc) NULL,
|
|
49437 |
(GtkClassInitFunc)NULL
|
|
49438 |
};
|
|
49439 |
-
|
|
49440 |
+
|
|
49441 |
type = gtk_type_unique (gtk_menu_get_type (), &info);
|
|
49442 |
}
|
|
49443 |
-
|
|
49444 |
+
|
|
49445 |
return type;
|
|
49446 |
}
|
|
49447 |
|
|
49448 |
@@ -78,9 +78,9 @@ GtkType a_Gtk_ext_menu_get_type (void)
|
|
49449 |
static void Gtk_ext_menu_class_init (GtkExtMenuClass *klass)
|
|
49450 |
{
|
|
49451 |
GtkWidgetClass *gtk_widget_class;
|
|
49452 |
-
|
|
49453 |
+
|
|
49454 |
parent_class = gtk_type_class (gtk_menu_get_type ());
|
|
49455 |
-
|
|
49456 |
+
|
|
49457 |
gtk_widget_class = (GtkWidgetClass*) klass;
|
|
49458 |
gtk_widget_class->button_release_event = Gtk_ext_menu_button_release;
|
|
49459 |
}
|
|
49460 |
@@ -115,7 +115,7 @@ static gint Gtk_ext_menu_is_item (GtkMen
|
|
49461 |
g_return_val_if_fail (menu_shell != NULL, FALSE);
|
|
49462 |
g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), FALSE);
|
|
49463 |
g_return_val_if_fail (child != NULL, FALSE);
|
|
49464 |
-
|
|
49465 |
+
|
|
49466 |
parent = child->parent;
|
|
49467 |
while (parent && GTK_IS_MENU_SHELL (parent)) {
|
|
49468 |
if (parent == (GtkWidget*) menu_shell)
|
|
49469 |
@@ -134,12 +134,12 @@ static GtkWidget* Gtk_ext_menu_get_item
|
|
49470 |
GdkEvent *event)
|
|
49471 |
{
|
|
49472 |
GtkWidget *menu_item;
|
|
49473 |
-
|
|
49474 |
+
|
|
49475 |
menu_item = gtk_get_event_widget ((GdkEvent*) event);
|
|
49476 |
-
|
|
49477 |
+
|
|
49478 |
while (menu_item && !GTK_IS_MENU_ITEM (menu_item))
|
|
49479 |
menu_item = menu_item->parent;
|
|
49480 |
-
|
|
49481 |
+
|
|
49482 |
if (menu_item && Gtk_ext_menu_is_item (menu_shell, menu_item))
|
|
49483 |
return menu_item;
|
|
49484 |
else
|
|
49485 |
diff -pruN dillo-0.8.6/src/gtk_ext_menu_item.h dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_menu_item.h
|
|
49486 |
--- dillo-0.8.6/src/gtk_ext_menu_item.h 2005-10-28 01:20:12.000000000 +0900
|
|
49487 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtk_ext_menu_item.h 2006-05-16 01:21:09.000000000 +0900
|
|
49488 |
@@ -28,7 +28,7 @@ struct _GtkExtMenuItem
|
|
49489 |
struct _GtkExtMenuItemClass
|
|
49490 |
{
|
|
49491 |
GtkMenuItemClass parent_class;
|
|
49492 |
-
|
|
49493 |
+
|
|
49494 |
void (*activate1) (GtkExtMenuItem *menu_item);
|
|
49495 |
void (*activate2) (GtkExtMenuItem *menu_item);
|
|
49496 |
void (*activate3) (GtkExtMenuItem *menu_item);
|
|
49497 |
diff -pruN dillo-0.8.6/src/gtk_menu_title.c dillo-0.8.6-i18n-misc-20070916/src/gtk_menu_title.c
|
|
49498 |
--- dillo-0.8.6/src/gtk_menu_title.c 2005-10-28 01:20:12.000000000 +0900
|
|
49499 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtk_menu_title.c 2006-05-16 01:21:09.000000000 +0900
|
|
49500 |
@@ -137,7 +137,7 @@ static void Gtk_menu_title_size_request
|
|
49501 |
BORDER_SPACING);
|
|
49502 |
requisition->height = 2 * (GTK_CONTAINER (widget)->border_width +
|
|
49503 |
widget->style->klass->ythickness);
|
|
49504 |
-
|
|
49505 |
+
|
|
49506 |
if (menu_title->label) {
|
|
49507 |
requisition->width +=
|
|
49508 |
gdk_string_width (widget->style->font, GTK_MENU_TITLE(widget)->label);
|
|
49509 |
diff -pruN dillo-0.8.6/src/gtkframeset.c dillo-0.8.6-i18n-misc-20070916/src/gtkframeset.c
|
|
49510 |
--- dillo-0.8.6/src/gtkframeset.c 1970-01-01 09:00:00.000000000 +0900
|
|
49511 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtkframeset.c 2006-05-16 01:21:09.000000000 +0900
|
|
49512 |
@@ -0,0 +1,1305 @@
|
|
49513 |
+/*
|
|
49514 |
+ * File: gtkframeset.c
|
|
49515 |
+ * Copyright (C) 2003 Frank de Lange <frank@unternet.org>
|
|
49516 |
+ *
|
|
49517 |
+ * a frameset widget for GTK - The GIMP Toolkit
|
|
49518 |
+ *
|
|
49519 |
+ * This library is free software; you can redistribute it and/or
|
|
49520 |
+ * modify it under the terms of the GNU Library General Public
|
|
49521 |
+ * License as published by the Free Software Foundation; either
|
|
49522 |
+ * version 2 of the License, or (at your option) any later version.
|
|
49523 |
+ *
|
|
49524 |
+ * This library is distributed in the hope that it will be useful,
|
|
49525 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
49526 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
49527 |
+ * Library General Public License for more details.
|
|
49528 |
+ *
|
|
49529 |
+ * You should have received a copy of the GNU Library General Public
|
|
49530 |
+ * License along with this library; if not, write to the
|
|
49531 |
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
49532 |
+ * Boston, MA 02111-1307, USA.
|
|
49533 |
+ */
|
|
49534 |
+
|
|
49535 |
+#include "gtkframeset.h"
|
|
49536 |
+#include <string.h> /* for strpbrk() */
|
|
49537 |
+#include <locale.h> /* for setlocale */
|
|
49538 |
+
|
|
49539 |
+#define DEBUG_ALLOC 10
|
|
49540 |
+#define DEBUG_EVENT 10
|
|
49541 |
+/* #define DEBUG_LEVEL 10 */
|
|
49542 |
+#include "debug.h"
|
|
49543 |
+
|
|
49544 |
+/* child args */
|
|
49545 |
+enum
|
|
49546 |
+{
|
|
49547 |
+ CHILD_ARG_0,
|
|
49548 |
+ CHILD_ARG_ROW_ATTACH,
|
|
49549 |
+ CHILD_ARG_COL_ATTACH,
|
|
49550 |
+ CHILD_ARG_X_PADDING,
|
|
49551 |
+ CHILD_ARG_Y_PADDING,
|
|
49552 |
+ CHILD_ARG_BORDER,
|
|
49553 |
+ CHILD_ARG_NORESIZE
|
|
49554 |
+};
|
|
49555 |
+
|
|
49556 |
+/* declarations */
|
|
49557 |
+static void gtk_frameset_class_init (GtkFramesetClass *klass);
|
|
49558 |
+static void gtk_frameset_init (GtkFrameset *frameset);
|
|
49559 |
+static void gtk_frameset_finalize (GtkObject *object);
|
|
49560 |
+static void gtk_frameset_size_allocate (GtkWidget *widget,
|
|
49561 |
+ GtkAllocation *allocation);
|
|
49562 |
+static void gtk_frameset_map (GtkWidget *widget);
|
|
49563 |
+static void gtk_frameset_unmap (GtkWidget *widget);
|
|
49564 |
+static void gtk_frameset_draw (GtkWidget *widget,
|
|
49565 |
+ GdkRectangle *area);
|
|
49566 |
+static gint gtk_frameset_expose (GtkWidget *widget,
|
|
49567 |
+ GdkEventExpose *event);
|
|
49568 |
+static void gtk_frameset_set_child_arg (GtkContainer *container,
|
|
49569 |
+ GtkWidget *child,
|
|
49570 |
+ GtkArg *arg,
|
|
49571 |
+ guint arg_id);
|
|
49572 |
+static void gtk_frameset_get_child_arg (GtkContainer *container,
|
|
49573 |
+ GtkWidget *child,
|
|
49574 |
+ GtkArg *arg,
|
|
49575 |
+ guint arg_id);
|
|
49576 |
+static GtkType gtk_frameset_child_type (GtkContainer *container);
|
|
49577 |
+static void gtk_frameset_add (GtkContainer *container,
|
|
49578 |
+ GtkWidget *widget);
|
|
49579 |
+static void gtk_frameset_remove (GtkContainer *container,
|
|
49580 |
+ GtkWidget *widget);
|
|
49581 |
+static void gtk_frameset_forall (GtkContainer *container,
|
|
49582 |
+ gboolean include_internals,
|
|
49583 |
+ GtkCallback callback,
|
|
49584 |
+ gpointer callback_data);
|
|
49585 |
+static void gtk_frameset_realize (GtkWidget *widget);
|
|
49586 |
+static void gtk_frameset_unrealize (GtkWidget *widget);
|
|
49587 |
+static gint gtk_frameset_button_press (GtkWidget *widget,
|
|
49588 |
+ GdkEventButton *event);
|
|
49589 |
+static gint gtk_frameset_button_release (GtkWidget *widget,
|
|
49590 |
+ GdkEventButton *event);
|
|
49591 |
+static gint gtk_frameset_motion (GtkWidget *widget,
|
|
49592 |
+ GdkEventMotion *event);
|
|
49593 |
+static gint gtk_frameset_enter (GtkWidget *widget,
|
|
49594 |
+ GdkEventCrossing *event);
|
|
49595 |
+static gint gtk_frameset_leave (GtkWidget *widget,
|
|
49596 |
+ GdkEventCrossing *event);
|
|
49597 |
+
|
|
49598 |
+/* private functions */
|
|
49599 |
+static void gtk_frameset_size_allocate_init (GtkFrameset *frameset);
|
|
49600 |
+static void gtk_frameset_size_allocate_pass1(GtkFrameset *frameset);
|
|
49601 |
+static GSList *gtk_frameset_get_multi_length(const gchar *attr);
|
|
49602 |
+static void gtk_frameset_calculate_lengths (GtkFrameset *frameset);
|
|
49603 |
+static gint gtk_frameset_set_resize_rowcol (GtkWidget *widget,
|
|
49604 |
+ gint x,
|
|
49605 |
+ gint y);
|
|
49606 |
+
|
|
49607 |
+static GtkContainerClass *parent_class = NULL;
|
|
49608 |
+
|
|
49609 |
+/* standard GTK function */
|
|
49610 |
+GtkType
|
|
49611 |
+gtk_frameset_get_type (void)
|
|
49612 |
+{
|
|
49613 |
+ static GtkType frameset_type = 0;
|
|
49614 |
+
|
|
49615 |
+ if (!frameset_type)
|
|
49616 |
+ {
|
|
49617 |
+ static const GtkTypeInfo frameset_info =
|
|
49618 |
+ {
|
|
49619 |
+ "GtkFrameset",
|
|
49620 |
+ sizeof (GtkFrameset),
|
|
49621 |
+ sizeof (GtkFramesetClass),
|
|
49622 |
+ (GtkClassInitFunc) gtk_frameset_class_init,
|
|
49623 |
+ (GtkObjectInitFunc) gtk_frameset_init,
|
|
49624 |
+ /* reserved_1 */ NULL,
|
|
49625 |
+ /* reserved_2 */ NULL,
|
|
49626 |
+ (GtkClassInitFunc) NULL,
|
|
49627 |
+ };
|
|
49628 |
+
|
|
49629 |
+ frameset_type = gtk_type_unique (gtk_container_get_type (), &frameset_info);
|
|
49630 |
+ }
|
|
49631 |
+
|
|
49632 |
+ return frameset_type;
|
|
49633 |
+}
|
|
49634 |
+
|
|
49635 |
+/* standard GTK function */
|
|
49636 |
+static void
|
|
49637 |
+gtk_frameset_class_init (GtkFramesetClass *class)
|
|
49638 |
+{
|
|
49639 |
+ GtkObjectClass *object_class;
|
|
49640 |
+ GtkWidgetClass *widget_class;
|
|
49641 |
+ GtkContainerClass *container_class;
|
|
49642 |
+
|
|
49643 |
+ object_class = (GtkObjectClass*) class;
|
|
49644 |
+ widget_class = (GtkWidgetClass*) class;
|
|
49645 |
+ container_class = (GtkContainerClass*) class;
|
|
49646 |
+
|
|
49647 |
+ parent_class = gtk_type_class (gtk_container_get_type ());
|
|
49648 |
+
|
|
49649 |
+ gtk_container_add_child_arg_type ("GtkFrameset::row_attach", GTK_TYPE_UINT, GTK_ARG_READWRITE, CHILD_ARG_ROW_ATTACH);
|
|
49650 |
+ gtk_container_add_child_arg_type ("GtkFrameset::col_attach", GTK_TYPE_UINT, GTK_ARG_READWRITE, CHILD_ARG_COL_ATTACH);
|
|
49651 |
+ gtk_container_add_child_arg_type ("GtkFrameset::x_padding", GTK_TYPE_UINT, GTK_ARG_READWRITE, CHILD_ARG_X_PADDING);
|
|
49652 |
+ gtk_container_add_child_arg_type ("GtkFrameset::y_padding", GTK_TYPE_UINT, GTK_ARG_READWRITE, CHILD_ARG_Y_PADDING);
|
|
49653 |
+ gtk_container_add_child_arg_type ("GtkFrameset::border", GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_BORDER);
|
|
49654 |
+ gtk_container_add_child_arg_type ("GtkFrameset::noresize", GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_NORESIZE);
|
|
49655 |
+
|
|
49656 |
+ object_class->finalize = gtk_frameset_finalize;
|
|
49657 |
+
|
|
49658 |
+ widget_class->size_allocate = gtk_frameset_size_allocate;
|
|
49659 |
+ widget_class->map = gtk_frameset_map;
|
|
49660 |
+ widget_class->unmap = gtk_frameset_unmap;
|
|
49661 |
+ widget_class->draw = gtk_frameset_draw;
|
|
49662 |
+ widget_class->expose_event = gtk_frameset_expose;
|
|
49663 |
+ widget_class->realize = gtk_frameset_realize;
|
|
49664 |
+ widget_class->unrealize = gtk_frameset_unrealize;
|
|
49665 |
+ widget_class->button_press_event = gtk_frameset_button_press;
|
|
49666 |
+ widget_class->button_release_event = gtk_frameset_button_release;
|
|
49667 |
+ widget_class->motion_notify_event = gtk_frameset_motion;
|
|
49668 |
+ widget_class->enter_notify_event = gtk_frameset_enter;
|
|
49669 |
+ widget_class->leave_notify_event = gtk_frameset_leave;
|
|
49670 |
+
|
|
49671 |
+ container_class->add = gtk_frameset_add;
|
|
49672 |
+ container_class->remove = gtk_frameset_remove;
|
|
49673 |
+ container_class->forall = gtk_frameset_forall;
|
|
49674 |
+ container_class->child_type = gtk_frameset_child_type;
|
|
49675 |
+ container_class->set_child_arg = gtk_frameset_set_child_arg;
|
|
49676 |
+ container_class->get_child_arg = gtk_frameset_get_child_arg;
|
|
49677 |
+}
|
|
49678 |
+
|
|
49679 |
+/* standard GTK function */
|
|
49680 |
+static GtkType
|
|
49681 |
+gtk_frameset_child_type (GtkContainer *container)
|
|
49682 |
+{
|
|
49683 |
+ return GTK_TYPE_WIDGET;
|
|
49684 |
+}
|
|
49685 |
+
|
|
49686 |
+/* standard GTK function */
|
|
49687 |
+static void
|
|
49688 |
+gtk_frameset_set_child_arg (GtkContainer *container,
|
|
49689 |
+ GtkWidget *child,
|
|
49690 |
+ GtkArg *arg,
|
|
49691 |
+ guint arg_id)
|
|
49692 |
+{
|
|
49693 |
+ GtkFrameset *frameset;
|
|
49694 |
+ GtkFramesetChild *frameset_child;
|
|
49695 |
+ GList *list;
|
|
49696 |
+
|
|
49697 |
+ frameset = GTK_FRAMESET (container);
|
|
49698 |
+ frameset_child = NULL;
|
|
49699 |
+ for (list = frameset->children; list; list = list->next)
|
|
49700 |
+ {
|
|
49701 |
+ frameset_child = list->data;
|
|
49702 |
+
|
|
49703 |
+ if (frameset_child->widget == child)
|
|
49704 |
+ break;
|
|
49705 |
+ }
|
|
49706 |
+ if (!list)
|
|
49707 |
+ return;
|
|
49708 |
+
|
|
49709 |
+ switch (arg_id)
|
|
49710 |
+ {
|
|
49711 |
+ case CHILD_ARG_ROW_ATTACH:
|
|
49712 |
+ frameset_child->row_attach = GTK_VALUE_UINT (*arg);
|
|
49713 |
+ break;
|
|
49714 |
+ case CHILD_ARG_COL_ATTACH:
|
|
49715 |
+ frameset_child->col_attach = GTK_VALUE_UINT (*arg);
|
|
49716 |
+ break;
|
|
49717 |
+ case CHILD_ARG_X_PADDING:
|
|
49718 |
+ frameset_child->xpadding = GTK_VALUE_UINT (*arg);
|
|
49719 |
+ break;
|
|
49720 |
+ case CHILD_ARG_Y_PADDING:
|
|
49721 |
+ frameset_child->ypadding = GTK_VALUE_UINT (*arg);
|
|
49722 |
+ break;
|
|
49723 |
+ case CHILD_ARG_BORDER:
|
|
49724 |
+ frameset_child->border = GTK_VALUE_BOOL (*arg);
|
|
49725 |
+ /* only SET this value (it is set to FALSE by default), otherwise
|
|
49726 |
+ * border frames followed by noborder frames will lose their border
|
|
49727 |
+ *
|
|
49728 |
+ * This feature can also be provided by manipulating the child widget's
|
|
49729 |
+ * border directly. I have tested this and it works. I might use it in a later
|
|
49730 |
+ * version of GtkFrameset */
|
|
49731 |
+ if(GTK_VALUE_BOOL(*arg)) {
|
|
49732 |
+ if(frameset_child->row_attach > 0)
|
|
49733 |
+ /* set top border */
|
|
49734 |
+ frameset->rows[frameset_child->row_attach - 1].border = GTK_VALUE_BOOL (*arg);
|
|
49735 |
+ frameset->rows[frameset_child->row_attach].border = GTK_VALUE_BOOL (*arg);
|
|
49736 |
+ if(frameset_child->col_attach > 0)
|
|
49737 |
+ /* set left border */
|
|
49738 |
+ frameset->cols[frameset_child->col_attach - 1].border = GTK_VALUE_BOOL (*arg);
|
|
49739 |
+ frameset->cols[frameset_child->col_attach].border = GTK_VALUE_BOOL (*arg);
|
|
49740 |
+ }
|
|
49741 |
+ break;
|
|
49742 |
+ case CHILD_ARG_NORESIZE:
|
|
49743 |
+ frameset_child->noresize = GTK_VALUE_BOOL (*arg);
|
|
49744 |
+ /* only SET this value (it is set to FALSE by default), otherwise
|
|
49745 |
+ * noresize frames followed by resizable frames will be resizable as
|
|
49746 |
+ * well through the resizable frames' left/top edge */
|
|
49747 |
+ if(GTK_VALUE_BOOL(*arg)) {
|
|
49748 |
+ if(frameset_child->row_attach + 1 < frameset->nrows)
|
|
49749 |
+ /* make lower edge unresizable */
|
|
49750 |
+ frameset->rows[frameset_child->row_attach + 1].noresize = GTK_VALUE_BOOL (*arg);
|
|
49751 |
+ frameset->rows[frameset_child->row_attach].noresize = GTK_VALUE_BOOL (*arg);
|
|
49752 |
+ if(frameset_child->col_attach + 1 < frameset->ncols)
|
|
49753 |
+ /* make right edge unresizable */
|
|
49754 |
+ frameset->cols[frameset_child->col_attach + 1].noresize = GTK_VALUE_BOOL (*arg);
|
|
49755 |
+ frameset->cols[frameset_child->col_attach].noresize = GTK_VALUE_BOOL (*arg);
|
|
49756 |
+ }
|
|
49757 |
+ break;
|
|
49758 |
+ default:
|
|
49759 |
+ break;
|
|
49760 |
+ }
|
|
49761 |
+ if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (frameset))
|
|
49762 |
+ gtk_widget_queue_resize (child);
|
|
49763 |
+}
|
|
49764 |
+
|
|
49765 |
+/* standard GTK function */
|
|
49766 |
+static void
|
|
49767 |
+gtk_frameset_get_child_arg (GtkContainer *container,
|
|
49768 |
+ GtkWidget *child,
|
|
49769 |
+ GtkArg *arg,
|
|
49770 |
+ guint arg_id)
|
|
49771 |
+{
|
|
49772 |
+ GtkFrameset *frameset;
|
|
49773 |
+ GtkFramesetChild *frameset_child;
|
|
49774 |
+ GList *list;
|
|
49775 |
+
|
|
49776 |
+ frameset = GTK_FRAMESET (container);
|
|
49777 |
+ frameset_child = NULL;
|
|
49778 |
+ for (list = frameset->children; list; list = list->next)
|
|
49779 |
+ {
|
|
49780 |
+ frameset_child = list->data;
|
|
49781 |
+
|
|
49782 |
+ if (frameset_child->widget == child)
|
|
49783 |
+ break;
|
|
49784 |
+ }
|
|
49785 |
+ if (!list)
|
|
49786 |
+ return;
|
|
49787 |
+
|
|
49788 |
+ switch (arg_id)
|
|
49789 |
+ {
|
|
49790 |
+ case CHILD_ARG_ROW_ATTACH:
|
|
49791 |
+ GTK_VALUE_UINT (*arg) = frameset_child->row_attach;
|
|
49792 |
+ break;
|
|
49793 |
+ case CHILD_ARG_COL_ATTACH:
|
|
49794 |
+ GTK_VALUE_UINT (*arg) = frameset_child->col_attach;
|
|
49795 |
+ break;
|
|
49796 |
+ case CHILD_ARG_X_PADDING:
|
|
49797 |
+ GTK_VALUE_UINT (*arg) = frameset_child->xpadding;
|
|
49798 |
+ break;
|
|
49799 |
+ case CHILD_ARG_Y_PADDING:
|
|
49800 |
+ GTK_VALUE_UINT (*arg) = frameset_child->ypadding;
|
|
49801 |
+ break;
|
|
49802 |
+ case CHILD_ARG_BORDER:
|
|
49803 |
+ GTK_VALUE_BOOL (*arg) = frameset_child->border;
|
|
49804 |
+ break;
|
|
49805 |
+ case CHILD_ARG_NORESIZE:
|
|
49806 |
+ GTK_VALUE_BOOL (*arg) = frameset_child->noresize;
|
|
49807 |
+ break;
|
|
49808 |
+ default:
|
|
49809 |
+ arg->type = GTK_TYPE_INVALID;
|
|
49810 |
+ break;
|
|
49811 |
+ }
|
|
49812 |
+}
|
|
49813 |
+
|
|
49814 |
+/*
|
|
49815 |
+ * Standard GTK function
|
|
49816 |
+ */
|
|
49817 |
+static void
|
|
49818 |
+gtk_frameset_realize (GtkWidget *widget)
|
|
49819 |
+{
|
|
49820 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
49821 |
+ GdkWindowAttr attributes;
|
|
49822 |
+ gint attributes_mask;
|
|
49823 |
+
|
|
49824 |
+ GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
|
|
49825 |
+
|
|
49826 |
+ attributes.x = widget->allocation.x;
|
|
49827 |
+ attributes.y = widget->allocation.y;
|
|
49828 |
+ attributes.width = widget->allocation.width;
|
|
49829 |
+ attributes.height = widget->allocation.height;
|
|
49830 |
+ attributes.window_type = GDK_WINDOW_CHILD;
|
|
49831 |
+ attributes.wclass = GDK_INPUT_OUTPUT;
|
|
49832 |
+ attributes.visual = gtk_widget_get_visual (widget);
|
|
49833 |
+ attributes.colormap = gtk_widget_get_colormap (widget);
|
|
49834 |
+ attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
|
|
49835 |
+ attributes_mask = (GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP);
|
|
49836 |
+ attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
|
|
49837 |
+ GDK_BUTTON_RELEASE_MASK |
|
|
49838 |
+ GDK_POINTER_MOTION_MASK |
|
|
49839 |
+ GDK_POINTER_MOTION_HINT_MASK |
|
|
49840 |
+ GDK_ENTER_NOTIFY_MASK |
|
|
49841 |
+ GDK_LEAVE_NOTIFY_MASK);
|
|
49842 |
+
|
|
49843 |
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
49844 |
+ &attributes, attributes_mask);
|
|
49845 |
+
|
|
49846 |
+ frameset->cursor_rowcol = gdk_cursor_new(GDK_FLEUR);
|
|
49847 |
+ frameset->cursor_row = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW);
|
|
49848 |
+ frameset->cursor_col = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW);
|
|
49849 |
+
|
|
49850 |
+ gdk_window_set_user_data (widget->window, frameset);
|
|
49851 |
+ widget->style = gtk_style_attach (widget->style, widget->window);
|
|
49852 |
+ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
|
|
49853 |
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
|
|
49854 |
+}
|
|
49855 |
+
|
|
49856 |
+/*
|
|
49857 |
+ * standard GTK function
|
|
49858 |
+ */
|
|
49859 |
+static void
|
|
49860 |
+gtk_frameset_unrealize (GtkWidget *widget)
|
|
49861 |
+{
|
|
49862 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
49863 |
+
|
|
49864 |
+ gdk_cursor_destroy(frameset->cursor_rowcol);
|
|
49865 |
+ gdk_cursor_destroy(frameset->cursor_row);
|
|
49866 |
+ gdk_cursor_destroy(frameset->cursor_col);
|
|
49867 |
+
|
|
49868 |
+ GTK_WIDGET_CLASS(parent_class)->unrealize (widget);
|
|
49869 |
+}
|
|
49870 |
+
|
|
49871 |
+/* standard GTK function */
|
|
49872 |
+static void
|
|
49873 |
+gtk_frameset_init (GtkFrameset *frameset)
|
|
49874 |
+{
|
|
49875 |
+ GTK_WIDGET_UNSET_FLAGS (frameset, GTK_NO_WINDOW);
|
|
49876 |
+
|
|
49877 |
+ frameset->children = NULL;
|
|
49878 |
+ frameset->rows = NULL;
|
|
49879 |
+ frameset->cols = NULL;
|
|
49880 |
+ frameset->nrows = 0;
|
|
49881 |
+ frameset->ncols = 0;
|
|
49882 |
+ frameset->resize_row = RESIZE_NONE;
|
|
49883 |
+ frameset->resize_col = RESIZE_NONE;
|
|
49884 |
+ frameset->in_drag = FALSE;
|
|
49885 |
+ frameset->cursor_rowcol = NULL;
|
|
49886 |
+ frameset->cursor_row = NULL;
|
|
49887 |
+ frameset->cursor_col = NULL;
|
|
49888 |
+
|
|
49889 |
+ gtk_frameset_resize (frameset, "*", "*");
|
|
49890 |
+}
|
|
49891 |
+
|
|
49892 |
+/*
|
|
49893 |
+ * standard GTK function
|
|
49894 |
+ *
|
|
49895 |
+ * resize frameset. It is only possible to enlarge the
|
|
49896 |
+ * frameset (or change dimensions while keeping the same
|
|
49897 |
+ * size) as reducing the size could orphan children.
|
|
49898 |
+ */
|
|
49899 |
+void
|
|
49900 |
+gtk_frameset_resize (GtkFrameset *frameset,
|
|
49901 |
+ gchar *row_multilengths,
|
|
49902 |
+ gchar *col_multilengths)
|
|
49903 |
+{
|
|
49904 |
+ gint n_rows, n_cols, n;
|
|
49905 |
+ GSList *rows, *cols;
|
|
49906 |
+ gfloat total_percentage, total_relative;
|
|
49907 |
+ gfloat row_per_relative, row_per_percent;
|
|
49908 |
+ gfloat col_per_relative, col_per_percent;
|
|
49909 |
+
|
|
49910 |
+ g_return_if_fail (frameset != NULL);
|
|
49911 |
+ g_return_if_fail (GTK_IS_FRAMESET(frameset));
|
|
49912 |
+ g_return_if_fail (row_multilengths || col_multilengths);
|
|
49913 |
+
|
|
49914 |
+ DEBUG_MSG(DEBUG_EVENT, "gtk_frameset_resize(%d, %s, %s)\n", (gint) frameset, row_multilengths, col_multilengths);
|
|
49915 |
+
|
|
49916 |
+ rows = gtk_frameset_get_multi_length(row_multilengths);
|
|
49917 |
+ cols = gtk_frameset_get_multi_length(col_multilengths);
|
|
49918 |
+
|
|
49919 |
+ /* (older versions of) compiler happiness */
|
|
49920 |
+ row_per_relative = 0;
|
|
49921 |
+ row_per_percent = 0;
|
|
49922 |
+ col_per_relative = 0;
|
|
49923 |
+ col_per_percent = 0;
|
|
49924 |
+
|
|
49925 |
+ n_rows = g_slist_length(rows);
|
|
49926 |
+ n_cols = g_slist_length(cols);
|
|
49927 |
+
|
|
49928 |
+ /* calculate row and column dimensions. These calculations are slightly hairy...
|
|
49929 |
+ * The theory goes as follows:
|
|
49930 |
+ *
|
|
49931 |
+ * Starting point is the frameset width and height.
|
|
49932 |
+ * First come frames with absolute dimensions. No frame can be bigger than the frameset,
|
|
49933 |
+ * so checks are performed to make sure that absolute frame dimensions do not
|
|
49934 |
+ * exceed frameset dimensions. When the total number of frames with absolute dimensions
|
|
49935 |
+ * exceeds the frameset dimensions, the available space is divided by ratio to those frames.
|
|
49936 |
+ * In case there are only absolute dimensioned frames, available space is divided by ratio to
|
|
49937 |
+ * these frames and the absolute dimensions are transformed into percentual dimensions.
|
|
49938 |
+ *
|
|
49939 |
+ * Next come frames with percentual dimensions. They get to divide the remaining space after
|
|
49940 |
+ * all absolute dimensions have been allocated. If the total of all percentual dimensions adds
|
|
49941 |
+ * up to more than 100, the calculation is normalised to 100%.
|
|
49942 |
+ *
|
|
49943 |
+ * Last come frames with relative dimensions. They get to divide the remaining space after
|
|
49944 |
+ * all absolute and percentual dimensions have been allocated. All available space is divided
|
|
49945 |
+ * by ratio to relative weights and allocated to frames. In the second stage, relative dimensions
|
|
49946 |
+ * are transformed into percentual dimensions so the frameset ends up having only absolute (pixel)
|
|
49947 |
+ * and percentual dimensions.
|
|
49948 |
+ *
|
|
49949 |
+ * The calculations are performed in two stages. In the first (aggregation) stage, the total weight of
|
|
49950 |
+ * absolute, percentual and relative dimensions is calculated. In the second (normalisation) stage, relative
|
|
49951 |
+ * dimensions are transformed into percentual dimensions. The actual calculation of pixel dimensions
|
|
49952 |
+ * is performed in the callback function as it depends on information about the current size of the
|
|
49953 |
+ * frameset widget.
|
|
49954 |
+ *
|
|
49955 |
+ * Can this be optimised? Sure, but... later...
|
|
49956 |
+ */
|
|
49957 |
+
|
|
49958 |
+ if(n_rows >= frameset->nrows)
|
|
49959 |
+ {
|
|
49960 |
+ frameset->nrows = n_rows;
|
|
49961 |
+ frameset->rows = g_realloc (frameset->rows, frameset->nrows * sizeof (GtkFramesetRowCol));
|
|
49962 |
+
|
|
49963 |
+ frameset->row_total_absolute = 0;
|
|
49964 |
+ total_percentage = 0;
|
|
49965 |
+ total_relative = 0;
|
|
49966 |
+
|
|
49967 |
+ for(n = 0; n < frameset->nrows; n++) {
|
|
49968 |
+ frameset->rows[n].length = GPOINTER_TO_INT(g_slist_nth_data(rows, n));
|
|
49969 |
+ frameset->rows[n].noresize = FALSE;
|
|
49970 |
+ frameset->rows[n].border = FALSE;
|
|
49971 |
+ if(LENGTH_IS_RELATIVE(frameset->rows[n].length))
|
|
49972 |
+ (LENGTH_GET_RELATIVE(frameset->rows[n].length) ?
|
|
49973 |
+ total_relative += LENGTH_GET_RELATIVE(frameset->rows[n].length) :
|
|
49974 |
+ total_relative++);
|
|
49975 |
+ else if(LENGTH_IS_PERCENTAGE(frameset->rows[n].length))
|
|
49976 |
+ total_percentage += LENGTH_GET_PERCENTAGE(frameset->rows[n].length);
|
|
49977 |
+ else if(LENGTH_IS_ABSOLUTE(frameset->rows[n].length)) {
|
|
49978 |
+ frameset->row_total_absolute += LENGTH_GET_ABSOLUTE(frameset->rows[n].length);
|
|
49979 |
+ }
|
|
49980 |
+ }
|
|
49981 |
+
|
|
49982 |
+ if((total_percentage == 0) && (total_relative == 0)) {
|
|
49983 |
+ for(n = 0; n < frameset->nrows; n++)
|
|
49984 |
+ if(LENGTH_IS_ABSOLUTE(frameset->rows[n].length))
|
|
49985 |
+ frameset->rows[n].length =
|
|
49986 |
+ LENGTH_CREATE_PERCENTAGE((gfloat) LENGTH_GET_ABSOLUTE(frameset->rows[n].length) /
|
|
49987 |
+ frameset->row_total_absolute);
|
|
49988 |
+ frameset->row_total_absolute = 0;
|
|
49989 |
+ row_per_percent = 1;
|
|
49990 |
+ } else if(total_percentage < 1) {
|
|
49991 |
+ row_per_relative = (gfloat) (1 - total_percentage) / total_relative;
|
|
49992 |
+ row_per_percent = (gfloat) (total_relative > 0 ? 1 : 1.0 / total_percentage);
|
|
49993 |
+ } else {
|
|
49994 |
+ row_per_percent = (gfloat) (1 / total_percentage);
|
|
49995 |
+ row_per_relative = 0;
|
|
49996 |
+ }
|
|
49997 |
+ }
|
|
49998 |
+
|
|
49999 |
+ if(n_cols >= frameset->ncols)
|
|
50000 |
+ {
|
|
50001 |
+ frameset->ncols = n_cols;
|
|
50002 |
+ frameset->cols = g_realloc (frameset->cols, frameset->ncols * sizeof (GtkFramesetRowCol));
|
|
50003 |
+
|
|
50004 |
+ frameset->col_total_absolute = 0;
|
|
50005 |
+ total_percentage = 0;
|
|
50006 |
+ total_relative = 0;
|
|
50007 |
+
|
|
50008 |
+ for(n = 0; n < frameset->ncols; n++) {
|
|
50009 |
+ frameset->cols[n].length = GPOINTER_TO_INT(g_slist_nth_data(cols, n));
|
|
50010 |
+ frameset->cols[n].noresize = FALSE;
|
|
50011 |
+ frameset->cols[n].border = FALSE;
|
|
50012 |
+ if(LENGTH_IS_RELATIVE(frameset->cols[n].length))
|
|
50013 |
+ (LENGTH_GET_RELATIVE(frameset->cols[n].length) ?
|
|
50014 |
+ total_relative += LENGTH_GET_RELATIVE(frameset->cols[n].length) :
|
|
50015 |
+ total_relative++);
|
|
50016 |
+ else if(LENGTH_IS_PERCENTAGE(frameset->cols[n].length))
|
|
50017 |
+ total_percentage += LENGTH_GET_PERCENTAGE(frameset->cols[n].length);
|
|
50018 |
+ else if(LENGTH_IS_ABSOLUTE(frameset->cols[n].length)) {
|
|
50019 |
+ frameset->col_total_absolute += LENGTH_GET_ABSOLUTE(frameset->cols[n].length);
|
|
50020 |
+ }
|
|
50021 |
+ }
|
|
50022 |
+
|
|
50023 |
+ /* normalize values */
|
|
50024 |
+ if((total_percentage == 0) && (total_relative == 0)) {
|
|
50025 |
+ for(n = 0; n < frameset->ncols; n++)
|
|
50026 |
+ if(LENGTH_IS_ABSOLUTE(frameset->cols[n].length))
|
|
50027 |
+ frameset->cols[n].length =
|
|
50028 |
+ LENGTH_CREATE_PERCENTAGE((gfloat) LENGTH_GET_ABSOLUTE(frameset->cols[n].length) /
|
|
50029 |
+ frameset->col_total_absolute);
|
|
50030 |
+ frameset->col_total_absolute = 0;
|
|
50031 |
+ col_per_percent = 1;
|
|
50032 |
+ col_per_relative = 0;
|
|
50033 |
+ } else if(total_percentage < 1) {
|
|
50034 |
+ col_per_relative = (gfloat) (1 - total_percentage) / total_relative;
|
|
50035 |
+ col_per_percent = (gfloat) (total_relative > 0 ? 1 : 1.0 / total_percentage);
|
|
50036 |
+ } else {
|
|
50037 |
+ col_per_percent = (gfloat) (1 / total_percentage);
|
|
50038 |
+ col_per_relative = 0;
|
|
50039 |
+ }
|
|
50040 |
+ }
|
|
50041 |
+
|
|
50042 |
+ /* now, calculate actual width/height distribution */
|
|
50043 |
+ if(frameset->nrows > 1) {
|
|
50044 |
+ for(n_rows = 0; n_rows < frameset->nrows; n_rows++) {
|
|
50045 |
+ if(LENGTH_IS_RELATIVE(frameset->rows[n_rows].length))
|
|
50046 |
+ frameset->rows[n_rows].length =
|
|
50047 |
+ LENGTH_CREATE_PERCENTAGE((LENGTH_GET_RELATIVE(frameset->rows[n_rows].length) ?
|
|
50048 |
+ (LENGTH_GET_RELATIVE(frameset->rows[n_rows].length) * row_per_relative) :
|
|
50049 |
+ row_per_relative));
|
|
50050 |
+ else if(LENGTH_IS_PERCENTAGE(frameset->rows[n_rows].length))
|
|
50051 |
+ frameset->rows[n_rows].length =
|
|
50052 |
+ LENGTH_CREATE_PERCENTAGE((LENGTH_GET_PERCENTAGE(frameset->rows[n_rows].length) * row_per_percent));
|
|
50053 |
+ }
|
|
50054 |
+ } else
|
|
50055 |
+ frameset->rows[0].length = LENGTH_CREATE_PERCENTAGE(1);
|
|
50056 |
+
|
|
50057 |
+ if(frameset->ncols > 1) {
|
|
50058 |
+ for(n_cols = 0; n_cols < frameset->ncols; n_cols++) {
|
|
50059 |
+ if(LENGTH_IS_RELATIVE(frameset->cols[n_cols].length))
|
|
50060 |
+ frameset->cols[n_cols].length =
|
|
50061 |
+ LENGTH_CREATE_PERCENTAGE((LENGTH_GET_RELATIVE(frameset->cols[n_cols].length) ?
|
|
50062 |
+ (LENGTH_GET_RELATIVE(frameset->cols[n_cols].length) * col_per_relative) :
|
|
50063 |
+ col_per_relative));
|
|
50064 |
+ else if(LENGTH_IS_PERCENTAGE(frameset->cols[n_cols].length))
|
|
50065 |
+ frameset->cols[n_cols].length =
|
|
50066 |
+ LENGTH_CREATE_PERCENTAGE(LENGTH_GET_PERCENTAGE(frameset->cols[n_cols].length) * col_per_percent);
|
|
50067 |
+ }
|
|
50068 |
+ } else
|
|
50069 |
+ frameset->cols[0].length = LENGTH_CREATE_PERCENTAGE(1);
|
|
50070 |
+
|
|
50071 |
+ g_slist_free(rows);
|
|
50072 |
+ g_slist_free(cols);
|
|
50073 |
+}
|
|
50074 |
+
|
|
50075 |
+/* standard GTK function */
|
|
50076 |
+GtkWidget*
|
|
50077 |
+gtk_frameset_new (gchar *row_multilengths,
|
|
50078 |
+ gchar *col_multilengths)
|
|
50079 |
+{
|
|
50080 |
+ GtkFrameset *frameset;
|
|
50081 |
+
|
|
50082 |
+ if (!row_multilengths)
|
|
50083 |
+ row_multilengths = "*";
|
|
50084 |
+ if (!col_multilengths)
|
|
50085 |
+ col_multilengths = "*";
|
|
50086 |
+
|
|
50087 |
+ frameset = gtk_type_new (gtk_frameset_get_type ());
|
|
50088 |
+
|
|
50089 |
+ DEBUG_MSG(DEBUG_EVENT, "/*\n");
|
|
50090 |
+
|
|
50091 |
+ gtk_frameset_resize(frameset, row_multilengths, col_multilengths);
|
|
50092 |
+
|
|
50093 |
+ DEBUG_MSG(DEBUG_EVENT, " * NEW frameset: %d\n", (gint) frameset);
|
|
50094 |
+ DEBUG_MSG(DEBUG_EVENT, " * %d rows, %d cols\n", frameset->nrows, frameset->ncols);
|
|
50095 |
+ DEBUG_MSG(DEBUG_EVENT, " */\n");
|
|
50096 |
+
|
|
50097 |
+ return GTK_WIDGET (frameset);
|
|
50098 |
+}
|
|
50099 |
+
|
|
50100 |
+/* standard GTK function */
|
|
50101 |
+void
|
|
50102 |
+gtk_frameset_attach (GtkFrameset *frameset,
|
|
50103 |
+ GtkWidget *child,
|
|
50104 |
+ guint row_attach,
|
|
50105 |
+ guint col_attach,
|
|
50106 |
+ guint xpadding,
|
|
50107 |
+ guint ypadding,
|
|
50108 |
+ gboolean border,
|
|
50109 |
+ gboolean noresize)
|
|
50110 |
+{
|
|
50111 |
+ GtkFramesetChild *frameset_child;
|
|
50112 |
+
|
|
50113 |
+ g_return_if_fail (frameset != NULL);
|
|
50114 |
+ g_return_if_fail (GTK_IS_FRAMESET (frameset));
|
|
50115 |
+ g_return_if_fail (child != NULL);
|
|
50116 |
+ g_return_if_fail (GTK_IS_WIDGET (child));
|
|
50117 |
+ g_return_if_fail (child->parent == NULL);
|
|
50118 |
+ g_return_if_fail (col_attach < frameset->ncols);
|
|
50119 |
+ g_return_if_fail (row_attach < frameset->nrows);
|
|
50120 |
+
|
|
50121 |
+ DEBUG_MSG(DEBUG_EVENT, "gtk_frameset_attach(%d, %d, %d, %d, %d, %d, %d, %d)\n",
|
|
50122 |
+ (gint) frameset, (gint) child, row_attach, col_attach,
|
|
50123 |
+ xpadding, ypadding, border, noresize);
|
|
50124 |
+
|
|
50125 |
+ frameset_child = g_new (GtkFramesetChild, 1);
|
|
50126 |
+ frameset_child->widget = child;
|
|
50127 |
+ frameset_child->row_attach = row_attach;
|
|
50128 |
+ frameset_child->col_attach = col_attach;
|
|
50129 |
+ frameset_child->xpadding = xpadding;
|
|
50130 |
+ frameset_child->ypadding = ypadding;
|
|
50131 |
+ frameset_child->border = border;
|
|
50132 |
+ frameset_child->noresize = noresize;
|
|
50133 |
+
|
|
50134 |
+ frameset->children = g_list_prepend (frameset->children, frameset_child);
|
|
50135 |
+
|
|
50136 |
+ gtk_widget_set_parent (child, GTK_WIDGET (frameset));
|
|
50137 |
+
|
|
50138 |
+ if (GTK_WIDGET_REALIZED (child->parent))
|
|
50139 |
+ gtk_widget_realize (child);
|
|
50140 |
+
|
|
50141 |
+ if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child))
|
|
50142 |
+ {
|
|
50143 |
+ if (GTK_WIDGET_MAPPED (child->parent))
|
|
50144 |
+ gtk_widget_map (child);
|
|
50145 |
+
|
|
50146 |
+ gtk_widget_queue_resize (child);
|
|
50147 |
+ }
|
|
50148 |
+}
|
|
50149 |
+
|
|
50150 |
+/*
|
|
50151 |
+ * Standard GTK function
|
|
50152 |
+ *
|
|
50153 |
+ * add a widget (frame) to the frameset. The widget
|
|
50154 |
+ * will be put in the current_frame (which will
|
|
50155 |
+ * be increased in the process)
|
|
50156 |
+ */
|
|
50157 |
+static void
|
|
50158 |
+gtk_frameset_add (GtkContainer *frameset,
|
|
50159 |
+ GtkWidget *widget)
|
|
50160 |
+{
|
|
50161 |
+ guint row, col;
|
|
50162 |
+
|
|
50163 |
+ /* is there space left in the frameset for this frame? */
|
|
50164 |
+ if (GTK_FRAMESET(frameset)->current_frame >=
|
|
50165 |
+ (GTK_FRAMESET(frameset)->nrows * GTK_FRAMESET(frameset)->ncols)) {
|
|
50166 |
+ DEBUG_MSG(DEBUG_EVENT, "No space in frameset for frame\n");
|
|
50167 |
+ return;
|
|
50168 |
+ }
|
|
50169 |
+
|
|
50170 |
+ /* calculate row and column for frame */
|
|
50171 |
+ col = GTK_FRAMESET(frameset)->current_frame % GTK_FRAMESET(frameset)->ncols;
|
|
50172 |
+ row = GTK_FRAMESET(frameset)->current_frame / GTK_FRAMESET(frameset)->ncols;
|
|
50173 |
+
|
|
50174 |
+ DEBUG_MSG(DEBUG_EVENT, "NEW FRAME in frameset %d\n", (gint) frameset);
|
|
50175 |
+ DEBUG_MSG(DEBUG_EVENT, " ROW %d COL %d\n", row, col);
|
|
50176 |
+
|
|
50177 |
+ gtk_frameset_attach(GTK_FRAMESET(frameset), /* the frameset widget */
|
|
50178 |
+ widget, /* the child widget */
|
|
50179 |
+ row, /* row to attach to */
|
|
50180 |
+ col, /* column to attach to */
|
|
50181 |
+ 0, /* marginwidth */
|
|
50182 |
+ 0, /* marginheight */
|
|
50183 |
+ FALSE, /* border */
|
|
50184 |
+ FALSE); /* noresize */
|
|
50185 |
+
|
|
50186 |
+ (GTK_FRAMESET(frameset)->current_frame)++;
|
|
50187 |
+}
|
|
50188 |
+
|
|
50189 |
+/* standard GTK function */
|
|
50190 |
+static void
|
|
50191 |
+gtk_frameset_remove (GtkContainer *container,
|
|
50192 |
+ GtkWidget *widget)
|
|
50193 |
+{
|
|
50194 |
+ GtkFrameset *frameset;
|
|
50195 |
+ GtkFramesetChild *child;
|
|
50196 |
+ GList *children;
|
|
50197 |
+
|
|
50198 |
+ g_return_if_fail (container != NULL);
|
|
50199 |
+ g_return_if_fail (GTK_IS_FRAMESET (container));
|
|
50200 |
+ g_return_if_fail (widget != NULL);
|
|
50201 |
+
|
|
50202 |
+ frameset = GTK_FRAMESET (container);
|
|
50203 |
+ children = frameset->children;
|
|
50204 |
+
|
|
50205 |
+ while (children)
|
|
50206 |
+ {
|
|
50207 |
+ child = children->data;
|
|
50208 |
+ children = children->next;
|
|
50209 |
+
|
|
50210 |
+ if (child->widget == widget)
|
|
50211 |
+ {
|
|
50212 |
+ gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
|
|
50213 |
+
|
|
50214 |
+ gtk_widget_unparent (widget);
|
|
50215 |
+
|
|
50216 |
+ frameset->children = g_list_remove (frameset->children, child);
|
|
50217 |
+ g_free (child);
|
|
50218 |
+
|
|
50219 |
+ if (was_visible && GTK_WIDGET_VISIBLE (container))
|
|
50220 |
+ gtk_widget_queue_resize (GTK_WIDGET (container));
|
|
50221 |
+ break;
|
|
50222 |
+ }
|
|
50223 |
+ }
|
|
50224 |
+}
|
|
50225 |
+
|
|
50226 |
+/* standard GTK function */
|
|
50227 |
+static void
|
|
50228 |
+gtk_frameset_forall (GtkContainer *container,
|
|
50229 |
+ gboolean include_internals,
|
|
50230 |
+ GtkCallback callback,
|
|
50231 |
+ gpointer callback_data)
|
|
50232 |
+{
|
|
50233 |
+ GtkFrameset *frameset;
|
|
50234 |
+ GtkFramesetChild *child;
|
|
50235 |
+ GList *children;
|
|
50236 |
+
|
|
50237 |
+ g_return_if_fail (container != NULL);
|
|
50238 |
+ g_return_if_fail (GTK_IS_FRAMESET (container));
|
|
50239 |
+ g_return_if_fail (callback != NULL);
|
|
50240 |
+
|
|
50241 |
+ frameset = GTK_FRAMESET (container);
|
|
50242 |
+ children = frameset->children;
|
|
50243 |
+
|
|
50244 |
+ while (children)
|
|
50245 |
+ {
|
|
50246 |
+ child = children->data;
|
|
50247 |
+ children = children->next;
|
|
50248 |
+
|
|
50249 |
+ (* callback) (child->widget, callback_data);
|
|
50250 |
+ }
|
|
50251 |
+}
|
|
50252 |
+
|
|
50253 |
+/* standard GTK function */
|
|
50254 |
+static void
|
|
50255 |
+gtk_frameset_finalize (GtkObject *object)
|
|
50256 |
+{
|
|
50257 |
+ GtkFrameset *frameset;
|
|
50258 |
+
|
|
50259 |
+ g_return_if_fail (object != NULL);
|
|
50260 |
+ g_return_if_fail (GTK_IS_FRAMESET (object));
|
|
50261 |
+
|
|
50262 |
+ frameset = GTK_FRAMESET (object);
|
|
50263 |
+
|
|
50264 |
+ g_free (frameset->rows);
|
|
50265 |
+ g_free (frameset->cols);
|
|
50266 |
+
|
|
50267 |
+ (* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
|
|
50268 |
+}
|
|
50269 |
+
|
|
50270 |
+/* standard GTK function */
|
|
50271 |
+static void
|
|
50272 |
+gtk_frameset_map (GtkWidget *widget)
|
|
50273 |
+{
|
|
50274 |
+ GtkFrameset *frameset;
|
|
50275 |
+ GtkFramesetChild *child;
|
|
50276 |
+ GList *children;
|
|
50277 |
+
|
|
50278 |
+ g_return_if_fail (widget != NULL);
|
|
50279 |
+ g_return_if_fail (GTK_IS_FRAMESET (widget));
|
|
50280 |
+
|
|
50281 |
+ frameset = GTK_FRAMESET (widget);
|
|
50282 |
+ GTK_WIDGET_SET_FLAGS (frameset, GTK_MAPPED);
|
|
50283 |
+
|
|
50284 |
+ children = frameset->children;
|
|
50285 |
+ while (children)
|
|
50286 |
+ {
|
|
50287 |
+ child = children->data;
|
|
50288 |
+ children = children->next;
|
|
50289 |
+
|
|
50290 |
+ if (GTK_WIDGET_VISIBLE (child->widget) &&
|
|
50291 |
+ !GTK_WIDGET_MAPPED (child->widget))
|
|
50292 |
+ gtk_widget_map (child->widget);
|
|
50293 |
+ }
|
|
50294 |
+
|
|
50295 |
+ gdk_window_show(widget->window);
|
|
50296 |
+}
|
|
50297 |
+
|
|
50298 |
+/* standard GTK function */
|
|
50299 |
+static void
|
|
50300 |
+gtk_frameset_unmap (GtkWidget *widget)
|
|
50301 |
+{
|
|
50302 |
+ GtkFrameset *frameset;
|
|
50303 |
+ GtkFramesetChild *child;
|
|
50304 |
+ GList *children;
|
|
50305 |
+
|
|
50306 |
+ g_return_if_fail (widget != NULL);
|
|
50307 |
+ g_return_if_fail (GTK_IS_FRAMESET (widget));
|
|
50308 |
+
|
|
50309 |
+ frameset = GTK_FRAMESET (widget);
|
|
50310 |
+ GTK_WIDGET_UNSET_FLAGS (frameset, GTK_MAPPED);
|
|
50311 |
+
|
|
50312 |
+ children = frameset->children;
|
|
50313 |
+ while (children)
|
|
50314 |
+ {
|
|
50315 |
+ child = children->data;
|
|
50316 |
+ children = children->next;
|
|
50317 |
+
|
|
50318 |
+ if (GTK_WIDGET_VISIBLE (child->widget) &&
|
|
50319 |
+ GTK_WIDGET_MAPPED (child->widget))
|
|
50320 |
+ gtk_widget_unmap (child->widget);
|
|
50321 |
+ }
|
|
50322 |
+
|
|
50323 |
+ gdk_window_hide(widget->window);
|
|
50324 |
+}
|
|
50325 |
+
|
|
50326 |
+/* standard GTK function */
|
|
50327 |
+static void
|
|
50328 |
+gtk_frameset_draw (GtkWidget *widget,
|
|
50329 |
+ GdkRectangle *area)
|
|
50330 |
+{
|
|
50331 |
+ GtkFrameset *frameset;
|
|
50332 |
+ GtkFramesetChild *child;
|
|
50333 |
+ GList *children;
|
|
50334 |
+ GdkRectangle child_area;
|
|
50335 |
+
|
|
50336 |
+ g_return_if_fail (widget != NULL);
|
|
50337 |
+ g_return_if_fail (GTK_IS_FRAMESET (widget));
|
|
50338 |
+
|
|
50339 |
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
|
50340 |
+ {
|
|
50341 |
+ frameset = GTK_FRAMESET (widget);
|
|
50342 |
+ children = frameset->children;
|
|
50343 |
+ while (children)
|
|
50344 |
+ {
|
|
50345 |
+ child = children->data;
|
|
50346 |
+ children = children->next;
|
|
50347 |
+
|
|
50348 |
+ if (gtk_widget_intersect (child->widget, area, &child_area))
|
|
50349 |
+ gtk_widget_draw (child->widget, &child_area);
|
|
50350 |
+ }
|
|
50351 |
+ }
|
|
50352 |
+}
|
|
50353 |
+
|
|
50354 |
+/* standard GTK function */
|
|
50355 |
+static gint
|
|
50356 |
+gtk_frameset_expose (GtkWidget *widget,
|
|
50357 |
+ GdkEventExpose *event)
|
|
50358 |
+{
|
|
50359 |
+ GtkFrameset *frameset;
|
|
50360 |
+ GtkFramesetChild *child;
|
|
50361 |
+ GList *children;
|
|
50362 |
+ GdkEventExpose child_event;
|
|
50363 |
+
|
|
50364 |
+ g_return_val_if_fail (widget != NULL, FALSE);
|
|
50365 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget), FALSE);
|
|
50366 |
+
|
|
50367 |
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
|
50368 |
+ {
|
|
50369 |
+ frameset = GTK_FRAMESET (widget);
|
|
50370 |
+
|
|
50371 |
+ child_event = *event;
|
|
50372 |
+
|
|
50373 |
+ children = frameset->children;
|
|
50374 |
+ while (children)
|
|
50375 |
+ {
|
|
50376 |
+ child = children->data;
|
|
50377 |
+ children = children->next;
|
|
50378 |
+
|
|
50379 |
+ if (GTK_WIDGET_NO_WINDOW (child->widget) &&
|
|
50380 |
+ gtk_widget_intersect (child->widget, &event->area, &child_event.area))
|
|
50381 |
+ gtk_widget_event (child->widget, (GdkEvent*) &child_event);
|
|
50382 |
+ }
|
|
50383 |
+ }
|
|
50384 |
+
|
|
50385 |
+ return FALSE;
|
|
50386 |
+}
|
|
50387 |
+
|
|
50388 |
+/* standard GTK function */
|
|
50389 |
+static void
|
|
50390 |
+gtk_frameset_size_allocate (GtkWidget *widget,
|
|
50391 |
+ GtkAllocation *allocation)
|
|
50392 |
+{
|
|
50393 |
+ GtkFrameset *frameset;
|
|
50394 |
+
|
|
50395 |
+ g_return_if_fail (widget != NULL);
|
|
50396 |
+ g_return_if_fail (GTK_IS_FRAMESET (widget));
|
|
50397 |
+ g_return_if_fail (allocation != NULL);
|
|
50398 |
+
|
|
50399 |
+ DEBUG_MSG(DEBUG_EVENT, "gtk_frameset_size_allocate(%d, {w:%d, h:%d, x:%d, y:%d})\n",
|
|
50400 |
+ (gint) widget, allocation->width, allocation->height, allocation->x, allocation->y);
|
|
50401 |
+
|
|
50402 |
+ widget->allocation = *allocation;
|
|
50403 |
+ frameset = GTK_FRAMESET (widget);
|
|
50404 |
+
|
|
50405 |
+ if (GTK_WIDGET_REALIZED (widget))
|
|
50406 |
+ gdk_window_move_resize (widget->window,
|
|
50407 |
+ allocation->x, allocation->y,
|
|
50408 |
+ allocation->width, allocation->height);
|
|
50409 |
+
|
|
50410 |
+ gtk_frameset_size_allocate_init (frameset);
|
|
50411 |
+ gtk_frameset_size_allocate_pass1 (frameset);
|
|
50412 |
+}
|
|
50413 |
+
|
|
50414 |
+/*
|
|
50415 |
+ * Calculate child dimensions relative to those of frameset,
|
|
50416 |
+ * based on row and column length specifications
|
|
50417 |
+ */
|
|
50418 |
+void
|
|
50419 |
+gtk_frameset_size_allocate_init(GtkFrameset *frameset)
|
|
50420 |
+{
|
|
50421 |
+ gint n_rows, n_cols;
|
|
50422 |
+ gfloat per_percent;
|
|
50423 |
+ guint real_width, real_height;
|
|
50424 |
+ guint row_borderspace, col_borderspace;
|
|
50425 |
+ guint location;
|
|
50426 |
+
|
|
50427 |
+ /* calculate total amount of border space used */
|
|
50428 |
+ row_borderspace = 0;
|
|
50429 |
+ col_borderspace = 0;
|
|
50430 |
+
|
|
50431 |
+ for(n_rows = 0; n_rows < frameset->nrows - 1; n_rows++)
|
|
50432 |
+ row_borderspace += (frameset->rows[n_rows].border ? GTKFRAMESET_DEFAULT_BORDER_SIZE : 0);
|
|
50433 |
+ for(n_cols = 0; n_cols < frameset->ncols - 1; n_cols++)
|
|
50434 |
+ col_borderspace += (frameset->cols[n_cols].border ? GTKFRAMESET_DEFAULT_BORDER_SIZE : 0);
|
|
50435 |
+
|
|
50436 |
+ real_width =
|
|
50437 |
+ (col_borderspace < GTK_WIDGET(frameset)->allocation.width ?
|
|
50438 |
+ GTK_WIDGET(frameset)->allocation.width - col_borderspace : 0);
|
|
50439 |
+ real_height =
|
|
50440 |
+ (row_borderspace < GTK_WIDGET(frameset)->allocation.height ?
|
|
50441 |
+ GTK_WIDGET(frameset)->allocation.height - row_borderspace : 0);
|
|
50442 |
+
|
|
50443 |
+ location = 0;
|
|
50444 |
+ if(frameset->nrows > 1) {
|
|
50445 |
+ /* calculate number of pixels to dole out per percent */
|
|
50446 |
+ per_percent = (gfloat) (real_height > frameset->row_total_absolute ?
|
|
50447 |
+ ((real_height - frameset->row_total_absolute) / 100.0) : 0);
|
|
50448 |
+ for(n_rows = 0; n_rows < frameset->nrows; n_rows++) {
|
|
50449 |
+ if(LENGTH_IS_PERCENTAGE(frameset->rows[n_rows].length))
|
|
50450 |
+ frameset->rows[n_rows].allocation =
|
|
50451 |
+ (gint) (per_percent * 100 * LENGTH_GET_PERCENTAGE(frameset->rows[n_rows].length));
|
|
50452 |
+ else if(LENGTH_IS_ABSOLUTE(frameset->rows[n_rows].length))
|
|
50453 |
+ frameset->rows[n_rows].allocation =
|
|
50454 |
+ (gint) LENGTH_GET_ABSOLUTE(frameset->rows[n_rows].length);
|
|
50455 |
+
|
|
50456 |
+ frameset->rows[n_rows].location = location;
|
|
50457 |
+ location += frameset->rows[n_rows].allocation +
|
|
50458 |
+ (frameset->rows[n_rows].border ? GTKFRAMESET_DEFAULT_BORDER_SIZE : 0);
|
|
50459 |
+ }
|
|
50460 |
+ } else {
|
|
50461 |
+ frameset->rows[0].allocation = real_height;
|
|
50462 |
+ frameset->rows[0].location = 0;
|
|
50463 |
+ }
|
|
50464 |
+
|
|
50465 |
+ location = 0;
|
|
50466 |
+ if(frameset->ncols > 1) {
|
|
50467 |
+ /* calculate number of pixels to dole out per percent */
|
|
50468 |
+ per_percent = (gfloat) (real_width > frameset->col_total_absolute ?
|
|
50469 |
+ ((real_width - frameset->col_total_absolute) / 100.0) : 0);
|
|
50470 |
+ for(n_cols = 0; n_cols < frameset->ncols; n_cols++) {
|
|
50471 |
+ if(LENGTH_IS_PERCENTAGE(frameset->cols[n_cols].length))
|
|
50472 |
+ frameset->cols[n_cols].allocation =
|
|
50473 |
+ (gint) (per_percent * 100 * LENGTH_GET_PERCENTAGE(frameset->cols[n_cols].length));
|
|
50474 |
+ else if(LENGTH_IS_ABSOLUTE(frameset->cols[n_cols].length))
|
|
50475 |
+ frameset->cols[n_cols].allocation =
|
|
50476 |
+ (gint) LENGTH_GET_ABSOLUTE(frameset->cols[n_cols].length);
|
|
50477 |
+
|
|
50478 |
+ frameset->cols[n_cols].location = location;
|
|
50479 |
+ location += frameset->cols[n_cols].allocation +
|
|
50480 |
+ (frameset->cols[n_cols].border ? GTKFRAMESET_DEFAULT_BORDER_SIZE : 0);
|
|
50481 |
+ }
|
|
50482 |
+ } else {
|
|
50483 |
+ frameset->cols[0].allocation = real_width;
|
|
50484 |
+ frameset->cols[0].location = 0;
|
|
50485 |
+ }
|
|
50486 |
+}
|
|
50487 |
+
|
|
50488 |
+/*
|
|
50489 |
+ * allocate children according to their placement in frameset
|
|
50490 |
+ */
|
|
50491 |
+static void
|
|
50492 |
+gtk_frameset_size_allocate_pass1(GtkFrameset *frameset)
|
|
50493 |
+{
|
|
50494 |
+ GtkFramesetChild *child;
|
|
50495 |
+ GList *children;
|
|
50496 |
+ GtkAllocation *alloc;
|
|
50497 |
+
|
|
50498 |
+ alloc = g_new0(GtkAllocation, 1);
|
|
50499 |
+
|
|
50500 |
+ children = frameset->children;
|
|
50501 |
+ while(children)
|
|
50502 |
+ {
|
|
50503 |
+ child = children->data;
|
|
50504 |
+ children = children->next;
|
|
50505 |
+
|
|
50506 |
+ if(GTK_WIDGET_VISIBLE(child->widget)) {
|
|
50507 |
+ alloc->width = (frameset->cols[child->col_attach].allocation < (2 * child->xpadding) ?
|
|
50508 |
+ 0 : frameset->cols[child->col_attach].allocation - (2 * child->xpadding));
|
|
50509 |
+
|
|
50510 |
+ alloc->height = (frameset->rows[child->row_attach].allocation < (2 * child->ypadding) ?
|
|
50511 |
+ 0 : frameset->rows[child->row_attach].allocation - (2 * child->ypadding));
|
|
50512 |
+ alloc->x = frameset->cols[child->col_attach].location + child->xpadding;
|
|
50513 |
+ alloc->y = frameset->rows[child->row_attach].location + child->ypadding;
|
|
50514 |
+ gtk_widget_size_allocate(GTK_WIDGET(child->widget), alloc);
|
|
50515 |
+
|
|
50516 |
+ DEBUG_MSG(DEBUG_ALLOC, "widget %d (row %d, col %d) allocated (w:%d, h:%d, x:%d, y:%d)\n",
|
|
50517 |
+ (gint) child->widget, child->row_attach, child->col_attach,
|
|
50518 |
+ alloc->width, alloc->height,
|
|
50519 |
+ frameset->cols[child->col_attach].location,
|
|
50520 |
+ frameset->rows[child->row_attach].location);
|
|
50521 |
+ }
|
|
50522 |
+ }
|
|
50523 |
+
|
|
50524 |
+ g_free(alloc);
|
|
50525 |
+}
|
|
50526 |
+
|
|
50527 |
+/*
|
|
50528 |
+ * Parse a comma-separated list of %MultiLengths, and returns a GSList
|
|
50529 |
+ * of lenghts. The caller has to free the GSList.
|
|
50530 |
+ */
|
|
50531 |
+static GSList*
|
|
50532 |
+gtk_frameset_get_multi_length (const gchar *attr)
|
|
50533 |
+{
|
|
50534 |
+ GSList *list;
|
|
50535 |
+ gdouble value;
|
|
50536 |
+ gchar *end, *locale;
|
|
50537 |
+ Length length;
|
|
50538 |
+
|
|
50539 |
+ g_return_val_if_fail(attr != NULL, NULL);
|
|
50540 |
+
|
|
50541 |
+ /* Set 'C' locale to avoid parsing problems with float numbers */
|
|
50542 |
+ locale = g_strdup (setlocale (LC_NUMERIC, NULL));
|
|
50543 |
+ setlocale (LC_NUMERIC, "C");
|
|
50544 |
+
|
|
50545 |
+ list = NULL;
|
|
50546 |
+
|
|
50547 |
+ while(TRUE) {
|
|
50548 |
+ value = g_strtod (attr, &end);
|
|
50549 |
+ switch (*end) {
|
|
50550 |
+ case '%':
|
|
50551 |
+ length = LENGTH_CREATE_PERCENTAGE (value / 100);
|
|
50552 |
+ break;
|
|
50553 |
+
|
|
50554 |
+ case '*':
|
|
50555 |
+ length = LENGTH_CREATE_RELATIVE (value);
|
|
50556 |
+ break;
|
|
50557 |
+
|
|
50558 |
+ default:
|
|
50559 |
+ length = LENGTH_CREATE_ABSOLUTE ((gint) value);
|
|
50560 |
+ break;
|
|
50561 |
+ }
|
|
50562 |
+
|
|
50563 |
+ list = g_slist_append(list, GINT_TO_POINTER(length));
|
|
50564 |
+
|
|
50565 |
+ /* there MUST be a comma between values */
|
|
50566 |
+ if(!(end = strchr(end, ',')))
|
|
50567 |
+ break;
|
|
50568 |
+ /* valid %MultiLength characters: 0123456789%* */
|
|
50569 |
+ if(!(attr = strpbrk(end, "0123456789%*")))
|
|
50570 |
+ break;
|
|
50571 |
+ }
|
|
50572 |
+
|
|
50573 |
+ setlocale (LC_NUMERIC, locale);
|
|
50574 |
+ g_free (locale);
|
|
50575 |
+
|
|
50576 |
+ return list;
|
|
50577 |
+}
|
|
50578 |
+
|
|
50579 |
+/*
|
|
50580 |
+ * given the current location and allocation values, calculate
|
|
50581 |
+ * row/col length values. The results are used in size_allocate
|
|
50582 |
+ */
|
|
50583 |
+static void
|
|
50584 |
+gtk_frameset_calculate_lengths(GtkFrameset *frameset)
|
|
50585 |
+{
|
|
50586 |
+ gint n;
|
|
50587 |
+ guint total_percentage;
|
|
50588 |
+
|
|
50589 |
+ total_percentage = 0;
|
|
50590 |
+ frameset->col_total_absolute = 0;
|
|
50591 |
+ for(n = 0; n < frameset->ncols; n++)
|
|
50592 |
+ if(LENGTH_IS_ABSOLUTE(frameset->cols[n].length)) {
|
|
50593 |
+ frameset->cols[n].length = LENGTH_CREATE_ABSOLUTE(frameset->cols[n].allocation);
|
|
50594 |
+ frameset->col_total_absolute += frameset->cols[n].allocation;
|
|
50595 |
+ } else
|
|
50596 |
+ total_percentage += frameset->cols[n].allocation;
|
|
50597 |
+
|
|
50598 |
+ for(n = 0; n < frameset->ncols; n++) {
|
|
50599 |
+ if(!(LENGTH_IS_ABSOLUTE(frameset->cols[n].length)))
|
|
50600 |
+ frameset->cols[n].length =
|
|
50601 |
+ LENGTH_CREATE_PERCENTAGE(((gfloat) frameset->cols[n].allocation) / total_percentage);
|
|
50602 |
+ }
|
|
50603 |
+
|
|
50604 |
+ total_percentage = 0;
|
|
50605 |
+ frameset->row_total_absolute = 0;
|
|
50606 |
+ for(n = 0; n < frameset->nrows; n++)
|
|
50607 |
+ if(LENGTH_IS_ABSOLUTE(frameset->rows[n].length)) {
|
|
50608 |
+ frameset->rows[n].length = LENGTH_CREATE_ABSOLUTE(frameset->rows[n].allocation);
|
|
50609 |
+ frameset->row_total_absolute += frameset->rows[n].allocation;
|
|
50610 |
+ } else
|
|
50611 |
+ total_percentage += frameset->rows[n].allocation;
|
|
50612 |
+
|
|
50613 |
+ for(n = 0; n < frameset->nrows; n++) {
|
|
50614 |
+ if(!(LENGTH_IS_ABSOLUTE(frameset->rows[n].length)))
|
|
50615 |
+ frameset->rows[n].length =
|
|
50616 |
+ LENGTH_CREATE_PERCENTAGE(((gfloat) frameset->rows[n].allocation) / total_percentage);
|
|
50617 |
+ }
|
|
50618 |
+}
|
|
50619 |
+
|
|
50620 |
+/*
|
|
50621 |
+ * set the resize_row and resize_col attributes and set resize cursor (if any)
|
|
50622 |
+ */
|
|
50623 |
+static gint
|
|
50624 |
+gtk_frameset_set_resize_rowcol(GtkWidget *widget, gint x, gint y)
|
|
50625 |
+{
|
|
50626 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
50627 |
+ guint n;
|
|
50628 |
+
|
|
50629 |
+ g_return_val_if_fail (widget != NULL,FALSE);
|
|
50630 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget),FALSE);
|
|
50631 |
+
|
|
50632 |
+ frameset->resize_row = RESIZE_NONE;
|
|
50633 |
+ frameset->resize_col = RESIZE_NONE;
|
|
50634 |
+
|
|
50635 |
+ for(n=1; n < frameset->ncols; n++) {
|
|
50636 |
+ if(frameset->cols[n - 1].allocation + frameset->cols[n - 1].location - GTKFRAMESET_DEFAULT_BORDER_SIZE <= x &&
|
|
50637 |
+ frameset->cols[n].location + GTKFRAMESET_DEFAULT_BORDER_SIZE >= x &&
|
|
50638 |
+ !frameset->cols[n].noresize) {
|
|
50639 |
+ frameset->resize_col = n - 1;
|
|
50640 |
+ break;
|
|
50641 |
+ }
|
|
50642 |
+ }
|
|
50643 |
+
|
|
50644 |
+ for(n=1; n < frameset->nrows; n++) {
|
|
50645 |
+ if(frameset->rows[n - 1].allocation + frameset->rows[n - 1].location - GTKFRAMESET_DEFAULT_BORDER_SIZE <= y &&
|
|
50646 |
+ frameset->rows[n].location + GTKFRAMESET_DEFAULT_BORDER_SIZE >= y &&
|
|
50647 |
+ !frameset->rows[n].noresize) {
|
|
50648 |
+ frameset->resize_row = n - 1;
|
|
50649 |
+ break;
|
|
50650 |
+ }
|
|
50651 |
+ }
|
|
50652 |
+
|
|
50653 |
+ if((frameset->resize_row != RESIZE_NONE) && (frameset->resize_col != RESIZE_NONE))
|
|
50654 |
+ gdk_window_set_cursor(widget->window, frameset->cursor_rowcol);
|
|
50655 |
+ else if(frameset->resize_row != RESIZE_NONE)
|
|
50656 |
+ gdk_window_set_cursor(widget->window, frameset->cursor_row);
|
|
50657 |
+ else if(frameset->resize_col != RESIZE_NONE)
|
|
50658 |
+ gdk_window_set_cursor(widget->window, frameset->cursor_col);
|
|
50659 |
+ else
|
|
50660 |
+ gdk_window_set_cursor(widget->window, NULL);
|
|
50661 |
+
|
|
50662 |
+ return TRUE;
|
|
50663 |
+}
|
|
50664 |
+
|
|
50665 |
+/*
|
|
50666 |
+ * standard GTK function
|
|
50667 |
+ *
|
|
50668 |
+ * enter drag mode on button_1_press over frame border
|
|
50669 |
+ */
|
|
50670 |
+static gint
|
|
50671 |
+gtk_frameset_button_press (GtkWidget *widget, GdkEventButton *event)
|
|
50672 |
+{
|
|
50673 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
50674 |
+
|
|
50675 |
+ g_return_val_if_fail (widget != NULL,FALSE);
|
|
50676 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget),FALSE);
|
|
50677 |
+
|
|
50678 |
+ if(!frameset->in_drag &&
|
|
50679 |
+ (event->button == 1) &&
|
|
50680 |
+ (frameset->resize_row != RESIZE_NONE || frameset->resize_col != RESIZE_NONE))
|
|
50681 |
+ {
|
|
50682 |
+ frameset->in_drag = TRUE;
|
|
50683 |
+ gdk_pointer_grab (widget->window, FALSE,
|
|
50684 |
+ GDK_POINTER_MOTION_HINT_MASK
|
|
50685 |
+ | GDK_BUTTON1_MOTION_MASK
|
|
50686 |
+ | GDK_BUTTON_RELEASE_MASK,
|
|
50687 |
+ NULL, NULL, event->time);
|
|
50688 |
+ }
|
|
50689 |
+
|
|
50690 |
+ return TRUE;
|
|
50691 |
+}
|
|
50692 |
+
|
|
50693 |
+/*
|
|
50694 |
+ * standard GTK function
|
|
50695 |
+ */
|
|
50696 |
+static gint
|
|
50697 |
+gtk_frameset_button_release (GtkWidget *widget, GdkEventButton *event)
|
|
50698 |
+{
|
|
50699 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
50700 |
+
|
|
50701 |
+ g_return_val_if_fail (widget != NULL,FALSE);
|
|
50702 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget),FALSE);
|
|
50703 |
+
|
|
50704 |
+ if(frameset->in_drag && (event->button == 1))
|
|
50705 |
+ {
|
|
50706 |
+ frameset->in_drag = FALSE;
|
|
50707 |
+ gdk_pointer_ungrab (event->time);
|
|
50708 |
+ gtk_widget_queue_resize(GTK_WIDGET(frameset));
|
|
50709 |
+ }
|
|
50710 |
+
|
|
50711 |
+ return TRUE;
|
|
50712 |
+}
|
|
50713 |
+
|
|
50714 |
+/*
|
|
50715 |
+ * standard GTK function
|
|
50716 |
+ *
|
|
50717 |
+ * determine row/col to resize (from x, y and noresize attribute),
|
|
50718 |
+ * set appropriate cursor (row resize, col resize or both)
|
|
50719 |
+ */
|
|
50720 |
+static gint
|
|
50721 |
+gtk_frameset_enter (GtkWidget *widget, GdkEventCrossing *event)
|
|
50722 |
+{
|
|
50723 |
+ g_return_val_if_fail (widget != NULL,FALSE);
|
|
50724 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget),FALSE);
|
|
50725 |
+
|
|
50726 |
+ return gtk_frameset_set_resize_rowcol(widget, event->x, event->y);
|
|
50727 |
+}
|
|
50728 |
+
|
|
50729 |
+/*
|
|
50730 |
+ * standard GTK function
|
|
50731 |
+ *
|
|
50732 |
+ * unset resize cursor and resize_row/resize_col
|
|
50733 |
+ */
|
|
50734 |
+static gint
|
|
50735 |
+gtk_frameset_leave (GtkWidget *widget, GdkEventCrossing *event)
|
|
50736 |
+{
|
|
50737 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
50738 |
+
|
|
50739 |
+ g_return_val_if_fail (widget != NULL,FALSE);
|
|
50740 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget),FALSE);
|
|
50741 |
+
|
|
50742 |
+ frameset->resize_row = RESIZE_NONE;
|
|
50743 |
+ frameset->resize_col = RESIZE_NONE;
|
|
50744 |
+ gdk_window_set_cursor(widget->window, NULL);
|
|
50745 |
+
|
|
50746 |
+ return TRUE;
|
|
50747 |
+}
|
|
50748 |
+
|
|
50749 |
+/*
|
|
50750 |
+ * standard GTK function
|
|
50751 |
+ *
|
|
50752 |
+ * resize row and/or column when in_drag is true
|
|
50753 |
+ * otherwise
|
|
50754 |
+ * if resize_row or resize_col is set
|
|
50755 |
+ * set resize_row/resize_col and cursor
|
|
50756 |
+ *
|
|
50757 |
+ * This way, motion events without prior enter events will not set the
|
|
50758 |
+ * cursor
|
|
50759 |
+ */
|
|
50760 |
+static gint
|
|
50761 |
+gtk_frameset_motion (GtkWidget *widget, GdkEventMotion *event)
|
|
50762 |
+{
|
|
50763 |
+ GtkFrameset *frameset = GTK_FRAMESET(widget);
|
|
50764 |
+ guint x, y;
|
|
50765 |
+ gint diff;
|
|
50766 |
+ gboolean return_val;
|
|
50767 |
+
|
|
50768 |
+ g_return_val_if_fail (widget != NULL, FALSE);
|
|
50769 |
+ g_return_val_if_fail (GTK_IS_FRAMESET (widget), FALSE);
|
|
50770 |
+
|
|
50771 |
+ if (event->is_hint)
|
|
50772 |
+ gtk_widget_get_pointer(widget, &x, &y);
|
|
50773 |
+ else {
|
|
50774 |
+ x = event->x;
|
|
50775 |
+ y = event->y;
|
|
50776 |
+ }
|
|
50777 |
+
|
|
50778 |
+ if (frameset->in_drag)
|
|
50779 |
+ {
|
|
50780 |
+ if(frameset->resize_row >= 0) {
|
|
50781 |
+ diff = (y - frameset->rows[frameset->resize_row].location) -
|
|
50782 |
+ frameset->rows[frameset->resize_row].allocation;
|
|
50783 |
+ if(frameset->rows[frameset->resize_row].allocation + diff > 0 &&
|
|
50784 |
+ frameset->rows[frameset->resize_row + 1].allocation - diff > 0) {
|
|
50785 |
+ frameset->rows[frameset->resize_row].allocation += diff;
|
|
50786 |
+ frameset->rows[frameset->resize_row + 1].location += diff;
|
|
50787 |
+ frameset->rows[frameset->resize_row + 1].allocation -= diff;
|
|
50788 |
+ }
|
|
50789 |
+ }
|
|
50790 |
+
|
|
50791 |
+ if(frameset->resize_col >= 0) {
|
|
50792 |
+ diff = (x - frameset->cols[frameset->resize_col].location) -
|
|
50793 |
+ frameset->cols[frameset->resize_col].allocation;
|
|
50794 |
+ if(frameset->cols[frameset->resize_col].allocation + diff > 0 &&
|
|
50795 |
+ frameset->cols[frameset->resize_col + 1].allocation - diff > 0) {
|
|
50796 |
+ frameset->cols[frameset->resize_col].allocation += diff;
|
|
50797 |
+ frameset->cols[frameset->resize_col + 1].location += diff;
|
|
50798 |
+ frameset->cols[frameset->resize_col + 1].allocation -= diff;
|
|
50799 |
+ }
|
|
50800 |
+ }
|
|
50801 |
+
|
|
50802 |
+ gtk_frameset_calculate_lengths(frameset);
|
|
50803 |
+ gtk_widget_queue_resize(GTK_WIDGET(frameset));
|
|
50804 |
+ return_val = TRUE;
|
|
50805 |
+ } else
|
|
50806 |
+ /* only adjust resize_row/resize_col if either of these is already set,
|
|
50807 |
+ * this way the cursor will not be changed by motion events without prior
|
|
50808 |
+ * enter event */
|
|
50809 |
+ if(frameset->resize_row != RESIZE_NONE ||
|
|
50810 |
+ frameset->resize_col != RESIZE_NONE)
|
|
50811 |
+ return_val = gtk_frameset_set_resize_rowcol(widget, x, y);
|
|
50812 |
+ else
|
|
50813 |
+ return_val = TRUE;
|
|
50814 |
+
|
|
50815 |
+ return return_val;
|
|
50816 |
+}
|
|
50817 |
+
|
|
50818 |
diff -pruN dillo-0.8.6/src/gtkframeset.h dillo-0.8.6-i18n-misc-20070916/src/gtkframeset.h
|
|
50819 |
--- dillo-0.8.6/src/gtkframeset.h 1970-01-01 09:00:00.000000000 +0900
|
|
50820 |
+++ dillo-0.8.6-i18n-misc-20070916/src/gtkframeset.h 2006-05-16 01:21:09.000000000 +0900
|
|
50821 |
@@ -0,0 +1,133 @@
|
|
50822 |
+/*
|
|
50823 |
+ * File: gtkframeset.h
|
|
50824 |
+ * Copyright (C) 2003 Frank de Lange <frank@unternet.org>
|
|
50825 |
+ *
|
|
50826 |
+ * a frameset widget for GTK - The GIMP Toolkit
|
|
50827 |
+ *
|
|
50828 |
+ * This library is free software; you can redistribute it and/or
|
|
50829 |
+ * modify it under the terms of the GNU Library General Public
|
|
50830 |
+ * License as published by the Free Software Foundation; either
|
|
50831 |
+ * version 2 of the License, or (at your option) any later version.
|
|
50832 |
+ *
|
|
50833 |
+ * This library is distributed in the hope that it will be useful,
|
|
50834 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
50835 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
50836 |
+ * Library General Public License for more details.
|
|
50837 |
+ *
|
|
50838 |
+ * You should have received a copy of the GNU Library General Public
|
|
50839 |
+ * License along with this library; if not, write to the
|
|
50840 |
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
50841 |
+ * Boston, MA 02111-1307, USA.
|
|
50842 |
+ */
|
|
50843 |
+
|
|
50844 |
+#ifndef __GTK_FRAMESET_H__
|
|
50845 |
+#define __GTK_FRAMESET_H__
|
|
50846 |
+
|
|
50847 |
+#include <gdk/gdk.h>
|
|
50848 |
+#include <gtk/gtkcontainer.h>
|
|
50849 |
+
|
|
50850 |
+
|
|
50851 |
+#ifdef __cplusplus
|
|
50852 |
+extern "C" {
|
|
50853 |
+#endif /* __cplusplus */
|
|
50854 |
+
|
|
50855 |
+
|
|
50856 |
+#define GTK_FRAMESET(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FRAMESET, GtkFrameset))
|
|
50857 |
+#define GTK_TYPE_FRAMESET (gtk_frameset_get_type ())
|
|
50858 |
+#define GTK_FRAMESET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAMESET, GtkFramesetClass))
|
|
50859 |
+#define GTK_IS_FRAMESET(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FRAMESET))
|
|
50860 |
+#define GTK_IS_FRAMESET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAMESET))
|
|
50861 |
+
|
|
50862 |
+
|
|
50863 |
+typedef struct _GtkFrameset GtkFrameset;
|
|
50864 |
+typedef struct _GtkFramesetClass GtkFramesetClass;
|
|
50865 |
+typedef struct _GtkFramesetChild GtkFramesetChild;
|
|
50866 |
+typedef struct _GtkFramesetRowCol GtkFramesetRowCol;
|
|
50867 |
+typedef gint32 Length;
|
|
50868 |
+
|
|
50869 |
+/* (adapted from dw_style.h) Lengths */
|
|
50870 |
+#define LENGTH_CREATE_ABSOLUTE(n) (((n) << 2) | 1)
|
|
50871 |
+#define LENGTH_CREATE_PERCENTAGE(n) ((LENGTH_FLOAT_TO_REAL (n) << 3) | 2)
|
|
50872 |
+#define LENGTH_CREATE_RELATIVE(n) ((LENGTH_FLOAT_TO_REAL (n) << 3) | 6)
|
|
50873 |
+#define LENGTH_UNDEF_LENGTH 0
|
|
50874 |
+
|
|
50875 |
+#define LENGTH_IS_ABSOLUTE(l) ((l) & 1)
|
|
50876 |
+#define LENGTH_IS_PERCENTAGE(l) (((l) & 7) == 2)
|
|
50877 |
+#define LENGTH_IS_RELATIVE(l) (((l) & 7) == 6)
|
|
50878 |
+
|
|
50879 |
+#define LENGTH_GET_ABSOLUTE(l) ((l) >> 2)
|
|
50880 |
+#define LENGTH_GET_PERCENTAGE(l) LENGTH_REAL_TO_FLOAT ((l) >> 3)
|
|
50881 |
+#define LENGTH_GET_RELATIVE(l) LENGTH_REAL_TO_FLOAT ((l) >> 3)
|
|
50882 |
+
|
|
50883 |
+#define LENGTH_REAL_TO_FLOAT(v) ((gfloat)(v) / 0x10000)
|
|
50884 |
+#define LENGTH_FLOAT_TO_REAL(v) ((gint)((v) * 0x10000))
|
|
50885 |
+
|
|
50886 |
+/* used in frame resize */
|
|
50887 |
+#define RESIZE_NONE -1
|
|
50888 |
+
|
|
50889 |
+/* default border size */
|
|
50890 |
+#define GTKFRAMESET_DEFAULT_BORDER_SIZE 2
|
|
50891 |
+
|
|
50892 |
+struct _GtkFrameset
|
|
50893 |
+{
|
|
50894 |
+ GtkContainer container;
|
|
50895 |
+
|
|
50896 |
+ GList *children;
|
|
50897 |
+ GtkFramesetRowCol *rows;
|
|
50898 |
+ GtkFramesetRowCol *cols;
|
|
50899 |
+ guint row_total_absolute, col_total_absolute;
|
|
50900 |
+ guint16 nrows;
|
|
50901 |
+ guint16 ncols;
|
|
50902 |
+ guint16 current_frame;
|
|
50903 |
+ gboolean in_drag : 1;
|
|
50904 |
+ gint16 resize_row, resize_col;
|
|
50905 |
+ GdkCursor *cursor_rowcol, *cursor_row, *cursor_col;
|
|
50906 |
+};
|
|
50907 |
+
|
|
50908 |
+struct _GtkFramesetClass
|
|
50909 |
+{
|
|
50910 |
+ GtkContainerClass parent_class;
|
|
50911 |
+};
|
|
50912 |
+
|
|
50913 |
+struct _GtkFramesetChild
|
|
50914 |
+{
|
|
50915 |
+ GtkWidget *widget;
|
|
50916 |
+ guint16 row_attach;
|
|
50917 |
+ guint16 col_attach;
|
|
50918 |
+ guint16 xpadding;
|
|
50919 |
+ guint16 ypadding;
|
|
50920 |
+ gboolean border : 1;
|
|
50921 |
+ gboolean noresize : 1;
|
|
50922 |
+};
|
|
50923 |
+
|
|
50924 |
+struct _GtkFramesetRowCol
|
|
50925 |
+{
|
|
50926 |
+ guint16 location;
|
|
50927 |
+ guint16 allocation;
|
|
50928 |
+ gboolean noresize : 1;
|
|
50929 |
+ gboolean border: 1;
|
|
50930 |
+ Length length;
|
|
50931 |
+ guint16 spacing;
|
|
50932 |
+};
|
|
50933 |
+
|
|
50934 |
+
|
|
50935 |
+GtkType gtk_frameset_get_type (void);
|
|
50936 |
+GtkWidget* gtk_frameset_new (gchar *rows,
|
|
50937 |
+ gchar *columns);
|
|
50938 |
+void gtk_frameset_resize (GtkFrameset *frameset,
|
|
50939 |
+ gchar *rows,
|
|
50940 |
+ gchar *columns);
|
|
50941 |
+void gtk_frameset_attach (GtkFrameset *frameset,
|
|
50942 |
+ GtkWidget *child,
|
|
50943 |
+ guint row_attach,
|
|
50944 |
+ guint col_attach,
|
|
50945 |
+ guint xpadding,
|
|
50946 |
+ guint ypadding,
|
|
50947 |
+ gboolean border,
|
|
50948 |
+ gboolean noresize);
|
|
50949 |
+
|
|
50950 |
+#ifdef __cplusplus
|
|
50951 |
+}
|
|
50952 |
+#endif /* __cplusplus */
|
|
50953 |
+
|
|
50954 |
+#endif /* __GTK_FRAMESET_H__ */
|
|
50955 |
diff -pruN dillo-0.8.6/src/html.c dillo-0.8.6-i18n-misc-20070916/src/html.c
|
|
50956 |
--- dillo-0.8.6/src/html.c 2006-04-13 00:50:35.000000000 +0900
|
|
50957 |
+++ dillo-0.8.6-i18n-misc-20070916/src/html.c 2007-09-09 23:05:46.000000000 +0900
|
|
50958 |
@@ -17,31 +17,41 @@
|
|
50959 |
|
|
50960 |
/* Undefine if you want to unroll tables. For instance for PDAs */
|
|
50961 |
#define USE_TABLES
|
|
50962 |
-
|
|
50963 |
/* Define to 1 to ignore white space immediately after an open tag,
|
|
50964 |
* and immediately before a close tag. */
|
|
50965 |
#define SGML_SPCDEL 0
|
|
50966 |
|
|
50967 |
+#ifndef ENABLE_META_REFRESH
|
|
50968 |
+ #define SEND_HTML_MSG /* meta-refresh */
|
|
50969 |
+#endif
|
|
50970 |
+//#define USE_OLD_PARSER
|
|
50971 |
+
|
|
50972 |
|
|
50973 |
+#include <config.h>
|
|
50974 |
#include <ctype.h> /* for isspace and tolower */
|
|
50975 |
#include <string.h> /* for memcpy and memmove */
|
|
50976 |
#include <stdlib.h>
|
|
50977 |
#include <stdio.h> /* for sprintf */
|
|
50978 |
-#include <math.h> /* for rint */
|
|
50979 |
-#include <errno.h>
|
|
50980 |
+#include <math.h> /* for rint */
|
|
50981 |
+#include <errno.h> /* for iconv error codes */
|
|
50982 |
+#include <time.h> /* for nanosleep */
|
|
50983 |
|
|
50984 |
-#include <gtk/gtk.h>
|
|
50985 |
+#include "i18n_gtk.h"
|
|
50986 |
|
|
50987 |
+#include "intl.h"
|
|
50988 |
#include "msg.h"
|
|
50989 |
+#include "adblock.h"
|
|
50990 |
#include "list.h"
|
|
50991 |
#include "binaryconst.h"
|
|
50992 |
#include "colors.h"
|
|
50993 |
#include "dillo.h"
|
|
50994 |
#include "history.h"
|
|
50995 |
#include "nav.h"
|
|
50996 |
+#include "doc.h"
|
|
50997 |
#include "menu.h"
|
|
50998 |
#include "commands.h"
|
|
50999 |
#include "dw.h" /* for Dw_cursor_hand */
|
|
51000 |
+#include "dw_gtk_scrolled_window.h" /* for a_Dw_gtk_scrolled_window_get_dw */
|
|
51001 |
|
|
51002 |
#include "dw_gtk_viewport.h"
|
|
51003 |
#include "dw_gtk_scrolled_window.h"
|
|
51004 |
@@ -56,11 +66,17 @@
|
|
51005 |
#include "dw_list_item.h"
|
|
51006 |
#include "dw_style.h"
|
|
51007 |
#include "interface.h"
|
|
51008 |
-#include "progressbar.h"
|
|
51009 |
#include "prefs.h"
|
|
51010 |
#include "misc.h"
|
|
51011 |
#include "capi.h"
|
|
51012 |
#include "html.h"
|
|
51013 |
+#include "i18n.h"
|
|
51014 |
+
|
|
51015 |
+#include "gtkframeset.h"
|
|
51016 |
+
|
|
51017 |
+#define DEBUG_EVENT 10
|
|
51018 |
+#define DEBUG_SIZE 10
|
|
51019 |
+#define DEBUG_ALLOC 10
|
|
51020 |
|
|
51021 |
#define DEBUG_LEVEL 10
|
|
51022 |
#include "debug.h"
|
|
51023 |
@@ -94,7 +110,7 @@ static gint Html_write_raw(DilloHtml *ht
|
|
51024 |
static void Html_write(DilloHtml *html, char *Buf, gint BufSize, gint Eof);
|
|
51025 |
static void Html_close(DilloHtml *html, gint ClientKey);
|
|
51026 |
static void Html_callback(int Op, CacheClient_t *Client);
|
|
51027 |
-static DilloHtml *Html_new(BrowserWindow *bw, const DilloUrl *url);
|
|
51028 |
+static DilloHtml *Html_new(DilloDoc *dd, const DilloUrl *url);
|
|
51029 |
static void Html_tag_open_input(DilloHtml *html, char *tag, gint tagsize);
|
|
51030 |
static void Html_add_input(DilloHtmlForm *form,
|
|
51031 |
DilloHtmlInputType type,
|
|
51032 |
@@ -107,6 +123,9 @@ static void Html_submit_form(GtkWidget *
|
|
51033 |
gint click_x, gint click_y);
|
|
51034 |
static void Html_reset_form(GtkWidget *reset, DilloHtmlLB *html_lb);
|
|
51035 |
static gint Html_tag_index(char *tag);
|
|
51036 |
+static void Html_translate(DilloTrans *trans, char *buf, gint bufsize);
|
|
51037 |
+static DilloTrans *Html_translation_new(char *source, char *dest);
|
|
51038 |
+static void Html_translation_free(DilloTrans *trans, gboolean keepbuf);
|
|
51039 |
|
|
51040 |
/* exported function */
|
|
51041 |
DwWidget *a_Html_text(const char *Type, void *P, CA_Callback_t *Call,
|
|
51042 |
@@ -117,9 +136,6 @@ DwWidget *a_Html_text(const char *Type,
|
|
51043 |
* Local Data
|
|
51044 |
*/
|
|
51045 |
|
|
51046 |
-/* The following array of font sizes has to be _strictly_ crescent */
|
|
51047 |
-static const gint FontSizes[] = {8, 10, 12, 14, 18, 24};
|
|
51048 |
-static const gint FontSizesNum = 6;
|
|
51049 |
static const gint FontSizesBase = 2;
|
|
51050 |
|
|
51051 |
/* Parsing table structure */
|
|
51052 |
@@ -141,9 +157,11 @@ static gint Html_get_line_number(DilloHt
|
|
51053 |
gint i, ofs, line;
|
|
51054 |
const char *p = html->Start_Buf;
|
|
51055 |
|
|
51056 |
+ ofs = (html->Buf_Size < html->CurrTagOfs)
|
|
51057 |
+ ? html->Buf_Size : html->CurrTagOfs;
|
|
51058 |
+
|
|
51059 |
g_return_val_if_fail(p != NULL, -1);
|
|
51060 |
|
|
51061 |
- ofs = html->CurrTagOfs;
|
|
51062 |
line = html->OldTagLine;
|
|
51063 |
for (i = html->OldTagOfs; i < ofs; ++i)
|
|
51064 |
if (p[i] == '\n')
|
|
51065 |
@@ -161,14 +179,14 @@ static void Html_msg(DilloHtml *html, co
|
|
51066 |
va_list argp;
|
|
51067 |
gchar buf[512];
|
|
51068 |
|
|
51069 |
- g_snprintf(buf, 512, "HTML warning: line %d, ",
|
|
51070 |
+ g_snprintf(buf, 512, _("HTML warning: line %d, "),
|
|
51071 |
Html_get_line_number(html));
|
|
51072 |
g_string_append(html->linkblock->page_bugs, buf);
|
|
51073 |
va_start(argp, format);
|
|
51074 |
g_vsnprintf(buf, 512, format, argp);
|
|
51075 |
va_end(argp);
|
|
51076 |
g_string_append(html->linkblock->page_bugs, buf);
|
|
51077 |
- a_Interface_bug_meter_update(html->bw,
|
|
51078 |
+ a_Interface_bug_meter_update(html->dd->bw,
|
|
51079 |
++html->linkblock->num_page_bugs);
|
|
51080 |
}
|
|
51081 |
|
|
51082 |
@@ -189,18 +207,29 @@ static DilloUrl *Html_url_new(DilloHtml
|
|
51083 |
(use_base_url) ? base_url : URL_STR_(html->linkblock->base_url),
|
|
51084 |
flags, posx, posy);
|
|
51085 |
if ((n_ic = URL_ILLEGAL_CHARS(url)) != 0) {
|
|
51086 |
- const char *suffix = (n_ic) > 1 ? "s" : "";
|
|
51087 |
n_ic_spc = URL_ILLEGAL_CHARS_SPC(url);
|
|
51088 |
if (n_ic == n_ic_spc) {
|
|
51089 |
- MSG_HTML("URL has %d illegal character%s [%d space%s]\n",
|
|
51090 |
- n_ic, suffix, n_ic_spc, suffix);
|
|
51091 |
+ MSG_HTML(_n(N_("URL has %d illegal character [%d space]\n"),
|
|
51092 |
+ N_("URL has %d illegal characters [%d spaces]\n"),
|
|
51093 |
+ n_ic), n_ic, n_ic_spc);
|
|
51094 |
} else if (n_ic_spc == 0) {
|
|
51095 |
- MSG_HTML("URL has %d illegal character%s [%d in (00-1F or 7F)]\n",
|
|
51096 |
- n_ic, suffix, n_ic);
|
|
51097 |
+ MSG_HTML(_n(N_("URL has %d illegal character "
|
|
51098 |
+ "[%d in (00-1F or 7F)]\n"),
|
|
51099 |
+ N_("URL has %d illegal characters "
|
|
51100 |
+ "[%d in (00-1F or 7F)]\n"),
|
|
51101 |
+ n_ic), n_ic, n_ic);
|
|
51102 |
+ } else if (n_ic_spc == 1) {
|
|
51103 |
+ MSG_HTML(_n(N_("URL has %d illegal character "
|
|
51104 |
+ "[%d space and %d in (00-1F or 7F)]\n"),
|
|
51105 |
+ N_("URL has %d illegal characters "
|
|
51106 |
+ "[%d space and %d in (00-1F or 7F)]\n"), n_ic),
|
|
51107 |
+ n_ic, n_ic_spc, n_ic-n_ic_spc);
|
|
51108 |
} else {
|
|
51109 |
- MSG_HTML("URL has %d illegal character%s "
|
|
51110 |
- "[%d space%s and %d in (00-1F or 7F)]\n",
|
|
51111 |
- n_ic, suffix, n_ic_spc, n_ic_spc ? "s" : "", n_ic-n_ic_spc);
|
|
51112 |
+ MSG_HTML(_n(N_("URL has %d illegal character "
|
|
51113 |
+ "[%d spaces and %d in (00-1F or 7F)]\n"),
|
|
51114 |
+ N_("URL has %d illegal characters "
|
|
51115 |
+ "[%d spaces and %d in (00-1F or 7F)]\n"), n_ic),
|
|
51116 |
+ n_ic, n_ic_spc, n_ic-n_ic_spc);
|
|
51117 |
}
|
|
51118 |
}
|
|
51119 |
return url;
|
|
51120 |
@@ -213,7 +242,15 @@ DwWidget *a_Html_text(const char *Type,
|
|
51121 |
void **Data)
|
|
51122 |
{
|
|
51123 |
DilloWeb *web = P;
|
|
51124 |
- DilloHtml *html = Html_new(web->bw, web->url);
|
|
51125 |
+ DilloHtml *html = Html_new(web->dd, web->url);
|
|
51126 |
+
|
|
51127 |
+ /* Actual, HTTP header charset is almost reliable in Japan
|
|
51128 |
+ * at least... however, the HTML 4.01 SPEC recommends
|
|
51129 |
+ * to giving top priority to this. */
|
|
51130 |
+ if ((html->server_charset = strstr(Type, "charset="))
|
|
51131 |
+ && html->server_charset + 8)
|
|
51132 |
+ html->server_charset
|
|
51133 |
+ = a_I18n_fix_charset(g_strdup(html->server_charset + 8));
|
|
51134 |
|
|
51135 |
*Data = (void *) html;
|
|
51136 |
*Call = (CA_Callback_t) Html_callback;
|
|
51137 |
@@ -224,11 +261,11 @@ DwWidget *a_Html_text(const char *Type,
|
|
51138 |
/*
|
|
51139 |
* We'll make the linkblock first to get it out of the way.
|
|
51140 |
*/
|
|
51141 |
-static DilloHtmlLB *Html_lb_new(BrowserWindow *bw, const DilloUrl *url)
|
|
51142 |
+static DilloHtmlLB *Html_lb_new(DilloDoc *dd, const DilloUrl *url)
|
|
51143 |
{
|
|
51144 |
DilloHtmlLB *html_lb = g_new(DilloHtmlLB, 1);
|
|
51145 |
|
|
51146 |
- html_lb->bw = bw;
|
|
51147 |
+ html_lb->dd = dd;
|
|
51148 |
html_lb->base_url = a_Url_dup(url);
|
|
51149 |
html_lb->num_forms_max = 1;
|
|
51150 |
html_lb->num_forms = 0;
|
|
51151 |
@@ -242,6 +279,14 @@ static DilloHtmlLB *Html_lb_new(BrowserW
|
|
51152 |
html_lb->link_color = prefs.link_color;
|
|
51153 |
html_lb->visited_color = prefs.visited_color;
|
|
51154 |
|
|
51155 |
+ html_lb->charset = NULL;
|
|
51156 |
+ html_lb->usingMetaCharset = FALSE;
|
|
51157 |
+ html_lb->lang[0] = 0;
|
|
51158 |
+
|
|
51159 |
+#ifdef ENABLE_META_REFRESH
|
|
51160 |
+ html_lb->meta_refresh = NULL;
|
|
51161 |
+#endif
|
|
51162 |
+
|
|
51163 |
html_lb->num_page_bugs = 0;
|
|
51164 |
html_lb->page_bugs = g_string_new("");
|
|
51165 |
|
|
51166 |
@@ -258,12 +303,17 @@ static void Html_lb_free(void *lb)
|
|
51167 |
DilloHtmlLB *html_lb = lb;
|
|
51168 |
|
|
51169 |
DEBUG_MSG(3, "Html_lb_free\n");
|
|
51170 |
-
|
|
51171 |
+#ifdef ENABLE_META_REFRESH
|
|
51172 |
+ if (html_lb->meta_refresh) {
|
|
51173 |
+ *html_lb->meta_refresh = 1;
|
|
51174 |
+ }
|
|
51175 |
+#endif
|
|
51176 |
a_Url_free(html_lb->base_url);
|
|
51177 |
|
|
51178 |
for (i = 0; i < html_lb->num_forms; i++) {
|
|
51179 |
form = &html_lb->forms[i];
|
|
51180 |
a_Url_free(form->action);
|
|
51181 |
+ g_free(form->charset);
|
|
51182 |
for (j = 0; j < form->num_inputs; j++) {
|
|
51183 |
g_free(form->inputs[j].name);
|
|
51184 |
g_free(form->inputs[j].init_str);
|
|
51185 |
@@ -286,6 +336,8 @@ static void Html_lb_free(void *lb)
|
|
51186 |
a_Url_free(html_lb->links[i]);
|
|
51187 |
g_free(html_lb->links);
|
|
51188 |
|
|
51189 |
+ g_free(html_lb->charset);
|
|
51190 |
+
|
|
51191 |
a_Dw_image_map_list_free(&html_lb->maps);
|
|
51192 |
|
|
51193 |
g_string_free(html_lb->page_bugs, TRUE);
|
|
51194 |
@@ -319,15 +371,19 @@ static void Html_handle_status(DwWidget
|
|
51195 |
|
|
51196 |
url = (link == -1) ? NULL : lb->links[link];
|
|
51197 |
if (url) {
|
|
51198 |
+ gchar *url_str = NULL;
|
|
51199 |
+ if(URL_STR_(url))
|
|
51200 |
+ url_str = a_I18n_convert(lb->charset, DILLO_CHARSET,
|
|
51201 |
+ URL_STR_(url), -1);
|
|
51202 |
Html_set_link_coordinates(lb, link, x, y);
|
|
51203 |
- a_Interface_msg(lb->bw, "%s",
|
|
51204 |
- URL_ALT_(url) ? URL_ALT_(url) : URL_STR_(url));
|
|
51205 |
+ a_Interface_msg(lb->dd->bw, "%s",
|
|
51206 |
+ URL_ALT_(url) ? URL_ALT_(url) : url_str);
|
|
51207 |
+ g_free(url_str);
|
|
51208 |
a_Dw_widget_set_cursor (widget, Dw_cursor_hand);
|
|
51209 |
- lb->bw->status_is_link = 1;
|
|
51210 |
-
|
|
51211 |
+ lb->dd->bw->status_is_link = 1;
|
|
51212 |
} else {
|
|
51213 |
- if (lb->bw->status_is_link)
|
|
51214 |
- a_Interface_msg(lb->bw, "");
|
|
51215 |
+ if (lb->dd->bw->status_is_link)
|
|
51216 |
+ a_Interface_msg(lb->dd->bw, "");
|
|
51217 |
a_Dw_widget_set_cursor (widget, NULL);
|
|
51218 |
}
|
|
51219 |
}
|
|
51220 |
@@ -343,26 +399,26 @@ static gboolean Html_link_menu(DwWidget
|
|
51221 |
|
|
51222 |
if (event->button == 3) {
|
|
51223 |
Html_set_link_coordinates(lb, link, x, y);
|
|
51224 |
- a_Menu_popup_set_url(lb->bw, lb->links[link]);
|
|
51225 |
+ a_Menu_popup_set_url(lb->dd->bw, lb->links[link]);
|
|
51226 |
|
|
51227 |
/* if we've got an image, prepare the image popup */
|
|
51228 |
widget_at_cursor =
|
|
51229 |
a_Dw_gtk_scrolled_window_widget_at_viewport_point(
|
|
51230 |
- GTK_DW_SCROLLED_WINDOW (lb->bw->docwin), event->x, event->y);
|
|
51231 |
+ GTK_DW_SCROLLED_WINDOW (lb->dd->docwin), event->x, event->y);
|
|
51232 |
if (widget_at_cursor && DW_IS_IMAGE (widget_at_cursor)) {
|
|
51233 |
DwImage *image = DW_IMAGE (widget_at_cursor);
|
|
51234 |
/* test image->url (it may have not started to arrive yet!) */
|
|
51235 |
if (image->url) {
|
|
51236 |
/* use the second URL for this popup */
|
|
51237 |
- gtk_object_set_data(GTK_OBJECT (lb->bw->menu_popup.over_image),
|
|
51238 |
+ gtk_object_set_data(GTK_OBJECT (lb->dd->bw->menu_popup.over_image),
|
|
51239 |
"url2", GINT_TO_POINTER(2));
|
|
51240 |
- a_Menu_popup_set_url2(lb->bw, image->url);
|
|
51241 |
+ a_Menu_popup_set_url2(lb->dd->bw, image->url);
|
|
51242 |
show_oi = TRUE;
|
|
51243 |
}
|
|
51244 |
}
|
|
51245 |
- a_Menu_popup_ol_show_oi(lb->bw, show_oi);
|
|
51246 |
+ a_Menu_popup_ol_show_oi(lb->dd->bw, show_oi);
|
|
51247 |
|
|
51248 |
- gtk_menu_popup(GTK_MENU(lb->bw->menu_popup.over_link), NULL, NULL,
|
|
51249 |
+ gtk_menu_popup(GTK_MENU(lb->dd->bw->menu_popup.over_link), NULL, NULL,
|
|
51250 |
NULL, NULL, event->button, event->time);
|
|
51251 |
return TRUE;
|
|
51252 |
}
|
|
51253 |
@@ -375,21 +431,60 @@ static gboolean Html_link_menu(DwWidget
|
|
51254 |
* Activate a link ("link_clicked" callback of the page)
|
|
51255 |
*/
|
|
51256 |
static gboolean Html_link_clicked(DwWidget *widget, gint link, gint x, gint y,
|
|
51257 |
- GdkEventButton *event, DilloHtmlLB *lb)
|
|
51258 |
+ GdkEventButton *event, DilloHtmlLB *lb)
|
|
51259 |
{
|
|
51260 |
+ DilloDoc *named_dd;
|
|
51261 |
+ gchar *target;
|
|
51262 |
+ gboolean return_val;
|
|
51263 |
+
|
|
51264 |
+ return_val = FALSE;
|
|
51265 |
+
|
|
51266 |
Html_set_link_coordinates(lb, link, x, y);
|
|
51267 |
- if (event->button == 1)
|
|
51268 |
- a_Nav_push(lb->bw, lb->links[link]);
|
|
51269 |
- else if (event->button == 2) {
|
|
51270 |
- a_Nav_push_nw(lb->bw, lb->links[link]);
|
|
51271 |
- } else {
|
|
51272 |
- return FALSE;
|
|
51273 |
+
|
|
51274 |
+ switch (event->button) {
|
|
51275 |
+ case 1:
|
|
51276 |
+ if (event->state & GDK_SHIFT_MASK) {
|
|
51277 |
+ /* shift-click: open in new window */
|
|
51278 |
+ a_Menu_popup_set_url(lb->dd->bw, lb->links[link]);
|
|
51279 |
+ a_Commands_open_link_nw_callback(NULL, lb->dd->bw);
|
|
51280 |
+#ifndef DISABLE_TABS
|
|
51281 |
+ } else if (event->state & GDK_CONTROL_MASK) {
|
|
51282 |
+ /* control-click: open in new tab */
|
|
51283 |
+ a_Menu_popup_set_url(lb->dd->bw, lb->links[link]);
|
|
51284 |
+ a_Commands_open_link_nw_tab_callback(NULL, lb->dd->bw);
|
|
51285 |
+#endif /* !DISABLE_TABS */
|
|
51286 |
+ } else {
|
|
51287 |
+ if((target = (gchar *) URL_TARGET_(lb->links[link])))
|
|
51288 |
+ /* targeted link or base target, open in either existing
|
|
51289 |
+ * named document or new document */
|
|
51290 |
+ if ((named_dd = a_Doc_get_by_name(lb->dd, (gchar *) target)))
|
|
51291 |
+ a_Nav_push(named_dd, lb->links[link]);
|
|
51292 |
+ else {
|
|
51293 |
+ a_Menu_popup_set_url(lb->dd->bw, lb->links[link]);
|
|
51294 |
+ a_Commands_open_link_nw_callback(NULL, lb->dd->bw);
|
|
51295 |
+ }
|
|
51296 |
+ else
|
|
51297 |
+ a_Nav_push(lb->dd, lb->links[link]);
|
|
51298 |
+ }
|
|
51299 |
+ return_val = TRUE;
|
|
51300 |
+ break;
|
|
51301 |
+ case 2:
|
|
51302 |
+ a_Menu_popup_set_url(lb->dd->bw, lb->links[link]);
|
|
51303 |
+#ifndef DISABLE_TABS
|
|
51304 |
+ if(prefs.tab_instead_of_window)
|
|
51305 |
+ a_Commands_open_link_nw_tab_callback(NULL, lb->dd->bw);
|
|
51306 |
+ else
|
|
51307 |
+#endif /* !DISABLE_TABS */
|
|
51308 |
+ a_Commands_open_link_nw_callback(NULL, lb->dd->bw);
|
|
51309 |
+ return_val = TRUE;
|
|
51310 |
+ break;
|
|
51311 |
+ default:
|
|
51312 |
+ break;
|
|
51313 |
}
|
|
51314 |
|
|
51315 |
if (DW_IS_PAGE (widget))
|
|
51316 |
a_Dw_page_change_link_color (DW_PAGE (widget), link, lb->visited_color);
|
|
51317 |
-
|
|
51318 |
- return TRUE;
|
|
51319 |
+ return return_val;
|
|
51320 |
}
|
|
51321 |
|
|
51322 |
/*
|
|
51323 |
@@ -397,14 +492,14 @@ static gboolean Html_link_clicked(DwWidg
|
|
51324 |
*/
|
|
51325 |
static gboolean Html_image_menu(DwWidget *widget,
|
|
51326 |
gint32 x, gint32 y, GdkEventButton *event,
|
|
51327 |
- BrowserWindow *bw)
|
|
51328 |
+ DilloDoc *dd)
|
|
51329 |
{
|
|
51330 |
DwImage *image = DW_IMAGE (widget);
|
|
51331 |
if (event->button == 3 && image->url) {
|
|
51332 |
- a_Menu_popup_set_url(bw, image->url);
|
|
51333 |
- a_Menu_popup_clear_url2(bw->menu_popup.over_image);
|
|
51334 |
+ a_Menu_popup_set_url(dd->bw, image->url);
|
|
51335 |
+ a_Menu_popup_clear_url2(dd->bw->menu_popup.over_image);
|
|
51336 |
|
|
51337 |
- gtk_menu_popup(GTK_MENU(bw->menu_popup.over_image), NULL, NULL,
|
|
51338 |
+ gtk_menu_popup(GTK_MENU(dd->bw->menu_popup.over_image), NULL, NULL,
|
|
51339 |
NULL, NULL, event->button, event->time);
|
|
51340 |
return TRUE;
|
|
51341 |
}
|
|
51342 |
@@ -416,19 +511,62 @@ static gboolean Html_image_menu(DwWidget
|
|
51343 |
* Popup the page menu ("button_press_event" callback of the viewport)
|
|
51344 |
*/
|
|
51345 |
static int Html_page_menu(GtkWidget *viewport, GdkEventButton *event,
|
|
51346 |
- BrowserWindow *bw)
|
|
51347 |
+ DilloDoc *dd)
|
|
51348 |
{
|
|
51349 |
gpointer bug_pix;
|
|
51350 |
-
|
|
51351 |
if (event->button == 3) {
|
|
51352 |
/* set the working URL */
|
|
51353 |
- a_Menu_popup_set_url(bw, a_History_get_url(NAV_TOP(bw)));
|
|
51354 |
+ a_Menu_popup_set_url(dd->bw, a_History_get_url(NAV_TOP(dd)));
|
|
51355 |
+ if(dd->pagemarks_menu) {
|
|
51356 |
+ /* this dd has a pagemarks menu, hook it up to the window's menu */
|
|
51357 |
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(dd->bw->pagemarks_menuitem),
|
|
51358 |
+ dd->pagemarks_menu);
|
|
51359 |
+ gtk_widget_set_sensitive(dd->bw->pagemarks_menuitem, TRUE);
|
|
51360 |
+ } else {
|
|
51361 |
+ /* remove pagemarks submenu from window's menu */
|
|
51362 |
+ gtk_widget_set_sensitive(dd->bw->pagemarks_menuitem, FALSE);
|
|
51363 |
+ }
|
|
51364 |
+ if(dd->parent) {
|
|
51365 |
+ /* this is a frame or an iframe, create frame menu */
|
|
51366 |
+ if(dd->bw->menu_popup.over_frame) {
|
|
51367 |
+ gtk_widget_destroy(dd->bw->menu_popup.over_frame);
|
|
51368 |
+ dd->bw->menu_popup.over_frame = NULL;
|
|
51369 |
+ }
|
|
51370 |
+ dd->bw->menu_popup.over_frame = a_Menu_popup_of_new(dd);
|
|
51371 |
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(dd->bw->frame_menuitem),
|
|
51372 |
+ dd->bw->menu_popup.over_frame);
|
|
51373 |
+ gtk_widget_set_sensitive(dd->bw->frame_menuitem, TRUE);
|
|
51374 |
+ if((dd->parent)->parent) {
|
|
51375 |
+ /* this is a nested frame, show frameset menu
|
|
51376 |
+ * TODO: currently the frameset menu also shows for nested
|
|
51377 |
+ * iframes. It does not do harm, but it is not that useful... */
|
|
51378 |
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(dd->bw->frameset_menuitem),
|
|
51379 |
+ a_Menu_popup_ofs_new(dd));
|
|
51380 |
+ gtk_widget_set_sensitive(dd->bw->frameset_menuitem, TRUE);
|
|
51381 |
+ gtk_widget_show(dd->bw->frameset_menuitem);
|
|
51382 |
+ } else {
|
|
51383 |
+ gtk_widget_set_sensitive(dd->bw->frameset_menuitem, FALSE);
|
|
51384 |
+ gtk_widget_hide(dd->bw->frameset_menuitem);
|
|
51385 |
+ }
|
|
51386 |
+ gtk_widget_show(dd->bw->frame_menuitem);
|
|
51387 |
+ } else {
|
|
51388 |
+ /* this is an unparented document, disable/destroy frame menu */
|
|
51389 |
+ if(dd->bw->menu_popup.over_frame) {
|
|
51390 |
+ gtk_widget_destroy(dd->bw->menu_popup.over_frame);
|
|
51391 |
+ dd->bw->menu_popup.over_frame = NULL;
|
|
51392 |
+ }
|
|
51393 |
+ gtk_widget_set_sensitive(dd->bw->frame_menuitem, FALSE);
|
|
51394 |
+ gtk_widget_hide(dd->bw->frame_menuitem);
|
|
51395 |
+ gtk_widget_set_sensitive(dd->bw->frameset_menuitem, FALSE);
|
|
51396 |
+ gtk_widget_hide(dd->bw->frameset_menuitem);
|
|
51397 |
+ }
|
|
51398 |
+
|
|
51399 |
/* set "View page Bugs" sensitivity */
|
|
51400 |
- bug_pix = gtk_object_get_data(GTK_OBJECT(bw->status_bug_meter), "bug");
|
|
51401 |
- gtk_widget_set_sensitive(bw->viewbugs_menuitem,
|
|
51402 |
+ bug_pix = gtk_object_get_data(GTK_OBJECT(dd->bw->status_bug_meter), "bug");
|
|
51403 |
+ gtk_widget_set_sensitive(dd->bw->viewbugs_menuitem,
|
|
51404 |
GTK_WIDGET_VISIBLE(GTK_WIDGET(bug_pix)));
|
|
51405 |
- gtk_menu_popup(GTK_MENU(bw->menu_popup.over_page), NULL, NULL,
|
|
51406 |
- NULL, NULL, event->button, event->time);
|
|
51407 |
+ gtk_menu_popup(GTK_MENU(dd->bw->menu_popup.over_page), NULL, NULL,
|
|
51408 |
+ NULL, NULL, event->button, event->time);
|
|
51409 |
return TRUE;
|
|
51410 |
} else
|
|
51411 |
return FALSE;
|
|
51412 |
@@ -458,6 +596,7 @@ static gint Html_set_new_link(DilloHtml
|
|
51413 |
{
|
|
51414 |
gint nl;
|
|
51415 |
|
|
51416 |
+ a_Url_set_referer(*url, html->linkblock->base_url);
|
|
51417 |
nl = html->linkblock->num_links;
|
|
51418 |
a_List_add(html->linkblock->links, nl, html->linkblock->num_links_max);
|
|
51419 |
html->linkblock->links[nl] = (*url) ? *url : NULL;
|
|
51420 |
@@ -480,7 +619,7 @@ static int Html_check_int(int n, int min
|
|
51421 |
static gint Html_form_new(DilloHtmlLB *html_lb,
|
|
51422 |
DilloHtmlMethod method,
|
|
51423 |
const DilloUrl *action,
|
|
51424 |
- DilloHtmlEnc enc)
|
|
51425 |
+ gchar *encoding)
|
|
51426 |
{
|
|
51427 |
gint nf;
|
|
51428 |
|
|
51429 |
@@ -489,7 +628,7 @@ static gint Html_form_new(DilloHtmlLB *h
|
|
51430 |
nf = html_lb->num_forms;
|
|
51431 |
html_lb->forms[nf].method = method;
|
|
51432 |
html_lb->forms[nf].action = a_Url_dup(action);
|
|
51433 |
- html_lb->forms[nf].enc = enc;
|
|
51434 |
+ html_lb->forms[nf].charset = g_strdup(encoding);
|
|
51435 |
html_lb->forms[nf].num_inputs = 0;
|
|
51436 |
html_lb->forms[nf].num_inputs_max = 4;
|
|
51437 |
html_lb->forms[nf].inputs = NULL;
|
|
51438 |
@@ -514,7 +653,7 @@ static gint Html_form_new(DilloHtmlLB *h
|
|
51439 |
style_attrs = *old_style; \
|
|
51440 |
style_attrs.var = (val); \
|
|
51441 |
(html)->stack[(html)->stack_top].style = \
|
|
51442 |
- a_Dw_style_new (&style_attrs, (html)->bw->main_window->window); \
|
|
51443 |
+ a_Dw_style_new (&style_attrs, (html)->dd->bw->main_window->window); \
|
|
51444 |
a_Dw_style_unref (old_style); \
|
|
51445 |
} while (FALSE)
|
|
51446 |
|
|
51447 |
@@ -539,6 +678,7 @@ static void Html_set_top_font(DilloHtml
|
|
51448 |
(prefs.use_oblique ?
|
|
51449 |
DW_STYLE_FONT_STYLE_OBLIQUE : DW_STYLE_FONT_STYLE_ITALIC) :
|
|
51450 |
DW_STYLE_FONT_STYLE_NORMAL;
|
|
51451 |
+ strncpy(font_attrs.lang, html->linkblock->lang, 6);
|
|
51452 |
|
|
51453 |
HTML_SET_TOP_ATTR (html, font, a_Dw_style_font_new (&font_attrs));
|
|
51454 |
}
|
|
51455 |
@@ -625,13 +765,13 @@ static void Html_add_indented_widget(Dil
|
|
51456 |
a_Dw_style_box_set_border_color
|
|
51457 |
(&style_attrs,
|
|
51458 |
a_Dw_style_shaded_color_new(style_attrs.color->color_val,
|
|
51459 |
- html->bw->main_window->window));
|
|
51460 |
+ html->dd->bw->main_window->window));
|
|
51461 |
a_Dw_style_box_set_border_style(&style_attrs, DW_STYLE_BORDER_DASHED);
|
|
51462 |
#endif
|
|
51463 |
|
|
51464 |
style_attrs.margin.left = left;
|
|
51465 |
style_attrs.margin.right = right;
|
|
51466 |
- style = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
51467 |
+ style = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
51468 |
|
|
51469 |
a_Dw_page_add_parbreak (DW_PAGE (html->dw), space, style);
|
|
51470 |
a_Dw_page_add_widget (DW_PAGE (html->dw), page, style);
|
|
51471 |
@@ -661,11 +801,11 @@ static gint Html_fontsize_to_level(gint
|
|
51472 |
{
|
|
51473 |
gint i, level;
|
|
51474 |
gdouble normalized_size = fontsize / prefs.font_factor,
|
|
51475 |
- approximation = FontSizes[FontSizesNum-1] + 1;
|
|
51476 |
+ approximation = prefs.font_sizes[D_FONT_SIZE_NUM-1] + 1;
|
|
51477 |
|
|
51478 |
- for (i = level = 0; i < FontSizesNum; i++)
|
|
51479 |
- if (approximation >= fabs(normalized_size - FontSizes[i])) {
|
|
51480 |
- approximation = fabs(normalized_size - FontSizes[i]);
|
|
51481 |
+ for (i = level = 0; i < D_FONT_SIZE_NUM; i++)
|
|
51482 |
+ if (approximation >= fabs(normalized_size - prefs.font_sizes[i])) {
|
|
51483 |
+ approximation = fabs(normalized_size - prefs.font_sizes[i]);
|
|
51484 |
level = i;
|
|
51485 |
} else {
|
|
51486 |
break;
|
|
51487 |
@@ -680,9 +820,9 @@ static gint Html_fontsize_to_level(gint
|
|
51488 |
static gint Html_level_to_fontsize(gint level)
|
|
51489 |
{
|
|
51490 |
level = MAX(0, level);
|
|
51491 |
- level = MIN(FontSizesNum - 1, level);
|
|
51492 |
+ level = MIN(D_FONT_SIZE_NUM - 1, level);
|
|
51493 |
|
|
51494 |
- return rint(FontSizes[level]*prefs.font_factor);
|
|
51495 |
+ return rint(prefs.font_sizes[level]*prefs.font_factor);
|
|
51496 |
}
|
|
51497 |
|
|
51498 |
/*
|
|
51499 |
@@ -706,13 +846,14 @@ static void Html_set_dwpage(DilloHtml *h
|
|
51500 |
font.size = Html_level_to_fontsize(FontSizesBase);
|
|
51501 |
font.weight = 400;
|
|
51502 |
font.style = DW_STYLE_FONT_STYLE_NORMAL;
|
|
51503 |
+ strncpy(font.lang, html->linkblock->lang, 6);
|
|
51504 |
|
|
51505 |
- a_Dw_style_init_values (&style_attrs, html->bw->main_window->window);
|
|
51506 |
+ a_Dw_style_init_values (&style_attrs, html->dd->bw->main_window->window);
|
|
51507 |
style_attrs.font = a_Dw_style_font_new (&font);
|
|
51508 |
style_attrs.color = a_Dw_style_color_new (prefs.text_color,
|
|
51509 |
- html->bw->main_window->window);
|
|
51510 |
+ html->dd->bw->main_window->window);
|
|
51511 |
html->stack[0].style = a_Dw_style_new (&style_attrs,
|
|
51512 |
- html->bw->main_window->window);
|
|
51513 |
+ html->dd->bw->main_window->window);
|
|
51514 |
|
|
51515 |
html->stack[0].table_cell_style = NULL;
|
|
51516 |
|
|
51517 |
@@ -720,21 +861,21 @@ static void Html_set_dwpage(DilloHtml *h
|
|
51518 |
Html_connect_signals(html, GTK_OBJECT(widget));
|
|
51519 |
|
|
51520 |
gtk_signal_connect_while_alive (
|
|
51521 |
- GTK_OBJECT(GTK_BIN(html->bw->docwin)->child), "button_press_event",
|
|
51522 |
- GTK_SIGNAL_FUNC(Html_page_menu), (gpointer)html->bw, GTK_OBJECT (page));
|
|
51523 |
+ GTK_OBJECT(GTK_BIN(html->dd->docwin)->child), "button_press_event",
|
|
51524 |
+ GTK_SIGNAL_FUNC(Html_page_menu), (gpointer)html->dd, GTK_OBJECT (page));
|
|
51525 |
|
|
51526 |
/* Connect the "bug meter" button-press to the linkblock */
|
|
51527 |
gtk_signal_connect_while_alive(
|
|
51528 |
- GTK_OBJECT (html->bw->status_bug_meter), "clicked",
|
|
51529 |
+ GTK_OBJECT (html->dd->bw->status_bug_meter), "clicked",
|
|
51530 |
GTK_SIGNAL_FUNC (a_Commands_view_page_bugs_callback),
|
|
51531 |
(gpointer)html->linkblock, GTK_OBJECT (page));
|
|
51532 |
gtk_signal_connect_while_alive(
|
|
51533 |
- GTK_OBJECT (html->bw->status_bug_meter), "clicked1",
|
|
51534 |
+ GTK_OBJECT (html->dd->bw->status_bug_meter), "clicked1",
|
|
51535 |
GTK_SIGNAL_FUNC (a_Commands_view_page_bugs_callback),
|
|
51536 |
(gpointer)html->linkblock, GTK_OBJECT (page));
|
|
51537 |
/* also connect with the "View page Bugs" menuitem */
|
|
51538 |
gtk_signal_connect_while_alive(
|
|
51539 |
- GTK_OBJECT (html->bw->viewbugs_menuitem), "activate",
|
|
51540 |
+ GTK_OBJECT (html->dd->bw->viewbugs_menuitem), "activate",
|
|
51541 |
GTK_SIGNAL_FUNC (a_Commands_view_page_bugs_callback),
|
|
51542 |
(gpointer)html->linkblock, GTK_OBJECT (page));
|
|
51543 |
|
|
51544 |
@@ -747,7 +888,7 @@ static void Html_set_dwpage(DilloHtml *h
|
|
51545 |
/*
|
|
51546 |
* Create and initialize a new DilloHtml structure
|
|
51547 |
*/
|
|
51548 |
-static DilloHtml *Html_new(BrowserWindow *bw, const DilloUrl *url)
|
|
51549 |
+static DilloHtml *Html_new(DilloDoc *dd, const DilloUrl *url)
|
|
51550 |
{
|
|
51551 |
DilloHtml *html;
|
|
51552 |
|
|
51553 |
@@ -755,6 +896,7 @@ static DilloHtml *Html_new(BrowserWindow
|
|
51554 |
|
|
51555 |
html->Start_Buf = NULL;
|
|
51556 |
html->Start_Ofs = 0;
|
|
51557 |
+ html->Buf_Size = 0;
|
|
51558 |
html->CurrTagOfs = 0;
|
|
51559 |
html->OldTagOfs = 0;
|
|
51560 |
html->OldTagLine = 1;
|
|
51561 |
@@ -763,8 +905,8 @@ static DilloHtml *Html_new(BrowserWindow
|
|
51562 |
html->DocTypeVersion = 0.0f;
|
|
51563 |
|
|
51564 |
html->dw = NULL;
|
|
51565 |
- html->bw = bw;
|
|
51566 |
- html->linkblock = Html_lb_new(bw, url);
|
|
51567 |
+ html->dd = dd;
|
|
51568 |
+ html->linkblock = Html_lb_new(dd, url);
|
|
51569 |
|
|
51570 |
html->stack_max = 16;
|
|
51571 |
html->stack_top = 0;
|
|
51572 |
@@ -774,6 +916,8 @@ static DilloHtml *Html_new(BrowserWindow
|
|
51573 |
html->stack[0].table_cell_style = NULL;
|
|
51574 |
html->stack[0].parse_mode = DILLO_HTML_PARSE_MODE_INIT;
|
|
51575 |
html->stack[0].table_mode = DILLO_HTML_TABLE_MODE_NONE;
|
|
51576 |
+ html->stack[0].frame_mode = DILLO_HTML_FRAME_MODE_NONE;
|
|
51577 |
+ html->stack[0].frameset = NULL;
|
|
51578 |
html->stack[0].cell_text_align_set = FALSE;
|
|
51579 |
html->stack[0].list_type = HTML_LIST_NONE; /* no <ul> or <ol> open */
|
|
51580 |
html->stack[0].list_number = 0;
|
|
51581 |
@@ -806,6 +950,10 @@ static DilloHtml *Html_new(BrowserWindow
|
|
51582 |
|
|
51583 |
html->attr_data = g_string_sized_new(1024);
|
|
51584 |
|
|
51585 |
+ html->trans = NULL; /* no conversion yet */
|
|
51586 |
+ html->server_charset = NULL;
|
|
51587 |
+ html->lang = NULL;
|
|
51588 |
+
|
|
51589 |
Html_set_dwpage(html);
|
|
51590 |
|
|
51591 |
return html;
|
|
51592 |
@@ -823,11 +971,11 @@ static void Html_stash_init(DilloHtml *h
|
|
51593 |
|
|
51594 |
/* Entities list from the HTML 4.01 DTD */
|
|
51595 |
typedef struct {
|
|
51596 |
- char *entity;
|
|
51597 |
- int isocode;
|
|
51598 |
+ gchar *entity;
|
|
51599 |
+ guint isocode;
|
|
51600 |
} Ent_t;
|
|
51601 |
|
|
51602 |
-#define NumEnt 252
|
|
51603 |
+#define NumEnt 253
|
|
51604 |
static const Ent_t Entities[NumEnt] = {
|
|
51605 |
{"AElig",0306}, {"Aacute",0301}, {"Acirc",0302}, {"Agrave",0300},
|
|
51606 |
{"Alpha",01621},{"Aring",0305}, {"Atilde",0303}, {"Auml",0304},
|
|
51607 |
@@ -846,7 +994,7 @@ static const Ent_t Entities[NumEnt] = {
|
|
51608 |
{"Yacute",0335},{"Yuml",0570}, {"Zeta",01626}, {"aacute",0341},
|
|
51609 |
{"acirc",0342}, {"acute",0264}, {"aelig",0346}, {"agrave",0340},
|
|
51610 |
{"alefsym",020465},{"alpha",01661},{"amp",38}, {"and",021047},
|
|
51611 |
- {"ang",021040}, {"aring",0345}, {"asymp",021110},{"atilde",0343},
|
|
51612 |
+ {"ang",021040},{"apos",34},{"aring",0345},{"asymp",021110},{"atilde",0343},
|
|
51613 |
{"auml",0344}, {"bdquo",020036},{"beta",01662}, {"brvbar",0246},
|
|
51614 |
{"bull",020042},{"cap",021051}, {"ccedil",0347}, {"cedil",0270},
|
|
51615 |
{"cent",0242}, {"chi",01707}, {"circ",01306}, {"clubs",023143},
|
|
51616 |
@@ -894,6 +1042,41 @@ static const Ent_t Entities[NumEnt] = {
|
|
51617 |
{"yuml",0377}, {"zeta",01666}, {"zwj",020015}, {"zwnj",020014}
|
|
51618 |
};
|
|
51619 |
|
|
51620 |
+/* A table for numbered entities. For Latin-1 text this is a 1-1 mapping.
|
|
51621 |
+ * It is more complicated for other character encodings. */
|
|
51622 |
+static char *NumberedEnts[256] = {
|
|
51623 |
+ "?","\001","\002","\003","\004","\005","\006","\007",
|
|
51624 |
+ "\010","\011","\012","\013","\014","\015","\016","\017",
|
|
51625 |
+ "\020","\021","\022","\023","\024","\025","\026","\027",
|
|
51626 |
+ "\030","\031","\032","\033","\034","\035","\036","\037",
|
|
51627 |
+ "\040","!","\042","#","\044","\045","&","\047",
|
|
51628 |
+ "(",")","*","+",",","-",".","/",
|
|
51629 |
+ "0","1","2","3","4","5","6","7",
|
|
51630 |
+ "8","9",":",";","<","=",">","?",
|
|
51631 |
+ "@","A","B","C","D","E","F","G",
|
|
51632 |
+ "H","I","J","K","L","M","N","O",
|
|
51633 |
+ "P","Q","R","S","T","U","V","W",
|
|
51634 |
+ "X","Y","Z","\133","\134","\135","^","_",
|
|
51635 |
+ "\140","a","b","c","d","e","f","g",
|
|
51636 |
+ "h","i","j","k","l","m","n","o",
|
|
51637 |
+ "p","q","r","s","t","u","v","w",
|
|
51638 |
+ "x","y","z","{","\174","}","~","\177",
|
|
51639 |
+ "\200","\201","\202","\203","\204","\205","\206","\207",
|
|
51640 |
+ "\210","\211","\212","\213","\214","\215","\216","\217",
|
|
51641 |
+ "\220","\221","\222","\223","\224","\225","\226","\227",
|
|
51642 |
+ "\230","\231","\232","\233","\234","\235","\236","\237",
|
|
51643 |
+ " ","!", NULL, NULL, "?", NULL, "|", NULL,
|
|
51644 |
+ NULL, "(c)", "a", "<<", NULL, "-", "(R)",
|
|
51645 |
+ NULL, NULL, NULL, "^2", "^3", NULL,
|
|
51646 |
+ "\xcc\xa6", NULL, NULL, ",", "^1", NULL, ">>", "1/4",
|
|
51647 |
+ "1/2", "3/4", "?", "A`", "A'", "A^", "A~", "A\"", "A", "AE", "C", "E`",
|
|
51648 |
+ "E'", "E^", "E\"", "I`", "I'", "I^", "I\"", "D", "N~", "O`", "O'", "O^",
|
|
51649 |
+ "O~", "O\"", NULL, "O/", "U`", "U'", "U^", "U\"", "Y'", "?", "ss",
|
|
51650 |
+ "a`", "a'", "a^", "a~", "a\"", "a", "ae", "c", "e`", "e'", "e^", "e\"",
|
|
51651 |
+ "i`", "i'", "i^", "i\"", "?", "n~", "o`", "o'", "o^", "o~", "o\"",
|
|
51652 |
+ NULL, "o/", "u`", "u'", "u^", "u\"", "y'", "Io", "y\""
|
|
51653 |
+};
|
|
51654 |
+
|
|
51655 |
|
|
51656 |
/*
|
|
51657 |
* Comparison function for binary search
|
|
51658 |
@@ -917,6 +1100,7 @@ static int Html_entity_search(char *key)
|
|
51659 |
return -1;
|
|
51660 |
}
|
|
51661 |
|
|
51662 |
+#if 0 /* no use on i18n */
|
|
51663 |
/*
|
|
51664 |
* Switch a few UCS encodings to latin1.
|
|
51665 |
*/
|
|
51666 |
@@ -933,7 +1117,7 @@ static gint Html_try_ucs2latin1(gint iso
|
|
51667 |
case 0x2039: ret = '<'; break;
|
|
51668 |
case 0x203a: ret = '>'; break;
|
|
51669 |
case 0x2022: ret = 176; break;
|
|
51670 |
- default: ret = -1; break;
|
|
51671 |
+ default: ret = isocode; break;
|
|
51672 |
}
|
|
51673 |
return ret;
|
|
51674 |
}
|
|
51675 |
@@ -956,6 +1140,61 @@ static gint Html_try_ascii2latin1(gint i
|
|
51676 |
}
|
|
51677 |
return ret;
|
|
51678 |
}
|
|
51679 |
+#endif
|
|
51680 |
+
|
|
51681 |
+/* Change from UCS2 to Dillo internal code. */
|
|
51682 |
+static gchar *Html_ucs2utf8(DilloHtml *html, gint isocode) {
|
|
51683 |
+ gchar *ret = NULL;
|
|
51684 |
+
|
|
51685 |
+ /* Try substitute ascii string. this is a temporary step. */
|
|
51686 |
+ if (!a_I18n_has_latin1_charset(html->linkblock->lang)) {
|
|
51687 |
+ if (isocode > 0 && isocode <= 255) {
|
|
51688 |
+ ret = NumberedEnts[isocode];
|
|
51689 |
+ } else switch (isocode) {
|
|
51690 |
+ case 338: ret = "OE"; break;
|
|
51691 |
+ case 339: ret = "oe"; break;
|
|
51692 |
+ case 352: ret = "S^"; break;
|
|
51693 |
+ case 353: ret = "s^"; break;
|
|
51694 |
+ case 376: ret = "Y\""; break;
|
|
51695 |
+ case 402: ret = "f"; break;
|
|
51696 |
+ case 710: ret = "^"; break;
|
|
51697 |
+ case 732: ret = "~"; break;
|
|
51698 |
+ case 8226: ret = "\xe3\x83\xbb"; break;
|
|
51699 |
+ case 8482: ret = "TM"; break;
|
|
51700 |
+ case 8544: ret = "I"; break;
|
|
51701 |
+ case 8545: ret = "II"; break;
|
|
51702 |
+ case 8546: ret = "III"; break;
|
|
51703 |
+ case 8547: ret = "IV"; break;
|
|
51704 |
+ case 8548: ret = "V"; break;
|
|
51705 |
+ case 8549: ret = "VI"; break;
|
|
51706 |
+ case 8550: ret = "VII"; break;
|
|
51707 |
+ case 8551: ret = "VIII"; break;
|
|
51708 |
+ case 8552: ret = "IX"; break;
|
|
51709 |
+ case 8553: ret = "X"; break;
|
|
51710 |
+ case 8554: ret = "XI"; break;
|
|
51711 |
+ case 8555: ret = "XII"; break;
|
|
51712 |
+ case 8722: ret = "-"; break;
|
|
51713 |
+ default:
|
|
51714 |
+ if (isocode >= 8194 && isocode <= 8207) ret = " ";
|
|
51715 |
+ }
|
|
51716 |
+ }
|
|
51717 |
+ switch (isocode) {
|
|
51718 |
+ case 8656: ret = "<="; break;
|
|
51719 |
+ case 8727: ret = "*"; break;
|
|
51720 |
+ case 8764: ret = "~"; break;
|
|
51721 |
+ case 8901: ret = "."; break;
|
|
51722 |
+ case 9001: ret = "<"; break;
|
|
51723 |
+ case 9002: ret = ">"; break;
|
|
51724 |
+ default: break;
|
|
51725 |
+ }
|
|
51726 |
+ if (ret) return g_strdup(ret);
|
|
51727 |
+
|
|
51728 |
+ {
|
|
51729 |
+ /* ISO-10646/UCS2 or ISO-10646-UCS-2 */
|
|
51730 |
+ gchar wc[3] = {(gchar)isocode, (gchar)(isocode>>8), 0};
|
|
51731 |
+ return a_I18n_convert("UCS-2LE", DILLO_CHARSET, wc, 2);
|
|
51732 |
+ }
|
|
51733 |
+}
|
|
51734 |
|
|
51735 |
/*
|
|
51736 |
* Given an entity, return the ISO-Latin1 character code.
|
|
51737 |
@@ -984,7 +1223,7 @@ static gint Html_parse_entity(DilloHtml
|
|
51738 |
/* strtol with base 16 accepts leading "0x" - we don't */
|
|
51739 |
if (*s == '0' && s[1] == 'x') {
|
|
51740 |
s++;
|
|
51741 |
- isocode = 0;
|
|
51742 |
+ isocode = 0;
|
|
51743 |
} else {
|
|
51744 |
isocode = strtol(s, &s, 16);
|
|
51745 |
}
|
|
51746 |
@@ -995,7 +1234,7 @@ static gint Html_parse_entity(DilloHtml
|
|
51747 |
|
|
51748 |
if (!isocode || errno || isocode > 0x7fffffffL) {
|
|
51749 |
/* this catches null bytes, errors and codes >=2^31 */
|
|
51750 |
- MSG_HTML("numeric character reference out of range\n");
|
|
51751 |
+ MSG_HTML(_("numeric character reference out of range\n"));
|
|
51752 |
isocode = -2;
|
|
51753 |
}
|
|
51754 |
|
|
51755 |
@@ -1003,19 +1242,19 @@ static gint Html_parse_entity(DilloHtml
|
|
51756 |
if (*s == ';')
|
|
51757 |
s++;
|
|
51758 |
else if (prefs.show_extra_warnings)
|
|
51759 |
- MSG_HTML("numeric character reference without trailing ';'\n");
|
|
51760 |
+ MSG_HTML(_("numeric character reference without trailing ';'\n"));
|
|
51761 |
}
|
|
51762 |
|
|
51763 |
} else if (isalpha(*s)) {
|
|
51764 |
/* character entity reference */
|
|
51765 |
- while (isalnum(*++s) || strchr(":_.-", *s));
|
|
51766 |
+ while (*++s && (isalnum(*s) || strchr(":_.-", *s)));
|
|
51767 |
c = *s;
|
|
51768 |
*s = 0;
|
|
51769 |
|
|
51770 |
if (c != ';' || (i = Html_entity_search(tok)) == -1) {
|
|
51771 |
if ((html->DocType == DT_HTML && html->DocTypeVersion == 4.01f) ||
|
|
51772 |
html->DocType == DT_XHTML)
|
|
51773 |
- MSG_HTML("undefined character entity '%s'\n", tok);
|
|
51774 |
+ MSG_HTML(_("undefined character entity '%s'\n"), tok);
|
|
51775 |
isocode = -3;
|
|
51776 |
} else
|
|
51777 |
isocode = Entities[i].isocode;
|
|
51778 |
@@ -1023,20 +1262,23 @@ static gint Html_parse_entity(DilloHtml
|
|
51779 |
if (c == ';')
|
|
51780 |
s++;
|
|
51781 |
else if (prefs.show_extra_warnings)
|
|
51782 |
- MSG_HTML("character entity reference without trailing ';'\n");
|
|
51783 |
+ MSG_HTML(_("character entity reference without trailing ';'\n"));
|
|
51784 |
}
|
|
51785 |
|
|
51786 |
*entsize = s-tok+1;
|
|
51787 |
g_free(tok);
|
|
51788 |
|
|
51789 |
+#if 0 /* no use on i18n */
|
|
51790 |
if (isocode >= 128 && isocode <= 159) {
|
|
51791 |
- MSG_HTML("code positions 128-159 are not defined for ISO Latin-1\n");
|
|
51792 |
+ MSG_HTML(_("code positions 128-159 are not defined for ISO Latin-1\n"));
|
|
51793 |
isocode = Html_try_ascii2latin1(isocode);
|
|
51794 |
} else if (isocode > 255)
|
|
51795 |
/* Try a few UCS translations to Latin1 */
|
|
51796 |
isocode = Html_try_ucs2latin1(isocode);
|
|
51797 |
- else if (isocode == -1 && prefs.show_extra_warnings)
|
|
51798 |
- MSG_HTML("literal '&'\n");
|
|
51799 |
+ else
|
|
51800 |
+#endif
|
|
51801 |
+ if (isocode == -1 && prefs.show_extra_warnings)
|
|
51802 |
+ MSG_HTML(_("literal '&'\n"));
|
|
51803 |
|
|
51804 |
return isocode;
|
|
51805 |
}
|
|
51806 |
@@ -1049,7 +1291,7 @@ static char *
|
|
51807 |
Html_parse_entities(DilloHtml *html, gchar *token, gint toksize)
|
|
51808 |
{
|
|
51809 |
gchar *esc_set = "&\xE2\xC2";
|
|
51810 |
- gchar *new_str;
|
|
51811 |
+ gchar *new_str, *subst, *subst_start;
|
|
51812 |
gint i, j, isocode, entsize;
|
|
51813 |
|
|
51814 |
new_str = g_strndup(token, toksize);
|
|
51815 |
@@ -1060,9 +1302,14 @@ static char *
|
|
51816 |
if (token[i] == '&' &&
|
|
51817 |
(isocode = Html_parse_entity(html, token+i,
|
|
51818 |
toksize-i, &entsize)) >= 0) {
|
|
51819 |
- new_str[j++] = (gchar) isocode;
|
|
51820 |
+ subst = subst_start = Html_ucs2utf8(html, isocode);
|
|
51821 |
+ while (*subst != '\0') { /* insert the actual character */
|
|
51822 |
+ new_str[j++] = *subst;
|
|
51823 |
+ subst++;
|
|
51824 |
+ }
|
|
51825 |
+ g_free(subst_start);
|
|
51826 |
i += entsize-1;
|
|
51827 |
-
|
|
51828 |
+#if 0 /* no use on i18n */
|
|
51829 |
} else if (token[i] == '\xE2' && token[i+1] == '\x80' && i+2 < toksize){
|
|
51830 |
/* Hack: for parsing some UTF-8 characters into latin1 */
|
|
51831 |
switch (token[i+2]) {
|
|
51832 |
@@ -1093,6 +1340,7 @@ static char *
|
|
51833 |
new_str[j++] = ' ';
|
|
51834 |
++i;
|
|
51835 |
|
|
51836 |
+#endif
|
|
51837 |
} else {
|
|
51838 |
new_str[j++] = token[i];
|
|
51839 |
}
|
|
51840 |
@@ -1139,7 +1387,7 @@ static void Html_process_space(DilloHtml
|
|
51841 |
break;
|
|
51842 |
case '\t':
|
|
51843 |
if (prefs.show_extra_warnings)
|
|
51844 |
- MSG_HTML("TAB character inside <PRE>\n");
|
|
51845 |
+ MSG_HTML(_("TAB character inside <PRE>\n"));
|
|
51846 |
offset = TAB_SIZE - html->pre_column % TAB_SIZE;
|
|
51847 |
a_Dw_page_add_text(DW_PAGE (html->dw),
|
|
51848 |
g_strnfill(offset, ' '),
|
|
51849 |
@@ -1375,7 +1623,7 @@ static void Html_tag_cleanup_at_close(Di
|
|
51850 |
/* Warn when we decide to close an open tag (for !w3c_mode) */
|
|
51851 |
if (html->stack_top > stack_idx &&
|
|
51852 |
Tags[toptag_idx].EndTag != 'O')
|
|
51853 |
- MSG_HTML(" - forcing close of open tag: <%s>\n",
|
|
51854 |
+ MSG_HTML(_(" - forcing close of open tag: <%s>\n"),
|
|
51855 |
Tags[toptag_idx].name);
|
|
51856 |
|
|
51857 |
/* Close this and only this tag */
|
|
51858 |
@@ -1384,7 +1632,7 @@ static void Html_tag_cleanup_at_close(Di
|
|
51859 |
}
|
|
51860 |
|
|
51861 |
} else {
|
|
51862 |
- MSG_HTML("unexpected closing tag: </%s>. -- expected </%s>\n",
|
|
51863 |
+ MSG_HTML(_("unexpected closing tag: </%1$s>. -- expected </%2$s>\n"),
|
|
51864 |
Tags[new_idx].name, html->stack[stack_idx].tag_name);
|
|
51865 |
}
|
|
51866 |
}
|
|
51867 |
@@ -1429,6 +1677,7 @@ static DwStyleLength Html_parse_length_o
|
|
51868 |
end += 2;
|
|
51869 |
*/
|
|
51870 |
default:
|
|
51871 |
+ v = (v > G_MAXSHORT*2) ? DW_STYLE_LENGTH_AUTO : v;
|
|
51872 |
l = DW_STYLE_CREATE_ABS_LENGTH ((gint)v);
|
|
51873 |
break;
|
|
51874 |
}
|
|
51875 |
@@ -1455,7 +1704,7 @@ static DwStyleLength Html_parse_length (
|
|
51876 |
else {
|
|
51877 |
/* allow only whitespaces */
|
|
51878 |
if (*end && !isspace (*end)) {
|
|
51879 |
- MSG_HTML("Garbage after length: %s\n", attr);
|
|
51880 |
+ MSG_HTML(_("Garbage after length: %s\n"), attr);
|
|
51881 |
return DW_STYLE_LENGTH_AUTO;
|
|
51882 |
}
|
|
51883 |
}
|
|
51884 |
@@ -1474,7 +1723,7 @@ static gint32
|
|
51885 |
gint32 color = a_Color_parse(subtag, default_color, &err);
|
|
51886 |
|
|
51887 |
if (err) {
|
|
51888 |
- MSG_HTML("color is not in \"#RRGGBB\" format\n");
|
|
51889 |
+ MSG_HTML(_("color is not in \"#RRGGBB\" format\n"));
|
|
51890 |
}
|
|
51891 |
return color;
|
|
51892 |
}
|
|
51893 |
@@ -1494,8 +1743,8 @@ static gint
|
|
51894 |
break;
|
|
51895 |
|
|
51896 |
if (val[i] || !isalpha(val[0]))
|
|
51897 |
- MSG_HTML("'%s' value is not of the form "
|
|
51898 |
- "[A-Za-z][A-Za-z0-9:_.-]*\n", attrname);
|
|
51899 |
+ MSG_HTML(_("'%s' value is not of the form "
|
|
51900 |
+ "[A-Za-z][A-Za-z0-9:_.-]*\n"), attrname);
|
|
51901 |
|
|
51902 |
return !(val[i]);
|
|
51903 |
}
|
|
51904 |
@@ -1591,12 +1840,18 @@ static void Html_parse_doctype(DilloHtml
|
|
51905 |
*/
|
|
51906 |
static void Html_tag_open_html(DilloHtml *html, char *tag, gint tagsize)
|
|
51907 |
{
|
|
51908 |
+ const char *attrbuf;
|
|
51909 |
+
|
|
51910 |
if (!(html->InFlags & IN_HTML))
|
|
51911 |
html->InFlags |= IN_HTML;
|
|
51912 |
++html->Num_HTML;
|
|
51913 |
|
|
51914 |
if (html->Num_HTML > 1) {
|
|
51915 |
- MSG_HTML("HTML element was already open\n");
|
|
51916 |
+ MSG_HTML(_("HTML element was already open\n"));
|
|
51917 |
+ }
|
|
51918 |
+
|
|
51919 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "lang"))) {
|
|
51920 |
+ strncpy(html->linkblock->lang, attrbuf, 6);
|
|
51921 |
}
|
|
51922 |
}
|
|
51923 |
|
|
51924 |
@@ -1619,7 +1874,7 @@ static void Html_tag_close_html(DilloHtm
|
|
51925 |
static void Html_tag_open_head(DilloHtml *html, char *tag, gint tagsize)
|
|
51926 |
{
|
|
51927 |
if (html->InFlags & IN_BODY) {
|
|
51928 |
- MSG_HTML("HEAD element must go before the BODY section\n");
|
|
51929 |
+ MSG_HTML(_("HEAD element must go before the BODY section\n"));
|
|
51930 |
html->ReqTagClose = TRUE;
|
|
51931 |
return;
|
|
51932 |
}
|
|
51933 |
@@ -1629,7 +1884,7 @@ static void Html_tag_open_head(DilloHtml
|
|
51934 |
++html->Num_HEAD;
|
|
51935 |
|
|
51936 |
if (html->Num_HEAD > 1) {
|
|
51937 |
- MSG_HTML("HEAD element was already open\n");
|
|
51938 |
+ MSG_HTML(_("HEAD element was already open\n"));
|
|
51939 |
}
|
|
51940 |
}
|
|
51941 |
|
|
51942 |
@@ -1642,8 +1897,8 @@ static void Html_tag_close_head(DilloHtm
|
|
51943 |
{
|
|
51944 |
if (html->InFlags & IN_HEAD) {
|
|
51945 |
if (html->Num_TITLE == 0)
|
|
51946 |
- MSG_HTML("HEAD section lacks the TITLE element\n");
|
|
51947 |
-
|
|
51948 |
+ MSG_HTML(_("HEAD section lacks the TITLE element\n"));
|
|
51949 |
+
|
|
51950 |
html->InFlags &= ~IN_HEAD;
|
|
51951 |
}
|
|
51952 |
Html_pop_tag(html, TagIdx);
|
|
51953 |
@@ -1667,10 +1922,10 @@ static void Html_tag_close_title(DilloHt
|
|
51954 |
{
|
|
51955 |
if (html->InFlags & IN_HEAD) {
|
|
51956 |
/* title is only valid inside HEAD */
|
|
51957 |
- a_Interface_set_page_title(html->linkblock->bw, html->Stash->str);
|
|
51958 |
- a_History_set_title(NAV_TOP(html->linkblock->bw), html->Stash->str);
|
|
51959 |
+ a_Doc_title_set(html->linkblock->dd, html->Stash->str);
|
|
51960 |
+ a_History_set_title(NAV_TOP(html->linkblock->dd), html->Stash->str);
|
|
51961 |
} else {
|
|
51962 |
- MSG_HTML("the TITLE element must be inside the HEAD section\n");
|
|
51963 |
+ MSG_HTML(_("the TITLE element must be inside the HEAD section\n"));
|
|
51964 |
}
|
|
51965 |
Html_pop_tag(html, TagIdx);
|
|
51966 |
}
|
|
51967 |
@@ -1725,17 +1980,26 @@ static void Html_tag_open_body(DilloHtml
|
|
51968 |
DwStyle style_attrs, *style;
|
|
51969 |
gint32 color;
|
|
51970 |
|
|
51971 |
+ /* if document contains frameset, ignore body */
|
|
51972 |
+ if (html->InFlags & IN_FRAMESET) return;
|
|
51973 |
+ /* in body, so hide/remove frameset and show docwin */
|
|
51974 |
+ if (html->dd->frameset && GTK_IS_WIDGET(html->dd->frameset)) {
|
|
51975 |
+ gtk_widget_destroy(html->dd->frameset);
|
|
51976 |
+ html->dd->frameset = NULL;
|
|
51977 |
+ gtk_widget_show(GTK_WIDGET(html->dd->docwin));
|
|
51978 |
+ }
|
|
51979 |
+
|
|
51980 |
if (!(html->InFlags & IN_BODY))
|
|
51981 |
html->InFlags |= IN_BODY;
|
|
51982 |
++html->Num_BODY;
|
|
51983 |
|
|
51984 |
if (html->Num_BODY > 1) {
|
|
51985 |
- MSG_HTML("BODY element was already open\n");
|
|
51986 |
+ MSG_HTML(_("BODY element was already open\n"));
|
|
51987 |
return;
|
|
51988 |
}
|
|
51989 |
if (html->InFlags & IN_HEAD) {
|
|
51990 |
/* if we're here, it's bad XHTML, no need to recover */
|
|
51991 |
- MSG_HTML("unclosed HEAD element\n");
|
|
51992 |
+ MSG_HTML(_("unclosed HEAD element\n"));
|
|
51993 |
}
|
|
51994 |
|
|
51995 |
page = DW_PAGE (html->dw);
|
|
51996 |
@@ -1749,8 +2013,8 @@ static void Html_tag_open_body(DilloHtml
|
|
51997 |
|
|
51998 |
style_attrs = *html->dw->style;
|
|
51999 |
style_attrs.background_color =
|
|
52000 |
- a_Dw_style_color_new (color, html->bw->main_window->window);
|
|
52001 |
- style = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52002 |
+ a_Dw_style_color_new (color, html->dd->bw->main_window->window);
|
|
52003 |
+ style = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52004 |
a_Dw_widget_set_style (html->dw, style);
|
|
52005 |
a_Dw_style_unref (style);
|
|
52006 |
html->stack[html->stack_top].current_bg_color = color;
|
|
52007 |
@@ -1760,7 +2024,7 @@ static void Html_tag_open_body(DilloHtml
|
|
52008 |
color = Html_color_parse(html, attrbuf, prefs.text_color);
|
|
52009 |
HTML_SET_TOP_ATTR
|
|
52010 |
(html, color,
|
|
52011 |
- a_Dw_style_color_new (color, html->bw->main_window->window));
|
|
52012 |
+ a_Dw_style_color_new (color, html->dd->bw->main_window->window));
|
|
52013 |
}
|
|
52014 |
|
|
52015 |
if ((attrbuf = Html_get_attr(html, tag, tagsize, "link")))
|
|
52016 |
@@ -1845,7 +2109,7 @@ static void Html_tag_open_table(DilloHtm
|
|
52017 |
(&style_attrs,
|
|
52018 |
a_Dw_style_shaded_color_new (
|
|
52019 |
html->stack[html->stack_top].current_bg_color,
|
|
52020 |
- html->bw->main_window->window));
|
|
52021 |
+ html->dd->bw->main_window->window));
|
|
52022 |
a_Dw_style_box_set_border_style (&style_attrs, DW_STYLE_BORDER_OUTSET);
|
|
52023 |
style_attrs.border_spacing = cellspacing;
|
|
52024 |
|
|
52025 |
@@ -1879,11 +2143,11 @@ static void Html_tag_open_table(DilloHtm
|
|
52026 |
bgcolor = prefs.bg_color;
|
|
52027 |
html->stack[html->stack_top].current_bg_color = bgcolor;
|
|
52028 |
style_attrs.background_color =
|
|
52029 |
- a_Dw_style_color_new (bgcolor, html->bw->main_window->window);
|
|
52030 |
+ a_Dw_style_color_new (bgcolor, html->dd->bw->main_window->window);
|
|
52031 |
}
|
|
52032 |
}
|
|
52033 |
|
|
52034 |
- tstyle = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52035 |
+ tstyle = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52036 |
|
|
52037 |
/* The style for the cells */
|
|
52038 |
style_attrs = *html->stack[html->stack_top].style;
|
|
52039 |
@@ -1900,7 +2164,7 @@ static void Html_tag_open_table(DilloHtm
|
|
52040 |
|
|
52041 |
old_style = html->stack[html->stack_top].table_cell_style;
|
|
52042 |
html->stack[html->stack_top].table_cell_style =
|
|
52043 |
- a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52044 |
+ a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52045 |
if (old_style)
|
|
52046 |
a_Dw_style_unref (old_style);
|
|
52047 |
|
|
52048 |
@@ -1931,11 +2195,11 @@ static void Html_tag_open_table_cell(Dil
|
|
52049 |
|
|
52050 |
switch (html->stack[html->stack_top].table_mode) {
|
|
52051 |
case DILLO_HTML_TABLE_MODE_NONE:
|
|
52052 |
- MSG_HTML("<td> or <th> outside <table>\n");
|
|
52053 |
+ MSG_HTML(_("<td> or <th> outside <table>\n"));
|
|
52054 |
return;
|
|
52055 |
|
|
52056 |
case DILLO_HTML_TABLE_MODE_TOP:
|
|
52057 |
- MSG_HTML("<td> or <th> outside <tr>\n");
|
|
52058 |
+ MSG_HTML(_("<td> or <th> outside <tr>\n"));
|
|
52059 |
/* a_Dw_table_add_cell takes care that dillo does not crash. */
|
|
52060 |
/* continues */
|
|
52061 |
case DILLO_HTML_TABLE_MODE_TR:
|
|
52062 |
@@ -1957,7 +2221,7 @@ static void Html_tag_open_table_cell(Dil
|
|
52063 |
style_attrs.white_space = DW_STYLE_WHITE_SPACE_NORMAL;
|
|
52064 |
|
|
52065 |
html->stack[html->stack_top].style =
|
|
52066 |
- a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52067 |
+ a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52068 |
a_Dw_style_unref (old_style);
|
|
52069 |
Html_tag_set_align_attr (html, tag, tagsize);
|
|
52070 |
|
|
52071 |
@@ -1982,7 +2246,7 @@ static void Html_tag_open_table_cell(Dil
|
|
52072 |
|
|
52073 |
new_style = TRUE;
|
|
52074 |
style_attrs.background_color =
|
|
52075 |
- a_Dw_style_color_new (bgcolor, html->bw->main_window->window);
|
|
52076 |
+ a_Dw_style_color_new (bgcolor, html->dd->bw->main_window->window);
|
|
52077 |
html->stack[html->stack_top].current_bg_color = bgcolor;
|
|
52078 |
}
|
|
52079 |
}
|
|
52080 |
@@ -1996,7 +2260,7 @@ static void Html_tag_open_table_cell(Dil
|
|
52081 |
col_page = a_Dw_page_new ();
|
|
52082 |
|
|
52083 |
if (new_style) {
|
|
52084 |
- style = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52085 |
+ style = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52086 |
a_Dw_widget_set_style (col_page, style);
|
|
52087 |
a_Dw_style_unref (style);
|
|
52088 |
} else
|
|
52089 |
@@ -2026,6 +2290,7 @@ static void Html_tag_open_table_cell(Dil
|
|
52090 |
*/
|
|
52091 |
static void Html_tag_open_td(DilloHtml *html, char *tag, gint tagsize)
|
|
52092 |
{
|
|
52093 |
+ Html_set_top_font(html, NULL, 0, 0, 0);
|
|
52094 |
Html_tag_open_table_cell (html, tag, tagsize, DW_STYLE_TEXT_ALIGN_LEFT);
|
|
52095 |
}
|
|
52096 |
|
|
52097 |
@@ -2052,7 +2317,7 @@ static void Html_tag_open_tr(DilloHtml *
|
|
52098 |
#ifdef USE_TABLES
|
|
52099 |
switch (html->stack[html->stack_top].table_mode) {
|
|
52100 |
case DILLO_HTML_TABLE_MODE_NONE:
|
|
52101 |
- _MSG("Invalid HTML syntax: <tr> outside <table>\n");
|
|
52102 |
+ _MSG(_("Invalid HTML syntax: <tr> outside <table>\n"));
|
|
52103 |
return;
|
|
52104 |
|
|
52105 |
case DILLO_HTML_TABLE_MODE_TOP:
|
|
52106 |
@@ -2069,9 +2334,9 @@ static void Html_tag_open_tr(DilloHtml *
|
|
52107 |
|
|
52108 |
style_attrs = *html->stack[html->stack_top].style;
|
|
52109 |
style_attrs.background_color =
|
|
52110 |
- a_Dw_style_color_new (bgcolor, html->bw->main_window->window);
|
|
52111 |
+ a_Dw_style_color_new (bgcolor, html->dd->bw->main_window->window);
|
|
52112 |
style =
|
|
52113 |
- a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52114 |
+ a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52115 |
html->stack[html->stack_top].current_bg_color = bgcolor;
|
|
52116 |
}
|
|
52117 |
}
|
|
52118 |
@@ -2090,7 +2355,7 @@ static void Html_tag_open_tr(DilloHtml *
|
|
52119 |
if (Html_tag_set_valign_attr (html, tag, tagsize, &style_attrs)) {
|
|
52120 |
old_style = html->stack[html->stack_top].table_cell_style;
|
|
52121 |
html->stack[html->stack_top].table_cell_style =
|
|
52122 |
- a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52123 |
+ a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52124 |
a_Dw_style_unref (old_style);
|
|
52125 |
} else
|
|
52126 |
|
|
52127 |
@@ -2107,87 +2372,320 @@ static void Html_tag_open_tr(DilloHtml *
|
|
52128 |
#endif
|
|
52129 |
}
|
|
52130 |
|
|
52131 |
-/*
|
|
52132 |
- * <FRAME>, <IFRAME>
|
|
52133 |
- * todo: This is just a temporary fix while real frame support
|
|
52134 |
- * isn't finished. Imitates lynx/w3m's frames.
|
|
52135 |
+static void Html_tag_open_noframes (DilloHtml *html, gchar *tag, gint tagsize)
|
|
52136 |
+{
|
|
52137 |
+ if (html->stack[html->stack_top].frame_mode == DILLO_HTML_FRAME_MODE_NONE)
|
|
52138 |
+ MSG_HTML(_("<noframes> outside of <frameset>!!!\n"));
|
|
52139 |
+ /* This code will allow the misuse of <noframes> which often exists. */
|
|
52140 |
+ html->stack[html->stack_top].frame_mode = DILLO_HTML_FRAME_MODE_NOFRAMES;
|
|
52141 |
+}
|
|
52142 |
+
|
|
52143 |
+/* Warning : this is illegal tag not existing! */
|
|
52144 |
+static void Html_tag_open_noframe (DilloHtml *html, gchar *tag, gint tagsize)
|
|
52145 |
+{
|
|
52146 |
+ MSG_HTML(_("<noframe> is illegal tag !!! use <noframes>.\n"));
|
|
52147 |
+ Html_tag_open_noframes (html, tag, tagsize);
|
|
52148 |
+}
|
|
52149 |
+
|
|
52150 |
+/*
|
|
52151 |
+ * <IFRAME>
|
|
52152 |
*/
|
|
52153 |
-static void Html_tag_open_frame (DilloHtml *html, gchar *tag, gint tagsize)
|
|
52154 |
+static void Html_tag_open_iframe (DilloHtml *html, gchar *tag, gint tagsize)
|
|
52155 |
{
|
|
52156 |
const char *attrbuf;
|
|
52157 |
- gchar *src, *buf;
|
|
52158 |
DilloUrl *url;
|
|
52159 |
+ GtkWidget *box;
|
|
52160 |
+ DwWidget *embed;
|
|
52161 |
+ DilloDoc *dd;
|
|
52162 |
DwPage *page;
|
|
52163 |
- DwStyle style_attrs, *link_style;
|
|
52164 |
- DwWidget *bullet;
|
|
52165 |
- gint buf_size;
|
|
52166 |
-
|
|
52167 |
- page = DW_PAGE(html->dw);
|
|
52168 |
+ // DwStyle style_attrs, *estyle, *fstyle; /* estyle is for embedding widget, fstyle for iframe */
|
|
52169 |
+ DwStyle style_attrs, *estyle;
|
|
52170 |
+ gchar *width_ptr, *height_ptr;
|
|
52171 |
+ gboolean frameborder;
|
|
52172 |
+ guint marginwidth, marginheight;
|
|
52173 |
+ GtkPolicyType scrolling;
|
|
52174 |
+ gchar *attrbuf_enc;
|
|
52175 |
+
|
|
52176 |
+ Html_tag_set_align_attr(html, tag, tagsize);
|
|
52177 |
+ /* ignore the rest of the text inside the tag
|
|
52178 |
+ *(it is the equivalent of a <noframes> block) */
|
|
52179 |
+ html->stack[html->stack_top].parse_mode = DILLO_HTML_PARSE_MODE_VERBATIM;
|
|
52180 |
+ html->stack[html->stack_top].frame_mode = DILLO_HTML_FRAME_MODE_IFRAME;
|
|
52181 |
|
|
52182 |
- if ( !(attrbuf = Html_get_attr(html, tag, tagsize, "src")) )
|
|
52183 |
+ /* no link == return */
|
|
52184 |
+ if ( !(attrbuf = Html_get_attr(html, tag, tagsize, "src")))
|
|
52185 |
+ return;
|
|
52186 |
+ if (strlen(attrbuf) == 0)
|
|
52187 |
+ return;
|
|
52188 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52189 |
+ attrbuf, -1);
|
|
52190 |
+ if (!(url = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0))) {
|
|
52191 |
+ g_free(attrbuf_enc);
|
|
52192 |
return;
|
|
52193 |
+ }
|
|
52194 |
+ g_free(attrbuf_enc);
|
|
52195 |
|
|
52196 |
- if (!(url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0)))
|
|
52197 |
+ /* block ads */
|
|
52198 |
+ if(a_Adblock_isblocked(url))
|
|
52199 |
+ {
|
|
52200 |
+ a_Url_free(url);
|
|
52201 |
return;
|
|
52202 |
+ }
|
|
52203 |
+
|
|
52204 |
+ page = DW_PAGE (html->dw);
|
|
52205 |
+ style_attrs = *html->stack[html->stack_top].style;
|
|
52206 |
|
|
52207 |
- src = g_strdup(attrbuf);
|
|
52208 |
+ /* use default for width (300) and height (150) if not specified */
|
|
52209 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "width")))
|
|
52210 |
+ width_ptr = g_strdup(attrbuf);
|
|
52211 |
+ else
|
|
52212 |
+ width_ptr = g_strdup("300");
|
|
52213 |
|
|
52214 |
- style_attrs = *(html->stack[html->stack_top].style);
|
|
52215 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "height")))
|
|
52216 |
+ height_ptr = g_strdup(attrbuf);
|
|
52217 |
+ else
|
|
52218 |
+ height_ptr = g_strdup("150");
|
|
52219 |
|
|
52220 |
- if (a_Capi_get_buf(url, &buf, &buf_size)) /* visited frame */
|
|
52221 |
- style_attrs.color = a_Dw_style_color_new
|
|
52222 |
- (html->linkblock->visited_color, html->bw->main_window->window);
|
|
52223 |
- else /* unvisited frame */
|
|
52224 |
- style_attrs.color = a_Dw_style_color_new
|
|
52225 |
- (html->linkblock->link_color, html->bw->main_window->window);
|
|
52226 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "frameborder")))
|
|
52227 |
+ frameborder = (strtol (attrbuf, NULL, 10) == 0 ? FALSE : TRUE);
|
|
52228 |
+ else
|
|
52229 |
+ frameborder = TRUE;
|
|
52230 |
|
|
52231 |
- style_attrs.text_decoration |= DW_STYLE_TEXT_DECORATION_UNDERLINE;
|
|
52232 |
- style_attrs.x_link = Html_set_new_link(html, &url);
|
|
52233 |
- link_style = a_Dw_style_new (&style_attrs,
|
|
52234 |
- html->bw->main_window->window);
|
|
52235 |
-
|
|
52236 |
- a_Dw_page_add_parbreak(page, 5, html->stack[(html)->stack_top].style);
|
|
52237 |
-
|
|
52238 |
- /* The bullet will be assigned the current list style, which should
|
|
52239 |
- * be "disc" by default, but may in very weird pages be different.
|
|
52240 |
- * Anyway, there should be no harm. */
|
|
52241 |
- bullet = a_Dw_bullet_new();
|
|
52242 |
- a_Dw_page_add_widget(page, bullet, html->stack[html->stack_top].style);
|
|
52243 |
- a_Dw_page_add_space(page, html->stack[html->stack_top].style);
|
|
52244 |
-
|
|
52245 |
- if (tolower(tag[1]) == 'i') {
|
|
52246 |
- /* IFRAME usually comes with very long advertising/spying URLS,
|
|
52247 |
- * to not break rendering we will force name="IFRAME" */
|
|
52248 |
- a_Dw_page_add_text(page, g_strdup("IFRAME"), link_style);
|
|
52249 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "marginwidth")))
|
|
52250 |
+ marginwidth = strtol (attrbuf, NULL, 10);
|
|
52251 |
+ else
|
|
52252 |
+ marginwidth = 0;
|
|
52253 |
|
|
52254 |
- } else {
|
|
52255 |
- /* FRAME:
|
|
52256 |
- * If 'name' tag is present use it, if not use 'src' value */
|
|
52257 |
- if ( !(attrbuf = Html_get_attr(html, tag, tagsize, "name")) ) {
|
|
52258 |
- a_Dw_page_add_text(page, g_strdup(src), link_style);
|
|
52259 |
- } else {
|
|
52260 |
- a_Dw_page_add_text(page, g_strdup(attrbuf), link_style);
|
|
52261 |
- }
|
|
52262 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "marginheight")))
|
|
52263 |
+ marginheight = strtol (attrbuf, NULL, 10);
|
|
52264 |
+ else
|
|
52265 |
+ marginheight = 0;
|
|
52266 |
+
|
|
52267 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "scrolling")))
|
|
52268 |
+ scrolling = (!g_strcasecmp(attrbuf, "no") ? GTK_POLICY_NEVER :
|
|
52269 |
+ (!g_strcasecmp(attrbuf, "yes") ? GTK_POLICY_ALWAYS : GTK_POLICY_AUTOMATIC));
|
|
52270 |
+ else
|
|
52271 |
+ scrolling = GTK_POLICY_AUTOMATIC;
|
|
52272 |
+
|
|
52273 |
+ dd = a_Doc_new();
|
|
52274 |
+ a_Doc_set_parent(dd, (html)->dd);
|
|
52275 |
+ /* set margins */
|
|
52276 |
+ (dd->style)->margin.left = (dd->style)->margin.right = marginwidth;
|
|
52277 |
+ (dd->style)->margin.top = (dd->style)->margin.bottom = marginheight;
|
|
52278 |
+ /* set border */
|
|
52279 |
+ if(!frameborder)
|
|
52280 |
+ a_Dw_style_box_set_val(&((dd->style)->border_width), frameborder);
|
|
52281 |
+
|
|
52282 |
+ box = gtk_hbox_new(TRUE, 0);
|
|
52283 |
+ gtk_container_set_border_width(GTK_CONTAINER(dd->docwin), 0);
|
|
52284 |
+ gtk_container_set_border_width(GTK_CONTAINER(box), 0);
|
|
52285 |
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dd->docwin), scrolling, scrolling);
|
|
52286 |
+ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(dd->docwin), TRUE, TRUE, 0);
|
|
52287 |
+ gtk_widget_show(GTK_WIDGET(box));
|
|
52288 |
+
|
|
52289 |
+ /* style for the embedding widget */
|
|
52290 |
+ a_Dw_style_box_set_border_style(&style_attrs, DW_STYLE_BORDER_NONE);
|
|
52291 |
+ a_Dw_style_box_set_val(&style_attrs.margin, 0);
|
|
52292 |
+ a_Dw_style_box_set_val(&style_attrs.border_width, 0);
|
|
52293 |
+ estyle = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52294 |
+
|
|
52295 |
+ embed = a_Dw_embed_gtk_new();
|
|
52296 |
+ a_Dw_embed_gtk_add_gtk(DW_EMBED_GTK(embed), GTK_WIDGET(box));
|
|
52297 |
+ Html_add_widget(html, (DwWidget *) embed, width_ptr, height_ptr, estyle);
|
|
52298 |
+
|
|
52299 |
+ a_Dw_style_unref(estyle);
|
|
52300 |
+ g_free(width_ptr);
|
|
52301 |
+ g_free(height_ptr);
|
|
52302 |
+
|
|
52303 |
+ /* set iframe name if specified */
|
|
52304 |
+ if((attrbuf = Html_get_attr(html, tag, tagsize, "name")))
|
|
52305 |
+ a_Doc_set_name(dd, (gchar *) attrbuf);
|
|
52306 |
+
|
|
52307 |
+ a_Url_set_referer(url, html->linkblock->base_url);
|
|
52308 |
+ a_Nav_push(dd, url);
|
|
52309 |
+}
|
|
52310 |
+
|
|
52311 |
+/*
|
|
52312 |
+ * <FRAME>
|
|
52313 |
+ */
|
|
52314 |
+static void Html_tag_open_frame (DilloHtml *html, gchar *tag, gint tagsize)
|
|
52315 |
+{
|
|
52316 |
+ const char *attrbuf;
|
|
52317 |
+ DilloUrl *url;
|
|
52318 |
+ GtkWidget *box;
|
|
52319 |
+ DilloDoc *dd;
|
|
52320 |
+ gboolean frameborder, noresize;
|
|
52321 |
+ guint marginwidth, marginheight;
|
|
52322 |
+ GtkPolicyType scrolling;
|
|
52323 |
+ gchar *attrbuf_enc;
|
|
52324 |
+
|
|
52325 |
+
|
|
52326 |
+ /* no link == return */
|
|
52327 |
+ if ( !(attrbuf = Html_get_attr(html, tag, tagsize, "src")))
|
|
52328 |
+ return;
|
|
52329 |
+ if (strlen(attrbuf) == 0)
|
|
52330 |
+ return;
|
|
52331 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52332 |
+ attrbuf, -1);
|
|
52333 |
+ _MSG(" URL %s\n", (attrbuf_enc) ? attrbuf_enc : "(null)");
|
|
52334 |
+ if (!(url = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0))) {
|
|
52335 |
+ g_free(attrbuf_enc);
|
|
52336 |
+ return;
|
|
52337 |
+ }
|
|
52338 |
+ g_free(attrbuf_enc);
|
|
52339 |
+
|
|
52340 |
+ /* block ads */
|
|
52341 |
+ if(a_Adblock_isblocked(url))
|
|
52342 |
+ {
|
|
52343 |
+ a_Url_free(url);
|
|
52344 |
+ url = Html_url_new(html, "about:blank", NULL, 0, 0, 0, 0);
|
|
52345 |
}
|
|
52346 |
|
|
52347 |
- a_Dw_page_add_parbreak(page, 5, html->stack[(html)->stack_top].style);
|
|
52348 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "frameborder")))
|
|
52349 |
+ frameborder = (strtol (attrbuf, NULL, 10) == 0 ? FALSE : TRUE);
|
|
52350 |
+ else
|
|
52351 |
+ frameborder = TRUE;
|
|
52352 |
+
|
|
52353 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "noresize")))
|
|
52354 |
+ noresize = TRUE;
|
|
52355 |
+ else
|
|
52356 |
+ noresize = FALSE;
|
|
52357 |
+
|
|
52358 |
+ /* if margins have not been set explicitly, use defaults */
|
|
52359 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "marginwidth")))
|
|
52360 |
+ marginwidth = strtol (attrbuf, NULL, 10);
|
|
52361 |
+ else
|
|
52362 |
+ marginwidth = DOC_DEFAULT_MARGIN;
|
|
52363 |
+
|
|
52364 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "marginheight")))
|
|
52365 |
+ marginheight = strtol (attrbuf, NULL, 10);
|
|
52366 |
+ else
|
|
52367 |
+ marginheight = DOC_DEFAULT_MARGIN;
|
|
52368 |
|
|
52369 |
- a_Dw_style_unref(link_style);
|
|
52370 |
- g_free(src);
|
|
52371 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "scrolling")))
|
|
52372 |
+ scrolling = (!g_strcasecmp(attrbuf, "no") ? GTK_POLICY_NEVER :
|
|
52373 |
+ (!g_strcasecmp(attrbuf, "yes") ? GTK_POLICY_ALWAYS : GTK_POLICY_AUTOMATIC));
|
|
52374 |
+ else
|
|
52375 |
+ scrolling = GTK_POLICY_AUTOMATIC;
|
|
52376 |
+
|
|
52377 |
+ switch(html->stack[html->stack_top].frame_mode) {
|
|
52378 |
+ case DILLO_HTML_FRAME_MODE_NONE:
|
|
52379 |
+ MSG_HTML(_("<frame> outside of <frameset>\n"));
|
|
52380 |
+ return;
|
|
52381 |
+ case DILLO_HTML_FRAME_MODE_NOFRAMES:
|
|
52382 |
+ MSG_HTML(_("<frame> inside of <noframes>\n"));
|
|
52383 |
+ return;
|
|
52384 |
+ case DILLO_HTML_FRAME_MODE_IFRAME:
|
|
52385 |
+ MSG_HTML(_("<frame> inside of <iframe>\n"));
|
|
52386 |
+ return;
|
|
52387 |
+ case DILLO_HTML_FRAME_MODE_FRAMESET:
|
|
52388 |
+ dd = a_Doc_new();
|
|
52389 |
+ a_Doc_set_parent(dd, (html)->dd);
|
|
52390 |
+ /* set marginwidth & height */
|
|
52391 |
+ (dd->style)->margin.left = (dd->style)->margin.right = marginwidth;
|
|
52392 |
+ (dd->style)->margin.top = (dd->style)->margin.bottom = marginheight;
|
|
52393 |
+ if(!frameborder) {
|
|
52394 |
+ a_Dw_style_box_set_val(&((dd->style)->border_width), 0);
|
|
52395 |
+ a_Dw_style_box_set_border_style(dd->style, DW_STYLE_BORDER_NONE);
|
|
52396 |
+ }
|
|
52397 |
+ box = gtk_hbox_new(TRUE, 0);
|
|
52398 |
+ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(dd->docwin), TRUE, TRUE, 0);
|
|
52399 |
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dd->docwin), scrolling, scrolling);
|
|
52400 |
+ gtk_container_set_border_width(GTK_CONTAINER(dd->docwin), 0);
|
|
52401 |
+ gtk_container_set_border_width(GTK_CONTAINER(box), 0);
|
|
52402 |
+ gtk_widget_show(GTK_WIDGET(box));
|
|
52403 |
+ gtk_container_add_with_args(GTK_CONTAINER(html->stack[html->stack_top].frameset),
|
|
52404 |
+ GTK_WIDGET(box),
|
|
52405 |
+ "GtkFrameset::x_padding", 0,
|
|
52406 |
+ "GtkFrameset::y_padding", 0,
|
|
52407 |
+ "GtkFrameset::noresize", noresize,
|
|
52408 |
+ "GtkFrameset::border", frameborder,
|
|
52409 |
+ NULL);
|
|
52410 |
+ a_Url_set_referer(url, html->linkblock->base_url);
|
|
52411 |
+ a_Nav_push(dd, url);
|
|
52412 |
+
|
|
52413 |
+ /* set frame name if specified */
|
|
52414 |
+ if((attrbuf = Html_get_attr(html, tag, tagsize, "name")))
|
|
52415 |
+ a_Doc_set_name(dd, (gchar *) attrbuf);
|
|
52416 |
+ break;
|
|
52417 |
+
|
|
52418 |
+ default:
|
|
52419 |
+ return;
|
|
52420 |
+ }
|
|
52421 |
}
|
|
52422 |
|
|
52423 |
/*
|
|
52424 |
* <FRAMESET>
|
|
52425 |
- * todo: This is just a temporary fix while real frame support
|
|
52426 |
- * isn't finished. Imitates lynx/w3m's frames.
|
|
52427 |
*/
|
|
52428 |
static void Html_tag_open_frameset (DilloHtml *html, gchar *tag, gint tagsize)
|
|
52429 |
{
|
|
52430 |
- a_Dw_page_add_parbreak(DW_PAGE (html->dw), 9,
|
|
52431 |
- html->stack[(html)->stack_top].style);
|
|
52432 |
- a_Dw_page_add_text(DW_PAGE(html->dw), g_strdup("--FRAME--"),
|
|
52433 |
- html->stack[html->stack_top].style);
|
|
52434 |
- Html_add_indented(html, 40, 0, 5);
|
|
52435 |
+ const char *attrbuf;
|
|
52436 |
+ GtkWidget *frameset;
|
|
52437 |
+ gchar *rows, *cols;
|
|
52438 |
+
|
|
52439 |
+ /* (older versions of) compiler happiness */
|
|
52440 |
+ frameset = NULL;
|
|
52441 |
+
|
|
52442 |
+ /* first, see if this frameset tag is in the right place... */
|
|
52443 |
+ if(html->stack[html->stack_top].parse_mode != DILLO_HTML_PARSE_MODE_INIT) {
|
|
52444 |
+ MSG_HTML(_("incorrectly placed <frameset>\n"));
|
|
52445 |
+ return;
|
|
52446 |
+ }
|
|
52447 |
+
|
|
52448 |
+ /* get frameset attributes */
|
|
52449 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "rows")))
|
|
52450 |
+ rows = g_strdup(attrbuf);
|
|
52451 |
+ else
|
|
52452 |
+ rows = NULL;
|
|
52453 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "cols")))
|
|
52454 |
+ cols = g_strdup(attrbuf);
|
|
52455 |
+ else
|
|
52456 |
+ cols = NULL;
|
|
52457 |
+
|
|
52458 |
+ switch(html->stack[html->stack_top].frame_mode) {
|
|
52459 |
+ case DILLO_HTML_FRAME_MODE_NOFRAMES:
|
|
52460 |
+ MSG_HTML(_("<frameset> inside of <noframes>\n"));
|
|
52461 |
+ g_free(rows);
|
|
52462 |
+ g_free(cols);
|
|
52463 |
+ return;
|
|
52464 |
+ case DILLO_HTML_FRAME_MODE_IFRAME:
|
|
52465 |
+ MSG_HTML(_("<frameset> inside of <iframe>\n"));
|
|
52466 |
+ g_free(rows);
|
|
52467 |
+ g_free(cols);
|
|
52468 |
+ return;
|
|
52469 |
+ case DILLO_HTML_FRAME_MODE_NONE:
|
|
52470 |
+ /* 'root' frameset, so add the frameset to the dd */
|
|
52471 |
+ if(html->dd->frameset)
|
|
52472 |
+ gtk_widget_destroy(html->dd->frameset);
|
|
52473 |
+ frameset = gtk_frameset_new(rows, cols);
|
|
52474 |
+ html->dd->frameset = frameset;
|
|
52475 |
+ gtk_container_add(GTK_CONTAINER(GTK_WIDGET(html->dd->docwin)->parent),
|
|
52476 |
+ GTK_WIDGET(frameset));
|
|
52477 |
+ /* hide the docwin, show the frameset */
|
|
52478 |
+ gtk_widget_hide(GTK_WIDGET(html->dd->docwin));
|
|
52479 |
+ gtk_widget_show(GTK_WIDGET(html->dd->frameset));
|
|
52480 |
+ break;
|
|
52481 |
+ case DILLO_HTML_FRAME_MODE_FRAMESET:
|
|
52482 |
+ /* nested frameset */
|
|
52483 |
+ frameset = gtk_frameset_new(rows, cols);
|
|
52484 |
+ gtk_container_add(GTK_CONTAINER(html->stack[html->stack_top].frameset), GTK_WIDGET(frameset));
|
|
52485 |
+ gtk_widget_show(GTK_WIDGET(frameset));
|
|
52486 |
+ break;
|
|
52487 |
+ default:
|
|
52488 |
+ break;
|
|
52489 |
+ }
|
|
52490 |
+
|
|
52491 |
+ g_free(rows);
|
|
52492 |
+ g_free(cols);
|
|
52493 |
+
|
|
52494 |
+
|
|
52495 |
+ /* once set, this flag does not get reset, even when the frameset tag
|
|
52496 |
+ * is closed. This is intentional. */
|
|
52497 |
+ html->InFlags |= IN_FRAMESET;
|
|
52498 |
+
|
|
52499 |
+ /* put the current frameset state on the stack */
|
|
52500 |
+ html->stack[html->stack_top].frame_mode = DILLO_HTML_FRAME_MODE_FRAMESET;
|
|
52501 |
+ html->stack[html->stack_top].frameset = frameset;
|
|
52502 |
}
|
|
52503 |
|
|
52504 |
/*
|
|
52505 |
@@ -2200,13 +2698,13 @@ static void Html_tag_open_h(DilloHtml *h
|
|
52506 |
|
|
52507 |
/* todo: combining these two would be slightly faster */
|
|
52508 |
Html_set_top_font(html, prefs.vw_fontname,
|
|
52509 |
- Html_level_to_fontsize(FontSizesNum - (tag[2] - '0')),
|
|
52510 |
+ Html_level_to_fontsize(D_FONT_SIZE_NUM - (tag[2] - '0')),
|
|
52511 |
1, 3);
|
|
52512 |
Html_tag_set_align_attr (html, tag, tagsize);
|
|
52513 |
|
|
52514 |
/* First finalize unclosed H tags (we test if already named anyway) */
|
|
52515 |
- a_Menu_pagemarks_set_text(html->bw, html->Stash->str);
|
|
52516 |
- a_Menu_pagemarks_add(html->bw, DW_PAGE (html->dw),
|
|
52517 |
+ a_Menu_pagemarks_set_text(html->dd, html->Stash->str);
|
|
52518 |
+ a_Menu_pagemarks_add(html->dd, DW_PAGE (html->dw),
|
|
52519 |
html->stack[html->stack_top].style, (tag[2] - '0'));
|
|
52520 |
Html_stash_init(html);
|
|
52521 |
html->stack[html->stack_top].parse_mode =
|
|
52522 |
@@ -2218,10 +2716,10 @@ static void Html_tag_open_h(DilloHtml *h
|
|
52523 |
*/
|
|
52524 |
static void Html_tag_close_h(DilloHtml *html, gint TagIdx)
|
|
52525 |
{
|
|
52526 |
- a_Menu_pagemarks_set_text(html->bw, html->Stash->str);
|
|
52527 |
+ a_Menu_pagemarks_set_text(html->dd, html->Stash->str);
|
|
52528 |
+ Html_pop_tag(html, TagIdx);
|
|
52529 |
a_Dw_page_add_parbreak(DW_PAGE (html->dw), 9,
|
|
52530 |
html->stack[(html)->stack_top].style);
|
|
52531 |
- Html_pop_tag(html, TagIdx);
|
|
52532 |
}
|
|
52533 |
|
|
52534 |
/*
|
|
52535 |
@@ -2268,7 +2766,7 @@ static void Html_tag_open_button(DilloHt
|
|
52536 |
a_Dw_style_box_set_val(&style_attrs.margin, 0);
|
|
52537 |
a_Dw_style_box_set_val(&style_attrs.border_width, 0);
|
|
52538 |
a_Dw_style_box_set_val(&style_attrs.padding, 0);
|
|
52539 |
- style = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52540 |
+ style = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52541 |
button = a_Dw_button_new (DW_USES_HINTS, TRUE);
|
|
52542 |
|
|
52543 |
/* The new button is not set button-insensitive, since nested buttons
|
|
52544 |
@@ -2282,7 +2780,7 @@ static void Html_tag_open_button(DilloHt
|
|
52545 |
a_Dw_style_unref (style);
|
|
52546 |
|
|
52547 |
a_Dw_style_box_set_val(&style_attrs.margin, 5);
|
|
52548 |
- style = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52549 |
+ style = a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52550 |
page = a_Dw_page_new ();
|
|
52551 |
a_Dw_widget_set_style (page, style);
|
|
52552 |
a_Dw_style_unref (style);
|
|
52553 |
@@ -2344,12 +2842,12 @@ static void Html_tag_open_font(DilloHtml
|
|
52554 |
if ((attrbuf = Html_get_attr(html, tag, tagsize, "color"))) {
|
|
52555 |
if (prefs.contrast_visited_color && html->InVisitedLink) {
|
|
52556 |
color = html->linkblock->visited_color;
|
|
52557 |
- } else {
|
|
52558 |
+ } else {
|
|
52559 |
/* use the tag-specified color */
|
|
52560 |
color = Html_color_parse(
|
|
52561 |
html, attrbuf, style_attrs.color->color_val);
|
|
52562 |
style_attrs.color = a_Dw_style_color_new
|
|
52563 |
- (color, html->bw->main_window->window);
|
|
52564 |
+ (color, html->dd->bw->main_window->window);
|
|
52565 |
}
|
|
52566 |
}
|
|
52567 |
|
|
52568 |
@@ -2362,7 +2860,7 @@ static void Html_tag_open_font(DilloHtml
|
|
52569 |
#endif
|
|
52570 |
|
|
52571 |
html->stack[html->stack_top].style =
|
|
52572 |
- a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52573 |
+ a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52574 |
a_Dw_style_unref (old_style);
|
|
52575 |
}
|
|
52576 |
|
|
52577 |
@@ -2534,15 +3032,19 @@ static void Html_load_image(DilloHtml *h
|
|
52578 |
{
|
|
52579 |
DilloWeb *Web;
|
|
52580 |
gint ClientKey;
|
|
52581 |
+ a_Url_set_referer(url, html->linkblock->base_url);
|
|
52582 |
/* Fill a Web structure for the cache query */
|
|
52583 |
+ if (URL_FLAGS(html->linkblock->base_url) && URL_MustCache)
|
|
52584 |
+ URL_FLAGS(url) |= URL_MustCache; /* cache page, cache images */
|
|
52585 |
+ URL_FLAGS(url) |= URL_IsImage;
|
|
52586 |
Web = a_Web_new(url);
|
|
52587 |
- Web->bw = html->bw;
|
|
52588 |
+ Web->dd = html->dd;
|
|
52589 |
Web->Image = Image;
|
|
52590 |
Web->flags |= WEB_Image;
|
|
52591 |
/* Request image data from the cache */
|
|
52592 |
if ((ClientKey = a_Capi_open_url(Web, NULL, NULL)) != 0) {
|
|
52593 |
- a_Interface_add_client(html->bw, ClientKey, 0);
|
|
52594 |
- a_Interface_add_url(html->bw, url, WEB_Image);
|
|
52595 |
+ a_Doc_add_client(html->dd, ClientKey, 0);
|
|
52596 |
+ a_Doc_add_url(html->dd, url, WEB_Image);
|
|
52597 |
}
|
|
52598 |
}
|
|
52599 |
|
|
52600 |
@@ -2558,23 +3060,38 @@ static void Html_tag_open_img(DilloHtml
|
|
52601 |
DwPage *page;
|
|
52602 |
DwStyle style_attrs;
|
|
52603 |
const char *attrbuf;
|
|
52604 |
+ gchar *attrbuf_enc;
|
|
52605 |
gint border;
|
|
52606 |
|
|
52607 |
/* This avoids loading images. Useful for viewing suspicious HTML email. */
|
|
52608 |
if (URL_FLAGS(html->linkblock->base_url) & URL_SpamSafe)
|
|
52609 |
return;
|
|
52610 |
|
|
52611 |
- if (!(attrbuf = Html_get_attr(html, tag, tagsize, "src")) ||
|
|
52612 |
- !(url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0)))
|
|
52613 |
+ if (!(attrbuf = Html_get_attr(html, tag, tagsize, "src")))
|
|
52614 |
+ return;
|
|
52615 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52616 |
+ attrbuf, -1);
|
|
52617 |
+ url = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0);
|
|
52618 |
+ g_free(attrbuf_enc);
|
|
52619 |
+ if(!url) return;
|
|
52620 |
+
|
|
52621 |
+ /* block ads */
|
|
52622 |
+ if(a_Adblock_isblocked(url))
|
|
52623 |
+ {
|
|
52624 |
+ a_Url_free(url);
|
|
52625 |
return;
|
|
52626 |
+ }
|
|
52627 |
|
|
52628 |
page = DW_PAGE (html->dw);
|
|
52629 |
|
|
52630 |
-
|
|
52631 |
usemap_url = NULL;
|
|
52632 |
- if ((attrbuf = Html_get_attr(html, tag, tagsize, "usemap")))
|
|
52633 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "usemap"))) {
|
|
52634 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52635 |
+ attrbuf, -1);
|
|
52636 |
/* todo: usemap URLs outside of the document are not used. */
|
|
52637 |
- usemap_url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0);
|
|
52638 |
+ usemap_url = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0);
|
|
52639 |
+ g_free(attrbuf_enc);
|
|
52640 |
+ }
|
|
52641 |
|
|
52642 |
style_attrs = *html->stack[html->stack_top].style;
|
|
52643 |
|
|
52644 |
@@ -2590,21 +3107,23 @@ static void Html_tag_open_img(DilloHtml
|
|
52645 |
a_Dw_style_box_set_border_color
|
|
52646 |
(&style_attrs,
|
|
52647 |
a_Dw_style_shaded_color_new (style_attrs.color->color_val,
|
|
52648 |
- html->bw->main_window->window));
|
|
52649 |
+ html->dd->bw->main_window->window));
|
|
52650 |
else
|
|
52651 |
a_Dw_style_box_set_border_color
|
|
52652 |
(&style_attrs,
|
|
52653 |
a_Dw_style_shaded_color_new (html->linkblock->link_color,
|
|
52654 |
- html->bw->main_window->window));
|
|
52655 |
+ html->dd->bw->main_window->window));
|
|
52656 |
|
|
52657 |
a_Dw_style_box_set_border_style (&style_attrs, DW_STYLE_BORDER_SOLID);
|
|
52658 |
a_Dw_style_box_set_val (&style_attrs.border_width, border);
|
|
52659 |
}
|
|
52660 |
|
|
52661 |
Image = Html_add_new_image(html, tag, tagsize, &style_attrs, TRUE);
|
|
52662 |
+ if (html->stack[html->stack_top].style->x_link != -1)
|
|
52663 |
+ a_Dw_widget_set_button_sensitive(DW_WIDGET(Image->dw), FALSE);
|
|
52664 |
Html_connect_signals(html, GTK_OBJECT(Image->dw));
|
|
52665 |
gtk_signal_connect_after(GTK_OBJECT(Image->dw), "button_press_event",
|
|
52666 |
- GTK_SIGNAL_FUNC(Html_image_menu), html->bw);
|
|
52667 |
+ GTK_SIGNAL_FUNC(Html_image_menu), html->dd);
|
|
52668 |
|
|
52669 |
/* Image maps */
|
|
52670 |
if (Html_get_attr(html, tag, tagsize, "ismap")) {
|
|
52671 |
@@ -2612,7 +3131,7 @@ static void Html_tag_open_img(DilloHtml
|
|
52672 |
* being separated with a word, only the first one is ISMAPed
|
|
52673 |
*/
|
|
52674 |
a_Dw_image_set_ismap (Image->dw);
|
|
52675 |
- _MSG(" Html_tag_open_img: server-side map (ISMAP)\n");
|
|
52676 |
+ _MSG(_(" Html_tag_open_img: server-side map (ISMAP)\n"));
|
|
52677 |
} else if (html->stack[html->stack_top].style->x_link != -1 &&
|
|
52678 |
usemap_url == NULL)
|
|
52679 |
/* For simple links, we have to suppress the "image_pressed" signal.
|
|
52680 |
@@ -2634,14 +3153,17 @@ static void Html_tag_open_img(DilloHtml
|
|
52681 |
static void Html_tag_open_map(DilloHtml *html, char *tag, gint tagsize)
|
|
52682 |
{
|
|
52683 |
char *hash_name;
|
|
52684 |
- const char *attrbuf;
|
|
52685 |
+ char *attrbuf_enc;
|
|
52686 |
DilloUrl *url;
|
|
52687 |
|
|
52688 |
if (html->InFlags & IN_MAP) {
|
|
52689 |
- MSG_HTML("nested <map>\n");
|
|
52690 |
+ MSG_HTML(_("nested <map>\n"));
|
|
52691 |
} else {
|
|
52692 |
- if ((attrbuf = Html_get_attr(html, tag, tagsize, "name"))) {
|
|
52693 |
- hash_name = g_strdup_printf("#%s", attrbuf);
|
|
52694 |
+ if ((attrbuf_enc = a_I18n_convert(DILLO_CHARSET,
|
|
52695 |
+ html->linkblock->charset,
|
|
52696 |
+ Html_get_attr(html, tag, tagsize, "name"), -1))) {
|
|
52697 |
+ hash_name = g_strdup_printf("#%s", attrbuf_enc);
|
|
52698 |
+ g_free(attrbuf_enc);
|
|
52699 |
url = Html_url_new(html, hash_name, NULL, 0, 0, 0, 0);
|
|
52700 |
a_Dw_image_map_list_add_map (&html->linkblock->maps, url);
|
|
52701 |
a_Url_free (url);
|
|
52702 |
@@ -2687,7 +3209,7 @@ static int Html_read_coords(DilloHtml *h
|
|
52703 |
pending = 0;
|
|
52704 |
} else {
|
|
52705 |
if (*newtail != ',') {
|
|
52706 |
- MSG_HTML("usemap coords MUST be separated with ','\n");
|
|
52707 |
+ MSG_HTML(_("usemap coords MUST be separated with ','\n"));
|
|
52708 |
}
|
|
52709 |
tail = newtail + 1;
|
|
52710 |
}
|
|
52711 |
@@ -2705,6 +3227,7 @@ static void Html_tag_open_area(DilloHtml
|
|
52712 |
GdkPoint point[1024];
|
|
52713 |
DilloUrl* url;
|
|
52714 |
const char *attrbuf;
|
|
52715 |
+ gchar *attrbuf_enc;
|
|
52716 |
gint type = DW_IMAGE_MAP_SHAPE_RECT;
|
|
52717 |
gint nbpoints, link = -1;
|
|
52718 |
|
|
52719 |
@@ -2730,14 +3253,21 @@ static void Html_tag_open_area(DilloHtml
|
|
52720 |
|
|
52721 |
if ( Html_get_attr(html, tag, tagsize, "nohref") ) {
|
|
52722 |
link = -1;
|
|
52723 |
- _MSG("nohref");
|
|
52724 |
+ _MSG(_("nohref"));
|
|
52725 |
}
|
|
52726 |
|
|
52727 |
if ((attrbuf = Html_get_attr(html, tag, tagsize, "href"))) {
|
|
52728 |
- url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0);
|
|
52729 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52730 |
+ attrbuf, -1);
|
|
52731 |
+ url = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0);
|
|
52732 |
+ g_free(attrbuf_enc);
|
|
52733 |
g_return_if_fail ( url != NULL );
|
|
52734 |
if ((attrbuf = Html_get_attr(html, tag, tagsize, "alt")))
|
|
52735 |
a_Url_set_alt(url, attrbuf);
|
|
52736 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "target")))
|
|
52737 |
+ a_Url_set_target(url, attrbuf);
|
|
52738 |
+ else if (URL_TARGET_(html->linkblock->base_url))
|
|
52739 |
+ a_Url_set_target(url, URL_TARGET_(html->linkblock->base_url));
|
|
52740 |
|
|
52741 |
link = Html_set_new_link(html, &url);
|
|
52742 |
}
|
|
52743 |
@@ -2762,7 +3292,7 @@ static const char* Html_get_javascript_l
|
|
52744 |
if ((ch == '"' || ch == '\'') &&
|
|
52745 |
(p2 = strchr(Buf->str + i + 1 , ch))) {
|
|
52746 |
p1 = Buf->str + i;
|
|
52747 |
- MSG_HTML("link depends on javascript()\n");
|
|
52748 |
+ MSG_HTML(_("link depends on javascript()\n"));
|
|
52749 |
g_string_truncate(Buf, p2 - Buf->str);
|
|
52750 |
g_string_erase(Buf, 0, p1 - Buf->str + 1);
|
|
52751 |
}
|
|
52752 |
@@ -2775,10 +3305,15 @@ static const char* Html_get_javascript_l
|
|
52753 |
*/
|
|
52754 |
static void Html_add_anchor(DilloHtml *html, const char *name)
|
|
52755 |
{
|
|
52756 |
- _MSG("Registering ANCHOR: %s\n", name);
|
|
52757 |
+ gchar *name_enc;
|
|
52758 |
+
|
|
52759 |
+ name_enc = a_I18n_DW_CHARSET_from_DILLO_CHARSET(name, -1);
|
|
52760 |
+ _MSG(_("Registering ANCHOR: %s\n"),
|
|
52761 |
+ a_I18n_DW_CHARSET_from_DILLO_CHARSET(name_enc, -1));
|
|
52762 |
+ g_free(name_enc);
|
|
52763 |
if (!a_Dw_page_add_anchor(DW_PAGE(html->dw), name,
|
|
52764 |
html->stack[html->stack_top].style))
|
|
52765 |
- MSG_HTML("Anchor names must be unique within the document\n");
|
|
52766 |
+ MSG_HTML(_("Anchor names must be unique within the document\n"));
|
|
52767 |
/* According to Sec. 12.2.1 of the HTML 4.01 spec, "anchor names that
|
|
52768 |
* differ only in case may not appear in the same document", but
|
|
52769 |
* "comparisons between fragment identifiers and anchor names must be
|
|
52770 |
@@ -2795,7 +3330,7 @@ static void Html_tag_open_a(DilloHtml *h
|
|
52771 |
DwStyle style_attrs, *old_style;
|
|
52772 |
DilloUrl *url;
|
|
52773 |
const char *attrbuf;
|
|
52774 |
- gchar *buf;
|
|
52775 |
+ gchar *buf, *attrbuf_enc;
|
|
52776 |
gint buf_size;
|
|
52777 |
|
|
52778 |
/* todo: add support for MAP with A HREF */
|
|
52779 |
@@ -2806,9 +3341,20 @@ static void Html_tag_open_a(DilloHtml *h
|
|
52780 |
if (tolower(attrbuf[0]) == 'j')
|
|
52781 |
attrbuf = Html_get_javascript_link(html);
|
|
52782 |
|
|
52783 |
- url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0);
|
|
52784 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52785 |
+ attrbuf, -1);
|
|
52786 |
+ url = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0);
|
|
52787 |
+ g_free(attrbuf_enc);
|
|
52788 |
g_return_if_fail ( url != NULL );
|
|
52789 |
|
|
52790 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "target"))) {
|
|
52791 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52792 |
+ attrbuf, -1);
|
|
52793 |
+ a_Url_set_target(url, attrbuf_enc);
|
|
52794 |
+ g_free(attrbuf_enc);
|
|
52795 |
+ } else if (URL_TARGET_(html->linkblock->base_url))
|
|
52796 |
+ a_Url_set_target(url, URL_TARGET_(html->linkblock->base_url));
|
|
52797 |
+
|
|
52798 |
old_style = html->stack[html->stack_top].style;
|
|
52799 |
style_attrs = *old_style;
|
|
52800 |
|
|
52801 |
@@ -2822,20 +3368,21 @@ static void Html_tag_open_a(DilloHtml *h
|
|
52802 |
html->linkblock->link_color,
|
|
52803 |
html->stack[html->stack_top].current_bg_color),
|
|
52804 |
*/
|
|
52805 |
- html->bw->main_window->window);
|
|
52806 |
+ html->dd->bw->main_window->window);
|
|
52807 |
} else {
|
|
52808 |
style_attrs.color = a_Dw_style_color_new
|
|
52809 |
- (html->linkblock->link_color, html->bw->main_window->window);
|
|
52810 |
+ (html->linkblock->link_color, html->dd->bw->main_window->window);
|
|
52811 |
}
|
|
52812 |
|
|
52813 |
- if ((attrbuf = Html_get_attr(html, tag, tagsize, "title")))
|
|
52814 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "title"))) {
|
|
52815 |
style_attrs.x_tooltip = a_Dw_tooltip_new_no_ref(attrbuf);
|
|
52816 |
+ }
|
|
52817 |
|
|
52818 |
style_attrs.text_decoration |= DW_STYLE_TEXT_DECORATION_UNDERLINE;
|
|
52819 |
style_attrs.x_link = Html_set_new_link(html, &url);
|
|
52820 |
|
|
52821 |
html->stack[html->stack_top].style =
|
|
52822 |
- a_Dw_style_new (&style_attrs, html->bw->main_window->window);
|
|
52823 |
+ a_Dw_style_new (&style_attrs, html->dd->bw->main_window->window);
|
|
52824 |
a_Dw_style_unref (old_style);
|
|
52825 |
}
|
|
52826 |
|
|
52827 |
@@ -2843,7 +3390,10 @@ static void Html_tag_open_a(DilloHtml *h
|
|
52828 |
if (prefs.show_extra_warnings)
|
|
52829 |
Html_check_name_val(html, attrbuf, "name");
|
|
52830 |
/* html->NameVal is freed in Html_process_tag */
|
|
52831 |
- html->NameVal = a_Url_decode_hex_str(attrbuf);
|
|
52832 |
+ attrbuf_enc = a_Url_decode_hex_str(attrbuf);
|
|
52833 |
+ html->NameVal = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52834 |
+ attrbuf_enc, -1);
|
|
52835 |
+ g_free(attrbuf_enc);
|
|
52836 |
Html_add_anchor(html, html->NameVal);
|
|
52837 |
}
|
|
52838 |
}
|
|
52839 |
@@ -2869,7 +3419,7 @@ static void Html_tag_open_u(DilloHtml *h
|
|
52840 |
style_attrs = *style;
|
|
52841 |
style_attrs.text_decoration |= DW_STYLE_TEXT_DECORATION_UNDERLINE;
|
|
52842 |
html->stack[html->stack_top].style =
|
|
52843 |
- a_Dw_style_new(&style_attrs, html->bw->main_window->window);
|
|
52844 |
+ a_Dw_style_new(&style_attrs, html->dd->bw->main_window->window);
|
|
52845 |
a_Dw_style_unref(style);
|
|
52846 |
}
|
|
52847 |
|
|
52848 |
@@ -2885,7 +3435,7 @@ static void Html_tag_open_strike(DilloHt
|
|
52849 |
style_attrs = *style;
|
|
52850 |
style_attrs.text_decoration |= DW_STYLE_TEXT_DECORATION_LINE_THROUGH;
|
|
52851 |
html->stack[html->stack_top].style =
|
|
52852 |
- a_Dw_style_new(&style_attrs, html->bw->main_window->window);
|
|
52853 |
+ a_Dw_style_new(&style_attrs, html->dd->bw->main_window->window);
|
|
52854 |
a_Dw_style_unref(style);
|
|
52855 |
}
|
|
52856 |
|
|
52857 |
@@ -2970,7 +3520,7 @@ static void Html_tag_open_menu(DilloHtml
|
|
52858 |
html->stack[html->stack_top].ref_list_item = NULL;
|
|
52859 |
|
|
52860 |
if (prefs.show_extra_warnings)
|
|
52861 |
- MSG_HTML("it is strongly recommended using <UL> instead of <MENU>\n");
|
|
52862 |
+ MSG_HTML(_("it is strongly recommended using <UL> instead of <MENU>\n"));
|
|
52863 |
}
|
|
52864 |
|
|
52865 |
/*
|
|
52866 |
@@ -3032,7 +3582,7 @@ static void Html_tag_open_li(DilloHtml *
|
|
52867 |
|
|
52868 |
switch (html->stack[html->stack_top].list_type) {
|
|
52869 |
case HTML_LIST_NONE:
|
|
52870 |
- MSG_HTML("<li> outside <ul> or <ol>\n");
|
|
52871 |
+ MSG_HTML(_("<li> outside <ul> or <ol>\n"));
|
|
52872 |
list_item = a_Dw_list_item_new(NULL);
|
|
52873 |
Html_add_indented_widget(html, list_item, 0, 0, 0 /* or 1 */);
|
|
52874 |
bullet = a_Dw_bullet_new();
|
|
52875 |
@@ -3107,7 +3657,7 @@ static void Html_tag_open_hr(DilloHtml *
|
|
52876 |
a_Dw_style_box_set_border_color
|
|
52877 |
(&style_attrs,
|
|
52878 |
a_Dw_style_shaded_color_new (style_attrs.color->color_val,
|
|
52879 |
- html->bw->main_window->window));
|
|
52880 |
+ html->dd->bw->main_window->window));
|
|
52881 |
if (size < 1)
|
|
52882 |
size = 1;
|
|
52883 |
} else {
|
|
52884 |
@@ -3116,7 +3666,7 @@ static void Html_tag_open_hr(DilloHtml *
|
|
52885 |
(&style_attrs,
|
|
52886 |
a_Dw_style_shaded_color_new
|
|
52887 |
(html->stack[html->stack_top].current_bg_color,
|
|
52888 |
- html->bw->main_window->window));
|
|
52889 |
+ html->dd->bw->main_window->window));
|
|
52890 |
if (size < 2)
|
|
52891 |
size = 2;
|
|
52892 |
}
|
|
52893 |
@@ -3221,14 +3771,14 @@ static void Html_tag_open_form(DilloHtml
|
|
52894 |
{
|
|
52895 |
DilloUrl *action;
|
|
52896 |
DilloHtmlMethod method;
|
|
52897 |
- DilloHtmlEnc enc;
|
|
52898 |
+ gchar *accept_charset = NULL, *attrbuf_enc;
|
|
52899 |
const char *attrbuf;
|
|
52900 |
|
|
52901 |
a_Dw_page_add_parbreak(DW_PAGE (html->dw), 9,
|
|
52902 |
html->stack[(html)->stack_top].style);
|
|
52903 |
|
|
52904 |
if (html->InFlags & IN_FORM) {
|
|
52905 |
- MSG_HTML("nested forms\n");
|
|
52906 |
+ MSG_HTML(_("nested forms\n"));
|
|
52907 |
return;
|
|
52908 |
}
|
|
52909 |
html->InFlags |= IN_FORM;
|
|
52910 |
@@ -3239,15 +3789,25 @@ static void Html_tag_open_form(DilloHtml
|
|
52911 |
method = DILLO_HTML_METHOD_POST;
|
|
52912 |
/* todo: maybe deal with unknown methods? */
|
|
52913 |
}
|
|
52914 |
- if ((attrbuf = Html_get_attr(html, tag, tagsize, "action")))
|
|
52915 |
- action = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0);
|
|
52916 |
- else
|
|
52917 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "action"))) {
|
|
52918 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
52919 |
+ attrbuf, -1);
|
|
52920 |
+ action = Html_url_new(html, attrbuf_enc, NULL, 0, 0, 0, 0);
|
|
52921 |
+ g_free(attrbuf_enc);
|
|
52922 |
+ } else
|
|
52923 |
action = a_Url_dup(html->linkblock->base_url);
|
|
52924 |
- enc = DILLO_HTML_ENC_URLENCODING;
|
|
52925 |
- if ( (attrbuf = Html_get_attr(html, tag, tagsize, "encoding")) ) {
|
|
52926 |
- /* todo: maybe deal with unknown encodings? */
|
|
52927 |
+
|
|
52928 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "target")))
|
|
52929 |
+ a_Url_set_target(action, attrbuf);
|
|
52930 |
+ else if (URL_TARGET_(html->linkblock->base_url))
|
|
52931 |
+ a_Url_set_target(action, URL_TARGET_(html->linkblock->base_url));
|
|
52932 |
+
|
|
52933 |
+ if(Html_get_attr(html, tag, tagsize, "accept-charset")) {
|
|
52934 |
+ accept_charset = a_I18n_fix_charset(g_strdup(
|
|
52935 |
+ Html_get_attr(html, tag, tagsize, "accept-charset")));
|
|
52936 |
}
|
|
52937 |
- Html_form_new(html->linkblock, method, action, enc);
|
|
52938 |
+ Html_form_new(html->linkblock, method, action, accept_charset);
|
|
52939 |
+ g_free(accept_charset);
|
|
52940 |
a_Url_free(action);
|
|
52941 |
}
|
|
52942 |
|
|
52943 |
@@ -3265,9 +3825,9 @@ static void Html_tag_close_form(DilloHtm
|
|
52944 |
let's add a custom one */
|
|
52945 |
if (form->num_submit_buttons == 0) {
|
|
52946 |
if (prefs.show_extra_warnings || form->num_entry_fields != 1)
|
|
52947 |
- MSG_HTML("FORM lacks a Submit button\n");
|
|
52948 |
+ MSG_HTML(_("FORM lacks a Submit button\n"));
|
|
52949 |
if (prefs.generate_submit) {
|
|
52950 |
- MSG_HTML(" (added a submit button internally)\n");
|
|
52951 |
+ MSG_HTML(_(" (added a submit button internally)\n"));
|
|
52952 |
Html_tag_open_input(html, SubmitTag, strlen(SubmitTag));
|
|
52953 |
form->num_submit_buttons = 0;
|
|
52954 |
}
|
|
52955 |
@@ -3294,6 +3854,27 @@ static void Html_tag_close_form(DilloHtm
|
|
52956 |
Html_pop_tag(html, TagIdx);
|
|
52957 |
}
|
|
52958 |
|
|
52959 |
+#ifdef ENABLE_META_REFRESH
|
|
52960 |
+/*
|
|
52961 |
+ * Helper function for meta refresh tag.
|
|
52962 |
+ */
|
|
52963 |
+static gboolean Html_tag_meta_refresh(gpointer data)
|
|
52964 |
+{
|
|
52965 |
+ DilloHtmlMetaRefreshData *rdata = (DilloHtmlMetaRefreshData *)data;
|
|
52966 |
+
|
|
52967 |
+ if (!rdata->html_dead) {
|
|
52968 |
+ rdata->lb->meta_refresh = NULL;
|
|
52969 |
+ if ( rdata->url ) {
|
|
52970 |
+ a_Nav_remove_top_url(rdata->lb->dd);
|
|
52971 |
+ a_Nav_push(rdata->lb->dd, rdata->url);
|
|
52972 |
+ }
|
|
52973 |
+ }
|
|
52974 |
+ a_Url_free(rdata->url);
|
|
52975 |
+ g_free(rdata);
|
|
52976 |
+ return FALSE;
|
|
52977 |
+}
|
|
52978 |
+#endif
|
|
52979 |
+
|
|
52980 |
/*
|
|
52981 |
* Handle <META>
|
|
52982 |
* We do not support http-equiv=refresh because it's non standard,
|
|
52983 |
@@ -3309,6 +3890,32 @@ static void Html_tag_close_form(DilloHtm
|
|
52984 |
*/
|
|
52985 |
static void Html_tag_open_meta(DilloHtml *html, char *tag, gint tagsize)
|
|
52986 |
{
|
|
52987 |
+#ifdef ENABLE_META_REFRESH
|
|
52988 |
+ const gchar *attrbuf;
|
|
52989 |
+
|
|
52990 |
+ if (!(html->InFlags & IN_HEAD) && html->linkblock->meta_refresh) {
|
|
52991 |
+ return;
|
|
52992 |
+ }
|
|
52993 |
+ attrbuf = Html_get_attr(html, tag, tagsize, "http-equiv");
|
|
52994 |
+
|
|
52995 |
+ /* Is this a refresh? */
|
|
52996 |
+ if (attrbuf && !g_strcasecmp(attrbuf, "refresh")) {
|
|
52997 |
+ DilloHtmlMetaRefreshData *data;
|
|
52998 |
+ gint delay;
|
|
52999 |
+ gchar *content;
|
|
53000 |
+ #ifdef SEND_HTML_MSG
|
|
53001 |
+ gchar *html_msg, *url;
|
|
53002 |
+ #endif
|
|
53003 |
+
|
|
53004 |
+ /* check for content */
|
|
53005 |
+ if (!(attrbuf = Html_get_attr(html, tag, tagsize, "content")))
|
|
53006 |
+ return;
|
|
53007 |
+
|
|
53008 |
+ /* check for delay */
|
|
53009 |
+ delay = strtol(attrbuf, &content, 0);
|
|
53010 |
+#else
|
|
53011 |
+ const gchar *equiv, *content;
|
|
53012 |
+ #ifdef SEND_HTML_MSG
|
|
53013 |
const gchar *meta_template =
|
|
53014 |
"<table width='100%%'><tr><td bgcolor='#ee0000'>Warning:</td>\n"
|
|
53015 |
" <td bgcolor='#8899aa' width='100%%'>\n"
|
|
53016 |
@@ -3317,13 +3924,14 @@ static void Html_tag_open_meta(DilloHtml
|
|
53017 |
" <tr><td bgcolor='#a0a0a0' colspan='2'>The author wanted you to go\n"
|
|
53018 |
" <a href='%s'>here</a>%s</td></tr></table><br>\n";
|
|
53019 |
|
|
53020 |
- const gchar *equiv, *content;
|
|
53021 |
- gchar *html_msg, delay_str[64];
|
|
53022 |
+ gchar *html_msg;
|
|
53023 |
+ #endif
|
|
53024 |
+ gchar delay_str[64];
|
|
53025 |
gint delay;
|
|
53026 |
|
|
53027 |
/* only valid inside HEAD */
|
|
53028 |
if (!(html->InFlags & IN_HEAD)) {
|
|
53029 |
- MSG_HTML("META elements must be inside the HEAD section\n");
|
|
53030 |
+ MSG_HTML(_("META elements must be inside the HEAD section\n"));
|
|
53031 |
return;
|
|
53032 |
}
|
|
53033 |
|
|
53034 |
@@ -3337,13 +3945,49 @@ static void Html_tag_open_meta(DilloHtml
|
|
53035 |
delay, (delay > 1) ? "s" : "");
|
|
53036 |
else
|
|
53037 |
sprintf(delay_str, ".");
|
|
53038 |
-
|
|
53039 |
+#endif
|
|
53040 |
/* Skip to anything after "URL=" */
|
|
53041 |
while (*content && *(content++) != '=');
|
|
53042 |
-
|
|
53043 |
+#ifdef ENABLE_META_REFRESH
|
|
53044 |
+ data = g_new(DilloHtmlMetaRefreshData, 1);
|
|
53045 |
+ data->lb = html->linkblock;
|
|
53046 |
+ data->html_dead = 0;
|
|
53047 |
+
|
|
53048 |
+ if (data->lb->meta_refresh) {
|
|
53049 |
+ *data->lb->meta_refresh = 1;
|
|
53050 |
+ }
|
|
53051 |
+
|
|
53052 |
+ data->lb->meta_refresh = &data->html_dead;
|
|
53053 |
+ data->url = Html_url_new(html, *content ? content :
|
|
53054 |
+ URL_STR(a_History_get_url(NAV_TOP(data->lb->dd))),
|
|
53055 |
+ NULL, 0, 0, 0, 0);
|
|
53056 |
+ a_Url_set_flags(data->url, URL_FLAGS(data->url) | URL_E2EReload);
|
|
53057 |
+
|
|
53058 |
+ if (!*content && delay < 7) /* don't refresh itself to often... */
|
|
53059 |
+ delay = 7;
|
|
53060 |
+
|
|
53061 |
+ /* Add a timeout which will load the new location */
|
|
53062 |
+ g_timeout_add(delay ? delay * 1000 : 300, Html_tag_meta_refresh,
|
|
53063 |
+ (gpointer)data);
|
|
53064 |
+ #ifdef SEND_HTML_MSG
|
|
53065 |
+ url = URL_STR( data->url );
|
|
53066 |
+ html_msg = g_strdup_printf(
|
|
53067 |
+ "<p><font color=\"red\">META REFRESH (%d sec): "
|
|
53068 |
+ "<a href=\"%s\">%s</a></p>",
|
|
53069 |
+ delay, url, url);
|
|
53070 |
+ #endif
|
|
53071 |
+#else
|
|
53072 |
+ #ifdef SEND_HTML_MSG
|
|
53073 |
/* Send a custom HTML message
|
|
53074 |
* todo: this is a hairy hack, It'd be much better to build a widget. */
|
|
53075 |
html_msg = g_strdup_printf(meta_template, content, delay_str);
|
|
53076 |
+ #endif
|
|
53077 |
+#endif
|
|
53078 |
+ MSG_HTML(_("The NON-STANDARD meta refresh tag."
|
|
53079 |
+ " The HTML 4.01 SPEC (sec 7.4.4) recommends explicitly to avoid it."
|
|
53080 |
+ " The author wanted you to go <%s>\n"), content);
|
|
53081 |
+
|
|
53082 |
+ #ifdef SEND_HTML_MSG
|
|
53083 |
{
|
|
53084 |
DilloHtmlProcessingState SaveFlags = html->InFlags;
|
|
53085 |
html->InFlags = IN_BODY;
|
|
53086 |
@@ -3353,6 +3997,7 @@ static void Html_tag_open_meta(DilloHtml
|
|
53087 |
html->InFlags = SaveFlags;
|
|
53088 |
}
|
|
53089 |
g_free(html_msg);
|
|
53090 |
+ #endif
|
|
53091 |
}
|
|
53092 |
}
|
|
53093 |
|
|
53094 |
@@ -3381,7 +4026,7 @@ static void Html_reset_input(DilloHtmlIn
|
|
53095 |
switch (input->type) {
|
|
53096 |
case DILLO_HTML_INPUT_TEXT:
|
|
53097 |
case DILLO_HTML_INPUT_PASSWORD:
|
|
53098 |
- gtk_entry_set_text(GTK_ENTRY(input->widget), input->init_str);
|
|
53099 |
+ a_I18n_gtk_entry_set_text(GTK_ENTRY(input->widget), input->init_str);
|
|
53100 |
break;
|
|
53101 |
case DILLO_HTML_INPUT_CHECKBOX:
|
|
53102 |
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(input->widget),
|
|
53103 |
@@ -3425,8 +4070,10 @@ static void Html_reset_input(DilloHtmlIn
|
|
53104 |
if (input->init_str != NULL) {
|
|
53105 |
int pos = 0;
|
|
53106 |
gtk_editable_delete_text(GTK_EDITABLE(input->widget), 0, -1);
|
|
53107 |
- gtk_editable_insert_text(GTK_EDITABLE(input->widget), input->init_str,
|
|
53108 |
- strlen(input->init_str), &pos);
|
|
53109 |
+ a_I18n_gtk_editable_insert_text(GTK_EDITABLE(input->widget),
|
|
53110 |
+ input->init_str,
|
|
53111 |
+ strlen(input->init_str),
|
|
53112 |
+ &pos);
|
|
53113 |
}
|
|
53114 |
break;
|
|
53115 |
default:
|
|
53116 |
@@ -3522,17 +4169,34 @@ static void Html_urlencode_append(GStrin
|
|
53117 |
g_free(enc_val);
|
|
53118 |
}
|
|
53119 |
|
|
53120 |
-/*
|
|
53121 |
+/*
|
|
53122 |
* Append a name-value pair to an existing url.
|
|
53123 |
* (name and value are urlencoded before appending them)
|
|
53124 |
+ * This also translates the value to the server character encoding or
|
|
53125 |
+ * Accept_charset, if necessary.
|
|
53126 |
*/
|
|
53127 |
-static void
|
|
53128 |
- Html_append_input(GString *url, const char *name, const char *value)
|
|
53129 |
+static void Html_append_input(DilloHtmlLB *lb, GString *url,
|
|
53130 |
+ const char *name, char *value, GtkWidget *submit)
|
|
53131 |
{
|
|
53132 |
- if (name != NULL) {
|
|
53133 |
+ if(name != NULL) {
|
|
53134 |
Html_urlencode_append(url, name);
|
|
53135 |
g_string_append_c(url, '=');
|
|
53136 |
- Html_urlencode_append(url, value);
|
|
53137 |
+ if (value != NULL) {
|
|
53138 |
+ int form_index;
|
|
53139 |
+ char *charset, *convValue;
|
|
53140 |
+ /* Search the form that generated the submit event */
|
|
53141 |
+ if ((form_index = Html_find_form(submit, lb)) == -1 ) {
|
|
53142 |
+ charset = lb->charset;
|
|
53143 |
+ } else {
|
|
53144 |
+ DilloHtmlForm *form = &lb->forms[form_index];
|
|
53145 |
+ charset = (form->charset)? form->charset : lb->charset;
|
|
53146 |
+ }
|
|
53147 |
+ convValue = a_I18n_convert(DILLO_CHARSET,
|
|
53148 |
+ charset, value, -1);
|
|
53149 |
+ _MSG("append charset%s\n", charset);
|
|
53150 |
+ Html_urlencode_append(url, convValue);
|
|
53151 |
+ g_free(convValue);
|
|
53152 |
+ }
|
|
53153 |
g_string_append_c(url, '&');
|
|
53154 |
}
|
|
53155 |
}
|
|
53156 |
@@ -3566,6 +4230,9 @@ static void Html_submit_form(GtkWidget *
|
|
53157 |
DilloHtmlInput *input;
|
|
53158 |
DilloUrl *new_url;
|
|
53159 |
gchar *url_str, *action_str, *p, *text;
|
|
53160 |
+ DilloDoc *name_dd;
|
|
53161 |
+
|
|
53162 |
+ name_dd = NULL;
|
|
53163 |
|
|
53164 |
/* Search the form that generated the submit event */
|
|
53165 |
if ( (i = Html_find_form(submit, html_lb)) == -1 )
|
|
53166 |
@@ -3579,29 +4246,33 @@ static void Html_submit_form(GtkWidget *
|
|
53167 |
DEBUG_MSG(3,"Html_submit_form form->action=%s\n",URL_STR_(form->action));
|
|
53168 |
|
|
53169 |
for (input_index = 0; input_index < form->num_inputs; input_index++) {
|
|
53170 |
+ gchar *enc_buf;
|
|
53171 |
input = &(form->inputs[input_index]);
|
|
53172 |
switch (input->type) {
|
|
53173 |
case DILLO_HTML_INPUT_TEXT:
|
|
53174 |
case DILLO_HTML_INPUT_PASSWORD:
|
|
53175 |
- Html_append_input(DataStr, input->name,
|
|
53176 |
- gtk_entry_get_text(GTK_ENTRY(input->widget)));
|
|
53177 |
+ enc_buf = a_I18n_gtk_entry_get_text(GTK_ENTRY(input->widget));
|
|
53178 |
+ Html_append_input(html_lb, DataStr, input->name, enc_buf, submit);
|
|
53179 |
+ g_free(enc_buf);
|
|
53180 |
break;
|
|
53181 |
case DILLO_HTML_INPUT_CHECKBOX:
|
|
53182 |
case DILLO_HTML_INPUT_RADIO:
|
|
53183 |
if (GTK_TOGGLE_BUTTON(input->widget)->active &&
|
|
53184 |
input->name != NULL && input->init_str != NULL) {
|
|
53185 |
- Html_append_input(DataStr, input->name, input->init_str);
|
|
53186 |
+ Html_append_input(html_lb, DataStr, input->name,
|
|
53187 |
+ input->init_str, submit);
|
|
53188 |
}
|
|
53189 |
break;
|
|
53190 |
case DILLO_HTML_INPUT_HIDDEN:
|
|
53191 |
- Html_append_input(DataStr, input->name, input->init_str);
|
|
53192 |
+ Html_append_input(html_lb, DataStr, input->name,
|
|
53193 |
+ input->init_str, submit);
|
|
53194 |
break;
|
|
53195 |
case DILLO_HTML_INPUT_SELECT:
|
|
53196 |
for (i = 0; i < input->select->num_options; i++) {
|
|
53197 |
if (GTK_CHECK_MENU_ITEM(input->select->options[i].menuitem)->
|
|
53198 |
active) {
|
|
53199 |
- Html_append_input(DataStr, input->name,
|
|
53200 |
- input->select->options[i].value);
|
|
53201 |
+ Html_append_input(html_lb, DataStr, input->name,
|
|
53202 |
+ input->select->options[i].value, submit);
|
|
53203 |
break;
|
|
53204 |
}
|
|
53205 |
}
|
|
53206 |
@@ -3610,23 +4281,26 @@ static void Html_submit_form(GtkWidget *
|
|
53207 |
for (i = 0; i < input->select->num_options; i++) {
|
|
53208 |
if (input->select->options[i].menuitem->state ==
|
|
53209 |
GTK_STATE_SELECTED) {
|
|
53210 |
- Html_append_input(DataStr, input->name,
|
|
53211 |
- input->select->options[i].value);
|
|
53212 |
+ Html_append_input(html_lb, DataStr, input->name,
|
|
53213 |
+ input->select->options[i].value, submit);
|
|
53214 |
}
|
|
53215 |
}
|
|
53216 |
break;
|
|
53217 |
case DILLO_HTML_INPUT_TEXTAREA:
|
|
53218 |
- text = gtk_editable_get_chars(GTK_EDITABLE (input->widget),0,-1);
|
|
53219 |
- Html_append_input(DataStr, input->name, text);
|
|
53220 |
+ text = a_I18n_gtk_editable_get_chars(GTK_EDITABLE (input->widget),
|
|
53221 |
+ 0,-1);
|
|
53222 |
+ Html_append_input(html_lb, DataStr, input->name, text, submit);
|
|
53223 |
g_free(text);
|
|
53224 |
break;
|
|
53225 |
case DILLO_HTML_INPUT_INDEX:
|
|
53226 |
- Html_urlencode_append(DataStr,
|
|
53227 |
- gtk_entry_get_text(GTK_ENTRY(input->widget)));
|
|
53228 |
+ enc_buf = a_I18n_gtk_entry_get_text(GTK_ENTRY(input->widget));
|
|
53229 |
+ Html_urlencode_append(DataStr, enc_buf);
|
|
53230 |
+ g_free(enc_buf);
|
|
53231 |
break;
|
|
53232 |
case DILLO_HTML_INPUT_IMAGE:
|
|
53233 |
if (input->widget == submit) {
|
|
53234 |
- Html_append_input(DataStr, input->name, input->init_str);
|
|
53235 |
+ Html_append_input(html_lb, DataStr, input->name,
|
|
53236 |
+ input->init_str, submit);
|
|
53237 |
Html_append_clickpos(DataStr, input->name, click_x, click_y);
|
|
53238 |
}
|
|
53239 |
break;
|
|
53240 |
@@ -3634,7 +4308,8 @@ static void Html_submit_form(GtkWidget *
|
|
53241 |
case DILLO_HTML_INPUT_BUTTON_SUBMIT:
|
|
53242 |
/* Only the button that triggered the submit. */
|
|
53243 |
if (input->widget == submit && form->num_submit_buttons > 0)
|
|
53244 |
- Html_append_input(DataStr, input->name, input->init_str);
|
|
53245 |
+ Html_append_input(html_lb, DataStr, input->name,
|
|
53246 |
+ input->init_str, submit);
|
|
53247 |
break;
|
|
53248 |
default:
|
|
53249 |
break;
|
|
53250 |
@@ -3664,16 +4339,25 @@ static void Html_submit_form(GtkWidget *
|
|
53251 |
g_free(url_str);
|
|
53252 |
}
|
|
53253 |
|
|
53254 |
- a_Nav_push(html_lb->bw, new_url);
|
|
53255 |
+ a_Url_set_referer(new_url, html_lb->base_url);
|
|
53256 |
+ if (URL_TARGET_(form->action)) {
|
|
53257 |
+ a_Url_set_target(new_url, (gchar *) URL_TARGET_(form->action));
|
|
53258 |
+ name_dd = a_Doc_get_by_name(html_lb->dd, (gchar *) URL_TARGET_(new_url));
|
|
53259 |
+ }
|
|
53260 |
+
|
|
53261 |
+ if (name_dd)
|
|
53262 |
+ a_Nav_push(name_dd, new_url);
|
|
53263 |
+ else
|
|
53264 |
+ a_Nav_push(html_lb->dd, new_url);
|
|
53265 |
g_free(action_str);
|
|
53266 |
g_string_free(DataStr, TRUE);
|
|
53267 |
a_Url_free(new_url);
|
|
53268 |
} else {
|
|
53269 |
- MSG("Html_submit_form: Method unknown\n");
|
|
53270 |
+ MSG(_("Html_submit_form: Method unknown\n"));
|
|
53271 |
}
|
|
53272 |
|
|
53273 |
/* now, make the rendered area have its focus back */
|
|
53274 |
- gtk_widget_grab_focus(GTK_BIN(html_lb->bw->docwin)->child);
|
|
53275 |
+ gtk_widget_grab_focus(GTK_BIN(html_lb->dd->docwin)->child);
|
|
53276 |
}
|
|
53277 |
|
|
53278 |
|
|
53279 |
@@ -3719,7 +4403,15 @@ static DwWidget *Html_input_image(DilloH
|
|
53280 |
const char *attrbuf;
|
|
53281 |
|
|
53282 |
if ((attrbuf = Html_get_attr(html, tag, tagsize, "src")) &&
|
|
53283 |
- (url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0))) {
|
|
53284 |
+ (url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0))) {
|
|
53285 |
+
|
|
53286 |
+ /* block ads */
|
|
53287 |
+ if(a_Adblock_isblocked(url))
|
|
53288 |
+ {
|
|
53289 |
+ a_Url_free(url);
|
|
53290 |
+ return NULL;
|
|
53291 |
+ }
|
|
53292 |
+
|
|
53293 |
button = a_Dw_button_new (0, FALSE);
|
|
53294 |
a_Dw_page_add_widget (DW_PAGE (html->dw), button,
|
|
53295 |
html->stack[html->stack_top].style);
|
|
53296 |
@@ -3743,7 +4435,7 @@ static DwWidget *Html_input_image(DilloH
|
|
53297 |
}
|
|
53298 |
}
|
|
53299 |
|
|
53300 |
- DEBUG_MSG(10, "Html_input_image: unable to create image submit.\n");
|
|
53301 |
+ DEBUG_MSG(10, _("Html_input_image: unable to create image submit.\n"));
|
|
53302 |
a_Url_free(url);
|
|
53303 |
return NULL;
|
|
53304 |
}
|
|
53305 |
@@ -3765,7 +4457,7 @@ static void Html_tag_open_input(DilloHtm
|
|
53306 |
gint input_index;
|
|
53307 |
|
|
53308 |
if (!(html->InFlags & IN_FORM)) {
|
|
53309 |
- MSG_HTML("input camp outside <form>\n");
|
|
53310 |
+ MSG_HTML(_("input camp outside <form>\n"));
|
|
53311 |
return;
|
|
53312 |
}
|
|
53313 |
|
|
53314 |
@@ -3782,8 +4474,9 @@ static void Html_tag_open_input(DilloHtm
|
|
53315 |
inp_type = DILLO_HTML_INPUT_PASSWORD;
|
|
53316 |
widget = gtk_entry_new();
|
|
53317 |
gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE);
|
|
53318 |
- if (value)
|
|
53319 |
- init_str = g_strdup(Html_get_attr(html, tag, tagsize, "value"));
|
|
53320 |
+ if (value) {
|
|
53321 |
+ init_str = value;//g_strdup(Html_get_attr(html, tag, tagsize, "value"));
|
|
53322 |
+ }
|
|
53323 |
} else if (!g_strcasecmp(type, "checkbox")) {
|
|
53324 |
inp_type = DILLO_HTML_INPUT_CHECKBOX;
|
|
53325 |
widget = gtk_check_button_new();
|
|
53326 |
@@ -3808,19 +4501,51 @@ static void Html_tag_open_input(DilloHtm
|
|
53327 |
init_str = (value) ? value : NULL;
|
|
53328 |
} else if (!g_strcasecmp(type, "hidden")) {
|
|
53329 |
inp_type = DILLO_HTML_INPUT_HIDDEN;
|
|
53330 |
- if (value)
|
|
53331 |
- init_str = g_strdup(Html_get_attr(html, tag, tagsize, "value"));
|
|
53332 |
+ if (value) {
|
|
53333 |
+ /* adhock fix: keep \n */
|
|
53334 |
+ int i;
|
|
53335 |
+ gboolean found_value;
|
|
53336 |
+ gchar *buf1, *buf2, *bufu;
|
|
53337 |
+ gchar delimiter[3] = " >";
|
|
53338 |
+
|
|
53339 |
+ buf1 = g_strndup(tag, tagsize);
|
|
53340 |
+ bufu = g_strndup(tag, tagsize);
|
|
53341 |
+ g_strup(bufu);
|
|
53342 |
+ found_value = (strstr(bufu, "VALUE=") != NULL);
|
|
53343 |
+ buf2 = buf1 + (strstr(bufu, "VALUE=") - bufu + 6);
|
|
53344 |
+ g_free(bufu);
|
|
53345 |
+ if (found_value) {
|
|
53346 |
+ GString *buf3;
|
|
53347 |
+ delimiter[0] = (buf2[0] == '"' || buf2[0] == '\'') ? buf2[0] : ' ';
|
|
53348 |
+ if (delimiter[0] != ' ') buf2++;
|
|
53349 |
+ if (strpbrk(buf2, delimiter)) strpbrk(buf2, delimiter)[0] = '\0';
|
|
53350 |
+ buf3 = g_string_new(buf2);
|
|
53351 |
+ for (i = 0; i < buf3->len; ++i) {
|
|
53352 |
+ if (buf3->str[i] == '\r') {
|
|
53353 |
+ if (buf3->str[i + 1] == '\n')
|
|
53354 |
+ g_string_erase(buf3, i, 1);
|
|
53355 |
+ else
|
|
53356 |
+ buf3->str[i] = '\n';
|
|
53357 |
+ }
|
|
53358 |
+ }
|
|
53359 |
+ init_str = buf3->str;
|
|
53360 |
+ g_string_free(buf3, FALSE);
|
|
53361 |
+ } else {
|
|
53362 |
+ init_str = g_strdup(Html_get_attr(html, tag, tagsize, "value"));
|
|
53363 |
+ }
|
|
53364 |
+ g_free(buf1);
|
|
53365 |
+ }
|
|
53366 |
} else if (!g_strcasecmp(type, "submit")) {
|
|
53367 |
inp_type = DILLO_HTML_INPUT_SUBMIT;
|
|
53368 |
- init_str = (value) ? value : g_strdup("submit");
|
|
53369 |
- widget = gtk_button_new_with_label(init_str);
|
|
53370 |
+ init_str = (value) ? value : g_strdup(_("submit"));
|
|
53371 |
+ widget = a_I18n_gtk_button_new_with_label(init_str);
|
|
53372 |
gtk_widget_set_sensitive(widget, FALSE); /* Until end of FORM! */
|
|
53373 |
gtk_signal_connect(GTK_OBJECT(widget), "clicked",
|
|
53374 |
GTK_SIGNAL_FUNC(Html_submit_form), html_lb);
|
|
53375 |
} else if (!g_strcasecmp(type, "reset")) {
|
|
53376 |
inp_type = DILLO_HTML_INPUT_RESET;
|
|
53377 |
- init_str = (value) ? value : g_strdup("Reset");
|
|
53378 |
- widget = gtk_button_new_with_label(init_str);
|
|
53379 |
+ init_str = (value) ? value : g_strdup(_("Reset"));
|
|
53380 |
+ widget = a_I18n_gtk_button_new_with_label(init_str);
|
|
53381 |
gtk_widget_set_sensitive(widget, FALSE); /* Until end of FORM! */
|
|
53382 |
gtk_signal_connect(GTK_OBJECT(widget), "clicked",
|
|
53383 |
GTK_SIGNAL_FUNC(Html_reset_form), html_lb);
|
|
53384 |
@@ -3829,9 +4554,9 @@ static void Html_tag_open_input(DilloHtm
|
|
53385 |
/* Don't request the image, make a text submit button instead */
|
|
53386 |
inp_type = DILLO_HTML_INPUT_SUBMIT;
|
|
53387 |
attrbuf = Html_get_attr(html, tag, tagsize, "alt");
|
|
53388 |
- label = attrbuf ? attrbuf : value ? value : name ? name : "Submit";
|
|
53389 |
+ label = attrbuf ? attrbuf : value ? value : name ? name : _("Submit");
|
|
53390 |
init_str = g_strdup(label);
|
|
53391 |
- widget = gtk_button_new_with_label(init_str);
|
|
53392 |
+ widget = a_I18n_gtk_button_new_with_label(init_str);
|
|
53393 |
gtk_widget_set_sensitive(widget, FALSE); /* Until end of FORM! */
|
|
53394 |
gtk_signal_connect(GTK_OBJECT(widget), "clicked",
|
|
53395 |
GTK_SIGNAL_FUNC(Html_submit_form), html_lb);
|
|
53396 |
@@ -3846,12 +4571,12 @@ static void Html_tag_open_input(DilloHtm
|
|
53397 |
/* todo: implement it! */
|
|
53398 |
inp_type = DILLO_HTML_INPUT_FILE;
|
|
53399 |
init_str = (value) ? value : NULL;
|
|
53400 |
- MSG("An input of the type \"file\" wasn't rendered!\n");
|
|
53401 |
+ MSG(_("An input of the type \"file\" wasn't rendered!\n"));
|
|
53402 |
} else if (!g_strcasecmp(type, "button")) {
|
|
53403 |
inp_type = DILLO_HTML_INPUT_BUTTON;
|
|
53404 |
if (value) {
|
|
53405 |
init_str = value;
|
|
53406 |
- widget = gtk_button_new_with_label(init_str);
|
|
53407 |
+ widget = a_I18n_gtk_button_new_with_label(init_str);
|
|
53408 |
}
|
|
53409 |
} else {
|
|
53410 |
/* Text input, which also is the default */
|
|
53411 |
@@ -3930,7 +4655,7 @@ static void Html_tag_open_isindex(DilloH
|
|
53412 |
action = a_Url_dup(html->linkblock->base_url);
|
|
53413 |
|
|
53414 |
Html_form_new(html->linkblock, DILLO_HTML_METHOD_GET, action,
|
|
53415 |
- DILLO_HTML_ENC_URLENCODING);
|
|
53416 |
+ NULL);
|
|
53417 |
|
|
53418 |
form = &(html_lb->forms[html_lb->num_forms - 1]);
|
|
53419 |
|
|
53420 |
@@ -3978,7 +4703,7 @@ static void Html_tag_close_textarea(Dill
|
|
53421 |
html->Stash = g_string_erase(html->Stash, 0, 1);
|
|
53422 |
if (html->Stash->str[0] == '\n')
|
|
53423 |
html->Stash = g_string_erase(html->Stash, 0, 1);
|
|
53424 |
-
|
|
53425 |
+
|
|
53426 |
/* As the spec recommends to canonicalize line endings, it is safe
|
|
53427 |
* to replace '\r' with '\n'. It will be canonicalized anyway! */
|
|
53428 |
for (i = 0; i < html->Stash->len; ++i) {
|
|
53429 |
@@ -3989,15 +4714,15 @@ static void Html_tag_close_textarea(Dill
|
|
53430 |
html->Stash->str[i] = '\n';
|
|
53431 |
}
|
|
53432 |
}
|
|
53433 |
-
|
|
53434 |
+
|
|
53435 |
/* The HTML3.2 spec says it can have "text and character entities". */
|
|
53436 |
str = Html_parse_entities(html, html->Stash->str, html->Stash->len);
|
|
53437 |
-
|
|
53438 |
+
|
|
53439 |
form = &(html_lb->forms[html_lb->num_forms - 1]);
|
|
53440 |
form->inputs[form->num_inputs - 1].init_str = str;
|
|
53441 |
- gtk_text_insert(GTK_TEXT(form->inputs[form->num_inputs - 1].widget),
|
|
53442 |
+ a_I18n_gtk_text_insert(GTK_TEXT(form->inputs[form->num_inputs - 1].widget),
|
|
53443 |
NULL, NULL, NULL, str, -1);
|
|
53444 |
-
|
|
53445 |
+
|
|
53446 |
html->InFlags &= ~IN_TEXTAREA;
|
|
53447 |
}
|
|
53448 |
Html_pop_tag(html, TagIdx);
|
|
53449 |
@@ -4020,12 +4745,12 @@ static void Html_tag_open_textarea(Dillo
|
|
53450 |
|
|
53451 |
/* We can't push a new <FORM> because the 'action' URL is unknown */
|
|
53452 |
if (!(html->InFlags & IN_FORM)) {
|
|
53453 |
- MSG_HTML("<textarea> outside <form>\n");
|
|
53454 |
+ MSG_HTML(_("<textarea> outside <form>\n"));
|
|
53455 |
html->ReqTagClose = TRUE;
|
|
53456 |
return;
|
|
53457 |
}
|
|
53458 |
if (html->InFlags & IN_TEXTAREA) {
|
|
53459 |
- MSG_HTML("nested <textarea>\n");
|
|
53460 |
+ MSG_HTML(_("nested <textarea>\n"));
|
|
53461 |
html->ReqTagClose = TRUE;
|
|
53462 |
return;
|
|
53463 |
}
|
|
53464 |
@@ -4033,6 +4758,7 @@ static void Html_tag_open_textarea(Dillo
|
|
53465 |
html->InFlags |= IN_TEXTAREA;
|
|
53466 |
html_lb = html->linkblock;
|
|
53467 |
form = &(html_lb->forms[html_lb->num_forms - 1]);
|
|
53468 |
+
|
|
53469 |
Html_stash_init(html);
|
|
53470 |
html->stack[html->stack_top].parse_mode = DILLO_HTML_PARSE_MODE_VERBATIM;
|
|
53471 |
|
|
53472 |
@@ -4096,11 +4822,11 @@ static void Html_tag_open_select(DilloHt
|
|
53473 |
gint size, type, multi;
|
|
53474 |
|
|
53475 |
if (!(html->InFlags & IN_FORM)) {
|
|
53476 |
- MSG_HTML("<select> outside <form>\n");
|
|
53477 |
+ MSG_HTML(_("<select> outside <form>\n"));
|
|
53478 |
return;
|
|
53479 |
}
|
|
53480 |
if (html->InFlags & IN_SELECT) {
|
|
53481 |
- MSG_HTML("nested <select>\n");
|
|
53482 |
+ MSG_HTML(_("nested <select>\n"));
|
|
53483 |
return;
|
|
53484 |
}
|
|
53485 |
html->InFlags |= IN_SELECT;
|
|
53486 |
@@ -4153,7 +4879,7 @@ static void Html_option_finish(DilloHtml
|
|
53487 |
GtkWidget *menuitem;
|
|
53488 |
GSList *group;
|
|
53489 |
DilloHtmlSelect *select;
|
|
53490 |
-
|
|
53491 |
+
|
|
53492 |
if (!(html->InFlags & IN_FORM))
|
|
53493 |
return;
|
|
53494 |
|
|
53495 |
@@ -4169,7 +4895,8 @@ static void Html_option_finish(DilloHtml
|
|
53496 |
else
|
|
53497 |
group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM
|
|
53498 |
(select->options[0].menuitem));
|
|
53499 |
- menuitem = gtk_radio_menu_item_new_with_label(group, html->Stash->str);
|
|
53500 |
+ menuitem = a_I18n_gtk_radio_menu_item_new_with_label(group,
|
|
53501 |
+ html->Stash->str);
|
|
53502 |
select->options[select->num_options - 1].menuitem = menuitem;
|
|
53503 |
if ( select->options[select->num_options - 1].value == NULL )
|
|
53504 |
select->options[select->num_options - 1].value =
|
|
53505 |
@@ -4182,7 +4909,7 @@ static void Html_option_finish(DilloHtml
|
|
53506 |
GTK_SIGNAL_FUNC (a_Interface_scroll_popup),
|
|
53507 |
NULL);
|
|
53508 |
} else if ( input->type == DILLO_HTML_INPUT_SEL_LIST ) {
|
|
53509 |
- menuitem = gtk_list_item_new_with_label(html->Stash->str);
|
|
53510 |
+ menuitem = a_I18n_gtk_list_item_new_with_label(html->Stash->str);
|
|
53511 |
select->options[select->num_options - 1].menuitem = menuitem;
|
|
53512 |
if (select->options[select->num_options - 1].value == NULL)
|
|
53513 |
select->options[select->num_options - 1].value =
|
|
53514 |
@@ -4241,14 +4968,14 @@ static void Html_tag_close_select(DilloH
|
|
53515 |
|
|
53516 |
if (html->InFlags & IN_SELECT) {
|
|
53517 |
html->InFlags &= ~IN_SELECT;
|
|
53518 |
-
|
|
53519 |
+
|
|
53520 |
html_lb = html->linkblock;
|
|
53521 |
-
|
|
53522 |
+
|
|
53523 |
form = &(html_lb->forms[html_lb->num_forms - 1]);
|
|
53524 |
input = &(form->inputs[form->num_inputs - 1]);
|
|
53525 |
if (input->type == DILLO_HTML_INPUT_SELECT) {
|
|
53526 |
Html_option_finish(html);
|
|
53527 |
-
|
|
53528 |
+
|
|
53529 |
gtk_option_menu_set_menu(GTK_OPTION_MENU(input->widget),
|
|
53530 |
input->select->menu);
|
|
53531 |
Html_select_set_history(input);
|
|
53532 |
@@ -4256,14 +4983,14 @@ static void Html_tag_close_select(DilloH
|
|
53533 |
/* gtk_option_menu_set_history(GTK_OPTION_MENU(input->widget), 1); */
|
|
53534 |
|
|
53535 |
gtk_widget_show(input->widget);
|
|
53536 |
-
|
|
53537 |
+
|
|
53538 |
embed_gtk = a_Dw_embed_gtk_new ();
|
|
53539 |
a_Dw_embed_gtk_add_gtk (DW_EMBED_GTK (embed_gtk), input->widget);
|
|
53540 |
a_Dw_page_add_widget(DW_PAGE (html->dw), embed_gtk,
|
|
53541 |
html->stack[html->stack_top].style);
|
|
53542 |
} else if (input->type == DILLO_HTML_INPUT_SEL_LIST) {
|
|
53543 |
Html_option_finish(html);
|
|
53544 |
-
|
|
53545 |
+
|
|
53546 |
if (input->select->size < input->select->num_options) {
|
|
53547 |
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
|
|
53548 |
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
|
|
53549 |
@@ -4272,23 +4999,23 @@ static void Html_tag_close_select(DilloH
|
|
53550 |
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW
|
|
53551 |
(scrolledwindow),
|
|
53552 |
input->widget);
|
|
53553 |
-
|
|
53554 |
+
|
|
53555 |
gtk_container_set_focus_vadjustment
|
|
53556 |
(GTK_CONTAINER (input->widget),
|
|
53557 |
gtk_scrolled_window_get_vadjustment
|
|
53558 |
(GTK_SCROLLED_WINDOW(scrolledwindow)));
|
|
53559 |
-
|
|
53560 |
+
|
|
53561 |
/* Calculate the height of the scrolled window */
|
|
53562 |
gtk_widget_size_request(input->select->options[0].menuitem, &req);
|
|
53563 |
height = input->select->size * req.height +
|
|
53564 |
2 * scrolledwindow->style->klass->ythickness;
|
|
53565 |
gtk_widget_set_usize(scrolledwindow, -1, height);
|
|
53566 |
-
|
|
53567 |
+
|
|
53568 |
gtk_widget_show(input->widget);
|
|
53569 |
input->widget = scrolledwindow;
|
|
53570 |
}
|
|
53571 |
gtk_widget_show(input->widget);
|
|
53572 |
-
|
|
53573 |
+
|
|
53574 |
/* note: In this next call, scrolledwindows get a g_warning from
|
|
53575 |
* gdkwindow.c:422. I'm not really going to sweat it now - the
|
|
53576 |
* embedded widget stuff is going to get massively redone anyway. */
|
|
53577 |
@@ -4307,11 +5034,15 @@ static void Html_tag_close_select(DilloH
|
|
53578 |
static void Html_tag_open_base(DilloHtml *html, char *tag, gint tagsize)
|
|
53579 |
{
|
|
53580 |
const char *attrbuf;
|
|
53581 |
+ gchar *attrbuf_enc;
|
|
53582 |
DilloUrl *BaseUrl;
|
|
53583 |
|
|
53584 |
if (html->InFlags & IN_HEAD) {
|
|
53585 |
if ((attrbuf = Html_get_attr(html, tag, tagsize, "href"))) {
|
|
53586 |
- BaseUrl = Html_url_new(html, attrbuf, "", 0, 0, 0, 1);
|
|
53587 |
+ attrbuf_enc = a_I18n_convert(DILLO_CHARSET, html->linkblock->charset,
|
|
53588 |
+ attrbuf, -1);
|
|
53589 |
+ BaseUrl = Html_url_new(html, attrbuf_enc, "", 0, 0, 0, 1);
|
|
53590 |
+ g_free(attrbuf_enc);
|
|
53591 |
if (URL_SCHEME_(BaseUrl)) {
|
|
53592 |
/* Pass the URL_SpamSafe flag to the new base url */
|
|
53593 |
a_Url_set_flags(
|
|
53594 |
@@ -4319,12 +5050,14 @@ static void Html_tag_open_base(DilloHtml
|
|
53595 |
a_Url_free(html->linkblock->base_url);
|
|
53596 |
html->linkblock->base_url = BaseUrl;
|
|
53597 |
} else {
|
|
53598 |
- MSG_HTML("base URI is relative (it MUST be absolute)\n");
|
|
53599 |
+ MSG_HTML(_("base URI is relative (it MUST be absolute)\n"));
|
|
53600 |
a_Url_free(BaseUrl);
|
|
53601 |
}
|
|
53602 |
}
|
|
53603 |
+ if ((attrbuf = Html_get_attr(html, tag, tagsize, "target")))
|
|
53604 |
+ a_Url_set_target(html->linkblock->base_url, attrbuf);
|
|
53605 |
} else {
|
|
53606 |
- MSG_HTML("the BASE element must appear in the HEAD section\n");
|
|
53607 |
+ MSG_HTML(_("the BASE element must appear in the HEAD section\n"));
|
|
53608 |
}
|
|
53609 |
}
|
|
53610 |
|
|
53611 |
@@ -4467,7 +5200,6 @@ static const TagInfo Tags[] = {
|
|
53612 |
{"body", B8(011110),'O',1, Html_tag_open_body, Html_tag_close_body},
|
|
53613 |
{"br", B8(010001),'F',0, Html_tag_open_br, Html_tag_close_default},
|
|
53614 |
{"button", B8(011101),'R',2, Html_tag_open_button, Html_tag_close_default},
|
|
53615 |
- /* caption */
|
|
53616 |
{"center", B8(011110),'R',2, Html_tag_open_center, Html_tag_close_div},
|
|
53617 |
{"cite", B8(010101),'R',2, Html_tag_open_cite, Html_tag_close_default},
|
|
53618 |
{"code", B8(010101),'R',2, Html_tag_open_code, Html_tag_close_default},
|
|
53619 |
@@ -4484,9 +5216,9 @@ static const TagInfo Tags[] = {
|
|
53620 |
{"em", B8(010101),'R',2, Html_tag_open_em, Html_tag_close_default},
|
|
53621 |
/* fieldset */
|
|
53622 |
{"font", B8(010101),'R',2, Html_tag_open_font, Html_tag_close_default},
|
|
53623 |
- {"form", B8(011110),'R',2, Html_tag_open_form, Html_tag_close_form},
|
|
53624 |
- {"frame", B8(010010),'F',0, Html_tag_open_frame, Html_tag_close_default},
|
|
53625 |
- {"frameset", B8(011110),'R',2,Html_tag_open_frameset, Html_tag_close_default},
|
|
53626 |
+ {"form", B8(011110),'R',5, Html_tag_open_form, Html_tag_close_form},
|
|
53627 |
+ {"frame", B8(000010),'F',0, Html_tag_open_frame, Html_tag_close_default},
|
|
53628 |
+ {"frameset", B8(001110),'R',2,Html_tag_open_frameset, Html_tag_close_default},
|
|
53629 |
{"h1", B8(010110),'R',2, Html_tag_open_h, Html_tag_close_h},
|
|
53630 |
{"h2", B8(010110),'R',2, Html_tag_open_h, Html_tag_close_h},
|
|
53631 |
{"h3", B8(010110),'R',2, Html_tag_open_h, Html_tag_close_h},
|
|
53632 |
@@ -4497,7 +5229,7 @@ static const TagInfo Tags[] = {
|
|
53633 |
{"hr", B8(010010),'F',0, Html_tag_open_hr, Html_tag_close_default},
|
|
53634 |
{"html", B8(001110),'O',1, Html_tag_open_html, Html_tag_close_html},
|
|
53635 |
{"i", B8(010101),'R',2, Html_tag_open_i, Html_tag_close_default},
|
|
53636 |
- {"iframe", B8(011110),'R',2, Html_tag_open_frame, Html_tag_close_default},
|
|
53637 |
+ {"iframe", B8(011110),'R',2, Html_tag_open_iframe, Html_tag_close_default},
|
|
53638 |
{"img", B8(010001),'F',0, Html_tag_open_img, Html_tag_close_default},
|
|
53639 |
{"input", B8(010001),'F',0, Html_tag_open_input, Html_tag_close_default},
|
|
53640 |
/* ins */
|
|
53641 |
@@ -4511,7 +5243,8 @@ static const TagInfo Tags[] = {
|
|
53642 |
/* menu 1010 -- todo: not exactly 1010, it can contain LI and inline */
|
|
53643 |
{"menu", B8(011010),'R',2, Html_tag_open_menu, Html_tag_close_par},
|
|
53644 |
{"meta", B8(100001),'F',0, Html_tag_open_meta, Html_tag_close_default},
|
|
53645 |
- /* noframes 1011 */
|
|
53646 |
+ {"noframe", B8(001011),'R',2, Html_tag_open_noframe, Html_tag_close_default}, /* Illegal tag */
|
|
53647 |
+ {"noframes", B8(001011),'R',2, Html_tag_open_noframes, Html_tag_close_default},
|
|
53648 |
/* noscript 1011 */
|
|
53649 |
/* object 11xxxx */
|
|
53650 |
{"ol", B8(011010),'R',2, Html_tag_open_ol, Html_tag_close_par},
|
|
53651 |
@@ -4675,7 +5408,7 @@ static void Html_stack_cleanup_at_open(D
|
|
53652 |
|
|
53653 |
/* we have an inline (or empty) container... */
|
|
53654 |
if (Tags[oldtag_idx].EndTag == 'R') {
|
|
53655 |
- MSG_HTML("<%s> is not allowed to contain <%s>. -- closing <%s>\n",
|
|
53656 |
+ MSG_HTML(_("<%1$s> is not allowed to contain <%2$s>. -- closing <%3$s>\n"),
|
|
53657 |
Tags[oldtag_idx].name, Tags[new_idx].name,
|
|
53658 |
Tags[oldtag_idx].name);
|
|
53659 |
}
|
|
53660 |
@@ -4684,7 +5417,6 @@ static void Html_stack_cleanup_at_open(D
|
|
53661 |
if ((html->InFlags & IN_PRE) &&
|
|
53662 |
strcmp(Tags[new_idx].name, "hr") == 0)
|
|
53663 |
break;
|
|
53664 |
-
|
|
53665 |
/* This call closes the top tag only. */
|
|
53666 |
Html_tag_cleanup_at_close(html, oldtag_idx);
|
|
53667 |
}
|
|
53668 |
@@ -4700,7 +5432,7 @@ static void Html_test_section(DilloHtml
|
|
53669 |
gint tag_idx;
|
|
53670 |
|
|
53671 |
if (!(html->InFlags & IN_HTML) && html->DocType == DT_NONE)
|
|
53672 |
- MSG_HTML("the required DOCTYPE declaration is missing (or invalid)\n");
|
|
53673 |
+ MSG_HTML(_("the required DOCTYPE declaration is missing (or invalid)\n"));
|
|
53674 |
|
|
53675 |
if (!(html->InFlags & IN_HTML)) {
|
|
53676 |
tag = "<html>";
|
|
53677 |
@@ -4791,7 +5523,7 @@ static void Html_process_tag(DilloHtml *
|
|
53678 |
/* todo: this is only raising a warning, take some defined action.
|
|
53679 |
* Note: apache uses IMG inside PRE (we could use its "alt"). */
|
|
53680 |
if ((html->InFlags & IN_PRE) && Html_tag_pre_excludes(ni))
|
|
53681 |
- MSG_HTML("<pre> is not allowed to contain <%s>\n", Tags[ni].name);
|
|
53682 |
+ MSG_HTML(_("<pre> is not allowed to contain <%s>\n"), Tags[ni].name);
|
|
53683 |
|
|
53684 |
/* Push the tag into the stack */
|
|
53685 |
Html_push_tag(html, ni);
|
|
53686 |
@@ -4813,7 +5545,7 @@ static void Html_process_tag(DilloHtml *
|
|
53687 |
/* We compare the "id" value with the url-decoded "name" value */
|
|
53688 |
if (!html->NameVal || strcmp(html->NameVal, attrbuf)) {
|
|
53689 |
if (html->NameVal)
|
|
53690 |
- MSG_HTML("'id' and 'name' attribute of <a> tag differ\n");
|
|
53691 |
+ MSG_HTML(_("'id' and 'name' attribute of <a> tag differ\n"));
|
|
53692 |
Html_add_anchor(html, attrbuf);
|
|
53693 |
}
|
|
53694 |
}
|
|
53695 |
@@ -4869,6 +5601,7 @@ static const char *Html_get_attr2(DilloH
|
|
53696 |
DilloHtmlTagParsingFlags flags)
|
|
53697 |
{
|
|
53698 |
gint i, isocode, entsize, Found = 0, delimiter = 0, attr_pos = 0;
|
|
53699 |
+ gchar *subst;
|
|
53700 |
GString *Buf = html->attr_data;
|
|
53701 |
DilloHtmlTagParsingState state = SEEK_ATTR_START;
|
|
53702 |
|
|
53703 |
@@ -4922,7 +5655,9 @@ static const char *Html_get_attr2(DilloH
|
|
53704 |
} else if (tag[i] == '&' && (flags & HTML_ParseEntities)) {
|
|
53705 |
if ((isocode = Html_parse_entity(html, tag+i,
|
|
53706 |
tagsize-i, &entsize)) >= 0) {
|
|
53707 |
- g_string_append_c(Buf, (gchar) isocode);
|
|
53708 |
+ subst = Html_ucs2utf8(html, isocode);
|
|
53709 |
+ g_string_append(Buf, subst);
|
|
53710 |
+ g_free(subst);
|
|
53711 |
i += entsize-1;
|
|
53712 |
} else {
|
|
53713 |
g_string_append_c(Buf, tag[i]);
|
|
53714 |
@@ -4996,7 +5731,12 @@ static void Html_add_widget(DilloHtml *h
|
|
53715 |
Html_parse_length (html, width_str) : DW_STYLE_LENGTH_AUTO;
|
|
53716 |
new_style_attrs.height = height_str ?
|
|
53717 |
Html_parse_length (html, height_str) : DW_STYLE_LENGTH_AUTO;
|
|
53718 |
- style = a_Dw_style_new (&new_style_attrs, (html)->bw->main_window->window);
|
|
53719 |
+ if ((gulong)new_style_attrs.width*new_style_attrs.height
|
|
53720 |
+ > (gulong)(G_MAXLONG >> 1)) {
|
|
53721 |
+ new_style_attrs.width = DW_STYLE_LENGTH_AUTO;
|
|
53722 |
+ new_style_attrs.height = DW_STYLE_LENGTH_AUTO;
|
|
53723 |
+ }
|
|
53724 |
+ style = a_Dw_style_new (&new_style_attrs, (html)->dd->bw->main_window->window);
|
|
53725 |
a_Dw_page_add_widget(DW_PAGE (html->dw), widget, style);
|
|
53726 |
a_Dw_style_unref (style);
|
|
53727 |
}
|
|
53728 |
@@ -5030,6 +5770,11 @@ static gint Html_write_raw(DilloHtml *ht
|
|
53729 |
gint token_start, buf_index;
|
|
53730 |
|
|
53731 |
g_return_val_if_fail ((page = DW_PAGE (html->dw)) != NULL, 0);
|
|
53732 |
+
|
|
53733 |
+ if(bufsize < 0){
|
|
53734 |
+ _MSG(_("Html_write_raw : bufsize is negative!\n"));
|
|
53735 |
+ bufsize = strlen(buf);
|
|
53736 |
+ }
|
|
53737 |
|
|
53738 |
buf = g_strndup(buf, bufsize);
|
|
53739 |
|
|
53740 |
@@ -5105,7 +5850,7 @@ static gint Html_write_raw(DilloHtml *ht
|
|
53741 |
if (buf[offset] == ch || !buf[offset]) {
|
|
53742 |
buf_index = offset;
|
|
53743 |
} else {
|
|
53744 |
- MSG_HTML("attribute lacks closing quote\n");
|
|
53745 |
+ MSG_HTML(_("attribute lacks closing quote\n"));
|
|
53746 |
break;
|
|
53747 |
}
|
|
53748 |
}
|
|
53749 |
@@ -5113,7 +5858,7 @@ static gint Html_write_raw(DilloHtml *ht
|
|
53750 |
/* unterminated tag detected */
|
|
53751 |
p = g_strndup(buf+token_start+1,
|
|
53752 |
strcspn(buf+token_start+1, " <"));
|
|
53753 |
- MSG_HTML("<%s> element lacks its closing '>'\n", p);
|
|
53754 |
+ MSG_HTML(_("<%s> element lacks its closing '>'\n"), p);
|
|
53755 |
g_free(p);
|
|
53756 |
--buf_index;
|
|
53757 |
break;
|
|
53758 |
@@ -5127,19 +5872,62 @@ static gint Html_write_raw(DilloHtml *ht
|
|
53759 |
}
|
|
53760 |
}
|
|
53761 |
} else {
|
|
53762 |
- /* A Word: search for whitespace or tag open */
|
|
53763 |
- while (++buf_index < bufsize) {
|
|
53764 |
- buf_index += strcspn(buf + buf_index, " <\n\r\t\f\v");
|
|
53765 |
- if ( buf[buf_index] == '<' && (ch = buf[buf_index + 1]) &&
|
|
53766 |
- !isalpha(ch) && !strchr("/!?", ch))
|
|
53767 |
- continue;
|
|
53768 |
- break;
|
|
53769 |
- }
|
|
53770 |
- if (buf_index < bufsize || Eof) {
|
|
53771 |
- /* successfully found end of token */
|
|
53772 |
- Html_process_word(html, buf + token_start,
|
|
53773 |
- buf_index - token_start);
|
|
53774 |
- token_start = buf_index;
|
|
53775 |
+ /* A Word */
|
|
53776 |
+ if (a_I18n_use_CJK_charset(html->linkblock->lang)) {
|
|
53777 |
+ if (!IS_ASCII_CHAR(buf[buf_index])) {
|
|
53778 |
+ /* Deal with multibyte characters, treat each character as a word. */
|
|
53779 |
+ int wordnum = a_I18n_mblen(&buf[buf_index]);
|
|
53780 |
+ if (wordnum != 0) {
|
|
53781 |
+ buf_index += wordnum;
|
|
53782 |
+ if (buf_index < bufsize || Eof) {
|
|
53783 |
+ Html_process_word(html, buf + token_start,
|
|
53784 |
+ buf_index - token_start);
|
|
53785 |
+ token_start = buf_index;
|
|
53786 |
+ }
|
|
53787 |
+ } else {
|
|
53788 |
+ /* ignore it, unless it is a multibyte character that has not
|
|
53789 |
+ * completely arrived yet */
|
|
53790 |
+ buf_index++;
|
|
53791 |
+ if (buf_index < bufsize || Eof)
|
|
53792 |
+ token_start = buf_index;
|
|
53793 |
+ }
|
|
53794 |
+ } else {
|
|
53795 |
+ /* search for whitespace or tag open or multibyte character*/
|
|
53796 |
+ /* otherwise, fall back to ASCII */
|
|
53797 |
+ while (++buf_index < bufsize) {
|
|
53798 |
+ while (buf_index < bufsize
|
|
53799 |
+ && IS_ASCII_CHAR(buf[buf_index])
|
|
53800 |
+ && !memchr(" <\n\r\t\f\v&", buf[buf_index], 8))
|
|
53801 |
+ buf_index++;
|
|
53802 |
+ if (buf[buf_index] == '<'
|
|
53803 |
+ && buf[buf_index + 1]
|
|
53804 |
+ && !isalpha(buf[buf_index + 1])
|
|
53805 |
+ && !strchr("/!?", buf[buf_index + 1]))
|
|
53806 |
+ continue; /* found a tag. */
|
|
53807 |
+ break;
|
|
53808 |
+ }
|
|
53809 |
+ if (buf_index < bufsize || Eof) {
|
|
53810 |
+ /* successfully found end of token */
|
|
53811 |
+ Html_process_word(html, buf + token_start,
|
|
53812 |
+ buf_index - token_start);
|
|
53813 |
+ token_start = buf_index;
|
|
53814 |
+ }
|
|
53815 |
+ }
|
|
53816 |
+ } else {
|
|
53817 |
+ /* search for whitespace or tag open or multibyte character*/
|
|
53818 |
+ while (++buf_index < bufsize) {
|
|
53819 |
+ buf_index += strcspn(buf + buf_index, " <\n\r\t\f\v");
|
|
53820 |
+ if ( buf[buf_index] == '<' && (ch = buf[buf_index + 1]) &&
|
|
53821 |
+ !isalpha(ch) && !strchr("/!?", ch))
|
|
53822 |
+ continue;
|
|
53823 |
+ break;
|
|
53824 |
+ }
|
|
53825 |
+ if (buf_index < bufsize || Eof) {
|
|
53826 |
+ /* successfully found end of token */
|
|
53827 |
+ Html_process_word(html, buf + token_start,
|
|
53828 |
+ buf_index - token_start);
|
|
53829 |
+ token_start = buf_index;
|
|
53830 |
+ }
|
|
53831 |
}
|
|
53832 |
}
|
|
53833 |
}/*while*/
|
|
53834 |
@@ -5150,6 +5938,60 @@ static gint Html_write_raw(DilloHtml *ht
|
|
53835 |
return token_start;
|
|
53836 |
}
|
|
53837 |
|
|
53838 |
+/* wait for </head> or <body> tag. if waiting, return TRUE*/
|
|
53839 |
+static gboolean Html_wait(char *Buf, gint BufSize, gint Eof)
|
|
53840 |
+{
|
|
53841 |
+ char *head, *body;
|
|
53842 |
+ struct timespec t = {0, 10000000L}; // 10ms
|
|
53843 |
+
|
|
53844 |
+ if (Eof == 1) return FALSE;
|
|
53845 |
+
|
|
53846 |
+ head = a_Misc_stristr(Buf, "</head>");
|
|
53847 |
+ if (head && (BufSize - (head - Buf)) > 0) return FALSE;
|
|
53848 |
+ body = a_Misc_stristr(Buf, "<body");
|
|
53849 |
+ if (body && (BufSize - (body - Buf)) > 0) return FALSE;
|
|
53850 |
+
|
|
53851 |
+ _MSG("wait..\n");
|
|
53852 |
+ nanosleep(&t, NULL);
|
|
53853 |
+ return TRUE;
|
|
53854 |
+}
|
|
53855 |
+
|
|
53856 |
+/* guess charset */
|
|
53857 |
+static void
|
|
53858 |
+Html_guess_charset(DilloHtml *html, char *Buf, gint BufSize)
|
|
53859 |
+{
|
|
53860 |
+ if (html->Start_Ofs != 0 && html->linkblock->usingMetaCharset)
|
|
53861 |
+ return;
|
|
53862 |
+
|
|
53863 |
+ g_free(html->linkblock->charset);
|
|
53864 |
+ /* 1. Server Charset */
|
|
53865 |
+ if (html->server_charset) {
|
|
53866 |
+ html->linkblock->charset = g_strdup(html->server_charset);
|
|
53867 |
+ return;
|
|
53868 |
+ }
|
|
53869 |
+
|
|
53870 |
+ /* 2. Meta Tag Charset */
|
|
53871 |
+ html->linkblock->charset = a_I18n_get_charset_from_meta_tag(Buf, BufSize);
|
|
53872 |
+ if (html->linkblock->charset) {
|
|
53873 |
+#if 0
|
|
53874 |
+ /* for rare case - page has many entities. */
|
|
53875 |
+ gchar *charset;
|
|
53876 |
+ if (g_strcasecmp(html->linkblock->charset, "ISO-8859-1") == 0) {
|
|
53877 |
+ Buf = Html_parse_entities(html, Buf, BufSize);
|
|
53878 |
+ charset = a_I18n_get_encoding(Buf, -1);
|
|
53879 |
+ if (!html->lang) html->lang = a_I18n_get_lang_from_charset(charset);
|
|
53880 |
+ g_free(charset);
|
|
53881 |
+ g_free(Buf);
|
|
53882 |
+ }
|
|
53883 |
+#endif
|
|
53884 |
+ html->linkblock->usingMetaCharset = TRUE;
|
|
53885 |
+ return;
|
|
53886 |
+ }
|
|
53887 |
+
|
|
53888 |
+ /* 3. Guess from document */
|
|
53889 |
+ html->linkblock->charset = a_I18n_get_encoding(Buf, BufSize);
|
|
53890 |
+}
|
|
53891 |
+
|
|
53892 |
/*
|
|
53893 |
* Process the newly arrived html and put it into the page structure.
|
|
53894 |
* (This function is called by Html_callback whenever there's new data)
|
|
53895 |
@@ -5157,23 +5999,51 @@ static gint Html_write_raw(DilloHtml *ht
|
|
53896 |
static void Html_write(DilloHtml *html, char *Buf, gint BufSize, gint Eof)
|
|
53897 |
{
|
|
53898 |
DwPage *page;
|
|
53899 |
- char completestr[32];
|
|
53900 |
gint token_start;
|
|
53901 |
- char *buf = Buf + html->Start_Ofs;
|
|
53902 |
- gint bufsize = BufSize - html->Start_Ofs;
|
|
53903 |
|
|
53904 |
g_return_if_fail ( (page = DW_PAGE (html->dw)) != NULL );
|
|
53905 |
-
|
|
53906 |
+ if (BufSize == 0) return;
|
|
53907 |
html->Start_Buf = Buf;
|
|
53908 |
- token_start = Html_write_raw(html, buf, bufsize, Eof);
|
|
53909 |
+ html->Buf_Size = BufSize;
|
|
53910 |
+
|
|
53911 |
+ if (!html->trans) {
|
|
53912 |
+ /* wait <meta> tag. */
|
|
53913 |
+ if (html->Start_Ofs == 0 && Html_wait(Buf, BufSize, Eof))
|
|
53914 |
+ return;
|
|
53915 |
+ /* guess charset */
|
|
53916 |
+ Html_guess_charset(html, Buf, BufSize);
|
|
53917 |
+ if (html->linkblock->charset) {
|
|
53918 |
+ html->trans = Html_translation_new(html->linkblock->charset,
|
|
53919 |
+ DILLO_CHARSET);
|
|
53920 |
+ if (!html->lang)
|
|
53921 |
+ html->lang = a_I18n_get_lang_from_charset(html->linkblock->charset);
|
|
53922 |
+ strncpy(html->linkblock->lang, html->lang, 6);
|
|
53923 |
+ Html_set_top_font(html, NULL, 0, 0, 0);
|
|
53924 |
+ }
|
|
53925 |
+ }
|
|
53926 |
+
|
|
53927 |
+ if (html->trans) {
|
|
53928 |
+ int bufsize;
|
|
53929 |
+
|
|
53930 |
+ // translation needed and available
|
|
53931 |
+ Html_translate(html->trans, Buf, BufSize);
|
|
53932 |
+ // note trans->bufsize includes the null byte
|
|
53933 |
+ bufsize = html->trans->bufsize - html->Start_Ofs;
|
|
53934 |
+ if (bufsize == 0) token_start = 0;
|
|
53935 |
+ else
|
|
53936 |
+ token_start = Html_write_raw(html,
|
|
53937 |
+ html->trans->buffer + html->Start_Ofs, bufsize, Eof);
|
|
53938 |
+ } else {
|
|
53939 |
+ // translation not needed, or not available
|
|
53940 |
+ token_start = Html_write_raw(html, Buf + html->Start_Ofs,
|
|
53941 |
+ BufSize - html->Start_Ofs, Eof);
|
|
53942 |
+ }
|
|
53943 |
html->Start_Ofs += token_start;
|
|
53944 |
|
|
53945 |
- if ( html->bw ) {
|
|
53946 |
- g_snprintf(
|
|
53947 |
- completestr, 32, "%s%.1f Kb",
|
|
53948 |
- PBAR_PSTR(prefs.panel_size == 1),
|
|
53949 |
- (float)html->Start_Ofs/1024);
|
|
53950 |
- a_Progressbar_update(html->bw->progress, completestr, 1);
|
|
53951 |
+ if ( html->dd ) {
|
|
53952 |
+ html->dd->progress = html->Start_Ofs/1024;
|
|
53953 |
+ html->dd->ready = FALSE;
|
|
53954 |
+ a_Doc_progress_update(html->dd);
|
|
53955 |
}
|
|
53956 |
}
|
|
53957 |
|
|
53958 |
@@ -5207,12 +6077,97 @@ static void Html_close(DilloHtml *html,
|
|
53959 |
g_string_free(html->attr_data, TRUE);
|
|
53960 |
|
|
53961 |
/* Remove this client from our active list */
|
|
53962 |
- a_Interface_close_client(html->bw, ClientKey);
|
|
53963 |
-
|
|
53964 |
- /* Set progress bar insensitive */
|
|
53965 |
- a_Progressbar_update(html->bw->progress, NULL, 0);
|
|
53966 |
+ a_Doc_close_client(html->dd, ClientKey);
|
|
53967 |
|
|
53968 |
+ /* update progress */
|
|
53969 |
+ html->dd->ready = TRUE;
|
|
53970 |
+ a_Doc_progress_update(html->dd);
|
|
53971 |
+
|
|
53972 |
+ /* close the character encoding converter, if present */
|
|
53973 |
+ Html_translation_free(html->trans, FALSE);
|
|
53974 |
+ g_free(html->server_charset);
|
|
53975 |
+ g_free(html->lang);
|
|
53976 |
+
|
|
53977 |
g_free(html);
|
|
53978 |
}
|
|
53979 |
|
|
53980 |
+/*
|
|
53981 |
+ * This translates between character encodings. The results are put into
|
|
53982 |
+ * `trans'. This call can be used repeatedly as new data arrives.
|
|
53983 |
+ */
|
|
53984 |
+static void Html_translate(DilloTrans *trans, char *buf, gint bufsize) {
|
|
53985 |
+ char *source, *dest, *temp;
|
|
53986 |
+ size_t s_left, d_left;
|
|
53987 |
+ int bytesneeded;
|
|
53988 |
+
|
|
53989 |
+ g_return_if_fail(trans && buf);
|
|
53990 |
+
|
|
53991 |
+ /* is there nothing new? */
|
|
53992 |
+ if (bufsize == trans->converted) {
|
|
53993 |
+ if (bufsize == 0 && !trans->buffer) {
|
|
53994 |
+ trans->buffer = g_new0(char,1); /* allocate if given empty input */
|
|
53995 |
+ trans->bufsize = 0;
|
|
53996 |
+ }
|
|
53997 |
+ return; /* no new data */
|
|
53998 |
+ }
|
|
53999 |
+
|
|
54000 |
+ /* allocate a string, leaving enough space for worst-case growth */
|
|
54001 |
+
|
|
54002 |
+ /* now the proper translation */
|
|
54003 |
+ source = buf + trans->converted;
|
|
54004 |
+ s_left = bufsize - trans->converted;
|
|
54005 |
+ d_left = bufsize * D_CHAR_GROWTH;
|
|
54006 |
+ temp = g_malloc(d_left + 1);
|
|
54007 |
+ dest = temp;
|
|
54008 |
+ a_I18n_iconv(trans->conversion,
|
|
54009 |
+ &source, &s_left,
|
|
54010 |
+ &dest, &d_left);
|
|
54011 |
+ trans->converted = bufsize - s_left; /* note how far into the source */
|
|
54012 |
+
|
|
54013 |
+ /* now do the proper allocation */
|
|
54014 |
+ bytesneeded = bufsize * D_CHAR_GROWTH - d_left;
|
|
54015 |
+ if (!trans->buffer) {
|
|
54016 |
+ trans->buffer = g_realloc(temp, bytesneeded + 1); /* cut to size */
|
|
54017 |
+ trans->bufsize = bytesneeded;
|
|
54018 |
+ } else {
|
|
54019 |
+ trans->buffer = g_realloc(trans->buffer, trans->bufsize + bytesneeded + 1);
|
|
54020 |
+ memcpy(trans->buffer + trans->bufsize, temp, bytesneeded + 1);
|
|
54021 |
+ trans->bufsize += bytesneeded;
|
|
54022 |
+ g_free(temp);
|
|
54023 |
+ }
|
|
54024 |
+}
|
|
54025 |
+
|
|
54026 |
+/*
|
|
54027 |
+ * This sets up character encoding translation. It should be done once
|
|
54028 |
+ * for each document that has to be translated.
|
|
54029 |
+ * The inputs are iconv-style encoding names.
|
|
54030 |
+ * This can return NULL if there is an error.
|
|
54031 |
+ */
|
|
54032 |
+static DilloTrans *Html_translation_new(char *source, char *dest) {
|
|
54033 |
+ DilloTrans *trans;
|
|
54034 |
+
|
|
54035 |
+ g_return_val_if_fail(source && dest, NULL);
|
|
54036 |
+ if (strncmp(source, "ASCII", 5) == 0) return NULL;
|
|
54037 |
+
|
|
54038 |
+ trans = g_new0(DilloTrans, 1);
|
|
54039 |
+ trans->conversion = iconv_open(dest, source);
|
|
54040 |
+ if (trans->conversion == (iconv_t)-1) {
|
|
54041 |
+ g_warning (_("could not allocate character encoding converter"));
|
|
54042 |
+ g_free(trans);
|
|
54043 |
+ return NULL;
|
|
54044 |
+ }
|
|
54045 |
+ return trans;
|
|
54046 |
+}
|
|
54047 |
+
|
|
54048 |
+/*
|
|
54049 |
+ * This shuts down character encoding translation.
|
|
54050 |
+ * Set the second parameter to true if you want to keep the translated buffer.
|
|
54051 |
+ */
|
|
54052 |
+static void Html_translation_free(DilloTrans *trans, gboolean keepbuf) {
|
|
54053 |
+ if (!trans) return;
|
|
54054 |
+ iconv_close(trans->conversion);
|
|
54055 |
+ if (!keepbuf) g_free(trans->buffer);
|
|
54056 |
+ g_free(trans);
|
|
54057 |
+}
|
|
54058 |
|
|
54059 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
54060 |
diff -pruN dillo-0.8.6/src/html.h dillo-0.8.6-i18n-misc-20070916/src/html.h
|
|
54061 |
--- dillo-0.8.6/src/html.h 2006-01-14 01:05:20.000000000 +0900
|
|
54062 |
+++ dillo-0.8.6-i18n-misc-20070916/src/html.h 2006-05-16 01:21:09.000000000 +0900
|
|
54063 |
@@ -1,10 +1,11 @@
|
|
54064 |
#ifndef __HTML_H__
|
|
54065 |
#define __HTML_H__
|
|
54066 |
|
|
54067 |
+#include <iconv.h>
|
|
54068 |
#include <gdk/gdk.h>
|
|
54069 |
#include <gtk/gtkcontainer.h>
|
|
54070 |
|
|
54071 |
-#include "browser.h" /* for BrowserWindow */
|
|
54072 |
+#include "browser.h" /* for DilloDoc */
|
|
54073 |
#include "dw_widget.h" /* for DwWidget */
|
|
54074 |
#include "dw_image.h" /* for DwImageMapList */
|
|
54075 |
|
|
54076 |
@@ -18,6 +19,9 @@ extern "C" {
|
|
54077 |
likely that imagemaps will go here. */
|
|
54078 |
|
|
54079 |
typedef struct _DilloHtmlLB DilloHtmlLB;
|
|
54080 |
+#ifdef ENABLE_META_REFRESH
|
|
54081 |
+typedef struct _DilloHtmlMetaRefreshData DilloHtmlMetaRefreshData;
|
|
54082 |
+#endif
|
|
54083 |
|
|
54084 |
typedef struct _DilloHtml DilloHtml;
|
|
54085 |
typedef struct _DilloHtmlClass DilloHtmlClass;
|
|
54086 |
@@ -26,10 +30,11 @@ typedef struct _DilloHtmlForm DilloHt
|
|
54087 |
typedef struct _DilloHtmlOption DilloHtmlOption;
|
|
54088 |
typedef struct _DilloHtmlSelect DilloHtmlSelect;
|
|
54089 |
typedef struct _DilloHtmlInput DilloHtmlInput;
|
|
54090 |
+typedef struct _DilloTrans DilloTrans;
|
|
54091 |
|
|
54092 |
|
|
54093 |
struct _DilloHtmlLB {
|
|
54094 |
- BrowserWindow *bw;
|
|
54095 |
+ DilloDoc *dd;
|
|
54096 |
DilloUrl *base_url;
|
|
54097 |
|
|
54098 |
DilloHtmlForm *forms;
|
|
54099 |
@@ -47,8 +52,22 @@ struct _DilloHtmlLB {
|
|
54100 |
|
|
54101 |
gint num_page_bugs;
|
|
54102 |
GString *page_bugs;
|
|
54103 |
+
|
|
54104 |
+ gchar *charset;
|
|
54105 |
+ gboolean usingMetaCharset;
|
|
54106 |
+ gchar lang[6];
|
|
54107 |
+#ifdef ENABLE_META_REFRESH
|
|
54108 |
+ gint *meta_refresh;
|
|
54109 |
+#endif
|
|
54110 |
};
|
|
54111 |
|
|
54112 |
+#ifdef ENABLE_META_REFRESH
|
|
54113 |
+struct _DilloHtmlMetaRefreshData {
|
|
54114 |
+ DilloHtmlLB *lb;
|
|
54115 |
+ int html_dead;
|
|
54116 |
+ DilloUrl *url;
|
|
54117 |
+};
|
|
54118 |
+#endif
|
|
54119 |
|
|
54120 |
typedef enum {
|
|
54121 |
DT_NONE,
|
|
54122 |
@@ -88,6 +107,12 @@ typedef enum {
|
|
54123 |
DILLO_HTML_TABLE_MODE_TD /* inside of <td> */
|
|
54124 |
} DilloHtmlTableMode;
|
|
54125 |
|
|
54126 |
+typedef enum {
|
|
54127 |
+ DILLO_HTML_FRAME_MODE_NONE, /* no frameset at all */
|
|
54128 |
+ DILLO_HTML_FRAME_MODE_IFRAME, /* inside of <iframe> */
|
|
54129 |
+ DILLO_HTML_FRAME_MODE_FRAMESET, /* inside of <frameset> */
|
|
54130 |
+ DILLO_HTML_FRAME_MODE_NOFRAMES /* inside of <noframes> */
|
|
54131 |
+} DilloHtmlFrameMode;
|
|
54132 |
|
|
54133 |
typedef enum {
|
|
54134 |
IN_HTML = 1 << 0,
|
|
54135 |
@@ -98,7 +123,8 @@ typedef enum {
|
|
54136 |
IN_TEXTAREA = 1 << 5,
|
|
54137 |
IN_MAP = 1 << 6,
|
|
54138 |
IN_PRE = 1 << 7,
|
|
54139 |
- IN_BUTTON = 1 << 8
|
|
54140 |
+ IN_BUTTON = 1 << 8,
|
|
54141 |
+ IN_FRAMESET = 1 << 9
|
|
54142 |
} DilloHtmlProcessingState;
|
|
54143 |
|
|
54144 |
|
|
54145 |
@@ -107,6 +133,8 @@ struct _DilloHtmlState {
|
|
54146 |
DwStyle *style, *table_cell_style;
|
|
54147 |
DilloHtmlParseMode parse_mode;
|
|
54148 |
DilloHtmlTableMode table_mode;
|
|
54149 |
+ DilloHtmlFrameMode frame_mode;
|
|
54150 |
+ GtkWidget *frameset;
|
|
54151 |
gboolean cell_text_align_set;
|
|
54152 |
enum { HTML_LIST_NONE, HTML_LIST_UNORDERED, HTML_LIST_ORDERED } list_type;
|
|
54153 |
gint list_number;
|
|
54154 |
@@ -135,14 +163,10 @@ typedef enum {
|
|
54155 |
DILLO_HTML_METHOD_POST
|
|
54156 |
} DilloHtmlMethod;
|
|
54157 |
|
|
54158 |
-typedef enum {
|
|
54159 |
- DILLO_HTML_ENC_URLENCODING
|
|
54160 |
-} DilloHtmlEnc;
|
|
54161 |
-
|
|
54162 |
struct _DilloHtmlForm {
|
|
54163 |
DilloHtmlMethod method;
|
|
54164 |
DilloUrl *action;
|
|
54165 |
- DilloHtmlEnc enc;
|
|
54166 |
+ gchar *charset;
|
|
54167 |
|
|
54168 |
DilloHtmlInput *inputs;
|
|
54169 |
gint num_inputs;
|
|
54170 |
@@ -196,12 +220,24 @@ struct _DilloHtmlInput {
|
|
54171 |
gboolean init_val; /* only meaningful for buttons */
|
|
54172 |
};
|
|
54173 |
|
|
54174 |
+/* This is used when converting from one character encoding to another */
|
|
54175 |
+struct _DilloTrans {
|
|
54176 |
+ iconv_t conversion; /* iconv conversion handler */
|
|
54177 |
+ char *buffer; /* The converted string. This moves about!! */
|
|
54178 |
+ int bufsize; /* Current length of the buffer, excluding NULL. */
|
|
54179 |
+ int converted; /* number of input bytes converted */
|
|
54180 |
+};
|
|
54181 |
+
|
|
54182 |
struct _DilloHtml {
|
|
54183 |
DwWidget *dw; /* this is duplicated in the stack (page) */
|
|
54184 |
+ DilloTrans *trans; /* handle for character set conversion */
|
|
54185 |
+ gchar *server_charset;
|
|
54186 |
+ gchar *lang;
|
|
54187 |
|
|
54188 |
DilloHtmlLB *linkblock;
|
|
54189 |
gchar *Start_Buf;
|
|
54190 |
size_t Start_Ofs;
|
|
54191 |
+ size_t Buf_Size;
|
|
54192 |
size_t CurrTagOfs;
|
|
54193 |
size_t OldTagOfs, OldTagLine;
|
|
54194 |
|
|
54195 |
@@ -235,7 +271,7 @@ struct _DilloHtml {
|
|
54196 |
|
|
54197 |
GString *attr_data;
|
|
54198 |
|
|
54199 |
- BrowserWindow *bw;
|
|
54200 |
+ DilloDoc *dd;
|
|
54201 |
};
|
|
54202 |
|
|
54203 |
#ifdef __cplusplus
|
|
54204 |
diff -pruN dillo-0.8.6/src/i18n.c dillo-0.8.6-i18n-misc-20070916/src/i18n.c
|
|
54205 |
--- dillo-0.8.6/src/i18n.c 1970-01-01 09:00:00.000000000 +0900
|
|
54206 |
+++ dillo-0.8.6-i18n-misc-20070916/src/i18n.c 2007-09-11 00:38:31.000000000 +0900
|
|
54207 |
@@ -0,0 +1,662 @@
|
|
54208 |
+/*
|
|
54209 |
+ * File: i18n.c
|
|
54210 |
+ *
|
|
54211 |
+ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
|
|
54212 |
+ * This code referred to Mr. Robert Thomson's code. and created it.
|
|
54213 |
+ *
|
|
54214 |
+ * This program is free software; you can redistribute it and/or modify
|
|
54215 |
+ * it under the terms of the GNU General Public License as published by
|
|
54216 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
54217 |
+ * (at your option) any later version.
|
|
54218 |
+ */
|
|
54219 |
+
|
|
54220 |
+/*
|
|
54221 |
+ * guess encoding charset and convert
|
|
54222 |
+ */
|
|
54223 |
+
|
|
54224 |
+#include <config.h>
|
|
54225 |
+#include <ctype.h>
|
|
54226 |
+#include <string.h>
|
|
54227 |
+#include <glib.h>
|
|
54228 |
+#include <errno.h> /* for iconv error codes */
|
|
54229 |
+#include <iconv.h>
|
|
54230 |
+
|
|
54231 |
+#include "intl.h"
|
|
54232 |
+#include "misc.h"
|
|
54233 |
+#include "msg.h"
|
|
54234 |
+#include "i18n.h"
|
|
54235 |
+
|
|
54236 |
+//#define DEBUG_LEVEL 10
|
|
54237 |
+#include "debug.h"
|
|
54238 |
+
|
|
54239 |
+#define MIN_HEADER_LENGTH (gint)(sizeof("<head><meta http-equiv=\"content-type\"" \
|
|
54240 |
+ " content=\"text/html\"; charset=></head>") - 1)
|
|
54241 |
+#define MAX_HEADER_LENGTH 10240
|
|
54242 |
+
|
|
54243 |
+typedef enum {
|
|
54244 |
+ AD_NONE,
|
|
54245 |
+ AD_CHINESE,
|
|
54246 |
+ AD_KOREAN,
|
|
54247 |
+ AD_JAPANESE,
|
|
54248 |
+ AD_ALL
|
|
54249 |
+} I18nAutoDetectionType;
|
|
54250 |
+
|
|
54251 |
+static gchar *default_lang;
|
|
54252 |
+static gchar *dw_charset;
|
|
54253 |
+static I18nAutoDetectionType detect_type;
|
|
54254 |
+static gboolean use_CJK_charset;
|
|
54255 |
+
|
|
54256 |
+typedef struct {
|
|
54257 |
+ gchar *lang;
|
|
54258 |
+ gchar *charset;
|
|
54259 |
+} lang_charset;
|
|
54260 |
+
|
|
54261 |
+#define LANG_TBL_N 59
|
|
54262 |
+static lang_charset lang_tbl[LANG_TBL_N] = {
|
|
54263 |
+ {"ZH_TW", "BIG5"},
|
|
54264 |
+ {"ZH_HK", "BIG5HKSCS"},
|
|
54265 |
+ {"ZH_CN", "GBK"},
|
|
54266 |
+ {"YI", "CP1255"},
|
|
54267 |
+ {"VI", "TCVN"},
|
|
54268 |
+ {"UR", "CP1256"},
|
|
54269 |
+ {"UK", "KOI8-U"},
|
|
54270 |
+ {"TURKISH", "ISO8859-9"},
|
|
54271 |
+ {"TT", "TATAR-CYR"},
|
|
54272 |
+ {"TR", "ISO8859-9"},
|
|
54273 |
+ {"TG", "KOI8-C"},
|
|
54274 |
+ {"TA", "TSCII-0"},
|
|
54275 |
+ {"SR_SP", "ISO8859-2"},
|
|
54276 |
+ {"SR", "ISO8859-5"},
|
|
54277 |
+ {"SQ", "ISO8859-2"},
|
|
54278 |
+ {"SP", "ISO8859-5"},
|
|
54279 |
+ {"SL", "ISO8859-2"},
|
|
54280 |
+ {"SK", "ISO8859-2"},
|
|
54281 |
+ {"SH", "ISO8859-2"},
|
|
54282 |
+ {"SE_NO", "UTF-8"},
|
|
54283 |
+ {"SERBOCROATIAN", "ISO8859-2"},
|
|
54284 |
+ {"RU_UA", "KOI8-U"},
|
|
54285 |
+ {"RU_RU", "KOI8-R"},
|
|
54286 |
+ {"RUSSIAN", "ISO8859-5"},
|
|
54287 |
+ {"RUMANIAN", "ISO8859-2"},
|
|
54288 |
+ {"RU", "KOI8-R"},
|
|
54289 |
+ {"RO", "ISO8859-2"},
|
|
54290 |
+ {"POSIX", "C"},
|
|
54291 |
+ {"POLISH", "ISO8859-2"},
|
|
54292 |
+ {"PL", "ISO8859-2"},
|
|
54293 |
+ {"MT", "ISO8859-3"},
|
|
54294 |
+ {"MK", "ISO8859-5"},
|
|
54295 |
+ {"LO", "MULELAO-1"},
|
|
54296 |
+ {"KO", "EUCKR"},
|
|
54297 |
+ {"KA", "GEORGIAN-ACADEMY"},
|
|
54298 |
+ {"JP_JP", "EUCJP"},
|
|
54299 |
+ {"JA", "EUCJP"},
|
|
54300 |
+ {"IW", "ISO8859-8"},
|
|
54301 |
+ {"IU", "NUNACOM-8"},
|
|
54302 |
+ {"HY", "ARMSCII-8"},
|
|
54303 |
+ {"HU", "ISO8859-2"},
|
|
54304 |
+ {"HR", "ISO8859-2"},
|
|
54305 |
+ {"HI", "ISCII-DEV"},
|
|
54306 |
+ {"HE", "ISO8859-8"},
|
|
54307 |
+ {"GREEK", "ISO8859-7"},
|
|
54308 |
+ {"FA", "UTF-8"},
|
|
54309 |
+ {"EO", "ISO8859-3"},
|
|
54310 |
+ {"EL", "ISO8859-7"},
|
|
54311 |
+ {"EE", "ISO8859-4"},
|
|
54312 |
+ {"CZ", "ISO8859-2"},
|
|
54313 |
+ {"CS", "ISO8859-2"},
|
|
54314 |
+ {"CROATIAN", "ISO8859-2"},
|
|
54315 |
+ {"CHINESE-T", "EUCTW"},
|
|
54316 |
+ {"CHINESE-S", "EUCCN"},
|
|
54317 |
+ {"BE", "CP1251"},
|
|
54318 |
+ {"AZ", "ISO8859-9E"},
|
|
54319 |
+ {"AR", "ISO8859-6"},
|
|
54320 |
+ {"AM", "UTF-8"},
|
|
54321 |
+ {"A3", "KOI8-C"},
|
|
54322 |
+};
|
|
54323 |
+
|
|
54324 |
+static gchar *I18n_get_charset_from_lang(const gchar *lang)
|
|
54325 |
+{
|
|
54326 |
+ gint i;
|
|
54327 |
+ gchar u_lang[64];
|
|
54328 |
+
|
|
54329 |
+ strncpy(u_lang, lang, 64);
|
|
54330 |
+ g_strup(u_lang);
|
|
54331 |
+ if (strstr(u_lang, "EURO")) return g_strdup("ISO8859-15");
|
|
54332 |
+ for (i = 0; i < LANG_TBL_N; i++) {
|
|
54333 |
+ if (strncmp(u_lang, lang_tbl[i].lang, strlen(lang_tbl[i].lang)) == 0)
|
|
54334 |
+ return g_strdup(lang_tbl[i].charset);
|
|
54335 |
+ }
|
|
54336 |
+ return g_strdup("ISO8859-1");
|
|
54337 |
+}
|
|
54338 |
+
|
|
54339 |
+void a_I18n_detect_DW_locale()
|
|
54340 |
+{
|
|
54341 |
+ char *lang;
|
|
54342 |
+
|
|
54343 |
+ lang = getenv("LC_CTYPE");
|
|
54344 |
+ if (!lang || !*lang) lang = getenv("LC_ALL");
|
|
54345 |
+ if (!lang || !*lang) lang = getenv("LANG");
|
|
54346 |
+
|
|
54347 |
+ detect_type = AD_NONE;
|
|
54348 |
+ use_CJK_charset = FALSE;
|
|
54349 |
+ if (!lang) {
|
|
54350 |
+ dw_charset = g_strdup("ISO8859-1");
|
|
54351 |
+ default_lang = g_strdup("en");
|
|
54352 |
+ return;
|
|
54353 |
+ }
|
|
54354 |
+ if (g_strncasecmp(lang, "ZH", 2) == 0) {
|
|
54355 |
+ detect_type = AD_CHINESE;
|
|
54356 |
+ use_CJK_charset = TRUE;
|
|
54357 |
+ } else if (g_strncasecmp(lang, "KO", 2) == 0) {
|
|
54358 |
+ detect_type = AD_KOREAN;
|
|
54359 |
+ use_CJK_charset = TRUE;
|
|
54360 |
+ } else if (g_strncasecmp(lang, "JA", 2) == 0) {
|
|
54361 |
+ detect_type = AD_JAPANESE;
|
|
54362 |
+ use_CJK_charset = TRUE;
|
|
54363 |
+ }
|
|
54364 |
+ if (strchr(lang, '.')) {
|
|
54365 |
+ default_lang = g_strdup(lang);
|
|
54366 |
+ strchr(default_lang, '.')[0] = 0;
|
|
54367 |
+ } else {
|
|
54368 |
+ default_lang = g_strdup(lang);
|
|
54369 |
+ }
|
|
54370 |
+ if (strchr(default_lang, '_')) {
|
|
54371 |
+ strchr(default_lang, '_')[0] = '-';
|
|
54372 |
+ }
|
|
54373 |
+
|
|
54374 |
+ dw_charset = (strchr(lang, '.'))
|
|
54375 |
+ ? a_I18n_fix_charset(g_strdup(strchr(lang, '.') + 1))
|
|
54376 |
+ : I18n_get_charset_from_lang(lang);
|
|
54377 |
+ if (!dw_charset) dw_charset = g_strdup(DILLO_CHARSET);
|
|
54378 |
+}
|
|
54379 |
+
|
|
54380 |
+const gchar *a_I18n_get_DW_charset()
|
|
54381 |
+{
|
|
54382 |
+ return dw_charset;
|
|
54383 |
+}
|
|
54384 |
+
|
|
54385 |
+/* If charset has latin1, return TRUE. */
|
|
54386 |
+gboolean a_I18n_has_latin1_charset(gchar *lang)
|
|
54387 |
+{
|
|
54388 |
+ return (g_strncasecmp(lang, "ja", 2) != 0);
|
|
54389 |
+}
|
|
54390 |
+
|
|
54391 |
+gchar *a_I18n_get_lang_from_charset(const gchar *charset)
|
|
54392 |
+{
|
|
54393 |
+ gchar *buf, *lang;
|
|
54394 |
+ if (!charset) return NULL;
|
|
54395 |
+
|
|
54396 |
+ buf = g_strdup(charset);
|
|
54397 |
+ g_strup(buf);
|
|
54398 |
+ if (strcmp(buf, "ISO-8859-1") == 0 ||
|
|
54399 |
+ strcmp(buf, "WINDOWS-1252") == 0) {
|
|
54400 |
+ lang ="en"; /* af,sq,eu,ca,da,nl,fo,fi,fr,gl,de,is,ga,it */
|
|
54401 |
+ } else if (strncmp(buf, "BIG", 3) == 0 ||
|
|
54402 |
+ strcmp(buf, "EUC-TW") == 0) {
|
|
54403 |
+ lang ="zh-TW"; /* Traditional */
|
|
54404 |
+ } else if (strncmp(buf, "GB", 2) == 0 ||
|
|
54405 |
+ strcmp(buf, "EUC-CN") == 0) {
|
|
54406 |
+ lang ="zh-CN"; /* Simplified */
|
|
54407 |
+ } else if (strcmp(buf, "SJIS") == 0 ||
|
|
54408 |
+ strncmp(buf, "SHIFT", 5) == 0 ||
|
|
54409 |
+ strcmp(buf, "EUC-JP") == 0 ||
|
|
54410 |
+ strcmp(buf, "ISO-2022-JP") == 0) {
|
|
54411 |
+ lang ="ja";
|
|
54412 |
+ } else if (strcmp(buf, "EUC-KR") == 0 ||
|
|
54413 |
+ strcmp(buf, "ISO-2022-KR") == 0) {
|
|
54414 |
+ lang ="ko";
|
|
54415 |
+ } else if (strcmp(buf, "ISO-8859-2") == 0 ||
|
|
54416 |
+ strcmp(buf, "WINDOWS-1250") == 0) {
|
|
54417 |
+ lang ="hr"; /* sl */
|
|
54418 |
+ } else if (strcmp(buf, "ISO-8859-3") == 0) {
|
|
54419 |
+ lang ="eo"; /* mt */
|
|
54420 |
+ } else if (strcmp(buf, "WINDOWS-874") == 0) {
|
|
54421 |
+ lang ="th";
|
|
54422 |
+ } else if (strcmp(buf, "WINDOWS-1251") == 0 ||
|
|
54423 |
+ strcmp(buf, "KOI8-R") == 0) {
|
|
54424 |
+ lang ="ru";
|
|
54425 |
+ } else if (strcmp(buf, "ISO-8859-5") == 0 ||
|
|
54426 |
+ strcmp(buf, "KOI8-U") == 0) {
|
|
54427 |
+ lang ="uk";
|
|
54428 |
+ } else if (strcmp(buf, "ISO-8859-6") == 0 ||
|
|
54429 |
+ strcmp(buf, "WINDOWS-1256") == 0) {
|
|
54430 |
+ lang ="ar";
|
|
54431 |
+ } else if (strcmp(buf, "ISO-8859-7") == 0) {
|
|
54432 |
+ lang ="el";
|
|
54433 |
+ } else if (strcmp(buf, "ISO-8859-8") == 0) {
|
|
54434 |
+ lang ="he";
|
|
54435 |
+ } else if (strcmp(buf, "ISO-8859-9") == 0 ||
|
|
54436 |
+ strcmp(buf, "WINDOWS-1254") == 0) {
|
|
54437 |
+ lang ="tr";
|
|
54438 |
+ } else if (strcmp(buf, "ISO-8859-13") == 0 ||
|
|
54439 |
+ strcmp(buf, "WINDOWS-1257") == 0) {
|
|
54440 |
+ lang ="lt"; /* lv */
|
|
54441 |
+ } else if (strcmp(buf, "ISO-8859-15") == 0) {
|
|
54442 |
+ lang = "et";
|
|
54443 |
+/* eo es la ms ...
|
|
54444 |
+ } else if (strncmp(buf, "", 1) == 0) {
|
|
54445 |
+ lang = "";
|
|
54446 |
+*/
|
|
54447 |
+ } else {
|
|
54448 |
+ lang = default_lang;
|
|
54449 |
+ }
|
|
54450 |
+ g_free(buf);
|
|
54451 |
+
|
|
54452 |
+ return g_strdup(lang);;
|
|
54453 |
+}
|
|
54454 |
+
|
|
54455 |
+gboolean a_I18n_use_CJK_charset(gchar *lang)
|
|
54456 |
+{
|
|
54457 |
+ return (g_strncasecmp(lang, "zh", 2) == 0 ||
|
|
54458 |
+ g_strncasecmp(lang, "ko", 2) == 0 ||
|
|
54459 |
+ g_strncasecmp(lang, "ja", 2) == 0);
|
|
54460 |
+}
|
|
54461 |
+
|
|
54462 |
+/* fix name Html_charset to iconv_charset. for example "x-sjis" to "SJIS"... */
|
|
54463 |
+/* TODO: remake this code! */
|
|
54464 |
+gchar *a_I18n_fix_charset(gchar *charset)
|
|
54465 |
+{
|
|
54466 |
+ iconv_t it;
|
|
54467 |
+
|
|
54468 |
+ if (!charset) return NULL;
|
|
54469 |
+ g_strup(charset);
|
|
54470 |
+ if (strchr(charset, '@'))
|
|
54471 |
+ strchr(charset, '@')[0] = '\0';
|
|
54472 |
+ if (strncmp(charset, "X-", 2) == 0) {
|
|
54473 |
+ gchar *old_charset = charset;
|
|
54474 |
+ charset = g_strdup(charset + 2);
|
|
54475 |
+ g_free(old_charset);
|
|
54476 |
+ }
|
|
54477 |
+ /* Japan Only */
|
|
54478 |
+ if (strcmp(charset, "SHIFTJIS") == 0) {
|
|
54479 |
+ g_free(charset);
|
|
54480 |
+ return g_strdup("SJIS");
|
|
54481 |
+ }
|
|
54482 |
+ /* Korea Only */
|
|
54483 |
+ if (strcmp(charset, "KS_C_5601-1987") == 0) {
|
|
54484 |
+ g_free(charset);
|
|
54485 |
+ return g_strdup("EUC-KR");
|
|
54486 |
+ }
|
|
54487 |
+ if (strcmp(charset, "UNICODE-1-1-UTF-8") == 0) {
|
|
54488 |
+ g_free(charset);
|
|
54489 |
+ return g_strdup("UTF-8");
|
|
54490 |
+ }
|
|
54491 |
+ if (strchr(charset, '_')) {
|
|
54492 |
+ strchr(charset, '_')[0] = '-';
|
|
54493 |
+ }
|
|
54494 |
+ if ((it = iconv_open(charset, charset)) == (iconv_t)-1) {
|
|
54495 |
+ g_free(charset);
|
|
54496 |
+ return NULL;
|
|
54497 |
+ }
|
|
54498 |
+ iconv_close(it);
|
|
54499 |
+ return charset;
|
|
54500 |
+}
|
|
54501 |
+
|
|
54502 |
+/* auto detect Chinese charset. -- GB2312,GBK,GB18030,HZ,ISO-2022-CN,
|
|
54503 |
+ * Big5,Big5-HKSCS,EUC-CN,EUC-TW*/
|
|
54504 |
+gchar *I18n_detect_chinese_charset(const gchar *buf, gint bufsize)
|
|
54505 |
+{
|
|
54506 |
+ /* TODO: implement this! */
|
|
54507 |
+ return g_strdup(DW_CHARSET);
|
|
54508 |
+}
|
|
54509 |
+
|
|
54510 |
+/* auto detect Korean charset. -- EUC-KR,UHC,JOHAB,ISO-2022-KR */
|
|
54511 |
+gchar *I18n_detect_korean_charset(const gchar *buf, gint bufsize)
|
|
54512 |
+{
|
|
54513 |
+ /* TODO: implement this! */
|
|
54514 |
+ return g_strdup(DW_CHARSET);
|
|
54515 |
+}
|
|
54516 |
+
|
|
54517 |
+/* auto detect Japanese charset. -- Shift_JIS,EUC-JP,ISO-2022-JP */
|
|
54518 |
+gchar *I18n_detect_japanese_charset(const gchar *buf, gint bufsize)
|
|
54519 |
+{
|
|
54520 |
+ gint i, got_sjis = 0, got_euc = 0, got_jis = 0;
|
|
54521 |
+ if (!buf || bufsize == 0)
|
|
54522 |
+ return g_strdup("SJIS");
|
|
54523 |
+
|
|
54524 |
+ /* check CR code. */
|
|
54525 |
+ if (strstr(buf, "\r"))
|
|
54526 |
+ got_sjis += 2;
|
|
54527 |
+
|
|
54528 |
+ for (i = 0; i < bufsize; i++) {
|
|
54529 |
+ if (got_sjis > got_euc && got_sjis >= 40)
|
|
54530 |
+ return g_strdup("SJIS");
|
|
54531 |
+ else if (got_euc > got_sjis && got_euc >= 40)
|
|
54532 |
+ return g_strdup("EUC-JP");
|
|
54533 |
+ else if (got_jis > 3)
|
|
54534 |
+ return g_strdup("ISO-2022-JP");
|
|
54535 |
+ if (buf[i] == 0x1b) {
|
|
54536 |
+ if (buf[i+1] == '$' || buf[i+1] == '(')
|
|
54537 |
+ got_jis++;
|
|
54538 |
+ else
|
|
54539 |
+ got_jis--;
|
|
54540 |
+ } else if (IS_ASCII_CHAR(buf[i])) continue;
|
|
54541 |
+ _MSG("e=%d s=%d j=%d %d\n", got_euc, got_sjis, got_jis, i);
|
|
54542 |
+ if (IS_SJIS_CHAR1(buf[i])) {
|
|
54543 |
+ if(IS_SJIS_CHAR2(buf[i+1])) {
|
|
54544 |
+ i++;
|
|
54545 |
+ got_sjis += 2;
|
|
54546 |
+ continue;
|
|
54547 |
+ } else
|
|
54548 |
+ got_euc += 2;
|
|
54549 |
+ }
|
|
54550 |
+ if (IS_EUC_CHAR(buf[i])) {
|
|
54551 |
+ if (IS_EUC_CHAR(buf[i+1])) {
|
|
54552 |
+ got_euc += 2;
|
|
54553 |
+ i++;
|
|
54554 |
+ } else got_sjis += 2;
|
|
54555 |
+ }
|
|
54556 |
+ if (i >= 1)
|
|
54557 |
+ if (IS_HANKANA_CHAR(buf[i - 2])
|
|
54558 |
+ && IS_HANKANA_CHAR(buf[i - 1])
|
|
54559 |
+ && IS_HANKANA_CHAR(buf[i])) {
|
|
54560 |
+ got_sjis++;
|
|
54561 |
+ if (IS_HANKANA_CHAR(buf[i+1]))
|
|
54562 |
+ got_sjis++;
|
|
54563 |
+ }
|
|
54564 |
+ }
|
|
54565 |
+
|
|
54566 |
+ _MSG(_("charset detect may mistake...\n"));
|
|
54567 |
+ if (got_jis > 1)
|
|
54568 |
+ return g_strdup("ISO-2022-JP");
|
|
54569 |
+ if (got_sjis > got_euc)
|
|
54570 |
+ return g_strdup("SJIS");
|
|
54571 |
+ if (got_euc >= 1)
|
|
54572 |
+ return g_strdup("EUC-JP");
|
|
54573 |
+
|
|
54574 |
+ /* check CR code again... */
|
|
54575 |
+ if (strstr(buf, "\r"))
|
|
54576 |
+ return g_strdup("SJIS");
|
|
54577 |
+ else
|
|
54578 |
+ return g_strdup("EUC-JP");
|
|
54579 |
+}
|
|
54580 |
+
|
|
54581 |
+static gchar *I18n_detect_utf8(const gchar *buf, gint bufsize)
|
|
54582 |
+{
|
|
54583 |
+ gint i, utf_count;
|
|
54584 |
+
|
|
54585 |
+ utf_count = 0;
|
|
54586 |
+ for (i = 0; i < bufsize; i++) {
|
|
54587 |
+ if (IS_UTF8_FIRST_CHAR(buf[i])) {
|
|
54588 |
+ if (IS_ASCII_CHAR(buf[i + 1])) {
|
|
54589 |
+ utf_count -= 8;
|
|
54590 |
+ } else if (IS_UTF8_2BYTE_FIRST_CHAR(buf[i])) {
|
|
54591 |
+ if (IS_UTF8_NON_FIRST_CHAR(buf[i + 1])
|
|
54592 |
+ && (IS_UTF8_FIRST_CHAR(buf[i + 2])
|
|
54593 |
+ || IS_ASCII_CHAR(buf[i + 2])))
|
|
54594 |
+ utf_count++;
|
|
54595 |
+ else
|
|
54596 |
+ utf_count -= 8;
|
|
54597 |
+ } else if (IS_UTF8_3BYTE_FIRST_CHAR(buf[i])) {
|
|
54598 |
+ if (IS_UTF8_NON_FIRST_CHAR(buf[i + 1])
|
|
54599 |
+ && IS_UTF8_NON_FIRST_CHAR(buf[i + 2])
|
|
54600 |
+ && (IS_UTF8_FIRST_CHAR(buf[i + 3])
|
|
54601 |
+ || IS_ASCII_CHAR(buf[i + 3])))
|
|
54602 |
+ utf_count += 2;
|
|
54603 |
+ else
|
|
54604 |
+ utf_count -= 8;
|
|
54605 |
+ } else if (IS_UTF8_4BYTE_FIRST_CHAR(buf[i])
|
|
54606 |
+ && IS_UTF8_NON_FIRST_CHAR(buf[i + 1])
|
|
54607 |
+ && IS_UTF8_NON_FIRST_CHAR(buf[i + 2])
|
|
54608 |
+ && IS_UTF8_NON_FIRST_CHAR(buf[i + 3])
|
|
54609 |
+ && (IS_UTF8_FIRST_CHAR(buf[i + 4])
|
|
54610 |
+ || IS_ASCII_CHAR(buf[i + 4])))
|
|
54611 |
+ utf_count += 3;
|
|
54612 |
+ else
|
|
54613 |
+ utf_count -= 8;
|
|
54614 |
+ if (utf_count <= -16 || utf_count >= 16)
|
|
54615 |
+ break;
|
|
54616 |
+ }
|
|
54617 |
+ }
|
|
54618 |
+ if (utf_count >= 9)
|
|
54619 |
+ return g_strdup("UTF-8");
|
|
54620 |
+ return NULL;
|
|
54621 |
+}
|
|
54622 |
+
|
|
54623 |
+gchar *a_I18n_get_charset_from_meta_tag(
|
|
54624 |
+ const gchar *buf, gint bufsize)
|
|
54625 |
+{
|
|
54626 |
+ gchar *meta_buf, *meta_tag, *head_end, *meta_charset, *charset = NULL;
|
|
54627 |
+ gint meta_buf_size, charset_len;
|
|
54628 |
+
|
|
54629 |
+ if (!buf || bufsize < MIN_HEADER_LENGTH)
|
|
54630 |
+ return NULL;
|
|
54631 |
+
|
|
54632 |
+ /* crate upper string */
|
|
54633 |
+ if (bufsize > MAX_HEADER_LENGTH)
|
|
54634 |
+ meta_buf_size = MAX_HEADER_LENGTH;
|
|
54635 |
+ else
|
|
54636 |
+ meta_buf_size = bufsize;
|
|
54637 |
+ meta_buf = g_strndup(buf, meta_buf_size);
|
|
54638 |
+ meta_buf[meta_buf_size - 1] = '\0';
|
|
54639 |
+ g_strup(meta_buf);
|
|
54640 |
+
|
|
54641 |
+ /* find meta-charset */
|
|
54642 |
+ if (!((meta_tag = strstr(meta_buf, "<META "))
|
|
54643 |
+ && (meta_tag += sizeof("<META ") - 1)
|
|
54644 |
+ && (meta_charset = strstr(meta_tag, "CHARSET="))
|
|
54645 |
+ && (strstr(meta_tag, "HTTP-EQUIV=\"CONTENT-TYPE")
|
|
54646 |
+ || strstr(meta_tag, "HTTP-EQUIV=CONTENT-TYPE")))) {
|
|
54647 |
+ g_free(meta_buf);
|
|
54648 |
+ return NULL;
|
|
54649 |
+ }
|
|
54650 |
+ head_end = strstr(meta_tag, "</HEAD>");
|
|
54651 |
+
|
|
54652 |
+ /* check HTML code. */
|
|
54653 |
+ if (meta_charset > head_end) {
|
|
54654 |
+ MSG(_("<meta> outside of <head>!\n"));
|
|
54655 |
+ //g_free(meta_buf);
|
|
54656 |
+ //return NULL;
|
|
54657 |
+ }
|
|
54658 |
+
|
|
54659 |
+ meta_charset += sizeof("CHARSET=") - 1;
|
|
54660 |
+ if (meta_charset[0] == '"' || meta_charset[0] == '\'')
|
|
54661 |
+ meta_charset++;
|
|
54662 |
+ charset_len = strpbrk(meta_charset, "\"'/> ") - meta_charset;
|
|
54663 |
+ if (charset_len > 0)
|
|
54664 |
+ charset = g_strndup(meta_charset, charset_len);
|
|
54665 |
+ g_free(meta_buf);
|
|
54666 |
+ if (charset)
|
|
54667 |
+ charset = a_I18n_fix_charset(charset);
|
|
54668 |
+ if (charset && strncmp(charset, "UTF", 3) == 0
|
|
54669 |
+ && (strncmp(charset, "UTF16", 5) == 0
|
|
54670 |
+ || strncmp(charset, "UTF-16", 6) == 0
|
|
54671 |
+ || strncmp(charset, "UTF32", 5) == 0
|
|
54672 |
+ || strncmp(charset, "UTF-32", 6) == 0))
|
|
54673 |
+ return NULL;
|
|
54674 |
+ return charset;
|
|
54675 |
+}
|
|
54676 |
+
|
|
54677 |
+/** get encoding charset.
|
|
54678 |
+ * buf : check target buffer.
|
|
54679 |
+ * bufsize : buf's size.
|
|
54680 |
+ * return : charset
|
|
54681 |
+ */
|
|
54682 |
+gchar *a_I18n_get_encoding(const gchar *buf, gint bufsize)
|
|
54683 |
+{
|
|
54684 |
+ gchar *charset;
|
|
54685 |
+
|
|
54686 |
+ if (!buf) return NULL;
|
|
54687 |
+ if (bufsize == 0) return g_strdup("");
|
|
54688 |
+
|
|
54689 |
+ /* skip ascii char */
|
|
54690 |
+ {
|
|
54691 |
+ gint i, old_bufsize = bufsize;
|
|
54692 |
+ for (i = 0; i < old_bufsize; i++) {
|
|
54693 |
+ if (IS_ASCII_CHAR(buf[0])
|
|
54694 |
+ && buf[0] != 0x1b) { //for ISO-2022-* detect
|
|
54695 |
+ buf++;
|
|
54696 |
+ bufsize--;
|
|
54697 |
+ } else break;
|
|
54698 |
+ }
|
|
54699 |
+ if (bufsize == 0) {
|
|
54700 |
+ _MSG(_("all ascii code\n"));
|
|
54701 |
+ return g_strdup("ASCII");
|
|
54702 |
+ }
|
|
54703 |
+ }
|
|
54704 |
+
|
|
54705 |
+ /* Check UTF-8 code. */
|
|
54706 |
+ charset = I18n_detect_utf8(buf, bufsize);
|
|
54707 |
+ if (charset) return charset;
|
|
54708 |
+
|
|
54709 |
+ switch (detect_type) {
|
|
54710 |
+ case AD_ALL:
|
|
54711 |
+ /* TODO: implement this! */
|
|
54712 |
+ case AD_CHINESE:
|
|
54713 |
+ return I18n_detect_chinese_charset(buf, bufsize);
|
|
54714 |
+ case AD_KOREAN:
|
|
54715 |
+ return I18n_detect_korean_charset(buf, bufsize);
|
|
54716 |
+ case AD_JAPANESE:
|
|
54717 |
+ return I18n_detect_japanese_charset(buf, bufsize);
|
|
54718 |
+ case AD_NONE:
|
|
54719 |
+ default:
|
|
54720 |
+ return g_strdup(DW_CHARSET);
|
|
54721 |
+ }
|
|
54722 |
+}
|
|
54723 |
+
|
|
54724 |
+/* [hack] iconv with error recovery */
|
|
54725 |
+size_t a_I18n_iconv(iconv_t cd,
|
|
54726 |
+ char **inbuf, size_t *inbytesleft,
|
|
54727 |
+ char **outbuf, size_t *outbytesleft)
|
|
54728 |
+{
|
|
54729 |
+ size_t error_count = 0;
|
|
54730 |
+
|
|
54731 |
+ if (iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft)
|
|
54732 |
+ == (size_t)-1 && errno != EINVAL) {
|
|
54733 |
+ _MSG(_("unable to fully convert between character encodings\n"));
|
|
54734 |
+ /*
|
|
54735 |
+ * This just skips past unconvertable characters, putting white square
|
|
54736 |
+ * in the output, then retries the conversion.
|
|
54737 |
+ */
|
|
54738 |
+ while ((int)*inbytesleft > 0 && (int)*outbytesleft > 0
|
|
54739 |
+ && errno == EILSEQ) {
|
|
54740 |
+ error_count++;
|
|
54741 |
+ (*outbuf)[0] = '['; /* white square */
|
|
54742 |
+ (*outbuf)[1] = ']';
|
|
54743 |
+ *outbuf += 2;
|
|
54744 |
+ *outbytesleft -= 2;
|
|
54745 |
+ *inbuf += 2;
|
|
54746 |
+ *inbytesleft -= 2;
|
|
54747 |
+ if ((int)*inbytesleft > 0 && (int)*outbytesleft > 0)
|
|
54748 |
+ iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);
|
|
54749 |
+ }
|
|
54750 |
+ }
|
|
54751 |
+ *outbuf[0] = '\0';
|
|
54752 |
+ return error_count;
|
|
54753 |
+}
|
|
54754 |
+
|
|
54755 |
+
|
|
54756 |
+/* Charset Transrate. for the part which gives priority to speed.*/
|
|
54757 |
+gchar *a_I18n_convert_raw(iconv_t *it, const gchar* buf, size_t bufsize)
|
|
54758 |
+{
|
|
54759 |
+ size_t outLeft, outSize;
|
|
54760 |
+ gchar *outStart, *in, *out;
|
|
54761 |
+
|
|
54762 |
+ outLeft = bufsize * D_CHAR_GROWTH;
|
|
54763 |
+ outSize = outLeft + 1;
|
|
54764 |
+ if (!buf) return NULL;
|
|
54765 |
+ if (bufsize == 0) return g_strdup("");
|
|
54766 |
+
|
|
54767 |
+ outStart = (gchar *)g_malloc(outSize);
|
|
54768 |
+ in = (gchar *)buf;
|
|
54769 |
+ out = outStart;
|
|
54770 |
+
|
|
54771 |
+ if (!*it || *it==(iconv_t)-1) {
|
|
54772 |
+ g_warning(_("no support enc\n"));
|
|
54773 |
+ *it = iconv_open("ASCII", DILLO_CHARSET);
|
|
54774 |
+ }
|
|
54775 |
+ a_I18n_iconv(*it, &in, &bufsize, &out, &outLeft);
|
|
54776 |
+ _MSG("free %d bytes.\n", outSize - outLeft);
|
|
54777 |
+ return outStart = g_realloc(outStart, outSize - outLeft);
|
|
54778 |
+}
|
|
54779 |
+
|
|
54780 |
+/* Charset Transrate. for simple text or string.
|
|
54781 |
+ * if buf is nul-terminated, can set bufsize -1 */
|
|
54782 |
+gchar *a_I18n_convert(
|
|
54783 |
+ const gchar* from, const gchar* to,
|
|
54784 |
+ const gchar* buf, gint bufsize)
|
|
54785 |
+{
|
|
54786 |
+ iconv_t it;
|
|
54787 |
+ gchar *outBuf;
|
|
54788 |
+ gint len;
|
|
54789 |
+
|
|
54790 |
+ if (!buf) return NULL;
|
|
54791 |
+ if (bufsize == 0) return g_strdup("");
|
|
54792 |
+ g_return_val_if_fail(from && to, g_strndup(buf, bufsize));
|
|
54793 |
+ len = (bufsize == -1) ? (gint)strlen(buf) : bufsize;
|
|
54794 |
+ if (len < 0) {
|
|
54795 |
+ MSG("a_I18n_convert: bufsize < 0\n");
|
|
54796 |
+ return g_strdup(buf);
|
|
54797 |
+ }
|
|
54798 |
+ it = iconv_open(to, from);
|
|
54799 |
+ outBuf = a_I18n_convert_raw(&it, buf, len);
|
|
54800 |
+ iconv_close(it);
|
|
54801 |
+ return outBuf;
|
|
54802 |
+}
|
|
54803 |
+
|
|
54804 |
+/* Convert to Toolkit's charset. */
|
|
54805 |
+gchar *a_I18n_DW_CHARSET_from_DILLO_CHARSET(const gchar* buf, gint bufsize)
|
|
54806 |
+{
|
|
54807 |
+ return a_I18n_convert(DILLO_CHARSET, DW_CHARSET, buf, bufsize);
|
|
54808 |
+}
|
|
54809 |
+
|
|
54810 |
+/* Convert to internal charset. */
|
|
54811 |
+gchar *a_I18n_DW_CHARSET_to_DILLO_CHARSET(const gchar* buf, gint bufsize)
|
|
54812 |
+{
|
|
54813 |
+ return a_I18n_convert(DW_CHARSET, DILLO_CHARSET, buf, bufsize);
|
|
54814 |
+}
|
|
54815 |
+
|
|
54816 |
+/* For gettext string. */
|
|
54817 |
+gchar *a_I18n_locale_to_DILLO_CHARSET(const gchar* buf)
|
|
54818 |
+{
|
|
54819 |
+ return a_I18n_convert(LOCALE_CHARSET, DILLO_CHARSET, buf, -1);
|
|
54820 |
+}
|
|
54821 |
+
|
|
54822 |
+/* mblen() only for UTF-8 stream.
|
|
54823 |
+ * return multibyte char size. */
|
|
54824 |
+gint a_I18n_mblen(gchar *str)
|
|
54825 |
+{
|
|
54826 |
+ if (IS_UTF8_3BYTE_FIRST_CHAR(str[0])) {
|
|
54827 |
+ if (IS_UTF8_NON_FIRST_CHAR(str[1]))
|
|
54828 |
+ if (IS_UTF8_NON_FIRST_CHAR(str[2]))
|
|
54829 |
+ return 3;
|
|
54830 |
+ } else if(IS_UTF8_2BYTE_FIRST_CHAR(str[0])) {
|
|
54831 |
+ if (IS_UTF8_NON_FIRST_CHAR(str[1]))
|
|
54832 |
+ return 2;
|
|
54833 |
+ } else if(IS_UTF8_4BYTE_FIRST_CHAR(str[0])) {
|
|
54834 |
+ if (IS_UTF8_NON_FIRST_CHAR(str[1]))
|
|
54835 |
+ if (IS_UTF8_NON_FIRST_CHAR(str[2]))
|
|
54836 |
+ if (IS_UTF8_NON_FIRST_CHAR(str[3]))
|
|
54837 |
+ return 4;
|
|
54838 |
+ }
|
|
54839 |
+ return 0;
|
|
54840 |
+}
|
|
54841 |
+
|
|
54842 |
+/*
|
|
54843 |
+ * check invalid string, and repair.
|
|
54844 |
+ */
|
|
54845 |
+gchar *a_I18n_string_check(const gchar *input, const gchar *charset)
|
|
54846 |
+{
|
|
54847 |
+ gint i, len;
|
|
54848 |
+ gchar *ret, *str;
|
|
54849 |
+ GString *out = g_string_new("");
|
|
54850 |
+
|
|
54851 |
+ /* convert to same charset.
|
|
54852 |
+ * invalid chars will be replaced to white square. */
|
|
54853 |
+ str = a_I18n_convert(charset, charset, input, -1);
|
|
54854 |
+ len = (str) ? strlen(str) : 0;
|
|
54855 |
+
|
|
54856 |
+ /* skip white square. */
|
|
54857 |
+ for(i = 0; i < len; i++) {
|
|
54858 |
+ if ((guchar)str[i] == '[' && (guchar)str[i+1] == ']')
|
|
54859 |
+ i++;
|
|
54860 |
+ else
|
|
54861 |
+ g_string_append_c(out, str[i]);
|
|
54862 |
+ }
|
|
54863 |
+ g_free(str);
|
|
54864 |
+ ret = out->str;
|
|
54865 |
+ g_string_free(out, FALSE);
|
|
54866 |
+ return ret;
|
|
54867 |
+}
|
|
54868 |
+
|
|
54869 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
54870 |
diff -pruN dillo-0.8.6/src/i18n.h dillo-0.8.6-i18n-misc-20070916/src/i18n.h
|
|
54871 |
--- dillo-0.8.6/src/i18n.h 1970-01-01 09:00:00.000000000 +0900
|
|
54872 |
+++ dillo-0.8.6-i18n-misc-20070916/src/i18n.h 2006-05-16 01:21:09.000000000 +0900
|
|
54873 |
@@ -0,0 +1,71 @@
|
|
54874 |
+#ifndef __I18N_H__
|
|
54875 |
+#define __I18N_H__
|
|
54876 |
+
|
|
54877 |
+#include <gtk/gtk.h>
|
|
54878 |
+#include <stdlib.h> /* for getenv() */
|
|
54879 |
+#include <iconv.h>
|
|
54880 |
+
|
|
54881 |
+#ifdef __cplusplus
|
|
54882 |
+extern "C" {
|
|
54883 |
+#endif /* __cplusplus */
|
|
54884 |
+
|
|
54885 |
+#define IS_ASCII_CHAR(c) (!(((unsigned char)(c)) & 0x80))
|
|
54886 |
+
|
|
54887 |
+#define IS_UTF8_FIRST_CHAR(c) ((((unsigned char)(c)) >> 6) == 0x03)
|
|
54888 |
+#define IS_UTF8_NON_FIRST_CHAR(c) ((((unsigned char)(c)) >> 6) == 0x02)
|
|
54889 |
+#define IS_UTF8_2BYTE_FIRST_CHAR(c) ((((unsigned char)(c)) >> 5) == 0x06)
|
|
54890 |
+#define IS_UTF8_3BYTE_FIRST_CHAR(c) ((((unsigned char)(c)) >> 4) == 0x0E)
|
|
54891 |
+#define IS_UTF8_4BYTE_FIRST_CHAR(c) ((((unsigned char)(c)) >> 3) == 0x1E)
|
|
54892 |
+
|
|
54893 |
+#define IS_HANKANA_CHAR(c) \
|
|
54894 |
+ (((unsigned char)(c))>=0xa1 && ((unsigned char)(c))<=0xdf)
|
|
54895 |
+
|
|
54896 |
+#define IS_EUC_CHAR(c) \
|
|
54897 |
+((((unsigned char)(c))>=0xa0 && ((unsigned char)(c))<=0xfe) \
|
|
54898 |
+ || ((unsigned char)(c) == 0x8E)) //half width katakana
|
|
54899 |
+
|
|
54900 |
+#define IS_SJIS_CHAR1(c) \
|
|
54901 |
+ ((((unsigned char)(c))>=0x81 && ((unsigned char)(c))<=0x9f) \
|
|
54902 |
+ || (((unsigned char)(c))>=0xe0 && ((unsigned char)(c))<=0xef))
|
|
54903 |
+#define IS_SJIS_CHAR2(c) \
|
|
54904 |
+ (((unsigned char)(c))>=0x40 && ((unsigned char)(c))<=0xfc)
|
|
54905 |
+
|
|
54906 |
+#define DILLO_CHARSET "UTF-8"
|
|
54907 |
+#define D_CHAR_GROWTH 3
|
|
54908 |
+#define LOCALE_CHARSET (a_I18n_get_DW_charset())
|
|
54909 |
+#define DW_CHARSET LOCALE_CHARSET
|
|
54910 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
54911 |
+ #define RENDER_CHARSET "UTF-8"
|
|
54912 |
+#else
|
|
54913 |
+ #define RENDER_CHARSET DW_CHARSET
|
|
54914 |
+#endif
|
|
54915 |
+
|
|
54916 |
+void a_I18n_detect_DW_locale();
|
|
54917 |
+const gchar *a_I18n_get_DW_charset();
|
|
54918 |
+gboolean a_I18n_has_latin1_charset(gchar *lang);
|
|
54919 |
+gboolean a_I18n_use_CJK_charset(gchar *lang);
|
|
54920 |
+gchar *a_I18n_get_lang_from_charset(const gchar *charset);
|
|
54921 |
+gchar *a_I18n_fix_charset(gchar *charset);
|
|
54922 |
+gchar *a_I18n_get_charset_from_meta_tag(const gchar *buf, gint bufsize);
|
|
54923 |
+gchar *a_I18n_get_encoding(const gchar *buf, gint bufsize);
|
|
54924 |
+size_t a_I18n_iconv(iconv_t cd,
|
|
54925 |
+ char **inbuf, size_t *inbytesleft,
|
|
54926 |
+ char **outbuf, size_t *outbytesleft);
|
|
54927 |
+gchar *a_I18n_convert_raw(iconv_t *it, const gchar* buf, size_t bufsize);
|
|
54928 |
+gchar *a_I18n_convert(const gchar* from, const gchar* to, const gchar* buf, gint bufsize);
|
|
54929 |
+gint a_I18n_mblen(gchar *str);
|
|
54930 |
+gchar *a_I18n_string_check(const gchar *input, const gchar *charset);
|
|
54931 |
+gchar *a_I18n_DW_CHARSET_from_DILLO_CHARSET(const gchar* buf, gint bufsize);
|
|
54932 |
+gchar *a_I18n_DW_CHARSET_to_DILLO_CHARSET(const gchar* buf, gint bufsize);
|
|
54933 |
+gchar *a_I18n_locale_to_DILLO_CHARSET(const gchar* buf);
|
|
54934 |
+#define a_I18n_locale_from_DILLO_CHARSET \
|
|
54935 |
+ a_I18n_DW_CHARSET_from_DILLO_CHARSET
|
|
54936 |
+
|
|
54937 |
+#ifdef __cplusplus
|
|
54938 |
+}
|
|
54939 |
+#endif /* __cplusplus */
|
|
54940 |
+
|
|
54941 |
+
|
|
54942 |
+#endif /* __I18N_H__ */
|
|
54943 |
+
|
|
54944 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
54945 |
diff -pruN dillo-0.8.6/src/i18n_gtk.c dillo-0.8.6-i18n-misc-20070916/src/i18n_gtk.c
|
|
54946 |
--- dillo-0.8.6/src/i18n_gtk.c 1970-01-01 09:00:00.000000000 +0900
|
|
54947 |
+++ dillo-0.8.6-i18n-misc-20070916/src/i18n_gtk.c 2006-05-16 01:21:09.000000000 +0900
|
|
54948 |
@@ -0,0 +1,128 @@
|
|
54949 |
+/*
|
|
54950 |
+ * File: i18n_gtk.c
|
|
54951 |
+ *
|
|
54952 |
+ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
|
|
54953 |
+ *
|
|
54954 |
+ * This program is free software; you can redistribute it and/or modify
|
|
54955 |
+ * it under the terms of the GNU General Public License as published by
|
|
54956 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
54957 |
+ * (at your option) any later version.
|
|
54958 |
+ */
|
|
54959 |
+/* gtk+ UTF-8 wrapper. */
|
|
54960 |
+#include <string.h>
|
|
54961 |
+#include <gtk/gtk.h>
|
|
54962 |
+#include "i18n_gtk.h"
|
|
54963 |
+#include "i18n.h"
|
|
54964 |
+
|
|
54965 |
+#ifndef DISABLE_I18N
|
|
54966 |
+GtkWidget* a_I18n_gtk_label_new (const gchar *str) {
|
|
54967 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(str, -1);
|
|
54968 |
+ GtkWidget* widget = gtk_label_new(locale_str);
|
|
54969 |
+ g_free(locale_str);
|
|
54970 |
+ return widget;
|
|
54971 |
+}
|
|
54972 |
+
|
|
54973 |
+void a_I18n_gtk_label_set_text(GtkLabel *label, const gchar *str) {
|
|
54974 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(str, -1);
|
|
54975 |
+ gtk_label_set_text(label, locale_str);
|
|
54976 |
+ g_free(locale_str);
|
|
54977 |
+}
|
|
54978 |
+
|
|
54979 |
+void a_I18n_gtk_window_set_title(GtkWindow *window, const gchar *title) {
|
|
54980 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(title, -1);
|
|
54981 |
+ gtk_window_set_title(window, locale_str);
|
|
54982 |
+ g_free(locale_str);
|
|
54983 |
+}
|
|
54984 |
+
|
|
54985 |
+gchar* a_I18n_gtk_editable_get_chars(GtkEditable *editable,
|
|
54986 |
+ gint start_pos, gint end_pos) {
|
|
54987 |
+ gchar *locale_str = gtk_editable_get_chars(editable, start_pos, end_pos);
|
|
54988 |
+ gchar *utf8_str = a_I18n_locale_to_DILLO_CHARSET(locale_str);
|
|
54989 |
+ g_free(locale_str);
|
|
54990 |
+ return utf8_str;
|
|
54991 |
+}
|
|
54992 |
+
|
|
54993 |
+void a_I18n_gtk_editable_insert_text(GtkEditable *editable,
|
|
54994 |
+ const gchar *new_text, gint new_text_length,
|
|
54995 |
+ gint *position) {
|
|
54996 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(new_text,
|
|
54997 |
+ new_text_length);
|
|
54998 |
+ gtk_editable_insert_text(editable,
|
|
54999 |
+ locale_str, (!locale_str) ? 0 : strlen(locale_str), position);
|
|
55000 |
+ g_free(locale_str);
|
|
55001 |
+}
|
|
55002 |
+
|
|
55003 |
+GtkWidget* a_I18n_gtk_radio_menu_item_new_with_label(GSList *group,
|
|
55004 |
+ const gchar *label) {
|
|
55005 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(label, -1);
|
|
55006 |
+ GtkWidget* widget = gtk_radio_menu_item_new_with_label(group, locale_str);
|
|
55007 |
+ g_free(locale_str);
|
|
55008 |
+ return widget;
|
|
55009 |
+}
|
|
55010 |
+
|
|
55011 |
+GtkWidget* a_I18n_gtk_list_item_new_with_label(const gchar *label) {
|
|
55012 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(label, -1);
|
|
55013 |
+ GtkWidget* widget = gtk_list_item_new_with_label(locale_str);
|
|
55014 |
+ g_free(locale_str);
|
|
55015 |
+ return widget;
|
|
55016 |
+}
|
|
55017 |
+
|
|
55018 |
+void a_I18n_gtk_text_insert(GtkText *text, GdkFont *font,
|
|
55019 |
+ GdkColor *fore, GdkColor *back,
|
|
55020 |
+ const char *chars, gint length) {
|
|
55021 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(chars, length);
|
|
55022 |
+ gtk_text_insert(text, font, fore, back, locale_str,
|
|
55023 |
+ (!locale_str) ? 0 : strlen(locale_str));
|
|
55024 |
+ g_free(locale_str);
|
|
55025 |
+}
|
|
55026 |
+
|
|
55027 |
+GtkWidget* a_I18n_gtk_button_new_with_label(const gchar *label) {
|
|
55028 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(label, -1);
|
|
55029 |
+ GtkWidget* widget = gtk_button_new_with_label(locale_str);
|
|
55030 |
+ g_free(locale_str);
|
|
55031 |
+ return widget;
|
|
55032 |
+}
|
|
55033 |
+
|
|
55034 |
+void a_I18n_gtk_entry_set_text(GtkEntry *entry, const gchar *text) {
|
|
55035 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(text, -1);
|
|
55036 |
+ gtk_entry_set_text(entry, (locale_str)? locale_str : "");
|
|
55037 |
+ g_free(locale_str);
|
|
55038 |
+}
|
|
55039 |
+
|
|
55040 |
+gchar* a_I18n_gtk_entry_get_text(GtkEntry *entry) {
|
|
55041 |
+ gchar *locale_str = gtk_entry_get_text(entry);
|
|
55042 |
+ gchar *utf8_str = a_I18n_locale_to_DILLO_CHARSET(locale_str);
|
|
55043 |
+ return utf8_str;
|
|
55044 |
+}
|
|
55045 |
+
|
|
55046 |
+GtkWidget* a_I18n_gtk_menu_item_new_with_label(const gchar *label) {
|
|
55047 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(label, -1);
|
|
55048 |
+ GtkWidget* widget = gtk_menu_item_new_with_label(locale_str);
|
|
55049 |
+ g_free(locale_str);
|
|
55050 |
+ return widget;
|
|
55051 |
+}
|
|
55052 |
+
|
|
55053 |
+void a_I18n_gdk_draw_string (GdkDrawable *drawable,
|
|
55054 |
+ GdkFont *font,
|
|
55055 |
+ GdkGC *gc,
|
|
55056 |
+ gint x,
|
|
55057 |
+ gint y,
|
|
55058 |
+ const gchar *string) {
|
|
55059 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(string, -1);
|
|
55060 |
+ gdk_draw_string (drawable, font, gc, x, y, locale_str);
|
|
55061 |
+ g_free(locale_str);
|
|
55062 |
+}
|
|
55063 |
+
|
|
55064 |
+gint a_I18n_gdk_text_width (GdkFont *font,
|
|
55065 |
+ const gchar *text, gint text_length) {
|
|
55066 |
+ gchar *locale_str = a_I18n_locale_from_DILLO_CHARSET(text,
|
|
55067 |
+ text_length);
|
|
55068 |
+ gint len;
|
|
55069 |
+ if (!locale_str) return 0;
|
|
55070 |
+ len = gdk_text_width(font, locale_str, strlen(locale_str));
|
|
55071 |
+ g_free(locale_str);
|
|
55072 |
+ return len;
|
|
55073 |
+}
|
|
55074 |
+
|
|
55075 |
+#endif /* DISABLE_I18n */
|
|
55076 |
+
|
|
55077 |
diff -pruN dillo-0.8.6/src/i18n_gtk.h dillo-0.8.6-i18n-misc-20070916/src/i18n_gtk.h
|
|
55078 |
--- dillo-0.8.6/src/i18n_gtk.h 1970-01-01 09:00:00.000000000 +0900
|
|
55079 |
+++ dillo-0.8.6-i18n-misc-20070916/src/i18n_gtk.h 2006-05-16 01:21:09.000000000 +0900
|
|
55080 |
@@ -0,0 +1,67 @@
|
|
55081 |
+#ifndef __GTK_I18N__
|
|
55082 |
+#define __GTK_I18N__
|
|
55083 |
+
|
|
55084 |
+#include <gtk/gtk.h>
|
|
55085 |
+
|
|
55086 |
+#ifdef __cplusplus
|
|
55087 |
+extern "C" {
|
|
55088 |
+#endif /* __cplusplus */
|
|
55089 |
+
|
|
55090 |
+//#define DISABLE_I18N
|
|
55091 |
+#ifndef DISABLE_I18N
|
|
55092 |
+
|
|
55093 |
+/* GTK */
|
|
55094 |
+GtkWidget* a_I18n_gtk_label_new (const gchar *str);
|
|
55095 |
+void a_I18n_gtk_label_set_text (GtkLabel *label, const gchar *str);
|
|
55096 |
+void a_I18n_gtk_window_set_title (GtkWindow *window, const gchar *title);
|
|
55097 |
+gchar* a_I18n_gtk_editable_get_chars (GtkEditable *editable,
|
|
55098 |
+ gint start_pos, gint end_pos);
|
|
55099 |
+void a_I18n_gtk_editable_insert_text (GtkEditable *editable,
|
|
55100 |
+ const gchar *new_text, gint new_text_length,
|
|
55101 |
+ gint *position);
|
|
55102 |
+GtkWidget* a_I18n_gtk_radio_menu_item_new_with_label (GSList *group,
|
|
55103 |
+ const gchar *label);
|
|
55104 |
+GtkWidget* a_I18n_gtk_list_item_new_with_label (const gchar *label);
|
|
55105 |
+void a_I18n_gtk_text_insert (GtkText *text, GdkFont *font,
|
|
55106 |
+ GdkColor *fore, GdkColor *back,
|
|
55107 |
+ const char *chars, gint length);
|
|
55108 |
+GtkWidget* a_I18n_gtk_button_new_with_label (const gchar *label);
|
|
55109 |
+void a_I18n_gtk_entry_set_text (GtkEntry *entry, const gchar *text);
|
|
55110 |
+gchar* a_I18n_gtk_entry_get_text (GtkEntry *entry);
|
|
55111 |
+GtkWidget* a_I18n_gtk_menu_item_new_with_label (const gchar *label);
|
|
55112 |
+
|
|
55113 |
+/* GDK */
|
|
55114 |
+void a_I18n_gdk_draw_string (GdkDrawable *drawable,
|
|
55115 |
+ GdkFont *font,
|
|
55116 |
+ GdkGC *gc,
|
|
55117 |
+ gint x,
|
|
55118 |
+ gint y,
|
|
55119 |
+ const gchar *string);
|
|
55120 |
+gint a_I18n_gdk_text_width (GdkFont *font,
|
|
55121 |
+ const gchar *text, gint text_length);
|
|
55122 |
+
|
|
55123 |
+#else
|
|
55124 |
+#define a_I18n_gtk_label_new gtk_label_new
|
|
55125 |
+#define a_I18n_gtk_label_set_text gtk_label_set_text
|
|
55126 |
+#define a_I18n_gtk_window_set_title gtk_window_set_title
|
|
55127 |
+#define a_I18n_gtk_editable_get_chars gtk_editable_get_chars
|
|
55128 |
+#define a_I18n_gtk_editable_insert_text gtk_editable_insert_text
|
|
55129 |
+#define a_I18n_gtk_radio_menu_item_new_with_label \
|
|
55130 |
+ gtk_radio_menu_item_new_with_label
|
|
55131 |
+#define a_I18n_gtk_list_item_new_with_label gtk_list_item_new_with_label
|
|
55132 |
+#define a_I18n_gtk_text_insert gtk_text_insert
|
|
55133 |
+#define a_I18n_gtk_button_new_with_label gtk_button_new_with_label
|
|
55134 |
+#define a_I18n_gtk_entry_set_text gtk_entry_set_text
|
|
55135 |
+#define a_I18n_gtk_entry_get_text gtk_entry_get_text
|
|
55136 |
+#define a_I18n_gtk_menu_item_new_with_label gtk_menu_item_new_with_label
|
|
55137 |
+#define a_I18n_gdk_draw_string gdk_draw_string
|
|
55138 |
+#define a_I18n_gdk_text_width gdk_text_width
|
|
55139 |
+#endif /* DISABLE_I18n */
|
|
55140 |
+
|
|
55141 |
+#define a_I18n_gtk_label_set a_I18n_gtk_label_set_text
|
|
55142 |
+
|
|
55143 |
+#ifdef __cplusplus
|
|
55144 |
+}
|
|
55145 |
+#endif /* __cplusplus */
|
|
55146 |
+
|
|
55147 |
+#endif /* __GTK_I18N__ */
|
|
55148 |
diff -pruN dillo-0.8.6/src/image.c dillo-0.8.6-i18n-misc-20070916/src/image.c
|
|
55149 |
--- dillo-0.8.6/src/image.c 2005-10-28 01:20:13.000000000 +0900
|
|
55150 |
+++ dillo-0.8.6-i18n-misc-20070916/src/image.c 2006-05-16 01:21:09.000000000 +0900
|
|
55151 |
@@ -51,7 +51,7 @@ DilloImage *a_Image_new(gint width,
|
|
55152 |
Image->State = IMG_Empty;
|
|
55153 |
|
|
55154 |
Image->RefCount = 1;
|
|
55155 |
-
|
|
55156 |
+
|
|
55157 |
return Image;
|
|
55158 |
}
|
|
55159 |
|
|
55160 |
diff -pruN dillo-0.8.6/src/interface.c dillo-0.8.6-i18n-misc-20070916/src/interface.c
|
|
55161 |
--- dillo-0.8.6/src/interface.c 2005-12-02 21:40:44.000000000 +0900
|
|
55162 |
+++ dillo-0.8.6-i18n-misc-20070916/src/interface.c 2006-07-09 00:46:26.000000000 +0900
|
|
55163 |
@@ -20,18 +20,24 @@
|
|
55164 |
#include <sys/time.h>
|
|
55165 |
#include <fcntl.h>
|
|
55166 |
|
|
55167 |
+#include "intl.h"
|
|
55168 |
#include "msg.h"
|
|
55169 |
#include "list.h"
|
|
55170 |
#include "misc.h"
|
|
55171 |
+#include "i18n.h"
|
|
55172 |
+#include "i18n_gtk.h"
|
|
55173 |
#include "dillo.h"
|
|
55174 |
#include "history.h"
|
|
55175 |
#include "nav.h"
|
|
55176 |
+#include "doc.h"
|
|
55177 |
#include "IO/Url.h"
|
|
55178 |
#include "IO/IO.h"
|
|
55179 |
#include "interface.h"
|
|
55180 |
+#ifndef DISABLE_TABS
|
|
55181 |
+#include "tab.h"
|
|
55182 |
+#endif /* !DISABLE_TABS */
|
|
55183 |
#include "commands.h"
|
|
55184 |
#include "menu.h"
|
|
55185 |
-#include "bookmark.h"
|
|
55186 |
#include "prefs.h"
|
|
55187 |
#include "url.h"
|
|
55188 |
#include "capi.h"
|
|
55189 |
@@ -52,6 +58,7 @@
|
|
55190 |
#include "debug.h"
|
|
55191 |
|
|
55192 |
|
|
55193 |
+void Interface_add_search_dialog(BrowserWindow *bw);
|
|
55194 |
/*
|
|
55195 |
* Local Data
|
|
55196 |
*/
|
|
55197 |
@@ -69,6 +76,8 @@ static gchar *open_dialog_last_dirname =
|
|
55198 |
/* save dialog last dir */
|
|
55199 |
static gchar *save_dialog_last_dirname = NULL;
|
|
55200 |
|
|
55201 |
+/* Keep to close find_text_dialog. */
|
|
55202 |
+static GtkWidget *find_text_window;
|
|
55203 |
|
|
55204 |
/*
|
|
55205 |
* Initialize global data
|
|
55206 |
@@ -83,93 +92,8 @@ void a_Interface_init(void)
|
|
55207 |
save_dialog_last_dirname = NULL;
|
|
55208 |
}
|
|
55209 |
|
|
55210 |
-/*
|
|
55211 |
- * Stop all active connections in the browser window (except downloads)
|
|
55212 |
- */
|
|
55213 |
-void a_Interface_stop(BrowserWindow *bw)
|
|
55214 |
-{
|
|
55215 |
- DEBUG_MSG(3, "a_Interface_stop: hi!\n");
|
|
55216 |
-
|
|
55217 |
- /* Remove root clients */
|
|
55218 |
- while ( bw->NumRootClients ) {
|
|
55219 |
- a_Cache_stop_client(bw->RootClients[0]);
|
|
55220 |
- a_List_remove(bw->RootClients, 0, bw->NumRootClients);
|
|
55221 |
- }
|
|
55222 |
- /* Remove image clients */
|
|
55223 |
- while ( bw->NumImageClients ) {
|
|
55224 |
- a_Cache_stop_client(bw->ImageClients[0]);
|
|
55225 |
- a_List_remove(bw->ImageClients, 0, bw->NumImageClients);
|
|
55226 |
- }
|
|
55227 |
-}
|
|
55228 |
-
|
|
55229 |
-/*
|
|
55230 |
- * Empty RootClients, ImageClients and PageUrls lists and
|
|
55231 |
- * reset progress bar data.
|
|
55232 |
- */
|
|
55233 |
-void a_Interface_clean(BrowserWindow *bw)
|
|
55234 |
-{
|
|
55235 |
- g_return_if_fail ( bw != NULL );
|
|
55236 |
-
|
|
55237 |
- while ( bw->NumRootClients )
|
|
55238 |
- a_List_remove(bw->RootClients, 0, bw->NumRootClients);
|
|
55239 |
-
|
|
55240 |
- while ( bw->NumImageClients )
|
|
55241 |
- a_List_remove(bw->ImageClients, 0, bw->NumImageClients);
|
|
55242 |
-
|
|
55243 |
- while ( bw->NumPageUrls ) {
|
|
55244 |
- a_Url_free(bw->PageUrls[0].Url);
|
|
55245 |
- a_List_remove(bw->PageUrls, 0, bw->NumPageUrls);
|
|
55246 |
- }
|
|
55247 |
-
|
|
55248 |
- /* Zero image-progressbar data */
|
|
55249 |
- bw->NumImages = 0;
|
|
55250 |
- bw->NumImagesGot = 0;
|
|
55251 |
-}
|
|
55252 |
-
|
|
55253 |
/*=== Browser Window Interface Updating =====================================*/
|
|
55254 |
/*
|
|
55255 |
- * Remove the cache-client from the bw list
|
|
55256 |
- * (client can be a image or a html page)
|
|
55257 |
- */
|
|
55258 |
-void a_Interface_remove_client(BrowserWindow *bw, gint ClientKey)
|
|
55259 |
-{
|
|
55260 |
- gint i;
|
|
55261 |
- gboolean Found = FALSE;
|
|
55262 |
-
|
|
55263 |
- for ( i = 0; !Found && i < bw->NumRootClients; ++i)
|
|
55264 |
- if ( bw->RootClients[i] == ClientKey ) {
|
|
55265 |
- a_List_remove(bw->RootClients, i, bw->NumRootClients);
|
|
55266 |
- Found = TRUE;
|
|
55267 |
- }
|
|
55268 |
-
|
|
55269 |
- for ( i = 0; !Found && i < bw->NumImageClients; ++i)
|
|
55270 |
- if ( bw->ImageClients[i] == ClientKey ) {
|
|
55271 |
- a_List_remove(bw->ImageClients, i, bw->NumImageClients);
|
|
55272 |
- bw->NumImagesGot++;
|
|
55273 |
- Found = TRUE;
|
|
55274 |
- }
|
|
55275 |
-
|
|
55276 |
- a_Interface_set_button_sens(bw);
|
|
55277 |
-}
|
|
55278 |
-
|
|
55279 |
-/*
|
|
55280 |
- * Remove the cache-client from the bw list
|
|
55281 |
- * (client can be a image or a html page)
|
|
55282 |
- */
|
|
55283 |
-void a_Interface_close_client(BrowserWindow *bw, gint ClientKey)
|
|
55284 |
-{
|
|
55285 |
- gchar numstr[32];
|
|
55286 |
-
|
|
55287 |
- a_Interface_remove_client(bw, ClientKey);
|
|
55288 |
-
|
|
55289 |
- /* --Progress bars stuff-- */
|
|
55290 |
- g_snprintf(numstr, 32, "%s%d of %d", PBAR_ISTR(prefs.panel_size == 1),
|
|
55291 |
- bw->NumImagesGot, bw->NumImages);
|
|
55292 |
- a_Progressbar_update(bw->imgprogress, numstr,
|
|
55293 |
- (bw->NumImagesGot == bw->NumImages) ? 0 : 1 );
|
|
55294 |
-}
|
|
55295 |
-
|
|
55296 |
-/*
|
|
55297 |
* Set the sensitivity on back/forw buttons and menu entries.
|
|
55298 |
*/
|
|
55299 |
static gint Interface_sens_idle_func(BrowserWindow *bw)
|
|
55300 |
@@ -177,16 +101,27 @@ static gint Interface_sens_idle_func(Bro
|
|
55301 |
gboolean back_sensitive, forw_sensitive, stop_sensitive;
|
|
55302 |
|
|
55303 |
/* Stop button */
|
|
55304 |
- stop_sensitive = (bw->NumRootClients > 0);
|
|
55305 |
+ stop_sensitive = (bw->dd->NumRootClients > 0);
|
|
55306 |
gtk_widget_set_sensitive(bw->stop_button, stop_sensitive);
|
|
55307 |
|
|
55308 |
+
|
|
55309 |
/* Back and Forward buttons */
|
|
55310 |
- back_sensitive = a_Nav_stack_ptr(bw) > 0;
|
|
55311 |
+ back_sensitive = a_Nav_stack_ptr(bw->dd) > 0;
|
|
55312 |
gtk_widget_set_sensitive(bw->back_button, back_sensitive);
|
|
55313 |
- forw_sensitive = (a_Nav_stack_ptr(bw) < a_Nav_stack_size(bw) - 1 &&
|
|
55314 |
- !bw->nav_expecting);
|
|
55315 |
+ forw_sensitive = (a_Nav_stack_ptr(bw->dd) < a_Nav_stack_size(bw->dd) - 1 &&
|
|
55316 |
+ !bw->dd->nav_expecting);
|
|
55317 |
gtk_widget_set_sensitive(bw->forw_button, forw_sensitive);
|
|
55318 |
|
|
55319 |
+ if(prefs.show_popup_navigation) {
|
|
55320 |
+ /* adjust popup menu buttons */
|
|
55321 |
+ if (GTK_IS_WIDGET(bw->stop_op_menu_button))
|
|
55322 |
+ gtk_widget_set_sensitive(bw->stop_op_menu_button, stop_sensitive);
|
|
55323 |
+ if (GTK_IS_WIDGET(bw->back_op_menu_button))
|
|
55324 |
+ gtk_widget_set_sensitive(bw->back_op_menu_button, back_sensitive);
|
|
55325 |
+ if (GTK_IS_WIDGET(bw->forw_op_menu_button))
|
|
55326 |
+ gtk_widget_set_sensitive(bw->forw_op_menu_button, forw_sensitive);
|
|
55327 |
+ }
|
|
55328 |
+
|
|
55329 |
bw->sens_idle_id = 0;
|
|
55330 |
return FALSE;
|
|
55331 |
}
|
|
55332 |
@@ -202,85 +137,18 @@ void a_Interface_set_button_sens(Browser
|
|
55333 |
}
|
|
55334 |
|
|
55335 |
/*
|
|
55336 |
- * Add a reference to the cache-client in the browser window's list.
|
|
55337 |
- * This helps us keep track of which are active in the window so that it's
|
|
55338 |
- * possible to abort them.
|
|
55339 |
- * (Root: Flag, whether a Root URL or not)
|
|
55340 |
- */
|
|
55341 |
-void a_Interface_add_client(BrowserWindow *bw, gint Key, gint Root)
|
|
55342 |
-{
|
|
55343 |
- gint nc;
|
|
55344 |
- char numstr[32];
|
|
55345 |
-
|
|
55346 |
- g_return_if_fail ( bw != NULL );
|
|
55347 |
-
|
|
55348 |
- if ( Root ) {
|
|
55349 |
- nc = bw->NumRootClients;
|
|
55350 |
- a_List_add(bw->RootClients, nc, bw->MaxRootClients);
|
|
55351 |
- bw->RootClients[nc] = Key;
|
|
55352 |
- bw->NumRootClients++;
|
|
55353 |
- a_Interface_set_button_sens(bw);
|
|
55354 |
- } else {
|
|
55355 |
- nc = bw->NumImageClients;
|
|
55356 |
- a_List_add(bw->ImageClients, nc, bw->MaxImageClients);
|
|
55357 |
- bw->ImageClients[nc] = Key;
|
|
55358 |
- bw->NumImageClients++;
|
|
55359 |
- bw->NumImages++;
|
|
55360 |
- a_Interface_set_button_sens(bw);
|
|
55361 |
-
|
|
55362 |
- /* --Progress bar stuff-- */
|
|
55363 |
- g_snprintf(numstr, 32, "%s%d of %d", PBAR_ISTR(prefs.panel_size == 1),
|
|
55364 |
- bw->NumImagesGot, bw->NumImages);
|
|
55365 |
- a_Progressbar_update(bw->imgprogress, numstr, 1);
|
|
55366 |
- }
|
|
55367 |
-}
|
|
55368 |
-
|
|
55369 |
-/*
|
|
55370 |
- * Add an URL to the browser window's list.
|
|
55371 |
- * This helps us keep track of page requested URLs so that it's
|
|
55372 |
- * possible to stop, abort and reload them.)
|
|
55373 |
- * Flags: Chosen from {BW_Root, BW_Image, BW_Download}
|
|
55374 |
- */
|
|
55375 |
-void a_Interface_add_url(BrowserWindow *bw, const DilloUrl *Url, gint Flags)
|
|
55376 |
-{
|
|
55377 |
- gint nu, i;
|
|
55378 |
- gboolean found = FALSE;
|
|
55379 |
-
|
|
55380 |
- g_return_if_fail ( bw != NULL && Url != NULL );
|
|
55381 |
-
|
|
55382 |
- nu = bw->NumPageUrls;
|
|
55383 |
- for ( i = 0; i < nu; i++ ) {
|
|
55384 |
- if ( !a_Url_cmp(Url, bw->PageUrls[i].Url) ) {
|
|
55385 |
- found = TRUE;
|
|
55386 |
- break;
|
|
55387 |
- }
|
|
55388 |
- }
|
|
55389 |
- if ( !found ) {
|
|
55390 |
- a_List_add(bw->PageUrls, nu, bw->MaxPageUrls);
|
|
55391 |
- bw->PageUrls[nu].Url = a_Url_dup(Url);
|
|
55392 |
- bw->PageUrls[nu].Flags = Flags;
|
|
55393 |
- bw->NumPageUrls++;
|
|
55394 |
- }
|
|
55395 |
-
|
|
55396 |
- /* test:
|
|
55397 |
- MSG("Urls:\n");
|
|
55398 |
- for (i = 0; i < bw->NumPageUrls; i++)
|
|
55399 |
- MSG("%s\n", bw->PageUrls[i].Url);
|
|
55400 |
- MSG("---\n");
|
|
55401 |
- */
|
|
55402 |
-}
|
|
55403 |
-
|
|
55404 |
-/*
|
|
55405 |
- * Remove a single browser window. This includes all its open childs,
|
|
55406 |
+ * Remove a single browser window. This includes all its open documents,
|
|
55407 |
* freeing all resources associated with them, and exiting gtk
|
|
55408 |
* if no browser windows are left.
|
|
55409 |
*/
|
|
55410 |
static gboolean Interface_quit(GtkWidget *widget, BrowserWindow *bw)
|
|
55411 |
{
|
|
55412 |
gint i;
|
|
55413 |
-
|
|
55414 |
- /* stop/abort open connections. */
|
|
55415 |
- a_Interface_stop(bw);
|
|
55416 |
+ a_Interface_findtext_dialog_close();
|
|
55417 |
+ /* destroy the container. It should take all its contents with
|
|
55418 |
+ * it, relying on callbacks to destroy non-widget data
|
|
55419 |
+ */
|
|
55420 |
+ gtk_widget_destroy(GTK_WIDGET(bw->container));
|
|
55421 |
|
|
55422 |
g_slist_free(bw->PanelHandles);
|
|
55423 |
|
|
55424 |
@@ -290,14 +158,16 @@ static gboolean Interface_quit(GtkWidget
|
|
55425 |
gtk_widget_destroy(bw->openfile_dialog_window);
|
|
55426 |
if (bw->quit_dialog_window != NULL)
|
|
55427 |
gtk_widget_destroy(bw->quit_dialog_window);
|
|
55428 |
- if (bw->findtext_dialog_window != NULL)
|
|
55429 |
- gtk_widget_destroy(bw->findtext_dialog_window);
|
|
55430 |
+ if (bw->findtext_dialog != NULL)
|
|
55431 |
+ gtk_widget_destroy(bw->findtext_dialog);
|
|
55432 |
if (bw->search_dialog_window != NULL)
|
|
55433 |
gtk_widget_destroy(bw->search_dialog_window);
|
|
55434 |
if (bw->proxy_passwd_dialog_window != NULL)
|
|
55435 |
gtk_widget_destroy(bw->proxy_passwd_dialog_window);
|
|
55436 |
if (bw->question_dialog_window != NULL)
|
|
55437 |
gtk_widget_destroy(bw->question_dialog_window);
|
|
55438 |
+ if (bw->passwd_dialog_window != NULL)
|
|
55439 |
+ gtk_widget_destroy(bw->passwd_dialog_window);
|
|
55440 |
|
|
55441 |
if (bw->menu_popup.over_page)
|
|
55442 |
gtk_widget_destroy(bw->menu_popup.over_page);
|
|
55443 |
@@ -310,29 +180,25 @@ static gboolean Interface_quit(GtkWidget
|
|
55444 |
gtk_widget_destroy(bw->menu_popup.over_forw);
|
|
55445 |
if (bw->menu_popup.over_bug)
|
|
55446 |
gtk_widget_destroy(bw->menu_popup.over_bug);
|
|
55447 |
+#ifndef DISABLE_TABS
|
|
55448 |
+ if (bw->menu_popup.over_tab)
|
|
55449 |
+ gtk_widget_destroy(bw->menu_popup.over_tab);
|
|
55450 |
+#endif /* !DISABLE_TABS */
|
|
55451 |
if (bw->menu_popup.url)
|
|
55452 |
a_Url_free(bw->menu_popup.url);
|
|
55453 |
if (bw->menu_popup.url2)
|
|
55454 |
a_Url_free(bw->menu_popup.url2);
|
|
55455 |
-
|
|
55456 |
+
|
|
55457 |
if (bw->sens_idle_id)
|
|
55458 |
gtk_idle_remove(bw->sens_idle_id);
|
|
55459 |
|
|
55460 |
+
|
|
55461 |
for (i = 0; i < num_bw; i++)
|
|
55462 |
if (browser_window[i] == bw) {
|
|
55463 |
browser_window[i] = browser_window[--num_bw];
|
|
55464 |
break;
|
|
55465 |
}
|
|
55466 |
|
|
55467 |
- /* free nav_stack and nav_expect stuff */
|
|
55468 |
- a_Nav_free(bw);
|
|
55469 |
-
|
|
55470 |
- g_free(bw->RootClients);
|
|
55471 |
- g_free(bw->ImageClients);
|
|
55472 |
-
|
|
55473 |
- for (i = 0; i < bw->NumPageUrls; i++)
|
|
55474 |
- a_Url_free(bw->PageUrls[i].Url);
|
|
55475 |
- g_free(bw->PageUrls);
|
|
55476 |
g_free(bw);
|
|
55477 |
|
|
55478 |
if (num_bw == 0)
|
|
55479 |
@@ -349,7 +215,7 @@ static gboolean Interface_quit(GtkWidget
|
|
55480 |
*/
|
|
55481 |
static void Interface_entry_clear(GtkEntry *entry)
|
|
55482 |
{
|
|
55483 |
- gtk_entry_set_text(entry, "");
|
|
55484 |
+ a_I18n_gtk_entry_set_text(entry, "");
|
|
55485 |
gtk_widget_grab_focus(GTK_WIDGET(entry));
|
|
55486 |
}
|
|
55487 |
|
|
55488 |
@@ -380,13 +246,14 @@ static void Interface_cub_selection_rece
|
|
55489 |
_MSG("Interface_cub_selection_received:\n");
|
|
55490 |
|
|
55491 |
if (selection_data->length < 0) {
|
|
55492 |
- DEBUG_MSG (1, "Selection retrieval failed\n");
|
|
55493 |
+ DEBUG_MSG (1, _("Selection retrieval failed\n"));
|
|
55494 |
return;
|
|
55495 |
}
|
|
55496 |
-
|
|
55497 |
- damn_string = g_strndup((gchar *)selection_data->data,
|
|
55498 |
+
|
|
55499 |
+ damn_string = a_I18n_locale_from_DILLO_CHARSET(
|
|
55500 |
+ (gchar *)selection_data->data,
|
|
55501 |
selection_data->length);
|
|
55502 |
- gtk_entry_set_text(GTK_ENTRY(bw->location), damn_string);
|
|
55503 |
+ a_I18n_gtk_entry_set_text(GTK_ENTRY(bw->location), damn_string);
|
|
55504 |
gtk_widget_activate(GTK_WIDGET(bw->location));
|
|
55505 |
g_free(damn_string);
|
|
55506 |
|
|
55507 |
@@ -453,21 +320,6 @@ static GtkWidget *Interface_toolbox_ext_
|
|
55508 |
}
|
|
55509 |
|
|
55510 |
/*
|
|
55511 |
- * Set the bw's cursor type
|
|
55512 |
- */
|
|
55513 |
-void a_Interface_set_cursor(BrowserWindow *bw, GdkCursorType CursorType)
|
|
55514 |
-{
|
|
55515 |
- GdkCursor *cursor;
|
|
55516 |
-
|
|
55517 |
- if ( bw->CursorType != CursorType ) {
|
|
55518 |
- cursor = gdk_cursor_new(CursorType);
|
|
55519 |
- gdk_window_set_cursor(bw->docwin->window, cursor);
|
|
55520 |
- gdk_cursor_destroy(cursor);
|
|
55521 |
- bw->CursorType = CursorType;
|
|
55522 |
- }
|
|
55523 |
-}
|
|
55524 |
-
|
|
55525 |
-/*
|
|
55526 |
* Connect button's "clicked" event with (key, key_mod) pair.
|
|
55527 |
*/
|
|
55528 |
static void Interface_set_button_accel(GtkButton *button,
|
|
55529 |
@@ -508,8 +360,8 @@ static GtkWidget *Interface_locbar_new(B
|
|
55530 |
a_Gtk_ext_button_set_command(GTK_EXT_BUTTON(bw->clear_url_button), 2);
|
|
55531 |
|
|
55532 |
gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar_l), bw->clear_url_button,
|
|
55533 |
- "Clear the URL box (middle-click to paste an "
|
|
55534 |
- "URL).", "Toolbar/Clear");
|
|
55535 |
+ _("Clear the URL box (middle-click to paste an "
|
|
55536 |
+ "URL)."), "Toolbar/Clear");
|
|
55537 |
gtk_signal_connect_object(GTK_OBJECT(bw->clear_url_button), "clicked",
|
|
55538 |
GTK_SIGNAL_FUNC (Interface_entry_clear),
|
|
55539 |
GTK_OBJECT(bw->location));
|
|
55540 |
@@ -530,7 +382,7 @@ static GtkWidget *Interface_locbar_new(B
|
|
55541 |
|
|
55542 |
bw->search_button = gtk_toolbar_append_item(
|
|
55543 |
GTK_TOOLBAR(toolbar_r),
|
|
55544 |
- NULL, "Search the Web", "Toolbar/New",
|
|
55545 |
+ NULL, _("Search the Web"), "Toolbar/New",
|
|
55546 |
Interface_pixmap_new(bw->main_window, search_xpm),
|
|
55547 |
GTK_SIGNAL_FUNC(a_Interface_search_dialog),
|
|
55548 |
bw);
|
|
55549 |
@@ -562,11 +414,11 @@ static GtkWidget *Interface_toolbar_new(
|
|
55550 |
|
|
55551 |
/* back button */
|
|
55552 |
bw->back_button =
|
|
55553 |
- Interface_toolbox_ext_button_new(bw->main_window, label ? "Back" : NULL,
|
|
55554 |
+ Interface_toolbox_ext_button_new(bw->main_window, label ? _("Back") : NULL,
|
|
55555 |
s ? s_left_xpm : left_xpm,
|
|
55556 |
&label_widget, &icon_widget);
|
|
55557 |
gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), bw->back_button,
|
|
55558 |
- "Go to previous page (right-click for menu).",
|
|
55559 |
+ _("Go to previous page (right-click for menu)."),
|
|
55560 |
"Toolbar/Back");
|
|
55561 |
gtk_widget_set_sensitive(bw->back_button, FALSE);
|
|
55562 |
Interface_set_button_accel(GTK_BUTTON(bw->back_button), GDK_comma,
|
|
55563 |
@@ -595,11 +447,11 @@ static GtkWidget *Interface_toolbar_new(
|
|
55564 |
/* forward button */
|
|
55565 |
bw->forw_button =
|
|
55566 |
Interface_toolbox_ext_button_new(bw->main_window,
|
|
55567 |
- label ? "Forward" : NULL,
|
|
55568 |
+ label ? _("Forward") : NULL,
|
|
55569 |
s ? s_right_xpm : right_xpm,
|
|
55570 |
&label_widget, &icon_widget);
|
|
55571 |
gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), bw->forw_button,
|
|
55572 |
- "Go to next page (right-click for menu).",
|
|
55573 |
+ _("Go to next page (right-click for menu)."),
|
|
55574 |
"Toolbar/Forward");
|
|
55575 |
gtk_widget_set_sensitive(bw->forw_button, FALSE);
|
|
55576 |
Interface_set_button_accel(GTK_BUTTON(bw->forw_button), GDK_period,
|
|
55577 |
@@ -624,67 +476,81 @@ static GtkWidget *Interface_toolbar_new(
|
|
55578 |
toolbar_child->label = label_widget;
|
|
55579 |
|
|
55580 |
/* home button */
|
|
55581 |
- bw->home_button = gtk_toolbar_append_item(
|
|
55582 |
- GTK_TOOLBAR(toolbar),
|
|
55583 |
- label ? "Home" : NULL,
|
|
55584 |
- "Go to the Home page", "Toolbar/Home",
|
|
55585 |
- Interface_pixmap_new(bw->main_window,
|
|
55586 |
- s ? s_home_xpm : home_xpm),
|
|
55587 |
- (GtkSignalFunc) a_Commands_home_callback, bw);
|
|
55588 |
- /*
|
|
55589 |
- * SG: This had never any effect, was it there for future extensions?
|
|
55590 |
- * gtk_signal_connect(GTK_OBJECT(bw->home_button), "button-press-event",
|
|
55591 |
- * GTK_SIGNAL_FUNC(a_Commands_navpress_callback), bw);
|
|
55592 |
- */
|
|
55593 |
+ bw->home_button =
|
|
55594 |
+ Interface_toolbox_ext_button_new(bw->main_window,
|
|
55595 |
+ label ? _("Home") : NULL,
|
|
55596 |
+ s ? s_home_xpm : home_xpm,
|
|
55597 |
+ &label_widget, &icon_widget);
|
|
55598 |
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), bw->home_button,
|
|
55599 |
+ _("Go to the Home page"),
|
|
55600 |
+ "Toolbar/Home");
|
|
55601 |
+ a_Gtk_ext_button_set_command(GTK_EXT_BUTTON(bw->home_button), 1);
|
|
55602 |
+ a_Gtk_ext_button_set_command(GTK_EXT_BUTTON(bw->home_button), 2);
|
|
55603 |
+ gtk_signal_connect(GTK_OBJECT(bw->home_button), "clicked",
|
|
55604 |
+ GTK_SIGNAL_FUNC(a_Commands_home_callback), (gpointer)bw);
|
|
55605 |
+ gtk_signal_connect(GTK_OBJECT(bw->home_button), "clicked1",
|
|
55606 |
+ GTK_SIGNAL_FUNC(a_Commands_home_callback), (gpointer)bw);
|
|
55607 |
+ gtk_signal_connect(GTK_OBJECT(bw->home_button), "clicked2",
|
|
55608 |
+ GTK_SIGNAL_FUNC(a_Commands_home_nw_callback), (gpointer)bw);
|
|
55609 |
|
|
55610 |
/* reload button */
|
|
55611 |
bw->reload_button = gtk_toolbar_append_item(
|
|
55612 |
GTK_TOOLBAR(toolbar),
|
|
55613 |
- label ? "Reload" : NULL,
|
|
55614 |
- "Reload this page", "Toolbar/Reload",
|
|
55615 |
+ label ? _("Reload") : NULL,
|
|
55616 |
+ _("Reload this page"), "Toolbar/Reload",
|
|
55617 |
Interface_pixmap_new(bw->main_window,
|
|
55618 |
s ? s_reload_xpm : reload_xpm),
|
|
55619 |
(GtkSignalFunc) a_Commands_reload_callback, bw);
|
|
55620 |
Interface_set_button_accel(GTK_BUTTON(bw->reload_button), GDK_r,
|
|
55621 |
GDK_CONTROL_MASK, bw->accel_group);
|
|
55622 |
+ Interface_set_button_accel(GTK_BUTTON(bw->reload_button), GDK_F5,
|
|
55623 |
+ 0, bw->accel_group);
|
|
55624 |
|
|
55625 |
/* save button */
|
|
55626 |
bw->save_button = gtk_toolbar_append_item(
|
|
55627 |
GTK_TOOLBAR(toolbar),
|
|
55628 |
- label ? "Save" : NULL,
|
|
55629 |
- "Save this page", "Toolbar/Save",
|
|
55630 |
+ label ? _("Save") : NULL,
|
|
55631 |
+ _("Save this page"), "Toolbar/Save",
|
|
55632 |
Interface_pixmap_new(bw->main_window,
|
|
55633 |
s ? s_save_xpm : save_xpm),
|
|
55634 |
(GtkSignalFunc) a_Commands_save_callback, bw);
|
|
55635 |
/* stop button */
|
|
55636 |
bw->stop_button = gtk_toolbar_append_item(
|
|
55637 |
GTK_TOOLBAR(toolbar),
|
|
55638 |
- label ? "Stop" : NULL,
|
|
55639 |
- "Stop the current transfer", "Toolbar/Stop",
|
|
55640 |
+ label ? _("Stop") : NULL,
|
|
55641 |
+ _("Stop the current transfer"), "Toolbar/Stop",
|
|
55642 |
Interface_pixmap_new(bw->main_window,
|
|
55643 |
s ? s_stop_xpm : stop_xpm),
|
|
55644 |
(GtkSignalFunc) a_Commands_stop_callback, bw);
|
|
55645 |
gtk_widget_set_sensitive(bw->stop_button, FALSE);
|
|
55646 |
+ /*
|
|
55647 |
+ Interface_set_button_accel(GTK_BUTTON(bw->stop_button), GDK_Escape,
|
|
55648 |
+ 0, bw->accel_group);
|
|
55649 |
+ */
|
|
55650 |
|
|
55651 |
/* bookmarks button */
|
|
55652 |
- bw->bookmarks_button = gtk_toolbar_append_item(
|
|
55653 |
- GTK_TOOLBAR(toolbar),
|
|
55654 |
- label ? "Book" : NULL,
|
|
55655 |
- "View bookmarks", "Toolbar/Bookmarks",
|
|
55656 |
- Interface_pixmap_new(bw->main_window,
|
|
55657 |
- s ? s_bm_xpm : bm_xpm),
|
|
55658 |
- (GtkSignalFunc) a_Commands_viewbm_callback, bw);
|
|
55659 |
+ bw->bookmarks_button =
|
|
55660 |
+ Interface_toolbox_ext_button_new(bw->main_window,
|
|
55661 |
+ label ? _("Book") : NULL,
|
|
55662 |
+ s ? s_bm_xpm : bm_xpm,
|
|
55663 |
+ &label_widget, &icon_widget);
|
|
55664 |
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), bw->bookmarks_button,
|
|
55665 |
+ _("View bookmarks"),
|
|
55666 |
+ "Toolbar/Bookmarks");
|
|
55667 |
gtk_widget_set_sensitive(bw->bookmarks_button, TRUE);
|
|
55668 |
Interface_set_button_accel(GTK_BUTTON(bw->bookmarks_button), GDK_semicolon,
|
|
55669 |
0, bw->accel_group);
|
|
55670 |
Interface_set_button_accel(GTK_BUTTON(bw->bookmarks_button), GDK_b,
|
|
55671 |
GDK_CONTROL_MASK, bw->accel_group);
|
|
55672 |
- /*
|
|
55673 |
- * SG: This had never any effect, was it there for future extensions?
|
|
55674 |
- * gtk_signal_connect(GTK_OBJECT(bw->bookmarks_button),
|
|
55675 |
- * "button-press-event",
|
|
55676 |
- * GTK_SIGNAL_FUNC(a_Commands_navpress_callback), bw);
|
|
55677 |
- */
|
|
55678 |
+ a_Gtk_ext_button_set_command(GTK_EXT_BUTTON(bw->bookmarks_button), 1);
|
|
55679 |
+ a_Gtk_ext_button_set_command(GTK_EXT_BUTTON(bw->bookmarks_button), 2);
|
|
55680 |
+ gtk_signal_connect(GTK_OBJECT(bw->bookmarks_button), "clicked",
|
|
55681 |
+ GTK_SIGNAL_FUNC(a_Commands_viewbm_callback), (gpointer)bw);
|
|
55682 |
+ gtk_signal_connect(GTK_OBJECT(bw->bookmarks_button), "clicked1",
|
|
55683 |
+ GTK_SIGNAL_FUNC(a_Commands_viewbm_callback), (gpointer)bw);
|
|
55684 |
+ gtk_signal_connect(GTK_OBJECT(bw->bookmarks_button), "clicked2",
|
|
55685 |
+ GTK_SIGNAL_FUNC(a_Commands_viewbm_nw_callback),
|
|
55686 |
+ (gpointer)bw);
|
|
55687 |
|
|
55688 |
gtk_widget_show(toolbar);
|
|
55689 |
return toolbar;
|
|
55690 |
@@ -712,7 +578,7 @@ static GtkWidget *Interface_progressbox_
|
|
55691 |
* Hide/Unhide this bw's control panels.
|
|
55692 |
* toggle: Flag [toggle or set].
|
|
55693 |
*/
|
|
55694 |
-static void Interface_toggle_panel(BrowserWindow *bw, gint toggle)
|
|
55695 |
+void a_Interface_toggle_panel(BrowserWindow *bw, gint toggle)
|
|
55696 |
{
|
|
55697 |
if (toggle)
|
|
55698 |
bw->fullwindow = !bw->fullwindow;
|
|
55699 |
@@ -721,12 +587,16 @@ static void Interface_toggle_panel(Brows
|
|
55700 |
g_slist_foreach(bw->PanelHandles, (GFunc)gtk_widget_hide, NULL);
|
|
55701 |
gtk_widget_hide(bw->status_box);
|
|
55702 |
gtk_widget_show (bw->full_screen_off_button);
|
|
55703 |
- gtk_widget_grab_focus(GTK_BIN(bw->docwin)->child);
|
|
55704 |
+ gtk_widget_grab_focus(GTK_BIN(bw->dd->docwin)->child);
|
|
55705 |
} else {
|
|
55706 |
g_slist_foreach(bw->PanelHandles, (GFunc)gtk_widget_show, NULL);
|
|
55707 |
gtk_widget_show(bw->status_box);
|
|
55708 |
gtk_widget_hide (bw->full_screen_off_button);
|
|
55709 |
}
|
|
55710 |
+#ifndef DISABLE_TABS
|
|
55711 |
+ a_Tab_visibility_update(bw);
|
|
55712 |
+#endif /* !DISABLE_TABS */
|
|
55713 |
+
|
|
55714 |
}
|
|
55715 |
|
|
55716 |
/*
|
|
55717 |
@@ -760,50 +630,7 @@ static void Interface_browser_window_cus
|
|
55718 |
gtk_widget_hide(bw->progress_box);
|
|
55719 |
|
|
55720 |
bw->fullwindow = prefs.fullwindow_start;
|
|
55721 |
- Interface_toggle_panel(bw, FALSE);
|
|
55722 |
-}
|
|
55723 |
-
|
|
55724 |
-static void Interface_full_screen_callback (BrowserWindow *bw)
|
|
55725 |
-{
|
|
55726 |
- Interface_toggle_panel(bw, TRUE);
|
|
55727 |
-}
|
|
55728 |
-
|
|
55729 |
-/*
|
|
55730 |
- * Handler for double-mouse-clicks that don't belong to the viewport.
|
|
55731 |
- */
|
|
55732 |
-static gint Interface_click_callback(BrowserWindow *bw, GdkEventButton *event)
|
|
55733 |
-{
|
|
55734 |
- if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
|
|
55735 |
- Interface_toggle_panel(bw, TRUE);
|
|
55736 |
- return TRUE;
|
|
55737 |
-}
|
|
55738 |
-
|
|
55739 |
-/*
|
|
55740 |
- * Handler for key presses that don't belong to the viewport.
|
|
55741 |
- * (Used to customize the interface a bit)
|
|
55742 |
- */
|
|
55743 |
-static void Interface_key_press_handler(GtkWidget *widget,
|
|
55744 |
- GdkEventKey *event,
|
|
55745 |
- gpointer client_data)
|
|
55746 |
-{
|
|
55747 |
- BrowserWindow *bw = client_data;
|
|
55748 |
-
|
|
55749 |
- switch (event->keyval) {
|
|
55750 |
- case GDK_BackSpace:
|
|
55751 |
- /* This key is handled here because GTK accel group ignores it */
|
|
55752 |
- if (event->state & GDK_SHIFT_MASK)
|
|
55753 |
- a_Commands_forw_callback(NULL, bw);
|
|
55754 |
- else
|
|
55755 |
- a_Commands_back_callback(NULL, bw);
|
|
55756 |
- break;
|
|
55757 |
- case GDK_slash:
|
|
55758 |
- /* This key is handled here because GTK accel group ignores it */
|
|
55759 |
- a_Commands_findtext_callback(NULL, bw);
|
|
55760 |
- break;
|
|
55761 |
- default:
|
|
55762 |
- _MSG(">> Key pressed!\n");
|
|
55763 |
- break;
|
|
55764 |
- }
|
|
55765 |
+ a_Interface_toggle_panel(bw, FALSE);
|
|
55766 |
}
|
|
55767 |
|
|
55768 |
/*
|
|
55769 |
@@ -825,7 +652,7 @@ static void Interface_add_full_screen_bu
|
|
55770 |
gtk_widget_show (dummy);
|
|
55771 |
|
|
55772 |
button = gtk_button_new ();
|
|
55773 |
- gtk_tooltips_set_tip (tooltips, button, "Hide Controls", "Show Controls");
|
|
55774 |
+ gtk_tooltips_set_tip (tooltips, button, _("Hide Controls"), _("Show Controls"));
|
|
55775 |
GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
|
|
55776 |
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
|
|
55777 |
gtk_widget_show (button);
|
|
55778 |
@@ -836,9 +663,13 @@ static void Interface_add_full_screen_bu
|
|
55779 |
|
|
55780 |
gtk_signal_connect_object
|
|
55781 |
(GTK_OBJECT (button), "clicked",
|
|
55782 |
- GTK_SIGNAL_FUNC (Interface_full_screen_callback), (gpointer)bw);
|
|
55783 |
+ GTK_SIGNAL_FUNC (a_Commands_full_screen_callback), (gpointer)bw);
|
|
55784 |
}
|
|
55785 |
|
|
55786 |
+/*******************
|
|
55787 |
+ * browser windows *
|
|
55788 |
+ *******************/
|
|
55789 |
+
|
|
55790 |
/*
|
|
55791 |
* Create a new browser window and return it.
|
|
55792 |
* (the new window is stored in browser_window[])
|
|
55793 |
@@ -848,6 +679,9 @@ a_Interface_browser_window_new(gint widt
|
|
55794 |
{
|
|
55795 |
GtkWidget *box1, *hbox, *button, *label,
|
|
55796 |
*progbox, *toolbar, *handlebox, *menubar, *locbox, *pixmap;
|
|
55797 |
+#ifdef DISABLE_TABS
|
|
55798 |
+ GtkWidget *box2;
|
|
55799 |
+#endif /* DISABLE_TABS */
|
|
55800 |
BrowserWindow *bw;
|
|
55801 |
char buf[64];
|
|
55802 |
|
|
55803 |
@@ -856,14 +690,17 @@ a_Interface_browser_window_new(gint widt
|
|
55804 |
a_List_add(browser_window, num_bw, num_bw_max);
|
|
55805 |
browser_window[num_bw++] = bw;
|
|
55806 |
|
|
55807 |
- /* initialize nav_stack struct in browser_window struct */
|
|
55808 |
- a_Nav_init(bw);
|
|
55809 |
-
|
|
55810 |
if (!xid)
|
|
55811 |
bw->main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
|
55812 |
else
|
|
55813 |
bw->main_window = gtk_plug_new(xid);
|
|
55814 |
|
|
55815 |
+ /* set tooltips.
|
|
55816 |
+ * TODO: this is a global, change to browser-window local?
|
|
55817 |
+ */
|
|
55818 |
+ bw->tooltips = tooltips;
|
|
55819 |
+ gtk_tooltips_enable(bw->tooltips);
|
|
55820 |
+
|
|
55821 |
gtk_window_set_policy(GTK_WINDOW(bw->main_window), TRUE, TRUE, FALSE);
|
|
55822 |
gtk_signal_connect(GTK_OBJECT(bw->main_window), "delete_event",
|
|
55823 |
GTK_SIGNAL_FUNC(gtk_object_destroy), bw);
|
|
55824 |
@@ -873,6 +710,8 @@ a_Interface_browser_window_new(gint widt
|
|
55825 |
|
|
55826 |
gtk_window_set_wmclass(GTK_WINDOW(bw->main_window), "dillo", "Dillo");
|
|
55827 |
|
|
55828 |
+ gtk_widget_set_usize(bw->main_window, width, height);
|
|
55829 |
+
|
|
55830 |
/* -RL :: I must realize the window to see it correctly */
|
|
55831 |
gtk_widget_realize(bw->main_window);
|
|
55832 |
|
|
55833 |
@@ -880,10 +719,6 @@ a_Interface_browser_window_new(gint widt
|
|
55834 |
bw->accel_group = gtk_accel_group_new();
|
|
55835 |
gtk_window_add_accel_group(GTK_WINDOW(bw->main_window), bw->accel_group);
|
|
55836 |
|
|
55837 |
- /* set window title */
|
|
55838 |
- g_snprintf(buf, 64, "Version %s", VERSION);
|
|
55839 |
- a_Interface_set_page_title(bw, buf);
|
|
55840 |
-
|
|
55841 |
box1 = gtk_vbox_new(FALSE, 0);
|
|
55842 |
|
|
55843 |
/* setup the control panel */
|
|
55844 |
@@ -912,7 +747,6 @@ a_Interface_browser_window_new(gint widt
|
|
55845 |
gtk_widget_show(hbox);
|
|
55846 |
gtk_box_pack_start(GTK_BOX(box1), handlebox, FALSE, FALSE, 0);
|
|
55847 |
gtk_widget_show(handlebox);
|
|
55848 |
-
|
|
55849 |
} else if (prefs.panel_size == 2 || prefs.panel_size == 3) {
|
|
55850 |
handlebox = gtk_handle_box_new();
|
|
55851 |
bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
|
|
55852 |
@@ -969,9 +803,12 @@ a_Interface_browser_window_new(gint widt
|
|
55853 |
|
|
55854 |
handlebox = gtk_handle_box_new();
|
|
55855 |
bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
|
|
55856 |
+ hbox = gtk_hbox_new(FALSE, 0);
|
|
55857 |
locbox = Interface_locbar_new(bw);
|
|
55858 |
- gtk_container_add(GTK_CONTAINER(handlebox), locbox);
|
|
55859 |
+ gtk_box_pack_start(GTK_BOX(hbox), locbox, TRUE, TRUE, 0);
|
|
55860 |
gtk_widget_show(locbox);
|
|
55861 |
+ gtk_container_add(GTK_CONTAINER(handlebox), hbox);
|
|
55862 |
+ gtk_widget_show(hbox);
|
|
55863 |
gtk_box_pack_start(GTK_BOX(box1), handlebox, FALSE, FALSE, 0);
|
|
55864 |
gtk_widget_show(handlebox);
|
|
55865 |
}
|
|
55866 |
@@ -979,58 +816,87 @@ a_Interface_browser_window_new(gint widt
|
|
55867 |
/* Add box1 */
|
|
55868 |
gtk_container_add(GTK_CONTAINER(bw->main_window), box1);
|
|
55869 |
|
|
55870 |
- /* Now the main document window */
|
|
55871 |
- bw->docwin = a_Dw_gtk_scrolled_window_new();
|
|
55872 |
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(bw->docwin),
|
|
55873 |
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
|
55874 |
- gtk_box_pack_start(GTK_BOX(box1), bw->docwin, TRUE, TRUE, 0);
|
|
55875 |
- gtk_widget_show(bw->docwin);
|
|
55876 |
+ /* Create the full_screen_off_button. This button is shared between all
|
|
55877 |
+ * documents in a tabbed browser. On switching tabs it is reparented
|
|
55878 |
+ * to the new current tab */
|
|
55879 |
+ bw->full_screen_off_button = gtk_button_new ();
|
|
55880 |
+ gtk_button_set_relief (GTK_BUTTON (bw->full_screen_off_button),
|
|
55881 |
+ GTK_RELIEF_NONE);
|
|
55882 |
+ gtk_tooltips_set_tip (tooltips, bw->full_screen_off_button,
|
|
55883 |
+ _("Show Controls"), _("Hide Controls"));
|
|
55884 |
+ GTK_WIDGET_UNSET_FLAGS (bw->full_screen_off_button, GTK_CAN_FOCUS);
|
|
55885 |
+
|
|
55886 |
+ pixmap = Interface_pixmap_new(bw->main_window, full_screen_off_xpm);
|
|
55887 |
+ gtk_container_add (GTK_CONTAINER (bw->full_screen_off_button), pixmap);
|
|
55888 |
+ gtk_widget_show (pixmap);
|
|
55889 |
+
|
|
55890 |
+ gtk_signal_connect_object
|
|
55891 |
+ (GTK_OBJECT (bw->full_screen_off_button), "clicked",
|
|
55892 |
+ GTK_SIGNAL_FUNC (a_Commands_full_screen_callback), (gpointer)bw);
|
|
55893 |
+
|
|
55894 |
+#ifndef DISABLE_TABS
|
|
55895 |
+ /* add tab browser */
|
|
55896 |
+ bw->container = a_Tab_browser_new(bw);
|
|
55897 |
+ /* Add initial tab*/
|
|
55898 |
+ a_Tab_new(bw);
|
|
55899 |
+#else
|
|
55900 |
+ /* add document container */
|
|
55901 |
+ bw->dd = a_Doc_new();
|
|
55902 |
+ a_Doc_set_browserwindow(bw->dd, bw);
|
|
55903 |
+ /* add box2, which will contain the docwin and the frameset.
|
|
55904 |
+ * Usually, only one of these is visible at any time */
|
|
55905 |
+ box2 = gtk_hbox_new(TRUE, 0);
|
|
55906 |
+ gtk_container_set_border_width(GTK_CONTAINER(box2), 0);
|
|
55907 |
+ gtk_box_pack_start(GTK_BOX(box2), GTK_WIDGET(bw->dd->docwin), TRUE, TRUE, 0);
|
|
55908 |
+ /* as this is a new document, the frameset will be empty so there
|
|
55909 |
+ * is no need to pack it in the box */
|
|
55910 |
+ gtk_widget_show(box2);
|
|
55911 |
+
|
|
55912 |
+ /* point bw->container at the box containing dd's docwin.
|
|
55913 |
+ * This ensures that the docwin (and, through its callback,
|
|
55914 |
+ * the associated DilloDoc) is destroyed when the window is closed */
|
|
55915 |
+ bw->container = GTK_CONTAINER(box2);
|
|
55916 |
|
|
55917 |
/* todo (GTK2): this call is a bit of a workaround to missing focus
|
|
55918 |
* between the location box and the docwin. It's fixed in GTK2:
|
|
55919 |
* http://mail.gnome.org/archives/gtk-list/2003-June/msg00307.html */
|
|
55920 |
- gtk_widget_grab_focus(GTK_BIN(bw->docwin)->child);
|
|
55921 |
+ gtk_widget_grab_focus(GTK_BIN(bw->dd->docwin)->child);
|
|
55922 |
|
|
55923 |
+#if 0
|
|
55924 |
/* Full screen mode via double click is done in two ways: First,
|
|
55925 |
* a feature of the selection is used, since in complex pages,
|
|
55926 |
* getting events back to the viewport is quite difficult. Second,
|
|
55927 |
* a simple callback, called e.g. when viewing image resources. */
|
|
55928 |
a_Selection_set_dclick_callback(
|
|
55929 |
- GTK_DW_VIEWPORT(GTK_BIN(GTK_BIN(bw->docwin)->child)->child)->selection,
|
|
55930 |
- (void(*)(gpointer))Interface_full_screen_callback, bw);
|
|
55931 |
+ GTK_DW_VIEWPORT(GTK_BIN(GTK_BIN(bw->dd->docwin)->child)->child)->selection,
|
|
55932 |
+ (void(*)(gpointer))a_Commands_full_screen_callback, bw);
|
|
55933 |
/* Selection requires an owner widget */
|
|
55934 |
a_Selection_set_owner(
|
|
55935 |
- GTK_DW_VIEWPORT(GTK_BIN(GTK_BIN(bw->docwin)->child)->child)->selection,
|
|
55936 |
- GTK_BIN(bw->docwin)->child);
|
|
55937 |
+ GTK_DW_VIEWPORT(GTK_BIN(GTK_BIN(bw->dd->docwin)->child)->child)->selection,
|
|
55938 |
+ GTK_BIN(bw->dd->docwin)->child);
|
|
55939 |
+#endif
|
|
55940 |
|
|
55941 |
- gtk_signal_connect_object_after(GTK_OBJECT(GTK_BIN(bw->docwin)->child),
|
|
55942 |
+#if 0
|
|
55943 |
+ gtk_signal_connect_object_after(GTK_OBJECT(GTK_BIN(bw->dd->docwin)->child),
|
|
55944 |
"button_press_event",
|
|
55945 |
- GTK_SIGNAL_FUNC(Interface_click_callback),
|
|
55946 |
+ GTK_SIGNAL_FUNC(a_Commands_click_callback),
|
|
55947 |
(gpointer)bw);
|
|
55948 |
+#endif
|
|
55949 |
|
|
55950 |
/* full screen button: actually there're two buttons, one in the scrolled
|
|
55951 |
* window (fs off) and one in the status bar (fs on). They look as one. */
|
|
55952 |
- bw->full_screen_off_button = gtk_button_new ();
|
|
55953 |
- gtk_tooltips_set_tip (tooltips, bw->full_screen_off_button,
|
|
55954 |
- "Show Controls", "Hide Controls");
|
|
55955 |
- GTK_WIDGET_UNSET_FLAGS (bw->full_screen_off_button, GTK_CAN_FOCUS);
|
|
55956 |
- a_Dw_gtk_scrolled_window_add_gadget (GTK_DW_SCROLLED_WINDOW (bw->docwin),
|
|
55957 |
- bw->full_screen_off_button);
|
|
55958 |
- pixmap = Interface_pixmap_new(bw->main_window, full_screen_off_xpm);
|
|
55959 |
- gtk_container_add (GTK_CONTAINER (bw->full_screen_off_button), pixmap);
|
|
55960 |
- gtk_widget_show (pixmap);
|
|
55961 |
- gtk_signal_connect_object
|
|
55962 |
- (GTK_OBJECT (bw->full_screen_off_button), "clicked",
|
|
55963 |
- GTK_SIGNAL_FUNC (Interface_full_screen_callback), (gpointer)bw);
|
|
55964 |
+ a_Dw_gtk_scrolled_window_add_gadget(GTK_DW_SCROLLED_WINDOW (bw->dd->docwin),
|
|
55965 |
+ bw->full_screen_off_button);
|
|
55966 |
Interface_set_button_accel(GTK_BUTTON(bw->full_screen_off_button), GDK_h,
|
|
55967 |
GDK_CONTROL_MASK, bw->accel_group);
|
|
55968 |
|
|
55969 |
/* Catch key_press event */
|
|
55970 |
- gtk_signal_connect(GTK_OBJECT(GTK_BIN(bw->docwin)->child),
|
|
55971 |
+ gtk_signal_connect(GTK_OBJECT(GTK_BIN(bw->dd->docwin)->child),
|
|
55972 |
"key_press_event",
|
|
55973 |
- GTK_SIGNAL_FUNC(Interface_key_press_handler), bw);
|
|
55974 |
-
|
|
55975 |
- gtk_widget_set_usize(bw->main_window, width, height);
|
|
55976 |
+ GTK_SIGNAL_FUNC(a_Commands_key_press_handler), bw);
|
|
55977 |
+#endif /* !DISABLE_TABS */
|
|
55978 |
+ gtk_box_pack_start(GTK_BOX(box1), GTK_WIDGET(bw->container), TRUE, TRUE, 0);
|
|
55979 |
+ gtk_widget_show(GTK_WIDGET(bw->container));
|
|
55980 |
|
|
55981 |
/* status widget */
|
|
55982 |
/* create the over-bug-meter menu */
|
|
55983 |
@@ -1060,11 +926,12 @@ a_Interface_browser_window_new(gint widt
|
|
55984 |
gtk_container_add (GTK_CONTAINER (button), hbox);
|
|
55985 |
gtk_widget_show(hbox);
|
|
55986 |
gtk_tooltips_set_tip (tooltips, button,
|
|
55987 |
- "Show HTML bugs (right-click for menu).", "");
|
|
55988 |
+ _("Show HTML bugs (right-click for menu)."), "");
|
|
55989 |
|
|
55990 |
bw->status_box = gtk_hbox_new(FALSE, 0);
|
|
55991 |
gtk_box_pack_start(GTK_BOX(bw->status_box), bw->status, TRUE, TRUE, 2);
|
|
55992 |
gtk_widget_show(bw->status);
|
|
55993 |
+ Interface_add_search_dialog(bw);
|
|
55994 |
gtk_box_pack_start(GTK_BOX(bw->status_box), button, FALSE, FALSE, 0);
|
|
55995 |
gtk_widget_show(button);
|
|
55996 |
|
|
55997 |
@@ -1076,47 +943,15 @@ a_Interface_browser_window_new(gint widt
|
|
55998 |
gtk_widget_show(bw->main_window);
|
|
55999 |
gtk_widget_show(box1);
|
|
56000 |
|
|
56001 |
+#if 0 //already initialize by g_new0().
|
|
56002 |
/* initialize the rest of the bw's data. */
|
|
56003 |
- bw->pagemarks_menuitem = NULL;
|
|
56004 |
- bw->pagemarks_menu = NULL;
|
|
56005 |
- bw->pagemarks_last = NULL;
|
|
56006 |
- bw->viewbugs_menuitem = NULL;
|
|
56007 |
-
|
|
56008 |
- /* the image menu is created first because it is used by the link menu */
|
|
56009 |
- bw->menu_popup.over_image = a_Menu_popup_oi_new(bw);
|
|
56010 |
- bw->menu_popup.over_link = a_Menu_popup_ol_new(bw);
|
|
56011 |
- bw->menu_popup.over_page = a_Menu_popup_op_new(bw);
|
|
56012 |
- bw->menu_popup.over_back = NULL;
|
|
56013 |
- bw->menu_popup.over_forw = NULL;
|
|
56014 |
- bw->menu_popup.url = NULL;
|
|
56015 |
- bw->menu_popup.url2 = NULL;
|
|
56016 |
-
|
|
56017 |
- bw->redirect_level = 0;
|
|
56018 |
- bw->sens_idle_id = 0;
|
|
56019 |
-
|
|
56020 |
- bw->CursorType = -1;
|
|
56021 |
-
|
|
56022 |
- bw->RootClients = NULL;
|
|
56023 |
- bw->NumRootClients = 0;
|
|
56024 |
- bw->MaxRootClients = 8;
|
|
56025 |
-
|
|
56026 |
- bw->ImageClients = NULL;
|
|
56027 |
- bw->NumImageClients = 0;
|
|
56028 |
- bw->MaxImageClients = 8;
|
|
56029 |
- bw->NumImages = 0;
|
|
56030 |
- bw->NumImagesGot = 0;
|
|
56031 |
-
|
|
56032 |
- bw->PageUrls = NULL;
|
|
56033 |
- bw->NumPageUrls = 0;
|
|
56034 |
- bw->MaxPageUrls = 8;
|
|
56035 |
-
|
|
56036 |
bw->open_dialog_window = NULL;
|
|
56037 |
bw->open_dialog_entry = NULL;
|
|
56038 |
bw->openfile_dialog_window = NULL;
|
|
56039 |
bw->quit_dialog_window = NULL;
|
|
56040 |
bw->save_dialog_window = NULL;
|
|
56041 |
bw->save_link_dialog_window = NULL;
|
|
56042 |
- bw->findtext_dialog_window = NULL;
|
|
56043 |
+ bw->findtext_dialog = NULL;
|
|
56044 |
bw->findtext_dialog_check = NULL;
|
|
56045 |
bw->findtext_dialog_entry = NULL;
|
|
56046 |
bw->search_dialog_window = NULL;
|
|
56047 |
@@ -1125,15 +960,61 @@ a_Interface_browser_window_new(gint widt
|
|
56048 |
bw->proxy_passwd_dialog_entry = NULL;
|
|
56049 |
bw->question_dialog_window = NULL;
|
|
56050 |
bw->question_dialog_data = NULL;
|
|
56051 |
+ bw->passwd_dialog_window = NULL;
|
|
56052 |
+ bw->passwd_dialog_uentry = NULL;
|
|
56053 |
+ bw->passwd_dialog_pentry = NULL;
|
|
56054 |
bw->viewsource_window = NULL;
|
|
56055 |
bw->pagebugs_window = NULL;
|
|
56056 |
|
|
56057 |
+ bw->pagemarks_menuitem = NULL;
|
|
56058 |
+ bw->viewbugs_menuitem = NULL;
|
|
56059 |
+ bw->frame_menuitem = NULL;
|
|
56060 |
+ bw->frameset_menuitem = NULL;
|
|
56061 |
+ bw->menu_popup.over_frame = NULL;
|
|
56062 |
+ bw->back_op_menu_button = NULL;
|
|
56063 |
+ bw->forw_op_menu_button = NULL;
|
|
56064 |
+ bw->stop_op_menu_button = NULL;
|
|
56065 |
+#endif
|
|
56066 |
+ /* the image menu is created first because it is used by the link menu */
|
|
56067 |
+ bw->menu_popup.over_image = a_Menu_popup_oi_new(bw);
|
|
56068 |
+ bw->menu_popup.over_page = a_Menu_popup_op_new(bw);
|
|
56069 |
+ bw->menu_popup.over_link = a_Menu_popup_ol_new(bw);
|
|
56070 |
+#if 0 //already initialize by g_new0().
|
|
56071 |
+ bw->menu_popup.over_back = NULL;
|
|
56072 |
+ bw->menu_popup.over_forw = NULL;
|
|
56073 |
+
|
|
56074 |
+#ifndef DISABLE_TABS
|
|
56075 |
+ bw->menu_popup.over_tab = NULL;
|
|
56076 |
+#endif /* !DISABLE_TABS */
|
|
56077 |
+ bw->menu_popup.url = NULL;
|
|
56078 |
+ bw->menu_popup.url2 = NULL;
|
|
56079 |
+#endif
|
|
56080 |
+
|
|
56081 |
+
|
|
56082 |
+ bw->found = FALSE;
|
|
56083 |
+ bw->dd_list = NULL;
|
|
56084 |
+ bw->dd_list_index = 0;
|
|
56085 |
+
|
|
56086 |
+ bw->sens_idle_id = 0;
|
|
56087 |
+
|
|
56088 |
+ /* set focus to location bar */
|
|
56089 |
+ if(prefs.focus_location_on_new)
|
|
56090 |
+ gtk_widget_grab_focus(bw->location);
|
|
56091 |
+ else
|
|
56092 |
+ gtk_widget_grab_focus(GTK_BIN(bw->dd->docwin)->child);
|
|
56093 |
+
|
|
56094 |
+ /* set document (and window) title */
|
|
56095 |
+ g_snprintf(buf, 64, "Version %s", VERSION);
|
|
56096 |
+ a_Doc_title_set(bw->dd, buf);
|
|
56097 |
+
|
|
56098 |
/* now that the bw is made, let's customize it.. */
|
|
56099 |
Interface_browser_window_customize(bw);
|
|
56100 |
|
|
56101 |
return bw;
|
|
56102 |
}
|
|
56103 |
|
|
56104 |
+
|
|
56105 |
+
|
|
56106 |
/*
|
|
56107 |
* Set the title of the browser window to start with "Dillo: "
|
|
56108 |
* prepended to it.
|
|
56109 |
@@ -1146,7 +1027,7 @@ void a_Interface_set_page_title(BrowserW
|
|
56110 |
|
|
56111 |
buf = g_string_new("");
|
|
56112 |
g_string_sprintfa(buf, "Dillo: %s", title);
|
|
56113 |
- gtk_window_set_title(GTK_WINDOW(bw->main_window), buf->str);
|
|
56114 |
+ a_I18n_gtk_window_set_title(GTK_WINDOW(bw->main_window), buf->str);
|
|
56115 |
g_string_free(buf, TRUE);
|
|
56116 |
}
|
|
56117 |
|
|
56118 |
@@ -1155,7 +1036,7 @@ void a_Interface_set_page_title(BrowserW
|
|
56119 |
*/
|
|
56120 |
void a_Interface_set_location_text(BrowserWindow *bw, char *text)
|
|
56121 |
{
|
|
56122 |
- gtk_entry_set_text(GTK_ENTRY(bw->location), text);
|
|
56123 |
+ a_I18n_gtk_entry_set_text(GTK_ENTRY(bw->location), text);
|
|
56124 |
}
|
|
56125 |
|
|
56126 |
/*
|
|
56127 |
@@ -1163,7 +1044,7 @@ void a_Interface_set_location_text(Brows
|
|
56128 |
*/
|
|
56129 |
gchar *a_Interface_get_location_text(BrowserWindow *bw)
|
|
56130 |
{
|
|
56131 |
- return gtk_entry_get_text(GTK_ENTRY(bw->location));
|
|
56132 |
+ return a_I18n_gtk_entry_get_text(GTK_ENTRY(bw->location));
|
|
56133 |
}
|
|
56134 |
|
|
56135 |
/*
|
|
56136 |
@@ -1181,13 +1062,16 @@ void a_Interface_reset_progress_bars(Bro
|
|
56137 |
void a_Interface_msg(BrowserWindow *bw, const char *format, ... )
|
|
56138 |
{
|
|
56139 |
static char msg[1024];
|
|
56140 |
+ char *msg_fix;
|
|
56141 |
va_list argp;
|
|
56142 |
|
|
56143 |
if ( bw ) {
|
|
56144 |
va_start(argp, format);
|
|
56145 |
g_vsnprintf(msg, 1024, format, argp);
|
|
56146 |
va_end(argp);
|
|
56147 |
- gtk_label_set_text(GTK_LABEL(bw->status), msg);
|
|
56148 |
+ msg_fix = a_I18n_string_check(msg, DILLO_CHARSET);
|
|
56149 |
+ a_I18n_gtk_label_set_text(GTK_LABEL(bw->status), msg_fix);
|
|
56150 |
+ g_free(msg_fix);
|
|
56151 |
bw->status_is_link = 0;
|
|
56152 |
}
|
|
56153 |
}
|
|
56154 |
@@ -1255,7 +1139,7 @@ void a_Interface_quit_all(void)
|
|
56155 |
gtk_widget_destroy(bws[i]->main_window);
|
|
56156 |
|
|
56157 |
g_free(bws);
|
|
56158 |
-
|
|
56159 |
+
|
|
56160 |
g_free(open_dialog_last_dirname);
|
|
56161 |
g_free(save_dialog_last_dirname);
|
|
56162 |
}
|
|
56163 |
@@ -1312,7 +1196,7 @@ static void
|
|
56164 |
Cfn = (s = a_Misc_escape_chars(fn, "% ")) ? s : fn;
|
|
56165 |
g_string_sprintf(UrlStr, "file:%s", Cfn);
|
|
56166 |
url = a_Url_new(UrlStr->str, NULL, 0, 0, 0);
|
|
56167 |
- a_Nav_push(bw, url);
|
|
56168 |
+ a_Nav_push(bw->dd, url);
|
|
56169 |
a_Url_free(url);
|
|
56170 |
g_string_free(UrlStr, TRUE);
|
|
56171 |
g_free(s);
|
|
56172 |
@@ -1330,10 +1214,12 @@ static void
|
|
56173 |
*/
|
|
56174 |
static gchar *Interface_make_search_url(const gchar *str)
|
|
56175 |
{
|
|
56176 |
- gchar *keys = a_Url_encode_hex_str(str), *c = prefs.search_url;
|
|
56177 |
+ gchar *enc_str = a_I18n_convert(DILLO_CHARSET, prefs.search_charset, str, -1);
|
|
56178 |
+ gchar *keys = a_Url_encode_hex_str(enc_str), *c = prefs.search_url;
|
|
56179 |
GString *newstr = g_string_sized_new(strlen(c)+strlen(keys));
|
|
56180 |
gchar *search_url;
|
|
56181 |
|
|
56182 |
+ g_free(enc_str);
|
|
56183 |
for (; *c; c++)
|
|
56184 |
if (*c == '%')
|
|
56185 |
switch(*++c) {
|
|
56186 |
@@ -1342,9 +1228,9 @@ static gchar *Interface_make_search_url(
|
|
56187 |
case '%':
|
|
56188 |
g_string_append_c(newstr, '%'); break;;
|
|
56189 |
case 0:
|
|
56190 |
- MSG("Warning: search_url ends with '%%'\n"); c--; break;;
|
|
56191 |
+ MSG(_("Warning: search_url ends with '%%'\n")); c--; break;;
|
|
56192 |
default:
|
|
56193 |
- MSG("Warning: illegal specifier '%%%c' in search_url\n", *c);
|
|
56194 |
+ MSG(_("Warning: illegal specifier '%%%c' in search_url\n"), *c);
|
|
56195 |
}
|
|
56196 |
else
|
|
56197 |
g_string_append_c(newstr, *c);
|
|
56198 |
@@ -1372,14 +1258,14 @@ static void Interface_open_url_string(gc
|
|
56199 |
|
|
56200 |
url = a_Url_new(new_text, NULL, 0, 0, 0);
|
|
56201 |
if (url) {
|
|
56202 |
- a_Nav_push(bw, url);
|
|
56203 |
+ a_Nav_push(bw->dd, url);
|
|
56204 |
a_Url_free(url);
|
|
56205 |
}
|
|
56206 |
g_free(new_text);
|
|
56207 |
}
|
|
56208 |
|
|
56209 |
/* let the rendered area have focus */
|
|
56210 |
- gtk_widget_grab_focus(GTK_BIN(bw->docwin)->child);
|
|
56211 |
+ gtk_widget_grab_focus(GTK_BIN(bw->dd->docwin)->child);
|
|
56212 |
}
|
|
56213 |
|
|
56214 |
/*
|
|
56215 |
@@ -1409,7 +1295,7 @@ void a_Interface_openfile_dialog(Browser
|
|
56216 |
if (!bw->openfile_dialog_window) {
|
|
56217 |
Interface_make_choose_file_dialog(
|
|
56218 |
&(bw->openfile_dialog_window),
|
|
56219 |
- "openfile_dialog", "Dillo", "Dillo: Open File",
|
|
56220 |
+ "openfile_dialog", "Dillo", _("Dillo: Open File"),
|
|
56221 |
(GtkSignalFunc) Interface_openfile_ok_callback, (void *)bw);
|
|
56222 |
}
|
|
56223 |
|
|
56224 |
@@ -1485,7 +1371,7 @@ static void
|
|
56225 |
(GtkSignalFunc) gtk_widget_grab_default,
|
|
56226 |
GTK_OBJECT(button));
|
|
56227 |
|
|
56228 |
- button = gtk_button_new_with_label("Clear");
|
|
56229 |
+ button = gtk_button_new_with_label(_("Clear"));
|
|
56230 |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
|
|
56231 |
(GtkSignalFunc) Interface_entry_clear,
|
|
56232 |
GTK_OBJECT(entry));
|
|
56233 |
@@ -1493,7 +1379,7 @@ static void
|
|
56234 |
gtk_box_pack_start(GTK_BOX(box2), button, FALSE, TRUE, 0);
|
|
56235 |
gtk_widget_show(button);
|
|
56236 |
|
|
56237 |
- button = gtk_button_new_with_label("Cancel");
|
|
56238 |
+ button = gtk_button_new_with_label(_("Cancel"));
|
|
56239 |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
|
|
56240 |
(GtkSignalFunc) gtk_widget_destroy,
|
|
56241 |
GTK_OBJECT(*DialogWindow));
|
|
56242 |
@@ -1522,7 +1408,7 @@ static void Interface_question_dialog_se
|
|
56243 |
* (0 means the window was cancelled, and 1 to 5 the respective alternatives)
|
|
56244 |
*/
|
|
56245 |
static void Interface_make_question_dialog(
|
|
56246 |
- BrowserWindow *bw,
|
|
56247 |
+ DilloDoc *dd,
|
|
56248 |
GtkWidget **DialogWindow, char *WmName, char *WmClass,
|
|
56249 |
char *WTitle, char *Question, gint modal_flag,
|
|
56250 |
char *alt1, char *alt2, char *alt3, char *alt4, char *alt5,
|
|
56251 |
@@ -1540,7 +1426,7 @@ static void Interface_make_question_dial
|
|
56252 |
gtk_window_set_modal(GTK_WINDOW(*DialogWindow), modal_flag);
|
|
56253 |
/* attach AnswerCallback to "destroy" so appropriate actions can be taken */
|
|
56254 |
gtk_signal_connect_object(GTK_OBJECT(*DialogWindow), "destroy",
|
|
56255 |
- (GtkSignalFunc) AnswerCallback, (gpointer)bw);
|
|
56256 |
+ (GtkSignalFunc) AnswerCallback, (gpointer)dd);
|
|
56257 |
gtk_signal_connect(GTK_OBJECT(*DialogWindow), "destroy",
|
|
56258 |
(GtkSignalFunc) Interface_destroy_window, DialogWindow);
|
|
56259 |
|
|
56260 |
@@ -1559,7 +1445,7 @@ static void Interface_make_question_dial
|
|
56261 |
* (it looks clumsy, but provides a handy interface for the caller) */
|
|
56262 |
answer = g_new(DialogAnswer, 6);
|
|
56263 |
for (i = 0; i < 6; ++i) {
|
|
56264 |
- answer[i].bw = bw;
|
|
56265 |
+ answer[i].bw = dd->bw;
|
|
56266 |
answer[i].alt_num = i;
|
|
56267 |
answer[i].this = answer;
|
|
56268 |
}
|
|
56269 |
@@ -1567,7 +1453,7 @@ static void Interface_make_question_dial
|
|
56270 |
answer[2].alt_str = alt2; answer[3].alt_str = alt3;
|
|
56271 |
answer[4].alt_str = alt4; answer[5].alt_str = alt5;
|
|
56272 |
/* Set the default answer */
|
|
56273 |
- bw->question_dialog_answer = &answer[0];
|
|
56274 |
+ dd->bw->question_dialog_answer = &answer[0];
|
|
56275 |
|
|
56276 |
/* pack the alternatives */
|
|
56277 |
box2 = gtk_hbox_new(TRUE, 5);
|
|
56278 |
@@ -1592,23 +1478,117 @@ static void Interface_make_question_dial
|
|
56279 |
}
|
|
56280 |
|
|
56281 |
/*
|
|
56282 |
+ * Make a password-dialog with two entries, OK and Cancel.
|
|
56283 |
+ */
|
|
56284 |
+void Interface_make_passwd_dialog(
|
|
56285 |
+ GtkWidget **DialogWindow, char *WmName, char *WmClass,
|
|
56286 |
+ char *WTitle, char *Context,
|
|
56287 |
+ GtkWidget **passwd_dialog_uentry,
|
|
56288 |
+ GtkWidget **passwd_dialog_pentry,
|
|
56289 |
+ GtkSignalFunc OkCallback, void *OkCbData,
|
|
56290 |
+ GtkSignalFunc CancelCallback, void *CancelCbData)
|
|
56291 |
+{
|
|
56292 |
+ GtkWidget *label,
|
|
56293 |
+ *label_user,
|
|
56294 |
+ *label_pass,
|
|
56295 |
+ *button,
|
|
56296 |
+ *box_l,
|
|
56297 |
+ *box_u,
|
|
56298 |
+ *box_p,
|
|
56299 |
+ *box_b;
|
|
56300 |
+
|
|
56301 |
+ *DialogWindow = gtk_window_new(GTK_WINDOW_DIALOG);
|
|
56302 |
+ gtk_window_set_wmclass(GTK_WINDOW(*DialogWindow), WmName, WmClass);
|
|
56303 |
+ gtk_window_set_title(GTK_WINDOW(*DialogWindow), WTitle);
|
|
56304 |
+ gtk_container_border_width(GTK_CONTAINER(*DialogWindow), 10);
|
|
56305 |
+ gtk_signal_connect(GTK_OBJECT(*DialogWindow), "destroy",
|
|
56306 |
+ (GtkSignalFunc) Interface_destroy_window, DialogWindow);
|
|
56307 |
+
|
|
56308 |
+ box_l = gtk_vbox_new(FALSE, 5);
|
|
56309 |
+ label = gtk_label_new(Context);
|
|
56310 |
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL);
|
|
56311 |
+ gtk_box_pack_start(GTK_BOX(box_l), label, FALSE, FALSE, 0);
|
|
56312 |
+ gtk_widget_show(label);
|
|
56313 |
+ box_u = gtk_hbox_new(FALSE, 5);
|
|
56314 |
+ label_user = gtk_label_new(_("User Name:"));
|
|
56315 |
+ gtk_box_pack_start(GTK_BOX(box_u), label_user, FALSE, FALSE, 0);
|
|
56316 |
+ gtk_widget_show(label_user);
|
|
56317 |
+ *passwd_dialog_uentry=gtk_entry_new();
|
|
56318 |
+ gtk_box_pack_start(GTK_BOX(box_u),*passwd_dialog_uentry, TRUE, TRUE, 0);
|
|
56319 |
+ gtk_widget_show(*passwd_dialog_uentry);
|
|
56320 |
+ box_p = gtk_hbox_new(FALSE, 5);
|
|
56321 |
+ label_pass = gtk_label_new(_("Password:"));
|
|
56322 |
+ gtk_box_pack_start(GTK_BOX(box_p), label_pass, FALSE, FALSE, 0);
|
|
56323 |
+ gtk_widget_show(label_pass);
|
|
56324 |
+ *passwd_dialog_pentry=gtk_entry_new();
|
|
56325 |
+ gtk_entry_set_visibility(GTK_ENTRY(*passwd_dialog_pentry), FALSE);
|
|
56326 |
+ gtk_box_pack_start(GTK_BOX(box_p),*passwd_dialog_pentry, TRUE, TRUE, 0);
|
|
56327 |
+ gtk_widget_show(*passwd_dialog_pentry);
|
|
56328 |
+
|
|
56329 |
+ box_b = gtk_hbox_new(TRUE, 5);
|
|
56330 |
+ button = gtk_button_new_with_label(_("OK"));
|
|
56331 |
+ gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
|
|
56332 |
+ OkCallback, OkCbData);
|
|
56333 |
+ gtk_signal_connect(GTK_OBJECT(button), "clicked",
|
|
56334 |
+ (GtkSignalFunc) Interface_destroy_window, DialogWindow);
|
|
56335 |
+ gtk_widget_show(button);
|
|
56336 |
+ gtk_box_pack_start(GTK_BOX(box_b), button, FALSE, TRUE, 0);
|
|
56337 |
+ button = gtk_button_new_with_label(_("Cancel"));
|
|
56338 |
+ gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
|
|
56339 |
+ CancelCallback, CancelCbData);
|
|
56340 |
+ gtk_signal_connect(GTK_OBJECT(button), "clicked",
|
|
56341 |
+ (GtkSignalFunc) Interface_destroy_window, DialogWindow);
|
|
56342 |
+ gtk_widget_show(button);
|
|
56343 |
+ gtk_box_pack_start(GTK_BOX(box_b), button, TRUE, TRUE, 0);
|
|
56344 |
+ gtk_box_pack_start(GTK_BOX(box_l), box_u, TRUE, FALSE, 0);
|
|
56345 |
+ gtk_box_pack_start(GTK_BOX(box_l), box_p, TRUE, FALSE, 0);
|
|
56346 |
+ gtk_box_pack_start(GTK_BOX(box_l), box_b, TRUE, FALSE, 0);
|
|
56347 |
+ gtk_container_add(GTK_CONTAINER(*DialogWindow), box_l);
|
|
56348 |
+
|
|
56349 |
+ gtk_widget_show(box_b);
|
|
56350 |
+ gtk_widget_show(box_p);
|
|
56351 |
+ gtk_widget_show(box_u);
|
|
56352 |
+ gtk_widget_show(box_l);
|
|
56353 |
+ gtk_widget_grab_focus(GTK_WIDGET(*passwd_dialog_uentry));
|
|
56354 |
+ gtk_widget_show(*DialogWindow);
|
|
56355 |
+}
|
|
56356 |
+
|
|
56357 |
+/*
|
|
56358 |
+ * Create and show a user/passwd dialog
|
|
56359 |
+ */
|
|
56360 |
+void a_Interface_passwd_dialog(
|
|
56361 |
+ BrowserWindow *bw, gchar *Context,
|
|
56362 |
+ GtkSignalFunc OkCallback, void *OkCbData,
|
|
56363 |
+ GtkSignalFunc CancelCallback, void *CancelCbData)
|
|
56364 |
+{
|
|
56365 |
+ if (!bw->passwd_dialog_window) {
|
|
56366 |
+ Interface_make_passwd_dialog(&(bw->passwd_dialog_window),
|
|
56367 |
+ "passwd_dialog", "Dillo", _("Dillo: Enter Authentication"), Context,
|
|
56368 |
+ &(bw->passwd_dialog_uentry), &(bw->passwd_dialog_pentry),
|
|
56369 |
+ OkCallback, OkCbData, CancelCallback, CancelCbData);
|
|
56370 |
+ } else {
|
|
56371 |
+ gtk_widget_destroy(bw->passwd_dialog_window);
|
|
56372 |
+ }
|
|
56373 |
+}
|
|
56374 |
+
|
|
56375 |
+/*
|
|
56376 |
* Create and show an [OK|Cancel] question dialog
|
|
56377 |
*/
|
|
56378 |
void a_Interface_question_dialog(
|
|
56379 |
- BrowserWindow *bw, gchar *QuestionTxt, gint modal_flag,
|
|
56380 |
+ DilloDoc *dd, gchar *QuestionTxt, gint modal_flag,
|
|
56381 |
char *alt1, char *alt2, char *alt3, char *alt4, char *alt5,
|
|
56382 |
GtkSignalFunc AnswerCallback)
|
|
56383 |
{
|
|
56384 |
- if (!bw->question_dialog_window) {
|
|
56385 |
+ if (!dd->bw->question_dialog_window) {
|
|
56386 |
Interface_make_question_dialog(
|
|
56387 |
- bw,
|
|
56388 |
- &(bw->question_dialog_window), "question_dialog", "Dillo",
|
|
56389 |
- "Dillo: Question", QuestionTxt, modal_flag,
|
|
56390 |
+ dd,
|
|
56391 |
+ &(dd->bw->question_dialog_window), "question_dialog", "Dillo",
|
|
56392 |
+ _("Dillo: Question"), QuestionTxt, modal_flag,
|
|
56393 |
alt1, alt2, alt3, alt4, alt5,
|
|
56394 |
AnswerCallback);
|
|
56395 |
} else {
|
|
56396 |
/* should not reach here */
|
|
56397 |
- gtk_widget_destroy(bw->question_dialog_window);
|
|
56398 |
+ gtk_widget_destroy(dd->bw->question_dialog_window);
|
|
56399 |
}
|
|
56400 |
}
|
|
56401 |
|
|
56402 |
@@ -1619,9 +1599,9 @@ void a_Interface_open_dialog(GtkWidget *
|
|
56403 |
{
|
|
56404 |
if (!bw->open_dialog_window) {
|
|
56405 |
Interface_make_dialog(&(bw->open_dialog_window),
|
|
56406 |
- "open_dialog", "Dillo", "Dillo: Open URL",
|
|
56407 |
+ "open_dialog", "Dillo", _("Dillo: Open URL"),
|
|
56408 |
&(bw->open_dialog_entry), "", 1, NULL, NULL,
|
|
56409 |
- "OK", (GtkSignalFunc) a_Interface_entry_open_url, (void *)bw);
|
|
56410 |
+ _("OK"), (GtkSignalFunc) a_Interface_entry_open_url, (void *)bw);
|
|
56411 |
if (prefs.transient_dialogs)
|
|
56412 |
gtk_window_set_transient_for(GTK_WINDOW(bw->open_dialog_window),
|
|
56413 |
GTK_WINDOW(bw->main_window));
|
|
56414 |
@@ -1643,11 +1623,13 @@ static void Interface_save_callback(int
|
|
56415 |
|
|
56416 |
if ( Op ){
|
|
56417 |
struct stat st;
|
|
56418 |
+ gchar *msg_enc = a_I18n_locale_to_DILLO_CHARSET(_("File saved (%d Bytes)"));
|
|
56419 |
|
|
56420 |
fflush(Web->stream);
|
|
56421 |
fstat(fileno(Web->stream), &st);
|
|
56422 |
fclose(Web->stream);
|
|
56423 |
- a_Interface_msg(Web->bw, "File saved (%d Bytes)", st.st_size);
|
|
56424 |
+ a_Interface_msg(Web->dd->bw, msg_enc, st.st_size);
|
|
56425 |
+ g_free(msg_enc);
|
|
56426 |
} else {
|
|
56427 |
if ( (Bytes = Client->BufSize - Web->SavedBytes) > 0 ) {
|
|
56428 |
Bytes = fwrite(Client->Buf + Web->SavedBytes, 1, Bytes, Web->stream);
|
|
56429 |
@@ -1670,11 +1652,11 @@ static void Interface_file_save_url(GtkW
|
|
56430 |
choosefile = GTK_FILE_SELECTION(bw->save_dialog_window);
|
|
56431 |
entry_url = GTK_ENTRY(bw->location);
|
|
56432 |
name = gtk_file_selection_get_filename(choosefile);
|
|
56433 |
- url = a_Url_dup(a_History_get_url(NAV_TOP(bw)));
|
|
56434 |
+ url = a_Url_dup(a_History_get_url(NAV_TOP(bw->dd)));
|
|
56435 |
|
|
56436 |
if ( strlen(name) && (out = fopen(name, "w")) != NULL ) {
|
|
56437 |
DilloWeb *Web = a_Web_new(url);
|
|
56438 |
- Web->bw = bw;
|
|
56439 |
+ Web->dd = bw->dd;
|
|
56440 |
Web->stream = out;
|
|
56441 |
Web->flags |= WEB_Download;
|
|
56442 |
/* todo: keep track of this client */
|
|
56443 |
@@ -1710,20 +1692,20 @@ static void Interface_file_save_link(Gtk
|
|
56444 |
/* Not cached, ask the downloads server to get it */
|
|
56445 |
cmd = a_Dpip_build_cmd("cmd=%s url=%s destination=%s",
|
|
56446 |
"download", URL_STR(url), name);
|
|
56447 |
- a_Capi_dpi_send_cmd(NULL, bw, cmd, "downloads", 1);
|
|
56448 |
+ a_Capi_dpi_send_cmd(NULL, bw->dd, cmd, "downloads", 1);
|
|
56449 |
g_free(cmd);
|
|
56450 |
|
|
56451 |
} else {
|
|
56452 |
/* Cached! Save from the cache */
|
|
56453 |
if ( strlen(name) && (out = fopen(name, "w")) != NULL ) {
|
|
56454 |
DilloWeb *Web = a_Web_new(url);
|
|
56455 |
- Web->bw = bw;
|
|
56456 |
+ Web->dd = bw->dd;
|
|
56457 |
Web->stream = out;
|
|
56458 |
Web->flags |= WEB_Download;
|
|
56459 |
/* todo: keep track of this client */
|
|
56460 |
a_Capi_open_url(Web, Interface_save_callback, Web);
|
|
56461 |
} else
|
|
56462 |
- g_printerr("Error trying to save: %s\n", name);
|
|
56463 |
+ g_printerr(_("Error trying to save: %s\n"), name);
|
|
56464 |
}
|
|
56465 |
|
|
56466 |
gtk_widget_destroy(bw->save_link_dialog_window);
|
|
56467 |
@@ -1776,7 +1758,7 @@ void a_Interface_save_dialog(GtkWidget *
|
|
56468 |
if (!bw->save_dialog_window) {
|
|
56469 |
Interface_make_choose_file_dialog(
|
|
56470 |
&bw->save_dialog_window,
|
|
56471 |
- "save_dialog", "Dillo", "Dillo: Save URL as File...",
|
|
56472 |
+ "save_dialog", "Dillo", _("Dillo: Save URL as File..."),
|
|
56473 |
(GtkSignalFunc) Interface_file_save_url, (void *)bw );
|
|
56474 |
}
|
|
56475 |
url = a_Url_new(a_Interface_get_location_text(bw), NULL, 0, 0, 0);
|
|
56476 |
@@ -1803,7 +1785,7 @@ void a_Interface_save_link_dialog(GtkWid
|
|
56477 |
Interface_make_choose_file_dialog(
|
|
56478 |
&bw->save_link_dialog_window,
|
|
56479 |
"save_link_dialog", "Dillo",
|
|
56480 |
- "Dillo: Save link as File...",
|
|
56481 |
+ _("Dillo: Save link as File..."),
|
|
56482 |
(GtkSignalFunc) Interface_file_save_link,
|
|
56483 |
(void *)bw);
|
|
56484 |
}
|
|
56485 |
@@ -1834,55 +1816,189 @@ static void Interface_entry_search(GtkWi
|
|
56486 |
{
|
|
56487 |
char *string;
|
|
56488 |
gboolean case_sens;
|
|
56489 |
+ DilloDoc *dd;
|
|
56490 |
|
|
56491 |
- string = gtk_editable_get_chars(GTK_EDITABLE(bw->findtext_dialog_entry),
|
|
56492 |
- 0, -1);
|
|
56493 |
+ string = a_I18n_gtk_editable_get_chars(GTK_EDITABLE(bw->findtext_dialog_entry),
|
|
56494 |
+ 0, -1);
|
|
56495 |
+ if (!string || strlen(string) == 0) return;
|
|
56496 |
case_sens = gtk_toggle_button_get_active
|
|
56497 |
- (GTK_TOGGLE_BUTTON(bw->findtext_dialog_check));
|
|
56498 |
- switch(a_Dw_gtk_scrolled_window_search(GTK_DW_SCROLLED_WINDOW(bw->docwin),
|
|
56499 |
- string, case_sens)) {
|
|
56500 |
+ (GTK_TOGGLE_BUTTON(bw->findtext_dialog_check));
|
|
56501 |
+
|
|
56502 |
+ /* get the document to search from dd_list */
|
|
56503 |
+ dd = g_list_nth_data(bw->dd_list, bw->dd_list_index);
|
|
56504 |
+ if (!dd) return;
|
|
56505 |
+
|
|
56506 |
+ switch(a_Dw_gtk_scrolled_window_search(GTK_DW_SCROLLED_WINDOW(dd->docwin),
|
|
56507 |
+ string, case_sens)) {
|
|
56508 |
case FINDTEXT_RESTART:
|
|
56509 |
- a_Interface_message_window("Dillo: Find text",
|
|
56510 |
- "No further occurence of \"%s\". "
|
|
56511 |
- "Restarting from the beginning.", string);
|
|
56512 |
- break;
|
|
56513 |
case FINDTEXT_NOT_FOUND:
|
|
56514 |
- a_Interface_message_window("Dillo: Find text",
|
|
56515 |
- "Cannot find \"%s\".", string);
|
|
56516 |
- break;
|
|
56517 |
+ a_Dw_gtk_scrolled_window_reset_search((void *) dd->docwin);
|
|
56518 |
+ if(++(bw->dd_list_index) < g_list_length(bw->dd_list)) {
|
|
56519 |
+ /* recursively repeat search in next document */
|
|
56520 |
+ Interface_entry_search(widget, bw);
|
|
56521 |
+ } else {
|
|
56522 |
+ if (!bw->found) {
|
|
56523 |
+ if (prefs.popup_dialogs) {
|
|
56524 |
+ gchar *title, *msg;
|
|
56525 |
+ title = a_I18n_locale_to_DILLO_CHARSET(_("Dillo: Find text"));
|
|
56526 |
+ msg = a_I18n_locale_to_DILLO_CHARSET(_("Cannot find \"%s\"."));
|
|
56527 |
+ a_Interface_message_window(title, msg, string);
|
|
56528 |
+ g_free(title);
|
|
56529 |
+ g_free(msg);
|
|
56530 |
+ } else {
|
|
56531 |
+ gchar *format;
|
|
56532 |
+ format = a_I18n_locale_to_DILLO_CHARSET(_("Cannot find \"%s\"."));
|
|
56533 |
+ a_Interface_msg(bw, format, string);
|
|
56534 |
+ g_free(format);
|
|
56535 |
+ }
|
|
56536 |
+ } else {
|
|
56537 |
+ if (prefs.popup_dialogs) {
|
|
56538 |
+ gchar *title, *msg;
|
|
56539 |
+ title = a_I18n_locale_to_DILLO_CHARSET(_("Dillo: Find text"));
|
|
56540 |
+ msg = a_I18n_locale_to_DILLO_CHARSET(_("No further occurence of \"%s\". "
|
|
56541 |
+ "Restarting from the beginning."));
|
|
56542 |
+ a_Interface_message_window(title, msg, string);
|
|
56543 |
+ g_free(title);
|
|
56544 |
+ g_free(msg);
|
|
56545 |
+ } else {
|
|
56546 |
+ gchar *format;
|
|
56547 |
+ format = a_I18n_locale_to_DILLO_CHARSET(
|
|
56548 |
+ _("(Find) \"%s\": restart from beginning"));
|
|
56549 |
+ a_Interface_msg(bw, format, string);
|
|
56550 |
+ g_free(format);
|
|
56551 |
+ }
|
|
56552 |
+ }
|
|
56553 |
+ bw->found = FALSE;
|
|
56554 |
+ bw->dd_list_index = 0;
|
|
56555 |
+ }
|
|
56556 |
+ break;
|
|
56557 |
+ case FINDTEXT_SUCCESS:
|
|
56558 |
+ bw->found = TRUE;
|
|
56559 |
+ if (!prefs.popup_dialogs) {
|
|
56560 |
+ gchar *format;
|
|
56561 |
+ format = a_I18n_locale_to_DILLO_CHARSET(_("(Find) \"%s\""));
|
|
56562 |
+ a_Interface_msg(bw, format, string);
|
|
56563 |
+ g_free(format);
|
|
56564 |
+ }
|
|
56565 |
+ break;
|
|
56566 |
+ default:
|
|
56567 |
+ _MSG(_("Unexpected return from a_Dw_gtk_scrolled_window_search()\n"));
|
|
56568 |
+ break;
|
|
56569 |
}
|
|
56570 |
+
|
|
56571 |
g_free(string);
|
|
56572 |
}
|
|
56573 |
|
|
56574 |
/*
|
|
56575 |
+ * Callback for findtext destroy, resets search and destroys dd_list
|
|
56576 |
+ */
|
|
56577 |
+void a_Interface_findtext_dialog_destroy(BrowserWindow *bw)
|
|
56578 |
+{
|
|
56579 |
+ DilloDoc *dd = NULL;
|
|
56580 |
+
|
|
56581 |
+ if (!find_text_window) return;
|
|
56582 |
+ dd = g_list_nth_data(bw->dd_list, bw->dd_list_index);
|
|
56583 |
+ /* reset the search */
|
|
56584 |
+ a_Dw_gtk_scrolled_window_reset_search((void *) dd->docwin);
|
|
56585 |
+ /* destroy the list */
|
|
56586 |
+ g_list_free(bw->dd_list);
|
|
56587 |
+ bw->dd_list = NULL;
|
|
56588 |
+ bw->dd_list_index = 0;
|
|
56589 |
+ bw->found = FALSE;
|
|
56590 |
+ find_text_window = NULL;
|
|
56591 |
+ if (!prefs.popup_dialogs)
|
|
56592 |
+ a_Interface_msg(bw, "");
|
|
56593 |
+ gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(bw->dd->docwin)->child));
|
|
56594 |
+}
|
|
56595 |
+
|
|
56596 |
+/*
|
|
56597 |
+ * Close the dialog interface for finding text in a page
|
|
56598 |
+ */
|
|
56599 |
+void a_Interface_findtext_dialog_close(){
|
|
56600 |
+ if (!find_text_window) return;
|
|
56601 |
+ if (prefs.popup_dialogs)
|
|
56602 |
+ gtk_widget_destroy(find_text_window);
|
|
56603 |
+ else {
|
|
56604 |
+ gtk_widget_hide(find_text_window);
|
|
56605 |
+ }
|
|
56606 |
+}
|
|
56607 |
+
|
|
56608 |
+void Interface_add_search_dialog(BrowserWindow *bw)
|
|
56609 |
+{
|
|
56610 |
+ if (prefs.popup_dialogs) return;
|
|
56611 |
+ if (bw->findtext_dialog) return;
|
|
56612 |
+ bw->findtext_dialog = gtk_hbox_new(FALSE, 0);
|
|
56613 |
+ bw->findtext_dialog_entry = gtk_entry_new();
|
|
56614 |
+ bw->findtext_dialog_check = gtk_check_button_new_with_label("aA");
|
|
56615 |
+ gtk_widget_set_usize(bw->findtext_dialog, 100, 0);
|
|
56616 |
+ gtk_widget_show(bw->findtext_dialog_entry);
|
|
56617 |
+ gtk_widget_show(bw->findtext_dialog_check);
|
|
56618 |
+ gtk_tooltips_set_tip(tooltips, bw->findtext_dialog_entry,
|
|
56619 |
+ _("press <Enter> to (repeat) search, <Esc> to close search"),
|
|
56620 |
+ _("Search"));
|
|
56621 |
+ gtk_tooltips_set_tip(tooltips, bw->findtext_dialog_check,
|
|
56622 |
+ _("Case sensitive"),
|
|
56623 |
+ _("Case sensitive"));
|
|
56624 |
+ gtk_box_pack_start(GTK_BOX(bw->findtext_dialog),
|
|
56625 |
+ bw->findtext_dialog_check, FALSE, FALSE, 0);
|
|
56626 |
+ gtk_box_pack_start(GTK_BOX(bw->findtext_dialog),
|
|
56627 |
+ bw->findtext_dialog_entry, TRUE, TRUE, 0);
|
|
56628 |
+ gtk_box_pack_start(GTK_BOX(bw->status_box),
|
|
56629 |
+ bw->findtext_dialog, TRUE, TRUE, 2);
|
|
56630 |
+ gtk_signal_connect(GTK_OBJECT(bw->findtext_dialog_entry), "activate",
|
|
56631 |
+ Interface_entry_search, (void *) bw);
|
|
56632 |
+ gtk_signal_connect_object
|
|
56633 |
+ (GTK_OBJECT(bw->findtext_dialog), "hide",
|
|
56634 |
+ (GtkSignalFunc) a_Interface_findtext_dialog_destroy,
|
|
56635 |
+ (void*) bw);
|
|
56636 |
+ gtk_widget_add_accelerator(bw->findtext_dialog, "hide",
|
|
56637 |
+ bw->accel_group, GDK_Escape, 0, 0);
|
|
56638 |
+}
|
|
56639 |
+
|
|
56640 |
+/*
|
|
56641 |
* Show the dialog interface for finding text in a page
|
|
56642 |
*/
|
|
56643 |
void a_Interface_findtext_dialog(BrowserWindow *bw)
|
|
56644 |
{
|
|
56645 |
- if (!bw->findtext_dialog_window) {
|
|
56646 |
- Interface_make_dialog(&(bw->findtext_dialog_window),
|
|
56647 |
- "findtext_dialog", "Dillo", "Dillo: Find text in page",
|
|
56648 |
- &(bw->findtext_dialog_entry), "", 1,
|
|
56649 |
- &(bw->findtext_dialog_check), "Case sensitive",
|
|
56650 |
- "Find", (GtkSignalFunc) Interface_entry_search, (void *)bw);
|
|
56651 |
- if (prefs.transient_dialogs)
|
|
56652 |
- gtk_window_set_transient_for(GTK_WINDOW(bw->findtext_dialog_window),
|
|
56653 |
- GTK_WINDOW(bw->main_window));
|
|
56654 |
- gtk_signal_connect_object
|
|
56655 |
- (GTK_OBJECT(bw->findtext_dialog_window), "destroy",
|
|
56656 |
- (GtkSignalFunc) a_Dw_gtk_scrolled_window_reset_search,
|
|
56657 |
- (void*)bw->docwin);
|
|
56658 |
- gtk_window_set_position(GTK_WINDOW(bw->findtext_dialog_window),
|
|
56659 |
- GTK_WIN_POS_NONE);
|
|
56660 |
- }
|
|
56661 |
+ /* make search list if it has not been defined yet */
|
|
56662 |
+ if(bw->dd_list == NULL)
|
|
56663 |
+ bw->dd_list = a_Doc_get_visible_children(bw->dd);
|
|
56664 |
+ bw->dd_list_index = 0;
|
|
56665 |
+ /* reset found state */
|
|
56666 |
+ bw->found = FALSE;
|
|
56667 |
+
|
|
56668 |
+ /* does the user want popup windows? */
|
|
56669 |
+ if (prefs.popup_dialogs) {
|
|
56670 |
+ /* YES: create search dialog popup */
|
|
56671 |
+ if (!bw->findtext_dialog) {
|
|
56672 |
+ Interface_make_dialog(&(bw->findtext_dialog),
|
|
56673 |
+ "findtext_dialog", "Dillo", _("Dillo: Find text in page"),
|
|
56674 |
+ &(bw->findtext_dialog_entry), "", 1,
|
|
56675 |
+ &(bw->findtext_dialog_check), _("Case sensitive"),
|
|
56676 |
+ _("Find"), (GtkSignalFunc) Interface_entry_search, (void *)bw);
|
|
56677 |
+ if (prefs.transient_dialogs)
|
|
56678 |
+ gtk_window_set_transient_for(GTK_WINDOW(bw->findtext_dialog),
|
|
56679 |
+ GTK_WINDOW(bw->main_window));
|
|
56680 |
+ gtk_signal_connect_object
|
|
56681 |
+ (GTK_OBJECT(bw->findtext_dialog), "destroy",
|
|
56682 |
+ (GtkSignalFunc) a_Interface_findtext_dialog_destroy,
|
|
56683 |
+ (void*) bw);
|
|
56684 |
+ gtk_window_set_position(GTK_WINDOW(bw->findtext_dialog),
|
|
56685 |
+ GTK_WIN_POS_NONE);
|
|
56686 |
+ }
|
|
56687 |
|
|
56688 |
- a_Interface_set_nice_window_pos(bw->findtext_dialog_window,
|
|
56689 |
- bw->main_window);
|
|
56690 |
+ a_Interface_set_nice_window_pos(bw->findtext_dialog,
|
|
56691 |
+ bw->main_window);
|
|
56692 |
|
|
56693 |
- if (!GTK_WIDGET_VISIBLE(bw->findtext_dialog_window))
|
|
56694 |
- gtk_widget_show(bw->findtext_dialog_window);
|
|
56695 |
- else
|
|
56696 |
- gdk_window_raise(bw->findtext_dialog_window->window);
|
|
56697 |
+ if (!GTK_WIDGET_VISIBLE(bw->findtext_dialog))
|
|
56698 |
+ gtk_widget_show(bw->findtext_dialog);
|
|
56699 |
+ else
|
|
56700 |
+ gdk_window_raise(bw->findtext_dialog->window);
|
|
56701 |
+ } else {
|
|
56702 |
+ gtk_widget_show(bw->findtext_dialog);
|
|
56703 |
+ gtk_widget_grab_focus(bw->findtext_dialog_entry);
|
|
56704 |
+ }
|
|
56705 |
+ find_text_window = bw->findtext_dialog;
|
|
56706 |
}
|
|
56707 |
|
|
56708 |
/*
|
|
56709 |
@@ -1892,7 +2008,7 @@ static void Interface_search_callback(Gt
|
|
56710 |
{
|
|
56711 |
gchar *keyw, *url_str;
|
|
56712 |
|
|
56713 |
- keyw = gtk_editable_get_chars(GTK_EDITABLE(bw->search_dialog_entry), 0, -1);
|
|
56714 |
+ keyw = a_I18n_gtk_editable_get_chars(GTK_EDITABLE(bw->search_dialog_entry), 0, -1);
|
|
56715 |
if (keyw) {
|
|
56716 |
url_str = Interface_make_search_url(keyw);
|
|
56717 |
Interface_open_url_string(url_str, bw);
|
|
56718 |
@@ -1910,9 +2026,9 @@ void a_Interface_search_dialog(GtkWidget
|
|
56719 |
{
|
|
56720 |
if (!bw->search_dialog_window) {
|
|
56721 |
Interface_make_dialog(&(bw->search_dialog_window),
|
|
56722 |
- "search_dialog", "Dillo", "Dillo: Search the Web",
|
|
56723 |
+ "search_dialog", _("Dillo"), _("Dillo: Search the Web"),
|
|
56724 |
&(bw->search_dialog_entry), "", 1, NULL, NULL,
|
|
56725 |
- "Search", (GtkSignalFunc)Interface_search_callback, (void *)bw);
|
|
56726 |
+ _("Search"), (GtkSignalFunc)Interface_search_callback, (void *)bw);
|
|
56727 |
if (prefs.transient_dialogs)
|
|
56728 |
gtk_window_set_transient_for(GTK_WINDOW(bw->search_dialog_window),
|
|
56729 |
GTK_WINDOW(bw->main_window));
|
|
56730 |
@@ -1931,7 +2047,7 @@ static void Interface_entry_proxy_passwd
|
|
56731 |
{
|
|
56732 |
gchar *text;
|
|
56733 |
|
|
56734 |
- text = gtk_editable_get_chars(GTK_EDITABLE(bw->proxy_passwd_dialog_entry),
|
|
56735 |
+ text = a_I18n_gtk_editable_get_chars(GTK_EDITABLE(bw->proxy_passwd_dialog_entry),
|
|
56736 |
0, -1);
|
|
56737 |
a_Http_set_proxy_passwd(text);
|
|
56738 |
g_free(text);
|
|
56739 |
@@ -1947,14 +2063,14 @@ void a_Interface_proxy_passwd_dialog(Bro
|
|
56740 |
{
|
|
56741 |
GString *buf = g_string_new("");
|
|
56742 |
|
|
56743 |
- g_string_sprintf(buf, "Dillo: Enter proxy password for '%s'",
|
|
56744 |
+ g_string_sprintf(buf, _("Dillo: Enter proxy password for '%s'"),
|
|
56745 |
prefs.http_proxyuser);
|
|
56746 |
|
|
56747 |
if (!bw->proxy_passwd_dialog_window) {
|
|
56748 |
Interface_make_dialog(&(bw->proxy_passwd_dialog_window),
|
|
56749 |
"proxy_passwd_dialog", "Dillo", buf->str,
|
|
56750 |
&(bw->proxy_passwd_dialog_entry), "", 0, NULL, NULL,
|
|
56751 |
- "OK", (GtkSignalFunc)Interface_entry_proxy_passwd, (void *)bw);
|
|
56752 |
+ _("OK"), (GtkSignalFunc)Interface_entry_proxy_passwd, (void *)bw);
|
|
56753 |
if (prefs.transient_dialogs)
|
|
56754 |
gtk_window_set_transient_for(
|
|
56755 |
GTK_WINDOW(bw->proxy_passwd_dialog_window),
|
|
56756 |
@@ -2011,7 +2127,7 @@ void a_Interface_message_window(const ch
|
|
56757 |
|
|
56758 |
window = gtk_window_new(GTK_WINDOW_DIALOG);
|
|
56759 |
gtk_window_set_wmclass(GTK_WINDOW(window), "question_dialog", "dillo");
|
|
56760 |
- gtk_window_set_title(GTK_WINDOW(window), title);
|
|
56761 |
+ a_I18n_gtk_window_set_title(GTK_WINDOW(window), title);
|
|
56762 |
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
|
|
56763 |
gtk_container_border_width(GTK_CONTAINER(window), 10);
|
|
56764 |
gtk_signal_connect_object(GTK_OBJECT(window), "delete_event",
|
|
56765 |
@@ -2024,7 +2140,7 @@ void a_Interface_message_window(const ch
|
|
56766 |
box = gtk_vbox_new(FALSE, 5);
|
|
56767 |
frame = gtk_frame_new(NULL);
|
|
56768 |
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
|
|
56769 |
- label = gtk_label_new(msg);
|
|
56770 |
+ label = a_I18n_gtk_label_new(msg);
|
|
56771 |
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL);
|
|
56772 |
gtk_misc_set_padding(GTK_MISC(label), 20, 20);
|
|
56773 |
gtk_container_add(GTK_CONTAINER(frame), label);
|
|
56774 |
@@ -2032,7 +2148,7 @@ void a_Interface_message_window(const ch
|
|
56775 |
gtk_widget_show(frame);
|
|
56776 |
gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
|
|
56777 |
|
|
56778 |
- button = gtk_button_new_with_label("Close");
|
|
56779 |
+ button = gtk_button_new_with_label(_("Close"));
|
|
56780 |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
|
|
56781 |
(GtkSignalFunc)gtk_widget_destroy, (void*)window);
|
|
56782 |
gtk_widget_add_accelerator(button, "clicked",
|
|
56783 |
@@ -2057,6 +2173,7 @@ void a_Interface_text_window (GtkWidget
|
|
56784 |
{
|
|
56785 |
gint xsize, ysize;
|
|
56786 |
GtkWidget *window, *box1, *button, *scrolled_window, *text;
|
|
56787 |
+ char *enc_buf, *charset;
|
|
56788 |
|
|
56789 |
if (*text_widget)
|
|
56790 |
gtk_widget_destroy (*text_widget);
|
|
56791 |
@@ -2075,7 +2192,7 @@ void a_Interface_text_window (GtkWidget
|
|
56792 |
GTK_SIGNAL_FUNC(gtk_widget_destroyed),
|
|
56793 |
text_widget);
|
|
56794 |
|
|
56795 |
- gtk_window_set_title (GTK_WINDOW (window), title);
|
|
56796 |
+ a_I18n_gtk_window_set_title (GTK_WINDOW (window), title);
|
|
56797 |
gtk_container_border_width (GTK_CONTAINER (window), 0);
|
|
56798 |
|
|
56799 |
box1 = gtk_vbox_new (FALSE, 0);
|
|
56800 |
@@ -2095,10 +2212,18 @@ void a_Interface_text_window (GtkWidget
|
|
56801 |
gtk_widget_show (text);
|
|
56802 |
|
|
56803 |
gtk_text_freeze (GTK_TEXT (text));
|
|
56804 |
- gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, buf, buf_size);
|
|
56805 |
+
|
|
56806 |
+ charset = a_I18n_get_charset_from_meta_tag(buf, buf_size);
|
|
56807 |
+ if (!charset) charset = a_I18n_get_encoding(buf, buf_size);
|
|
56808 |
+ enc_buf = a_I18n_convert(charset, DW_CHARSET, buf, buf_size);
|
|
56809 |
+ g_free(charset);
|
|
56810 |
+
|
|
56811 |
+ if (enc_buf)
|
|
56812 |
+ gtk_text_insert (GTK_TEXT (text),
|
|
56813 |
+ NULL, NULL, NULL, enc_buf, strlen(enc_buf));
|
|
56814 |
gtk_text_thaw (GTK_TEXT (text));
|
|
56815 |
|
|
56816 |
- button = gtk_button_new_with_label ("close");
|
|
56817 |
+ button = gtk_button_new_with_label (_("close"));
|
|
56818 |
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
|
|
56819 |
GTK_SIGNAL_FUNC(gtk_widget_destroy),
|
|
56820 |
GTK_OBJECT (window));
|
|
56821 |
@@ -2156,3 +2281,5 @@ void a_Interface_set_nice_window_pos(Gtk
|
|
56822 |
gtk_widget_set_uposition(win1, (sh - h1) / 2, 0);
|
|
56823 |
}
|
|
56824 |
}
|
|
56825 |
+
|
|
56826 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
56827 |
diff -pruN dillo-0.8.6/src/interface.h dillo-0.8.6-i18n-misc-20070916/src/interface.h
|
|
56828 |
--- dillo-0.8.6/src/interface.h 2005-10-28 01:20:13.000000000 +0900
|
|
56829 |
+++ dillo-0.8.6-i18n-misc-20070916/src/interface.h 2006-05-16 01:21:09.000000000 +0900
|
|
56830 |
@@ -6,7 +6,7 @@
|
|
56831 |
/*
|
|
56832 |
* This struct is used with custom dialogs.
|
|
56833 |
* It can be extended to provide extra widgets (e.g. check buttons).
|
|
56834 |
- *
|
|
56835 |
+ *
|
|
56836 |
*/
|
|
56837 |
typedef struct _DialogAnswer DialogAnswer;
|
|
56838 |
struct _DialogAnswer {
|
|
56839 |
@@ -18,14 +18,8 @@ struct _DialogAnswer {
|
|
56840 |
|
|
56841 |
|
|
56842 |
void a_Interface_init(void);
|
|
56843 |
-void a_Interface_stop(BrowserWindow *bw);
|
|
56844 |
-void a_Interface_clean(BrowserWindow *bw);
|
|
56845 |
-void a_Interface_quit_all(void);
|
|
56846 |
|
|
56847 |
-void a_Interface_add_client(BrowserWindow *bw, gint Key, gint Root);
|
|
56848 |
-void a_Interface_remove_client(BrowserWindow *bw, gint ClientKey);
|
|
56849 |
-void a_Interface_add_url(BrowserWindow *bw, const DilloUrl *Url, gint Flags);
|
|
56850 |
-void a_Interface_close_client(BrowserWindow *bw, gint ClientKey);
|
|
56851 |
+void a_Interface_quit_all(void);
|
|
56852 |
|
|
56853 |
void a_Interface_msg(BrowserWindow *bw, const char *format, ... );
|
|
56854 |
void a_Interface_bug_meter_update(BrowserWindow *bw, gint num_err);
|
|
56855 |
@@ -36,6 +30,8 @@ void a_Interface_save_dialog(GtkWidget *
|
|
56856 |
void a_Interface_save_link_dialog(GtkWidget *widget, BrowserWindow *bw);
|
|
56857 |
void a_Interface_offer_link_download(BrowserWindow *bw, const DilloUrl *url);
|
|
56858 |
void a_Interface_search_dialog(GtkWidget *widget, BrowserWindow *bw);
|
|
56859 |
+void Interface_findtext_dialog_destroy(BrowserWindow *bw);
|
|
56860 |
+void a_Interface_findtext_dialog_close();
|
|
56861 |
void a_Interface_findtext_dialog(BrowserWindow *bw);
|
|
56862 |
void a_Interface_proxy_passwd_dialog(BrowserWindow *bw);
|
|
56863 |
void a_Interface_quit_dialog(BrowserWindow *bw);
|
|
56864 |
@@ -45,7 +41,12 @@ void a_Interface_set_location_text(Brows
|
|
56865 |
gchar *a_Interface_get_location_text(BrowserWindow *bw);
|
|
56866 |
void a_Interface_reset_progress_bars(BrowserWindow *bw);
|
|
56867 |
void a_Interface_entry_open_url(GtkWidget *widget, BrowserWindow *bw);
|
|
56868 |
-void a_Interface_set_cursor(BrowserWindow *bw, GdkCursorType CursorType);
|
|
56869 |
+
|
|
56870 |
+void a_Interface_toggle_panel(BrowserWindow *bw, gboolean toggle);
|
|
56871 |
+
|
|
56872 |
+/* content (scrolled_frame and everything in it) focus callback */
|
|
56873 |
+void a_Interface_content_focus_callback(BrowserWindow *bw);
|
|
56874 |
+
|
|
56875 |
BrowserWindow *
|
|
56876 |
a_Interface_browser_window_new(gint width, gint height, guint32 xid);
|
|
56877 |
|
|
56878 |
@@ -54,7 +55,7 @@ void a_Interface_set_button_sens(Browser
|
|
56879 |
void a_Interface_scroll_popup(GtkWidget *widget);
|
|
56880 |
|
|
56881 |
void a_Interface_question_dialog(
|
|
56882 |
- BrowserWindow *bw, gchar *QuestionTxt, gint modal_flag,
|
|
56883 |
+ DilloDoc *dd, gchar *QuestionTxt, gint modal_flag,
|
|
56884 |
char *alt1, char *alt2, char *alt3, char *alt4, char *alt5,
|
|
56885 |
GtkSignalFunc AnswerCallback);
|
|
56886 |
void a_Interface_message_window(const char *title, const char *format, ... );
|
|
56887 |
@@ -65,5 +66,10 @@ void a_Interface_text_window (GtkWidget
|
|
56888 |
|
|
56889 |
void a_Interface_set_nice_window_pos(GtkWidget *win1, GtkWidget *win2);
|
|
56890 |
|
|
56891 |
+void a_Interface_passwd_dialog(BrowserWindow *bw,
|
|
56892 |
+ gchar *Context,
|
|
56893 |
+ GtkSignalFunc OkCallback, void *OkCbData,
|
|
56894 |
+ GtkSignalFunc CancelCallback, void *CancelCbData);
|
|
56895 |
+
|
|
56896 |
|
|
56897 |
#endif /* __INTERFACE_H__ */
|
|
56898 |
diff -pruN dillo-0.8.6/src/intl.h dillo-0.8.6-i18n-misc-20070916/src/intl.h
|
|
56899 |
--- dillo-0.8.6/src/intl.h 1970-01-01 09:00:00.000000000 +0900
|
|
56900 |
+++ dillo-0.8.6-i18n-misc-20070916/src/intl.h 2007-09-09 11:12:10.000000000 +0900
|
|
56901 |
@@ -0,0 +1,30 @@
|
|
56902 |
+#ifndef __INTL_H__
|
|
56903 |
+#define __INTL_H__
|
|
56904 |
+
|
|
56905 |
+#ifdef ENABLE_NLS
|
|
56906 |
+# include <libintl.h>
|
|
56907 |
+# include <locale.h>
|
|
56908 |
+# define _(String) dgettext(PACKAGE,String)
|
|
56909 |
+# ifdef ngettext
|
|
56910 |
+# define _n(msgid1, msgid2, n) ngettext(msgid1, msgid2, n)
|
|
56911 |
+# else
|
|
56912 |
+# define _n(msgid1, msgid2, n) ((n==1) ? msgid1 : msgid2)
|
|
56913 |
+# endif /* gettext_noop */
|
|
56914 |
+# ifdef gettext_noop
|
|
56915 |
+# define N_(String) gettext_noop(String)
|
|
56916 |
+# else
|
|
56917 |
+# define N_(String) (String)
|
|
56918 |
+# endif /* gettext_noop */
|
|
56919 |
+#else
|
|
56920 |
+# define _(String) (String)
|
|
56921 |
+# define _n(msgid1, msgid2, n) ((n==1) ? msgid1 : msgid2)
|
|
56922 |
+# define N_(String) (String)
|
|
56923 |
+# define textdomain(String) (String)
|
|
56924 |
+# define gettext(String) (String)
|
|
56925 |
+# define dgettext(Domain,String) (String)
|
|
56926 |
+# define dcgettext(Domain,String,Type) (String)
|
|
56927 |
+# define bindtextdomain(Domain,Directory) (Domain)
|
|
56928 |
+# define bind_textdomain_codeset(Domain,Codeset) (Domain)
|
|
56929 |
+#endif /* ENABLE_NLS */
|
|
56930 |
+
|
|
56931 |
+#endif /* __INTL_H__ */
|
|
56932 |
diff -pruN dillo-0.8.6/src/menu.c dillo-0.8.6-i18n-misc-20070916/src/menu.c
|
|
56933 |
--- dillo-0.8.6/src/menu.c 2005-10-28 01:20:13.000000000 +0900
|
|
56934 |
+++ dillo-0.8.6-i18n-misc-20070916/src/menu.c 2006-05-16 01:21:09.000000000 +0900
|
|
56935 |
@@ -20,11 +20,16 @@
|
|
56936 |
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
56937 |
*/
|
|
56938 |
|
|
56939 |
+#include <config.h>
|
|
56940 |
#include <stdio.h>
|
|
56941 |
#include <stdlib.h>
|
|
56942 |
#include <string.h>
|
|
56943 |
#include <gtk/gtk.h>
|
|
56944 |
#include <gdk/gdkkeysyms.h>
|
|
56945 |
+#include "intl.h"
|
|
56946 |
+#include "i18n.h"
|
|
56947 |
+#include "i18n_gtk.h"
|
|
56948 |
+#include "prefs.h"
|
|
56949 |
#include "history.h"
|
|
56950 |
#include "nav.h"
|
|
56951 |
#include "commands.h"
|
|
56952 |
@@ -38,6 +43,8 @@
|
|
56953 |
#include "gtk_ext_menu_item.h"
|
|
56954 |
#include "gtk_menu_title.h"
|
|
56955 |
|
|
56956 |
+/* NOTE: default charset is DW_CHARSET */
|
|
56957 |
+
|
|
56958 |
/*
|
|
56959 |
* Forward declarations
|
|
56960 |
*/
|
|
56961 |
@@ -156,31 +163,54 @@ GtkWidget *a_Menu_mainbar_new(BrowserWin
|
|
56962 |
{
|
|
56963 |
GtkWidget *menubar;
|
|
56964 |
GtkWidget *file_menu;
|
|
56965 |
+ GtkWidget *view_menu;
|
|
56966 |
+
|
|
56967 |
/* GtkWidget *help_menu; */
|
|
56968 |
|
|
56969 |
bw->menubar = menubar = gtk_menu_bar_new();
|
|
56970 |
|
|
56971 |
/* FILE MENU */
|
|
56972 |
- file_menu = Menu_new(menubar, tiny ? "_F" : "_File", FALSE, bw);
|
|
56973 |
- Menu_add(file_menu, "_New Browser", "<ctrl>N", bw,
|
|
56974 |
+ file_menu = Menu_new(menubar, tiny ? "_F" : _("_File"), FALSE, bw);
|
|
56975 |
+ Menu_add(file_menu, _("_New Window"), "<ctrl>N", bw,
|
|
56976 |
a_Commands_new_callback, bw);
|
|
56977 |
- Menu_add(file_menu, "_Open File...", "<ctrl>O", bw,
|
|
56978 |
+#ifndef DISABLE_TABS
|
|
56979 |
+ Menu_add(file_menu, _("New _Tab"), "<ctrl>T", bw,
|
|
56980 |
+ a_Commands_new_tab_callback, bw);
|
|
56981 |
+ Menu_sep(file_menu);
|
|
56982 |
+#endif /* !DISABLE_TABS */
|
|
56983 |
+ Menu_add(file_menu, _("_Open File..."), "<ctrl>O", bw,
|
|
56984 |
a_Commands_openfile_callback, bw);
|
|
56985 |
- Menu_add(file_menu, "Open _URL...", "<ctrl>L", bw,
|
|
56986 |
+ Menu_add(file_menu, _("Open _URL..."), "<ctrl>L", bw,
|
|
56987 |
a_Commands_openurl_callback, bw);
|
|
56988 |
/*
|
|
56989 |
- Menu_add(file_menu, "_Preferences", "<ctrl>E", bw,
|
|
56990 |
+ Menu_add(file_menu, _("_Preferences"), "<ctrl>E", bw,
|
|
56991 |
a_Commands_prefs_callback, bw);
|
|
56992 |
*/
|
|
56993 |
- Menu_add(file_menu, "Close Window", "<ctrl>Q", bw,
|
|
56994 |
+ Menu_add(file_menu, _("Close Window"), "<ctrl>Q", bw,
|
|
56995 |
a_Commands_close_callback, bw);
|
|
56996 |
+#ifndef DISABLE_TABS
|
|
56997 |
+ Menu_add(file_menu, _("Close Tab"), "<ctrl>W", bw,
|
|
56998 |
+ a_Commands_close_current_tab_callback, bw);
|
|
56999 |
+#endif /* !DISABLE_TABS */
|
|
57000 |
Menu_sep(file_menu);
|
|
57001 |
- Menu_add(file_menu, "Exit Dillo", "<alt>Q", bw,
|
|
57002 |
+ Menu_add(file_menu, _("Exit Dillo"), "<alt>Q", bw,
|
|
57003 |
a_Commands_exit_callback, bw);
|
|
57004 |
|
|
57005 |
+ /* VIEW MENU */
|
|
57006 |
+ view_menu = Menu_new(menubar, tiny? "_V" : _("_View"), FALSE, bw);
|
|
57007 |
+#ifndef DISABLE_TABS
|
|
57008 |
+ Menu_add(view_menu, _("Previous tab"), "<ctrl>comma", bw,
|
|
57009 |
+ a_Commands_tab_prev_callback, bw);
|
|
57010 |
+ Menu_add(view_menu, _("Next tab"), "<ctrl>period", bw,
|
|
57011 |
+ a_Commands_tab_next_callback, bw);
|
|
57012 |
+ Menu_sep(view_menu);
|
|
57013 |
+#endif /* !DISABLE_TABS */
|
|
57014 |
+ Menu_add(view_menu, _("_Options..."), NULL, bw,
|
|
57015 |
+ a_Commands_prefs_callback, bw);
|
|
57016 |
+
|
|
57017 |
/* HELP MENU
|
|
57018 |
- help_menu = Menu_new(menubar, "_Help", TRUE, bw);
|
|
57019 |
- Menu_add(help_menu, "Dillo _Home", NULL, bw,
|
|
57020 |
+ help_menu = Menu_new(menubar, _("_Help"), TRUE, bw);
|
|
57021 |
+ Menu_add(help_menu, _("Dillo _Home"), NULL, bw,
|
|
57022 |
a_Commands_helphome_callback, bw);
|
|
57023 |
*/
|
|
57024 |
return menubar;
|
|
57025 |
@@ -195,28 +225,149 @@ GtkWidget *a_Menu_popup_op_new(BrowserWi
|
|
57026 |
|
|
57027 |
menu = gtk_menu_new();
|
|
57028 |
Menu_sep(menu);
|
|
57029 |
- Menu_add_title(menu, "PAGE OPTIONS");
|
|
57030 |
+ Menu_add_title(menu, _("PAGE OPTIONS"));
|
|
57031 |
Menu_sep(menu);
|
|
57032 |
- Menu_add(menu, "View page Source", NULL, bw,
|
|
57033 |
+ if(prefs.show_popup_navigation) {
|
|
57034 |
+ bw->back_op_menu_button = Menu_add(menu, _("Back"), NULL, bw,
|
|
57035 |
+ a_Commands_back_callback, bw);
|
|
57036 |
+ bw->forw_op_menu_button = Menu_add(menu, _("Forward"), NULL, bw,
|
|
57037 |
+ a_Commands_forw_callback, bw);
|
|
57038 |
+ bw->stop_op_menu_button = Menu_add(menu, _("Stop"), NULL, bw,
|
|
57039 |
+ a_Commands_stop_callback, bw);
|
|
57040 |
+ Menu_add(menu, _("_Reload"), "<ctrl>r", bw,
|
|
57041 |
+ a_Commands_reload_callback, bw);
|
|
57042 |
+ Menu_sep(menu);
|
|
57043 |
+ }
|
|
57044 |
+ Menu_add(menu, _("View page So_urce"), NULL, bw,
|
|
57045 |
a_Commands_viewsource_callback, bw);
|
|
57046 |
- bw->viewbugs_menuitem = Menu_add(menu, "View page Bugs", NULL,bw, NULL,bw);
|
|
57047 |
-
|
|
57048 |
- Menu_add(menu, "Bookmark this page", NULL, bw,
|
|
57049 |
+ bw->viewbugs_menuitem = Menu_add(menu, _("View page Bugs"), NULL,bw, NULL,bw);
|
|
57050 |
+ Menu_add(menu, _("_Bookmark this Page"), NULL, bw,
|
|
57051 |
a_Commands_addbm_callback, bw);
|
|
57052 |
Menu_sep(menu);
|
|
57053 |
- Menu_add(menu, "_Find Text", "<ctrl>F", bw,
|
|
57054 |
+ Menu_add(menu, _("Duplicate this Page"), "<alt>n", bw,
|
|
57055 |
+ a_Commands_duplicate_callback, bw);
|
|
57056 |
+#ifndef DISABLE_TABS
|
|
57057 |
+ Menu_add(menu, _("Duplicate this tab"), "<alt>t", bw,
|
|
57058 |
+ a_Commands_duplicate_tab_callback, bw);
|
|
57059 |
+#endif /* !DISABLE_TABS */
|
|
57060 |
+ Menu_sep(menu);
|
|
57061 |
+ Menu_add(menu, _("_Find Text"), "<ctrl>F", bw,
|
|
57062 |
a_Commands_findtext_callback, bw);
|
|
57063 |
|
|
57064 |
- bw->pagemarks_menuitem = Menu_add(menu, "Jump to...", NULL, bw, NULL, bw);
|
|
57065 |
+ bw->pagemarks_menuitem = Menu_add(menu, _("Jump to..."), NULL, bw, NULL, NULL);
|
|
57066 |
+ bw->frame_menuitem = Menu_add(menu, _("This Frame..."), NULL, bw, NULL, NULL);
|
|
57067 |
+ bw->frameset_menuitem = Menu_add(menu, _("This Frameset..."), NULL, bw, NULL, NULL);
|
|
57068 |
|
|
57069 |
Menu_sep(menu);
|
|
57070 |
- Menu_add(menu, "Save page As...", NULL, bw,
|
|
57071 |
+ Menu_add(menu, _("Save Page As..."), "<ctrl>s", bw,
|
|
57072 |
a_Commands_save_callback, bw);
|
|
57073 |
|
|
57074 |
return menu;
|
|
57075 |
}
|
|
57076 |
|
|
57077 |
/*
|
|
57078 |
+ * Make a new frame menu and return it
|
|
57079 |
+ */
|
|
57080 |
+GtkWidget *a_Menu_popup_of_new(DilloDoc *dd)
|
|
57081 |
+{
|
|
57082 |
+ GtkWidget *menu;
|
|
57083 |
+
|
|
57084 |
+ menu = gtk_menu_new();
|
|
57085 |
+ Menu_sep(menu);
|
|
57086 |
+ Menu_add_title(menu, _("FRAME OPTIONS"));
|
|
57087 |
+ Menu_sep(menu);
|
|
57088 |
+ if (prefs.show_popup_navigation) {
|
|
57089 |
+ dd->bw->back_op_menu_button = Menu_add(menu, _("Back"), NULL, dd->bw,
|
|
57090 |
+ a_Commands_back_callback, dd->bw);
|
|
57091 |
+ dd->bw->forw_op_menu_button = Menu_add(menu, _("Forward"), NULL, dd->bw,
|
|
57092 |
+ a_Commands_forw_callback, dd->bw);
|
|
57093 |
+ dd->bw->stop_op_menu_button = Menu_add(menu, _("Stop"), NULL, dd->bw,
|
|
57094 |
+ a_Commands_stop_callback, dd->bw);
|
|
57095 |
+ Menu_add(menu, _("_Reload"), NULL, dd->bw,
|
|
57096 |
+ a_Commands_reload_callback, dd->bw);
|
|
57097 |
+ Menu_sep(menu);
|
|
57098 |
+ }
|
|
57099 |
+ Menu_add(menu, _("View frame Source"), NULL, dd->bw,
|
|
57100 |
+ a_Commands_viewsource_doc_callback, dd);
|
|
57101 |
+ Menu_add(menu, _("Bookmark this Frame"), NULL, dd->bw,
|
|
57102 |
+ a_Commands_addbm_doc_callback, dd);
|
|
57103 |
+ Menu_add(menu, _("Reload this Frame"), NULL, dd->bw,
|
|
57104 |
+ a_Commands_reload_doc_callback, dd);
|
|
57105 |
+ Menu_sep(menu);
|
|
57106 |
+ Menu_add(menu, _("Show only this Frame"), NULL, dd->bw,
|
|
57107 |
+ a_Commands_showonly_doc_callback, dd);
|
|
57108 |
+ Menu_add(menu, _("Open Frame in new Window"), NULL, dd->bw,
|
|
57109 |
+ a_Commands_open_link_nw_callback, dd->bw);
|
|
57110 |
+#ifndef DISABLE_TABS
|
|
57111 |
+ Menu_add(menu, _("Open Frame in new Tab"), NULL, dd->bw,
|
|
57112 |
+ a_Commands_open_link_nw_tab_callback, dd->bw);
|
|
57113 |
+#endif /* !DISABLE_TABS */
|
|
57114 |
+ Menu_sep(menu);
|
|
57115 |
+ Menu_add(menu, _("_Find Text in this Frame..."), NULL, dd->bw,
|
|
57116 |
+ a_Commands_findtext_doc_callback, dd);
|
|
57117 |
+ Menu_sep(menu);
|
|
57118 |
+ Menu_add(menu, _("Save Frame As..."), NULL, dd->bw,
|
|
57119 |
+ a_Commands_save_doc_callback, dd);
|
|
57120 |
+
|
|
57121 |
+ return menu;
|
|
57122 |
+}
|
|
57123 |
+
|
|
57124 |
+/*
|
|
57125 |
+ * Make a new frameset menu and return it
|
|
57126 |
+ *
|
|
57127 |
+ */
|
|
57128 |
+GtkWidget *a_Menu_popup_ofs_new(DilloDoc *dd)
|
|
57129 |
+{
|
|
57130 |
+ GtkWidget *frameset_menu;
|
|
57131 |
+
|
|
57132 |
+ frameset_menu = gtk_menu_new();
|
|
57133 |
+ Menu_sep(frameset_menu);
|
|
57134 |
+ Menu_add_title(frameset_menu, _("FRAMESET OPTIONS"));
|
|
57135 |
+ Menu_sep(frameset_menu);
|
|
57136 |
+ Menu_add(frameset_menu, _("View Frameset Source"), NULL, dd->bw,
|
|
57137 |
+ a_Commands_viewsource_doc_callback, dd->parent);
|
|
57138 |
+ Menu_add(frameset_menu, _("Bookmark this Frameset"), NULL, dd->bw,
|
|
57139 |
+ a_Commands_addbm_doc_callback, dd->parent);
|
|
57140 |
+ Menu_add(frameset_menu, _("Reload this Frameset"), NULL, dd->bw,
|
|
57141 |
+ a_Commands_reload_doc_callback, dd->parent);
|
|
57142 |
+ Menu_sep(frameset_menu);
|
|
57143 |
+ Menu_add(frameset_menu, _("Show only this Frameset"), NULL, dd->bw,
|
|
57144 |
+ a_Commands_showonly_doc_callback, dd->parent);
|
|
57145 |
+ Menu_sep(frameset_menu);
|
|
57146 |
+ Menu_add(frameset_menu, _("_Find Text in this Frameset..."), NULL, dd->bw,
|
|
57147 |
+ a_Commands_findtext_doc_callback, dd->parent);
|
|
57148 |
+ Menu_sep(frameset_menu);
|
|
57149 |
+ Menu_add(frameset_menu, _("Save Frame As..."), NULL, dd->bw,
|
|
57150 |
+ a_Commands_save_doc_callback, dd->parent);
|
|
57151 |
+
|
|
57152 |
+ return frameset_menu;
|
|
57153 |
+}
|
|
57154 |
+
|
|
57155 |
+
|
|
57156 |
+#ifndef DISABLE_TABS
|
|
57157 |
+/*
|
|
57158 |
+ * Make a new popup menu for when the mouse is over a tab
|
|
57159 |
+ */
|
|
57160 |
+GtkWidget *a_Menu_popup_tab_new(DilloDoc *dd)
|
|
57161 |
+{
|
|
57162 |
+ GtkWidget *menu;
|
|
57163 |
+
|
|
57164 |
+ menu = gtk_menu_new();
|
|
57165 |
+ Menu_sep(menu);
|
|
57166 |
+ Menu_add_title(menu, _("TAB OPTIONS"));
|
|
57167 |
+ Menu_sep(menu);
|
|
57168 |
+ Menu_add(menu, _("Close Tab"), NULL, dd->bw,
|
|
57169 |
+ a_Commands_close_tab_callback, dd);
|
|
57170 |
+ Menu_add(menu, _("New Tab"), NULL, dd->bw,
|
|
57171 |
+ a_Commands_new_tab_callback, dd->bw);
|
|
57172 |
+ Menu_add(menu, _("Reload Tab"), NULL, dd->bw,
|
|
57173 |
+ a_Commands_reload_doc_callback, dd);
|
|
57174 |
+ return menu;
|
|
57175 |
+}
|
|
57176 |
+
|
|
57177 |
+#endif /* !DISABLE_TABS */
|
|
57178 |
+
|
|
57179 |
+/*
|
|
57180 |
* Set the popup's primary DilloUrl
|
|
57181 |
*/
|
|
57182 |
void a_Menu_popup_set_url(BrowserWindow *bw, const DilloUrl *url)
|
|
57183 |
@@ -267,8 +418,8 @@ Menu_popup_history_select_callback(GtkWi
|
|
57184 |
BrowserWindow *bw = data;
|
|
57185 |
|
|
57186 |
idx = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT (widget), "nav_idx"));
|
|
57187 |
- if (idx >= 0 && idx < a_Nav_stack_size(bw)) {
|
|
57188 |
- a_Interface_msg(bw, "%s", URL_STR_(a_History_get_url(NAV_IDX(bw,idx))));
|
|
57189 |
+ if (idx >= 0 && idx < a_Nav_stack_size(bw->dd)) {
|
|
57190 |
+ a_Interface_msg(bw, "%s", URL_STR_(a_History_get_url(NAV_IDX(bw->dd,idx))));
|
|
57191 |
bw->status_is_link = 1;
|
|
57192 |
}
|
|
57193 |
}
|
|
57194 |
@@ -284,6 +435,15 @@ Menu_popup_history_deselect_callback(Gtk
|
|
57195 |
}
|
|
57196 |
|
|
57197 |
/*
|
|
57198 |
+ * Called when the user selects "Copy Link Location" in the link menu.
|
|
57199 |
+ */
|
|
57200 |
+void a_Menu_popup_select_url_callback(GtkWidget *widget, gpointer client_data)
|
|
57201 |
+{
|
|
57202 |
+ BrowserWindow *bw = (BrowserWindow *)client_data;
|
|
57203 |
+ a_Selection_set_selection(widget, URL_STR(a_Menu_popup_get_url(bw)));
|
|
57204 |
+}
|
|
57205 |
+
|
|
57206 |
+/*
|
|
57207 |
* Make a new popup menu for history browsing
|
|
57208 |
* direction: {backward = -1, forward = 1}
|
|
57209 |
*/
|
|
57210 |
@@ -292,31 +452,39 @@ GtkWidget *a_Menu_popup_history_new(Brow
|
|
57211 |
int i;
|
|
57212 |
GtkWidget *menu, *menu_item;
|
|
57213 |
GString *text = g_string_sized_new(128);
|
|
57214 |
+ gchar *text_enc;
|
|
57215 |
|
|
57216 |
menu = a_Gtk_ext_menu_new();
|
|
57217 |
Menu_sep(menu);
|
|
57218 |
if (direction>0) {
|
|
57219 |
- Menu_add_title(menu, "FOLLOWING PAGES");
|
|
57220 |
- i = a_Nav_stack_ptr(bw) + 1;
|
|
57221 |
+ Menu_add_title(menu, _("FOLLOWING PAGES"));
|
|
57222 |
+ i = a_Nav_stack_ptr(bw->dd) + 1;
|
|
57223 |
} else {
|
|
57224 |
- Menu_add_title(menu, "PREVIOUS PAGES");
|
|
57225 |
- i = a_Nav_stack_ptr(bw) - 1;
|
|
57226 |
+ Menu_add_title(menu, _("PREVIOUS PAGES"));
|
|
57227 |
+ i = a_Nav_stack_ptr(bw->dd) - 1;
|
|
57228 |
}
|
|
57229 |
Menu_sep(menu);
|
|
57230 |
|
|
57231 |
- for ( ; i >= 0 && i < a_Nav_stack_size(bw); i+=direction ) {
|
|
57232 |
- if (a_History_get_title(NAV_IDX(bw,i))) {
|
|
57233 |
- g_string_assign(text, a_History_get_title(NAV_IDX(bw,i)));
|
|
57234 |
+ for ( ; i >= 0 && i < a_Nav_stack_size(bw->dd); i+=direction ) {
|
|
57235 |
+ if (a_History_get_title(NAV_IDX(bw->dd,i))) {
|
|
57236 |
+ g_string_assign(text, a_History_get_title(NAV_IDX(bw->dd,i)));
|
|
57237 |
} else {
|
|
57238 |
- g_string_assign(text, URL_STR(a_History_get_url(NAV_IDX(bw,i))));
|
|
57239 |
+ g_string_assign(text, URL_STR(a_History_get_url(NAV_IDX(bw->dd,i))));
|
|
57240 |
}
|
|
57241 |
if ( text->len > 64 ) {
|
|
57242 |
- g_string_truncate(text, 64);
|
|
57243 |
+ int max_len = 64;
|
|
57244 |
+ while (IS_UTF8_NON_FIRST_CHAR(text->str[max_len - 1]))
|
|
57245 |
+ max_len--;
|
|
57246 |
+ if (IS_UTF8_FIRST_CHAR(text->str[max_len - 1]))
|
|
57247 |
+ max_len--;
|
|
57248 |
+ g_string_truncate(text, max_len);
|
|
57249 |
g_string_append(text, "...");
|
|
57250 |
}
|
|
57251 |
- menu_item = a_Gtk_ext_menu_item_new_with_label(text->str);
|
|
57252 |
+ text_enc = a_I18n_DW_CHARSET_from_DILLO_CHARSET(text->str, text->len);
|
|
57253 |
+ menu_item = a_Gtk_ext_menu_item_new_with_label(text_enc);
|
|
57254 |
gtk_menu_append(GTK_MENU(menu), menu_item);
|
|
57255 |
gtk_widget_show(menu_item);
|
|
57256 |
+ g_free(text_enc);
|
|
57257 |
/* attach the nav_stack index to the menu item */
|
|
57258 |
gtk_object_set_data(GTK_OBJECT (menu_item), "nav_idx",
|
|
57259 |
GINT_TO_POINTER(i));
|
|
57260 |
@@ -360,23 +528,29 @@ GtkWidget *a_Menu_popup_ol_new(BrowserWi
|
|
57261 |
|
|
57262 |
menu = gtk_menu_new();
|
|
57263 |
Menu_sep(menu);
|
|
57264 |
- Menu_add_title(menu, "LINK OPTIONS");
|
|
57265 |
+ Menu_add_title(menu, _("LINK OPTIONS"));
|
|
57266 |
Menu_sep(menu);
|
|
57267 |
- Menu_add(menu, "Open Link in New Window", NULL, bw,
|
|
57268 |
+ Menu_add(menu, _("Open Link in New Window"), NULL, bw,
|
|
57269 |
a_Commands_open_link_nw_callback, bw);
|
|
57270 |
- Menu_add(menu, "Bookmark this Link", NULL, bw,
|
|
57271 |
- a_Commands_addbm_callback, bw);
|
|
57272 |
-
|
|
57273 |
- copy = Menu_add(menu, "Copy Link location", NULL, bw,
|
|
57274 |
- a_Commands_select_popup_url_callback, bw);
|
|
57275 |
+#ifndef DISABLE_TABS
|
|
57276 |
+ Menu_add(menu, _("Open Link in New Tab"), NULL, bw,
|
|
57277 |
+ a_Commands_open_link_nw_tab_callback, bw);
|
|
57278 |
+#endif /* !DISABLE_TABS */
|
|
57279 |
+ Menu_add(menu, _("Open Link"), NULL, bw,
|
|
57280 |
+ a_Commands_open_link_callback, bw);
|
|
57281 |
+ Menu_sep(menu);
|
|
57282 |
+ Menu_add(menu, _("Bookmark this Link"), NULL, bw,
|
|
57283 |
+ a_Commands_addbm_link_callback, bw);
|
|
57284 |
+ copy = Menu_add(menu, _("Copy Link location"), NULL, bw,
|
|
57285 |
+ a_Menu_popup_select_url_callback, bw);
|
|
57286 |
a_Selection_init_selection(copy);
|
|
57287 |
|
|
57288 |
Menu_sep(menu);
|
|
57289 |
- Menu_add(menu, "Save Link As...", NULL, bw,
|
|
57290 |
+ Menu_add(menu, _("Save Link As..."), NULL, bw,
|
|
57291 |
a_Commands_save_link_callback, bw);
|
|
57292 |
|
|
57293 |
Menu_sep(menu);
|
|
57294 |
- menuitem = Menu_add(menu, "Image Menu...", NULL, bw, NULL, bw);
|
|
57295 |
+ menuitem = Menu_add(menu, _("Image Menu..."), NULL, bw, NULL, bw);
|
|
57296 |
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
|
|
57297 |
bw->menu_popup.over_image);
|
|
57298 |
bw->menu_popup.ol_oi_submenu = menuitem;
|
|
57299 |
@@ -394,20 +568,27 @@ GtkWidget *a_Menu_popup_oi_new (BrowserW
|
|
57300 |
|
|
57301 |
menu = gtk_menu_new();
|
|
57302 |
Menu_sep(menu);
|
|
57303 |
- Menu_add_title(menu, "IMAGE OPTIONS");
|
|
57304 |
+ Menu_add_title(menu, _("IMAGE OPTIONS"));
|
|
57305 |
Menu_sep(menu);
|
|
57306 |
- Menu_add(menu, "Isolate Image", NULL, bw,
|
|
57307 |
+ Menu_add(menu, _("Isolate Image"), NULL, bw,
|
|
57308 |
a_Commands_open_link_callback, bw);
|
|
57309 |
- Menu_add(menu, "Open Image in New Window", NULL, bw,
|
|
57310 |
+ Menu_add(menu, _("Open Image in New Window"), NULL, bw,
|
|
57311 |
a_Commands_open_link_nw_callback, bw);
|
|
57312 |
- Menu_add(menu, "Bookmark this Image", NULL, bw,
|
|
57313 |
- a_Commands_addbm_callback, bw);
|
|
57314 |
- copy = Menu_add(menu, "Copy Image location", NULL, bw,
|
|
57315 |
- a_Commands_select_popup_url_callback, bw);
|
|
57316 |
+#ifndef DISABLE_TABS
|
|
57317 |
+ Menu_add(menu, _("Open Image in New Tab"), NULL, bw,
|
|
57318 |
+ a_Commands_open_link_nw_tab_callback, bw);
|
|
57319 |
+#endif /* !DISABLE_TABS */
|
|
57320 |
+ Menu_add(menu, _("Open Image"), NULL, bw,
|
|
57321 |
+ a_Commands_open_link_callback, bw);
|
|
57322 |
+ Menu_sep(menu);
|
|
57323 |
+ Menu_add(menu, _("Bookmark this Image"), NULL, bw,
|
|
57324 |
+ a_Commands_addbm_link_callback, bw);
|
|
57325 |
+ copy = Menu_add(menu, _("Copy Image location"), NULL, bw,
|
|
57326 |
+ a_Menu_popup_select_url_callback, bw);
|
|
57327 |
a_Selection_init_selection(copy);
|
|
57328 |
|
|
57329 |
Menu_sep(menu);
|
|
57330 |
- Menu_add(menu, "Save Image As...", NULL, bw,
|
|
57331 |
+ Menu_add(menu, _("Save Image As..."), NULL, bw,
|
|
57332 |
a_Commands_save_link_callback, bw);
|
|
57333 |
return menu;
|
|
57334 |
}
|
|
57335 |
@@ -421,14 +602,14 @@ GtkWidget *a_Menu_popup_ob_new (BrowserW
|
|
57336 |
|
|
57337 |
menu = gtk_menu_new();
|
|
57338 |
Menu_sep(menu);
|
|
57339 |
- Menu_add_title(menu, "BUG METER OPTIONS");
|
|
57340 |
+ Menu_add_title(menu, _("BUG METER OPTIONS"));
|
|
57341 |
Menu_sep(menu);
|
|
57342 |
- Menu_add(menu, "Validate URL with W3C", NULL, bw,
|
|
57343 |
+ Menu_add(menu, _("Validate URL with W3C"), NULL, bw,
|
|
57344 |
a_Commands_ob_w3c_callback, bw);
|
|
57345 |
- Menu_add(menu, "Validate URL with WDG", NULL, bw,
|
|
57346 |
+ Menu_add(menu, _("Validate URL with WDG"), NULL, bw,
|
|
57347 |
a_Commands_ob_wdg_callback, bw);
|
|
57348 |
Menu_sep(menu);
|
|
57349 |
- Menu_add(menu, "About Bug Meter...", NULL, bw,
|
|
57350 |
+ Menu_add(menu, _("About Bug Meter..."), NULL, bw,
|
|
57351 |
a_Commands_ob_info_callback, bw);
|
|
57352 |
return menu;
|
|
57353 |
}
|
|
57354 |
@@ -455,28 +636,46 @@ void a_Menu_popup_ol_show_oi(BrowserWind
|
|
57355 |
static void Menu_pagemarks_goto_pagemark(GtkWidget *widget,
|
|
57356 |
gpointer client_data)
|
|
57357 |
{
|
|
57358 |
- BrowserWindow *bw = (BrowserWindow *) client_data;
|
|
57359 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
57360 |
char anchor[32];
|
|
57361 |
|
|
57362 |
g_snprintf (anchor, 32, "#%ld", (long int)widget);
|
|
57363 |
- a_Dw_gtk_scrolled_window_set_anchor(GTK_DW_SCROLLED_WINDOW(bw->docwin),
|
|
57364 |
+ a_Dw_gtk_scrolled_window_set_anchor(GTK_DW_SCROLLED_WINDOW(dd->docwin),
|
|
57365 |
anchor);
|
|
57366 |
}
|
|
57367 |
|
|
57368 |
/*
|
|
57369 |
- * Deallocate the memory used by a pagemarks menu and create a new one
|
|
57370 |
+ * Deallocate memory used by a pagemark menu
|
|
57371 |
*/
|
|
57372 |
-void a_Menu_pagemarks_new(BrowserWindow *bw)
|
|
57373 |
+void a_Menu_pagemarks_destroy(DilloDoc *dd)
|
|
57374 |
{
|
|
57375 |
- gtk_widget_set_sensitive(bw->pagemarks_menuitem, FALSE);
|
|
57376 |
-
|
|
57377 |
- if (bw->pagemarks_menu)
|
|
57378 |
- gtk_widget_destroy(bw->pagemarks_menu);
|
|
57379 |
- bw->pagemarks_menu = gtk_menu_new();
|
|
57380 |
- bw->pagemarks_last = NULL;
|
|
57381 |
+ /* set pagemarks menu insensitive if this is the current tab */
|
|
57382 |
+ if(dd->bw->dd == dd)
|
|
57383 |
+ gtk_widget_set_sensitive(dd->bw->pagemarks_menuitem, FALSE);
|
|
57384 |
+ if (GTK_IS_WIDGET(dd->pagemarks_menu))
|
|
57385 |
+ {
|
|
57386 |
+ gtk_object_unref(GTK_OBJECT(dd->pagemarks_menu));
|
|
57387 |
+ dd->pagemarks_menu = NULL;
|
|
57388 |
+ dd->pagemarks_last = NULL;
|
|
57389 |
+ }
|
|
57390 |
+}
|
|
57391 |
|
|
57392 |
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(bw->pagemarks_menuitem),
|
|
57393 |
- bw->pagemarks_menu);
|
|
57394 |
+/*
|
|
57395 |
+ * Deallocate the memory used by a pagemarks menu and create a new one
|
|
57396 |
+ */
|
|
57397 |
+void a_Menu_pagemarks_new(DilloDoc *dd)
|
|
57398 |
+{
|
|
57399 |
+ a_Menu_pagemarks_destroy(dd);
|
|
57400 |
+ dd->pagemarks_menu = gtk_menu_new();
|
|
57401 |
+ /* add a reference to the object, otherwise it will be destroyed
|
|
57402 |
+ * when the document (tab) is switched */
|
|
57403 |
+ gtk_object_ref(GTK_OBJECT(dd->pagemarks_menu));
|
|
57404 |
+ dd->pagemarks_last = NULL;
|
|
57405 |
+
|
|
57406 |
+ /* add to bw's menu only if this is the current tab */
|
|
57407 |
+ if(dd->bw->dd == dd)
|
|
57408 |
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(dd->bw->pagemarks_menuitem),
|
|
57409 |
+ dd->pagemarks_menu);
|
|
57410 |
}
|
|
57411 |
|
|
57412 |
/*
|
|
57413 |
@@ -484,43 +683,61 @@ void a_Menu_pagemarks_new(BrowserWindow
|
|
57414 |
* The text can be set only at the closing H tag.
|
|
57415 |
* level is the level of the heading (1-6).
|
|
57416 |
*/
|
|
57417 |
-void a_Menu_pagemarks_add(BrowserWindow *bw, void *page, void *style,
|
|
57418 |
+void a_Menu_pagemarks_add(DilloDoc *dd, void *page, void *style,
|
|
57419 |
gint level)
|
|
57420 |
{
|
|
57421 |
char anchor[32], spaces[32], name[32];
|
|
57422 |
|
|
57423 |
- gtk_widget_set_sensitive(bw->pagemarks_menuitem, TRUE);
|
|
57424 |
+ /* set pagemarks menu sensitive if this is the current tab */
|
|
57425 |
+ if(dd->bw->dd == dd)
|
|
57426 |
+ gtk_widget_set_sensitive(dd->bw->pagemarks_menuitem, TRUE);
|
|
57427 |
g_snprintf(spaces, 32, "%*s", 3 * (level - 1), "");
|
|
57428 |
- bw->pagemarks_last = Menu_add(bw->pagemarks_menu, spaces, NULL, bw,
|
|
57429 |
- Menu_pagemarks_goto_pagemark, bw);
|
|
57430 |
- g_snprintf(anchor, 32, "#%ld", (glong)(bw->pagemarks_last));
|
|
57431 |
+ dd->pagemarks_last = gtk_menu_item_new_with_label(spaces);
|
|
57432 |
+ gtk_menu_append(GTK_MENU(dd->pagemarks_menu),dd->pagemarks_last);
|
|
57433 |
+ gtk_widget_show(dd->pagemarks_last);
|
|
57434 |
+ gtk_signal_connect(GTK_OBJECT(dd->pagemarks_last), "activate",
|
|
57435 |
+ (GtkSignalFunc) Menu_pagemarks_goto_pagemark, dd);
|
|
57436 |
+ /* was:
|
|
57437 |
+ * Menu_add(dd->pagemarks_menu, spaces, NULL, dd,
|
|
57438 |
+ * Pagemark_goto_pagemark, dd);
|
|
57439 |
+ * but Menu_add is a private function for menu.c so... */
|
|
57440 |
+ g_snprintf(anchor, 32, "#%ld", (glong)(dd->pagemarks_last));
|
|
57441 |
a_Dw_page_add_anchor(page, anchor, style);
|
|
57442 |
- gtk_signal_connect (GTK_OBJECT (bw->pagemarks_last), "select",
|
|
57443 |
+ gtk_signal_connect (GTK_OBJECT (dd->pagemarks_last), "select",
|
|
57444 |
GTK_SIGNAL_FUNC (a_Interface_scroll_popup), NULL);
|
|
57445 |
g_snprintf(name, 32, "dilloHeading%d", level);
|
|
57446 |
- gtk_widget_set_name(bw->pagemarks_last, name);
|
|
57447 |
+ gtk_widget_set_name(dd->pagemarks_last, name);
|
|
57448 |
}
|
|
57449 |
|
|
57450 |
/*
|
|
57451 |
* Set the text for the last created pagemark.
|
|
57452 |
*/
|
|
57453 |
-void a_Menu_pagemarks_set_text(BrowserWindow *bw, const char *str)
|
|
57454 |
+void a_Menu_pagemarks_set_text(DilloDoc *dd, const char *str)
|
|
57455 |
{
|
|
57456 |
GString *text;
|
|
57457 |
GtkWidget *child;
|
|
57458 |
+ char *label_text;
|
|
57459 |
|
|
57460 |
/* Avoid problems with lonely closing tags and nested headings */
|
|
57461 |
- if ( bw->pagemarks_last &&
|
|
57462 |
- (child = GTK_BIN (bw->pagemarks_last)->child) &&
|
|
57463 |
+ if ( dd->pagemarks_last &&
|
|
57464 |
+ (child = GTK_BIN (dd->pagemarks_last)->child) &&
|
|
57465 |
GTK_IS_LABEL (child) ) {
|
|
57466 |
text = g_string_new(GTK_LABEL(child)->label);
|
|
57467 |
g_string_append(text, str);
|
|
57468 |
if ( text->len > 64 ) {
|
|
57469 |
- g_string_truncate(text, 64);
|
|
57470 |
+ int max_len = 64;
|
|
57471 |
+ while (IS_UTF8_NON_FIRST_CHAR(text->str[max_len - 1]))
|
|
57472 |
+ max_len--;
|
|
57473 |
+ if (IS_UTF8_FIRST_CHAR(text->str[max_len - 1]))
|
|
57474 |
+ max_len--;
|
|
57475 |
+ g_string_truncate(text, max_len);
|
|
57476 |
g_string_append(text, "...");
|
|
57477 |
}
|
|
57478 |
- gtk_label_set_text(GTK_LABEL (child), text->str);
|
|
57479 |
+ label_text = a_I18n_string_check(text->str, DILLO_CHARSET);
|
|
57480 |
+ a_I18n_gtk_label_set_text(GTK_LABEL (child), label_text);
|
|
57481 |
+ g_free(label_text);
|
|
57482 |
g_string_free(text, 1);
|
|
57483 |
- bw->pagemarks_last = NULL;
|
|
57484 |
+ dd->pagemarks_last = NULL;
|
|
57485 |
}
|
|
57486 |
}
|
|
57487 |
+
|
|
57488 |
diff -pruN dillo-0.8.6/src/menu.h dillo-0.8.6-i18n-misc-20070916/src/menu.h
|
|
57489 |
--- dillo-0.8.6/src/menu.h 2005-10-28 01:20:13.000000000 +0900
|
|
57490 |
+++ dillo-0.8.6-i18n-misc-20070916/src/menu.h 2006-05-16 01:21:09.000000000 +0900
|
|
57491 |
@@ -8,7 +8,12 @@ GtkWidget *a_Menu_popup_op_new (BrowserW
|
|
57492 |
GtkWidget *a_Menu_popup_ol_new (BrowserWindow *bw);
|
|
57493 |
GtkWidget *a_Menu_popup_oi_new (BrowserWindow *bw);
|
|
57494 |
GtkWidget *a_Menu_popup_ob_new (BrowserWindow *bw);
|
|
57495 |
+GtkWidget *a_Menu_popup_of_new (DilloDoc *dd);
|
|
57496 |
+GtkWidget *a_Menu_popup_ofs_new (DilloDoc *dd);
|
|
57497 |
GtkWidget *a_Menu_popup_history_new(BrowserWindow *bw, gint direction);
|
|
57498 |
+#ifndef DISABLE_TABS
|
|
57499 |
+GtkWidget *a_Menu_popup_tab_new(DilloDoc *dd);
|
|
57500 |
+#endif
|
|
57501 |
void a_Menu_popup_ol_show_oi(BrowserWindow *bw, gboolean show);
|
|
57502 |
void a_Menu_popup_set_url(BrowserWindow *bw, const DilloUrl *url);
|
|
57503 |
void a_Menu_popup_set_url2(BrowserWindow *bw, const DilloUrl *url);
|
|
57504 |
@@ -16,10 +21,10 @@ void a_Menu_popup_clear_url2(GtkWidget *
|
|
57505 |
|
|
57506 |
DilloUrl *a_Menu_popup_get_url(BrowserWindow *bw);
|
|
57507 |
|
|
57508 |
-void a_Menu_pagemarks_new (BrowserWindow *bw);
|
|
57509 |
-void a_Menu_pagemarks_destroy (BrowserWindow *bw);
|
|
57510 |
-void a_Menu_pagemarks_add(BrowserWindow *bw, void *page, void *style,
|
|
57511 |
+void a_Menu_pagemarks_new (DilloDoc *dd);
|
|
57512 |
+void a_Menu_pagemarks_destroy (DilloDoc *dd);
|
|
57513 |
+void a_Menu_pagemarks_add(DilloDoc *dd, void *page, void *style,
|
|
57514 |
gint level);
|
|
57515 |
-void a_Menu_pagemarks_set_text(BrowserWindow *bw, const char *str);
|
|
57516 |
+void a_Menu_pagemarks_set_text(DilloDoc *dd, const char *str);
|
|
57517 |
|
|
57518 |
#endif /* MENU_H */
|
|
57519 |
diff -pruN dillo-0.8.6/src/misc.c dillo-0.8.6-i18n-misc-20070916/src/misc.c
|
|
57520 |
--- dillo-0.8.6/src/misc.c 2006-04-06 05:57:18.000000000 +0900
|
|
57521 |
+++ dillo-0.8.6-i18n-misc-20070916/src/misc.c 2006-05-16 01:21:09.000000000 +0900
|
|
57522 |
@@ -10,6 +10,7 @@
|
|
57523 |
* (at your option) any later version.
|
|
57524 |
*/
|
|
57525 |
|
|
57526 |
+#include <config.h>
|
|
57527 |
#include <glib.h>
|
|
57528 |
|
|
57529 |
#include <stdio.h>
|
|
57530 |
@@ -18,8 +19,12 @@
|
|
57531 |
#include <string.h>
|
|
57532 |
#include <ctype.h>
|
|
57533 |
|
|
57534 |
+#include "intl.h"
|
|
57535 |
#include "msg.h"
|
|
57536 |
#include "misc.h"
|
|
57537 |
+#include "prefs.h"
|
|
57538 |
+#include "i18n.h"
|
|
57539 |
+
|
|
57540 |
|
|
57541 |
/*
|
|
57542 |
* Prepend the users home-dir to 'file' string i.e,
|
|
57543 |
@@ -116,7 +121,7 @@ gchar *a_Misc_expand_tabs(const char *st
|
|
57544 |
int len, i, j, pos, old_pos;
|
|
57545 |
char *val;
|
|
57546 |
|
|
57547 |
- if ( (len = strlen(str)) ) {
|
|
57548 |
+ if (str && (len = strlen(str)) ) {
|
|
57549 |
for (pos = 0, i = 0; i < len; i++) {
|
|
57550 |
if (str[i] == '\t') {
|
|
57551 |
/* Fill with whitespaces until the next tab. */
|
|
57552 |
@@ -385,3 +390,184 @@ gchar *a_Misc_encode_base64(const gchar
|
|
57553 |
out[i] = '\0';
|
|
57554 |
return out;
|
|
57555 |
}
|
|
57556 |
+
|
|
57557 |
+/* insert a space between multibyte chars. */
|
|
57558 |
+gchar *a_Misc_add_space(gchar *str){
|
|
57559 |
+ char *encStr, *parseStr;
|
|
57560 |
+ int buf_index = 0;
|
|
57561 |
+ int parse_index = 0;
|
|
57562 |
+ int wordnum = 0;
|
|
57563 |
+ int len = strlen(str);
|
|
57564 |
+ if(len == 0)
|
|
57565 |
+ return NULL;
|
|
57566 |
+ //g_print("SOURCE[%3d]: %s\n",len, str);
|
|
57567 |
+ parseStr = g_malloc0(len * 2);
|
|
57568 |
+ while(buf_index < len){
|
|
57569 |
+ if ((wordnum = a_I18n_mblen(&str[buf_index])) == 0){
|
|
57570 |
+ while(isprint(str[buf_index + wordnum]))
|
|
57571 |
+ wordnum++;
|
|
57572 |
+ }
|
|
57573 |
+ if(wordnum == 0){
|
|
57574 |
+ g_warning("Findtext_add_space() invalid char.\n");
|
|
57575 |
+ //parseStr[parse_index] = str[buf_index];
|
|
57576 |
+ buf_index++;
|
|
57577 |
+ } else {
|
|
57578 |
+ strncpy(&parseStr[parse_index], &str[buf_index], wordnum);
|
|
57579 |
+ parse_index += wordnum;
|
|
57580 |
+ buf_index += wordnum;
|
|
57581 |
+ parseStr[parse_index] = ' ';
|
|
57582 |
+ }
|
|
57583 |
+ parse_index++;
|
|
57584 |
+ }
|
|
57585 |
+ parseStr[parse_index - ((wordnum == 0)?0:1)] = 0;
|
|
57586 |
+ encStr = g_strndup(parseStr,strlen(parseStr));
|
|
57587 |
+ //g_print("PARSE[%3d]: %s\n",strlen(parseStr), parseStr);
|
|
57588 |
+ g_free(parseStr);
|
|
57589 |
+ return encStr;
|
|
57590 |
+}
|
|
57591 |
+
|
|
57592 |
+#ifndef DISABLE_TABS
|
|
57593 |
+
|
|
57594 |
+/*
|
|
57595 |
+ * (adapted from Galeon's misc_string_shorten_name())
|
|
57596 |
+ * try to shorten a string to target_length or less
|
|
57597 |
+ * this is quite language-specific, ie. it will not work
|
|
57598 |
+ * with non indo-european languages
|
|
57599 |
+ *
|
|
57600 |
+ * minimum returned string length is 1, even if target_length
|
|
57601 |
+ * is set to a lower value
|
|
57602 |
+ *
|
|
57603 |
+ * caller has to free the returned string
|
|
57604 |
+ */
|
|
57605 |
+gchar *
|
|
57606 |
+a_Misc_string_compress(const gchar *input, gint target_length)
|
|
57607 |
+{
|
|
57608 |
+ gint i, j, length;
|
|
57609 |
+ gchar *name, **common_prefixes = prefs.compress_common_prefixes_vec;
|
|
57610 |
+ gchar *shortened_name;
|
|
57611 |
+ char c;
|
|
57612 |
+
|
|
57613 |
+ /* it does not make sense to compress a string into nothing... */
|
|
57614 |
+ if (target_length < 1)
|
|
57615 |
+ target_length = 1;
|
|
57616 |
+
|
|
57617 |
+ if (input == NULL)
|
|
57618 |
+ return (a_Misc_string_shorten(g_strdup(_("Untitled")),target_length));
|
|
57619 |
+
|
|
57620 |
+ /* copy and clean name */
|
|
57621 |
+ name = g_strdup (input);
|
|
57622 |
+ g_strstrip (name);
|
|
57623 |
+ length = strlen (name);
|
|
57624 |
+
|
|
57625 |
+ /* remove common prefixes from string */
|
|
57626 |
+ if (common_prefixes)
|
|
57627 |
+ for(i=0; common_prefixes[i]; ++i)
|
|
57628 |
+ if(strncasecmp(name, common_prefixes[i],strlen(common_prefixes[i])) == 0) {
|
|
57629 |
+ length -= strlen(common_prefixes[i]);
|
|
57630 |
+ memmove(name, name + strlen(common_prefixes[i]), length + 1);
|
|
57631 |
+ }
|
|
57632 |
+
|
|
57633 |
+ /* remove trailing whitespace, if any */
|
|
57634 |
+ g_strchug(name);
|
|
57635 |
+
|
|
57636 |
+ /* remove vowels from string */
|
|
57637 |
+ for (i = length - 1, j = length - 1; i >= 0; i--) {
|
|
57638 |
+ c = name[i];
|
|
57639 |
+ /* keep the letter if the string is short enough
|
|
57640 |
+ * already, if the letter is at the beginning of a
|
|
57641 |
+ * word, or if it's not a lowercase vowel */
|
|
57642 |
+ if (length <= target_length || i == 0 ||
|
|
57643 |
+ (i > 0 && name[i - 1] == ' ') ||
|
|
57644 |
+ /* prefs.compress_vowels contains those characters
|
|
57645 |
+ that can be skipped without making a word totally
|
|
57646 |
+ irrecognizable. In most languages, those are the
|
|
57647 |
+ vowels (with and without accents) */
|
|
57648 |
+ !strchr (prefs.compress_vowels, c))
|
|
57649 |
+ {
|
|
57650 |
+ name[j] = c;
|
|
57651 |
+ j--;
|
|
57652 |
+ }
|
|
57653 |
+ else
|
|
57654 |
+ {
|
|
57655 |
+ length--;
|
|
57656 |
+ }
|
|
57657 |
+ }
|
|
57658 |
+ /* shift */
|
|
57659 |
+ memmove(name, name + j + 1, length + 1);
|
|
57660 |
+
|
|
57661 |
+ /* short enough yet? */
|
|
57662 |
+ if (length <= target_length)
|
|
57663 |
+ {
|
|
57664 |
+ return name;
|
|
57665 |
+ }
|
|
57666 |
+
|
|
57667 |
+ /* no - try chopping out whole words */
|
|
57668 |
+ for (i = target_length; i > 0; i--) {
|
|
57669 |
+ if (ispunct((int) name[i]) || isspace((int) name[i]))
|
|
57670 |
+ {
|
|
57671 |
+ while (ispunct((int) name[i]) || isspace((int) name[i]))
|
|
57672 |
+ {
|
|
57673 |
+ i--;
|
|
57674 |
+ }
|
|
57675 |
+ /* this will do */
|
|
57676 |
+ name[i + 1] = '\0';
|
|
57677 |
+ g_strchomp (name);
|
|
57678 |
+ return name;
|
|
57679 |
+ }
|
|
57680 |
+ }
|
|
57681 |
+
|
|
57682 |
+ /* still too long - use shortening on the compressed string */
|
|
57683 |
+ shortened_name = a_Misc_string_shorten(name, target_length);
|
|
57684 |
+ g_free(name);
|
|
57685 |
+ return shortened_name;
|
|
57686 |
+}
|
|
57687 |
+
|
|
57688 |
+/*
|
|
57689 |
+ * shorten a string to no more than target_length characters
|
|
57690 |
+ * by replacing part of the middle of the string by
|
|
57691 |
+ * three ellipsis ('...').
|
|
57692 |
+ *
|
|
57693 |
+ * minimum returned string length is 3, even if target_length
|
|
57694 |
+ * is set to a lower value.
|
|
57695 |
+ *
|
|
57696 |
+ * caller must free returned string
|
|
57697 |
+ */
|
|
57698 |
+gchar *
|
|
57699 |
+a_Misc_string_shorten(const gchar *input, gint target_length)
|
|
57700 |
+{
|
|
57701 |
+ gchar *output;
|
|
57702 |
+ gint actual_length, first_length, second_length;
|
|
57703 |
+
|
|
57704 |
+ if (!input) return NULL;
|
|
57705 |
+
|
|
57706 |
+ /* target length can not be smaller than 3 */
|
|
57707 |
+ if (target_length < 3)
|
|
57708 |
+ target_length = 3;
|
|
57709 |
+
|
|
57710 |
+ actual_length = strlen (input);
|
|
57711 |
+
|
|
57712 |
+ /* if the string is already short enough, or if it's too short for
|
|
57713 |
+ * us to shorten it, return a new copy */
|
|
57714 |
+ if (actual_length <= target_length ||
|
|
57715 |
+ actual_length <= 3)
|
|
57716 |
+ return g_strdup (input);
|
|
57717 |
+
|
|
57718 |
+ /* allocate new string */
|
|
57719 |
+ output = g_new (gchar, target_length + 1);
|
|
57720 |
+
|
|
57721 |
+ /* calc lengths to take from beginning and ending of input */
|
|
57722 |
+ second_length = (target_length - 3) / 2;
|
|
57723 |
+ if(second_length%2 != 0) second_length++;
|
|
57724 |
+ first_length = target_length - 3 - second_length;
|
|
57725 |
+
|
|
57726 |
+ /* create string */
|
|
57727 |
+ strncpy (output, input, first_length);
|
|
57728 |
+ strncpy (output + first_length, "...", 3);
|
|
57729 |
+ strncpy (output + first_length + 3,
|
|
57730 |
+ input + actual_length - second_length, second_length);
|
|
57731 |
+ output[target_length] = '\0';
|
|
57732 |
+
|
|
57733 |
+ return output;
|
|
57734 |
+}
|
|
57735 |
+
|
|
57736 |
+#endif /* !DISABLE_TABS */
|
|
57737 |
diff -pruN dillo-0.8.6/src/misc.h dillo-0.8.6-i18n-misc-20070916/src/misc.h
|
|
57738 |
--- dillo-0.8.6/src/misc.h 2006-04-05 04:51:06.000000000 +0900
|
|
57739 |
+++ dillo-0.8.6-i18n-misc-20070916/src/misc.h 2006-05-16 01:21:09.000000000 +0900
|
|
57740 |
@@ -15,6 +15,11 @@ gint a_Misc_get_content_type_from_data(v
|
|
57741 |
int a_Misc_content_type_check(const char *EntryType, const char *DetectedType);
|
|
57742 |
gint a_Misc_parse_geometry(gchar *geom, gint *x, gint *y, gint *w, gint *h);
|
|
57743 |
gchar *a_Misc_encode_base64(const gchar *in);
|
|
57744 |
+gchar *a_Misc_add_space(gchar *str);
|
|
57745 |
+#ifndef DISABLE_TABS
|
|
57746 |
+gchar *a_Misc_string_compress(const gchar *input, gint target_length);
|
|
57747 |
+gchar *a_Misc_string_shorten(const gchar *input, gint target_length);
|
|
57748 |
+#endif /* !DISABLE_TABS */
|
|
57749 |
|
|
57750 |
/* Return a NULL-terminated string containing the characters from p1 to p2. */
|
|
57751 |
#define a_Misc_strpdup(s, p1, p2) g_strndup((s) + (p1), (p2) - (p1))
|
|
57752 |
diff -pruN dillo-0.8.6/src/msg.h dillo-0.8.6-i18n-misc-20070916/src/msg.h
|
|
57753 |
--- dillo-0.8.6/src/msg.h 2005-10-28 01:20:13.000000000 +0900
|
|
57754 |
+++ dillo-0.8.6-i18n-misc-20070916/src/msg.h 2006-05-16 01:21:08.000000000 +0900
|
|
57755 |
@@ -22,6 +22,10 @@
|
|
57756 |
Html_msg(html, fmt); \
|
|
57757 |
} G_STMT_END
|
|
57758 |
|
|
57759 |
-#define MSG_HTTP(fmt...) g_print("HTTP warning: " fmt)
|
|
57760 |
+#define MSG_HTTP(fmt...) \
|
|
57761 |
+ G_STMT_START { \
|
|
57762 |
+ g_print(_("HTTP warning: ")); \
|
|
57763 |
+ g_print(fmt); \
|
|
57764 |
+ } G_STMT_END
|
|
57765 |
|
|
57766 |
#endif /* __MSG_H__ */
|
|
57767 |
diff -pruN dillo-0.8.6/src/nav.c dillo-0.8.6-i18n-misc-20070916/src/nav.c
|
|
57768 |
--- dillo-0.8.6/src/nav.c 2006-01-03 03:17:23.000000000 +0900
|
|
57769 |
+++ dillo-0.8.6-i18n-misc-20070916/src/nav.c 2006-05-16 01:21:09.000000000 +0900
|
|
57770 |
@@ -12,17 +12,21 @@
|
|
57771 |
|
|
57772 |
/* Support for a navigation stack */
|
|
57773 |
|
|
57774 |
+#include <config.h>
|
|
57775 |
#include <stdio.h>
|
|
57776 |
#include <gtk/gtk.h>
|
|
57777 |
+#include "intl.h"
|
|
57778 |
#include "msg.h"
|
|
57779 |
#include "list.h"
|
|
57780 |
#include "nav.h"
|
|
57781 |
#include "history.h"
|
|
57782 |
#include "web.h"
|
|
57783 |
+#include "doc.h"
|
|
57784 |
#include "menu.h"
|
|
57785 |
#include "interface.h"
|
|
57786 |
#include "dw_gtk_scrolled_window.h"
|
|
57787 |
#include "prefs.h"
|
|
57788 |
+#include "commands.h"
|
|
57789 |
#include "capi.h"
|
|
57790 |
|
|
57791 |
/* #define DEBUG_LEVEL 3 */
|
|
57792 |
@@ -31,29 +35,29 @@
|
|
57793 |
/*
|
|
57794 |
* Forward declarations
|
|
57795 |
*/
|
|
57796 |
-static void Nav_reload(BrowserWindow *bw);
|
|
57797 |
+static void Nav_reload(DilloDoc *dd);
|
|
57798 |
|
|
57799 |
|
|
57800 |
/*
|
|
57801 |
* Initialize the navigation structure with safe values
|
|
57802 |
*/
|
|
57803 |
-void a_Nav_init(BrowserWindow *bw)
|
|
57804 |
+void a_Nav_init(DilloDoc *dd)
|
|
57805 |
{
|
|
57806 |
- bw->nav_stack_size = 0;
|
|
57807 |
- bw->nav_stack_size_max = 16;
|
|
57808 |
- bw->nav_stack = NULL;
|
|
57809 |
- bw->nav_stack_ptr = -1;
|
|
57810 |
- bw->nav_expecting = FALSE;
|
|
57811 |
- bw->nav_expect_url = NULL;
|
|
57812 |
+ dd->nav_stack_size = 0;
|
|
57813 |
+ dd->nav_stack_size_max = 16;
|
|
57814 |
+ dd->nav_stack = NULL;
|
|
57815 |
+ dd->nav_stack_ptr = -1;
|
|
57816 |
+ dd->nav_expecting = FALSE;
|
|
57817 |
+ dd->nav_expect_url = NULL;
|
|
57818 |
}
|
|
57819 |
|
|
57820 |
/*
|
|
57821 |
* Free memory used by this module
|
|
57822 |
*/
|
|
57823 |
-void a_Nav_free(BrowserWindow *bw)
|
|
57824 |
+void a_Nav_free(DilloDoc *dd)
|
|
57825 |
{
|
|
57826 |
- a_Nav_cancel_expect(bw);
|
|
57827 |
- g_free(bw->nav_stack);
|
|
57828 |
+ a_Nav_cancel_expect(dd);
|
|
57829 |
+ g_free(dd->nav_stack);
|
|
57830 |
}
|
|
57831 |
|
|
57832 |
|
|
57833 |
@@ -62,79 +66,79 @@ void a_Nav_free(BrowserWindow *bw)
|
|
57834 |
/*
|
|
57835 |
* Return current nav_stack pointer [0 based; -1 = empty]
|
|
57836 |
*/
|
|
57837 |
-gint a_Nav_stack_ptr(BrowserWindow *bw)
|
|
57838 |
+gint a_Nav_stack_ptr(DilloDoc *dd)
|
|
57839 |
{
|
|
57840 |
- return bw->nav_stack_ptr;
|
|
57841 |
+ return dd->nav_stack_ptr;
|
|
57842 |
}
|
|
57843 |
|
|
57844 |
/*
|
|
57845 |
* Move the nav_stack pointer
|
|
57846 |
*/
|
|
57847 |
-static void Nav_stack_move_ptr(BrowserWindow *bw, gint offset)
|
|
57848 |
+static void Nav_stack_move_ptr(DilloDoc *dd, gint offset)
|
|
57849 |
{
|
|
57850 |
gint nptr;
|
|
57851 |
|
|
57852 |
- g_return_if_fail (bw != NULL);
|
|
57853 |
+ g_return_if_fail (dd != NULL);
|
|
57854 |
if (offset != 0) {
|
|
57855 |
- nptr = bw->nav_stack_ptr + offset;
|
|
57856 |
- g_return_if_fail (nptr >= 0 && nptr < bw->nav_stack_size);
|
|
57857 |
- bw->nav_stack_ptr = nptr;
|
|
57858 |
+ nptr = dd->nav_stack_ptr + offset;
|
|
57859 |
+ g_return_if_fail (nptr >= 0 && nptr < dd->nav_stack_size);
|
|
57860 |
+ dd->nav_stack_ptr = nptr;
|
|
57861 |
}
|
|
57862 |
}
|
|
57863 |
|
|
57864 |
/*
|
|
57865 |
* Return size of nav_stack [1 based]
|
|
57866 |
*/
|
|
57867 |
-gint a_Nav_stack_size(BrowserWindow *bw)
|
|
57868 |
+gint a_Nav_stack_size(DilloDoc *dd)
|
|
57869 |
{
|
|
57870 |
- return bw->nav_stack_size;
|
|
57871 |
+ return dd->nav_stack_size;
|
|
57872 |
}
|
|
57873 |
|
|
57874 |
/*
|
|
57875 |
* Add an URL-index in the navigation stack.
|
|
57876 |
*/
|
|
57877 |
-static void Nav_stack_add(BrowserWindow *bw, gint idx)
|
|
57878 |
+static void Nav_stack_add(DilloDoc *dd, gint idx)
|
|
57879 |
{
|
|
57880 |
- g_return_if_fail (bw != NULL);
|
|
57881 |
+ g_return_if_fail (dd != NULL);
|
|
57882 |
|
|
57883 |
- ++bw->nav_stack_ptr;
|
|
57884 |
- if ( bw->nav_stack_ptr == bw->nav_stack_size) {
|
|
57885 |
- a_List_add(bw->nav_stack, bw->nav_stack_size, bw->nav_stack_size_max);
|
|
57886 |
- ++bw->nav_stack_size;
|
|
57887 |
+ ++dd->nav_stack_ptr;
|
|
57888 |
+ if ( dd->nav_stack_ptr == dd->nav_stack_size) {
|
|
57889 |
+ a_List_add(dd->nav_stack, dd->nav_stack_size, dd->nav_stack_size_max);
|
|
57890 |
+ ++dd->nav_stack_size;
|
|
57891 |
} else {
|
|
57892 |
- bw->nav_stack_size = bw->nav_stack_ptr + 1;
|
|
57893 |
+ dd->nav_stack_size = dd->nav_stack_ptr + 1;
|
|
57894 |
}
|
|
57895 |
- bw->nav_stack[bw->nav_stack_ptr] = idx;
|
|
57896 |
+ dd->nav_stack[dd->nav_stack_ptr] = idx;
|
|
57897 |
}
|
|
57898 |
|
|
57899 |
/*
|
|
57900 |
* Remove an URL-index from the navigation stack.
|
|
57901 |
*/
|
|
57902 |
-static void Nav_stack_remove(BrowserWindow *bw, gint idx)
|
|
57903 |
+static void Nav_stack_remove(DilloDoc *dd, gint idx)
|
|
57904 |
{
|
|
57905 |
- gint sz = a_Nav_stack_size(bw);
|
|
57906 |
+ gint sz = a_Nav_stack_size(dd);
|
|
57907 |
|
|
57908 |
- g_return_if_fail (bw != NULL && idx >=0 && idx < sz);
|
|
57909 |
+ g_return_if_fail (dd != NULL && idx >=0 && idx < sz);
|
|
57910 |
|
|
57911 |
for ( ; idx < sz - 1; ++idx)
|
|
57912 |
- bw->nav_stack[idx] = bw->nav_stack[idx + 1];
|
|
57913 |
- if ( bw->nav_stack_ptr == --bw->nav_stack_size )
|
|
57914 |
- --bw->nav_stack_ptr;
|
|
57915 |
+ dd->nav_stack[idx] = dd->nav_stack[idx + 1];
|
|
57916 |
+ if ( dd->nav_stack_ptr == --dd->nav_stack_size )
|
|
57917 |
+ --dd->nav_stack_ptr;
|
|
57918 |
}
|
|
57919 |
|
|
57920 |
/*
|
|
57921 |
- * Remove equal adyacent URLs at the top of the stack.
|
|
57922 |
+ * Remove equal adjacent URLs at the top of the stack.
|
|
57923 |
* (It may happen with redirections)
|
|
57924 |
*/
|
|
57925 |
-static void Nav_stack_clean(BrowserWindow *bw)
|
|
57926 |
+static void Nav_stack_clean(DilloDoc *dd)
|
|
57927 |
{
|
|
57928 |
gint i;
|
|
57929 |
|
|
57930 |
- g_return_if_fail (bw != NULL);
|
|
57931 |
+ g_return_if_fail (dd != NULL);
|
|
57932 |
|
|
57933 |
- if ((i = a_Nav_stack_size(bw)) >= 2 &&
|
|
57934 |
- bw->nav_stack[i-2] == bw->nav_stack[i-1])
|
|
57935 |
- Nav_stack_remove(bw, i - 1);
|
|
57936 |
+ if ((i = a_Nav_stack_size(dd)) >= 2 &&
|
|
57937 |
+ dd->nav_stack[i-2] == dd->nav_stack[i-1])
|
|
57938 |
+ Nav_stack_remove(dd, i - 1);
|
|
57939 |
}
|
|
57940 |
|
|
57941 |
|
|
57942 |
@@ -146,7 +150,7 @@ static void Nav_stack_clean(BrowserWindo
|
|
57943 |
* This function requests the page's root-URL; images and related stuff
|
|
57944 |
* are fetched directly by the HTML module.
|
|
57945 |
*/
|
|
57946 |
-static void Nav_open_url(BrowserWindow *bw, const DilloUrl *url, gint offset)
|
|
57947 |
+static void Nav_open_url(DilloDoc *dd, const DilloUrl *url, gint offset)
|
|
57948 |
{
|
|
57949 |
DilloUrl *old_url = NULL;
|
|
57950 |
gboolean MustLoad;
|
|
57951 |
@@ -154,48 +158,49 @@ static void Nav_open_url(BrowserWindow *
|
|
57952 |
DilloWeb *Web;
|
|
57953 |
gboolean ForceReload = (URL_FLAGS(url) & URL_E2EReload);
|
|
57954 |
|
|
57955 |
- MSG("Nav_open_url: Url=>%s<\n", URL_STR_(url));
|
|
57956 |
+ _MSG("Nav_open_url: Url=>%s<\n", URL_STR_(url));
|
|
57957 |
|
|
57958 |
/* Get the url of the current page */
|
|
57959 |
- if ( a_Nav_stack_ptr(bw) != -1 )
|
|
57960 |
- old_url = a_History_get_url(NAV_TOP(bw));
|
|
57961 |
+ if ( a_Nav_stack_ptr(dd) != -1 )
|
|
57962 |
+ old_url = a_History_get_url(NAV_TOP(dd));
|
|
57963 |
|
|
57964 |
/* Record current scrolling position
|
|
57965 |
* (the strcmp check is necessary because of redirections) */
|
|
57966 |
if (old_url &&
|
|
57967 |
- !strcmp(URL_STR(old_url), a_Interface_get_location_text(bw))) {
|
|
57968 |
+ !strcmp(URL_STR(old_url), a_Interface_get_location_text(dd->bw))) {
|
|
57969 |
old_url->scrolling_position_x =
|
|
57970 |
a_Dw_gtk_scrolled_window_get_scrolling_position_x(
|
|
57971 |
- GTK_DW_SCROLLED_WINDOW(bw->docwin));
|
|
57972 |
+ GTK_DW_SCROLLED_WINDOW(dd->docwin));
|
|
57973 |
old_url->scrolling_position_y =
|
|
57974 |
a_Dw_gtk_scrolled_window_get_scrolling_position_y(
|
|
57975 |
- GTK_DW_SCROLLED_WINDOW(bw->docwin));
|
|
57976 |
+ GTK_DW_SCROLLED_WINDOW(dd->docwin));
|
|
57977 |
}
|
|
57978 |
|
|
57979 |
/* Update navigation-stack-pointer (offset may be zero) */
|
|
57980 |
- Nav_stack_move_ptr(bw, offset);
|
|
57981 |
+ Nav_stack_move_ptr(dd, offset);
|
|
57982 |
|
|
57983 |
/* Page must be reloaded, if old and new url (without anchor) differ */
|
|
57984 |
MustLoad = ForceReload || !old_url;
|
|
57985 |
if (old_url){
|
|
57986 |
MustLoad |= a_Url_cmp(old_url, url);
|
|
57987 |
- MustLoad |= strcmp(URL_STR(old_url), a_Interface_get_location_text(bw));
|
|
57988 |
+ /* TODO: possible issue with background/(i)frame load, see above */
|
|
57989 |
+ MustLoad |= strcmp(URL_STR(old_url), a_Interface_get_location_text(dd->bw));
|
|
57990 |
}
|
|
57991 |
|
|
57992 |
if ( MustLoad ) {
|
|
57993 |
- a_Interface_stop(bw);
|
|
57994 |
- a_Interface_clean(bw);
|
|
57995 |
+ a_Doc_stop(dd);
|
|
57996 |
+ a_Doc_clean(dd);
|
|
57997 |
|
|
57998 |
- a_Menu_pagemarks_new(bw);
|
|
57999 |
+ a_Menu_pagemarks_new(dd);
|
|
58000 |
|
|
58001 |
Web = a_Web_new(url);
|
|
58002 |
- Web->bw = bw;
|
|
58003 |
+ Web->dd = dd;
|
|
58004 |
Web->flags |= WEB_RootUrl;
|
|
58005 |
if ((ClientKey = a_Capi_open_url(Web, NULL, NULL)) != 0) {
|
|
58006 |
- a_Interface_add_client(bw, ClientKey, 1);
|
|
58007 |
- a_Interface_add_url(bw, url, WEB_RootUrl);
|
|
58008 |
+ a_Doc_add_client(dd, ClientKey, 1);
|
|
58009 |
+ a_Doc_add_url(dd, url, WEB_RootUrl);
|
|
58010 |
}
|
|
58011 |
- a_Interface_set_cursor(bw, GDK_LEFT_PTR);
|
|
58012 |
+ a_Doc_set_cursor(dd, GDK_LEFT_PTR);
|
|
58013 |
}
|
|
58014 |
|
|
58015 |
/* Jump to #anchor position */
|
|
58016 |
@@ -203,7 +208,7 @@ static void Nav_open_url(BrowserWindow *
|
|
58017 |
/* todo: push on stack */
|
|
58018 |
gchar *pf = a_Url_decode_hex_str(URL_FRAGMENT_(url));
|
|
58019 |
a_Dw_gtk_scrolled_window_set_anchor(
|
|
58020 |
- GTK_DW_SCROLLED_WINDOW(bw->docwin), pf);
|
|
58021 |
+ GTK_DW_SCROLLED_WINDOW(dd->docwin), pf);
|
|
58022 |
g_free(pf);
|
|
58023 |
}
|
|
58024 |
}
|
|
58025 |
@@ -212,155 +217,191 @@ static void Nav_open_url(BrowserWindow *
|
|
58026 |
* Cancel the last expected url if present. The responsibility
|
|
58027 |
* for actually aborting the data stream remains with the caller.
|
|
58028 |
*/
|
|
58029 |
-void a_Nav_cancel_expect(BrowserWindow *bw)
|
|
58030 |
+void a_Nav_cancel_expect(DilloDoc *dd)
|
|
58031 |
{
|
|
58032 |
- if (bw->nav_expecting) {
|
|
58033 |
- if (bw->nav_expect_url) {
|
|
58034 |
- a_Url_free(bw->nav_expect_url);
|
|
58035 |
- bw->nav_expect_url = NULL;
|
|
58036 |
+ if (dd->nav_expecting) {
|
|
58037 |
+ if (dd->nav_expect_url) {
|
|
58038 |
+ a_Url_free(dd->nav_expect_url);
|
|
58039 |
+ dd->nav_expect_url = NULL;
|
|
58040 |
}
|
|
58041 |
- bw->nav_expecting = FALSE;
|
|
58042 |
+ dd->nav_expecting = FALSE;
|
|
58043 |
}
|
|
58044 |
}
|
|
58045 |
|
|
58046 |
/*
|
|
58047 |
* We have an answer! Set things accordingly.
|
|
58048 |
*/
|
|
58049 |
-void a_Nav_expect_done(BrowserWindow *bw)
|
|
58050 |
+void a_Nav_expect_done(DilloDoc *dd)
|
|
58051 |
{
|
|
58052 |
gint idx;
|
|
58053 |
DilloUrl *url;
|
|
58054 |
|
|
58055 |
- g_return_if_fail(bw != NULL);
|
|
58056 |
+ g_return_if_fail(dd != NULL);
|
|
58057 |
|
|
58058 |
- if (bw->nav_expecting) {
|
|
58059 |
- url = bw->nav_expect_url;
|
|
58060 |
+ if (dd->nav_expecting) {
|
|
58061 |
+ url = dd->nav_expect_url;
|
|
58062 |
/* unset E2EReload before adding this url to history */
|
|
58063 |
- a_Url_set_flags(url, URL_FLAGS(url) & ~URL_E2EReload);
|
|
58064 |
+ a_Url_set_flags(url, (URL_FLAGS(url) & ~URL_E2EReload) | URL_MustCache);
|
|
58065 |
idx = a_History_add_url(url);
|
|
58066 |
- Nav_stack_add(bw, idx);
|
|
58067 |
+ Nav_stack_add(dd, idx);
|
|
58068 |
|
|
58069 |
a_Url_free(url);
|
|
58070 |
- bw->nav_expect_url = NULL;
|
|
58071 |
- bw->nav_expecting = FALSE;
|
|
58072 |
+ dd->nav_expect_url = NULL;
|
|
58073 |
+ dd->nav_expecting = FALSE;
|
|
58074 |
}
|
|
58075 |
- Nav_stack_clean(bw);
|
|
58076 |
- a_Interface_set_button_sens(bw);
|
|
58077 |
+ Nav_stack_clean(dd);
|
|
58078 |
+ a_Doc_progress_update(dd);
|
|
58079 |
+}
|
|
58080 |
+
|
|
58081 |
+/*
|
|
58082 |
+ * Remove top-URL from the navigation stack.
|
|
58083 |
+ * (Used to remove URLs that force redirection)
|
|
58084 |
+ */
|
|
58085 |
+void a_Nav_remove_top_url(DilloDoc *dd)
|
|
58086 |
+{
|
|
58087 |
+ g_return_if_fail (dd != NULL);
|
|
58088 |
+
|
|
58089 |
+ /* Deallocate the URL a the top of the stack */
|
|
58090 |
+ Nav_stack_remove(dd, a_Nav_stack_size(dd) - 1);
|
|
58091 |
}
|
|
58092 |
|
|
58093 |
/*
|
|
58094 |
* Make 'url' the current browsed page (upon data arrival)
|
|
58095 |
- * - Set bw to expect the URL data
|
|
58096 |
+ * - Set dd to expect the URL data
|
|
58097 |
* - Ask the cache to feed back the requested URL (via Nav_open_url)
|
|
58098 |
*/
|
|
58099 |
-void a_Nav_push(BrowserWindow *bw, const DilloUrl *url)
|
|
58100 |
+void a_Nav_push(DilloDoc *dd, const DilloUrl *url)
|
|
58101 |
{
|
|
58102 |
- g_return_if_fail (bw != NULL);
|
|
58103 |
+ g_return_if_fail (dd != NULL);
|
|
58104 |
|
|
58105 |
- if (bw->nav_expecting && a_Url_cmp(bw->nav_expect_url, url) == 0 &&
|
|
58106 |
- URL_STRCAMP_EQ(URL_FRAGMENT_(bw->nav_expect_url), URL_FRAGMENT_(url))) {
|
|
58107 |
+ if (dd->nav_expecting && a_Url_cmp(dd->nav_expect_url, url) == 0 &&
|
|
58108 |
+ URL_STRCAMP_EQ(URL_FRAGMENT_(dd->nav_expect_url), URL_FRAGMENT_(url))
|
|
58109 |
+ && !(URL_FLAGS(url) & URL_RealmAccess)) { //except BASIC Realm
|
|
58110 |
/* we're already expecting that url (most probably a double-click) */
|
|
58111 |
return;
|
|
58112 |
}
|
|
58113 |
- a_Nav_cancel_expect(bw);
|
|
58114 |
- bw->nav_expect_url = a_Url_dup(url);
|
|
58115 |
- bw->nav_expecting = TRUE;
|
|
58116 |
- Nav_open_url(bw, url, 0);
|
|
58117 |
+ a_Nav_cancel_expect(dd);
|
|
58118 |
+ dd->nav_expect_url = a_Url_dup(url);
|
|
58119 |
+ dd->nav_expecting = TRUE;
|
|
58120 |
+ /* is this is a targeted URL, (re)name the document after it */
|
|
58121 |
+ if(URL_TARGET_(url))
|
|
58122 |
+ a_Doc_set_name(dd, (gchar *) URL_TARGET_(url));
|
|
58123 |
+ Nav_open_url(dd, url, 0);
|
|
58124 |
}
|
|
58125 |
|
|
58126 |
/*
|
|
58127 |
* Same as a_Nav_push() but in a new window.
|
|
58128 |
*/
|
|
58129 |
-void a_Nav_push_nw(BrowserWindow *bw, const DilloUrl *url)
|
|
58130 |
+void a_Nav_push_nw(DilloDoc *dd, const DilloUrl *url)
|
|
58131 |
{
|
|
58132 |
gint width, height;
|
|
58133 |
BrowserWindow *newbw;
|
|
58134 |
|
|
58135 |
- gdk_window_get_size (bw->main_window->window, &width, &height);
|
|
58136 |
+ gdk_window_get_size (dd->bw->main_window->window, &width, &height);
|
|
58137 |
newbw = a_Interface_browser_window_new(width, height, 0);
|
|
58138 |
- a_Nav_push(newbw, url);
|
|
58139 |
+ a_Nav_push(newbw->dd, url);
|
|
58140 |
}
|
|
58141 |
|
|
58142 |
/*
|
|
58143 |
* Wraps a_Nav_push to match 'DwPage->link' function type
|
|
58144 |
*/
|
|
58145 |
-void a_Nav_vpush(void *vbw, const DilloUrl *url)
|
|
58146 |
+void a_Nav_vpush(void *vdd, const DilloUrl *url)
|
|
58147 |
{
|
|
58148 |
- a_Nav_push(vbw, url);
|
|
58149 |
+ a_Nav_push(vdd, url);
|
|
58150 |
}
|
|
58151 |
|
|
58152 |
/*
|
|
58153 |
* Send the browser back to previous page
|
|
58154 |
*/
|
|
58155 |
-void a_Nav_back(BrowserWindow *bw)
|
|
58156 |
+void a_Nav_back(DilloDoc *dd)
|
|
58157 |
{
|
|
58158 |
- gint idx = a_Nav_stack_ptr(bw);
|
|
58159 |
+ gint idx = a_Nav_stack_ptr(dd);
|
|
58160 |
|
|
58161 |
- a_Nav_cancel_expect(bw);
|
|
58162 |
+ a_Nav_cancel_expect(dd);
|
|
58163 |
if ( --idx >= 0 ){
|
|
58164 |
- a_Interface_msg(bw, "");
|
|
58165 |
- Nav_open_url(bw, a_History_get_url(NAV_IDX(bw,idx)), -1);
|
|
58166 |
+ a_Interface_msg(dd->bw, "");
|
|
58167 |
+ Nav_open_url(dd, a_History_get_url(NAV_IDX(dd,idx)), -1);
|
|
58168 |
}
|
|
58169 |
}
|
|
58170 |
|
|
58171 |
/*
|
|
58172 |
* Send the browser to next page in the history list
|
|
58173 |
*/
|
|
58174 |
-void a_Nav_forw(BrowserWindow *bw)
|
|
58175 |
+void a_Nav_forw(DilloDoc *dd)
|
|
58176 |
{
|
|
58177 |
- gint idx = a_Nav_stack_ptr(bw);
|
|
58178 |
+ gint idx = a_Nav_stack_ptr(dd);
|
|
58179 |
|
|
58180 |
- a_Nav_cancel_expect(bw);
|
|
58181 |
- if (++idx < a_Nav_stack_size(bw)) {
|
|
58182 |
- a_Interface_msg(bw, "");
|
|
58183 |
- Nav_open_url(bw, a_History_get_url(NAV_IDX(bw,idx)), +1);
|
|
58184 |
+ a_Nav_cancel_expect(dd);
|
|
58185 |
+ if (++idx < a_Nav_stack_size(dd)) {
|
|
58186 |
+ a_Interface_msg(dd->bw, "");
|
|
58187 |
+ Nav_open_url(dd, a_History_get_url(NAV_IDX(dd,idx)), +1);
|
|
58188 |
}
|
|
58189 |
}
|
|
58190 |
|
|
58191 |
/*
|
|
58192 |
* Redirect the browser to the HOME page!
|
|
58193 |
*/
|
|
58194 |
-void a_Nav_home(BrowserWindow *bw)
|
|
58195 |
+void a_Nav_home(DilloDoc *dd)
|
|
58196 |
{
|
|
58197 |
- a_Nav_push(bw, prefs.home);
|
|
58198 |
+ a_Nav_push(dd, prefs.home);
|
|
58199 |
}
|
|
58200 |
|
|
58201 |
/*
|
|
58202 |
* Jump to an URL within the stack history
|
|
58203 |
- * NewBw: {0 = same window, 1 = new window}
|
|
58204 |
+#ifndef DISABLE_TABS
|
|
58205 |
+ * NewDd: {0 = same window, 1 = new window, 2 = new tab}
|
|
58206 |
+#else
|
|
58207 |
+ * NewDd: {0 = same window, 1 = new window}
|
|
58208 |
+#endif
|
|
58209 |
*/
|
|
58210 |
-void a_Nav_jump_callback(GtkWidget *widget, gpointer client_data, gint NewBw)
|
|
58211 |
+void a_Nav_jump_callback(GtkWidget *widget, gpointer client_data, gint NewDd)
|
|
58212 |
{
|
|
58213 |
int idx;
|
|
58214 |
- BrowserWindow *bw = client_data;
|
|
58215 |
+ DilloDoc *dd = client_data;
|
|
58216 |
|
|
58217 |
idx = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT (widget), "nav_idx"));
|
|
58218 |
- if (idx >= 0 && idx < a_Nav_stack_size(bw)) {
|
|
58219 |
- if (NewBw == 1) {
|
|
58220 |
- a_Nav_push_nw(bw, a_History_get_url(NAV_IDX(bw,idx)));
|
|
58221 |
- } else {
|
|
58222 |
- Nav_open_url(bw, a_History_get_url(NAV_IDX(bw,idx)),
|
|
58223 |
- idx - a_Nav_stack_ptr(bw));
|
|
58224 |
- }
|
|
58225 |
+ if (idx >= 0 && idx < a_Nav_stack_size(dd)) {
|
|
58226 |
+ switch (NewDd) {
|
|
58227 |
+ case 0:
|
|
58228 |
+ /* Open link in same bw */
|
|
58229 |
+ Nav_open_url(dd, a_History_get_url(NAV_IDX(dd,idx)),
|
|
58230 |
+ idx - a_Nav_stack_ptr(dd));
|
|
58231 |
+ break;
|
|
58232 |
+ case 1:
|
|
58233 |
+ /* Open link in a new bw */
|
|
58234 |
+ a_Menu_popup_set_url(dd->bw, a_History_get_url(NAV_IDX(dd,idx)));
|
|
58235 |
+ a_Commands_open_link_nw_callback(widget, dd->bw);
|
|
58236 |
+ break;
|
|
58237 |
+#ifndef DISABLE_TABS
|
|
58238 |
+ case 2:
|
|
58239 |
+ /* Open link in a new tab */
|
|
58240 |
+ a_Menu_popup_set_url(dd->bw, a_History_get_url(NAV_IDX(dd,idx)));
|
|
58241 |
+ a_Commands_open_link_nw_tab_callback(widget, dd->bw);
|
|
58242 |
+ break;
|
|
58243 |
+#endif
|
|
58244 |
+ default:
|
|
58245 |
+ g_error(_("Unhandled switch type %d in a_Nav_jump_callback in src/nav.c\n"), NewDd);
|
|
58246 |
+ }
|
|
58247 |
}
|
|
58248 |
}
|
|
58249 |
|
|
58250 |
/*
|
|
58251 |
* Callback for reload confirmation
|
|
58252 |
*/
|
|
58253 |
-static void Nav_reload_confirmation_cb(BrowserWindow *bw)
|
|
58254 |
+static void Nav_reload_confirmation_cb(DilloDoc *dd)
|
|
58255 |
{
|
|
58256 |
- DialogAnswer *answer = bw->question_dialog_answer;
|
|
58257 |
+ DialogAnswer *answer = dd->bw->question_dialog_answer;
|
|
58258 |
|
|
58259 |
_MSG("Nav_reload_confirmation_cb %p\n", bw->question_dialog_window);
|
|
58260 |
|
|
58261 |
+ if (!answer) return;
|
|
58262 |
if (answer->alt_num == 1) { /* "OK" */
|
|
58263 |
DEBUG_MSG(3, "Nav_reload_confirmed\n");
|
|
58264 |
- if ( a_Nav_stack_size(bw) &&
|
|
58265 |
- bw->question_dialog_data == a_History_get_url(NAV_TOP(bw)) ) {
|
|
58266 |
+ if ( a_Nav_stack_size(dd) &&
|
|
58267 |
+ dd->bw->question_dialog_data == a_History_get_url(NAV_TOP(dd)) ) {
|
|
58268 |
/* a genuine confirmation! */
|
|
58269 |
DEBUG_MSG(3, "Nav_reload_confirmed test: OK\n");
|
|
58270 |
- Nav_reload(bw);
|
|
58271 |
+ Nav_reload(dd);
|
|
58272 |
}
|
|
58273 |
|
|
58274 |
} else { /* window closed or cancel button */
|
|
58275 |
@@ -368,27 +409,27 @@ static void Nav_reload_confirmation_cb(B
|
|
58276 |
}
|
|
58277 |
|
|
58278 |
/* cleanup */
|
|
58279 |
- bw->question_dialog_data = NULL;
|
|
58280 |
+ dd->bw->question_dialog_data = NULL;
|
|
58281 |
g_free(answer->this);
|
|
58282 |
- bw->question_dialog_answer = NULL;
|
|
58283 |
+ dd->bw->question_dialog_answer = NULL;
|
|
58284 |
}
|
|
58285 |
|
|
58286 |
/*
|
|
58287 |
* This one does a_Nav_reload's job!
|
|
58288 |
*/
|
|
58289 |
-static void Nav_reload(BrowserWindow *bw)
|
|
58290 |
+static void Nav_reload(DilloDoc *dd)
|
|
58291 |
{
|
|
58292 |
DilloUrl *url, *ReqURL;
|
|
58293 |
|
|
58294 |
- a_Nav_cancel_expect(bw);
|
|
58295 |
- if ( a_Nav_stack_size(bw) ) {
|
|
58296 |
- url = a_History_get_url(NAV_TOP(bw));
|
|
58297 |
- ReqURL = a_Url_dup(a_History_get_url(NAV_TOP(bw)));
|
|
58298 |
+ a_Nav_cancel_expect(dd);
|
|
58299 |
+ if ( a_Nav_stack_size(dd) ) {
|
|
58300 |
+ url = a_History_get_url(NAV_TOP(dd));
|
|
58301 |
+ ReqURL = a_Url_dup(a_History_get_url(NAV_TOP(dd)));
|
|
58302 |
/* Let's make reload be end-to-end */
|
|
58303 |
a_Url_set_flags(ReqURL, URL_FLAGS(ReqURL) | URL_E2EReload);
|
|
58304 |
/* This is an explicit reload, so clear the SpamSafe flag */
|
|
58305 |
a_Url_set_flags(ReqURL, URL_FLAGS(ReqURL) & ~URL_SpamSafe);
|
|
58306 |
- Nav_open_url(bw, ReqURL, 0);
|
|
58307 |
+ Nav_open_url(dd, ReqURL, 0);
|
|
58308 |
a_Url_free(ReqURL);
|
|
58309 |
}
|
|
58310 |
}
|
|
58311 |
@@ -397,23 +438,23 @@ static void Nav_reload(BrowserWindow *bw
|
|
58312 |
* Implement the RELOAD button functionality.
|
|
58313 |
* (We haven't defined it yet ;)
|
|
58314 |
*/
|
|
58315 |
-void a_Nav_reload(BrowserWindow *bw)
|
|
58316 |
+void a_Nav_reload(DilloDoc *dd)
|
|
58317 |
{
|
|
58318 |
DilloUrl *url;
|
|
58319 |
|
|
58320 |
- a_Nav_cancel_expect(bw);
|
|
58321 |
- if ( a_Nav_stack_size(bw) ) {
|
|
58322 |
- url = a_History_get_url(NAV_TOP(bw));
|
|
58323 |
+ a_Nav_cancel_expect(dd);
|
|
58324 |
+ if ( a_Nav_stack_size(dd) ) {
|
|
58325 |
+ url = a_History_get_url(NAV_TOP(dd));
|
|
58326 |
if (URL_FLAGS(url) & URL_Post) {
|
|
58327 |
/* Attempt to repost data, let's confirm... */
|
|
58328 |
- bw->question_dialog_data = (gpointer)url;
|
|
58329 |
+ dd->bw->question_dialog_data = (gpointer)url;
|
|
58330 |
a_Interface_question_dialog(
|
|
58331 |
- bw, "Repost form data?", TRUE,
|
|
58332 |
- "OK", "Cancel", NULL, NULL, NULL,
|
|
58333 |
+ dd, _("Repost form data?"), TRUE,
|
|
58334 |
+ _("OK"), _("Cancel"), NULL, NULL, NULL,
|
|
58335 |
(GtkSignalFunc) Nav_reload_confirmation_cb);
|
|
58336 |
|
|
58337 |
} else {
|
|
58338 |
- Nav_reload(bw);
|
|
58339 |
+ Nav_reload(dd);
|
|
58340 |
}
|
|
58341 |
}
|
|
58342 |
}
|
|
58343 |
diff -pruN dillo-0.8.6/src/nav.h dillo-0.8.6-i18n-misc-20070916/src/nav.h
|
|
58344 |
--- dillo-0.8.6/src/nav.h 2005-10-28 01:20:14.000000000 +0900
|
|
58345 |
+++ dillo-0.8.6-i18n-misc-20070916/src/nav.h 2006-05-16 01:21:09.000000000 +0900
|
|
58346 |
@@ -6,28 +6,29 @@
|
|
58347 |
|
|
58348 |
|
|
58349 |
/* useful macros for the navigation stack */
|
|
58350 |
-#define NAV_IDX(bw, i) (bw)->nav_stack[i]
|
|
58351 |
-#define NAV_TOP(bw) (bw)->nav_stack[(bw)->nav_stack_ptr]
|
|
58352 |
+#define NAV_IDX(dd, i) (dd)->nav_stack[i]
|
|
58353 |
+#define NAV_TOP(dd) (dd)->nav_stack[(dd)->nav_stack_ptr]
|
|
58354 |
|
|
58355 |
|
|
58356 |
#ifdef __cplusplus
|
|
58357 |
extern "C" {
|
|
58358 |
#endif /* __cplusplus */
|
|
58359 |
|
|
58360 |
-void a_Nav_push(BrowserWindow *bw, const DilloUrl *url);
|
|
58361 |
-void a_Nav_push_nw(BrowserWindow *bw, const DilloUrl *url);
|
|
58362 |
-void a_Nav_vpush(void *vbw, const DilloUrl *url);
|
|
58363 |
-void a_Nav_back(BrowserWindow *bw);
|
|
58364 |
-void a_Nav_forw(BrowserWindow *bw);
|
|
58365 |
-void a_Nav_home(BrowserWindow *bw);
|
|
58366 |
-void a_Nav_reload(BrowserWindow *bw);
|
|
58367 |
-void a_Nav_init(BrowserWindow *bw);
|
|
58368 |
-void a_Nav_free(BrowserWindow *bw);
|
|
58369 |
-void a_Nav_cancel_expect (BrowserWindow *bw);
|
|
58370 |
-void a_Nav_expect_done(BrowserWindow *bw);
|
|
58371 |
-void a_Nav_jump_callback(GtkWidget *widget, gpointer client_data, gint NewBw);
|
|
58372 |
-gint a_Nav_stack_ptr(BrowserWindow *bw);
|
|
58373 |
-gint a_Nav_stack_size(BrowserWindow *bw);
|
|
58374 |
+void a_Nav_push(DilloDoc *dd, const DilloUrl *url);
|
|
58375 |
+void a_Nav_push_nw(DilloDoc *dd, const DilloUrl *url);
|
|
58376 |
+void a_Nav_vpush(void *vdd, const DilloUrl *url);
|
|
58377 |
+void a_Nav_back(DilloDoc *dd);
|
|
58378 |
+void a_Nav_forw(DilloDoc *dd);
|
|
58379 |
+void a_Nav_home(DilloDoc *dd);
|
|
58380 |
+void a_Nav_reload(DilloDoc *dd);
|
|
58381 |
+void a_Nav_init(DilloDoc *dd);
|
|
58382 |
+void a_Nav_free(DilloDoc *dd);
|
|
58383 |
+void a_Nav_cancel_expect (DilloDoc *dd);
|
|
58384 |
+void a_Nav_expect_done(DilloDoc *dd);
|
|
58385 |
+void a_Nav_remove_top_url(DilloDoc *dd);
|
|
58386 |
+void a_Nav_jump_callback(GtkWidget *widget, gpointer client_data, gint NewDd);
|
|
58387 |
+gint a_Nav_stack_ptr(DilloDoc *dd);
|
|
58388 |
+gint a_Nav_stack_size(DilloDoc *dd);
|
|
58389 |
|
|
58390 |
|
|
58391 |
#ifdef __cplusplus
|
|
58392 |
diff -pruN dillo-0.8.6/src/plain.c dillo-0.8.6-i18n-misc-20070916/src/plain.c
|
|
58393 |
--- dillo-0.8.6/src/plain.c 2006-01-03 03:16:58.000000000 +0900
|
|
58394 |
+++ dillo-0.8.6-i18n-misc-20070916/src/plain.c 2006-05-16 01:21:09.000000000 +0900
|
|
58395 |
@@ -18,13 +18,13 @@
|
|
58396 |
#include <math.h> /* for rint() */
|
|
58397 |
#include <gtk/gtk.h>
|
|
58398 |
|
|
58399 |
+#include "i18n.h"
|
|
58400 |
#include "prefs.h"
|
|
58401 |
#include "dw_page.h"
|
|
58402 |
#include "cache.h"
|
|
58403 |
#include "browser.h"
|
|
58404 |
#include "web.h"
|
|
58405 |
-#include "interface.h"
|
|
58406 |
-#include "progressbar.h"
|
|
58407 |
+#include "doc.h"
|
|
58408 |
#include "misc.h"
|
|
58409 |
#include "history.h"
|
|
58410 |
#include "nav.h"
|
|
58411 |
@@ -35,8 +35,9 @@ typedef struct _DilloPlain {
|
|
58412 |
DwWidget *dw;
|
|
58413 |
size_t Start_Ofs; /* Offset of where to start reading next */
|
|
58414 |
DwStyle *style;
|
|
58415 |
- BrowserWindow *bw;
|
|
58416 |
+ DilloDoc *dd;
|
|
58417 |
gint state;
|
|
58418 |
+ gchar *charset;
|
|
58419 |
} DilloPlain;
|
|
58420 |
|
|
58421 |
/* FSM states */
|
|
58422 |
@@ -64,7 +65,7 @@ static int Plain_page_menu(GtkWidget *vi
|
|
58423 |
BrowserWindow *bw)
|
|
58424 |
{
|
|
58425 |
if (event->button == 3) {
|
|
58426 |
- a_Menu_popup_set_url(bw, a_History_get_url(NAV_TOP(bw)));
|
|
58427 |
+ a_Menu_popup_set_url(bw, a_History_get_url(NAV_TOP(bw->dd)));
|
|
58428 |
gtk_menu_popup(GTK_MENU(bw->menu_popup.over_page), NULL, NULL,
|
|
58429 |
NULL, NULL, event->button, event->time);
|
|
58430 |
return TRUE;
|
|
58431 |
@@ -75,7 +76,7 @@ static int Plain_page_menu(GtkWidget *vi
|
|
58432 |
/*
|
|
58433 |
* Create and initialize a new DilloPlain structure.
|
|
58434 |
*/
|
|
58435 |
-static DilloPlain *Plain_new(BrowserWindow *bw)
|
|
58436 |
+static DilloPlain *Plain_new(DilloDoc *dd)
|
|
58437 |
{
|
|
58438 |
DilloPlain *plain;
|
|
58439 |
DwPage *page;
|
|
58440 |
@@ -83,30 +84,31 @@ static DilloPlain *Plain_new(BrowserWind
|
|
58441 |
DwStyleFont font_attrs;
|
|
58442 |
|
|
58443 |
plain = g_new(DilloPlain, 1);
|
|
58444 |
+ plain->charset = NULL;
|
|
58445 |
plain->state = ST_SeekingEol;
|
|
58446 |
plain->Start_Ofs = 0;
|
|
58447 |
- plain->bw = bw;
|
|
58448 |
+ plain->dd = dd;
|
|
58449 |
plain->dw = a_Dw_page_new();
|
|
58450 |
page = (DwPage *) plain->dw;
|
|
58451 |
|
|
58452 |
/* Create the font and attribute for the page. */
|
|
58453 |
font_attrs.name = prefs.fw_fontname;
|
|
58454 |
- font_attrs.size = rint(12.0 * prefs.font_factor);
|
|
58455 |
+ font_attrs.size = rint(prefs.font_sizes[2] * prefs.font_factor);
|
|
58456 |
font_attrs.weight = 400;
|
|
58457 |
font_attrs.style = DW_STYLE_FONT_STYLE_NORMAL;
|
|
58458 |
-
|
|
58459 |
- a_Dw_style_init_values (&style_attrs, plain->bw->main_window->window);
|
|
58460 |
+ strncpy(font_attrs.lang, "", 6);
|
|
58461 |
+ a_Dw_style_init_values (&style_attrs, plain->dd->bw->main_window->window);
|
|
58462 |
style_attrs.font = a_Dw_style_font_new (&font_attrs);
|
|
58463 |
style_attrs.color = a_Dw_style_color_new (prefs.text_color,
|
|
58464 |
- plain->bw->main_window->window);
|
|
58465 |
+ plain->dd->bw->main_window->window);
|
|
58466 |
plain->style = a_Dw_style_new (&style_attrs,
|
|
58467 |
- plain->bw->main_window->window);
|
|
58468 |
+ plain->dd->bw->main_window->window);
|
|
58469 |
/* a_Dw_widget_set_style (plain->dw, plain->style); */
|
|
58470 |
|
|
58471 |
/* The context menu */
|
|
58472 |
gtk_signal_connect_while_alive
|
|
58473 |
- (GTK_OBJECT(GTK_BIN(plain->bw->docwin)->child),"button_press_event",
|
|
58474 |
- GTK_SIGNAL_FUNC(Plain_page_menu), (gpointer)plain->bw,
|
|
58475 |
+ (GTK_OBJECT(GTK_BIN(plain->dd->docwin)->child),"button_press_event",
|
|
58476 |
+ GTK_SIGNAL_FUNC(Plain_page_menu), (gpointer)plain->dd->bw,
|
|
58477 |
GTK_OBJECT (page));
|
|
58478 |
|
|
58479 |
return plain;
|
|
58480 |
@@ -119,7 +121,7 @@ DwWidget* a_Plain_text(const char *type,
|
|
58481 |
void **Data)
|
|
58482 |
{
|
|
58483 |
DilloWeb *web = P;
|
|
58484 |
- DilloPlain *plain = Plain_new(web->bw);
|
|
58485 |
+ DilloPlain *plain = Plain_new(web->dd);
|
|
58486 |
|
|
58487 |
*Call = (CA_Callback_t)Plain_callback;
|
|
58488 |
*Data = (void*)plain;
|
|
58489 |
@@ -140,11 +142,10 @@ static void Plain_callback(int Op, Cache
|
|
58490 |
if (plain->Start_Ofs < Client->BufSize)
|
|
58491 |
Plain_write(plain, Client->Buf, Client->BufSize, 1);
|
|
58492 |
/* remove this client from our active list */
|
|
58493 |
- a_Interface_close_client(plain->bw, Client->Key);
|
|
58494 |
- /* set progress bar insensitive */
|
|
58495 |
- a_Progressbar_update(plain->bw->progress, NULL, 0);
|
|
58496 |
-
|
|
58497 |
+ plain->dd->ready = TRUE;
|
|
58498 |
+ a_Doc_close_client(plain->dd, Client->Key);
|
|
58499 |
a_Dw_style_unref (plain->style);
|
|
58500 |
+ g_free(plain->charset);
|
|
58501 |
g_free(plain);
|
|
58502 |
} else {
|
|
58503 |
Plain_write(plain, Client->Buf, Client->BufSize, 0);
|
|
58504 |
@@ -164,6 +165,8 @@ static void Plain_write(DilloPlain *plai
|
|
58505 |
char *data;
|
|
58506 |
guint i, len, MaxBytes;
|
|
58507 |
|
|
58508 |
+ if(!plain->charset)
|
|
58509 |
+ plain->charset = a_I18n_get_encoding(Buf, BufSize);
|
|
58510 |
Start = (char*)Buf + plain->Start_Ofs;
|
|
58511 |
MaxBytes = BufSize - plain->Start_Ofs;
|
|
58512 |
i = len = 0;
|
|
58513 |
@@ -177,7 +180,8 @@ static void Plain_write(DilloPlain *plai
|
|
58514 |
}
|
|
58515 |
break;
|
|
58516 |
case ST_Eol:
|
|
58517 |
- data = g_strndup(Start + i - len, len);
|
|
58518 |
+ data = a_I18n_convert(plain->charset, DILLO_CHARSET,
|
|
58519 |
+ Start + i - len, len);
|
|
58520 |
a_Dw_page_add_text(page, a_Misc_expand_tabs(data), plain->style);
|
|
58521 |
g_free(data);
|
|
58522 |
a_Dw_page_add_parbreak(page, 0, plain->style);
|
|
58523 |
@@ -190,19 +194,17 @@ static void Plain_write(DilloPlain *plai
|
|
58524 |
}
|
|
58525 |
plain->Start_Ofs += i - len;
|
|
58526 |
if ( Eof && len ) {
|
|
58527 |
- data = g_strndup(Start + i - len, len);
|
|
58528 |
+ data = a_I18n_convert(plain->charset, DILLO_CHARSET,
|
|
58529 |
+ Start + i - len, len);
|
|
58530 |
a_Dw_page_add_text(page, a_Misc_expand_tabs(data), plain->style);
|
|
58531 |
g_free(data);
|
|
58532 |
a_Dw_page_add_parbreak(page, 0, plain->style);
|
|
58533 |
plain->Start_Ofs += len;
|
|
58534 |
}
|
|
58535 |
|
|
58536 |
- if ( plain->bw ) {
|
|
58537 |
- gchar completestr[32];
|
|
58538 |
- g_snprintf(
|
|
58539 |
- completestr, 32, "%s%.1f Kb",
|
|
58540 |
- PBAR_PSTR(prefs.panel_size == 1),
|
|
58541 |
- (float)plain->Start_Ofs/1024);
|
|
58542 |
- a_Progressbar_update(plain->bw->progress, completestr, 1);
|
|
58543 |
+ if ( plain->dd ) {
|
|
58544 |
+ plain->dd->progress = plain->Start_Ofs/1024;
|
|
58545 |
+ plain->dd->ready = FALSE;
|
|
58546 |
+ a_Doc_progress_update(plain->dd);
|
|
58547 |
}
|
|
58548 |
}
|
|
58549 |
diff -pruN dillo-0.8.6/src/prefs.c dillo-0.8.6-i18n-misc-20070916/src/prefs.c
|
|
58550 |
--- dillo-0.8.6/src/prefs.c 2005-10-28 01:20:14.000000000 +0900
|
|
58551 |
+++ dillo-0.8.6-i18n-misc-20070916/src/prefs.c 2007-09-07 00:09:59.000000000 +0900
|
|
58552 |
@@ -18,18 +18,25 @@
|
|
58553 |
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
58554 |
*/
|
|
58555 |
|
|
58556 |
+#include <config.h>
|
|
58557 |
+
|
|
58558 |
#include <glib.h>
|
|
58559 |
#include <sys/types.h>
|
|
58560 |
#include <sys/stat.h>
|
|
58561 |
+#include <stdio.h> /* for sscanf */
|
|
58562 |
#include <stdlib.h>
|
|
58563 |
#include <string.h> /* for strchr */
|
|
58564 |
#include <fcntl.h>
|
|
58565 |
#include <unistd.h>
|
|
58566 |
#include <locale.h> /* for setlocale */
|
|
58567 |
+#include "intl.h"
|
|
58568 |
#include "prefs.h"
|
|
58569 |
#include "colors.h"
|
|
58570 |
#include "misc.h"
|
|
58571 |
|
|
58572 |
+#define DEBUG_LEVEL 5
|
|
58573 |
+#include "debug.h"
|
|
58574 |
+
|
|
58575 |
/* symbol array */
|
|
58576 |
static const struct {
|
|
58577 |
gchar *name;
|
|
58578 |
@@ -39,6 +46,8 @@ static const struct {
|
|
58579 |
{ "http_proxy", DRC_TOKEN_PROXY },
|
|
58580 |
{ "http_proxyuser", DRC_TOKEN_PROXYUSER },
|
|
58581 |
{ "no_proxy", DRC_TOKEN_NOPROXY },
|
|
58582 |
+ { "user_agent", DRC_TOKEN_USER_AGENT },
|
|
58583 |
+ { "send_referer", DRC_TOKEN_SEND_REFERER },
|
|
58584 |
{ "link_color", DRC_TOKEN_LINK_COLOR },
|
|
58585 |
{ "visited_color", DRC_TOKEN_VISITED_COLOR, },
|
|
58586 |
{ "bg_color", DRC_TOKEN_BG_COLOR },
|
|
58587 |
@@ -53,8 +62,10 @@ static const struct {
|
|
58588 |
{ "panel_size", DRC_TOKEN_PANEL_SIZE },
|
|
58589 |
{ "small_icons", DRC_TOKEN_SMALL_ICONS },
|
|
58590 |
{ "limit_text_width", DRC_TOKEN_LIMIT_TEXT_WIDTH },
|
|
58591 |
+ { "limit_font_decoration", DRC_TOKEN_LIMIT_FONT_DECORATION },
|
|
58592 |
{ "w3c_plus_heuristics", DRC_TOKEN_W3C_PLUS_HEURISTICS },
|
|
58593 |
{ "font_factor", DRC_TOKEN_FONT_FACTOR },
|
|
58594 |
+ { "font_sizes", DRC_TOKEN_FONT_SIZES },
|
|
58595 |
{ "use_dicache", DRC_TOKEN_USE_DICACHE },
|
|
58596 |
{ "show_back", DRC_TOKEN_SHOW_BACK },
|
|
58597 |
{ "show_forw", DRC_TOKEN_SHOW_FORW },
|
|
58598 |
@@ -68,15 +79,37 @@ static const struct {
|
|
58599 |
{ "show_url", DRC_TOKEN_SHOW_URL },
|
|
58600 |
{ "show_search", DRC_TOKEN_SHOW_SEARCH },
|
|
58601 |
{ "show_progress_box", DRC_TOKEN_SHOW_PROGRESS_BOX },
|
|
58602 |
+ { "show_popup_navigation", DRC_TOKEN_SHOW_POPUP_NAVIGATION },
|
|
58603 |
{ "fullwindow_start", DRC_TOKEN_FULLWINDOW_START },
|
|
58604 |
{ "transient_dialogs", DRC_TOKEN_TRANSIENT_DIALOGS },
|
|
58605 |
+ { "popup_dialogs", DRC_TOKEN_POPUP_DIALOGS },
|
|
58606 |
+ { "vw_aafontname", DRC_TOKEN_VW_AAFONT },
|
|
58607 |
+ { "fw_aafontname", DRC_TOKEN_FW_AAFONT },
|
|
58608 |
{ "vw_fontname", DRC_TOKEN_VW_FONT },
|
|
58609 |
{ "fw_fontname", DRC_TOKEN_FW_FONT },
|
|
58610 |
{ "generate_submit", DRC_TOKEN_GENERATE_SUBMIT },
|
|
58611 |
{ "enterpress_forces_submit", DRC_TOKEN_ENTERPRESS_FORCES_SUBMIT },
|
|
58612 |
{ "search_url", DRC_TOKEN_SEARCH_URL },
|
|
58613 |
+ { "search_charset", DRC_TOKEN_SEARCH_CHARSET },
|
|
58614 |
{ "show_msg", DRC_TOKEN_SHOW_MSG },
|
|
58615 |
- { "show_extra_warnings", DRC_TOKEN_SHOW_EXTRA_WARNINGS }
|
|
58616 |
+ { "show_extra_warnings", DRC_TOKEN_SHOW_EXTRA_WARNINGS },
|
|
58617 |
+ { "focus_location_on_new", DRC_TOKEN_FOCUS_LOCATION_ON_NEW },
|
|
58618 |
+ { "accept_language", DRC_TOKEN_ACCEPT_LANGUAGE },
|
|
58619 |
+ { "query_expire_time", DRC_TOKEN_QUERY_EXPIRE_TIME },
|
|
58620 |
+ { "min_page_expire", DRC_TOKEN_MIN_PAGE_EXPIRE_TIME },
|
|
58621 |
+ { "min_image_expire", DRC_TOKEN_MIN_IMAGE_EXPIRE_TIME },
|
|
58622 |
+#ifndef DISABLE_TABS
|
|
58623 |
+ { "tab_load_in_background", DRC_TOKEN_TAB_LOAD_IN_BACKGROUND },
|
|
58624 |
+ { "tab_instead_of_window", DRC_TOKEN_TAB_INSTEAD_OF_WINDOW },
|
|
58625 |
+ { "tab_bar_show_fullscreen", DRC_TOKEN_TAB_BAR_SHOW_FULLSCREEN },
|
|
58626 |
+ { "tab_bar_show_single_tab", DRC_TOKEN_TAB_BAR_SHOW_SINGLE_TAB },
|
|
58627 |
+ { "tab_bar_scroller", DRC_TOKEN_TAB_BAR_SCROLLER },
|
|
58628 |
+ { "tab_bar_homogeneous", DRC_TOKEN_TAB_BAR_HOMOGENEOUS },
|
|
58629 |
+ { "tab_title_compress", DRC_TOKEN_TAB_TITLE_COMPRESS },
|
|
58630 |
+ { "tab_close_middle_click", DRC_TOKEN_TAB_CLOSE_MIDDLE_CLICK },
|
|
58631 |
+ { "compress_vowels", DRC_TOKEN_COMPRESS_VOWELS },
|
|
58632 |
+ { "compress_common_prefixes", DRC_TOKEN_COMPRESS_COMMON_PREFIXES },
|
|
58633 |
+#endif /* !DISABLE_TABS */
|
|
58634 |
};
|
|
58635 |
|
|
58636 |
static const guint n_symbols = sizeof (symbols) / sizeof (symbols[0]);
|
|
58637 |
@@ -129,6 +162,21 @@ static guint Prefs_parser(GScanner *scan
|
|
58638 |
prefs.no_proxy = g_strdup(scanner->value.v_string);
|
|
58639 |
prefs.no_proxy_vec = g_strsplit(prefs.no_proxy, " ", 0);
|
|
58640 |
break;
|
|
58641 |
+ case DRC_TOKEN_USER_AGENT:
|
|
58642 |
+ {
|
|
58643 |
+ gchar *prefs_value = g_strdup(scanner->value.v_string);
|
|
58644 |
+ gchar *option = NULL;
|
|
58645 |
+ g_free(prefs.user_agent);
|
|
58646 |
+ if((option = strstr(prefs_value, "%v"))) {
|
|
58647 |
+ option[1] = 's';
|
|
58648 |
+ prefs.user_agent = g_strdup_printf(prefs_value, VERSION);
|
|
58649 |
+ } else prefs.user_agent = prefs_value;
|
|
58650 |
+ DEBUG_MSG(4, "Setting User-Agent: \"%s\"\n", prefs.user_agent);
|
|
58651 |
+ break;
|
|
58652 |
+ }
|
|
58653 |
+ case DRC_TOKEN_SEND_REFERER:
|
|
58654 |
+ prefs.send_referer = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58655 |
+ break;
|
|
58656 |
case DRC_TOKEN_LINK_COLOR:
|
|
58657 |
prefs.link_color = a_Color_parse(scanner->value.v_string,
|
|
58658 |
prefs.link_color, &st);
|
|
58659 |
@@ -184,10 +232,30 @@ static guint Prefs_parser(GScanner *scan
|
|
58660 |
break;
|
|
58661 |
case DRC_TOKEN_FONT_FACTOR:
|
|
58662 |
prefs.font_factor = strtod(scanner->value.v_string, NULL);
|
|
58663 |
- break;
|
|
58664 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
58665 |
+ prefs.font_factor *= 0.8;
|
|
58666 |
+#endif
|
|
58667 |
+ break;
|
|
58668 |
+ case DRC_TOKEN_FONT_SIZES:
|
|
58669 |
+ {
|
|
58670 |
+ int sizes[D_FONT_SIZE_NUM];
|
|
58671 |
+ if (sscanf(scanner->value.v_string,
|
|
58672 |
+ "%d %d %d %d %d %d",
|
|
58673 |
+ &sizes[0],
|
|
58674 |
+ &sizes[1],
|
|
58675 |
+ &sizes[2],
|
|
58676 |
+ &sizes[3],
|
|
58677 |
+ &sizes[4],
|
|
58678 |
+ &sizes[5]) == D_FONT_SIZE_NUM) {
|
|
58679 |
+ memcpy(prefs.font_sizes, sizes, sizeof(int) * D_FONT_SIZE_NUM);
|
|
58680 |
+ }
|
|
58681 |
+ }
|
|
58682 |
case DRC_TOKEN_LIMIT_TEXT_WIDTH:
|
|
58683 |
prefs.limit_text_width = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58684 |
break;
|
|
58685 |
+ case DRC_TOKEN_LIMIT_FONT_DECORATION:
|
|
58686 |
+ prefs.limit_font_decoration = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58687 |
+ break;
|
|
58688 |
case DRC_TOKEN_W3C_PLUS_HEURISTICS:
|
|
58689 |
prefs.w3c_plus_heuristics = (strcmp(scanner->value.v_string,"YES") == 0);
|
|
58690 |
break;
|
|
58691 |
@@ -230,17 +298,31 @@ static guint Prefs_parser(GScanner *scan
|
|
58692 |
case DRC_TOKEN_SHOW_PROGRESS_BOX:
|
|
58693 |
prefs.show_progress_box = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58694 |
break;
|
|
58695 |
+ case DRC_TOKEN_SHOW_POPUP_NAVIGATION:
|
|
58696 |
+ prefs.show_popup_navigation = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58697 |
+ break;
|
|
58698 |
case DRC_TOKEN_FULLWINDOW_START:
|
|
58699 |
prefs.fullwindow_start = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58700 |
break;
|
|
58701 |
case DRC_TOKEN_TRANSIENT_DIALOGS:
|
|
58702 |
prefs.transient_dialogs = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58703 |
break;
|
|
58704 |
+ case DRC_TOKEN_POPUP_DIALOGS:
|
|
58705 |
+ prefs.popup_dialogs = (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58706 |
+ break;
|
|
58707 |
+#ifdef DISABLE_ANTI_ALIAS
|
|
58708 |
case DRC_TOKEN_FW_FONT:
|
|
58709 |
+#else
|
|
58710 |
+ case DRC_TOKEN_FW_AAFONT:
|
|
58711 |
+#endif
|
|
58712 |
g_free(prefs.fw_fontname);
|
|
58713 |
prefs.fw_fontname = g_strdup(scanner->value.v_string);
|
|
58714 |
break;
|
|
58715 |
+#ifdef DISABLE_ANTI_ALIAS
|
|
58716 |
case DRC_TOKEN_VW_FONT:
|
|
58717 |
+#else
|
|
58718 |
+ case DRC_TOKEN_VW_AAFONT:
|
|
58719 |
+#endif
|
|
58720 |
g_free(prefs.vw_fontname);
|
|
58721 |
prefs.vw_fontname = g_strdup(scanner->value.v_string);
|
|
58722 |
break;
|
|
58723 |
@@ -255,6 +337,10 @@ static guint Prefs_parser(GScanner *scan
|
|
58724 |
g_free(prefs.search_url);
|
|
58725 |
prefs.search_url = g_strdup(scanner->value.v_string);
|
|
58726 |
break;
|
|
58727 |
+ case DRC_TOKEN_SEARCH_CHARSET:
|
|
58728 |
+ g_free(prefs.search_charset);
|
|
58729 |
+ prefs.search_charset = g_strdup(scanner->value.v_string);
|
|
58730 |
+ break;
|
|
58731 |
case DRC_TOKEN_SHOW_MSG:
|
|
58732 |
prefs.show_msg =
|
|
58733 |
(strcmp(scanner->value.v_string, "YES") == 0);
|
|
58734 |
@@ -263,23 +349,94 @@ static guint Prefs_parser(GScanner *scan
|
|
58735 |
prefs.show_extra_warnings =
|
|
58736 |
(strcmp(scanner->value.v_string, "YES") == 0);
|
|
58737 |
break;
|
|
58738 |
+ case DRC_TOKEN_FOCUS_LOCATION_ON_NEW:
|
|
58739 |
+ prefs.focus_location_on_new =
|
|
58740 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58741 |
+ break;
|
|
58742 |
+ case DRC_TOKEN_ACCEPT_LANGUAGE:
|
|
58743 |
+ if (strlen(scanner->value.v_string) != 0) {
|
|
58744 |
+ g_free(prefs.accept_language);
|
|
58745 |
+ prefs.accept_language = g_strdup(scanner->value.v_string);
|
|
58746 |
+ }
|
|
58747 |
+ break;
|
|
58748 |
+ case DRC_TOKEN_QUERY_EXPIRE_TIME:
|
|
58749 |
+ prefs.query_expire_time = strtol(scanner->value.v_string, NULL, 10);
|
|
58750 |
+ break;
|
|
58751 |
+ case DRC_TOKEN_MIN_PAGE_EXPIRE_TIME:
|
|
58752 |
+ prefs.min_page_expire_time = strtol(scanner->value.v_string, NULL, 10);
|
|
58753 |
+ break;
|
|
58754 |
+ case DRC_TOKEN_MIN_IMAGE_EXPIRE_TIME:
|
|
58755 |
+ prefs.min_image_expire_time = strtol(scanner->value.v_string, NULL, 10);
|
|
58756 |
+ break;
|
|
58757 |
+#ifndef DISABLE_TABS
|
|
58758 |
+ case DRC_TOKEN_TAB_LOAD_IN_BACKGROUND:
|
|
58759 |
+ prefs.tab_load_in_background =
|
|
58760 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58761 |
+ break;
|
|
58762 |
+ case DRC_TOKEN_TAB_INSTEAD_OF_WINDOW:
|
|
58763 |
+ prefs.tab_instead_of_window =
|
|
58764 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58765 |
+ break;
|
|
58766 |
+ case DRC_TOKEN_TAB_BAR_SHOW_FULLSCREEN:
|
|
58767 |
+ prefs.tab_bar_show_fullscreen =
|
|
58768 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58769 |
+ break;
|
|
58770 |
+ case DRC_TOKEN_TAB_BAR_SHOW_SINGLE_TAB:
|
|
58771 |
+ prefs.tab_bar_show_single_tab =
|
|
58772 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58773 |
+ break;
|
|
58774 |
+ case DRC_TOKEN_TAB_BAR_SCROLLER:
|
|
58775 |
+ prefs.tab_bar_scroller =
|
|
58776 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58777 |
+ break;
|
|
58778 |
+ case DRC_TOKEN_TAB_BAR_HOMOGENEOUS:
|
|
58779 |
+ prefs.tab_bar_homogeneous =
|
|
58780 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58781 |
+ break;
|
|
58782 |
+ case DRC_TOKEN_TAB_TITLE_COMPRESS:
|
|
58783 |
+ prefs.tab_title_compress =
|
|
58784 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58785 |
+ break;
|
|
58786 |
+ case DRC_TOKEN_TAB_CLOSE_MIDDLE_CLICK:
|
|
58787 |
+ prefs.tab_close_middle_click =
|
|
58788 |
+ (strcmp(scanner->value.v_string, "YES") == 0);
|
|
58789 |
+ break;
|
|
58790 |
+ case DRC_TOKEN_COMPRESS_VOWELS:
|
|
58791 |
+ g_free(prefs.compress_vowels);
|
|
58792 |
+ prefs.compress_vowels = g_strdup(scanner->value.v_string);
|
|
58793 |
+ break;
|
|
58794 |
+ case DRC_TOKEN_COMPRESS_COMMON_PREFIXES:
|
|
58795 |
+ g_free(prefs.compress_common_prefixes);
|
|
58796 |
+ prefs.compress_common_prefixes = g_strdup(scanner->value.v_string);
|
|
58797 |
+ prefs.compress_common_prefixes_vec =
|
|
58798 |
+ g_strsplit(prefs.compress_common_prefixes, ";", 0);
|
|
58799 |
+ break;
|
|
58800 |
+#endif /*DISABLE_TABS */
|
|
58801 |
default:
|
|
58802 |
break; /* Not reached */
|
|
58803 |
}
|
|
58804 |
return G_TOKEN_NONE;
|
|
58805 |
}
|
|
58806 |
|
|
58807 |
-static gint Prefs_load(void)
|
|
58808 |
+static gint Prefs_load(char *rcfile)
|
|
58809 |
{
|
|
58810 |
GScanner *scanner;
|
|
58811 |
- gint fd;
|
|
58812 |
+ gint fd = -1;
|
|
58813 |
guint i, expected_token;
|
|
58814 |
gchar *file;
|
|
58815 |
|
|
58816 |
/* Here we load and set options from dillorc */
|
|
58817 |
- file = a_Misc_prepend_user_home(".dillo/dillorc");
|
|
58818 |
- fd = open(file, O_RDONLY);
|
|
58819 |
- g_free(file);
|
|
58820 |
+ if (rcfile) {
|
|
58821 |
+ if ((fd = open(rcfile, O_RDONLY)) < 0) {
|
|
58822 |
+ g_printerr(_("Error: Can't open specified config file."
|
|
58823 |
+ " default file is used.\n"));
|
|
58824 |
+ }
|
|
58825 |
+ }
|
|
58826 |
+ if (fd < 0) {
|
|
58827 |
+ file = a_Misc_prepend_user_home(".dillo/dillorc");
|
|
58828 |
+ fd = open(file, O_RDONLY);
|
|
58829 |
+ g_free(file);
|
|
58830 |
+ }
|
|
58831 |
if (fd < 0 && (fd = open(DILLORC_SYS, O_RDONLY)) < 0)
|
|
58832 |
return FILE_NOT_FOUND;
|
|
58833 |
|
|
58834 |
@@ -318,7 +475,7 @@ static gint Prefs_load(void)
|
|
58835 |
g_scanner_input_file(scanner, fd);
|
|
58836 |
|
|
58837 |
/* give the error handler an idea on how the input is named */
|
|
58838 |
- scanner->input_name = "dillorc";
|
|
58839 |
+ scanner->input_name = (rcfile) ? rcfile : "dillorc";
|
|
58840 |
|
|
58841 |
/*
|
|
58842 |
* Scanning loop, we parse the input until it's end is reached,
|
|
58843 |
@@ -354,7 +511,7 @@ static gint Prefs_load(void)
|
|
58844 |
return PARSE_OK;
|
|
58845 |
}
|
|
58846 |
|
|
58847 |
-void a_Prefs_init(void)
|
|
58848 |
+void a_Prefs_init(char *rcfile)
|
|
58849 |
{
|
|
58850 |
gchar *old_locale;
|
|
58851 |
|
|
58852 |
@@ -366,6 +523,8 @@ void a_Prefs_init(void)
|
|
58853 |
prefs.http_proxyuser = NULL;
|
|
58854 |
prefs.no_proxy = NULL;
|
|
58855 |
prefs.no_proxy_vec = NULL;
|
|
58856 |
+ prefs.user_agent = NULL;
|
|
58857 |
+ prefs.send_referer = TRUE;
|
|
58858 |
prefs.link_color = DW_COLOR_DEFAULT_BLUE;
|
|
58859 |
prefs.visited_color = DW_COLOR_DEFAULT_PURPLE;
|
|
58860 |
prefs.bg_color = DW_COLOR_DEFAULT_BGND;
|
|
58861 |
@@ -380,8 +539,18 @@ void a_Prefs_init(void)
|
|
58862 |
prefs.panel_size = 1;
|
|
58863 |
prefs.small_icons = FALSE;
|
|
58864 |
prefs.limit_text_width = FALSE;
|
|
58865 |
+ prefs.limit_font_decoration = FALSE;
|
|
58866 |
prefs.w3c_plus_heuristics = TRUE;
|
|
58867 |
prefs.font_factor = 1.0;
|
|
58868 |
+#ifndef DISABLE_ANTI_ALIAS
|
|
58869 |
+ prefs.font_factor = 0.8;
|
|
58870 |
+#endif
|
|
58871 |
+ prefs.font_sizes[0] = D_FONT_SIZE_1;
|
|
58872 |
+ prefs.font_sizes[1] = D_FONT_SIZE_2;
|
|
58873 |
+ prefs.font_sizes[2] = D_FONT_SIZE_3;
|
|
58874 |
+ prefs.font_sizes[3] = D_FONT_SIZE_4;
|
|
58875 |
+ prefs.font_sizes[4] = D_FONT_SIZE_5;
|
|
58876 |
+ prefs.font_sizes[5] = D_FONT_SIZE_6;
|
|
58877 |
prefs.use_dicache = FALSE;
|
|
58878 |
prefs.show_back=TRUE;
|
|
58879 |
prefs.show_forw=TRUE;
|
|
58880 |
@@ -395,21 +564,42 @@ void a_Prefs_init(void)
|
|
58881 |
prefs.show_url=TRUE;
|
|
58882 |
prefs.show_search=TRUE;
|
|
58883 |
prefs.show_progress_box=TRUE;
|
|
58884 |
+ prefs.show_popup_navigation=TRUE;
|
|
58885 |
prefs.fullwindow_start=FALSE;
|
|
58886 |
prefs.transient_dialogs=FALSE;
|
|
58887 |
- prefs.vw_fontname = g_strdup("helvetica");
|
|
58888 |
- prefs.fw_fontname = g_strdup("courier");
|
|
58889 |
+ prefs.popup_dialogs=FALSE;
|
|
58890 |
+ prefs.vw_fontname = g_strdup(D_DEFAULT_VW_FONT);
|
|
58891 |
+ prefs.fw_fontname = g_strdup(D_DEFAULT_FW_FONT);
|
|
58892 |
prefs.generate_submit = FALSE;
|
|
58893 |
prefs.enterpress_forces_submit = FALSE;
|
|
58894 |
- prefs.search_url = g_strdup("http://www.google.com/search?q=%s");
|
|
58895 |
+ prefs.search_url = g_strdup(DILLO_SEARCH_URL);
|
|
58896 |
+ prefs.search_charset = g_strdup(DILLO_SEARCH_CHARSET);
|
|
58897 |
prefs.show_msg = TRUE;
|
|
58898 |
prefs.show_extra_warnings = FALSE;
|
|
58899 |
-
|
|
58900 |
+ prefs.focus_location_on_new = TRUE;
|
|
58901 |
+ prefs.accept_language = g_strdup(DILLO_ACCEPT_LANGUAGE);
|
|
58902 |
+ prefs.query_expire_time = -1;
|
|
58903 |
+ prefs.min_page_expire_time = 60; // some sites need 0. 60; // 1 minute
|
|
58904 |
+ prefs.min_image_expire_time = 1800; // 30 minutes
|
|
58905 |
+#ifndef DISABLE_TABS
|
|
58906 |
+ prefs.tab_load_in_background = FALSE;
|
|
58907 |
+ prefs.tab_instead_of_window = FALSE;
|
|
58908 |
+ prefs.tab_bar_show_fullscreen = FALSE;
|
|
58909 |
+ prefs.tab_bar_show_single_tab = FALSE;
|
|
58910 |
+ prefs.tab_bar_scroller = FALSE;
|
|
58911 |
+ prefs.tab_bar_homogeneous = TRUE;
|
|
58912 |
+ prefs.tab_title_compress = TRUE;
|
|
58913 |
+ prefs.tab_close_middle_click = TRUE;
|
|
58914 |
+ prefs.compress_vowels = g_strdup(COMPRESS_VOWELS);
|
|
58915 |
+ prefs.compress_common_prefixes = g_strdup(COMPRESS_COMMON_PREFIXES);
|
|
58916 |
+ prefs.compress_common_prefixes_vec =
|
|
58917 |
+ g_strsplit(prefs.compress_common_prefixes, ";", 0);
|
|
58918 |
+#endif /* DISABLE_TABS */
|
|
58919 |
/* this locale stuff is to avoid parsing problems with float numbers */
|
|
58920 |
old_locale = g_strdup (setlocale (LC_NUMERIC, NULL));
|
|
58921 |
setlocale (LC_NUMERIC, "C");
|
|
58922 |
|
|
58923 |
- Prefs_load();
|
|
58924 |
+ Prefs_load(rcfile);
|
|
58925 |
|
|
58926 |
setlocale (LC_NUMERIC, old_locale);
|
|
58927 |
g_free (old_locale);
|
|
58928 |
@@ -426,9 +616,18 @@ void a_Prefs_freeall(void)
|
|
58929 |
if (prefs.no_proxy_vec)
|
|
58930 |
g_strfreev(prefs.no_proxy_vec);
|
|
58931 |
a_Url_free(prefs.http_proxy);
|
|
58932 |
+ g_free(prefs.user_agent);
|
|
58933 |
g_free(prefs.fw_fontname);
|
|
58934 |
g_free(prefs.vw_fontname);
|
|
58935 |
a_Url_free(prefs.start_page);
|
|
58936 |
a_Url_free(prefs.home);
|
|
58937 |
g_free(prefs.search_url);
|
|
58938 |
+ g_free(prefs.search_charset);
|
|
58939 |
+ g_free(prefs.accept_language);
|
|
58940 |
+#ifndef DISABLE_TABS
|
|
58941 |
+ g_free(prefs.compress_vowels);
|
|
58942 |
+ g_free(prefs.compress_common_prefixes);
|
|
58943 |
+ if (prefs.compress_common_prefixes_vec)
|
|
58944 |
+ g_strfreev(prefs.compress_common_prefixes_vec);
|
|
58945 |
+#endif /* DISABLE_TABS */
|
|
58946 |
}
|
|
58947 |
diff -pruN dillo-0.8.6/src/prefs.h dillo-0.8.6-i18n-misc-20070916/src/prefs.h
|
|
58948 |
--- dillo-0.8.6/src/prefs.h 2005-10-28 01:20:14.000000000 +0900
|
|
58949 |
+++ dillo-0.8.6-i18n-misc-20070916/src/prefs.h 2006-05-16 01:21:09.000000000 +0900
|
|
58950 |
@@ -9,6 +9,9 @@ extern "C" {
|
|
58951 |
|
|
58952 |
#define DILLO_START_PAGE "about:splash"
|
|
58953 |
#define DILLO_HOME "http://www.dillo.org/"
|
|
58954 |
+#define DILLO_SEARCH_URL "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
|
|
58955 |
+#define DILLO_SEARCH_CHARSET "UTF-8"
|
|
58956 |
+#define DILLO_ACCEPT_LANGUAGE "en-us"
|
|
58957 |
#define D_GEOMETRY_DEFAULT_WIDTH 640
|
|
58958 |
#define D_GEOMETRY_DEFAULT_HEIGHT 550
|
|
58959 |
#define D_GEOMETRY_DEFAULT_XPOS -9999
|
|
58960 |
@@ -20,6 +23,28 @@ extern "C" {
|
|
58961 |
#define DW_COLOR_DEFAULT_PURPLE 0x800080
|
|
58962 |
#define DW_COLOR_DEFAULT_BGND 0xd6d6c0
|
|
58963 |
|
|
58964 |
+#define COMPRESS_VOWELS "aeiouyAEIOUY"
|
|
58965 |
+#define COMPRESS_COMMON_PREFIXES "index of ;re: ;fwd: ;www.;welcome to ;the "
|
|
58966 |
+
|
|
58967 |
+#ifdef DISABLE_ANTI_ALIAS
|
|
58968 |
+ #define D_DEFAULT_VW_FONT "*-gothic"
|
|
58969 |
+ #define D_DEFAULT_FW_FONT "*-gothic"
|
|
58970 |
+ #define D_FONT_SIZE_BASE 8
|
|
58971 |
+#else
|
|
58972 |
+ #define D_DEFAULT_VW_FONT "*"
|
|
58973 |
+ #define D_DEFAULT_FW_FONT "*"
|
|
58974 |
+ #define D_FONT_SIZE_BASE 6
|
|
58975 |
+#endif
|
|
58976 |
+
|
|
58977 |
+/* The following array of font sizes has to be _strictly_ crescent */
|
|
58978 |
+#define D_FONT_SIZE_1 (D_FONT_SIZE_BASE + 2)
|
|
58979 |
+#define D_FONT_SIZE_2 (D_FONT_SIZE_BASE + 4)
|
|
58980 |
+#define D_FONT_SIZE_3 (D_FONT_SIZE_BASE + 6)
|
|
58981 |
+#define D_FONT_SIZE_4 (D_FONT_SIZE_BASE + 8)
|
|
58982 |
+#define D_FONT_SIZE_5 (D_FONT_SIZE_BASE + 12)
|
|
58983 |
+#define D_FONT_SIZE_6 (D_FONT_SIZE_BASE + 16)
|
|
58984 |
+#define D_FONT_SIZE_NUM 6
|
|
58985 |
+
|
|
58986 |
/* define enumeration values to be returned */
|
|
58987 |
enum {
|
|
58988 |
PARSE_OK = 0,
|
|
58989 |
@@ -33,6 +58,8 @@ typedef enum {
|
|
58990 |
DRC_TOKEN_PROXY,
|
|
58991 |
DRC_TOKEN_PROXYUSER,
|
|
58992 |
DRC_TOKEN_NOPROXY,
|
|
58993 |
+ DRC_TOKEN_USER_AGENT,
|
|
58994 |
+ DRC_TOKEN_SEND_REFERER,
|
|
58995 |
DRC_TOKEN_LINK_COLOR,
|
|
58996 |
DRC_TOKEN_VISITED_COLOR,
|
|
58997 |
DRC_TOKEN_BG_COLOR,
|
|
58998 |
@@ -46,8 +73,10 @@ typedef enum {
|
|
58999 |
DRC_TOKEN_PANEL_SIZE,
|
|
59000 |
DRC_TOKEN_SMALL_ICONS,
|
|
59001 |
DRC_TOKEN_FONT_FACTOR,
|
|
59002 |
+ DRC_TOKEN_FONT_SIZES,
|
|
59003 |
DRC_TOKEN_SHOW_TOOLTIP,
|
|
59004 |
DRC_TOKEN_LIMIT_TEXT_WIDTH,
|
|
59005 |
+ DRC_TOKEN_LIMIT_FONT_DECORATION,
|
|
59006 |
DRC_TOKEN_W3C_PLUS_HEURISTICS,
|
|
59007 |
DRC_TOKEN_USE_DICACHE,
|
|
59008 |
DRC_TOKEN_SHOW_BACK,
|
|
59009 |
@@ -62,15 +91,37 @@ typedef enum {
|
|
59010 |
DRC_TOKEN_SHOW_URL,
|
|
59011 |
DRC_TOKEN_SHOW_SEARCH,
|
|
59012 |
DRC_TOKEN_SHOW_PROGRESS_BOX,
|
|
59013 |
+ DRC_TOKEN_SHOW_POPUP_NAVIGATION,
|
|
59014 |
DRC_TOKEN_FULLWINDOW_START,
|
|
59015 |
DRC_TOKEN_TRANSIENT_DIALOGS,
|
|
59016 |
+ DRC_TOKEN_POPUP_DIALOGS,
|
|
59017 |
DRC_TOKEN_FW_FONT,
|
|
59018 |
DRC_TOKEN_VW_FONT,
|
|
59019 |
+ DRC_TOKEN_FW_AAFONT,
|
|
59020 |
+ DRC_TOKEN_VW_AAFONT,
|
|
59021 |
DRC_TOKEN_GENERATE_SUBMIT,
|
|
59022 |
DRC_TOKEN_ENTERPRESS_FORCES_SUBMIT,
|
|
59023 |
DRC_TOKEN_SEARCH_URL,
|
|
59024 |
+ DRC_TOKEN_SEARCH_CHARSET,
|
|
59025 |
DRC_TOKEN_SHOW_MSG,
|
|
59026 |
DRC_TOKEN_SHOW_EXTRA_WARNINGS,
|
|
59027 |
+ DRC_TOKEN_FOCUS_LOCATION_ON_NEW,
|
|
59028 |
+ DRC_TOKEN_ACCEPT_LANGUAGE,
|
|
59029 |
+ DRC_TOKEN_QUERY_EXPIRE_TIME,
|
|
59030 |
+ DRC_TOKEN_MIN_PAGE_EXPIRE_TIME,
|
|
59031 |
+ DRC_TOKEN_MIN_IMAGE_EXPIRE_TIME,
|
|
59032 |
+#ifndef DISABLE_TABS
|
|
59033 |
+ DRC_TOKEN_TAB_LOAD_IN_BACKGROUND,
|
|
59034 |
+ DRC_TOKEN_TAB_INSTEAD_OF_WINDOW,
|
|
59035 |
+ DRC_TOKEN_TAB_BAR_SHOW_FULLSCREEN,
|
|
59036 |
+ DRC_TOKEN_TAB_BAR_SHOW_SINGLE_TAB,
|
|
59037 |
+ DRC_TOKEN_TAB_BAR_SCROLLER,
|
|
59038 |
+ DRC_TOKEN_TAB_BAR_HOMOGENEOUS,
|
|
59039 |
+ DRC_TOKEN_TAB_TITLE_COMPRESS,
|
|
59040 |
+ DRC_TOKEN_TAB_CLOSE_MIDDLE_CLICK,
|
|
59041 |
+ DRC_TOKEN_COMPRESS_VOWELS,
|
|
59042 |
+ DRC_TOKEN_COMPRESS_COMMON_PREFIXES,
|
|
59043 |
+#endif /* !DISABLE_TABS */
|
|
59044 |
|
|
59045 |
DRC_TOKEN_LAST
|
|
59046 |
} Dillo_Rc_TokenType;
|
|
59047 |
@@ -86,6 +137,8 @@ struct _DilloPrefs {
|
|
59048 |
gchar *http_proxyuser;
|
|
59049 |
gchar *no_proxy;
|
|
59050 |
gchar **no_proxy_vec;
|
|
59051 |
+ gchar *user_agent;
|
|
59052 |
+ gboolean send_referer;
|
|
59053 |
DilloUrl *start_page;
|
|
59054 |
DilloUrl *home;
|
|
59055 |
gint32 link_color;
|
|
59056 |
@@ -100,8 +153,10 @@ struct _DilloPrefs {
|
|
59057 |
gint panel_size;
|
|
59058 |
gboolean small_icons;
|
|
59059 |
gboolean limit_text_width;
|
|
59060 |
+ gboolean limit_font_decoration;
|
|
59061 |
gboolean w3c_plus_heuristics;
|
|
59062 |
gdouble font_factor;
|
|
59063 |
+ gint font_sizes[D_FONT_SIZE_NUM];
|
|
59064 |
gboolean use_dicache;
|
|
59065 |
gboolean show_back;
|
|
59066 |
gboolean show_forw;
|
|
59067 |
@@ -115,21 +170,42 @@ struct _DilloPrefs {
|
|
59068 |
gboolean show_url;
|
|
59069 |
gboolean show_search;
|
|
59070 |
gboolean show_progress_box;
|
|
59071 |
+ gboolean show_popup_navigation;
|
|
59072 |
gboolean fullwindow_start;
|
|
59073 |
gboolean transient_dialogs;
|
|
59074 |
+ gboolean popup_dialogs;
|
|
59075 |
gchar *vw_fontname;
|
|
59076 |
gchar *fw_fontname;
|
|
59077 |
gboolean generate_submit;
|
|
59078 |
gboolean enterpress_forces_submit;
|
|
59079 |
gchar *search_url;
|
|
59080 |
+ gchar *search_charset;
|
|
59081 |
gboolean show_msg;
|
|
59082 |
gboolean show_extra_warnings;
|
|
59083 |
+ gboolean focus_location_on_new;
|
|
59084 |
+ gchar *accept_language;
|
|
59085 |
+ gint query_expire_time;
|
|
59086 |
+ gint min_page_expire_time;
|
|
59087 |
+ gint min_image_expire_time;
|
|
59088 |
+#ifndef DISABLE_TABS
|
|
59089 |
+ gboolean tab_load_in_background;
|
|
59090 |
+ gboolean tab_instead_of_window;
|
|
59091 |
+ gboolean tab_bar_show_fullscreen;
|
|
59092 |
+ gboolean tab_bar_show_single_tab;
|
|
59093 |
+ gboolean tab_bar_scroller;
|
|
59094 |
+ gboolean tab_bar_homogeneous;
|
|
59095 |
+ gboolean tab_title_compress;
|
|
59096 |
+ gboolean tab_close_middle_click;
|
|
59097 |
+ gchar *compress_vowels;
|
|
59098 |
+ gchar *compress_common_prefixes;
|
|
59099 |
+ gchar **compress_common_prefixes_vec;
|
|
59100 |
+#endif /* DISABLE_TABS */
|
|
59101 |
};
|
|
59102 |
|
|
59103 |
/* Global Data */
|
|
59104 |
DilloPrefs prefs;
|
|
59105 |
|
|
59106 |
-void a_Prefs_init(void);
|
|
59107 |
+void a_Prefs_init(char *rcfile);
|
|
59108 |
void a_Prefs_freeall(void);
|
|
59109 |
|
|
59110 |
#ifdef __cplusplus
|
|
59111 |
diff -pruN dillo-0.8.6/src/progressbar.h dillo-0.8.6-i18n-misc-20070916/src/progressbar.h
|
|
59112 |
--- dillo-0.8.6/src/progressbar.h 2005-10-28 01:20:14.000000000 +0900
|
|
59113 |
+++ dillo-0.8.6-i18n-misc-20070916/src/progressbar.h 2006-05-16 01:21:09.000000000 +0900
|
|
59114 |
@@ -27,6 +27,8 @@
|
|
59115 |
extern "C" {
|
|
59116 |
#endif /* __cplusplus */
|
|
59117 |
|
|
59118 |
+#define PBAR_L 32 /* max length of progress bar string */
|
|
59119 |
+
|
|
59120 |
#define PBAR_ISTR(s) (s) ? "" : "Images: "
|
|
59121 |
#define PBAR_PSTR(s) (s) ? "" : "Page: "
|
|
59122 |
|
|
59123 |
diff -pruN dillo-0.8.6/src/selection.c dillo-0.8.6-i18n-misc-20070916/src/selection.c
|
|
59124 |
--- dillo-0.8.6/src/selection.c 2006-01-03 03:16:32.000000000 +0900
|
|
59125 |
+++ dillo-0.8.6-i18n-misc-20070916/src/selection.c 2006-05-16 01:21:09.000000000 +0900
|
|
59126 |
@@ -14,6 +14,7 @@
|
|
59127 |
* See doc/Selection.txt for informations about this module.
|
|
59128 |
*/
|
|
59129 |
|
|
59130 |
+#include "i18n.h"
|
|
59131 |
#include "selection.h"
|
|
59132 |
#include "strbuf.h"
|
|
59133 |
#include "dw_gtk_viewport.h"
|
|
59134 |
@@ -570,7 +571,7 @@ static void Selection_copy(Selection *se
|
|
59135 |
strlen (i->content.data.text) - a_char);
|
|
59136 |
a_Strbuf_append (strbuf, tmp);
|
|
59137 |
g_free (tmp);
|
|
59138 |
- } else if (cmp == 0) {
|
|
59139 |
+ } else if (cmp == 0 && b_char > 0) {
|
|
59140 |
/* the end */
|
|
59141 |
tmp = g_strndup(si->content.data.text, b_char);
|
|
59142 |
a_Strbuf_append (strbuf, tmp);
|
|
59143 |
@@ -638,8 +639,11 @@ void a_Selection_set_selection(GtkWidget
|
|
59144 |
/* As the clear-selection callback is not being called automatically
|
|
59145 |
* before setting the new value, it'll be cleared here. --Jcid
|
|
59146 |
* todo: this selection code needs a revision */
|
|
59147 |
+ gchar *oldSelection;
|
|
59148 |
g_free(selection);
|
|
59149 |
- selection = g_strdup(str);
|
|
59150 |
+ oldSelection = a_I18n_locale_from_DILLO_CHARSET(str, -1);
|
|
59151 |
+ selection = a_I18n_string_check(oldSelection, DW_CHARSET);
|
|
59152 |
+ g_free(oldSelection);
|
|
59153 |
}
|
|
59154 |
}
|
|
59155 |
|
|
59156 |
@@ -649,8 +653,25 @@ void a_Selection_set_selection(GtkWidget
|
|
59157 |
void a_Selection_give_selection_callback(GtkWidget *widget,
|
|
59158 |
GtkSelectionData *data, guint info, guint time)
|
|
59159 |
{
|
|
59160 |
- gtk_selection_data_set(data, GDK_SELECTION_TYPE_STRING,
|
|
59161 |
- 8, selection, strlen(selection));
|
|
59162 |
+ guchar *ctext;
|
|
59163 |
+ gint format, length;
|
|
59164 |
+ GdkAtom encoding;
|
|
59165 |
+ gboolean is_ascii_string;
|
|
59166 |
+ gint i;
|
|
59167 |
+
|
|
59168 |
+ is_ascii_string = TRUE;
|
|
59169 |
+ for (i = 0; selection[i]; i++) {
|
|
59170 |
+ is_ascii_string &= IS_ASCII_CHAR(selection[i]);
|
|
59171 |
+ }
|
|
59172 |
+
|
|
59173 |
+ if (is_ascii_string) {
|
|
59174 |
+ gtk_selection_data_set(data, GDK_SELECTION_TYPE_STRING,
|
|
59175 |
+ 8, selection, strlen(selection));
|
|
59176 |
+ } else {
|
|
59177 |
+ gdk_string_to_compound_text(selection, &encoding, &format, &ctext, &length);
|
|
59178 |
+ gtk_selection_data_set(data, encoding, 8, ctext, length);
|
|
59179 |
+ gdk_free_compound_text(ctext);
|
|
59180 |
+ }
|
|
59181 |
}
|
|
59182 |
|
|
59183 |
/*
|
|
59184 |
@@ -666,3 +687,4 @@ gint a_Selection_clear_selection_callbac
|
|
59185 |
return TRUE;
|
|
59186 |
}
|
|
59187 |
|
|
59188 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
59189 |
diff -pruN dillo-0.8.6/src/strbuf.c dillo-0.8.6-i18n-misc-20070916/src/strbuf.c
|
|
59190 |
--- dillo-0.8.6/src/strbuf.c 2005-10-28 01:20:15.000000000 +0900
|
|
59191 |
+++ dillo-0.8.6-i18n-misc-20070916/src/strbuf.c 2006-05-16 01:21:09.000000000 +0900
|
|
59192 |
@@ -78,17 +78,27 @@ gchar* a_Strbuf_chars (Strbuf_t *strbuf)
|
|
59193 |
g_free (strbuf->str);
|
|
59194 |
strbuf->str = g_new (gchar, strbuf->num_chars + 1);
|
|
59195 |
|
|
59196 |
+#if 1 /* if 1, use old code. */
|
|
59197 |
+ strbuf->list = g_slist_reverse (strbuf->list);
|
|
59198 |
+#else
|
|
59199 |
/* The strings in the list are prepended so we have to start from the tail
|
|
59200 |
* and work our way to the start of the new string */
|
|
59201 |
p = strbuf->str + strbuf->num_chars;
|
|
59202 |
+#endif
|
|
59203 |
+ p = strbuf->str;
|
|
59204 |
for (it = strbuf->list; it; it = it->next) {
|
|
59205 |
s = (gchar*)(it->data);
|
|
59206 |
l = strlen (s);
|
|
59207 |
- p -= l;
|
|
59208 |
memcpy (p, s, l * sizeof (gchar));
|
|
59209 |
+ p += l;
|
|
59210 |
}
|
|
59211 |
|
|
59212 |
+#if 1 /* if 1, use old code. */
|
|
59213 |
+ *p = 0;
|
|
59214 |
+ strbuf->list = g_slist_reverse (strbuf->list); /* reverse reversion */
|
|
59215 |
+#else
|
|
59216 |
p[strbuf->num_chars] = 0;
|
|
59217 |
+#endif
|
|
59218 |
strbuf->str_valid = TRUE;
|
|
59219 |
|
|
59220 |
return strbuf->str;
|
|
59221 |
diff -pruN dillo-0.8.6/src/tab.c dillo-0.8.6-i18n-misc-20070916/src/tab.c
|
|
59222 |
--- dillo-0.8.6/src/tab.c 1970-01-01 09:00:00.000000000 +0900
|
|
59223 |
+++ dillo-0.8.6-i18n-misc-20070916/src/tab.c 2006-05-16 01:21:09.000000000 +0900
|
|
59224 |
@@ -0,0 +1,500 @@
|
|
59225 |
+/*
|
|
59226 |
+ * File: tab.c
|
|
59227 |
+ *
|
|
59228 |
+ * Copyright (C) 2003 Frank de Lange <frank@unternet.org>
|
|
59229 |
+ *
|
|
59230 |
+ * This program is free software; you can redistribute it and/or modify
|
|
59231 |
+ * it under the terms of the GNU General Public License as published by
|
|
59232 |
+ * the Free Software Foundation; either version 2 of the License, or
|
|
59233 |
+ * (at your option) any later version. */
|
|
59234 |
+
|
|
59235 |
+#ifndef DISABLE_TABS
|
|
59236 |
+
|
|
59237 |
+#include <config.h>
|
|
59238 |
+
|
|
59239 |
+#include <stdio.h>
|
|
59240 |
+#include <ctype.h>
|
|
59241 |
+#include <gtk/gtk.h>
|
|
59242 |
+#include <sys/types.h>
|
|
59243 |
+#include <sys/stat.h>
|
|
59244 |
+#include <sys/time.h>
|
|
59245 |
+#include <fcntl.h>
|
|
59246 |
+
|
|
59247 |
+#include "intl.h"
|
|
59248 |
+#include "i18n.h"
|
|
59249 |
+#include "misc.h"
|
|
59250 |
+#include "dillo.h"
|
|
59251 |
+#include "history.h"
|
|
59252 |
+#include "nav.h"
|
|
59253 |
+#include "doc.h"
|
|
59254 |
+#include "IO/Url.h"
|
|
59255 |
+#include "interface.h"
|
|
59256 |
+#include "tab.h"
|
|
59257 |
+#include "commands.h"
|
|
59258 |
+#include "prefs.h"
|
|
59259 |
+#include "menu.h"
|
|
59260 |
+
|
|
59261 |
+#include "dw_gtk_scrolled_window.h"
|
|
59262 |
+#include "dw_gtk_viewport.h"
|
|
59263 |
+
|
|
59264 |
+#include <gdk/gdkkeysyms.h>
|
|
59265 |
+
|
|
59266 |
+#define DEBUG_EVENT 0
|
|
59267 |
+#define DEBUG_SIZE 10
|
|
59268 |
+#define DEBUG_ALLOC 10
|
|
59269 |
+
|
|
59270 |
+#define DEBUG_LEVEL 0
|
|
59271 |
+#include "debug.h"
|
|
59272 |
+
|
|
59273 |
+/* BROWSER TABS */
|
|
59274 |
+
|
|
59275 |
+/* callbacks */
|
|
59276 |
+
|
|
59277 |
+/*
|
|
59278 |
+ * callback for tab label resize_request. This adjusts
|
|
59279 |
+ * the tab title to the width of the tab, compressing
|
|
59280 |
+ * or shortening (according to preference) the title if needed
|
|
59281 |
+ */
|
|
59282 |
+void
|
|
59283 |
+Tab_label_size_request_callback(GtkWidget *widget,
|
|
59284 |
+ GtkAllocation *alloc,
|
|
59285 |
+ gpointer client_data)
|
|
59286 |
+{
|
|
59287 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
59288 |
+ GtkLabel *tab_label = (GtkLabel *) widget;
|
|
59289 |
+ gchar *tab_title, *checked_str, *short_title;
|
|
59290 |
+ gint tab_title_size, tab_title_len;
|
|
59291 |
+
|
|
59292 |
+ /* the tool tip is attached to the parent of the label, an event box */
|
|
59293 |
+ tab_title = ((GtkTooltipsData *) gtk_tooltips_data_get(
|
|
59294 |
+ GTK_WIDGET(
|
|
59295 |
+ GTK_WIDGET(
|
|
59296 |
+ tab_label)->parent)))->tip_text;
|
|
59297 |
+
|
|
59298 |
+ tab_title_size = (gint) ((gfloat) alloc->width / dd->bw->tab_label_average_character_width);
|
|
59299 |
+
|
|
59300 |
+ /* compress or shorten the tab title? */
|
|
59301 |
+ tab_title = a_I18n_DW_CHARSET_to_DILLO_CHARSET(tab_title, -1);
|
|
59302 |
+ tab_title_len = strlen(tab_title);
|
|
59303 |
+ if (prefs.tab_title_compress) {
|
|
59304 |
+ /* use title compression algorithm */
|
|
59305 |
+ short_title = a_Misc_string_compress(tab_title, tab_title_size);
|
|
59306 |
+ } else {
|
|
59307 |
+ /* use simple shortening */
|
|
59308 |
+ short_title = a_Misc_string_shorten(tab_title, tab_title_size);
|
|
59309 |
+ }
|
|
59310 |
+ g_free(tab_title);
|
|
59311 |
+ tab_title = a_I18n_DW_CHARSET_from_DILLO_CHARSET(short_title, -1);
|
|
59312 |
+ g_free(short_title);
|
|
59313 |
+
|
|
59314 |
+ /* check string */
|
|
59315 |
+ checked_str = a_I18n_string_check(tab_title, DW_CHARSET);
|
|
59316 |
+ g_free(tab_title);
|
|
59317 |
+
|
|
59318 |
+ gtk_label_set_text(GTK_LABEL(tab_label), checked_str);
|
|
59319 |
+ g_free(checked_str);
|
|
59320 |
+}
|
|
59321 |
+
|
|
59322 |
+/*
|
|
59323 |
+ * callback for tab label button_press_event
|
|
59324 |
+ *
|
|
59325 |
+ * used to popup menu with tab options
|
|
59326 |
+ *
|
|
59327 |
+ * even though this is called 'tab_label_..., the callback is in
|
|
59328 |
+ * fact attached to an event box surrounding the tab_label, as gtk
|
|
59329 |
+ * label widgets can not receive events
|
|
59330 |
+ */
|
|
59331 |
+void
|
|
59332 |
+Tab_label_button_press_event_callback(GtkWidget *widget,
|
|
59333 |
+ GdkEventButton *event,
|
|
59334 |
+ gpointer client_data)
|
|
59335 |
+{
|
|
59336 |
+ DilloDoc *dd = (DilloDoc *) client_data;
|
|
59337 |
+ switch (event->button) {
|
|
59338 |
+ case 1:
|
|
59339 |
+ a_Tab_switch(dd);
|
|
59340 |
+ break;
|
|
59341 |
+ case 2:
|
|
59342 |
+ /* currently unused */
|
|
59343 |
+ DEBUG_MSG(DEBUG_EVENT, "You pressed button (%d) over a tab...\n", (gint) event->button);
|
|
59344 |
+ if (prefs.tab_close_middle_click)
|
|
59345 |
+ a_Tab_close(dd);
|
|
59346 |
+ break;
|
|
59347 |
+ case 3:
|
|
59348 |
+ /* popup tab options menu */
|
|
59349 |
+ if (dd->bw->menu_popup.over_tab)
|
|
59350 |
+ gtk_widget_destroy(dd->bw->menu_popup.over_tab);
|
|
59351 |
+ dd->bw->menu_popup.over_tab = a_Menu_popup_tab_new(dd);
|
|
59352 |
+ gtk_menu_popup(GTK_MENU(dd->bw->menu_popup.over_tab), NULL, NULL,
|
|
59353 |
+ NULL, NULL, event->button, event->time);
|
|
59354 |
+ break;
|
|
59355 |
+ default:
|
|
59356 |
+ /* weird pointer with more than 3 buttons, ignore */
|
|
59357 |
+ DEBUG_MSG(DEBUG_EVENT, "You pressed button (%d) over a tab...\n", (gint) event->button);
|
|
59358 |
+ break;
|
|
59359 |
+ }
|
|
59360 |
+}
|
|
59361 |
+
|
|
59362 |
+/*
|
|
59363 |
+ * callback for tab switch. This just calls a_Tab_switch for the docwin
|
|
59364 |
+ * passed as page
|
|
59365 |
+ */
|
|
59366 |
+void
|
|
59367 |
+Tab_switch_callback(GtkWidget *tabbrowser,
|
|
59368 |
+ GtkNotebookPage *page,
|
|
59369 |
+ gint page_num,
|
|
59370 |
+ gpointer client_data)
|
|
59371 |
+{
|
|
59372 |
+ DilloDoc *dd;
|
|
59373 |
+ GtkWidget *docwin;
|
|
59374 |
+
|
|
59375 |
+ /* the notebook page contains a box, which contains the docwin as its first child
|
|
59376 |
+ * hence this hairy function... */
|
|
59377 |
+ docwin = g_list_nth_data(gtk_container_children(GTK_CONTAINER(gtk_notebook_get_nth_page(GTK_NOTEBOOK(tabbrowser), page_num))), 0);
|
|
59378 |
+ dd = a_Doc_get_by_docwin(docwin);
|
|
59379 |
+
|
|
59380 |
+ if(dd)
|
|
59381 |
+ a_Tab_switch(dd);
|
|
59382 |
+}
|
|
59383 |
+
|
|
59384 |
+/*
|
|
59385 |
+ * callback for tab add
|
|
59386 |
+ */
|
|
59387 |
+void
|
|
59388 |
+Tab_add_callback(GtkContainer *container,
|
|
59389 |
+ GtkWidget *widget,
|
|
59390 |
+ gpointer client_data)
|
|
59391 |
+{
|
|
59392 |
+ DEBUG_MSG(DEBUG_EVENT, "I am the tab_add callback in src/tab.c!\n");
|
|
59393 |
+}
|
|
59394 |
+
|
|
59395 |
+/*
|
|
59396 |
+ * callback for tab remove
|
|
59397 |
+ */
|
|
59398 |
+void
|
|
59399 |
+Tab_remove_callback(GtkContainer *container,
|
|
59400 |
+ GtkWidget *widget,
|
|
59401 |
+ gpointer client_data)
|
|
59402 |
+{
|
|
59403 |
+ DEBUG_MSG(DEBUG_EVENT, "I am the tab remove callback, in src/tab.c!\n");
|
|
59404 |
+}
|
|
59405 |
+
|
|
59406 |
+/*
|
|
59407 |
+ * callback for tab browser destroy
|
|
59408 |
+ */
|
|
59409 |
+void
|
|
59410 |
+Tab_browser_destroy_callback(GtkContainer *container,
|
|
59411 |
+ GtkWidget *widget,
|
|
59412 |
+ gpointer client_data)
|
|
59413 |
+{
|
|
59414 |
+ DEBUG_MSG(DEBUG_EVENT, "I am the tab browser destroy callback, in src/tab.c!\n");
|
|
59415 |
+}
|
|
59416 |
+
|
|
59417 |
+/* Public functions */
|
|
59418 |
+
|
|
59419 |
+/*
|
|
59420 |
+ * return a new tab browser
|
|
59421 |
+ */
|
|
59422 |
+GtkContainer *
|
|
59423 |
+a_Tab_browser_new(BrowserWindow *bw)
|
|
59424 |
+{
|
|
59425 |
+ GtkRequisition *req;
|
|
59426 |
+ GtkWidget *label;
|
|
59427 |
+ GtkNotebook *tabbrowser;
|
|
59428 |
+
|
|
59429 |
+ /* try to calulate the average width of a character in a label
|
|
59430 |
+ * in the current context. This is something of a hack...
|
|
59431 |
+ */
|
|
59432 |
+ req = g_new0(GtkRequisition, 1);
|
|
59433 |
+ label = gtk_label_new(D_QUICK_BROWN_FOX);
|
|
59434 |
+ gtk_widget_show(label);
|
|
59435 |
+ gtk_widget_size_request(GTK_WIDGET(label), req);
|
|
59436 |
+ bw->tab_label_average_character_width = (gfloat) ((gfloat) req->width / (gfloat) strlen(GTK_LABEL(label)->label));
|
|
59437 |
+ g_free(req);
|
|
59438 |
+
|
|
59439 |
+ /* Add tabbrowser */
|
|
59440 |
+ tabbrowser = GTK_NOTEBOOK(gtk_notebook_new());
|
|
59441 |
+ gtk_notebook_set_show_border(GTK_NOTEBOOK(tabbrowser), FALSE);
|
|
59442 |
+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(tabbrowser), prefs.tab_bar_scroller);
|
|
59443 |
+ gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(tabbrowser), prefs.tab_bar_homogeneous);
|
|
59444 |
+ gtk_signal_connect_after(GTK_OBJECT(tabbrowser),
|
|
59445 |
+ "switch_page",
|
|
59446 |
+ GTK_SIGNAL_FUNC(Tab_switch_callback),
|
|
59447 |
+ (gpointer) bw);
|
|
59448 |
+
|
|
59449 |
+ gtk_signal_connect_after(GTK_OBJECT(tabbrowser),
|
|
59450 |
+ "add",
|
|
59451 |
+ GTK_SIGNAL_FUNC(Tab_add_callback),
|
|
59452 |
+ (gpointer) bw);
|
|
59453 |
+
|
|
59454 |
+ gtk_signal_connect(GTK_OBJECT(tabbrowser),
|
|
59455 |
+ "remove",
|
|
59456 |
+ GTK_SIGNAL_FUNC(Tab_remove_callback),
|
|
59457 |
+ (gpointer) bw);
|
|
59458 |
+ /* commented out, currently not in use...
|
|
59459 |
+ gtk_signal_connect(GTK_OBJECT(tabbrowser),
|
|
59460 |
+ "destroy",
|
|
59461 |
+ GTK_SIGNAL_FUNC(Tab_browser_destroy_callback),
|
|
59462 |
+ (gpointer) bw);
|
|
59463 |
+ */
|
|
59464 |
+
|
|
59465 |
+ return GTK_CONTAINER(tabbrowser);
|
|
59466 |
+}
|
|
59467 |
+
|
|
59468 |
+/*
|
|
59469 |
+ * switch tab, update interface
|
|
59470 |
+ */
|
|
59471 |
+void
|
|
59472 |
+a_Tab_switch(DilloDoc *dd)
|
|
59473 |
+{
|
|
59474 |
+ a_Interface_findtext_dialog_close();
|
|
59475 |
+ a_Dw_tooltip_count_reset ();
|
|
59476 |
+
|
|
59477 |
+ /* set bw's current root document */
|
|
59478 |
+ dd->bw->dd = a_Doc_get_root(dd);
|
|
59479 |
+
|
|
59480 |
+ /* add the browser window's full_screen_off_button to the dd's
|
|
59481 |
+ * docwin. This button is owned by the window (this makes it easier
|
|
59482 |
+ * to move tabs between windows, if needed), so it needs to
|
|
59483 |
+ * be moved from tab to tab when the tab becomes current (as
|
|
59484 |
+ * GTK does not allow a widget to have more than one parent).
|
|
59485 |
+ *
|
|
59486 |
+ * XXX:HACK
|
|
59487 |
+ */
|
|
59488 |
+ if (GTK_WIDGET(dd->bw->full_screen_off_button)->parent != dd->docwin) {
|
|
59489 |
+ /* keep a ref to the widget to keep it alive in transit... */
|
|
59490 |
+ gtk_object_ref(GTK_OBJECT(dd->bw->full_screen_off_button));
|
|
59491 |
+ if (GTK_WIDGET(dd->bw->full_screen_off_button)->parent)
|
|
59492 |
+ gtk_container_remove(GTK_CONTAINER(GTK_WIDGET(dd->bw->full_screen_off_button)->parent),
|
|
59493 |
+ GTK_WIDGET(dd->bw->full_screen_off_button));
|
|
59494 |
+ a_Dw_gtk_scrolled_window_add_gadget(GTK_DW_SCROLLED_WINDOW (dd->docwin),
|
|
59495 |
+ dd->bw->full_screen_off_button);
|
|
59496 |
+ /* ref is no longer needed, discard it... */
|
|
59497 |
+ gtk_object_unref(GTK_OBJECT(dd->bw->full_screen_off_button));
|
|
59498 |
+
|
|
59499 |
+ /* XXX:HACK the docwin does not show (or raise?) the widget when needed... */
|
|
59500 |
+ if(GTK_WIDGET_VISIBLE(dd->bw->full_screen_off_button)) {
|
|
59501 |
+ gtk_widget_hide(dd->bw->full_screen_off_button);
|
|
59502 |
+ gtk_widget_show(dd->bw->full_screen_off_button);
|
|
59503 |
+ }
|
|
59504 |
+ }
|
|
59505 |
+
|
|
59506 |
+ /* update progress bar and adjust button sensitivity */
|
|
59507 |
+ a_Doc_progress_update(dd);
|
|
59508 |
+
|
|
59509 |
+ /* adjust tab specific interface elements */
|
|
59510 |
+ if (dd->nav_stack_ptr != -1)
|
|
59511 |
+ /* this tab has a document loaded, set values accordingly */
|
|
59512 |
+ {
|
|
59513 |
+ a_Interface_set_page_title(dd->bw, (gchar *) a_History_get_title(NAV_TOP(dd)));
|
|
59514 |
+ a_Interface_set_location_text(dd->bw,URL_STR_(a_History_get_url(NAV_TOP(dd))));
|
|
59515 |
+ } else {
|
|
59516 |
+ /* no document loaded in tab, use default values */
|
|
59517 |
+ gchar *title = a_I18n_locale_to_DILLO_CHARSET(_("(Untitled)"));
|
|
59518 |
+ a_Interface_set_page_title(dd->bw, title);
|
|
59519 |
+ g_free(title);
|
|
59520 |
+ a_Interface_set_location_text(dd->bw,"");
|
|
59521 |
+ }
|
|
59522 |
+
|
|
59523 |
+ /* show tab */
|
|
59524 |
+ gtk_notebook_set_page(GTK_NOTEBOOK(dd->bw->container),
|
|
59525 |
+ gtk_notebook_page_num(GTK_NOTEBOOK(dd->bw->container),
|
|
59526 |
+ GTK_WIDGET(dd->docwin)->parent));
|
|
59527 |
+
|
|
59528 |
+ /* set focus to docwin */
|
|
59529 |
+ gtk_widget_grab_focus(GTK_BIN(dd->docwin)->child);
|
|
59530 |
+}
|
|
59531 |
+
|
|
59532 |
+/*
|
|
59533 |
+ * set visibility of tab bar
|
|
59534 |
+ */
|
|
59535 |
+void
|
|
59536 |
+a_Tab_visibility_update(BrowserWindow *bw)
|
|
59537 |
+{
|
|
59538 |
+ gboolean hide_tabs;
|
|
59539 |
+
|
|
59540 |
+ g_return_if_fail(bw != NULL);
|
|
59541 |
+
|
|
59542 |
+ /* this gets called in the tab switching code, which in turn gets called when
|
|
59543 |
+ * a tab is deleted. This includes the final tab, which in turn causes the main_window
|
|
59544 |
+ * to be destroyed, which of course includes the tabbrowser... So, check first if
|
|
59545 |
+ * there is still a tabbrowser around to update before doing anything else...
|
|
59546 |
+ */
|
|
59547 |
+ if(!GTK_IS_CONTAINER(bw->container))
|
|
59548 |
+ return;
|
|
59549 |
+
|
|
59550 |
+ /* HIDE tab bar IF
|
|
59551 |
+ * - there is only one tab left AND the preference tab_bar_show_single_tab
|
|
59552 |
+ * is set to NO
|
|
59553 |
+ * OR
|
|
59554 |
+ * - when using fullscreen AND the preference tab_bar_show_fullscreen
|
|
59555 |
+ * is set to NO
|
|
59556 |
+ * OTHERWISE
|
|
59557 |
+ * SHOW tab bar
|
|
59558 |
+ */
|
|
59559 |
+ hide_tabs = ((g_list_length(gtk_container_children(GTK_CONTAINER(bw->container))) == 1)
|
|
59560 |
+ && (!prefs.tab_bar_show_single_tab));
|
|
59561 |
+ hide_tabs |= (bw->fullwindow
|
|
59562 |
+ && (!prefs.tab_bar_show_fullscreen));
|
|
59563 |
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(bw->container), !hide_tabs);
|
|
59564 |
+}
|
|
59565 |
+
|
|
59566 |
+
|
|
59567 |
+/*
|
|
59568 |
+ * close a specific browser tab,
|
|
59569 |
+ * close window if no tabs left
|
|
59570 |
+ *
|
|
59571 |
+ * NOTE: this will destroy the document which
|
|
59572 |
+ * was displayed in the tab, through the destroy callback
|
|
59573 |
+ * for the docwin (in src/doc.c). If documents have to
|
|
59574 |
+ * be moved between tabs or frames, unparent the
|
|
59575 |
+ * pagemarks menu and reparent dd->docwin before calling
|
|
59576 |
+ * this function!
|
|
59577 |
+ */
|
|
59578 |
+void
|
|
59579 |
+a_Tab_close(DilloDoc *dd)
|
|
59580 |
+{
|
|
59581 |
+ gint page_num;
|
|
59582 |
+ BrowserWindow *bw = dd->bw;
|
|
59583 |
+
|
|
59584 |
+ g_return_if_fail (dd != NULL);
|
|
59585 |
+
|
|
59586 |
+ a_Interface_findtext_dialog_close();
|
|
59587 |
+
|
|
59588 |
+ page_num = gtk_notebook_page_num(GTK_NOTEBOOK(bw->container),
|
|
59589 |
+ GTK_WIDGET(dd->docwin)->parent);
|
|
59590 |
+
|
|
59591 |
+ /* left-to-right tab deletion: if this is the current page, show next page */
|
|
59592 |
+ if(gtk_notebook_get_current_page(GTK_NOTEBOOK(bw->container)) == page_num)
|
|
59593 |
+ gtk_notebook_next_page(GTK_NOTEBOOK(bw->container));
|
|
59594 |
+
|
|
59595 |
+ /* this will destroy dd->docwin (and the DilloDoc)
|
|
59596 |
+ * if there are no reference left to it */
|
|
59597 |
+ gtk_notebook_remove_page(GTK_NOTEBOOK(bw->container), page_num);
|
|
59598 |
+
|
|
59599 |
+ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(bw->container)) == -1)
|
|
59600 |
+ {
|
|
59601 |
+ /* destroying the main window causes its destroy
|
|
59602 |
+ callback to be fired. This takes down the
|
|
59603 |
+ rest of the BrowserWindow */
|
|
59604 |
+ gtk_widget_destroy(GTK_WIDGET(bw->main_window));
|
|
59605 |
+ }
|
|
59606 |
+
|
|
59607 |
+ a_Tab_visibility_update(bw);
|
|
59608 |
+}
|
|
59609 |
+
|
|
59610 |
+/*
|
|
59611 |
+ * Add a tab (containing a new DilloDoc) to a browser window
|
|
59612 |
+ */
|
|
59613 |
+void
|
|
59614 |
+a_Tab_new(BrowserWindow *bw)
|
|
59615 |
+{
|
|
59616 |
+ DilloDoc *dd;
|
|
59617 |
+
|
|
59618 |
+ g_return_if_fail (bw != NULL);
|
|
59619 |
+
|
|
59620 |
+ dd = a_Doc_new();
|
|
59621 |
+ a_Tab_add(bw, dd);
|
|
59622 |
+
|
|
59623 |
+ /* always show new tabs, even when background loading */
|
|
59624 |
+ a_Tab_switch(dd);
|
|
59625 |
+
|
|
59626 |
+ /* set focus to url bar */
|
|
59627 |
+ gtk_widget_grab_focus(dd->bw->location);
|
|
59628 |
+}
|
|
59629 |
+
|
|
59630 |
+
|
|
59631 |
+/*
|
|
59632 |
+ * Add a tab (containing an existing DilloDoc) to a browser window
|
|
59633 |
+ */
|
|
59634 |
+void
|
|
59635 |
+a_Tab_add(BrowserWindow *bw, DilloDoc *dd)
|
|
59636 |
+{
|
|
59637 |
+ GString *tab_title;
|
|
59638 |
+ GtkWidget *tab_label, *tab_label_event_box, *box;
|
|
59639 |
+ GtkPackType *pack_type = g_new0(GtkPackType, 1);
|
|
59640 |
+
|
|
59641 |
+ g_return_if_fail (bw != NULL && dd != NULL);
|
|
59642 |
+
|
|
59643 |
+ a_Doc_set_browserwindow(dd, bw);
|
|
59644 |
+
|
|
59645 |
+ if (dd->nav_stack_ptr != -1)
|
|
59646 |
+ {
|
|
59647 |
+ tab_title = g_string_new(a_History_get_title(NAV_TOP(dd)));
|
|
59648 |
+ } else {
|
|
59649 |
+ tab_title = g_string_new(_("(Untitled)"));
|
|
59650 |
+ }
|
|
59651 |
+
|
|
59652 |
+ tab_label_event_box = gtk_event_box_new();
|
|
59653 |
+ tab_label = gtk_label_new(tab_title->str);
|
|
59654 |
+ gtk_widget_show(tab_label);
|
|
59655 |
+ gtk_container_add(GTK_CONTAINER(tab_label_event_box), tab_label);
|
|
59656 |
+ box = gtk_hbox_new(TRUE, 0);
|
|
59657 |
+ gtk_container_set_border_width(GTK_CONTAINER(box), 0);
|
|
59658 |
+ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(dd->docwin), TRUE, TRUE, 0);
|
|
59659 |
+ if(dd->frameset)
|
|
59660 |
+ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(dd->frameset), TRUE, TRUE, 0);
|
|
59661 |
+ gtk_widget_show(box);
|
|
59662 |
+ gtk_notebook_append_page(GTK_NOTEBOOK(bw->container), box, tab_label_event_box);
|
|
59663 |
+
|
|
59664 |
+ /* add tooltip with full title. This has to be attached to the event box,
|
|
59665 |
+ * since label widgets are windowless and hence can not receive events */
|
|
59666 |
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(dd->bw->tooltips),
|
|
59667 |
+ GTK_WIDGET(tab_label_event_box),
|
|
59668 |
+ tab_title->str,
|
|
59669 |
+ tab_title->str);
|
|
59670 |
+
|
|
59671 |
+ /* make sure the tab labels adjust their size according to available space */
|
|
59672 |
+ gtk_signal_connect_after(GTK_OBJECT(tab_label),
|
|
59673 |
+ "size_allocate",
|
|
59674 |
+ GTK_SIGNAL_FUNC(Tab_label_size_request_callback),
|
|
59675 |
+ (gpointer) dd);
|
|
59676 |
+
|
|
59677 |
+ /* catch button press events for showing menu, etc. This has to be attached
|
|
59678 |
+ * to the event box, since label widgets are windowless and hence can not
|
|
59679 |
+ * receive events */
|
|
59680 |
+ gtk_signal_connect_after(GTK_OBJECT(tab_label_event_box),
|
|
59681 |
+ "button_press_event",
|
|
59682 |
+ GTK_SIGNAL_FUNC(Tab_label_button_press_event_callback),
|
|
59683 |
+ (gpointer) dd);
|
|
59684 |
+
|
|
59685 |
+ g_string_free(tab_title, TRUE);
|
|
59686 |
+ gtk_notebook_query_tab_label_packing(GTK_NOTEBOOK(bw->container), GTK_WIDGET(dd->docwin)->parent, NULL, NULL, pack_type);
|
|
59687 |
+ gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(bw->container), GTK_WIDGET(dd->docwin)->parent, TRUE, TRUE, *pack_type);
|
|
59688 |
+ g_free(pack_type);
|
|
59689 |
+ a_Tab_visibility_update(bw);
|
|
59690 |
+}
|
|
59691 |
+
|
|
59692 |
+
|
|
59693 |
+/*
|
|
59694 |
+ * set tab title
|
|
59695 |
+ * also sets window title if this tab is the current tab
|
|
59696 |
+ */
|
|
59697 |
+void
|
|
59698 |
+a_Tab_title_set(DilloDoc *dd, gchar *title)
|
|
59699 |
+{
|
|
59700 |
+ GtkWidget *tab_label;
|
|
59701 |
+ gchar *title_enc;
|
|
59702 |
+
|
|
59703 |
+ g_return_if_fail (dd != NULL && title != NULL);
|
|
59704 |
+
|
|
59705 |
+ /* set tooltip on tab label container (a GtkEventBox), and queue a resize
|
|
59706 |
+ * for the label itself so the title is redrawn */
|
|
59707 |
+ tab_label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(dd->bw->container),GTK_WIDGET(dd->docwin)->parent);
|
|
59708 |
+ title_enc = a_I18n_DW_CHARSET_from_DILLO_CHARSET(title, -1);
|
|
59709 |
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(dd->bw->tooltips),
|
|
59710 |
+ GTK_WIDGET(tab_label),
|
|
59711 |
+ title_enc,
|
|
59712 |
+ title_enc);
|
|
59713 |
+ g_free(title_enc);
|
|
59714 |
+
|
|
59715 |
+ gtk_widget_queue_resize(GTK_WIDGET(GTK_BIN(tab_label)->child));
|
|
59716 |
+
|
|
59717 |
+ /* if this is the current tab, set window title */
|
|
59718 |
+ if (dd->bw->dd == dd)
|
|
59719 |
+ a_Interface_set_page_title(dd->bw, title);
|
|
59720 |
+}
|
|
59721 |
+
|
|
59722 |
+#endif /* !DISABLE_TABS */
|
|
59723 |
+
|
|
59724 |
+/* vim: set ts=3 sw=3 sts=3 expandtab:*/
|
|
59725 |
diff -pruN dillo-0.8.6/src/tab.h dillo-0.8.6-i18n-misc-20070916/src/tab.h
|
|
59726 |
--- dillo-0.8.6/src/tab.h 1970-01-01 09:00:00.000000000 +0900
|
|
59727 |
+++ dillo-0.8.6-i18n-misc-20070916/src/tab.h 2006-05-16 01:21:09.000000000 +0900
|
|
59728 |
@@ -0,0 +1,22 @@
|
|
59729 |
+#ifndef __TAB_H__
|
|
59730 |
+#define __TAB_H__
|
|
59731 |
+
|
|
59732 |
+#ifndef DISABLE_TABS
|
|
59733 |
+#include "browser.h"
|
|
59734 |
+
|
|
59735 |
+/* this string is used to calculate the average width of a
|
|
59736 |
+ * character in a GTK_LABEL in the current context.
|
|
59737 |
+ */
|
|
59738 |
+#define D_QUICK_BROWN_FOX "The Quick Brown Fox Jumped Over The Lazy Dog"
|
|
59739 |
+
|
|
59740 |
+GtkContainer *
|
|
59741 |
+a_Tab_browser_new(BrowserWindow *bw);
|
|
59742 |
+void a_Tab_new(BrowserWindow *bw);
|
|
59743 |
+void a_Tab_close(DilloDoc *dd);
|
|
59744 |
+void a_Tab_add(BrowserWindow *bw, DilloDoc *dd);
|
|
59745 |
+void a_Tab_switch(DilloDoc *dd);
|
|
59746 |
+void a_Tab_title_set(DilloDoc *dd, gchar *title);
|
|
59747 |
+void a_Tab_visibility_update(BrowserWindow *bw);
|
|
59748 |
+
|
|
59749 |
+#endif /* !DISABLE_TABS */
|
|
59750 |
+#endif /* __TAB_H__ */
|
|
59751 |
diff -pruN dillo-0.8.6/src/url.c dillo-0.8.6-i18n-misc-20070916/src/url.c
|
|
59752 |
--- dillo-0.8.6/src/url.c 2006-01-03 03:11:47.000000000 +0900
|
|
59753 |
+++ dillo-0.8.6-i18n-misc-20070916/src/url.c 2006-06-19 01:03:28.000000000 +0900
|
|
59754 |
@@ -70,7 +70,8 @@ gchar *a_Url_str(const DilloUrl *u)
|
|
59755 |
url->fragment ? url->fragment : "");
|
|
59756 |
}
|
|
59757 |
|
|
59758 |
- return url->url_string->str;
|
|
59759 |
+ if(url->url_string) return url->url_string->str;
|
|
59760 |
+ return NULL;
|
|
59761 |
}
|
|
59762 |
|
|
59763 |
/*
|
|
59764 |
@@ -172,6 +173,8 @@ void a_Url_free(DilloUrl *url)
|
|
59765 |
g_free((gchar *)url->buffer);
|
|
59766 |
g_free((gchar *)url->data);
|
|
59767 |
g_free((gchar *)url->alt);
|
|
59768 |
+ g_free((gchar *)url->target);
|
|
59769 |
+ g_free((gchar *)url->referer);
|
|
59770 |
g_free(url);
|
|
59771 |
}
|
|
59772 |
}
|
|
59773 |
@@ -180,7 +183,7 @@ void a_Url_free(DilloUrl *url)
|
|
59774 |
* Resolve the URL as RFC2396 suggests.
|
|
59775 |
*/
|
|
59776 |
static GString *Url_resolve_relative(const gchar *RelStr,
|
|
59777 |
- DilloUrl *BaseUrlPar,
|
|
59778 |
+ DilloUrl **BaseUrlPar,
|
|
59779 |
const gchar *BaseStr)
|
|
59780 |
{
|
|
59781 |
gchar *p, *s, *e;
|
|
59782 |
@@ -191,9 +194,9 @@ static GString *Url_resolve_relative(con
|
|
59783 |
/* parse relative URL */
|
|
59784 |
RelUrl = Url_object_new(RelStr);
|
|
59785 |
|
|
59786 |
- if (BaseUrlPar) {
|
|
59787 |
- BaseUrl = BaseUrlPar;
|
|
59788 |
- } else if (RelUrl->scheme == NULL) {
|
|
59789 |
+ if (*BaseUrlPar) {
|
|
59790 |
+ BaseUrl = *BaseUrlPar;
|
|
59791 |
+ } else {
|
|
59792 |
/* only required when there's no <scheme> in RelStr */
|
|
59793 |
BaseUrl = Url_object_new(BaseStr);
|
|
59794 |
}
|
|
59795 |
@@ -302,8 +305,7 @@ static GString *Url_resolve_relative(con
|
|
59796 |
done:
|
|
59797 |
g_string_free(Path, TRUE);
|
|
59798 |
a_Url_free(RelUrl);
|
|
59799 |
- if (BaseUrl != BaseUrlPar)
|
|
59800 |
- a_Url_free(BaseUrl);
|
|
59801 |
+ *BaseUrlPar = BaseUrl;
|
|
59802 |
return SolvedUrl;
|
|
59803 |
}
|
|
59804 |
|
|
59805 |
@@ -323,6 +325,7 @@ done:
|
|
59806 |
* flags = 0
|
|
59807 |
* data = NULL
|
|
59808 |
* alt = NULL
|
|
59809 |
+ * target = NULL
|
|
59810 |
* ismap_url_len = 0
|
|
59811 |
* scrolling_position = 0
|
|
59812 |
* }
|
|
59813 |
@@ -332,7 +335,7 @@ done:
|
|
59814 |
DilloUrl* a_Url_new(const gchar *url_str, const gchar *base_url,
|
|
59815 |
gint flags, gint32 posx, gint32 posy)
|
|
59816 |
{
|
|
59817 |
- DilloUrl *url;
|
|
59818 |
+ DilloUrl *url, *BaseUrl = NULL;
|
|
59819 |
gchar *urlstring, *p, *new_str = NULL;
|
|
59820 |
GString *SolvedUrl;
|
|
59821 |
gint n_ic, n_ic_spc;
|
|
59822 |
@@ -368,19 +371,27 @@ DilloUrl* a_Url_new(const gchar *url_str
|
|
59823 |
}
|
|
59824 |
|
|
59825 |
/* Resolve the URL */
|
|
59826 |
- SolvedUrl = Url_resolve_relative(urlstring, NULL, base_url);
|
|
59827 |
+ SolvedUrl = Url_resolve_relative(urlstring, &BaseUrl, base_url);
|
|
59828 |
DEBUG_MSG(2, "SolvedUrl = %s\n", SolvedUrl->str);
|
|
59829 |
- g_return_val_if_fail (SolvedUrl != NULL, NULL);
|
|
59830 |
+ if (!SolvedUrl) {
|
|
59831 |
+ a_Url_free(BaseUrl);
|
|
59832 |
+ return NULL;
|
|
59833 |
+ }
|
|
59834 |
|
|
59835 |
/* Fill url data */
|
|
59836 |
url = Url_object_new(SolvedUrl->str);
|
|
59837 |
+ if (BaseUrl && !URL_STRCAMP_I_EQ(URL_HOST_(url), URL_HOST_(BaseUrl))) {
|
|
59838 |
+ flags |= URL_OnOtherHost;
|
|
59839 |
+ }
|
|
59840 |
url->url_string = SolvedUrl;
|
|
59841 |
url->flags = flags;
|
|
59842 |
url->scrolling_position_x = posx;
|
|
59843 |
url->scrolling_position_y = posy;
|
|
59844 |
url->illegal_chars = n_ic;
|
|
59845 |
url->illegal_chars_spc = n_ic_spc;
|
|
59846 |
-
|
|
59847 |
+ url->referer = NULL;//g_strdup(base_url);
|
|
59848 |
+ a_Url_free(BaseUrl);
|
|
59849 |
+
|
|
59850 |
g_free(new_str);
|
|
59851 |
return url;
|
|
59852 |
}
|
|
59853 |
@@ -401,11 +412,13 @@ DilloUrl* a_Url_dup(const DilloUrl *ori)
|
|
59854 |
url->flags = ori->flags;
|
|
59855 |
url->data = g_strdup(ori->data);
|
|
59856 |
url->alt = g_strdup(ori->alt);
|
|
59857 |
+ url->target = g_strdup(ori->target);
|
|
59858 |
url->ismap_url_len = ori->ismap_url_len;
|
|
59859 |
url->scrolling_position_x = ori->scrolling_position_x;
|
|
59860 |
url->scrolling_position_y = ori->scrolling_position_y;
|
|
59861 |
url->illegal_chars = ori->illegal_chars;
|
|
59862 |
url->illegal_chars_spc = ori->illegal_chars_spc;
|
|
59863 |
+ url->referer = g_strdup(ori->referer);
|
|
59864 |
|
|
59865 |
return url;
|
|
59866 |
}
|
|
59867 |
@@ -465,6 +478,18 @@ void a_Url_set_alt(DilloUrl *u, const gc
|
|
59868 |
}
|
|
59869 |
|
|
59870 |
/*
|
|
59871 |
+ * Set DilloUrl target (used to target link at specific frame or window)
|
|
59872 |
+ */
|
|
59873 |
+void a_Url_set_target(DilloUrl *u, const gchar *target)
|
|
59874 |
+{
|
|
59875 |
+ if (u) {
|
|
59876 |
+ if (u->target)
|
|
59877 |
+ g_free((gchar *)u->target);
|
|
59878 |
+ u->target = g_strdup(target);
|
|
59879 |
+ }
|
|
59880 |
+}
|
|
59881 |
+
|
|
59882 |
+/*
|
|
59883 |
* Set DilloUrl scrolling position
|
|
59884 |
*/
|
|
59885 |
void a_Url_set_pos(DilloUrl *u, gint32 posx, gint32 posy)
|
|
59886 |
@@ -476,6 +501,17 @@ void a_Url_set_pos(DilloUrl *u, gint32 p
|
|
59887 |
}
|
|
59888 |
|
|
59889 |
/*
|
|
59890 |
+ * Set DilloUrl referer URL
|
|
59891 |
+ */
|
|
59892 |
+void a_Url_set_referer(DilloUrl *u, DilloUrl *ref)
|
|
59893 |
+{
|
|
59894 |
+ if (u && ref) {
|
|
59895 |
+ g_free((gchar *)u->referer);
|
|
59896 |
+ u->referer = g_strdup(a_Url_str(ref));
|
|
59897 |
+ }
|
|
59898 |
+}
|
|
59899 |
+
|
|
59900 |
+/*
|
|
59901 |
* Set DilloUrl ismap coordinates
|
|
59902 |
* (this is optimized for not hogging the CPU)
|
|
59903 |
*/
|
|
59904 |
@@ -612,3 +648,4 @@ gchar *a_Url_string_strip_delimiters(con
|
|
59905 |
}
|
|
59906 |
return new_str;
|
|
59907 |
}
|
|
59908 |
+
|
|
59909 |
diff -pruN dillo-0.8.6/src/url.h dillo-0.8.6-i18n-misc-20070916/src/url.h
|
|
59910 |
--- dillo-0.8.6/src/url.h 2006-01-03 03:39:40.000000000 +0900
|
|
59911 |
+++ dillo-0.8.6-i18n-misc-20070916/src/url.h 2006-05-16 01:21:09.000000000 +0900
|
|
59912 |
@@ -41,26 +41,33 @@
|
|
59913 |
#define URL_ReloadIncomplete (1 << 9)
|
|
59914 |
#define URL_SpamSafe (1 << 10)
|
|
59915 |
|
|
59916 |
+#define URL_MustCache (1 << 11)
|
|
59917 |
+#define URL_IsImage (1 << 12)
|
|
59918 |
+#define URL_OnOtherHost (1 << 13)
|
|
59919 |
+
|
|
59920 |
+
|
|
59921 |
/*
|
|
59922 |
* Access methods to fields inside DilloURL.
|
|
59923 |
* (non '_'-ended macros MUST use these for initialization sake)
|
|
59924 |
*/
|
|
59925 |
/* these MAY return NULL: */
|
|
59926 |
-#define URL_SCHEME_(u) u->scheme
|
|
59927 |
-#define URL_AUTHORITY_(u) u->authority
|
|
59928 |
-#define URL_PATH_(u) u->path
|
|
59929 |
-#define URL_QUERY_(u) u->query
|
|
59930 |
-#define URL_FRAGMENT_(u) u->fragment
|
|
59931 |
-#define URL_HOST_(u) a_Url_hostname(u)
|
|
59932 |
-#define URL_DATA_(u) u->data
|
|
59933 |
-#define URL_ALT_(u) u->alt
|
|
59934 |
-#define URL_STR_(u) a_Url_str(u)
|
|
59935 |
+#define URL_SCHEME_(u) u->scheme
|
|
59936 |
+#define URL_AUTHORITY_(u) u->authority
|
|
59937 |
+#define URL_PATH_(u) u->path
|
|
59938 |
+#define URL_QUERY_(u) u->query
|
|
59939 |
+#define URL_FRAGMENT_(u) u->fragment
|
|
59940 |
+#define URL_HOST_(u) a_Url_hostname(u)
|
|
59941 |
+#define URL_DATA_(u) u->data
|
|
59942 |
+#define URL_ALT_(u) u->alt
|
|
59943 |
+#define URL_STR_(u) a_Url_str(u)
|
|
59944 |
+#define URL_REFERER_(u) u->referer
|
|
59945 |
+#define URL_TARGET_(u) u->target
|
|
59946 |
/* these return an integer */
|
|
59947 |
-#define URL_PORT_(u) (URL_HOST(u) ? u->port : u->port)
|
|
59948 |
-#define URL_FLAGS_(u) u->flags
|
|
59949 |
-#define URL_POSX_(u) u->scrolling_position_x
|
|
59950 |
-#define URL_POSY_(u) u->scrolling_position_y
|
|
59951 |
-#define URL_ILLEGAL_CHARS_(u) url->illegal_chars
|
|
59952 |
+#define URL_PORT_(u) (URL_HOST(u) ? u->port : u->port)
|
|
59953 |
+#define URL_FLAGS_(u) u->flags
|
|
59954 |
+#define URL_POSX_(u) u->scrolling_position_x
|
|
59955 |
+#define URL_POSY_(u) u->scrolling_position_y
|
|
59956 |
+#define URL_ILLEGAL_CHARS_(u) url->illegal_chars
|
|
59957 |
#define URL_ILLEGAL_CHARS_SPC_(u) url->illegal_chars_spc
|
|
59958 |
|
|
59959 |
/*
|
|
59960 |
@@ -68,22 +75,24 @@
|
|
59961 |
* When the "empty" and "undefined" concepts of RFC-2396 are irrelevant to
|
|
59962 |
* the caller, and a string is required, use these methods instead:
|
|
59963 |
*/
|
|
59964 |
-#define NPTR2STR(p) ((p) ? (p) : "")
|
|
59965 |
-#define URL_SCHEME(u) NPTR2STR(URL_SCHEME_(u))
|
|
59966 |
-#define URL_AUTHORITY(u) NPTR2STR(URL_AUTHORITY_(u))
|
|
59967 |
-#define URL_PATH(u) NPTR2STR(URL_PATH_(u))
|
|
59968 |
-#define URL_QUERY(u) NPTR2STR(URL_QUERY_(u))
|
|
59969 |
-#define URL_FRAGMENT(u) NPTR2STR(URL_FRAGMENT_(u))
|
|
59970 |
-#define URL_HOST(u) NPTR2STR(URL_HOST_(u))
|
|
59971 |
-#define URL_DATA(u) NPTR2STR(URL_DATA_(u))
|
|
59972 |
-#define URL_ALT(u) NPTR2STR(URL_ALT_(u))
|
|
59973 |
-#define URL_STR(u) NPTR2STR(URL_STR_(u))
|
|
59974 |
-#define URL_PORT(u) URL_PORT_(u)
|
|
59975 |
-#define URL_FLAGS(u) URL_FLAGS_(u)
|
|
59976 |
-#define URL_POSX(u) URL_POSX_(u)
|
|
59977 |
-#define URL_POSY(u) URL_POSY_(u)
|
|
59978 |
-#define URL_ILLEGAL_CHARS(u) URL_ILLEGAL_CHARS_(u)
|
|
59979 |
+#define NPTR2STR(p) ((p) ? (p) : "")
|
|
59980 |
+#define URL_SCHEME(u) NPTR2STR(URL_SCHEME_(u))
|
|
59981 |
+#define URL_AUTHORITY(u) NPTR2STR(URL_AUTHORITY_(u))
|
|
59982 |
+#define URL_PATH(u) NPTR2STR(URL_PATH_(u))
|
|
59983 |
+#define URL_QUERY(u) NPTR2STR(URL_QUERY_(u))
|
|
59984 |
+#define URL_FRAGMENT(u) NPTR2STR(URL_FRAGMENT_(u))
|
|
59985 |
+#define URL_HOST(u) NPTR2STR(URL_HOST_(u))
|
|
59986 |
+#define URL_DATA(u) NPTR2STR(URL_DATA_(u))
|
|
59987 |
+#define URL_ALT(u) NPTR2STR(URL_ALT_(u))
|
|
59988 |
+#define URL_STR(u) NPTR2STR(URL_STR_(u))
|
|
59989 |
+#define URL_PORT(u) URL_PORT_(u)
|
|
59990 |
+#define URL_FLAGS(u) URL_FLAGS_(u)
|
|
59991 |
+#define URL_POSX(u) URL_POSX_(u)
|
|
59992 |
+#define URL_POSY(u) URL_POSY_(u)
|
|
59993 |
+#define URL_ILLEGAL_CHARS(u) URL_ILLEGAL_CHARS_(u)
|
|
59994 |
#define URL_ILLEGAL_CHARS_SPC(u) URL_ILLEGAL_CHARS_SPC_(u)
|
|
59995 |
+#define URL_REFERER(u) NPTR2STR(URL_REFERER_(u))
|
|
59996 |
+#define URL_TARGET(u) NPTR2STR(URL_TARGET_(u))
|
|
59997 |
|
|
59998 |
|
|
59999 |
|
|
60000 |
@@ -117,11 +126,13 @@ struct _DilloUrl {
|
|
60001 |
gint flags;
|
|
60002 |
const gchar *data; /* POST */
|
|
60003 |
const gchar *alt; /* "alt" text (used by image maps) */
|
|
60004 |
+ const gchar *target; /* target frame/window */
|
|
60005 |
gint ismap_url_len; /* Used by server side image maps */
|
|
60006 |
gint32 scrolling_position_x, scrolling_position_y;
|
|
60007 |
/* remember position of visited urls */
|
|
60008 |
gint illegal_chars; /* number of illegal chars */
|
|
60009 |
gint illegal_chars_spc; /* number of illegal space chars */
|
|
60010 |
+ const gchar *referer; /* The URL that refered to this one */
|
|
60011 |
};
|
|
60012 |
|
|
60013 |
|
|
60014 |
@@ -135,7 +146,9 @@ gint a_Url_cmp(const DilloUrl *A, const
|
|
60015 |
void a_Url_set_flags(DilloUrl *u, gint flags);
|
|
60016 |
void a_Url_set_data(DilloUrl *u, gchar *data);
|
|
60017 |
void a_Url_set_alt(DilloUrl *u, const gchar *alt);
|
|
60018 |
+void a_Url_set_target(DilloUrl *u, const gchar *target);
|
|
60019 |
void a_Url_set_pos(DilloUrl *u, gint32 posx, gint32 posy);
|
|
60020 |
+void a_Url_set_referer(DilloUrl *u, DilloUrl *ref);
|
|
60021 |
void a_Url_set_ismap_coords(DilloUrl *u, gchar *coord_str);
|
|
60022 |
gchar *a_Url_decode_hex_str(const gchar *str);
|
|
60023 |
gchar *a_Url_encode_hex_str(const gchar *str);
|
|
60024 |
diff -pruN dillo-0.8.6/src/web.c dillo-0.8.6-i18n-misc-20070916/src/web.c
|
|
60025 |
--- dillo-0.8.6/src/web.c 2005-10-28 01:20:15.000000000 +0900
|
|
60026 |
+++ dillo-0.8.6-i18n-misc-20070916/src/web.c 2006-05-16 01:21:09.000000000 +0900
|
|
60027 |
@@ -9,15 +9,18 @@
|
|
60028 |
* (at your option) any later version.
|
|
60029 |
*/
|
|
60030 |
|
|
60031 |
+#include <config.h>
|
|
60032 |
#include <stdio.h>
|
|
60033 |
#include <stdlib.h>
|
|
60034 |
#include <gtk/gtk.h>
|
|
60035 |
#include <math.h> /* for rint */
|
|
60036 |
|
|
60037 |
+#include "intl.h"
|
|
60038 |
#include "msg.h"
|
|
60039 |
#include "browser.h"
|
|
60040 |
-#include "nav.h"
|
|
60041 |
#include "interface.h"
|
|
60042 |
+#include "nav.h"
|
|
60043 |
+#include "doc.h"
|
|
60044 |
#include "IO/IO.h"
|
|
60045 |
#include "IO/mime.h"
|
|
60046 |
|
|
60047 |
@@ -27,7 +30,7 @@
|
|
60048 |
#include "prefs.h"
|
|
60049 |
#include "web.h"
|
|
60050 |
|
|
60051 |
-#define DEBUG_LEVEL 5
|
|
60052 |
+//#define DEBUG_LEVEL 5
|
|
60053 |
#include "debug.h"
|
|
60054 |
|
|
60055 |
/*
|
|
60056 |
@@ -45,12 +48,12 @@ gint a_Web_dispatch_by_type (const char
|
|
60057 |
CA_Callback_t *Call, void **Data)
|
|
60058 |
{
|
|
60059 |
DwWidget *dw = NULL;
|
|
60060 |
- DwStyle style_attrs, *style;
|
|
60061 |
- DwStyleFont font;
|
|
60062 |
+// DwStyle style_attrs, *style;
|
|
60063 |
+// DwStyleFont font;
|
|
60064 |
|
|
60065 |
DEBUG_MSG(1, "a_Web_dispatch_by_type\n");
|
|
60066 |
|
|
60067 |
- g_return_val_if_fail(Web->bw != NULL, -1);
|
|
60068 |
+ g_return_val_if_fail(Web->dd != NULL, -1);
|
|
60069 |
|
|
60070 |
if (Web->flags & WEB_RootUrl) {
|
|
60071 |
/* We have RootUrl! */
|
|
60072 |
@@ -58,46 +61,35 @@ gint a_Web_dispatch_by_type (const char
|
|
60073 |
if (dw == NULL)
|
|
60074 |
return -1;
|
|
60075 |
|
|
60076 |
- /* Set a style for the widget */
|
|
60077 |
- font.name = prefs.vw_fontname; /* must be defined */
|
|
60078 |
- font.size = rint(12.0 * prefs.font_factor);
|
|
60079 |
- font.weight = 400;
|
|
60080 |
- font.style = DW_STYLE_FONT_STYLE_NORMAL;
|
|
60081 |
-
|
|
60082 |
- a_Dw_style_init_values (&style_attrs, Web->bw->main_window->window);
|
|
60083 |
- a_Dw_style_box_set_val (&style_attrs.margin, 5);
|
|
60084 |
- style_attrs.font = a_Dw_style_font_new (&font);
|
|
60085 |
- style_attrs.color =
|
|
60086 |
- a_Dw_style_color_new (prefs.text_color, Web->bw->main_window->window);
|
|
60087 |
- style_attrs.background_color =
|
|
60088 |
- a_Dw_style_color_new (prefs.bg_color, Web->bw->main_window->window);
|
|
60089 |
- style = a_Dw_style_new (&style_attrs, Web->bw->main_window->window);
|
|
60090 |
- a_Dw_widget_set_style (dw, style);
|
|
60091 |
- a_Dw_style_unref (style);
|
|
60092 |
+ /* set widget style */
|
|
60093 |
+ a_Dw_widget_set_style(dw, Web->dd->style);
|
|
60094 |
|
|
60095 |
a_Dw_gtk_scrolled_window_set_dw(
|
|
60096 |
- GTK_DW_SCROLLED_WINDOW(Web->bw->docwin), dw);
|
|
60097 |
+ GTK_DW_SCROLLED_WINDOW(Web->dd->docwin), dw);
|
|
60098 |
|
|
60099 |
if (URL_POSX(Web->url) || URL_POSY(Web->url)) {
|
|
60100 |
a_Dw_gtk_scrolled_window_set_scrolling_position(
|
|
60101 |
- GTK_DW_SCROLLED_WINDOW(Web->bw->docwin),
|
|
60102 |
+ GTK_DW_SCROLLED_WINDOW(Web->dd->docwin),
|
|
60103 |
URL_POSX(Web->url), URL_POSY(Web->url));
|
|
60104 |
} else {
|
|
60105 |
gchar *pf = a_Url_decode_hex_str(URL_FRAGMENT_(Web->url));
|
|
60106 |
a_Dw_gtk_scrolled_window_set_anchor(
|
|
60107 |
- GTK_DW_SCROLLED_WINDOW(Web->bw->docwin), pf);
|
|
60108 |
+ GTK_DW_SCROLLED_WINDOW(Web->dd->docwin), pf);
|
|
60109 |
g_free(pf);
|
|
60110 |
}
|
|
60111 |
|
|
60112 |
- /* Clear the title bar for pages without a <TITLE> tag */
|
|
60113 |
- a_Interface_set_page_title(Web->bw, "");
|
|
60114 |
- a_Interface_set_location_text(Web->bw, URL_STR(Web->url));
|
|
60115 |
- a_Interface_reset_progress_bars(Web->bw);
|
|
60116 |
+
|
|
60117 |
+ /* Set document title to url, will be replaced by real title
|
|
60118 |
+ * if this page has a <TITLE> tag */
|
|
60119 |
+ a_Doc_title_set(Web->dd, URL_STR(Web->url));
|
|
60120 |
+ /* update progress */
|
|
60121 |
+ a_Doc_progress_update(Web->dd);
|
|
60122 |
+ a_Doc_location_set(Web->dd, URL_STR(Web->url));
|
|
60123 |
/* Reset the bug meter */
|
|
60124 |
- a_Interface_bug_meter_update(Web->bw, 0);
|
|
60125 |
+ a_Interface_bug_meter_update(Web->dd->bw, 0);
|
|
60126 |
|
|
60127 |
/* Let the Nav module know... */
|
|
60128 |
- a_Nav_expect_done(Web->bw);
|
|
60129 |
+ a_Nav_expect_done(Web->dd);
|
|
60130 |
|
|
60131 |
} else {
|
|
60132 |
/* A non-RootUrl. At this moment we only handle image-children */
|
|
60133 |
@@ -121,7 +113,7 @@ DilloWeb* a_Web_new(const DilloUrl *url)
|
|
60134 |
|
|
60135 |
_MSG(" a_Web_new: ValidWebs ==> %d\n", g_slist_length(ValidWebs));
|
|
60136 |
web->url = a_Url_dup(url);
|
|
60137 |
- web->bw = NULL;
|
|
60138 |
+ web->dd = NULL;
|
|
60139 |
web->flags = 0;
|
|
60140 |
web->Image = NULL;
|
|
60141 |
web->stream = NULL;
|
|
60142 |
diff -pruN dillo-0.8.6/src/web.h dillo-0.8.6-i18n-misc-20070916/src/web.h
|
|
60143 |
--- dillo-0.8.6/src/web.h 2005-10-28 01:20:15.000000000 +0900
|
|
60144 |
+++ dillo-0.8.6-i18n-misc-20070916/src/web.h 2006-05-16 01:21:09.000000000 +0900
|
|
60145 |
@@ -23,7 +23,7 @@ typedef struct _DilloWeb DilloWeb;
|
|
60146 |
|
|
60147 |
struct _DilloWeb {
|
|
60148 |
DilloUrl *url; /* Requested URL */
|
|
60149 |
- BrowserWindow *bw; /* The requesting browser window [reference] */
|
|
60150 |
+ DilloDoc *dd; /* The requesting browser document [reference] */
|
|
60151 |
gint flags; /* Additional info */
|
|
60152 |
|
|
60153 |
DilloImage *Image; /* For image urls [reference] */
|