aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-03-07 15:32:41 +0000
committerChristian Grothoff <christian@grothoff.org>2012-03-07 15:32:41 +0000
commit0169892db251df639bf53e0014d0d74e8f748d5c (patch)
tree043e2449dd0fe0c8b95f7e837e066eb98c2c056c
parente3135a87b4b6b8df0296919ae70c63f2460aacac (diff)
downloadgnunet-ext-0169892db251df639bf53e0014d0d74e8f748d5c.tar.gz
gnunet-ext-0169892db251df639bf53e0014d0d74e8f748d5c.zip
-updating build system
Diffstat
-rw-r--r--ABOUT-NLS1282
-rw-r--r--ChangeLog14
-rw-r--r--Makefile.am2
-rwxr-xr-xconfig.rpath132
-rw-r--r--configure.ac87
-rw-r--r--m4/gettext.m4383
-rw-r--r--m4/iconv.m4214
-rw-r--r--m4/lib-ld.m4110
-rw-r--r--m4/lib-link.m4774
-rw-r--r--m4/lib-prefix.m4224
-rw-r--r--m4/libtool.m41996
-rw-r--r--m4/ltoptions.m413
-rw-r--r--m4/ltversion.m412
-rw-r--r--m4/lt~obsolete.m412
-rw-r--r--m4/nls.m432
-rw-r--r--m4/pkg.m457
-rw-r--r--m4/po.m4449
-rw-r--r--m4/progtest.m492
-rw-r--r--po/ChangeLog12
-rw-r--r--po/Makefile.in.in444
-rw-r--r--po/Makevars.template41
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/Rules-quot47
-rw-r--r--po/boldquot.sed10
-rw-r--r--po/en@boldquot.header25
-rw-r--r--po/en@quot.header22
-rw-r--r--po/insert-header.sin23
-rw-r--r--po/quot.sed6
-rw-r--r--po/remove-potcdate.sin19
29 files changed, 5196 insertions, 1339 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS
index e69de29..b1de1b6 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -0,0 +1,1282 @@
11 Notes on the Free Translation Project
2***************************************
3
4Free software is going international! The Free Translation Project is
5a way to get maintainers of free software, translators, and users all
6together, so that free software will gradually become able to speak many
7languages. A few packages already provide translations for their
8messages.
9
10 If you found this `ABOUT-NLS' file inside a distribution, you may
11assume that the distributed package does use GNU `gettext' internally,
12itself available at your nearest GNU archive site. But you do _not_
13need to install GNU `gettext' prior to configuring, installing or using
14this package with messages translated.
15
16 Installers will find here some useful hints. These notes also
17explain how users should proceed for getting the programs to use the
18available translations. They tell how people wanting to contribute and
19work on translations can contact the appropriate team.
20
211.1 INSTALL Matters
22===================
23
24Some packages are "localizable" when properly installed; the programs
25they contain can be made to speak your own native language. Most such
26packages use GNU `gettext'. Other packages have their own ways to
27internationalization, predating GNU `gettext'.
28
29 By default, this package will be installed to allow translation of
30messages. It will automatically detect whether the system already
31provides the GNU `gettext' functions. Installers may use special
32options at configuration time for changing the default behaviour. The
33command:
34
35 ./configure --disable-nls
36
37will _totally_ disable translation of messages.
38
39 When you already have GNU `gettext' installed on your system and run
40configure without an option for your new package, `configure' will
41probably detect the previously built and installed `libintl' library
42and will decide to use it. If not, you may have to to use the
43`--with-libintl-prefix' option to tell `configure' where to look for it.
44
45 Internationalized packages usually have many `po/LL.po' files, where
46LL gives an ISO 639 two-letter code identifying the language. Unless
47translations have been forbidden at `configure' time by using the
48`--disable-nls' switch, all available translations are installed
49together with the package. However, the environment variable `LINGUAS'
50may be set, prior to configuration, to limit the installed set.
51`LINGUAS' should then contain a space separated list of two-letter
52codes, stating which languages are allowed.
53
541.2 Using This Package
55======================
56
57As a user, if your language has been installed for this package, you
58only have to set the `LANG' environment variable to the appropriate
59`LL_CC' combination. If you happen to have the `LC_ALL' or some other
60`LC_xxx' environment variables set, you should unset them before
61setting `LANG', otherwise the setting of `LANG' will not have the
62desired effect. Here `LL' is an ISO 639 two-letter language code, and
63`CC' is an ISO 3166 two-letter country code. For example, let's
64suppose that you speak German and live in Germany. At the shell
65prompt, merely execute `setenv LANG de_DE' (in `csh'),
66`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
67This can be done from your `.login' or `.profile' file, once and for
68all.
69
70 You might think that the country code specification is redundant.
71But in fact, some languages have dialects in different countries. For
72example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
73country code serves to distinguish the dialects.
74
75 The locale naming convention of `LL_CC', with `LL' denoting the
76language and `CC' denoting the country, is the one use on systems based
77on GNU libc. On other systems, some variations of this scheme are
78used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
79locales supported by your system for your language by running the
80command `locale -a | grep '^LL''.
81
82 Not all programs have translations for all languages. By default, an
83English message is shown in place of a nonexistent translation. If you
84understand other languages, you can set up a priority list of languages.
85This is done through a different environment variable, called
86`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
87for the purpose of message handling, but you still need to have `LANG'
88set to the primary language; this is required by other parts of the
89system libraries. For example, some Swedish users who would rather
90read translations in German than English for when Swedish is not
91available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
92
93 Special advice for Norwegian users: The language code for Norwegian
94bokma*l changed from `no' to `nb' recently (in 2003). During the
95transition period, while some message catalogs for this language are
96installed under `nb' and some older ones under `no', it's recommended
97for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
98older translations are used.
99
100 In the `LANGUAGE' environment variable, but not in the `LANG'
101environment variable, `LL_CC' combinations can be abbreviated as `LL'
102to denote the language's main dialect. For example, `de' is equivalent
103to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
104(Portuguese as spoken in Portugal) in this context.
105
1061.3 Translating Teams
107=====================
108
109For the Free Translation Project to be a success, we need interested
110people who like their own language and write it well, and who are also
111able to synergize with other translators speaking the same language.
112Each translation team has its own mailing list. The up-to-date list of
113teams can be found at the Free Translation Project's homepage,
114`http://translationproject.org/', in the "Teams" area.
115
116 If you'd like to volunteer to _work_ at translating messages, you
117should become a member of the translating team for your own language.
118The subscribing address is _not_ the same as the list itself, it has
119`-request' appended. For example, speakers of Swedish can send a
120message to `sv-request@li.org', having this message body:
121
122 subscribe
123
124 Keep in mind that team members are expected to participate
125_actively_ in translations, or at solving translational difficulties,
126rather than merely lurking around. If your team does not exist yet and
127you want to start one, or if you are unsure about what to do or how to
128get started, please write to `coordinator@translationproject.org' to
129reach the coordinator for all translator teams.
130
131 The English team is special. It works at improving and uniformizing
132the terminology in use. Proven linguistic skills are praised more than
133programming skills, here.
134
1351.4 Available Packages
136======================
137
138Languages are not equally supported in all packages. The following
139matrix shows the current state of internationalization, as of June
1402010. The matrix shows, in regard of each package, for which languages
141PO files have been submitted to translation coordination, with a
142translation percentage of at least 50%.
143
144 Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca
145 +--------------------------------------------------+
146 a2ps | [] [] |
147 aegis | |
148 ant-phone | |
149 anubis | |
150 aspell | [] [] |
151 bash | |
152 bfd | |
153 bibshelf | [] |
154 binutils | |
155 bison | |
156 bison-runtime | [] |
157 bluez-pin | [] [] |
158 bombono-dvd | |
159 buzztard | |
160 cflow | |
161 clisp | |
162 coreutils | [] [] |
163 cpio | |
164 cppi | |
165 cpplib | [] |
166 cryptsetup | |
167 dfarc | |
168 dialog | [] [] |
169 dico | |
170 diffutils | [] |
171 dink | |
172 doodle | |
173 e2fsprogs | [] |
174 enscript | [] |
175 exif | |
176 fetchmail | [] |
177 findutils | [] |
178 flex | [] |
179 freedink | |
180 gas | |
181 gawk | [] [] |
182 gcal | [] |
183 gcc | |
184 gettext-examples | [] [] [] [] |
185 gettext-runtime | [] [] |
186 gettext-tools | [] [] |
187 gip | [] |
188 gjay | |
189 gliv | [] |
190 glunarclock | [] [] |
191 gnubiff | |
192 gnucash | [] |
193 gnuedu | |
194 gnulib | |
195 gnunet | |
196 gnunet-gtk | |
197 gnutls | |
198 gold | |
199 gpe-aerial | |
200 gpe-beam | |
201 gpe-bluetooth | |
202 gpe-calendar | |
203 gpe-clock | [] |
204 gpe-conf | |
205 gpe-contacts | |
206 gpe-edit | |
207 gpe-filemanager | |
208 gpe-go | |
209 gpe-login | |
210 gpe-ownerinfo | [] |
211 gpe-package | |
212 gpe-sketchbook | |
213 gpe-su | [] |
214 gpe-taskmanager | [] |
215 gpe-timesheet | [] |
216 gpe-today | [] |
217 gpe-todo | |
218 gphoto2 | |
219 gprof | [] |
220 gpsdrive | |
221 gramadoir | |
222 grep | |
223 grub | [] [] |
224 gsasl | |
225 gss | |
226 gst-plugins-bad | [] |
227 gst-plugins-base | [] |
228 gst-plugins-good | [] |
229 gst-plugins-ugly | [] |
230 gstreamer | [] [] [] |
231 gtick | |
232 gtkam | [] |
233 gtkorphan | [] |
234 gtkspell | [] [] [] |
235 gutenprint | |
236 hello | [] |
237 help2man | |
238 hylafax | |
239 idutils | |
240 indent | [] [] |
241 iso_15924 | |
242 iso_3166 | [] [] [] [] [] [] [] |
243 iso_3166_2 | |
244 iso_4217 | |
245 iso_639 | [] [] [] [] |
246 iso_639_3 | |
247 jwhois | |
248 kbd | |
249 keytouch | [] |
250 keytouch-editor | |
251 keytouch-keyboa... | [] |
252 klavaro | [] |
253 latrine | |
254 ld | [] |
255 leafpad | [] [] |
256 libc | [] [] |
257 libexif | () |
258 libextractor | |
259 libgnutls | |
260 libgpewidget | |
261 libgpg-error | |
262 libgphoto2 | |
263 libgphoto2_port | |
264 libgsasl | |
265 libiconv | [] |
266 libidn | |
267 lifelines | |
268 liferea | [] [] |
269 lilypond | |
270 linkdr | [] |
271 lordsawar | |
272 lprng | |
273 lynx | [] |
274 m4 | |
275 mailfromd | |
276 mailutils | |
277 make | |
278 man-db | |
279 man-db-manpages | |
280 minicom | |
281 mkisofs | |
282 myserver | |
283 nano | [] [] |
284 opcodes | |
285 parted | |
286 pies | |
287 popt | |
288 psmisc | |
289 pspp | [] |
290 pwdutils | |
291 radius | [] |
292 recode | [] [] |
293 rosegarden | |
294 rpm | |
295 rush | |
296 sarg | |
297 screem | |
298 scrollkeeper | [] [] [] |
299 sed | [] [] |
300 sharutils | [] [] |
301 shishi | |
302 skencil | |
303 solfege | |
304 solfege-manual | |
305 soundtracker | |
306 sp | |
307 sysstat | |
308 tar | [] |
309 texinfo | |
310 tin | |
311 unicode-han-tra... | |
312 unicode-transla... | |
313 util-linux-ng | [] |
314 vice | |
315 vmm | |
316 vorbis-tools | |
317 wastesedge | |
318 wdiff | |
319 wget | [] [] |
320 wyslij-po | |
321 xchat | [] [] [] [] |
322 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
323 xkeyboard-config | [] [] |
324 +--------------------------------------------------+
325 af am an ar as ast az be be@latin bg bn_IN bs ca
326 6 0 1 2 3 19 1 10 3 28 3 1 38
327
328 crh cs da de el en en_GB en_ZA eo es et eu fa
329 +-------------------------------------------------+
330 a2ps | [] [] [] [] [] [] [] |
331 aegis | [] [] [] |
332 ant-phone | [] () |
333 anubis | [] [] |
334 aspell | [] [] [] [] [] |
335 bash | [] [] [] |
336 bfd | [] |
337 bibshelf | [] [] [] |
338 binutils | [] |
339 bison | [] [] |
340 bison-runtime | [] [] [] [] |
341 bluez-pin | [] [] [] [] [] [] |
342 bombono-dvd | [] |
343 buzztard | [] [] [] |
344 cflow | [] [] |
345 clisp | [] [] [] [] |
346 coreutils | [] [] [] [] |
347 cpio | |
348 cppi | |
349 cpplib | [] [] [] |
350 cryptsetup | [] |
351 dfarc | [] [] [] |
352 dialog | [] [] [] [] [] |
353 dico | |
354 diffutils | [] [] [] [] [] [] |
355 dink | [] [] [] |
356 doodle | [] |
357 e2fsprogs | [] [] [] |
358 enscript | [] [] [] |
359 exif | () [] [] |
360 fetchmail | [] [] () [] [] [] |
361 findutils | [] [] [] |
362 flex | [] [] |
363 freedink | [] [] [] |
364 gas | [] |
365 gawk | [] [] [] |
366 gcal | [] |
367 gcc | [] [] |
368 gettext-examples | [] [] [] [] |
369 gettext-runtime | [] [] [] [] |
370 gettext-tools | [] [] [] |
371 gip | [] [] [] [] |
372 gjay | [] |
373 gliv | [] [] [] |
374 glunarclock | [] [] |
375 gnubiff | () |
376 gnucash | [] () () () () |
377 gnuedu | [] [] |
378 gnulib | [] [] |
379 gnunet | |
380 gnunet-gtk | [] |
381 gnutls | [] [] |
382 gold | [] |
383 gpe-aerial | [] [] [] [] |
384 gpe-beam | [] [] [] [] |
385 gpe-bluetooth | [] [] |
386 gpe-calendar | [] |
387 gpe-clock | [] [] [] [] |
388 gpe-conf | [] [] [] |
389 gpe-contacts | [] [] [] |
390 gpe-edit | [] [] |
391 gpe-filemanager | [] [] [] |
392 gpe-go | [] [] [] [] |
393 gpe-login | [] [] |
394 gpe-ownerinfo | [] [] [] [] |
395 gpe-package | [] [] [] |
396 gpe-sketchbook | [] [] [] [] |
397 gpe-su | [] [] [] [] |
398 gpe-taskmanager | [] [] [] [] |
399 gpe-timesheet | [] [] [] [] |
400 gpe-today | [] [] [] [] |
401 gpe-todo | [] [] [] |
402 gphoto2 | [] [] () [] [] [] |
403 gprof | [] [] [] |
404 gpsdrive | [] [] [] |
405 gramadoir | [] [] [] |
406 grep | [] |
407 grub | [] [] |
408 gsasl | [] |
409 gss | |
410 gst-plugins-bad | [] [] [] [] [] |
411 gst-plugins-base | [] [] [] [] [] |
412 gst-plugins-good | [] [] [] [] [] [] |
413 gst-plugins-ugly | [] [] [] [] [] [] |
414 gstreamer | [] [] [] [] [] |
415 gtick | [] () [] |
416 gtkam | [] [] () [] [] |
417 gtkorphan | [] [] [] [] |
418 gtkspell | [] [] [] [] [] [] [] |
419 gutenprint | [] [] [] |
420 hello | [] [] [] [] |
421 help2man | [] |
422 hylafax | [] [] |
423 idutils | [] [] |
424 indent | [] [] [] [] [] [] [] |
425 iso_15924 | [] () [] [] |
426 iso_3166 | [] [] [] [] () [] [] [] () |
427 iso_3166_2 | () |
428 iso_4217 | [] [] [] () [] [] |
429 iso_639 | [] [] [] [] () [] [] |
430 iso_639_3 | [] |
431 jwhois | [] |
432 kbd | [] [] [] [] [] |
433 keytouch | [] [] |
434 keytouch-editor | [] [] |
435 keytouch-keyboa... | [] |
436 klavaro | [] [] [] [] |
437 latrine | [] () |
438 ld | [] [] |
439 leafpad | [] [] [] [] [] [] |
440 libc | [] [] [] [] |
441 libexif | [] [] () |
442 libextractor | |
443 libgnutls | [] |
444 libgpewidget | [] [] |
445 libgpg-error | [] [] |
446 libgphoto2 | [] () |
447 libgphoto2_port | [] () [] |
448 libgsasl | |
449 libiconv | [] [] [] [] [] |
450 libidn | [] [] [] |
451 lifelines | [] () |
452 liferea | [] [] [] [] [] |
453 lilypond | [] [] [] |
454 linkdr | [] [] [] |
455 lordsawar | [] |
456 lprng | |
457 lynx | [] [] [] [] |
458 m4 | [] [] [] [] |
459 mailfromd | |
460 mailutils | [] |
461 make | [] [] [] |
462 man-db | |
463 man-db-manpages | |
464 minicom | [] [] [] [] |
465 mkisofs | |
466 myserver | |
467 nano | [] [] [] |
468 opcodes | [] [] |
469 parted | [] [] |
470 pies | |
471 popt | [] [] [] [] [] |
472 psmisc | [] [] [] |
473 pspp | [] |
474 pwdutils | [] |
475 radius | [] |
476 recode | [] [] [] [] [] [] |
477 rosegarden | () () () |
478 rpm | [] [] [] |
479 rush | |
480 sarg | |
481 screem | |
482 scrollkeeper | [] [] [] [] [] |
483 sed | [] [] [] [] [] [] |
484 sharutils | [] [] [] [] |
485 shishi | |
486 skencil | [] () [] |
487 solfege | [] [] [] |
488 solfege-manual | [] [] |
489 soundtracker | [] [] [] |
490 sp | [] |
491 sysstat | [] [] [] |
492 tar | [] [] [] [] |
493 texinfo | [] [] [] |
494 tin | [] [] |
495 unicode-han-tra... | |
496 unicode-transla... | |
497 util-linux-ng | [] [] [] [] |
498 vice | () () |
499 vmm | [] |
500 vorbis-tools | [] [] |
501 wastesedge | [] |
502 wdiff | [] [] |
503 wget | [] [] [] |
504 wyslij-po | |
505 xchat | [] [] [] [] [] |
506 xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
507 xkeyboard-config | [] [] [] [] [] [] |
508 +-------------------------------------------------+
509 crh cs da de el en en_GB en_ZA eo es et eu fa
510 5 64 105 117 18 1 8 0 28 89 18 19 0
511
512 fi fr ga gl gu he hi hr hu hy id is it ja ka kn
513 +----------------------------------------------------+
514 a2ps | [] [] [] [] |
515 aegis | [] [] |
516 ant-phone | [] [] |
517 anubis | [] [] [] [] |
518 aspell | [] [] [] [] |
519 bash | [] [] [] [] |
520 bfd | [] [] [] |
521 bibshelf | [] [] [] [] [] |
522 binutils | [] [] [] |
523 bison | [] [] [] [] |
524 bison-runtime | [] [] [] [] [] [] |
525 bluez-pin | [] [] [] [] [] [] [] [] |
526 bombono-dvd | [] |
527 buzztard | [] |
528 cflow | [] [] [] |
529 clisp | [] |
530 coreutils | [] [] [] [] [] |
531 cpio | [] [] [] [] |
532 cppi | [] [] |
533 cpplib | [] [] [] |
534 cryptsetup | [] [] [] |
535 dfarc | [] [] [] |
536 dialog | [] [] [] [] [] [] [] |
537 dico | |
538 diffutils | [] [] [] [] [] [] [] [] [] |
539 dink | [] |
540 doodle | [] [] |
541 e2fsprogs | [] [] |
542 enscript | [] [] [] [] |
543 exif | [] [] [] [] [] [] |
544 fetchmail | [] [] [] [] |
545 findutils | [] [] [] [] [] [] |
546 flex | [] [] [] |
547 freedink | [] [] [] |
548 gas | [] [] |
549 gawk | [] [] [] [] () [] |
550 gcal | [] |
551 gcc | [] |
552 gettext-examples | [] [] [] [] [] [] [] |
553 gettext-runtime | [] [] [] [] [] [] |
554 gettext-tools | [] [] [] [] |
555 gip | [] [] [] [] [] [] |
556 gjay | [] |
557 gliv | [] () |
558 glunarclock | [] [] [] [] |
559 gnubiff | () [] () |
560 gnucash | () () () () () [] |
561 gnuedu | [] [] |
562 gnulib | [] [] [] [] [] [] |
563 gnunet | |
564 gnunet-gtk | [] |
565 gnutls | [] [] |
566 gold | [] [] |
567 gpe-aerial | [] [] [] |
568 gpe-beam | [] [] [] [] |
569 gpe-bluetooth | [] [] [] [] |
570 gpe-calendar | [] [] |
571 gpe-clock | [] [] [] [] [] |
572 gpe-conf | [] [] [] [] |
573 gpe-contacts | [] [] [] [] |
574 gpe-edit | [] [] [] |
575 gpe-filemanager | [] [] [] [] |
576 gpe-go | [] [] [] [] [] |
577 gpe-login | [] [] [] |
578 gpe-ownerinfo | [] [] [] [] [] |
579 gpe-package | [] [] [] |
580 gpe-sketchbook | [] [] [] [] |
581 gpe-su | [] [] [] [] [] [] |
582 gpe-taskmanager | [] [] [] [] [] |
583 gpe-timesheet | [] [] [] [] [] |
584 gpe-today | [] [] [] [] [] [] [] |
585 gpe-todo | [] [] [] |
586 gphoto2 | [] [] [] [] [] [] |
587 gprof | [] [] [] [] |
588 gpsdrive | [] [] [] |
589 gramadoir | [] [] [] |
590 grep | [] [] |
591 grub | [] [] [] [] |
592 gsasl | [] [] [] [] [] |
593 gss | [] [] [] [] [] |
594 gst-plugins-bad | [] [] [] [] [] [] |
595 gst-plugins-base | [] [] [] [] [] [] |
596 gst-plugins-good | [] [] [] [] [] [] |
597 gst-plugins-ugly | [] [] [] [] [] [] |
598 gstreamer | [] [] [] [] [] |
599 gtick | [] [] [] [] [] |
600 gtkam | [] [] [] [] [] |
601 gtkorphan | [] [] [] |
602 gtkspell | [] [] [] [] [] [] [] [] [] |
603 gutenprint | [] [] [] [] |
604 hello | [] [] [] |
605 help2man | [] [] |
606 hylafax | [] |
607 idutils | [] [] [] [] [] [] |
608 indent | [] [] [] [] [] [] [] [] |
609 iso_15924 | [] () [] [] |
610 iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] |
611 iso_3166_2 | () [] [] [] |
612 iso_4217 | [] () [] [] [] [] |
613 iso_639 | [] () [] [] [] [] [] [] [] |
614 iso_639_3 | () [] [] |
615 jwhois | [] [] [] [] [] |
616 kbd | [] [] |
617 keytouch | [] [] [] [] [] [] |
618 keytouch-editor | [] [] [] [] [] |
619 keytouch-keyboa... | [] [] [] [] [] |
620 klavaro | [] [] |
621 latrine | [] [] [] |
622 ld | [] [] [] [] |
623 leafpad | [] [] [] [] [] [] [] () |
624 libc | [] [] [] [] [] |
625 libexif | [] |
626 libextractor | |
627 libgnutls | [] [] |
628 libgpewidget | [] [] [] [] |
629 libgpg-error | [] [] |
630 libgphoto2 | [] [] [] |
631 libgphoto2_port | [] [] [] |
632 libgsasl | [] [] [] [] [] |
633 libiconv | [] [] [] [] [] [] |
634 libidn | [] [] [] [] |
635 lifelines | () |
636 liferea | [] [] [] [] |
637 lilypond | [] [] |
638 linkdr | [] [] [] [] [] |
639 lordsawar | |
640 lprng | [] |
641 lynx | [] [] [] [] [] |
642 m4 | [] [] [] [] [] [] |
643 mailfromd | |
644 mailutils | [] [] |
645 make | [] [] [] [] [] [] [] [] [] |
646 man-db | [] [] |
647 man-db-manpages | [] |
648 minicom | [] [] [] [] [] |
649 mkisofs | [] [] [] [] |
650 myserver | |
651 nano | [] [] [] [] [] [] |
652 opcodes | [] [] [] [] |
653 parted | [] [] [] [] |
654 pies | |
655 popt | [] [] [] [] [] [] [] [] [] |
656 psmisc | [] [] [] |
657 pspp | |
658 pwdutils | [] [] |
659 radius | [] [] |
660 recode | [] [] [] [] [] [] [] [] |
661 rosegarden | () () () () () |
662 rpm | [] [] |
663 rush | |
664 sarg | [] |
665 screem | [] [] |
666 scrollkeeper | [] [] [] [] |
667 sed | [] [] [] [] [] [] [] [] |
668 sharutils | [] [] [] [] [] [] [] |
669 shishi | [] |
670 skencil | [] |
671 solfege | [] [] [] [] |
672 solfege-manual | [] [] |
673 soundtracker | [] [] |
674 sp | [] () |
675 sysstat | [] [] [] [] [] |
676 tar | [] [] [] [] [] [] [] |
677 texinfo | [] [] [] [] |
678 tin | [] |
679 unicode-han-tra... | |
680 unicode-transla... | [] [] |
681 util-linux-ng | [] [] [] [] [] [] |
682 vice | () () () |
683 vmm | [] |
684 vorbis-tools | [] |
685 wastesedge | () () |
686 wdiff | [] |
687 wget | [] [] [] [] [] [] [] [] |
688 wyslij-po | [] [] [] |
689 xchat | [] [] [] [] [] [] [] [] [] |
690 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] |
691 xkeyboard-config | [] [] [] [] [] |
692 +----------------------------------------------------+
693 fi fr ga gl gu he hi hr hu hy id is it ja ka kn
694 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4
695
696 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
697 +-----------------------------------------------+
698 a2ps | [] |
699 aegis | |
700 ant-phone | |
701 anubis | [] [] |
702 aspell | [] |
703 bash | |
704 bfd | |
705 bibshelf | [] [] |
706 binutils | |
707 bison | [] |
708 bison-runtime | [] [] [] [] [] |
709 bluez-pin | [] [] [] [] [] |
710 bombono-dvd | |
711 buzztard | |
712 cflow | |
713 clisp | |
714 coreutils | [] |
715 cpio | |
716 cppi | |
717 cpplib | |
718 cryptsetup | |
719 dfarc | [] |
720 dialog | [] [] [] [] [] |
721 dico | |
722 diffutils | [] [] |
723 dink | |
724 doodle | |
725 e2fsprogs | |
726 enscript | |
727 exif | [] |
728 fetchmail | |
729 findutils | |
730 flex | |
731 freedink | [] |
732 gas | |
733 gawk | |
734 gcal | |
735 gcc | |
736 gettext-examples | [] [] [] [] |
737 gettext-runtime | [] |
738 gettext-tools | [] |
739 gip | [] [] |
740 gjay | |
741 gliv | |
742 glunarclock | [] |
743 gnubiff | |
744 gnucash | () () () () |
745 gnuedu | |
746 gnulib | |
747 gnunet | |
748 gnunet-gtk | |
749 gnutls | [] |
750 gold | |
751 gpe-aerial | [] |
752 gpe-beam | [] |
753 gpe-bluetooth | [] [] |
754 gpe-calendar | [] |
755 gpe-clock | [] [] [] [] [] |
756 gpe-conf | [] [] |
757 gpe-contacts | [] [] |
758 gpe-edit | [] |
759 gpe-filemanager | [] [] |
760 gpe-go | [] [] [] |
761 gpe-login | [] |
762 gpe-ownerinfo | [] [] |
763 gpe-package | [] [] |
764 gpe-sketchbook | [] [] |
765 gpe-su | [] [] [] [] [] [] |
766 gpe-taskmanager | [] [] [] [] [] [] |
767 gpe-timesheet | [] [] |
768 gpe-today | [] [] [] [] |
769 gpe-todo | [] [] |
770 gphoto2 | |
771 gprof | [] |
772 gpsdrive | |
773 gramadoir | |
774 grep | |
775 grub | |
776 gsasl | |
777 gss | |
778 gst-plugins-bad | [] [] [] [] |
779 gst-plugins-base | [] [] |
780 gst-plugins-good | [] [] |
781 gst-plugins-ugly | [] [] [] [] [] |
782 gstreamer | |
783 gtick | |
784 gtkam | [] |
785 gtkorphan | [] [] |
786 gtkspell | [] [] [] [] [] [] [] |
787 gutenprint | |
788 hello | [] [] [] |
789 help2man | |
790 hylafax | |
791 idutils | |
792 indent | |
793 iso_15924 | [] [] |
794 iso_3166 | [] [] () [] [] [] [] [] |
795 iso_3166_2 | |
796 iso_4217 | [] [] |
797 iso_639 | [] [] |
798 iso_639_3 | [] |
799 jwhois | [] |
800 kbd | |
801 keytouch | [] |
802 keytouch-editor | [] |
803 keytouch-keyboa... | [] |
804 klavaro | [] |
805 latrine | [] |
806 ld | |
807 leafpad | [] [] [] |
808 libc | [] |
809 libexif | |
810 libextractor | |
811 libgnutls | [] |
812 libgpewidget | [] [] |
813 libgpg-error | |
814 libgphoto2 | |
815 libgphoto2_port | |
816 libgsasl | |
817 libiconv | |
818 libidn | |
819 lifelines | |
820 liferea | |
821 lilypond | |
822 linkdr | |
823 lordsawar | |
824 lprng | |
825 lynx | |
826 m4 | |
827 mailfromd | |
828 mailutils | |
829 make | [] |
830 man-db | |
831 man-db-manpages | |
832 minicom | [] |
833 mkisofs | |
834 myserver | |
835 nano | [] [] |
836 opcodes | |
837 parted | |
838 pies | |
839 popt | [] [] [] |
840 psmisc | |
841 pspp | |
842 pwdutils | |
843 radius | |
844 recode | |
845 rosegarden | |
846 rpm | |
847 rush | |
848 sarg | |
849 screem | |
850 scrollkeeper | [] [] |
851 sed | |
852 sharutils | |
853 shishi | |
854 skencil | |
855 solfege | [] |
856 solfege-manual | |
857 soundtracker | |
858 sp | |
859 sysstat | [] |
860 tar | [] |
861 texinfo | [] |
862 tin | |
863 unicode-han-tra... | |
864 unicode-transla... | |
865 util-linux-ng | |
866 vice | |
867 vmm | |
868 vorbis-tools | |
869 wastesedge | |
870 wdiff | |
871 wget | [] |
872 wyslij-po | |
873 xchat | [] [] [] |
874 xdg-user-dirs | [] [] [] [] [] [] [] [] |
875 xkeyboard-config | [] [] [] |
876 +-----------------------------------------------+
877 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
878 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1
879
880 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
881 +---------------------------------------------------+
882 a2ps | [] [] [] [] [] [] [] [] |
883 aegis | [] [] [] |
884 ant-phone | [] [] |
885 anubis | [] [] [] |
886 aspell | [] [] [] [] [] |
887 bash | [] [] |
888 bfd | [] |
889 bibshelf | [] [] |
890 binutils | [] [] |
891 bison | [] [] [] |
892 bison-runtime | [] [] [] [] [] [] [] |
893 bluez-pin | [] [] [] [] [] [] [] [] |
894 bombono-dvd | [] () |
895 buzztard | [] [] |
896 cflow | [] |
897 clisp | [] [] |
898 coreutils | [] [] [] [] [] [] |
899 cpio | [] [] [] |
900 cppi | [] |
901 cpplib | [] |
902 cryptsetup | [] |
903 dfarc | [] |
904 dialog | [] [] [] [] |
905 dico | [] |
906 diffutils | [] [] [] [] [] [] |
907 dink | () |
908 doodle | [] [] |
909 e2fsprogs | [] [] |
910 enscript | [] [] [] [] [] |
911 exif | [] [] [] () [] |
912 fetchmail | [] [] [] [] |
913 findutils | [] [] [] [] [] |
914 flex | [] [] [] [] [] |
915 freedink | [] [] |
916 gas | |
917 gawk | [] [] [] [] |
918 gcal | |
919 gcc | [] |
920 gettext-examples | [] [] [] [] [] [] [] [] |
921 gettext-runtime | [] [] [] [] [] [] [] [] [] |
922 gettext-tools | [] [] [] [] [] [] |
923 gip | [] [] [] [] [] |
924 gjay | |
925 gliv | [] [] [] [] [] [] |
926 glunarclock | [] [] [] [] [] |
927 gnubiff | [] () |
928 gnucash | [] () () () |
929 gnuedu | [] |
930 gnulib | [] [] [] [] |
931 gnunet | |
932 gnunet-gtk | |
933 gnutls | [] [] |
934 gold | |
935 gpe-aerial | [] [] [] [] [] [] [] |
936 gpe-beam | [] [] [] [] [] [] [] |
937 gpe-bluetooth | [] [] |
938 gpe-calendar | [] [] [] [] |
939 gpe-clock | [] [] [] [] [] [] [] [] |
940 gpe-conf | [] [] [] [] [] [] [] |
941 gpe-contacts | [] [] [] [] [] |
942 gpe-edit | [] [] [] |
943 gpe-filemanager | [] [] [] |
944 gpe-go | [] [] [] [] [] [] [] [] |
945 gpe-login | [] [] |
946 gpe-ownerinfo | [] [] [] [] [] [] [] [] |
947 gpe-package | [] [] |
948 gpe-sketchbook | [] [] [] [] [] [] [] |
949 gpe-su | [] [] [] [] [] [] [] [] |
950 gpe-taskmanager | [] [] [] [] [] [] [] [] |
951 gpe-timesheet | [] [] [] [] [] [] [] [] |
952 gpe-today | [] [] [] [] [] [] [] [] |
953 gpe-todo | [] [] [] [] [] |
954 gphoto2 | [] [] [] [] [] [] [] [] |
955 gprof | [] [] [] |
956 gpsdrive | [] [] |
957 gramadoir | [] [] |
958 grep | [] [] [] [] |
959 grub | [] [] [] |
960 gsasl | [] [] [] [] |
961 gss | [] [] [] |
962 gst-plugins-bad | [] [] [] [] [] [] |
963 gst-plugins-base | [] [] [] [] [] |
964 gst-plugins-good | [] [] [] [] [] |
965 gst-plugins-ugly | [] [] [] [] [] [] |
966 gstreamer | [] [] [] [] [] |
967 gtick | [] [] [] |
968 gtkam | [] [] [] [] [] [] |
969 gtkorphan | [] |
970 gtkspell | [] [] [] [] [] [] [] [] [] [] |
971 gutenprint | [] [] |
972 hello | [] [] [] [] |
973 help2man | [] [] |
974 hylafax | [] |
975 idutils | [] [] [] [] [] |
976 indent | [] [] [] [] [] [] [] |
977 iso_15924 | [] [] [] [] |
978 iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
979 iso_3166_2 | [] [] [] |
980 iso_4217 | [] [] [] [] [] [] [] [] |
981 iso_639 | [] [] [] [] [] [] [] [] [] |
982 iso_639_3 | [] [] |
983 jwhois | [] [] [] [] |
984 kbd | [] [] [] |
985 keytouch | [] [] [] |
986 keytouch-editor | [] [] [] |
987 keytouch-keyboa... | [] [] [] |
988 klavaro | [] [] |
989 latrine | [] [] |
990 ld | |
991 leafpad | [] [] [] [] [] [] [] [] [] |
992 libc | [] [] [] [] |
993 libexif | [] [] () [] |
994 libextractor | |
995 libgnutls | [] [] |
996 libgpewidget | [] [] [] |
997 libgpg-error | [] [] |
998 libgphoto2 | [] [] |
999 libgphoto2_port | [] [] [] [] [] |
1000 libgsasl | [] [] [] [] [] |
1001 libiconv | [] [] [] [] [] |
1002 libidn | [] [] |
1003 lifelines | [] [] |
1004 liferea | [] [] [] [] [] () () [] |
1005 lilypond | [] |
1006 linkdr | [] [] [] |
1007 lordsawar | |
1008 lprng | [] |
1009 lynx | [] [] [] |
1010 m4 | [] [] [] [] [] |
1011 mailfromd | [] |
1012 mailutils | [] |
1013 make | [] [] [] [] |
1014 man-db | [] [] [] |
1015 man-db-manpages | [] [] [] |
1016 minicom | [] [] [] [] |
1017 mkisofs | [] [] [] |
1018 myserver | |
1019 nano | [] [] [] [] |
1020 opcodes | [] [] |
1021 parted | [] [] [] [] |
1022 pies | [] |
1023 popt | [] [] [] [] |
1024 psmisc | [] [] [] |
1025 pspp | [] [] |
1026 pwdutils | [] |
1027 radius | [] [] [] |
1028 recode | [] [] [] [] [] [] [] [] |
1029 rosegarden | () () |
1030 rpm | [] [] [] |
1031 rush | [] [] |
1032 sarg | |
1033 screem | |
1034 scrollkeeper | [] [] [] [] [] [] [] [] |
1035 sed | [] [] [] [] [] [] [] [] [] |
1036 sharutils | [] [] [] [] |
1037 shishi | [] |
1038 skencil | [] [] |
1039 solfege | [] [] [] [] |
1040 solfege-manual | [] [] [] |
1041 soundtracker | [] |
1042 sp | |
1043 sysstat | [] [] [] [] |
1044 tar | [] [] [] [] |
1045 texinfo | [] [] [] [] |
1046 tin | [] |
1047 unicode-han-tra... | |
1048 unicode-transla... | |
1049 util-linux-ng | [] [] [] [] [] |
1050 vice | [] |
1051 vmm | [] |
1052 vorbis-tools | [] [] |
1053 wastesedge | [] |
1054 wdiff | [] [] |
1055 wget | [] [] [] [] [] [] [] |
1056 wyslij-po | [] [] [] |
1057 xchat | [] [] [] [] [] [] [] [] [] |
1058 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
1059 xkeyboard-config | [] [] [] |
1060 +---------------------------------------------------+
1061 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
1062 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37
1063
1064 sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1065 +---------------------------------------------------+
1066 a2ps | [] [] [] [] [] | 27
1067 aegis | [] | 9
1068 ant-phone | [] [] [] [] | 9
1069 anubis | [] [] [] [] | 15
1070 aspell | [] [] [] | 20
1071 bash | [] [] [] | 12
1072 bfd | [] | 6
1073 bibshelf | [] [] [] | 16
1074 binutils | [] [] | 8
1075 bison | [] [] | 12
1076 bison-runtime | [] [] [] [] [] [] | 29
1077 bluez-pin | [] [] [] [] [] [] [] [] | 37
1078 bombono-dvd | [] | 4
1079 buzztard | [] | 7
1080 cflow | [] [] [] | 9
1081 clisp | | 10
1082 coreutils | [] [] [] [] | 22
1083 cpio | [] [] [] [] [] [] | 13
1084 cppi | [] [] | 5
1085 cpplib | [] [] [] [] [] [] | 14
1086 cryptsetup | [] [] | 7
1087 dfarc | [] | 9
1088 dialog | [] [] [] [] [] [] [] | 30
1089 dico | [] | 2
1090 diffutils | [] [] [] [] [] [] | 30
1091 dink | | 4
1092 doodle | [] [] | 7
1093 e2fsprogs | [] [] [] | 11
1094 enscript | [] [] [] [] | 17
1095 exif | [] [] [] | 16
1096 fetchmail | [] [] [] | 17
1097 findutils | [] [] [] [] [] | 20
1098 flex | [] [] [] [] | 15
1099 freedink | [] | 10
1100 gas | [] | 4
1101 gawk | [] [] [] [] | 18
1102 gcal | [] [] | 5
1103 gcc | [] [] [] | 7
1104 gettext-examples | [] [] [] [] [] [] [] | 34
1105 gettext-runtime | [] [] [] [] [] [] [] | 29
1106 gettext-tools | [] [] [] [] [] [] | 22
1107 gip | [] [] [] [] | 22
1108 gjay | [] | 3
1109 gliv | [] [] [] | 14
1110 glunarclock | [] [] [] [] [] | 19
1111 gnubiff | [] [] | 4
1112 gnucash | () [] () [] () | 10
1113 gnuedu | [] [] | 7
1114 gnulib | [] [] [] [] | 16
1115 gnunet | [] | 1
1116 gnunet-gtk | [] [] [] | 5
1117 gnutls | [] [] [] | 10
1118 gold | [] | 4
1119 gpe-aerial | [] [] [] | 18
1120 gpe-beam | [] [] [] | 19
1121 gpe-bluetooth | [] [] [] | 13
1122 gpe-calendar | [] [] [] [] | 12
1123 gpe-clock | [] [] [] [] [] | 28
1124 gpe-conf | [] [] [] [] | 20
1125 gpe-contacts | [] [] [] | 17
1126 gpe-edit | [] [] [] | 12
1127 gpe-filemanager | [] [] [] [] | 16
1128 gpe-go | [] [] [] [] [] | 25
1129 gpe-login | [] [] [] | 11
1130 gpe-ownerinfo | [] [] [] [] [] | 25
1131 gpe-package | [] [] [] | 13
1132 gpe-sketchbook | [] [] [] | 20
1133 gpe-su | [] [] [] [] [] | 30
1134 gpe-taskmanager | [] [] [] [] [] | 29
1135 gpe-timesheet | [] [] [] [] [] | 25
1136 gpe-today | [] [] [] [] [] [] | 30
1137 gpe-todo | [] [] [] [] | 17
1138 gphoto2 | [] [] [] [] [] | 24
1139 gprof | [] [] [] | 15
1140 gpsdrive | [] [] [] | 11
1141 gramadoir | [] [] [] | 11
1142 grep | [] [] [] | 10
1143 grub | [] [] [] | 14
1144 gsasl | [] [] [] [] | 14
1145 gss | [] [] [] | 11
1146 gst-plugins-bad | [] [] [] [] | 26
1147 gst-plugins-base | [] [] [] [] [] | 24
1148 gst-plugins-good | [] [] [] [] | 24
1149 gst-plugins-ugly | [] [] [] [] [] | 29
1150 gstreamer | [] [] [] [] | 22
1151 gtick | [] [] [] | 13
1152 gtkam | [] [] [] | 20
1153 gtkorphan | [] [] [] | 14
1154 gtkspell | [] [] [] [] [] [] [] [] [] | 45
1155 gutenprint | [] | 10
1156 hello | [] [] [] [] [] [] | 21
1157 help2man | [] [] | 7
1158 hylafax | [] | 5
1159 idutils | [] [] [] [] | 17
1160 indent | [] [] [] [] [] [] | 30
1161 iso_15924 | () [] () [] [] | 16
1162 iso_3166 | [] [] () [] [] () [] [] [] () | 53
1163 iso_3166_2 | () [] () [] | 9
1164 iso_4217 | [] () [] [] () [] [] | 26
1165 iso_639 | [] [] [] () [] () [] [] [] [] | 38
1166 iso_639_3 | [] () | 8
1167 jwhois | [] [] [] [] [] | 16
1168 kbd | [] [] [] [] [] | 15
1169 keytouch | [] [] [] | 16
1170 keytouch-editor | [] [] [] | 14
1171 keytouch-keyboa... | [] [] [] | 14
1172 klavaro | [] | 11
1173 latrine | [] [] [] | 10
1174 ld | [] [] [] [] | 11
1175 leafpad | [] [] [] [] [] [] | 33
1176 libc | [] [] [] [] [] | 21
1177 libexif | [] () | 7
1178 libextractor | [] | 1
1179 libgnutls | [] [] [] | 9
1180 libgpewidget | [] [] [] | 14
1181 libgpg-error | [] [] [] | 9
1182 libgphoto2 | [] [] | 8
1183 libgphoto2_port | [] [] [] [] | 14
1184 libgsasl | [] [] [] | 13
1185 libiconv | [] [] [] [] | 21
1186 libidn | () [] [] | 11
1187 lifelines | [] | 4
1188 liferea | [] [] [] | 21
1189 lilypond | [] | 7
1190 linkdr | [] [] [] [] [] | 17
1191 lordsawar | | 1
1192 lprng | [] | 3
1193 lynx | [] [] [] [] | 17
1194 m4 | [] [] [] [] | 19
1195 mailfromd | [] [] | 3
1196 mailutils | [] | 5
1197 make | [] [] [] [] | 21
1198 man-db | [] [] [] | 8
1199 man-db-manpages | | 4
1200 minicom | [] [] | 16
1201 mkisofs | [] [] | 9
1202 myserver | | 0
1203 nano | [] [] [] [] | 21
1204 opcodes | [] [] [] | 11
1205 parted | [] [] [] [] [] | 15
1206 pies | [] [] | 3
1207 popt | [] [] [] [] [] [] | 27
1208 psmisc | [] [] | 11
1209 pspp | | 4
1210 pwdutils | [] [] | 6
1211 radius | [] [] | 9
1212 recode | [] [] [] [] | 28
1213 rosegarden | () | 0
1214 rpm | [] [] [] | 11
1215 rush | [] [] | 4
1216 sarg | | 1
1217 screem | [] | 3
1218 scrollkeeper | [] [] [] [] [] | 27
1219 sed | [] [] [] [] [] | 30
1220 sharutils | [] [] [] [] [] | 22
1221 shishi | [] | 3
1222 skencil | [] [] | 7
1223 solfege | [] [] [] [] | 16
1224 solfege-manual | [] | 8
1225 soundtracker | [] [] [] | 9
1226 sp | [] | 3
1227 sysstat | [] [] | 15
1228 tar | [] [] [] [] [] [] | 23
1229 texinfo | [] [] [] [] [] | 17
1230 tin | | 4
1231 unicode-han-tra... | | 0
1232 unicode-transla... | | 2
1233 util-linux-ng | [] [] [] [] | 20
1234 vice | () () | 1
1235 vmm | [] | 4
1236 vorbis-tools | [] | 6
1237 wastesedge | | 2
1238 wdiff | [] [] | 7
1239 wget | [] [] [] [] [] | 26
1240 wyslij-po | [] [] | 8
1241 xchat | [] [] [] [] [] [] | 36
1242 xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63
1243 xkeyboard-config | [] [] [] | 22
1244 +---------------------------------------------------+
1245 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
1246 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618
1247
1248 Some counters in the preceding matrix are higher than the number of
1249visible blocks let us expect. This is because a few extra PO files are
1250used for implementing regional variants of languages, or language
1251dialects.
1252
1253 For a PO file in the matrix above to be effective, the package to
1254which it applies should also have been internationalized and
1255distributed as such by its maintainer. There might be an observable
1256lag between the mere existence a PO file and its wide availability in a
1257distribution.
1258
1259 If June 2010 seems to be old, you may fetch a more recent copy of
1260this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
1261matrix with full percentage details can be found at
1262`http://translationproject.org/extra/matrix.html'.
1263
12641.5 Using `gettext' in new packages
1265===================================
1266
1267If you are writing a freely available program and want to
1268internationalize it you are welcome to use GNU `gettext' in your
1269package. Of course you have to respect the GNU Library General Public
1270License which covers the use of the GNU `gettext' library. This means
1271in particular that even non-free programs can use `libintl' as a shared
1272library, whereas only free software can use `libintl' as a static
1273library or use modified versions of `libintl'.
1274
1275 Once the sources are changed appropriately and the setup can handle
1276the use of `gettext' the only thing missing are the translations. The
1277Free Translation Project is also available for packages which are not
1278developed inside the GNU project. Therefore the information given above
1279applies also for every other Free Software Project. Contact
1280`coordinator@translationproject.org' to make the `.pot' files available
1281to the translation teams.
1282
diff --git a/ChangeLog b/ChangeLog
index e69de29..5363c5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,14 @@
12012-03-07 gettextize <bug-gnu-gettext@gnu.org>
2
3 * m4/gettext.m4: New file, from gettext-0.18.1.
4 * m4/iconv.m4: New file, from gettext-0.18.1.
5 * m4/lib-ld.m4: New file, from gettext-0.18.1.
6 * m4/lib-link.m4: New file, from gettext-0.18.1.
7 * m4/lib-prefix.m4: New file, from gettext-0.18.1.
8 * m4/nls.m4: New file, from gettext-0.18.1.
9 * m4/po.m4: New file, from gettext-0.18.1.
10 * m4/progtest.m4: New file, from gettext-0.18.1.
11 * Makefile.am (SUBDIRS): Add po.
12 * configure.ac (AC_OUTPUT): Add po/Makefile.in.
13 (AM_GNU_GETTEXT_VERSION): Bump to 0.18.1.
14
diff --git a/Makefile.am b/Makefile.am
index 51adac1..3453421 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3SUBDIRS = src 3SUBDIRS = po src
4 4
5EXTRA_DIST = config.rpath \ 5EXTRA_DIST = config.rpath \
6 install-sh 6 install-sh
diff --git a/config.rpath b/config.rpath
index c492a93..17298f2 100755
--- a/config.rpath
+++ b/config.rpath
@@ -2,7 +2,7 @@
2# Output a system dependent set of variables, describing how to set the 2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable. 3# run time search path of shared libraries in an executable.
4# 4#
5# Copyright 1996-2006 Free Software Foundation, Inc. 5# Copyright 1996-2010 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001 6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8# 8#
@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
47done 47done
48cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` 48cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
49 49
50# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. 50# Code taken from libtool.m4's _LT_COMPILER_PIC.
51 51
52wl= 52wl=
53if test "$GCC" = yes; then 53if test "$GCC" = yes; then
@@ -64,7 +64,7 @@ else
64 ;; 64 ;;
65 esac 65 esac
66 ;; 66 ;;
67 mingw* | pw32* | os2*) 67 mingw* | cygwin* | pw32* | os2* | cegcc*)
68 ;; 68 ;;
69 hpux9* | hpux10* | hpux11*) 69 hpux9* | hpux10* | hpux11*)
70 wl='-Wl,' 70 wl='-Wl,'
@@ -74,9 +74,15 @@ else
74 ;; 74 ;;
75 newsos6) 75 newsos6)
76 ;; 76 ;;
77 linux*) 77 linux* | k*bsd*-gnu)
78 case $cc_basename in 78 case $cc_basename in
79 icc* | ecc*) 79 ecc*)
80 wl='-Wl,'
81 ;;
82 icc* | ifort*)
83 wl='-Wl,'
84 ;;
85 lf95*)
80 wl='-Wl,' 86 wl='-Wl,'
81 ;; 87 ;;
82 pgcc | pgf77 | pgf90) 88 pgcc | pgf77 | pgf90)
@@ -100,7 +106,7 @@ else
100 osf3* | osf4* | osf5*) 106 osf3* | osf4* | osf5*)
101 wl='-Wl,' 107 wl='-Wl,'
102 ;; 108 ;;
103 sco3.2v5*) 109 rdos*)
104 ;; 110 ;;
105 solaris*) 111 solaris*)
106 wl='-Wl,' 112 wl='-Wl,'
@@ -108,11 +114,14 @@ else
108 sunos4*) 114 sunos4*)
109 wl='-Qoption ld ' 115 wl='-Qoption ld '
110 ;; 116 ;;
111 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) 117 sysv4 | sysv4.2uw2* | sysv4.3*)
112 wl='-Wl,' 118 wl='-Wl,'
113 ;; 119 ;;
114 sysv4*MP*) 120 sysv4*MP*)
115 ;; 121 ;;
122 sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
123 wl='-Wl,'
124 ;;
116 unicos*) 125 unicos*)
117 wl='-Wl,' 126 wl='-Wl,'
118 ;; 127 ;;
@@ -121,7 +130,7 @@ else
121 esac 130 esac
122fi 131fi
123 132
124# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. 133# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
125 134
126hardcode_libdir_flag_spec= 135hardcode_libdir_flag_spec=
127hardcode_libdir_separator= 136hardcode_libdir_separator=
@@ -129,7 +138,7 @@ hardcode_direct=no
129hardcode_minus_L=no 138hardcode_minus_L=no
130 139
131case "$host_os" in 140case "$host_os" in
132 cygwin* | mingw* | pw32*) 141 cygwin* | mingw* | pw32* | cegcc*)
133 # FIXME: the MSVC++ port hasn't been tested in a loooong time 142 # FIXME: the MSVC++ port hasn't been tested in a loooong time
134 # When not using gcc, we currently assume that we are using 143 # When not using gcc, we currently assume that we are using
135 # Microsoft Visual C++. 144 # Microsoft Visual C++.
@@ -155,7 +164,7 @@ if test "$with_gnu_ld" = yes; then
155 # option of GNU ld is called -rpath, not --rpath. 164 # option of GNU ld is called -rpath, not --rpath.
156 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 165 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
157 case "$host_os" in 166 case "$host_os" in
158 aix3* | aix4* | aix5*) 167 aix[3-9]*)
159 # On AIX/PPC, the GNU linker is very broken 168 # On AIX/PPC, the GNU linker is very broken
160 if test "$host_cpu" != ia64; then 169 if test "$host_cpu" != ia64; then
161 ld_shlibs=no 170 ld_shlibs=no
@@ -179,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
179 ld_shlibs=no 188 ld_shlibs=no
180 fi 189 fi
181 ;; 190 ;;
182 cygwin* | mingw* | pw32*) 191 cygwin* | mingw* | pw32* | cegcc*)
183 # hardcode_libdir_flag_spec is actually meaningless, as there is 192 # hardcode_libdir_flag_spec is actually meaningless, as there is
184 # no search path for DLLs. 193 # no search path for DLLs.
185 hardcode_libdir_flag_spec='-L$libdir' 194 hardcode_libdir_flag_spec='-L$libdir'
@@ -189,11 +198,11 @@ if test "$with_gnu_ld" = yes; then
189 ld_shlibs=no 198 ld_shlibs=no
190 fi 199 fi
191 ;; 200 ;;
192 interix3*) 201 interix[3-9]*)
193 hardcode_direct=no 202 hardcode_direct=no
194 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 203 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
195 ;; 204 ;;
196 linux*) 205 gnu* | linux* | k*bsd*-gnu)
197 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 206 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
198 : 207 :
199 else 208 else
@@ -251,7 +260,7 @@ else
251 hardcode_direct=unsupported 260 hardcode_direct=unsupported
252 fi 261 fi
253 ;; 262 ;;
254 aix4* | aix5*) 263 aix[4-9]*)
255 if test "$host_cpu" = ia64; then 264 if test "$host_cpu" = ia64; then
256 # On IA64, the linker does run time linking by default, so we don't 265 # On IA64, the linker does run time linking by default, so we don't
257 # have to do anything special. 266 # have to do anything special.
@@ -261,7 +270,7 @@ else
261 # Test if we are trying to use run time linking or normal 270 # Test if we are trying to use run time linking or normal
262 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 271 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
263 # need to do runtime linking. 272 # need to do runtime linking.
264 case $host_os in aix4.[23]|aix4.[23].*|aix5*) 273 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
265 for ld_flag in $LDFLAGS; do 274 for ld_flag in $LDFLAGS; do
266 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then 275 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
267 aix_use_runtimelinking=yes 276 aix_use_runtimelinking=yes
@@ -280,7 +289,7 @@ else
280 strings "$collect2name" | grep resolve_lib_name >/dev/null 289 strings "$collect2name" | grep resolve_lib_name >/dev/null
281 then 290 then
282 # We have reworked collect2 291 # We have reworked collect2
283 hardcode_direct=yes 292 :
284 else 293 else
285 # We have old collect2 294 # We have old collect2
286 hardcode_direct=unsupported 295 hardcode_direct=unsupported
@@ -323,7 +332,7 @@ else
323 ;; 332 ;;
324 bsdi[45]*) 333 bsdi[45]*)
325 ;; 334 ;;
326 cygwin* | mingw* | pw32*) 335 cygwin* | mingw* | pw32* | cegcc*)
327 # When not using gcc, we currently assume that we are using 336 # When not using gcc, we currently assume that we are using
328 # Microsoft Visual C++. 337 # Microsoft Visual C++.
329 # hardcode_libdir_flag_spec is actually meaningless, as there is 338 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -359,7 +368,7 @@ else
359 hardcode_direct=yes 368 hardcode_direct=yes
360 hardcode_minus_L=yes 369 hardcode_minus_L=yes
361 ;; 370 ;;
362 freebsd* | kfreebsd*-gnu | dragonfly*) 371 freebsd* | dragonfly*)
363 hardcode_libdir_flag_spec='-R$libdir' 372 hardcode_libdir_flag_spec='-R$libdir'
364 hardcode_direct=yes 373 hardcode_direct=yes
365 ;; 374 ;;
@@ -412,18 +421,22 @@ else
412 hardcode_libdir_separator=: 421 hardcode_libdir_separator=:
413 ;; 422 ;;
414 openbsd*) 423 openbsd*)
415 hardcode_direct=yes 424 if test -f /usr/libexec/ld.so; then
416 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 425 hardcode_direct=yes
417 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 426 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
427 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
428 else
429 case "$host_os" in
430 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
431 hardcode_libdir_flag_spec='-R$libdir'
432 ;;
433 *)
434 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
435 ;;
436 esac
437 fi
418 else 438 else
419 case "$host_os" in 439 ld_shlibs=no
420 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
421 hardcode_libdir_flag_spec='-R$libdir'
422 ;;
423 *)
424 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
425 ;;
426 esac
427 fi 440 fi
428 ;; 441 ;;
429 os2*) 442 os2*)
@@ -471,7 +484,7 @@ else
471 ld_shlibs=yes 484 ld_shlibs=yes
472 fi 485 fi
473 ;; 486 ;;
474 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) 487 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
475 ;; 488 ;;
476 sysv5* | sco3.2v5* | sco5v6*) 489 sysv5* | sco3.2v5* | sco5v6*)
477 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' 490 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
@@ -487,34 +500,52 @@ else
487fi 500fi
488 501
489# Check dynamic linker characteristics 502# Check dynamic linker characteristics
490# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. 503# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
504# Unlike libtool.m4, here we don't care about _all_ names of the library, but
505# only about the one the linker finds when passed -lNAME. This is the last
506# element of library_names_spec in libtool.m4, or possibly two of them if the
507# linker has special search rules.
508library_names_spec= # the last element of library_names_spec in libtool.m4
491libname_spec='lib$name' 509libname_spec='lib$name'
492case "$host_os" in 510case "$host_os" in
493 aix3*) 511 aix3*)
512 library_names_spec='$libname.a'
494 ;; 513 ;;
495 aix4* | aix5*) 514 aix[4-9]*)
515 library_names_spec='$libname$shrext'
496 ;; 516 ;;
497 amigaos*) 517 amigaos*)
518 library_names_spec='$libname.a'
498 ;; 519 ;;
499 beos*) 520 beos*)
521 library_names_spec='$libname$shrext'
500 ;; 522 ;;
501 bsdi[45]*) 523 bsdi[45]*)
524 library_names_spec='$libname$shrext'
502 ;; 525 ;;
503 cygwin* | mingw* | pw32*) 526 cygwin* | mingw* | pw32* | cegcc*)
504 shrext=.dll 527 shrext=.dll
528 library_names_spec='$libname.dll.a $libname.lib'
505 ;; 529 ;;
506 darwin* | rhapsody*) 530 darwin* | rhapsody*)
507 shrext=.dylib 531 shrext=.dylib
532 library_names_spec='$libname$shrext'
508 ;; 533 ;;
509 dgux*) 534 dgux*)
535 library_names_spec='$libname$shrext'
510 ;; 536 ;;
511 freebsd1*) 537 freebsd1*)
512 ;; 538 ;;
513 kfreebsd*-gnu)
514 ;;
515 freebsd* | dragonfly*) 539 freebsd* | dragonfly*)
540 case "$host_os" in
541 freebsd[123]*)
542 library_names_spec='$libname$shrext$versuffix' ;;
543 *)
544 library_names_spec='$libname$shrext' ;;
545 esac
516 ;; 546 ;;
517 gnu*) 547 gnu*)
548 library_names_spec='$libname$shrext'
518 ;; 549 ;;
519 hpux9* | hpux10* | hpux11*) 550 hpux9* | hpux10* | hpux11*)
520 case $host_cpu in 551 case $host_cpu in
@@ -528,10 +559,13 @@ case "$host_os" in
528 shrext=.sl 559 shrext=.sl
529 ;; 560 ;;
530 esac 561 esac
562 library_names_spec='$libname$shrext'
531 ;; 563 ;;
532 interix3*) 564 interix[3-9]*)
565 library_names_spec='$libname$shrext'
533 ;; 566 ;;
534 irix5* | irix6* | nonstopux*) 567 irix5* | irix6* | nonstopux*)
568 library_names_spec='$libname$shrext'
535 case "$host_os" in 569 case "$host_os" in
536 irix5* | nonstopux*) 570 irix5* | nonstopux*)
537 libsuff= shlibsuff= 571 libsuff= shlibsuff=
@@ -548,41 +582,59 @@ case "$host_os" in
548 ;; 582 ;;
549 linux*oldld* | linux*aout* | linux*coff*) 583 linux*oldld* | linux*aout* | linux*coff*)
550 ;; 584 ;;
551 linux*) 585 linux* | k*bsd*-gnu)
586 library_names_spec='$libname$shrext'
552 ;; 587 ;;
553 knetbsd*-gnu) 588 knetbsd*-gnu)
589 library_names_spec='$libname$shrext'
554 ;; 590 ;;
555 netbsd*) 591 netbsd*)
592 library_names_spec='$libname$shrext'
556 ;; 593 ;;
557 newsos6) 594 newsos6)
595 library_names_spec='$libname$shrext'
558 ;; 596 ;;
559 nto-qnx*) 597 nto-qnx*)
598 library_names_spec='$libname$shrext'
560 ;; 599 ;;
561 openbsd*) 600 openbsd*)
601 library_names_spec='$libname$shrext$versuffix'
562 ;; 602 ;;
563 os2*) 603 os2*)
564 libname_spec='$name' 604 libname_spec='$name'
565 shrext=.dll 605 shrext=.dll
606 library_names_spec='$libname.a'
566 ;; 607 ;;
567 osf3* | osf4* | osf5*) 608 osf3* | osf4* | osf5*)
609 library_names_spec='$libname$shrext'
610 ;;
611 rdos*)
568 ;; 612 ;;
569 solaris*) 613 solaris*)
614 library_names_spec='$libname$shrext'
570 ;; 615 ;;
571 sunos4*) 616 sunos4*)
617 library_names_spec='$libname$shrext$versuffix'
572 ;; 618 ;;
573 sysv4 | sysv4.3*) 619 sysv4 | sysv4.3*)
620 library_names_spec='$libname$shrext'
574 ;; 621 ;;
575 sysv4*MP*) 622 sysv4*MP*)
623 library_names_spec='$libname$shrext'
576 ;; 624 ;;
577 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) 625 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
626 library_names_spec='$libname$shrext'
578 ;; 627 ;;
579 uts4*) 628 uts4*)
629 library_names_spec='$libname$shrext'
580 ;; 630 ;;
581esac 631esac
582 632
583sed_quote_subst='s/\(["`$\\]\)/\\\1/g' 633sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
584escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` 634escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
585shlibext=`echo "$shrext" | sed -e 's,^\.,,'` 635shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
636escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
637escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
586escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` 638escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
587 639
588LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF 640LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
@@ -596,6 +648,12 @@ libext="$libext"
596# Shared library suffix (normally "so"). 648# Shared library suffix (normally "so").
597shlibext="$shlibext" 649shlibext="$shlibext"
598 650
651# Format of library name prefix.
652libname_spec="$escaped_libname_spec"
653
654# Library names that the linker finds when passed -lNAME.
655library_names_spec="$escaped_library_names_spec"
656
599# Flag to hardcode \$libdir into a binary during linking. 657# Flag to hardcode \$libdir into a binary during linking.
600# This must work even if \$libdir does not exist. 658# This must work even if \$libdir does not exist.
601hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" 659hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
diff --git a/configure.ac b/configure.ac
index d83d715..d0cf129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,80 +111,79 @@ esac
111AM_CONDITIONAL(MINGW, test "$build_target" = "mingw") 111AM_CONDITIONAL(MINGW, test "$build_target" = "mingw")
112 112
113# check for gettext 113# check for gettext
114AM_GNU_GETTEXT_VERSION([0.17]) 114AM_GNU_GETTEXT_VERSION([0.18.1])
115AM_GNU_GETTEXT([external]) 115AM_GNU_GETTEXT([external])
116 116
117AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h stdarg.h]) 117AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h stdarg.h])
118 118
119# test for GNUnet core 119# test for GNUnet core
120gnunet=0 120gnunet=0
121lookin=${prefix}
122backup_LIBS="$LIBS"
123backup_CFLAGS="$CFLAGS "
124backup_CPPFLAGS="$CPPFLAGS"
125GNUNET_CFLAGS=""
126GNUNET_CPPFLAGS=""
127GNUNET_LIBS=""
121AC_MSG_CHECKING(for GNUnet core) 128AC_MSG_CHECKING(for GNUnet core)
122AC_ARG_WITH(gnunet, 129AC_ARG_WITH(gnunet,
123 [ --with-gnunet=PFX Base of GNUnet installation], 130 [ --with-gnunet=PFX Base of GNUnet installation],
124 [AC_MSG_RESULT([$with_gnunet]) 131 [AC_MSG_RESULT([$with_gnunet])
125 case $with_gnunet in 132 case $with_gnunet in
126 no) 133 no)
134 lookin=""
127 ;; 135 ;;
128 yes) 136 yes)
129 LDFLAGS="-L/usr/lib $LDFLAGS" 137 lookin="${prefix}"
130 CPPFLAGS="-I/usr/include $CPPFLAGS"
131 AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
132 AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
133 gnunet=1))
134 ;; 138 ;;
135 *) 139 *)
136 LDFLAGS="-L$with_gnunet/lib $LDFLAGS" 140 lookin="$with_gnunet"
137 CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
138 AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
139 AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
140 EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
141 gnunet=1))
142 ;; 141 ;;
143 esac 142 esac
144 ], 143 ],
145 [AC_MSG_RESULT([--with-gnunet not specified]) 144 [
146 LDFLAGS="-L/usr/lib $LDFLAGS" 145 AC_MSG_RESULT([--with-gnunet not specified])
147 CPPFLAGS="-I/usr/include $CPPFLAGS" 146 PKG_CHECK_MODULES([GNUNET], [gnunetutil >= 0.9.0], gnunet=1)
148 AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h], 147 ]
149 AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_], 148)
150 gnunet=1))]) 149
151 150if test "x$gnunet" == "x0" -a ! "x$lookin" == "x"
152# if GNUnet was not found, try in /usr/local
153if test "$gnunet" != 1
154then 151then
155AC_MSG_CHECKING(for GNUnet core in /usr/local) 152 AC_MSG_CHECKING(for GNUnet util library in $lookin)
156with_gnunet=/usr/local 153 GNUNET_LIBS="-L${lookin}/lib"
157 LDFLAGS="-L$with_gnunet/lib $LDFLAGS" 154 GNUNET_CFLAGS="-I${lookin}/include"
158 CPPFLAGS="-I$with_gnunet/include $CPPFLAGS" 155 GNUNET_CPPFLAGS="-I${lookin}/include"
159 AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h], 156 LIBS="$GNUNET_LIBS $backup_LIBS"
160 AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_], 157 CFLAGS="$GNUNET_CFLAGS $backup_CFLAGS"
161 EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH" 158 CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS"
162 gnunet=1)) 159 AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h],
160 AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
161 [
162 gnunet=1
163 EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
164 ]
165 ),,[#include <gnunet/platform.h>]
166 )
163fi 167fi
164 168
165if test "$gnunet" != 1 169if test "x$gnunet" == "x0"
166then 170then
167 AC_MSG_ERROR([gnunet-ext requires GNUnet]) 171 AC_MSG_ERROR([gnunet-gtk requires GNUnet])
168fi 172fi
169AC_CHECK_HEADERS([gnunet/gnunet_core_service.h],, 173
170 AC_MSG_ERROR([compiling gnunet-ext requires GNUnet core headers])) 174AC_SUBST(GNUNET_CFLAGS)
171 175AC_SUBST(GNUNET_LIBS)
172SAVELIBS=$LIBS 176LIBS="$backup_LIBS"
173AC_CHECK_LIB(gnunetutil,GNUNET_log,, 177CFLAGS="$backup_CFLAGS"
174 AC_MSG_ERROR([gnunet-ext requires libgnunetutil])) 178CPPFLAGS="$backup_CPPFLAGS"
175AC_CHECK_LIB(gnunetcore,GNUNET_CORE_connect,, 179
176 AC_MSG_ERROR([gnunet-ext requires libgnunetcore]))
177LIBS=$SAVELIBS
178
179AC_SUBST(GNUNETEXT_CFLAGS)
180AC_SUBST(GNUNETEXT_LIBS)
181AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data]) 180AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data])
182 181
183# Set PACKAGE_SOURCE_DIR in gnunet_gtk_config.h. 182# Set PACKAGE_SOURCE_DIR in gnunet_gtk_config.h.
184packagesrcdir=`cd $srcdir && pwd` 183packagesrcdir=`cd $srcdir && pwd`
185AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir]) 184AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir])
186 185
187AC_OUTPUT([ 186AC_OUTPUT([ po/Makefile.in
188Makefile 187Makefile
189src/Makefile 188src/Makefile
190src/include/Makefile 189src/include/Makefile
diff --git a/m4/gettext.m4 b/m4/gettext.m4
new file mode 100644
index 0000000..f84e6a5
--- /dev/null
+++ b/m4/gettext.m4
@@ -0,0 +1,383 @@
1# gettext.m4 serial 63 (gettext-0.18)
2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
19
20dnl Macro to add for using GNU gettext.
21
22dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
23dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
24dnl default (if it is not specified or empty) is 'no-libtool'.
25dnl INTLSYMBOL should be 'external' for packages with no intl directory,
26dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
27dnl If INTLSYMBOL is 'use-libtool', then a libtool library
28dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
29dnl depending on --{enable,disable}-{shared,static} and on the presence of
30dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
31dnl $(top_builddir)/intl/libintl.a will be created.
32dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
33dnl implementations (in libc or libintl) without the ngettext() function
34dnl will be ignored. If NEEDSYMBOL is specified and is
35dnl 'need-formatstring-macros', then GNU gettext implementations that don't
36dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
37dnl INTLDIR is used to find the intl libraries. If empty,
38dnl the value `$(top_builddir)/intl/' is used.
39dnl
40dnl The result of the configuration is one of three cases:
41dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
42dnl and used.
43dnl Catalog format: GNU --> install in $(datadir)
44dnl Catalog extension: .mo after installation, .gmo in source tree
45dnl 2) GNU gettext has been found in the system's C library.
46dnl Catalog format: GNU --> install in $(datadir)
47dnl Catalog extension: .mo after installation, .gmo in source tree
48dnl 3) No internationalization, always use English msgid.
49dnl Catalog format: none
50dnl Catalog extension: none
51dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
52dnl The use of .gmo is historical (it was needed to avoid overwriting the
53dnl GNU format catalogs when building on a platform with an X/Open gettext),
54dnl but we keep it in order not to force irrelevant filename changes on the
55dnl maintainers.
56dnl
57AC_DEFUN([AM_GNU_GETTEXT],
58[
59 dnl Argument checking.
60 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
61 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
62])])])])])
63 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
64 [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
65 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
66 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
67])])])])
68 define([gt_included_intl],
69 ifelse([$1], [external],
70 ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
71 [yes]))
72 define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
73 gt_NEEDS_INIT
74 AM_GNU_GETTEXT_NEED([$2])
75
76 AC_REQUIRE([AM_PO_SUBDIRS])dnl
77 ifelse(gt_included_intl, yes, [
78 AC_REQUIRE([AM_INTL_SUBDIR])dnl
79 ])
80
81 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
82 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
83 AC_REQUIRE([AC_LIB_RPATH])
84
85 dnl Sometimes libintl requires libiconv, so first search for libiconv.
86 dnl Ideally we would do this search only after the
87 dnl if test "$USE_NLS" = "yes"; then
88 dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
89 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
90 dnl the configure script would need to contain the same shell code
91 dnl again, outside any 'if'. There are two solutions:
92 dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
93 dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
94 dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
95 dnl documented, we avoid it.
96 ifelse(gt_included_intl, yes, , [
97 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
98 ])
99
100 dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
101 gt_INTL_MACOSX
102
103 dnl Set USE_NLS.
104 AC_REQUIRE([AM_NLS])
105
106 ifelse(gt_included_intl, yes, [
107 BUILD_INCLUDED_LIBINTL=no
108 USE_INCLUDED_LIBINTL=no
109 ])
110 LIBINTL=
111 LTLIBINTL=
112 POSUB=
113
114 dnl Add a version number to the cache macros.
115 case " $gt_needs " in
116 *" need-formatstring-macros "*) gt_api_version=3 ;;
117 *" need-ngettext "*) gt_api_version=2 ;;
118 *) gt_api_version=1 ;;
119 esac
120 gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
121 gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
122
123 dnl If we use NLS figure out what method
124 if test "$USE_NLS" = "yes"; then
125 gt_use_preinstalled_gnugettext=no
126 ifelse(gt_included_intl, yes, [
127 AC_MSG_CHECKING([whether included gettext is requested])
128 AC_ARG_WITH([included-gettext],
129 [ --with-included-gettext use the GNU gettext library included here],
130 nls_cv_force_use_gnu_gettext=$withval,
131 nls_cv_force_use_gnu_gettext=no)
132 AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
133
134 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
135 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
136 ])
137 dnl User does not insist on using GNU NLS library. Figure out what
138 dnl to use. If GNU gettext is available we use this. Else we have
139 dnl to fall back to GNU NLS library.
140
141 if test $gt_api_version -ge 3; then
142 gt_revision_test_code='
143#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
144#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
145#endif
146changequote(,)dnl
147typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
148changequote([,])dnl
149'
150 else
151 gt_revision_test_code=
152 fi
153 if test $gt_api_version -ge 2; then
154 gt_expression_test_code=' + * ngettext ("", "", 0)'
155 else
156 gt_expression_test_code=
157 fi
158
159 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
160 [AC_TRY_LINK([#include <libintl.h>
161$gt_revision_test_code
162extern int _nl_msg_cat_cntr;
163extern int *_nl_domain_bindings;],
164 [bindtextdomain ("", "");
165return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
166 [eval "$gt_func_gnugettext_libc=yes"],
167 [eval "$gt_func_gnugettext_libc=no"])])
168
169 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
170 dnl Sometimes libintl requires libiconv, so first search for libiconv.
171 ifelse(gt_included_intl, yes, , [
172 AM_ICONV_LINK
173 ])
174 dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
175 dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
176 dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
177 dnl even if libiconv doesn't exist.
178 AC_LIB_LINKFLAGS_BODY([intl])
179 AC_CACHE_CHECK([for GNU gettext in libintl],
180 [$gt_func_gnugettext_libintl],
181 [gt_save_CPPFLAGS="$CPPFLAGS"
182 CPPFLAGS="$CPPFLAGS $INCINTL"
183 gt_save_LIBS="$LIBS"
184 LIBS="$LIBS $LIBINTL"
185 dnl Now see whether libintl exists and does not depend on libiconv.
186 AC_TRY_LINK([#include <libintl.h>
187$gt_revision_test_code
188extern int _nl_msg_cat_cntr;
189extern
190#ifdef __cplusplus
191"C"
192#endif
193const char *_nl_expand_alias (const char *);],
194 [bindtextdomain ("", "");
195return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
196 [eval "$gt_func_gnugettext_libintl=yes"],
197 [eval "$gt_func_gnugettext_libintl=no"])
198 dnl Now see whether libintl exists and depends on libiconv.
199 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
200 LIBS="$LIBS $LIBICONV"
201 AC_TRY_LINK([#include <libintl.h>
202$gt_revision_test_code
203extern int _nl_msg_cat_cntr;
204extern
205#ifdef __cplusplus
206"C"
207#endif
208const char *_nl_expand_alias (const char *);],
209 [bindtextdomain ("", "");
210return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
211 [LIBINTL="$LIBINTL $LIBICONV"
212 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
213 eval "$gt_func_gnugettext_libintl=yes"
214 ])
215 fi
216 CPPFLAGS="$gt_save_CPPFLAGS"
217 LIBS="$gt_save_LIBS"])
218 fi
219
220 dnl If an already present or preinstalled GNU gettext() is found,
221 dnl use it. But if this macro is used in GNU gettext, and GNU
222 dnl gettext is already preinstalled in libintl, we update this
223 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
224 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
225 || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
226 && test "$PACKAGE" != gettext-runtime \
227 && test "$PACKAGE" != gettext-tools; }; then
228 gt_use_preinstalled_gnugettext=yes
229 else
230 dnl Reset the values set by searching for libintl.
231 LIBINTL=
232 LTLIBINTL=
233 INCINTL=
234 fi
235
236 ifelse(gt_included_intl, yes, [
237 if test "$gt_use_preinstalled_gnugettext" != "yes"; then
238 dnl GNU gettext is not found in the C library.
239 dnl Fall back on included GNU gettext library.
240 nls_cv_use_gnu_gettext=yes
241 fi
242 fi
243
244 if test "$nls_cv_use_gnu_gettext" = "yes"; then
245 dnl Mark actions used to generate GNU NLS library.
246 BUILD_INCLUDED_LIBINTL=yes
247 USE_INCLUDED_LIBINTL=yes
248 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
249 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
250 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
251 fi
252
253 CATOBJEXT=
254 if test "$gt_use_preinstalled_gnugettext" = "yes" \
255 || test "$nls_cv_use_gnu_gettext" = "yes"; then
256 dnl Mark actions to use GNU gettext tools.
257 CATOBJEXT=.gmo
258 fi
259 ])
260
261 if test -n "$INTL_MACOSX_LIBS"; then
262 if test "$gt_use_preinstalled_gnugettext" = "yes" \
263 || test "$nls_cv_use_gnu_gettext" = "yes"; then
264 dnl Some extra flags are needed during linking.
265 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
266 LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
267 fi
268 fi
269
270 if test "$gt_use_preinstalled_gnugettext" = "yes" \
271 || test "$nls_cv_use_gnu_gettext" = "yes"; then
272 AC_DEFINE([ENABLE_NLS], [1],
273 [Define to 1 if translation of program messages to the user's native language
274 is requested.])
275 else
276 USE_NLS=no
277 fi
278 fi
279
280 AC_MSG_CHECKING([whether to use NLS])
281 AC_MSG_RESULT([$USE_NLS])
282 if test "$USE_NLS" = "yes"; then
283 AC_MSG_CHECKING([where the gettext function comes from])
284 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
285 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
286 gt_source="external libintl"
287 else
288 gt_source="libc"
289 fi
290 else
291 gt_source="included intl directory"
292 fi
293 AC_MSG_RESULT([$gt_source])
294 fi
295
296 if test "$USE_NLS" = "yes"; then
297
298 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
299 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
300 AC_MSG_CHECKING([how to link with libintl])
301 AC_MSG_RESULT([$LIBINTL])
302 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
303 fi
304
305 dnl For backward compatibility. Some packages may be using this.
306 AC_DEFINE([HAVE_GETTEXT], [1],
307 [Define if the GNU gettext() function is already present or preinstalled.])
308 AC_DEFINE([HAVE_DCGETTEXT], [1],
309 [Define if the GNU dcgettext() function is already present or preinstalled.])
310 fi
311
312 dnl We need to process the po/ directory.
313 POSUB=po
314 fi
315
316 ifelse(gt_included_intl, yes, [
317 dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
318 dnl to 'yes' because some of the testsuite requires it.
319 if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
320 BUILD_INCLUDED_LIBINTL=yes
321 fi
322
323 dnl Make all variables we use known to autoconf.
324 AC_SUBST([BUILD_INCLUDED_LIBINTL])
325 AC_SUBST([USE_INCLUDED_LIBINTL])
326 AC_SUBST([CATOBJEXT])
327
328 dnl For backward compatibility. Some configure.ins may be using this.
329 nls_cv_header_intl=
330 nls_cv_header_libgt=
331
332 dnl For backward compatibility. Some Makefiles may be using this.
333 DATADIRNAME=share
334 AC_SUBST([DATADIRNAME])
335
336 dnl For backward compatibility. Some Makefiles may be using this.
337 INSTOBJEXT=.mo
338 AC_SUBST([INSTOBJEXT])
339
340 dnl For backward compatibility. Some Makefiles may be using this.
341 GENCAT=gencat
342 AC_SUBST([GENCAT])
343
344 dnl For backward compatibility. Some Makefiles may be using this.
345 INTLOBJS=
346 if test "$USE_INCLUDED_LIBINTL" = yes; then
347 INTLOBJS="\$(GETTOBJS)"
348 fi
349 AC_SUBST([INTLOBJS])
350
351 dnl Enable libtool support if the surrounding package wishes it.
352 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
353 AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
354 ])
355
356 dnl For backward compatibility. Some Makefiles may be using this.
357 INTLLIBS="$LIBINTL"
358 AC_SUBST([INTLLIBS])
359
360 dnl Make all documented variables known to autoconf.
361 AC_SUBST([LIBINTL])
362 AC_SUBST([LTLIBINTL])
363 AC_SUBST([POSUB])
364])
365
366
367dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
368m4_define([gt_NEEDS_INIT],
369[
370 m4_divert_text([DEFAULTS], [gt_needs=])
371 m4_define([gt_NEEDS_INIT], [])
372])
373
374
375dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
376AC_DEFUN([AM_GNU_GETTEXT_NEED],
377[
378 m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
379])
380
381
382dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
383AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
new file mode 100644
index 0000000..e2041b9
--- /dev/null
+++ b/m4/iconv.m4
@@ -0,0 +1,214 @@
1# iconv.m4 serial 11 (gettext-0.18.1)
2dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
10[
11 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
12 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
13 AC_REQUIRE([AC_LIB_RPATH])
14
15 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
16 dnl accordingly.
17 AC_LIB_LINKFLAGS_BODY([iconv])
18])
19
20AC_DEFUN([AM_ICONV_LINK],
21[
22 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
23 dnl those with the standalone portable GNU libiconv installed).
24 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
25
26 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
27 dnl accordingly.
28 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
29
30 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
31 dnl because if the user has installed libiconv and not disabled its use
32 dnl via --without-libiconv-prefix, he wants to use it. The first
33 dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
34 am_save_CPPFLAGS="$CPPFLAGS"
35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
36
37 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
38 am_cv_func_iconv="no, consider installing GNU libiconv"
39 am_cv_lib_iconv=no
40 AC_TRY_LINK([#include <stdlib.h>
41#include <iconv.h>],
42 [iconv_t cd = iconv_open("","");
43 iconv(cd,NULL,NULL,NULL,NULL);
44 iconv_close(cd);],
45 [am_cv_func_iconv=yes])
46 if test "$am_cv_func_iconv" != yes; then
47 am_save_LIBS="$LIBS"
48 LIBS="$LIBS $LIBICONV"
49 AC_TRY_LINK([#include <stdlib.h>
50#include <iconv.h>],
51 [iconv_t cd = iconv_open("","");
52 iconv(cd,NULL,NULL,NULL,NULL);
53 iconv_close(cd);],
54 [am_cv_lib_iconv=yes]
55 [am_cv_func_iconv=yes])
56 LIBS="$am_save_LIBS"
57 fi
58 ])
59 if test "$am_cv_func_iconv" = yes; then
60 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
61 dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
62 am_save_LIBS="$LIBS"
63 if test $am_cv_lib_iconv = yes; then
64 LIBS="$LIBS $LIBICONV"
65 fi
66 AC_TRY_RUN([
67#include <iconv.h>
68#include <string.h>
69int main ()
70{
71 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
72 returns. */
73 {
74 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
75 if (cd_utf8_to_88591 != (iconv_t)(-1))
76 {
77 static const char input[] = "\342\202\254"; /* EURO SIGN */
78 char buf[10];
79 const char *inptr = input;
80 size_t inbytesleft = strlen (input);
81 char *outptr = buf;
82 size_t outbytesleft = sizeof (buf);
83 size_t res = iconv (cd_utf8_to_88591,
84 (char **) &inptr, &inbytesleft,
85 &outptr, &outbytesleft);
86 if (res == 0)
87 return 1;
88 }
89 }
90 /* Test against Solaris 10 bug: Failures are not distinguishable from
91 successful returns. */
92 {
93 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
94 if (cd_ascii_to_88591 != (iconv_t)(-1))
95 {
96 static const char input[] = "\263";
97 char buf[10];
98 const char *inptr = input;
99 size_t inbytesleft = strlen (input);
100 char *outptr = buf;
101 size_t outbytesleft = sizeof (buf);
102 size_t res = iconv (cd_ascii_to_88591,
103 (char **) &inptr, &inbytesleft,
104 &outptr, &outbytesleft);
105 if (res == 0)
106 return 1;
107 }
108 }
109#if 0 /* This bug could be worked around by the caller. */
110 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
111 {
112 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
113 if (cd_88591_to_utf8 != (iconv_t)(-1))
114 {
115 static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
116 char buf[50];
117 const char *inptr = input;
118 size_t inbytesleft = strlen (input);
119 char *outptr = buf;
120 size_t outbytesleft = sizeof (buf);
121 size_t res = iconv (cd_88591_to_utf8,
122 (char **) &inptr, &inbytesleft,
123 &outptr, &outbytesleft);
124 if ((int)res > 0)
125 return 1;
126 }
127 }
128#endif
129 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
130 provided. */
131 if (/* Try standardized names. */
132 iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
133 /* Try IRIX, OSF/1 names. */
134 && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
135 /* Try AIX names. */
136 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
137 /* Try HP-UX names. */
138 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
139 return 1;
140 return 0;
141}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
142 [case "$host_os" in
143 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
144 *) am_cv_func_iconv_works="guessing yes" ;;
145 esac])
146 LIBS="$am_save_LIBS"
147 ])
148 case "$am_cv_func_iconv_works" in
149 *no) am_func_iconv=no am_cv_lib_iconv=no ;;
150 *) am_func_iconv=yes ;;
151 esac
152 else
153 am_func_iconv=no am_cv_lib_iconv=no
154 fi
155 if test "$am_func_iconv" = yes; then
156 AC_DEFINE([HAVE_ICONV], [1],
157 [Define if you have the iconv() function and it works.])
158 fi
159 if test "$am_cv_lib_iconv" = yes; then
160 AC_MSG_CHECKING([how to link with libiconv])
161 AC_MSG_RESULT([$LIBICONV])
162 else
163 dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
164 dnl either.
165 CPPFLAGS="$am_save_CPPFLAGS"
166 LIBICONV=
167 LTLIBICONV=
168 fi
169 AC_SUBST([LIBICONV])
170 AC_SUBST([LTLIBICONV])
171])
172
173dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
174dnl avoid warnings like
175dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
176dnl This is tricky because of the way 'aclocal' is implemented:
177dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
178dnl Otherwise aclocal's initial scan pass would miss the macro definition.
179dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
180dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
181dnl warnings.
182m4_define([gl_iconv_AC_DEFUN],
183 m4_version_prereq([2.64],
184 [[AC_DEFUN_ONCE(
185 [$1], [$2])]],
186 [[AC_DEFUN(
187 [$1], [$2])]]))
188gl_iconv_AC_DEFUN([AM_ICONV],
189[
190 AM_ICONV_LINK
191 if test "$am_cv_func_iconv" = yes; then
192 AC_MSG_CHECKING([for iconv declaration])
193 AC_CACHE_VAL([am_cv_proto_iconv], [
194 AC_TRY_COMPILE([
195#include <stdlib.h>
196#include <iconv.h>
197extern
198#ifdef __cplusplus
199"C"
200#endif
201#if defined(__STDC__) || defined(__cplusplus)
202size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
203#else
204size_t iconv();
205#endif
206], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
207 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);"])
208 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
209 AC_MSG_RESULT([
210 $am_cv_proto_iconv])
211 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
212 [Define as const if the declaration of iconv() needs const.])
213 fi
214])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
new file mode 100644
index 0000000..ebb3052
--- /dev/null
+++ b/m4/lib-ld.m4
@@ -0,0 +1,110 @@
1# lib-ld.m4 serial 4 (gettext-0.18)
2dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl Subroutines of libtool.m4,
8dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
9dnl with libtool.m4.
10
11dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
12AC_DEFUN([AC_LIB_PROG_LD_GNU],
13[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
14[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
15case `$LD -v 2>&1 </dev/null` in
16*GNU* | *'with BFD'*)
17 acl_cv_prog_gnu_ld=yes ;;
18*)
19 acl_cv_prog_gnu_ld=no ;;
20esac])
21with_gnu_ld=$acl_cv_prog_gnu_ld
22])
23
24dnl From libtool-1.4. Sets the variable LD.
25AC_DEFUN([AC_LIB_PROG_LD],
26[AC_ARG_WITH([gnu-ld],
27[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
28test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
29AC_REQUIRE([AC_PROG_CC])dnl
30AC_REQUIRE([AC_CANONICAL_HOST])dnl
31# Prepare PATH_SEPARATOR.
32# The user is always right.
33if test "${PATH_SEPARATOR+set}" != set; then
34 echo "#! /bin/sh" >conf$$.sh
35 echo "exit 0" >>conf$$.sh
36 chmod +x conf$$.sh
37 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
38 PATH_SEPARATOR=';'
39 else
40 PATH_SEPARATOR=:
41 fi
42 rm -f conf$$.sh
43fi
44ac_prog=ld
45if test "$GCC" = yes; then
46 # Check if gcc -print-prog-name=ld gives a path.
47 AC_MSG_CHECKING([for ld used by GCC])
48 case $host in
49 *-*-mingw*)
50 # gcc leaves a trailing carriage return which upsets mingw
51 ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
52 *)
53 ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
54 esac
55 case $ac_prog in
56 # Accept absolute paths.
57 [[\\/]* | [A-Za-z]:[\\/]*)]
58 [re_direlt='/[^/][^/]*/\.\./']
59 # Canonicalize the path of ld
60 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
61 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
62 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
63 done
64 test -z "$LD" && LD="$ac_prog"
65 ;;
66 "")
67 # If it fails, then pretend we aren't using GCC.
68 ac_prog=ld
69 ;;
70 *)
71 # If it is relative, then search for the first ld in PATH.
72 with_gnu_ld=unknown
73 ;;
74 esac
75elif test "$with_gnu_ld" = yes; then
76 AC_MSG_CHECKING([for GNU ld])
77else
78 AC_MSG_CHECKING([for non-GNU ld])
79fi
80AC_CACHE_VAL([acl_cv_path_LD],
81[if test -z "$LD"; then
82 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
83 for ac_dir in $PATH; do
84 test -z "$ac_dir" && ac_dir=.
85 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
86 acl_cv_path_LD="$ac_dir/$ac_prog"
87 # Check to see if the program is GNU ld. I'd rather use --version,
88 # but apparently some GNU ld's only accept -v.
89 # Break only if it was the GNU/non-GNU ld that we prefer.
90 case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
91 *GNU* | *'with BFD'*)
92 test "$with_gnu_ld" != no && break ;;
93 *)
94 test "$with_gnu_ld" != yes && break ;;
95 esac
96 fi
97 done
98 IFS="$ac_save_ifs"
99else
100 acl_cv_path_LD="$LD" # Let the user override the test with a path.
101fi])
102LD="$acl_cv_path_LD"
103if test -n "$LD"; then
104 AC_MSG_RESULT([$LD])
105else
106 AC_MSG_RESULT([no])
107fi
108test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
109AC_LIB_PROG_LD_GNU
110])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
new file mode 100644
index 0000000..c73bd8e
--- /dev/null
+++ b/m4/lib-link.m4
@@ -0,0 +1,774 @@
1# lib-link.m4 serial 21 (gettext-0.18)
2dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9AC_PREREQ([2.54])
10
11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
12dnl the libraries corresponding to explicit and implicit dependencies.
13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
14dnl augments the CPPFLAGS variable.
15dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
16dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
17AC_DEFUN([AC_LIB_LINKFLAGS],
18[
19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20 AC_REQUIRE([AC_LIB_RPATH])
21 pushdef([Name],[translit([$1],[./-], [___])])
22 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
25 AC_LIB_LINKFLAGS_BODY([$1], [$2])
26 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
27 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
28 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
29 ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
30 ])
31 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
32 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
33 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
34 LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
36 AC_SUBST([LIB]NAME)
37 AC_SUBST([LTLIB]NAME)
38 AC_SUBST([LIB]NAME[_PREFIX])
39 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
40 dnl results of this search when this library appears as a dependency.
41 HAVE_LIB[]NAME=yes
42 popdef([NAME])
43 popdef([Name])
44])
45
46dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
47dnl searches for libname and the libraries corresponding to explicit and
48dnl implicit dependencies, together with the specified include files and
49dnl the ability to compile and link the specified testcode. The missing-message
50dnl defaults to 'no' and may contain additional hints for the user.
51dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
52dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
53dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
54dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
55dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
56dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
57AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
58[
59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
60 AC_REQUIRE([AC_LIB_RPATH])
61 pushdef([Name],[translit([$1],[./-], [___])])
62 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
64
65 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
66 dnl accordingly.
67 AC_LIB_LINKFLAGS_BODY([$1], [$2])
68
69 dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
70 dnl because if the user has installed lib[]Name and not disabled its use
71 dnl via --without-lib[]Name-prefix, he wants to use it.
72 ac_save_CPPFLAGS="$CPPFLAGS"
73 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
74
75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
76 ac_save_LIBS="$LIBS"
77 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
78 dnl because these -l options might require -L options that are present in
79 dnl LIBS. -l options benefit only from the -L options listed before it.
80 dnl Otherwise, add it to the front of LIBS, because it may be a static
81 dnl library that depends on another static library that is present in LIBS.
82 dnl Static libraries benefit only from the static libraries listed after
83 dnl it.
84 case " $LIB[]NAME" in
85 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
86 *) LIBS="$LIB[]NAME $LIBS" ;;
87 esac
88 AC_TRY_LINK([$3], [$4],
89 [ac_cv_lib[]Name=yes],
90 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
91 LIBS="$ac_save_LIBS"
92 ])
93 if test "$ac_cv_lib[]Name" = yes; then
94 HAVE_LIB[]NAME=yes
95 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
96 AC_MSG_CHECKING([how to link with lib[]$1])
97 AC_MSG_RESULT([$LIB[]NAME])
98 else
99 HAVE_LIB[]NAME=no
100 dnl If $LIB[]NAME didn't lead to a usable library, we don't need
101 dnl $INC[]NAME either.
102 CPPFLAGS="$ac_save_CPPFLAGS"
103 LIB[]NAME=
104 LTLIB[]NAME=
105 LIB[]NAME[]_PREFIX=
106 fi
107 AC_SUBST([HAVE_LIB]NAME)
108 AC_SUBST([LIB]NAME)
109 AC_SUBST([LTLIB]NAME)
110 AC_SUBST([LIB]NAME[_PREFIX])
111 popdef([NAME])
112 popdef([Name])
113])
114
115dnl Determine the platform dependent parameters needed to use rpath:
116dnl acl_libext,
117dnl acl_shlibext,
118dnl acl_hardcode_libdir_flag_spec,
119dnl acl_hardcode_libdir_separator,
120dnl acl_hardcode_direct,
121dnl acl_hardcode_minus_L.
122AC_DEFUN([AC_LIB_RPATH],
123[
124 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
125 m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
126 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
127 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
128 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
129 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
130 AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
131 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
132 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
133 . ./conftest.sh
134 rm -f ./conftest.sh
135 acl_cv_rpath=done
136 ])
137 wl="$acl_cv_wl"
138 acl_libext="$acl_cv_libext"
139 acl_shlibext="$acl_cv_shlibext"
140 acl_libname_spec="$acl_cv_libname_spec"
141 acl_library_names_spec="$acl_cv_library_names_spec"
142 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
143 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
144 acl_hardcode_direct="$acl_cv_hardcode_direct"
145 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
146 dnl Determine whether the user wants rpath handling at all.
147 AC_ARG_ENABLE([rpath],
148 [ --disable-rpath do not hardcode runtime library paths],
149 :, enable_rpath=yes)
150])
151
152dnl AC_LIB_FROMPACKAGE(name, package)
153dnl declares that libname comes from the given package. The configure file
154dnl will then not have a --with-libname-prefix option but a
155dnl --with-package-prefix option. Several libraries can come from the same
156dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
157dnl macro call that searches for libname.
158AC_DEFUN([AC_LIB_FROMPACKAGE],
159[
160 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
161 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
162 define([acl_frompackage_]NAME, [$2])
163 popdef([NAME])
164 pushdef([PACK],[$2])
165 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
166 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
167 define([acl_libsinpackage_]PACKUP,
168 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
169 popdef([PACKUP])
170 popdef([PACK])
171])
172
173dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
174dnl the libraries corresponding to explicit and implicit dependencies.
175dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
176dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
177dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
178AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
179[
180 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
181 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
182 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
183 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
184 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
185 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
186 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
187 dnl Autoconf >= 2.61 supports dots in --with options.
188 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
189 dnl By default, look in $includedir and $libdir.
190 use_additional=yes
191 AC_LIB_WITH_FINAL_PREFIX([
192 eval additional_includedir=\"$includedir\"
193 eval additional_libdir=\"$libdir\"
194 ])
195 AC_ARG_WITH(P_A_C_K[-prefix],
196[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
197 --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
198[
199 if test "X$withval" = "Xno"; then
200 use_additional=no
201 else
202 if test "X$withval" = "X"; then
203 AC_LIB_WITH_FINAL_PREFIX([
204 eval additional_includedir=\"$includedir\"
205 eval additional_libdir=\"$libdir\"
206 ])
207 else
208 additional_includedir="$withval/include"
209 additional_libdir="$withval/$acl_libdirstem"
210 if test "$acl_libdirstem2" != "$acl_libdirstem" \
211 && ! test -d "$withval/$acl_libdirstem"; then
212 additional_libdir="$withval/$acl_libdirstem2"
213 fi
214 fi
215 fi
216])
217 dnl Search the library and its dependencies in $additional_libdir and
218 dnl $LDFLAGS. Using breadth-first-seach.
219 LIB[]NAME=
220 LTLIB[]NAME=
221 INC[]NAME=
222 LIB[]NAME[]_PREFIX=
223 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
224 dnl computed. So it has to be reset here.
225 HAVE_LIB[]NAME=
226 rpathdirs=
227 ltrpathdirs=
228 names_already_handled=
229 names_next_round='$1 $2'
230 while test -n "$names_next_round"; do
231 names_this_round="$names_next_round"
232 names_next_round=
233 for name in $names_this_round; do
234 already_handled=
235 for n in $names_already_handled; do
236 if test "$n" = "$name"; then
237 already_handled=yes
238 break
239 fi
240 done
241 if test -z "$already_handled"; then
242 names_already_handled="$names_already_handled $name"
243 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
244 dnl or AC_LIB_HAVE_LINKFLAGS call.
245 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
246 eval value=\"\$HAVE_LIB$uppername\"
247 if test -n "$value"; then
248 if test "$value" = yes; then
249 eval value=\"\$LIB$uppername\"
250 test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
251 eval value=\"\$LTLIB$uppername\"
252 test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
253 else
254 dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
255 dnl that this library doesn't exist. So just drop it.
256 :
257 fi
258 else
259 dnl Search the library lib$name in $additional_libdir and $LDFLAGS
260 dnl and the already constructed $LIBNAME/$LTLIBNAME.
261 found_dir=
262 found_la=
263 found_so=
264 found_a=
265 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
266 if test -n "$acl_shlibext"; then
267 shrext=".$acl_shlibext" # typically: shrext=.so
268 else
269 shrext=
270 fi
271 if test $use_additional = yes; then
272 dir="$additional_libdir"
273 dnl The same code as in the loop below:
274 dnl First look for a shared library.
275 if test -n "$acl_shlibext"; then
276 if test -f "$dir/$libname$shrext"; then
277 found_dir="$dir"
278 found_so="$dir/$libname$shrext"
279 else
280 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
281 ver=`(cd "$dir" && \
282 for f in "$libname$shrext".*; do echo "$f"; done \
283 | sed -e "s,^$libname$shrext\\\\.,," \
284 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
285 | sed 1q ) 2>/dev/null`
286 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
287 found_dir="$dir"
288 found_so="$dir/$libname$shrext.$ver"
289 fi
290 else
291 eval library_names=\"$acl_library_names_spec\"
292 for f in $library_names; do
293 if test -f "$dir/$f"; then
294 found_dir="$dir"
295 found_so="$dir/$f"
296 break
297 fi
298 done
299 fi
300 fi
301 fi
302 dnl Then look for a static library.
303 if test "X$found_dir" = "X"; then
304 if test -f "$dir/$libname.$acl_libext"; then
305 found_dir="$dir"
306 found_a="$dir/$libname.$acl_libext"
307 fi
308 fi
309 if test "X$found_dir" != "X"; then
310 if test -f "$dir/$libname.la"; then
311 found_la="$dir/$libname.la"
312 fi
313 fi
314 fi
315 if test "X$found_dir" = "X"; then
316 for x in $LDFLAGS $LTLIB[]NAME; do
317 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
318 case "$x" in
319 -L*)
320 dir=`echo "X$x" | sed -e 's/^X-L//'`
321 dnl First look for a shared library.
322 if test -n "$acl_shlibext"; then
323 if test -f "$dir/$libname$shrext"; then
324 found_dir="$dir"
325 found_so="$dir/$libname$shrext"
326 else
327 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
328 ver=`(cd "$dir" && \
329 for f in "$libname$shrext".*; do echo "$f"; done \
330 | sed -e "s,^$libname$shrext\\\\.,," \
331 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
332 | sed 1q ) 2>/dev/null`
333 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
334 found_dir="$dir"
335 found_so="$dir/$libname$shrext.$ver"
336 fi
337 else
338 eval library_names=\"$acl_library_names_spec\"
339 for f in $library_names; do
340 if test -f "$dir/$f"; then
341 found_dir="$dir"
342 found_so="$dir/$f"
343 break
344 fi
345 done
346 fi
347 fi
348 fi
349 dnl Then look for a static library.
350 if test "X$found_dir" = "X"; then
351 if test -f "$dir/$libname.$acl_libext"; then
352 found_dir="$dir"
353 found_a="$dir/$libname.$acl_libext"
354 fi
355 fi
356 if test "X$found_dir" != "X"; then
357 if test -f "$dir/$libname.la"; then
358 found_la="$dir/$libname.la"
359 fi
360 fi
361 ;;
362 esac
363 if test "X$found_dir" != "X"; then
364 break
365 fi
366 done
367 fi
368 if test "X$found_dir" != "X"; then
369 dnl Found the library.
370 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
371 if test "X$found_so" != "X"; then
372 dnl Linking with a shared library. We attempt to hardcode its
373 dnl directory into the executable's runpath, unless it's the
374 dnl standard /usr/lib.
375 if test "$enable_rpath" = no \
376 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
377 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
378 dnl No hardcoding is needed.
379 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
380 else
381 dnl Use an explicit option to hardcode DIR into the resulting
382 dnl binary.
383 dnl Potentially add DIR to ltrpathdirs.
384 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
385 haveit=
386 for x in $ltrpathdirs; do
387 if test "X$x" = "X$found_dir"; then
388 haveit=yes
389 break
390 fi
391 done
392 if test -z "$haveit"; then
393 ltrpathdirs="$ltrpathdirs $found_dir"
394 fi
395 dnl The hardcoding into $LIBNAME is system dependent.
396 if test "$acl_hardcode_direct" = yes; then
397 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
398 dnl resulting binary.
399 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
400 else
401 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
402 dnl Use an explicit option to hardcode DIR into the resulting
403 dnl binary.
404 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
405 dnl Potentially add DIR to rpathdirs.
406 dnl The rpathdirs will be appended to $LIBNAME at the end.
407 haveit=
408 for x in $rpathdirs; do
409 if test "X$x" = "X$found_dir"; then
410 haveit=yes
411 break
412 fi
413 done
414 if test -z "$haveit"; then
415 rpathdirs="$rpathdirs $found_dir"
416 fi
417 else
418 dnl Rely on "-L$found_dir".
419 dnl But don't add it if it's already contained in the LDFLAGS
420 dnl or the already constructed $LIBNAME
421 haveit=
422 for x in $LDFLAGS $LIB[]NAME; do
423 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
424 if test "X$x" = "X-L$found_dir"; then
425 haveit=yes
426 break
427 fi
428 done
429 if test -z "$haveit"; then
430 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
431 fi
432 if test "$acl_hardcode_minus_L" != no; then
433 dnl FIXME: Not sure whether we should use
434 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
435 dnl here.
436 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
437 else
438 dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
439 dnl here, because this doesn't fit in flags passed to the
440 dnl compiler. So give up. No hardcoding. This affects only
441 dnl very old systems.
442 dnl FIXME: Not sure whether we should use
443 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
444 dnl here.
445 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
446 fi
447 fi
448 fi
449 fi
450 else
451 if test "X$found_a" != "X"; then
452 dnl Linking with a static library.
453 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
454 else
455 dnl We shouldn't come here, but anyway it's good to have a
456 dnl fallback.
457 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
458 fi
459 fi
460 dnl Assume the include files are nearby.
461 additional_includedir=
462 case "$found_dir" in
463 */$acl_libdirstem | */$acl_libdirstem/)
464 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
465 if test "$name" = '$1'; then
466 LIB[]NAME[]_PREFIX="$basedir"
467 fi
468 additional_includedir="$basedir/include"
469 ;;
470 */$acl_libdirstem2 | */$acl_libdirstem2/)
471 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
472 if test "$name" = '$1'; then
473 LIB[]NAME[]_PREFIX="$basedir"
474 fi
475 additional_includedir="$basedir/include"
476 ;;
477 esac
478 if test "X$additional_includedir" != "X"; then
479 dnl Potentially add $additional_includedir to $INCNAME.
480 dnl But don't add it
481 dnl 1. if it's the standard /usr/include,
482 dnl 2. if it's /usr/local/include and we are using GCC on Linux,
483 dnl 3. if it's already present in $CPPFLAGS or the already
484 dnl constructed $INCNAME,
485 dnl 4. if it doesn't exist as a directory.
486 if test "X$additional_includedir" != "X/usr/include"; then
487 haveit=
488 if test "X$additional_includedir" = "X/usr/local/include"; then
489 if test -n "$GCC"; then
490 case $host_os in
491 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
492 esac
493 fi
494 fi
495 if test -z "$haveit"; then
496 for x in $CPPFLAGS $INC[]NAME; do
497 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
498 if test "X$x" = "X-I$additional_includedir"; then
499 haveit=yes
500 break
501 fi
502 done
503 if test -z "$haveit"; then
504 if test -d "$additional_includedir"; then
505 dnl Really add $additional_includedir to $INCNAME.
506 INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
507 fi
508 fi
509 fi
510 fi
511 fi
512 dnl Look for dependencies.
513 if test -n "$found_la"; then
514 dnl Read the .la file. It defines the variables
515 dnl dlname, library_names, old_library, dependency_libs, current,
516 dnl age, revision, installed, dlopen, dlpreopen, libdir.
517 save_libdir="$libdir"
518 case "$found_la" in
519 */* | *\\*) . "$found_la" ;;
520 *) . "./$found_la" ;;
521 esac
522 libdir="$save_libdir"
523 dnl We use only dependency_libs.
524 for dep in $dependency_libs; do
525 case "$dep" in
526 -L*)
527 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
528 dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
529 dnl But don't add it
530 dnl 1. if it's the standard /usr/lib,
531 dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
532 dnl 3. if it's already present in $LDFLAGS or the already
533 dnl constructed $LIBNAME,
534 dnl 4. if it doesn't exist as a directory.
535 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
536 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
537 haveit=
538 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
539 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
540 if test -n "$GCC"; then
541 case $host_os in
542 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
543 esac
544 fi
545 fi
546 if test -z "$haveit"; then
547 haveit=
548 for x in $LDFLAGS $LIB[]NAME; do
549 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
550 if test "X$x" = "X-L$additional_libdir"; then
551 haveit=yes
552 break
553 fi
554 done
555 if test -z "$haveit"; then
556 if test -d "$additional_libdir"; then
557 dnl Really add $additional_libdir to $LIBNAME.
558 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
559 fi
560 fi
561 haveit=
562 for x in $LDFLAGS $LTLIB[]NAME; do
563 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
564 if test "X$x" = "X-L$additional_libdir"; then
565 haveit=yes
566 break
567 fi
568 done
569 if test -z "$haveit"; then
570 if test -d "$additional_libdir"; then
571 dnl Really add $additional_libdir to $LTLIBNAME.
572 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
573 fi
574 fi
575 fi
576 fi
577 ;;
578 -R*)
579 dir=`echo "X$dep" | sed -e 's/^X-R//'`
580 if test "$enable_rpath" != no; then
581 dnl Potentially add DIR to rpathdirs.
582 dnl The rpathdirs will be appended to $LIBNAME at the end.
583 haveit=
584 for x in $rpathdirs; do
585 if test "X$x" = "X$dir"; then
586 haveit=yes
587 break
588 fi
589 done
590 if test -z "$haveit"; then
591 rpathdirs="$rpathdirs $dir"
592 fi
593 dnl Potentially add DIR to ltrpathdirs.
594 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
595 haveit=
596 for x in $ltrpathdirs; do
597 if test "X$x" = "X$dir"; then
598 haveit=yes
599 break
600 fi
601 done
602 if test -z "$haveit"; then
603 ltrpathdirs="$ltrpathdirs $dir"
604 fi
605 fi
606 ;;
607 -l*)
608 dnl Handle this in the next round.
609 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
610 ;;
611 *.la)
612 dnl Handle this in the next round. Throw away the .la's
613 dnl directory; it is already contained in a preceding -L
614 dnl option.
615 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
616 ;;
617 *)
618 dnl Most likely an immediate library name.
619 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
620 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
621 ;;
622 esac
623 done
624 fi
625 else
626 dnl Didn't find the library; assume it is in the system directories
627 dnl known to the linker and runtime loader. (All the system
628 dnl directories known to the linker should also be known to the
629 dnl runtime loader, otherwise the system is severely misconfigured.)
630 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
631 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
632 fi
633 fi
634 fi
635 done
636 done
637 if test "X$rpathdirs" != "X"; then
638 if test -n "$acl_hardcode_libdir_separator"; then
639 dnl Weird platform: only the last -rpath option counts, the user must
640 dnl pass all path elements in one option. We can arrange that for a
641 dnl single library, but not when more than one $LIBNAMEs are used.
642 alldirs=
643 for found_dir in $rpathdirs; do
644 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
645 done
646 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
647 acl_save_libdir="$libdir"
648 libdir="$alldirs"
649 eval flag=\"$acl_hardcode_libdir_flag_spec\"
650 libdir="$acl_save_libdir"
651 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
652 else
653 dnl The -rpath options are cumulative.
654 for found_dir in $rpathdirs; do
655 acl_save_libdir="$libdir"
656 libdir="$found_dir"
657 eval flag=\"$acl_hardcode_libdir_flag_spec\"
658 libdir="$acl_save_libdir"
659 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
660 done
661 fi
662 fi
663 if test "X$ltrpathdirs" != "X"; then
664 dnl When using libtool, the option that works for both libraries and
665 dnl executables is -R. The -R options are cumulative.
666 for found_dir in $ltrpathdirs; do
667 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
668 done
669 fi
670 popdef([P_A_C_K])
671 popdef([PACKLIBS])
672 popdef([PACKUP])
673 popdef([PACK])
674 popdef([NAME])
675])
676
677dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
678dnl unless already present in VAR.
679dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
680dnl contains two or three consecutive elements that belong together.
681AC_DEFUN([AC_LIB_APPENDTOVAR],
682[
683 for element in [$2]; do
684 haveit=
685 for x in $[$1]; do
686 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
687 if test "X$x" = "X$element"; then
688 haveit=yes
689 break
690 fi
691 done
692 if test -z "$haveit"; then
693 [$1]="${[$1]}${[$1]:+ }$element"
694 fi
695 done
696])
697
698dnl For those cases where a variable contains several -L and -l options
699dnl referring to unknown libraries and directories, this macro determines the
700dnl necessary additional linker options for the runtime path.
701dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
702dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
703dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
704dnl otherwise linking without libtool is assumed.
705AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
706[
707 AC_REQUIRE([AC_LIB_RPATH])
708 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
709 $1=
710 if test "$enable_rpath" != no; then
711 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
712 dnl Use an explicit option to hardcode directories into the resulting
713 dnl binary.
714 rpathdirs=
715 next=
716 for opt in $2; do
717 if test -n "$next"; then
718 dir="$next"
719 dnl No need to hardcode the standard /usr/lib.
720 if test "X$dir" != "X/usr/$acl_libdirstem" \
721 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
722 rpathdirs="$rpathdirs $dir"
723 fi
724 next=
725 else
726 case $opt in
727 -L) next=yes ;;
728 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
729 dnl No need to hardcode the standard /usr/lib.
730 if test "X$dir" != "X/usr/$acl_libdirstem" \
731 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
732 rpathdirs="$rpathdirs $dir"
733 fi
734 next= ;;
735 *) next= ;;
736 esac
737 fi
738 done
739 if test "X$rpathdirs" != "X"; then
740 if test -n ""$3""; then
741 dnl libtool is used for linking. Use -R options.
742 for dir in $rpathdirs; do
743 $1="${$1}${$1:+ }-R$dir"
744 done
745 else
746 dnl The linker is used for linking directly.
747 if test -n "$acl_hardcode_libdir_separator"; then
748 dnl Weird platform: only the last -rpath option counts, the user
749 dnl must pass all path elements in one option.
750 alldirs=
751 for dir in $rpathdirs; do
752 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
753 done
754 acl_save_libdir="$libdir"
755 libdir="$alldirs"
756 eval flag=\"$acl_hardcode_libdir_flag_spec\"
757 libdir="$acl_save_libdir"
758 $1="$flag"
759 else
760 dnl The -rpath options are cumulative.
761 for dir in $rpathdirs; do
762 acl_save_libdir="$libdir"
763 libdir="$dir"
764 eval flag=\"$acl_hardcode_libdir_flag_spec\"
765 libdir="$acl_save_libdir"
766 $1="${$1}${$1:+ }$flag"
767 done
768 fi
769 fi
770 fi
771 fi
772 fi
773 AC_SUBST([$1])
774])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
new file mode 100644
index 0000000..1601cea
--- /dev/null
+++ b/m4/lib-prefix.m4
@@ -0,0 +1,224 @@
1# lib-prefix.m4 serial 7 (gettext-0.18)
2dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
10dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
11dnl require excessive bracketing.
12ifdef([AC_HELP_STRING],
13[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
14[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
15
16dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
17dnl to access previously installed libraries. The basic assumption is that
18dnl a user will want packages to use other packages he previously installed
19dnl with the same --prefix option.
20dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
21dnl libraries, but is otherwise very convenient.
22AC_DEFUN([AC_LIB_PREFIX],
23[
24 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
25 AC_REQUIRE([AC_PROG_CC])
26 AC_REQUIRE([AC_CANONICAL_HOST])
27 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
28 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
29 dnl By default, look in $includedir and $libdir.
30 use_additional=yes
31 AC_LIB_WITH_FINAL_PREFIX([
32 eval additional_includedir=\"$includedir\"
33 eval additional_libdir=\"$libdir\"
34 ])
35 AC_LIB_ARG_WITH([lib-prefix],
36[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
37 --without-lib-prefix don't search for libraries in includedir and libdir],
38[
39 if test "X$withval" = "Xno"; then
40 use_additional=no
41 else
42 if test "X$withval" = "X"; then
43 AC_LIB_WITH_FINAL_PREFIX([
44 eval additional_includedir=\"$includedir\"
45 eval additional_libdir=\"$libdir\"
46 ])
47 else
48 additional_includedir="$withval/include"
49 additional_libdir="$withval/$acl_libdirstem"
50 fi
51 fi
52])
53 if test $use_additional = yes; then
54 dnl Potentially add $additional_includedir to $CPPFLAGS.
55 dnl But don't add it
56 dnl 1. if it's the standard /usr/include,
57 dnl 2. if it's already present in $CPPFLAGS,
58 dnl 3. if it's /usr/local/include and we are using GCC on Linux,
59 dnl 4. if it doesn't exist as a directory.
60 if test "X$additional_includedir" != "X/usr/include"; then
61 haveit=
62 for x in $CPPFLAGS; do
63 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
64 if test "X$x" = "X-I$additional_includedir"; then
65 haveit=yes
66 break
67 fi
68 done
69 if test -z "$haveit"; then
70 if test "X$additional_includedir" = "X/usr/local/include"; then
71 if test -n "$GCC"; then
72 case $host_os in
73 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
74 esac
75 fi
76 fi
77 if test -z "$haveit"; then
78 if test -d "$additional_includedir"; then
79 dnl Really add $additional_includedir to $CPPFLAGS.
80 CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
81 fi
82 fi
83 fi
84 fi
85 dnl Potentially add $additional_libdir to $LDFLAGS.
86 dnl But don't add it
87 dnl 1. if it's the standard /usr/lib,
88 dnl 2. if it's already present in $LDFLAGS,
89 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
90 dnl 4. if it doesn't exist as a directory.
91 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
92 haveit=
93 for x in $LDFLAGS; do
94 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
95 if test "X$x" = "X-L$additional_libdir"; then
96 haveit=yes
97 break
98 fi
99 done
100 if test -z "$haveit"; then
101 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
102 if test -n "$GCC"; then
103 case $host_os in
104 linux*) haveit=yes;;
105 esac
106 fi
107 fi
108 if test -z "$haveit"; then
109 if test -d "$additional_libdir"; then
110 dnl Really add $additional_libdir to $LDFLAGS.
111 LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
112 fi
113 fi
114 fi
115 fi
116 fi
117])
118
119dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
120dnl acl_final_exec_prefix, containing the values to which $prefix and
121dnl $exec_prefix will expand at the end of the configure script.
122AC_DEFUN([AC_LIB_PREPARE_PREFIX],
123[
124 dnl Unfortunately, prefix and exec_prefix get only finally determined
125 dnl at the end of configure.
126 if test "X$prefix" = "XNONE"; then
127 acl_final_prefix="$ac_default_prefix"
128 else
129 acl_final_prefix="$prefix"
130 fi
131 if test "X$exec_prefix" = "XNONE"; then
132 acl_final_exec_prefix='${prefix}'
133 else
134 acl_final_exec_prefix="$exec_prefix"
135 fi
136 acl_save_prefix="$prefix"
137 prefix="$acl_final_prefix"
138 eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
139 prefix="$acl_save_prefix"
140])
141
142dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
143dnl variables prefix and exec_prefix bound to the values they will have
144dnl at the end of the configure script.
145AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
146[
147 acl_save_prefix="$prefix"
148 prefix="$acl_final_prefix"
149 acl_save_exec_prefix="$exec_prefix"
150 exec_prefix="$acl_final_exec_prefix"
151 $1
152 exec_prefix="$acl_save_exec_prefix"
153 prefix="$acl_save_prefix"
154])
155
156dnl AC_LIB_PREPARE_MULTILIB creates
157dnl - a variable acl_libdirstem, containing the basename of the libdir, either
158dnl "lib" or "lib64" or "lib/64",
159dnl - a variable acl_libdirstem2, as a secondary possible value for
160dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
161dnl "lib/amd64".
162AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
163[
164 dnl There is no formal standard regarding lib and lib64.
165 dnl On glibc systems, the current practice is that on a system supporting
166 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
167 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
168 dnl the compiler's default mode by looking at the compiler's library search
169 dnl path. If at least one of its elements ends in /lib64 or points to a
170 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
171 dnl Otherwise we use the default, namely "lib".
172 dnl On Solaris systems, the current practice is that on a system supporting
173 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
174 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
175 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
176 AC_REQUIRE([AC_CANONICAL_HOST])
177 acl_libdirstem=lib
178 acl_libdirstem2=
179 case "$host_os" in
180 solaris*)
181 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
182 dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
183 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
184 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
185 dnl symlink is missing, so we set acl_libdirstem2 too.
186 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
187 [AC_EGREP_CPP([sixtyfour bits], [
188#ifdef _LP64
189sixtyfour bits
190#endif
191 ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
192 ])
193 if test $gl_cv_solaris_64bit = yes; then
194 acl_libdirstem=lib/64
195 case "$host_cpu" in
196 sparc*) acl_libdirstem2=lib/sparcv9 ;;
197 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
198 esac
199 fi
200 ;;
201 *)
202 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
203 if test -n "$searchpath"; then
204 acl_save_IFS="${IFS= }"; IFS=":"
205 for searchdir in $searchpath; do
206 if test -d "$searchdir"; then
207 case "$searchdir" in
208 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
209 */../ | */.. )
210 # Better ignore directories of this form. They are misleading.
211 ;;
212 *) searchdir=`cd "$searchdir" && pwd`
213 case "$searchdir" in
214 */lib64 ) acl_libdirstem=lib64 ;;
215 esac ;;
216 esac
217 fi
218 done
219 IFS="$acl_save_IFS"
220 fi
221 ;;
222 esac
223 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
224])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 8ff3c76..a3fee53 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,7 @@
1# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 1# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
2# 2#
3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 4# 2006, 2007, 2008 Free Software Foundation, Inc.
5# Inc.
6# Written by Gordon Matzigkeit, 1996 5# Written by Gordon Matzigkeit, 1996
7# 6#
8# This file is free software; the Free Software Foundation gives 7# This file is free software; the Free Software Foundation gives
@@ -11,8 +10,7 @@
11 10
12m4_define([_LT_COPYING], [dnl 11m4_define([_LT_COPYING], [dnl
13# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 12# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 13# 2006, 2007, 2008 Free Software Foundation, Inc.
15# Inc.
16# Written by Gordon Matzigkeit, 1996 14# Written by Gordon Matzigkeit, 1996
17# 15#
18# This file is part of GNU Libtool. 16# This file is part of GNU Libtool.
@@ -39,7 +37,7 @@ m4_define([_LT_COPYING], [dnl
39# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 37# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
40]) 38])
41 39
42# serial 57 LT_INIT 40# serial 56 LT_INIT
43 41
44 42
45# LT_PREREQ(VERSION) 43# LT_PREREQ(VERSION)
@@ -68,7 +66,6 @@ esac
68# ------------------ 66# ------------------
69AC_DEFUN([LT_INIT], 67AC_DEFUN([LT_INIT],
70[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT 68[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
71AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
72AC_BEFORE([$0], [LT_LANG])dnl 69AC_BEFORE([$0], [LT_LANG])dnl
73AC_BEFORE([$0], [LT_OUTPUT])dnl 70AC_BEFORE([$0], [LT_OUTPUT])dnl
74AC_BEFORE([$0], [LTDL_INIT])dnl 71AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -85,8 +82,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
85AC_REQUIRE([LTOBSOLETE_VERSION])dnl 82AC_REQUIRE([LTOBSOLETE_VERSION])dnl
86m4_require([_LT_PROG_LTMAIN])dnl 83m4_require([_LT_PROG_LTMAIN])dnl
87 84
88_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
89
90dnl Parse OPTIONS 85dnl Parse OPTIONS
91_LT_SET_OPTIONS([$0], [$1]) 86_LT_SET_OPTIONS([$0], [$1])
92 87
@@ -123,7 +118,7 @@ m4_defun([_LT_CC_BASENAME],
123 *) break;; 118 *) break;;
124 esac 119 esac
125done 120done
126cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` 121cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
127]) 122])
128 123
129 124
@@ -143,9 +138,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
143m4_defun([_LT_SETUP], 138m4_defun([_LT_SETUP],
144[AC_REQUIRE([AC_CANONICAL_HOST])dnl 139[AC_REQUIRE([AC_CANONICAL_HOST])dnl
145AC_REQUIRE([AC_CANONICAL_BUILD])dnl 140AC_REQUIRE([AC_CANONICAL_BUILD])dnl
146AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
147AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
148
149_LT_DECL([], [host_alias], [0], [The host system])dnl 141_LT_DECL([], [host_alias], [0], [The host system])dnl
150_LT_DECL([], [host], [0])dnl 142_LT_DECL([], [host], [0])dnl
151_LT_DECL([], [host_os], [0])dnl 143_LT_DECL([], [host_os], [0])dnl
@@ -168,13 +160,10 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
168dnl 160dnl
169m4_require([_LT_FILEUTILS_DEFAULTS])dnl 161m4_require([_LT_FILEUTILS_DEFAULTS])dnl
170m4_require([_LT_CHECK_SHELL_FEATURES])dnl 162m4_require([_LT_CHECK_SHELL_FEATURES])dnl
171m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
172m4_require([_LT_CMD_RELOAD])dnl 163m4_require([_LT_CMD_RELOAD])dnl
173m4_require([_LT_CHECK_MAGIC_METHOD])dnl 164m4_require([_LT_CHECK_MAGIC_METHOD])dnl
174m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
175m4_require([_LT_CMD_OLD_ARCHIVE])dnl 165m4_require([_LT_CMD_OLD_ARCHIVE])dnl
176m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl 166m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
177m4_require([_LT_WITH_SYSROOT])dnl
178 167
179_LT_CONFIG_LIBTOOL_INIT([ 168_LT_CONFIG_LIBTOOL_INIT([
180# See if we are running on zsh, and set the options which allow our 169# See if we are running on zsh, and set the options which allow our
@@ -190,6 +179,7 @@ fi
190_LT_CHECK_OBJDIR 179_LT_CHECK_OBJDIR
191 180
192m4_require([_LT_TAG_COMPILER])dnl 181m4_require([_LT_TAG_COMPILER])dnl
182_LT_PROG_ECHO_BACKSLASH
193 183
194case $host_os in 184case $host_os in
195aix3*) 185aix3*)
@@ -203,6 +193,23 @@ aix3*)
203 ;; 193 ;;
204esac 194esac
205 195
196# Sed substitution that helps us do robust quoting. It backslashifies
197# metacharacters that are still active within double-quoted strings.
198sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
199
200# Same as above, but do not quote variable references.
201double_quote_subst='s/\([["`\\]]\)/\\\1/g'
202
203# Sed substitution to delay expansion of an escaped shell variable in a
204# double_quote_subst'ed string.
205delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
206
207# Sed substitution to delay expansion of an escaped single quote.
208delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
209
210# Sed substitution to avoid accidental globbing in evaled expressions
211no_glob_subst='s/\*/\\\*/g'
212
206# Global variables: 213# Global variables:
207ofile=libtool 214ofile=libtool
208can_build_shared=yes 215can_build_shared=yes
@@ -243,28 +250,6 @@ _LT_CONFIG_COMMANDS
243])# _LT_SETUP 250])# _LT_SETUP
244 251
245 252
246# _LT_PREPARE_SED_QUOTE_VARS
247# --------------------------
248# Define a few sed substitution that help us do robust quoting.
249m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
250[# Backslashify metacharacters that are still active within
251# double-quoted strings.
252sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
253
254# Same as above, but do not quote variable references.
255double_quote_subst='s/\([["`\\]]\)/\\\1/g'
256
257# Sed substitution to delay expansion of an escaped shell variable in a
258# double_quote_subst'ed string.
259delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
260
261# Sed substitution to delay expansion of an escaped single quote.
262delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
263
264# Sed substitution to avoid accidental globbing in evaled expressions
265no_glob_subst='s/\*/\\\*/g'
266])
267
268# _LT_PROG_LTMAIN 253# _LT_PROG_LTMAIN
269# --------------- 254# ---------------
270# Note that this code is called both from `configure', and `config.status' 255# Note that this code is called both from `configure', and `config.status'
@@ -423,7 +408,7 @@ m4_define([_lt_decl_all_varnames],
423# declaration there will have the same value as in `configure'. VARNAME 408# declaration there will have the same value as in `configure'. VARNAME
424# must have a single quote delimited value for this to work. 409# must have a single quote delimited value for this to work.
425m4_define([_LT_CONFIG_STATUS_DECLARE], 410m4_define([_LT_CONFIG_STATUS_DECLARE],
426[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) 411[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
427 412
428 413
429# _LT_CONFIG_STATUS_DECLARATIONS 414# _LT_CONFIG_STATUS_DECLARATIONS
@@ -433,7 +418,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
433# embedded single quotes properly. In configure, this macro expands 418# embedded single quotes properly. In configure, this macro expands
434# each variable declared with _LT_DECL (and _LT_TAGDECL) into: 419# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
435# 420#
436# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' 421# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
437m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], 422m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
438[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), 423[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
439 [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) 424 [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -532,20 +517,12 @@ LTCC='$LTCC'
532LTCFLAGS='$LTCFLAGS' 517LTCFLAGS='$LTCFLAGS'
533compiler='$compiler_DEFAULT' 518compiler='$compiler_DEFAULT'
534 519
535# A function that is used when there is no print builtin or printf.
536func_fallback_echo ()
537{
538 eval 'cat <<_LTECHO_EOF
539\$[]1
540_LTECHO_EOF'
541}
542
543# Quote evaled strings. 520# Quote evaled strings.
544for var in lt_decl_all_varnames([[ \ 521for var in lt_decl_all_varnames([[ \
545]], lt_decl_quote_varnames); do 522]], lt_decl_quote_varnames); do
546 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 523 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
547 *[[\\\\\\\`\\"\\\$]]*) 524 *[[\\\\\\\`\\"\\\$]]*)
548 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" 525 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
549 ;; 526 ;;
550 *) 527 *)
551 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" 528 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -556,9 +533,9 @@ done
556# Double-quote double-evaled strings. 533# Double-quote double-evaled strings.
557for var in lt_decl_all_varnames([[ \ 534for var in lt_decl_all_varnames([[ \
558]], lt_decl_dquote_varnames); do 535]], lt_decl_dquote_varnames); do
559 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 536 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
560 *[[\\\\\\\`\\"\\\$]]*) 537 *[[\\\\\\\`\\"\\\$]]*)
561 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 538 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
562 ;; 539 ;;
563 *) 540 *)
564 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" 541 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -566,38 +543,16 @@ for var in lt_decl_all_varnames([[ \
566 esac 543 esac
567done 544done
568 545
546# Fix-up fallback echo if it was mangled by the above quoting rules.
547case \$lt_ECHO in
548*'\\\[$]0 --fallback-echo"')dnl "
549 lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
550 ;;
551esac
552
569_LT_OUTPUT_LIBTOOL_INIT 553_LT_OUTPUT_LIBTOOL_INIT
570]) 554])
571 555
572# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
573# ------------------------------------
574# Generate a child script FILE with all initialization necessary to
575# reuse the environment learned by the parent script, and make the
576# file executable. If COMMENT is supplied, it is inserted after the
577# `#!' sequence but before initialization text begins. After this
578# macro, additional text can be appended to FILE to form the body of
579# the child script. The macro ends with non-zero status if the
580# file could not be fully written (such as if the disk is full).
581m4_ifdef([AS_INIT_GENERATED],
582[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
583[m4_defun([_LT_GENERATED_FILE_INIT],
584[m4_require([AS_PREPARE])]dnl
585[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
586[lt_write_fail=0
587cat >$1 <<_ASEOF || lt_write_fail=1
588#! $SHELL
589# Generated by $as_me.
590$2
591SHELL=\${CONFIG_SHELL-$SHELL}
592export SHELL
593_ASEOF
594cat >>$1 <<\_ASEOF || lt_write_fail=1
595AS_SHELL_SANITIZE
596_AS_PREPARE
597exec AS_MESSAGE_FD>&1
598_ASEOF
599test $lt_write_fail = 0 && chmod +x $1[]dnl
600m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
601 556
602# LT_OUTPUT 557# LT_OUTPUT
603# --------- 558# ---------
@@ -607,11 +562,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
607AC_DEFUN([LT_OUTPUT], 562AC_DEFUN([LT_OUTPUT],
608[: ${CONFIG_LT=./config.lt} 563[: ${CONFIG_LT=./config.lt}
609AC_MSG_NOTICE([creating $CONFIG_LT]) 564AC_MSG_NOTICE([creating $CONFIG_LT])
610_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], 565cat >"$CONFIG_LT" <<_LTEOF
611[# Run this file to recreate a libtool stub with the current configuration.]) 566#! $SHELL
567# Generated by $as_me.
568# Run this file to recreate a libtool stub with the current configuration.
612 569
613cat >>"$CONFIG_LT" <<\_LTEOF
614lt_cl_silent=false 570lt_cl_silent=false
571SHELL=\${CONFIG_SHELL-$SHELL}
572_LTEOF
573
574cat >>"$CONFIG_LT" <<\_LTEOF
575AS_SHELL_SANITIZE
576_AS_PREPARE
577
578exec AS_MESSAGE_FD>&1
615exec AS_MESSAGE_LOG_FD>>config.log 579exec AS_MESSAGE_LOG_FD>>config.log
616{ 580{
617 echo 581 echo
@@ -637,7 +601,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
637m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) 601m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
638configured by $[0], generated by m4_PACKAGE_STRING. 602configured by $[0], generated by m4_PACKAGE_STRING.
639 603
640Copyright (C) 2010 Free Software Foundation, Inc. 604Copyright (C) 2008 Free Software Foundation, Inc.
641This config.lt script is free software; the Free Software Foundation 605This config.lt script is free software; the Free Software Foundation
642gives unlimited permision to copy, distribute and modify it." 606gives unlimited permision to copy, distribute and modify it."
643 607
@@ -682,13 +646,15 @@ chmod +x "$CONFIG_LT"
682# appending to config.log, which fails on DOS, as config.log is still kept 646# appending to config.log, which fails on DOS, as config.log is still kept
683# open by configure. Here we exec the FD to /dev/null, effectively closing 647# open by configure. Here we exec the FD to /dev/null, effectively closing
684# config.log, so it can be properly (re)opened and appended to by config.lt. 648# config.log, so it can be properly (re)opened and appended to by config.lt.
685lt_cl_success=: 649if test "$no_create" != yes; then
686test "$silent" = yes && 650 lt_cl_success=:
687 lt_config_lt_args="$lt_config_lt_args --quiet" 651 test "$silent" = yes &&
688exec AS_MESSAGE_LOG_FD>/dev/null 652 lt_config_lt_args="$lt_config_lt_args --quiet"
689$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false 653 exec AS_MESSAGE_LOG_FD>/dev/null
690exec AS_MESSAGE_LOG_FD>>config.log 654 $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
691$lt_cl_success || AS_EXIT(1) 655 exec AS_MESSAGE_LOG_FD>>config.log
656 $lt_cl_success || AS_EXIT(1)
657fi
692])# LT_OUTPUT 658])# LT_OUTPUT
693 659
694 660
@@ -751,12 +717,15 @@ _LT_EOF
751 # if finds mixed CR/LF and LF-only lines. Since sed operates in 717 # if finds mixed CR/LF and LF-only lines. Since sed operates in
752 # text mode, it properly converts lines to CR/LF. This bash problem 718 # text mode, it properly converts lines to CR/LF. This bash problem
753 # is reportedly fixed, but why not run on old versions too? 719 # is reportedly fixed, but why not run on old versions too?
754 sed '$q' "$ltmain" >> "$cfgfile" \ 720 sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
755 || (rm -f "$cfgfile"; exit 1) 721 || (rm -f "$cfgfile"; exit 1)
756 722
757 _LT_PROG_REPLACE_SHELLFNS 723 _LT_PROG_XSI_SHELLFNS
758 724
759 mv -f "$cfgfile" "$ofile" || 725 sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
726 || (rm -f "$cfgfile"; exit 1)
727
728 mv -f "$cfgfile" "$ofile" ||
760 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 729 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
761 chmod +x "$ofile" 730 chmod +x "$ofile"
762], 731],
@@ -862,13 +831,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
862AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) 831AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
863AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) 832AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
864AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) 833AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
865AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
866dnl aclocal-1.4 backwards compatibility: 834dnl aclocal-1.4 backwards compatibility:
867dnl AC_DEFUN([AC_LIBTOOL_CXX], []) 835dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
868dnl AC_DEFUN([AC_LIBTOOL_F77], []) 836dnl AC_DEFUN([AC_LIBTOOL_F77], [])
869dnl AC_DEFUN([AC_LIBTOOL_FC], []) 837dnl AC_DEFUN([AC_LIBTOOL_FC], [])
870dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) 838dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
871dnl AC_DEFUN([AC_LIBTOOL_RC], [])
872 839
873 840
874# _LT_TAG_COMPILER 841# _LT_TAG_COMPILER
@@ -973,31 +940,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
973 [lt_cv_ld_exported_symbols_list=no]) 940 [lt_cv_ld_exported_symbols_list=no])
974 LDFLAGS="$save_LDFLAGS" 941 LDFLAGS="$save_LDFLAGS"
975 ]) 942 ])
976 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
977 [lt_cv_ld_force_load=no
978 cat > conftest.c << _LT_EOF
979int forced_loaded() { return 2;}
980_LT_EOF
981 echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
982 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
983 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
984 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
985 echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
986 $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
987 cat > conftest.c << _LT_EOF
988int main() { return 0;}
989_LT_EOF
990 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
991 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
992 _lt_result=$?
993 if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
994 lt_cv_ld_force_load=yes
995 else
996 cat conftest.err >&AS_MESSAGE_LOG_FD
997 fi
998 rm -f conftest.err libconftest.a conftest conftest.c
999 rm -rf conftest.dSYM
1000 ])
1001 case $host_os in 943 case $host_os in
1002 rhapsody* | darwin1.[[012]]) 944 rhapsody* | darwin1.[[012]])
1003 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 945 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1025,7 +967,7 @@ _LT_EOF
1025 else 967 else
1026 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' 968 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
1027 fi 969 fi
1028 if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then 970 if test "$DSYMUTIL" != ":"; then
1029 _lt_dsymutil='~$DSYMUTIL $lib || :' 971 _lt_dsymutil='~$DSYMUTIL $lib || :'
1030 else 972 else
1031 _lt_dsymutil= 973 _lt_dsymutil=
@@ -1045,11 +987,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
1045 _LT_TAGVAR(hardcode_direct, $1)=no 987 _LT_TAGVAR(hardcode_direct, $1)=no
1046 _LT_TAGVAR(hardcode_automatic, $1)=yes 988 _LT_TAGVAR(hardcode_automatic, $1)=yes
1047 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported 989 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1048 if test "$lt_cv_ld_force_load" = "yes"; then 990 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1049 _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
1050 else
1051 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1052 fi
1053 _LT_TAGVAR(link_all_deplibs, $1)=yes 991 _LT_TAGVAR(link_all_deplibs, $1)=yes
1054 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" 992 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
1055 case $cc_basename in 993 case $cc_basename in
@@ -1057,7 +995,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
1057 *) _lt_dar_can_shared=$GCC ;; 995 *) _lt_dar_can_shared=$GCC ;;
1058 esac 996 esac
1059 if test "$_lt_dar_can_shared" = "yes"; then 997 if test "$_lt_dar_can_shared" = "yes"; then
1060 output_verbose_link_cmd=func_echo_all 998 output_verbose_link_cmd=echo
1061 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 999 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1062 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 1000 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1063 _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" 1001 _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1073,141 +1011,202 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
1073 fi 1011 fi
1074]) 1012])
1075 1013
1076# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) 1014# _LT_SYS_MODULE_PATH_AIX
1077# ---------------------------------- 1015# -----------------------
1078# Links a minimal program and checks the executable 1016# Links a minimal program and checks the executable
1079# for the system default hardcoded library path. In most cases, 1017# for the system default hardcoded library path. In most cases,
1080# this is /usr/lib:/lib, but when the MPI compilers are used 1018# this is /usr/lib:/lib, but when the MPI compilers are used
1081# the location of the communication and MPI libs are included too. 1019# the location of the communication and MPI libs are included too.
1082# If we don't find anything, use the default library path according 1020# If we don't find anything, use the default library path according
1083# to the aix ld manual. 1021# to the aix ld manual.
1084# Store the results from the different compilers for each TAGNAME.
1085# Allow to override them for all tags through lt_cv_aix_libpath.
1086m4_defun([_LT_SYS_MODULE_PATH_AIX], 1022m4_defun([_LT_SYS_MODULE_PATH_AIX],
1087[m4_require([_LT_DECL_SED])dnl 1023[m4_require([_LT_DECL_SED])dnl
1088if test "${lt_cv_aix_libpath+set}" = set; then 1024AC_LINK_IFELSE(AC_LANG_PROGRAM,[
1089 aix_libpath=$lt_cv_aix_libpath 1025lt_aix_libpath_sed='
1090else 1026 /Import File Strings/,/^$/ {
1091 AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], 1027 /^0/ {
1092 [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ 1028 s/^0 *\(.*\)$/\1/
1093 lt_aix_libpath_sed='[ 1029 p
1094 /Import File Strings/,/^$/ { 1030 }
1095 /^0/ { 1031 }'
1096 s/^0 *\([^ ]*\) *$/\1/ 1032aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1097 p 1033# Check for a 64-bit object if we didn't find anything.
1098 } 1034if test -z "$aix_libpath"; then
1099 }]' 1035 aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1100 _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1036fi],[])
1101 # Check for a 64-bit object if we didn't find anything. 1037if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1102 if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
1103 _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1104 fi],[])
1105 if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
1106 _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
1107 fi
1108 ])
1109 aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
1110fi
1111])# _LT_SYS_MODULE_PATH_AIX 1038])# _LT_SYS_MODULE_PATH_AIX
1112 1039
1113 1040
1114# _LT_SHELL_INIT(ARG) 1041# _LT_SHELL_INIT(ARG)
1115# ------------------- 1042# -------------------
1116m4_define([_LT_SHELL_INIT], 1043m4_define([_LT_SHELL_INIT],
1117[m4_divert_text([M4SH-INIT], [$1 1044[ifdef([AC_DIVERSION_NOTICE],
1118])])# _LT_SHELL_INIT 1045 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
1119 1046 [AC_DIVERT_PUSH(NOTICE)])
1047$1
1048AC_DIVERT_POP
1049])# _LT_SHELL_INIT
1120 1050
1121 1051
1122# _LT_PROG_ECHO_BACKSLASH 1052# _LT_PROG_ECHO_BACKSLASH
1123# ----------------------- 1053# -----------------------
1124# Find how we can fake an echo command that does not interpret backslash. 1054# Add some code to the start of the generated configure script which
1125# In particular, with Autoconf 2.60 or later we add some code to the start 1055# will find an echo command which doesn't interpret backslashes.
1126# of the generated configure script which will find a shell with a builtin
1127# printf (which we can use as an echo command).
1128m4_defun([_LT_PROG_ECHO_BACKSLASH], 1056m4_defun([_LT_PROG_ECHO_BACKSLASH],
1129[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' 1057[_LT_SHELL_INIT([
1130ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO 1058# Check that we are running under the correct shell.
1131ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 1059SHELL=${CONFIG_SHELL-/bin/sh}
1132 1060
1133AC_MSG_CHECKING([how to print strings]) 1061case X$lt_ECHO in
1134# Test print first, because it will be a builtin if present. 1062X*--fallback-echo)
1135if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 1063 # Remove one level of quotation (which was required for Make).
1136 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 1064 ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
1137 ECHO='print -r --' 1065 ;;
1138elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 1066esac
1139 ECHO='printf %s\n' 1067
1068ECHO=${lt_ECHO-echo}
1069if test "X[$]1" = X--no-reexec; then
1070 # Discard the --no-reexec flag, and continue.
1071 shift
1072elif test "X[$]1" = X--fallback-echo; then
1073 # Avoid inline document here, it may be left over
1074 :
1075elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
1076 # Yippee, $ECHO works!
1077 :
1140else 1078else
1141 # Use this function as a fallback that always works. 1079 # Restart under the correct shell.
1142 func_fallback_echo () 1080 exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
1143 {
1144 eval 'cat <<_LTECHO_EOF
1145$[]1
1146_LTECHO_EOF'
1147 }
1148 ECHO='func_fallback_echo'
1149fi 1081fi
1150 1082
1151# func_echo_all arg... 1083if test "X[$]1" = X--fallback-echo; then
1152# Invoke $ECHO with all args, space-separated. 1084 # used as fallback echo
1153func_echo_all () 1085 shift
1154{ 1086 cat <<_LT_EOF
1155 $ECHO "$*" 1087[$]*
1156} 1088_LT_EOF
1089 exit 0
1090fi
1157 1091
1158case "$ECHO" in 1092# The HP-UX ksh and POSIX shell print the target directory to stdout
1159 printf*) AC_MSG_RESULT([printf]) ;; 1093# if CDPATH is set.
1160 print*) AC_MSG_RESULT([print -r]) ;; 1094(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1161 *) AC_MSG_RESULT([cat]) ;;
1162esac
1163 1095
1164m4_ifdef([_AS_DETECT_SUGGESTED], 1096if test -z "$lt_ECHO"; then
1165[_AS_DETECT_SUGGESTED([ 1097 if test "X${echo_test_string+set}" != Xset; then
1166 test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( 1098 # find a string as large as possible, as long as the shell can cope with it
1167 ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' 1099 for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1168 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO 1100 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1169 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 1101 if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
1170 PATH=/empty FPATH=/empty; export PATH FPATH 1102 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
1171 test "X`printf %s $ECHO`" = "X$ECHO" \ 1103 then
1172 || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) 1104 break
1105 fi
1106 done
1107 fi
1173 1108
1174_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) 1109 if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1175_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 1110 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1176])# _LT_PROG_ECHO_BACKSLASH 1111 test "X$echo_testing_string" = "X$echo_test_string"; then
1112 :
1113 else
1114 # The Solaris, AIX, and Digital Unix default echo programs unquote
1115 # backslashes. This makes it impossible to quote backslashes using
1116 # echo "$something" | sed 's/\\/\\\\/g'
1117 #
1118 # So, first we look for a working echo in the user's PATH.
1177 1119
1120 lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1121 for dir in $PATH /usr/ucb; do
1122 IFS="$lt_save_ifs"
1123 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
1124 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
1125 echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
1126 test "X$echo_testing_string" = "X$echo_test_string"; then
1127 ECHO="$dir/echo"
1128 break
1129 fi
1130 done
1131 IFS="$lt_save_ifs"
1178 1132
1179# _LT_WITH_SYSROOT 1133 if test "X$ECHO" = Xecho; then
1180# ---------------- 1134 # We didn't find a better echo, so look for alternatives.
1181AC_DEFUN([_LT_WITH_SYSROOT], 1135 if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
1182[AC_MSG_CHECKING([for sysroot]) 1136 echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
1183AC_ARG_WITH([sysroot], 1137 test "X$echo_testing_string" = "X$echo_test_string"; then
1184[ --with-sysroot[=DIR] Search for dependent libraries within DIR 1138 # This shell has a builtin print -r that does the trick.
1185 (or the compiler's sysroot if not specified).], 1139 ECHO='print -r'
1186[], [with_sysroot=no]) 1140 elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
1187 1141 test "X$CONFIG_SHELL" != X/bin/ksh; then
1188dnl lt_sysroot will always be passed unquoted. We quote it here 1142 # If we have ksh, try running configure again with it.
1189dnl in case the user passed a directory name. 1143 ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
1190lt_sysroot= 1144 export ORIGINAL_CONFIG_SHELL
1191case ${with_sysroot} in #( 1145 CONFIG_SHELL=/bin/ksh
1192 yes) 1146 export CONFIG_SHELL
1193 if test "$GCC" = yes; then 1147 exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
1194 lt_sysroot=`$CC --print-sysroot 2>/dev/null` 1148 else
1195 fi 1149 # Try using printf.
1196 ;; #( 1150 ECHO='printf %s\n'
1197 /*) 1151 if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1198 lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` 1152 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1199 ;; #( 1153 test "X$echo_testing_string" = "X$echo_test_string"; then
1200 no|'') 1154 # Cool, printf works
1201 ;; #( 1155 :
1202 *) 1156 elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1203 AC_MSG_RESULT([${with_sysroot}]) 1157 test "X$echo_testing_string" = 'X\t' &&
1204 AC_MSG_ERROR([The sysroot must be an absolute path.]) 1158 echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1205 ;; 1159 test "X$echo_testing_string" = "X$echo_test_string"; then
1206esac 1160 CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
1161 export CONFIG_SHELL
1162 SHELL="$CONFIG_SHELL"
1163 export SHELL
1164 ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1165 elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1166 test "X$echo_testing_string" = 'X\t' &&
1167 echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1168 test "X$echo_testing_string" = "X$echo_test_string"; then
1169 ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1170 else
1171 # maybe with a smaller string...
1172 prev=:
1173
1174 for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
1175 if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
1176 then
1177 break
1178 fi
1179 prev="$cmd"
1180 done
1181
1182 if test "$prev" != 'sed 50q "[$]0"'; then
1183 echo_test_string=`eval $prev`
1184 export echo_test_string
1185 exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
1186 else
1187 # Oops. We lost completely, so just stick with echo.
1188 ECHO=echo
1189 fi
1190 fi
1191 fi
1192 fi
1193 fi
1194fi
1195
1196# Copy echo and quote the copy suitably for passing to libtool from
1197# the Makefile, instead of quoting the original, which is used later.
1198lt_ECHO=$ECHO
1199if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
1200 lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
1201fi
1202
1203AC_SUBST(lt_ECHO)
1204])
1205_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
1206_LT_DECL([], [ECHO], [1],
1207 [An echo program that does not interpret backslashes])
1208])# _LT_PROG_ECHO_BACKSLASH
1207 1209
1208 AC_MSG_RESULT([${lt_sysroot:-no}])
1209_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
1210[dependent libraries, and in which our libraries should be installed.])])
1211 1210
1212# _LT_ENABLE_LOCK 1211# _LT_ENABLE_LOCK
1213# --------------- 1212# ---------------
@@ -1237,7 +1236,7 @@ ia64-*-hpux*)
1237 ;; 1236 ;;
1238*-*-irix6*) 1237*-*-irix6*)
1239 # Find out which ABI we are using. 1238 # Find out which ABI we are using.
1240 echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext 1239 echo '[#]line __oline__ "configure"' > conftest.$ac_ext
1241 if AC_TRY_EVAL(ac_compile); then 1240 if AC_TRY_EVAL(ac_compile); then
1242 if test "$lt_cv_prog_gnu_ld" = yes; then 1241 if test "$lt_cv_prog_gnu_ld" = yes; then
1243 case `/usr/bin/file conftest.$ac_objext` in 1242 case `/usr/bin/file conftest.$ac_objext` in
@@ -1355,47 +1354,14 @@ need_locks="$enable_libtool_lock"
1355])# _LT_ENABLE_LOCK 1354])# _LT_ENABLE_LOCK
1356 1355
1357 1356
1358# _LT_PROG_AR
1359# -----------
1360m4_defun([_LT_PROG_AR],
1361[AC_CHECK_TOOLS(AR, [ar], false)
1362: ${AR=ar}
1363: ${AR_FLAGS=cru}
1364_LT_DECL([], [AR], [1], [The archiver])
1365_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
1366
1367AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
1368 [lt_cv_ar_at_file=no
1369 AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
1370 [echo conftest.$ac_objext > conftest.lst
1371 lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
1372 AC_TRY_EVAL([lt_ar_try])
1373 if test "$ac_status" -eq 0; then
1374 # Ensure the archiver fails upon bogus file names.
1375 rm -f conftest.$ac_objext libconftest.a
1376 AC_TRY_EVAL([lt_ar_try])
1377 if test "$ac_status" -ne 0; then
1378 lt_cv_ar_at_file=@
1379 fi
1380 fi
1381 rm -f conftest.* libconftest.a
1382 ])
1383 ])
1384
1385if test "x$lt_cv_ar_at_file" = xno; then
1386 archiver_list_spec=
1387else
1388 archiver_list_spec=$lt_cv_ar_at_file
1389fi
1390_LT_DECL([], [archiver_list_spec], [1],
1391 [How to feed a file listing to the archiver])
1392])# _LT_PROG_AR
1393
1394
1395# _LT_CMD_OLD_ARCHIVE 1357# _LT_CMD_OLD_ARCHIVE
1396# ------------------- 1358# -------------------
1397m4_defun([_LT_CMD_OLD_ARCHIVE], 1359m4_defun([_LT_CMD_OLD_ARCHIVE],
1398[_LT_PROG_AR 1360[AC_CHECK_TOOL(AR, ar, false)
1361test -z "$AR" && AR=ar
1362test -z "$AR_FLAGS" && AR_FLAGS=cru
1363_LT_DECL([], [AR], [1], [The archiver])
1364_LT_DECL([], [AR_FLAGS], [1])
1399 1365
1400AC_CHECK_TOOL(STRIP, strip, :) 1366AC_CHECK_TOOL(STRIP, strip, :)
1401test -z "$STRIP" && STRIP=: 1367test -z "$STRIP" && STRIP=:
@@ -1422,19 +1388,10 @@ if test -n "$RANLIB"; then
1422 esac 1388 esac
1423 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" 1389 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1424fi 1390fi
1425
1426case $host_os in
1427 darwin*)
1428 lock_old_archive_extraction=yes ;;
1429 *)
1430 lock_old_archive_extraction=no ;;
1431esac
1432_LT_DECL([], [old_postinstall_cmds], [2]) 1391_LT_DECL([], [old_postinstall_cmds], [2])
1433_LT_DECL([], [old_postuninstall_cmds], [2]) 1392_LT_DECL([], [old_postuninstall_cmds], [2])
1434_LT_TAGDECL([], [old_archive_cmds], [2], 1393_LT_TAGDECL([], [old_archive_cmds], [2],
1435 [Commands used to build an old-style archive]) 1394 [Commands used to build an old-style archive])
1436_LT_DECL([], [lock_old_archive_extraction], [0],
1437 [Whether to use a lock for old archive extraction])
1438])# _LT_CMD_OLD_ARCHIVE 1395])# _LT_CMD_OLD_ARCHIVE
1439 1396
1440 1397
@@ -1459,15 +1416,15 @@ AC_CACHE_CHECK([$1], [$2],
1459 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 1416 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1460 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ 1417 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1461 -e 's:$: $lt_compiler_flag:'` 1418 -e 's:$: $lt_compiler_flag:'`
1462 (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) 1419 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1463 (eval "$lt_compile" 2>conftest.err) 1420 (eval "$lt_compile" 2>conftest.err)
1464 ac_status=$? 1421 ac_status=$?
1465 cat conftest.err >&AS_MESSAGE_LOG_FD 1422 cat conftest.err >&AS_MESSAGE_LOG_FD
1466 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 1423 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1467 if (exit $ac_status) && test -s "$ac_outfile"; then 1424 if (exit $ac_status) && test -s "$ac_outfile"; then
1468 # The compiler can only warn and ignore the option if not recognized 1425 # The compiler can only warn and ignore the option if not recognized
1469 # So say no if there are warnings other than the usual output. 1426 # So say no if there are warnings other than the usual output.
1470 $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp 1427 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1471 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 1428 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1472 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 1429 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1473 $2=yes 1430 $2=yes
@@ -1507,7 +1464,7 @@ AC_CACHE_CHECK([$1], [$2],
1507 if test -s conftest.err; then 1464 if test -s conftest.err; then
1508 # Append any errors to the config.log. 1465 # Append any errors to the config.log.
1509 cat conftest.err 1>&AS_MESSAGE_LOG_FD 1466 cat conftest.err 1>&AS_MESSAGE_LOG_FD
1510 $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp 1467 $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1511 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 1468 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1512 if diff conftest.exp conftest.er2 >/dev/null; then 1469 if diff conftest.exp conftest.er2 >/dev/null; then
1513 $2=yes 1470 $2=yes
@@ -1570,11 +1527,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1570 lt_cv_sys_max_cmd_len=8192; 1527 lt_cv_sys_max_cmd_len=8192;
1571 ;; 1528 ;;
1572 1529
1573 mint*)
1574 # On MiNT this can take a long time and run out of memory.
1575 lt_cv_sys_max_cmd_len=8192;
1576 ;;
1577
1578 amigaos*) 1530 amigaos*)
1579 # On AmigaOS with pdksh, this test takes hours, literally. 1531 # On AmigaOS with pdksh, this test takes hours, literally.
1580 # So we just punt and use a minimum line length of 8192. 1532 # So we just punt and use a minimum line length of 8192.
@@ -1639,8 +1591,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1639 # If test is not a shell built-in, we'll probably end up computing a 1591 # If test is not a shell built-in, we'll probably end up computing a
1640 # maximum length that is only half of the actual maximum length, but 1592 # maximum length that is only half of the actual maximum length, but
1641 # we can't tell. 1593 # we can't tell.
1642 while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ 1594 while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
1643 = "X$teststring$teststring"; } >/dev/null 2>&1 && 1595 = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
1644 test $i != 17 # 1/2 MB should be enough 1596 test $i != 17 # 1/2 MB should be enough
1645 do 1597 do
1646 i=`expr $i + 1` 1598 i=`expr $i + 1`
@@ -1691,7 +1643,7 @@ else
1691 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1643 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1692 lt_status=$lt_dlunknown 1644 lt_status=$lt_dlunknown
1693 cat > conftest.$ac_ext <<_LT_EOF 1645 cat > conftest.$ac_ext <<_LT_EOF
1694[#line $LINENO "configure" 1646[#line __oline__ "configure"
1695#include "confdefs.h" 1647#include "confdefs.h"
1696 1648
1697#if HAVE_DLFCN_H 1649#if HAVE_DLFCN_H
@@ -1732,13 +1684,7 @@ else
1732# endif 1684# endif
1733#endif 1685#endif
1734 1686
1735/* When -fvisbility=hidden is used, assume the code has been annotated 1687void fnord() { int i=42;}
1736 correspondingly for the symbols needed. */
1737#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1738int fnord () __attribute__((visibility("default")));
1739#endif
1740
1741int fnord () { return 42; }
1742int main () 1688int main ()
1743{ 1689{
1744 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1690 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1747,11 +1693,7 @@ int main ()
1747 if (self) 1693 if (self)
1748 { 1694 {
1749 if (dlsym (self,"fnord")) status = $lt_dlno_uscore; 1695 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
1750 else 1696 else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1751 {
1752 if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1753 else puts (dlerror ());
1754 }
1755 /* dlclose (self); */ 1697 /* dlclose (self); */
1756 } 1698 }
1757 else 1699 else
@@ -1927,16 +1869,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
1927 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 1869 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1928 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ 1870 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1929 -e 's:$: $lt_compiler_flag:'` 1871 -e 's:$: $lt_compiler_flag:'`
1930 (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) 1872 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1931 (eval "$lt_compile" 2>out/conftest.err) 1873 (eval "$lt_compile" 2>out/conftest.err)
1932 ac_status=$? 1874 ac_status=$?
1933 cat out/conftest.err >&AS_MESSAGE_LOG_FD 1875 cat out/conftest.err >&AS_MESSAGE_LOG_FD
1934 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 1876 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1935 if (exit $ac_status) && test -s out/conftest2.$ac_objext 1877 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1936 then 1878 then
1937 # The compiler can only warn and ignore the option if not recognized 1879 # The compiler can only warn and ignore the option if not recognized
1938 # So say no if there are warnings 1880 # So say no if there are warnings
1939 $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp 1881 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
1940 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 1882 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
1941 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then 1883 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
1942 _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes 1884 _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2095,7 +2037,6 @@ m4_require([_LT_DECL_EGREP])dnl
2095m4_require([_LT_FILEUTILS_DEFAULTS])dnl 2037m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2096m4_require([_LT_DECL_OBJDUMP])dnl 2038m4_require([_LT_DECL_OBJDUMP])dnl
2097m4_require([_LT_DECL_SED])dnl 2039m4_require([_LT_DECL_SED])dnl
2098m4_require([_LT_CHECK_SHELL_FEATURES])dnl
2099AC_MSG_CHECKING([dynamic linker characteristics]) 2040AC_MSG_CHECKING([dynamic linker characteristics])
2100m4_if([$1], 2041m4_if([$1],
2101 [], [ 2042 [], [
@@ -2104,23 +2045,16 @@ if test "$GCC" = yes; then
2104 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; 2045 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
2105 *) lt_awk_arg="/^libraries:/" ;; 2046 *) lt_awk_arg="/^libraries:/" ;;
2106 esac 2047 esac
2107 case $host_os in 2048 lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2108 mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; 2049 if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
2109 *) lt_sed_strip_eq="s,=/,/,g" ;;
2110 esac
2111 lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
2112 case $lt_search_path_spec in
2113 *\;*)
2114 # if the path contains ";" then we assume it to be the separator 2050 # if the path contains ";" then we assume it to be the separator
2115 # otherwise default to the standard path separator (i.e. ":") - it is 2051 # otherwise default to the standard path separator (i.e. ":") - it is
2116 # assumed that no part of a normal pathname contains ";" but that should 2052 # assumed that no part of a normal pathname contains ";" but that should
2117 # okay in the real world where ";" in dirpaths is itself problematic. 2053 # okay in the real world where ";" in dirpaths is itself problematic.
2118 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` 2054 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
2119 ;; 2055 else
2120 *) 2056 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2121 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` 2057 fi
2122 ;;
2123 esac
2124 # Ok, now we have the path, separated by spaces, we can step through it 2058 # Ok, now we have the path, separated by spaces, we can step through it
2125 # and add multilib dir if necessary. 2059 # and add multilib dir if necessary.
2126 lt_tmp_lt_search_path_spec= 2060 lt_tmp_lt_search_path_spec=
@@ -2133,7 +2067,7 @@ if test "$GCC" = yes; then
2133 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" 2067 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
2134 fi 2068 fi
2135 done 2069 done
2136 lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' 2070 lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
2137BEGIN {RS=" "; FS="/|\n";} { 2071BEGIN {RS=" "; FS="/|\n";} {
2138 lt_foo=""; 2072 lt_foo="";
2139 lt_count=0; 2073 lt_count=0;
@@ -2153,13 +2087,7 @@ BEGIN {RS=" "; FS="/|\n";} {
2153 if (lt_foo != "") { lt_freq[[lt_foo]]++; } 2087 if (lt_foo != "") { lt_freq[[lt_foo]]++; }
2154 if (lt_freq[[lt_foo]] == 1) { print lt_foo; } 2088 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
2155}'` 2089}'`
2156 # AWK program above erroneously prepends '/' to C:/dos/paths 2090 sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
2157 # for these hosts.
2158 case $host_os in
2159 mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
2160 $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
2161 esac
2162 sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
2163else 2091else
2164 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" 2092 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
2165fi]) 2093fi])
@@ -2247,7 +2175,7 @@ amigaos*)
2247 m68k) 2175 m68k)
2248 library_names_spec='$libname.ixlibrary $libname.a' 2176 library_names_spec='$libname.ixlibrary $libname.a'
2249 # Create ${libname}_ixlibrary.a entries in /sys/libs. 2177 # Create ${libname}_ixlibrary.a entries in /sys/libs.
2250 finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' 2178 finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
2251 ;; 2179 ;;
2252 esac 2180 esac
2253 ;; 2181 ;;
@@ -2278,9 +2206,8 @@ cygwin* | mingw* | pw32* | cegcc*)
2278 need_version=no 2206 need_version=no
2279 need_lib_prefix=no 2207 need_lib_prefix=no
2280 2208
2281 case $GCC,$cc_basename in 2209 case $GCC,$host_os in
2282 yes,*) 2210 yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
2283 # gcc
2284 library_names_spec='$libname.dll.a' 2211 library_names_spec='$libname.dll.a'
2285 # DLL is installed to $(libdir)/../bin by postinstall_cmds 2212 # DLL is installed to $(libdir)/../bin by postinstall_cmds
2286 postinstall_cmds='base_file=`basename \${file}`~ 2213 postinstall_cmds='base_file=`basename \${file}`~
@@ -2301,83 +2228,36 @@ cygwin* | mingw* | pw32* | cegcc*)
2301 cygwin*) 2228 cygwin*)
2302 # Cygwin DLLs use 'cyg' prefix rather than 'lib' 2229 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
2303 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2230 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2304m4_if([$1], [],[ 2231 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2305 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
2306 ;; 2232 ;;
2307 mingw* | cegcc*) 2233 mingw* | cegcc*)
2308 # MinGW DLLs use traditional 'lib' prefix 2234 # MinGW DLLs use traditional 'lib' prefix
2309 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2235 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2310 ;; 2236 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2311 pw32*)
2312 # pw32 DLLs use 'pw' prefix rather than 'lib'
2313 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2314 ;;
2315 esac
2316 dynamic_linker='Win32 ld.exe'
2317 ;;
2318
2319 *,cl*)
2320 # Native MSVC
2321 libname_spec='$name'
2322 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2323 library_names_spec='${libname}.dll.lib'
2324
2325 case $build_os in
2326 mingw*)
2327 sys_lib_search_path_spec=
2328 lt_save_ifs=$IFS
2329 IFS=';'
2330 for lt_path in $LIB
2331 do
2332 IFS=$lt_save_ifs
2333 # Let DOS variable expansion print the short 8.3 style file name.
2334 lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
2335 sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
2336 done
2337 IFS=$lt_save_ifs
2338 # Convert to MSYS style.
2339 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
2340 ;;
2341 cygwin*)
2342 # Convert to unix form, then to dos form, then back to unix form
2343 # but this time dos style (no spaces!) so that the unix form looks
2344 # like /cygdrive/c/PROGRA~1:/cygdr...
2345 sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
2346 sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
2347 sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2348 ;;
2349 *)
2350 sys_lib_search_path_spec="$LIB"
2351 if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then 2237 if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
2352 # It is most probably a Windows format PATH. 2238 # It is most probably a Windows format PATH printed by
2239 # mingw gcc, but we are running on Cygwin. Gcc prints its search
2240 # path with ; separators, and with drive letters. We can handle the
2241 # drive letters (cygwin fileutils understands them), so leave them,
2242 # especially as we might pass files found there to a mingw objdump,
2243 # which wouldn't understand a cygwinified path. Ahh.
2353 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 2244 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
2354 else 2245 else
2355 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 2246 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2356 fi 2247 fi
2357 # FIXME: find the short name or the path components, as spaces are 2248 ;;
2358 # common. (e.g. "Program Files" -> "PROGRA~1") 2249 pw32*)
2250 # pw32 DLLs use 'pw' prefix rather than 'lib'
2251 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2359 ;; 2252 ;;
2360 esac 2253 esac
2361
2362 # DLL is installed to $(libdir)/../bin by postinstall_cmds
2363 postinstall_cmds='base_file=`basename \${file}`~
2364 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
2365 dldir=$destdir/`dirname \$dlpath`~
2366 test -d \$dldir || mkdir -p \$dldir~
2367 $install_prog $dir/$dlname \$dldir/$dlname'
2368 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
2369 dlpath=$dir/\$dldll~
2370 $RM \$dlpath'
2371 shlibpath_overrides_runpath=yes
2372 dynamic_linker='Win32 link.exe'
2373 ;; 2254 ;;
2374 2255
2375 *) 2256 *)
2376 # Assume MSVC wrapper
2377 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' 2257 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
2378 dynamic_linker='Win32 ld.exe'
2379 ;; 2258 ;;
2380 esac 2259 esac
2260 dynamic_linker='Win32 ld.exe'
2381 # FIXME: first we should search . and the directory the executable is in 2261 # FIXME: first we should search . and the directory the executable is in
2382 shlibpath_var=PATH 2262 shlibpath_var=PATH
2383 ;; 2263 ;;
@@ -2461,20 +2341,6 @@ gnu*)
2461 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 2341 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2462 soname_spec='${libname}${release}${shared_ext}$major' 2342 soname_spec='${libname}${release}${shared_ext}$major'
2463 shlibpath_var=LD_LIBRARY_PATH 2343 shlibpath_var=LD_LIBRARY_PATH
2464 shlibpath_overrides_runpath=no
2465 hardcode_into_libs=yes
2466 ;;
2467
2468haiku*)
2469 version_type=linux
2470 need_lib_prefix=no
2471 need_version=no
2472 dynamic_linker="$host_os runtime_loader"
2473 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2474 soname_spec='${libname}${release}${shared_ext}$major'
2475 shlibpath_var=LIBRARY_PATH
2476 shlibpath_overrides_runpath=yes
2477 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
2478 hardcode_into_libs=yes 2344 hardcode_into_libs=yes
2479 ;; 2345 ;;
2480 2346
@@ -2520,10 +2386,8 @@ hpux9* | hpux10* | hpux11*)
2520 soname_spec='${libname}${release}${shared_ext}$major' 2386 soname_spec='${libname}${release}${shared_ext}$major'
2521 ;; 2387 ;;
2522 esac 2388 esac
2523 # HP-UX runs *really* slowly unless shared libraries are mode 555, ... 2389 # HP-UX runs *really* slowly unless shared libraries are mode 555.
2524 postinstall_cmds='chmod 555 $lib' 2390 postinstall_cmds='chmod 555 $lib'
2525 # or fails outright, so override atomically:
2526 install_override_mode=555
2527 ;; 2391 ;;
2528 2392
2529interix[[3-9]]*) 2393interix[[3-9]]*)
@@ -2590,21 +2454,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2590 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' 2454 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
2591 shlibpath_var=LD_LIBRARY_PATH 2455 shlibpath_var=LD_LIBRARY_PATH
2592 shlibpath_overrides_runpath=no 2456 shlibpath_overrides_runpath=no
2593
2594 # Some binutils ld are patched to set DT_RUNPATH 2457 # Some binutils ld are patched to set DT_RUNPATH
2595 AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], 2458 save_LDFLAGS=$LDFLAGS
2596 [lt_cv_shlibpath_overrides_runpath=no 2459 save_libdir=$libdir
2597 save_LDFLAGS=$LDFLAGS 2460 eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
2598 save_libdir=$libdir 2461 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
2599 eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ 2462 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2600 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" 2463 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2601 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], 2464 [shlibpath_overrides_runpath=yes])])
2602 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], 2465 LDFLAGS=$save_LDFLAGS
2603 [lt_cv_shlibpath_overrides_runpath=yes])]) 2466 libdir=$save_libdir
2604 LDFLAGS=$save_LDFLAGS
2605 libdir=$save_libdir
2606 ])
2607 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
2608 2467
2609 # This implies no fast_install, which is unacceptable. 2468 # This implies no fast_install, which is unacceptable.
2610 # Some rework will be needed to allow for fast_install 2469 # Some rework will be needed to allow for fast_install
@@ -2613,7 +2472,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2613 2472
2614 # Append ld.so.conf contents to the search path 2473 # Append ld.so.conf contents to the search path
2615 if test -f /etc/ld.so.conf; then 2474 if test -f /etc/ld.so.conf; then
2616 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` 2475 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
2617 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 2476 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2618 fi 2477 fi
2619 2478
@@ -2858,8 +2717,6 @@ _LT_DECL([], [library_names_spec], [1],
2858 The last name is the one that the linker finds with -lNAME]]) 2717 The last name is the one that the linker finds with -lNAME]])
2859_LT_DECL([], [soname_spec], [1], 2718_LT_DECL([], [soname_spec], [1],
2860 [[The coded name of the library, if different from the real name]]) 2719 [[The coded name of the library, if different from the real name]])
2861_LT_DECL([], [install_override_mode], [1],
2862 [Permission mode override for installation of shared libraries])
2863_LT_DECL([], [postinstall_cmds], [2], 2720_LT_DECL([], [postinstall_cmds], [2],
2864 [Command to use after installation of a shared archive]) 2721 [Command to use after installation of a shared archive])
2865_LT_DECL([], [postuninstall_cmds], [2], 2722_LT_DECL([], [postuninstall_cmds], [2],
@@ -2972,7 +2829,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
2972AC_REQUIRE([AC_CANONICAL_BUILD])dnl 2829AC_REQUIRE([AC_CANONICAL_BUILD])dnl
2973m4_require([_LT_DECL_SED])dnl 2830m4_require([_LT_DECL_SED])dnl
2974m4_require([_LT_DECL_EGREP])dnl 2831m4_require([_LT_DECL_EGREP])dnl
2975m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
2976 2832
2977AC_ARG_WITH([gnu-ld], 2833AC_ARG_WITH([gnu-ld],
2978 [AS_HELP_STRING([--with-gnu-ld], 2834 [AS_HELP_STRING([--with-gnu-ld],
@@ -3094,11 +2950,6 @@ case $reload_flag in
3094esac 2950esac
3095reload_cmds='$LD$reload_flag -o $output$reload_objs' 2951reload_cmds='$LD$reload_flag -o $output$reload_objs'
3096case $host_os in 2952case $host_os in
3097 cygwin* | mingw* | pw32* | cegcc*)
3098 if test "$GCC" != yes; then
3099 reload_cmds=false
3100 fi
3101 ;;
3102 darwin*) 2953 darwin*)
3103 if test "$GCC" = yes; then 2954 if test "$GCC" = yes; then
3104 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2955 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -3107,8 +2958,8 @@ case $host_os in
3107 fi 2958 fi
3108 ;; 2959 ;;
3109esac 2960esac
3110_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl 2961_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
3111_LT_TAGDECL([], [reload_cmds], [2])dnl 2962_LT_DECL([], [reload_cmds], [2])dnl
3112])# _LT_CMD_RELOAD 2963])# _LT_CMD_RELOAD
3113 2964
3114 2965
@@ -3160,18 +3011,16 @@ mingw* | pw32*)
3160 # Base MSYS/MinGW do not provide the 'file' command needed by 3011 # Base MSYS/MinGW do not provide the 'file' command needed by
3161 # func_win32_libid shell function, so use a weaker test based on 'objdump', 3012 # func_win32_libid shell function, so use a weaker test based on 'objdump',
3162 # unless we find 'file', for example because we are cross-compiling. 3013 # unless we find 'file', for example because we are cross-compiling.
3163 # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. 3014 if ( file / ) >/dev/null 2>&1; then
3164 if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
3165 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 3015 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
3166 lt_cv_file_magic_cmd='func_win32_libid' 3016 lt_cv_file_magic_cmd='func_win32_libid'
3167 else 3017 else
3168 # Keep this pattern in sync with the one in func_win32_libid. 3018 lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
3169 lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
3170 lt_cv_file_magic_cmd='$OBJDUMP -f' 3019 lt_cv_file_magic_cmd='$OBJDUMP -f'
3171 fi 3020 fi
3172 ;; 3021 ;;
3173 3022
3174cegcc*) 3023cegcc)
3175 # use the weaker test based on 'objdump'. See mingw*. 3024 # use the weaker test based on 'objdump'. See mingw*.
3176 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' 3025 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
3177 lt_cv_file_magic_cmd='$OBJDUMP -f' 3026 lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3201,10 +3050,6 @@ gnu*)
3201 lt_cv_deplibs_check_method=pass_all 3050 lt_cv_deplibs_check_method=pass_all
3202 ;; 3051 ;;
3203 3052
3204haiku*)
3205 lt_cv_deplibs_check_method=pass_all
3206 ;;
3207
3208hpux10.20* | hpux11*) 3053hpux10.20* | hpux11*)
3209 lt_cv_file_magic_cmd=/usr/bin/file 3054 lt_cv_file_magic_cmd=/usr/bin/file
3210 case $host_cpu in 3055 case $host_cpu in
@@ -3213,11 +3058,11 @@ hpux10.20* | hpux11*)
3213 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so 3058 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
3214 ;; 3059 ;;
3215 hppa*64*) 3060 hppa*64*)
3216 [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] 3061 [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
3217 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl 3062 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
3218 ;; 3063 ;;
3219 *) 3064 *)
3220 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' 3065 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
3221 lt_cv_file_magic_test_file=/usr/lib/libc.sl 3066 lt_cv_file_magic_test_file=/usr/lib/libc.sl
3222 ;; 3067 ;;
3223 esac 3068 esac
@@ -3317,21 +3162,6 @@ tpf*)
3317 ;; 3162 ;;
3318esac 3163esac
3319]) 3164])
3320
3321file_magic_glob=
3322want_nocaseglob=no
3323if test "$build" = "$host"; then
3324 case $host_os in
3325 mingw* | pw32*)
3326 if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
3327 want_nocaseglob=yes
3328 else
3329 file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
3330 fi
3331 ;;
3332 esac
3333fi
3334
3335file_magic_cmd=$lt_cv_file_magic_cmd 3165file_magic_cmd=$lt_cv_file_magic_cmd
3336deplibs_check_method=$lt_cv_deplibs_check_method 3166deplibs_check_method=$lt_cv_deplibs_check_method
3337test -z "$deplibs_check_method" && deplibs_check_method=unknown 3167test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3339,11 +3169,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
3339_LT_DECL([], [deplibs_check_method], [1], 3169_LT_DECL([], [deplibs_check_method], [1],
3340 [Method to check whether dependent libraries are shared objects]) 3170 [Method to check whether dependent libraries are shared objects])
3341_LT_DECL([], [file_magic_cmd], [1], 3171_LT_DECL([], [file_magic_cmd], [1],
3342 [Command to use when deplibs_check_method = "file_magic"]) 3172 [Command to use when deplibs_check_method == "file_magic"])
3343_LT_DECL([], [file_magic_glob], [1],
3344 [How to find potential files when deplibs_check_method = "file_magic"])
3345_LT_DECL([], [want_nocaseglob], [1],
3346 [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
3347])# _LT_CHECK_MAGIC_METHOD 3173])# _LT_CHECK_MAGIC_METHOD
3348 3174
3349 3175
@@ -3400,19 +3226,7 @@ if test "$lt_cv_path_NM" != "no"; then
3400 NM="$lt_cv_path_NM" 3226 NM="$lt_cv_path_NM"
3401else 3227else
3402 # Didn't find any BSD compatible name lister, look for dumpbin. 3228 # Didn't find any BSD compatible name lister, look for dumpbin.
3403 if test -n "$DUMPBIN"; then : 3229 AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
3404 # Let the user override the test.
3405 else
3406 AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
3407 case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
3408 *COFF*)
3409 DUMPBIN="$DUMPBIN -symbols"
3410 ;;
3411 *)
3412 DUMPBIN=:
3413 ;;
3414 esac
3415 fi
3416 AC_SUBST([DUMPBIN]) 3230 AC_SUBST([DUMPBIN])
3417 if test "$DUMPBIN" != ":"; then 3231 if test "$DUMPBIN" != ":"; then
3418 NM="$DUMPBIN" 3232 NM="$DUMPBIN"
@@ -3425,13 +3239,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
3425AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], 3239AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
3426 [lt_cv_nm_interface="BSD nm" 3240 [lt_cv_nm_interface="BSD nm"
3427 echo "int some_variable = 0;" > conftest.$ac_ext 3241 echo "int some_variable = 0;" > conftest.$ac_ext
3428 (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) 3242 (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
3429 (eval "$ac_compile" 2>conftest.err) 3243 (eval "$ac_compile" 2>conftest.err)
3430 cat conftest.err >&AS_MESSAGE_LOG_FD 3244 cat conftest.err >&AS_MESSAGE_LOG_FD
3431 (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) 3245 (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
3432 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 3246 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3433 cat conftest.err >&AS_MESSAGE_LOG_FD 3247 cat conftest.err >&AS_MESSAGE_LOG_FD
3434 (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) 3248 (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
3435 cat conftest.out >&AS_MESSAGE_LOG_FD 3249 cat conftest.out >&AS_MESSAGE_LOG_FD
3436 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 3250 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3437 lt_cv_nm_interface="MS dumpbin" 3251 lt_cv_nm_interface="MS dumpbin"
@@ -3446,67 +3260,6 @@ dnl aclocal-1.4 backwards compatibility:
3446dnl AC_DEFUN([AM_PROG_NM], []) 3260dnl AC_DEFUN([AM_PROG_NM], [])
3447dnl AC_DEFUN([AC_PROG_NM], []) 3261dnl AC_DEFUN([AC_PROG_NM], [])
3448 3262
3449# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
3450# --------------------------------
3451# how to determine the name of the shared library
3452# associated with a specific link library.
3453# -- PORTME fill in with the dynamic library characteristics
3454m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
3455[m4_require([_LT_DECL_EGREP])
3456m4_require([_LT_DECL_OBJDUMP])
3457m4_require([_LT_DECL_DLLTOOL])
3458AC_CACHE_CHECK([how to associate runtime and link libraries],
3459lt_cv_sharedlib_from_linklib_cmd,
3460[lt_cv_sharedlib_from_linklib_cmd='unknown'
3461
3462case $host_os in
3463cygwin* | mingw* | pw32* | cegcc*)
3464 # two different shell functions defined in ltmain.sh
3465 # decide which to use based on capabilities of $DLLTOOL
3466 case `$DLLTOOL --help 2>&1` in
3467 *--identify-strict*)
3468 lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
3469 ;;
3470 *)
3471 lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
3472 ;;
3473 esac
3474 ;;
3475*)
3476 # fallback: assume linklib IS sharedlib
3477 lt_cv_sharedlib_from_linklib_cmd="$ECHO"
3478 ;;
3479esac
3480])
3481sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
3482test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
3483
3484_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
3485 [Command to associate shared and link libraries])
3486])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
3487
3488
3489# _LT_PATH_MANIFEST_TOOL
3490# ----------------------
3491# locate the manifest tool
3492m4_defun([_LT_PATH_MANIFEST_TOOL],
3493[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
3494test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
3495AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
3496 [lt_cv_path_mainfest_tool=no
3497 echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
3498 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
3499 cat conftest.err >&AS_MESSAGE_LOG_FD
3500 if $GREP 'Manifest Tool' conftest.out > /dev/null; then
3501 lt_cv_path_mainfest_tool=yes
3502 fi
3503 rm -f conftest*])
3504if test "x$lt_cv_path_mainfest_tool" != xyes; then
3505 MANIFEST_TOOL=:
3506fi
3507_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
3508])# _LT_PATH_MANIFEST_TOOL
3509
3510 3263
3511# LT_LIB_M 3264# LT_LIB_M
3512# -------- 3265# --------
@@ -3515,7 +3268,7 @@ AC_DEFUN([LT_LIB_M],
3515[AC_REQUIRE([AC_CANONICAL_HOST])dnl 3268[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3516LIBM= 3269LIBM=
3517case $host in 3270case $host in
3518*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) 3271*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
3519 # These system don't have libm, or don't need it 3272 # These system don't have libm, or don't need it
3520 ;; 3273 ;;
3521*-ncr-sysv4.3*) 3274*-ncr-sysv4.3*)
@@ -3543,12 +3296,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
3543_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= 3296_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
3544 3297
3545if test "$GCC" = yes; then 3298if test "$GCC" = yes; then
3546 case $cc_basename in 3299 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
3547 nvcc*)
3548 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
3549 *)
3550 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
3551 esac
3552 3300
3553 _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], 3301 _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
3554 lt_cv_prog_compiler_rtti_exceptions, 3302 lt_cv_prog_compiler_rtti_exceptions,
@@ -3565,7 +3313,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
3565m4_defun([_LT_CMD_GLOBAL_SYMBOLS], 3313m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
3566[AC_REQUIRE([AC_CANONICAL_HOST])dnl 3314[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3567AC_REQUIRE([AC_PROG_CC])dnl 3315AC_REQUIRE([AC_PROG_CC])dnl
3568AC_REQUIRE([AC_PROG_AWK])dnl
3569AC_REQUIRE([LT_PATH_NM])dnl 3316AC_REQUIRE([LT_PATH_NM])dnl
3570AC_REQUIRE([LT_PATH_LD])dnl 3317AC_REQUIRE([LT_PATH_LD])dnl
3571m4_require([_LT_DECL_SED])dnl 3318m4_require([_LT_DECL_SED])dnl
@@ -3633,8 +3380,8 @@ esac
3633lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 3380lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
3634 3381
3635# Transform an extracted symbol line into symbol name and symbol address 3382# Transform an extracted symbol line into symbol name and symbol address
3636lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" 3383lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
3637lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" 3384lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
3638 3385
3639# Handle CRLF in mingw tool chain 3386# Handle CRLF in mingw tool chain
3640opt_cr= 3387opt_cr=
@@ -3670,7 +3417,6 @@ for ac_symprfx in "" "_"; do
3670 else 3417 else
3671 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 3418 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
3672 fi 3419 fi
3673 lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
3674 3420
3675 # Check to see that the pipe works correctly. 3421 # Check to see that the pipe works correctly.
3676 pipe_works=no 3422 pipe_works=no
@@ -3692,7 +3438,7 @@ _LT_EOF
3692 if AC_TRY_EVAL(ac_compile); then 3438 if AC_TRY_EVAL(ac_compile); then
3693 # Now try to grab the symbols. 3439 # Now try to grab the symbols.
3694 nlist=conftest.nm 3440 nlist=conftest.nm
3695 if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then 3441 if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
3696 # Try sorting and uniquifying the output. 3442 # Try sorting and uniquifying the output.
3697 if sort "$nlist" | uniq > "$nlist"T; then 3443 if sort "$nlist" | uniq > "$nlist"T; then
3698 mv -f "$nlist"T "$nlist" 3444 mv -f "$nlist"T "$nlist"
@@ -3704,18 +3450,6 @@ _LT_EOF
3704 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 3450 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
3705 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 3451 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
3706 cat <<_LT_EOF > conftest.$ac_ext 3452 cat <<_LT_EOF > conftest.$ac_ext
3707/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3708#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3709/* DATA imports from DLLs on WIN32 con't be const, because runtime
3710 relocations are performed -- see ld's documentation on pseudo-relocs. */
3711# define LT@&t@_DLSYM_CONST
3712#elif defined(__osf__)
3713/* This system does not cope well with relocations in const data. */
3714# define LT@&t@_DLSYM_CONST
3715#else
3716# define LT@&t@_DLSYM_CONST const
3717#endif
3718
3719#ifdef __cplusplus 3453#ifdef __cplusplus
3720extern "C" { 3454extern "C" {
3721#endif 3455#endif
@@ -3727,7 +3461,7 @@ _LT_EOF
3727 cat <<_LT_EOF >> conftest.$ac_ext 3461 cat <<_LT_EOF >> conftest.$ac_ext
3728 3462
3729/* The mapping between symbol names and symbols. */ 3463/* The mapping between symbol names and symbols. */
3730LT@&t@_DLSYM_CONST struct { 3464const struct {
3731 const char *name; 3465 const char *name;
3732 void *address; 3466 void *address;
3733} 3467}
@@ -3753,15 +3487,15 @@ static const void *lt_preloaded_setup() {
3753_LT_EOF 3487_LT_EOF
3754 # Now try linking the two files. 3488 # Now try linking the two files.
3755 mv conftest.$ac_objext conftstm.$ac_objext 3489 mv conftest.$ac_objext conftstm.$ac_objext
3756 lt_globsym_save_LIBS=$LIBS 3490 lt_save_LIBS="$LIBS"
3757 lt_globsym_save_CFLAGS=$CFLAGS 3491 lt_save_CFLAGS="$CFLAGS"
3758 LIBS="conftstm.$ac_objext" 3492 LIBS="conftstm.$ac_objext"
3759 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" 3493 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
3760 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then 3494 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
3761 pipe_works=yes 3495 pipe_works=yes
3762 fi 3496 fi
3763 LIBS=$lt_globsym_save_LIBS 3497 LIBS="$lt_save_LIBS"
3764 CFLAGS=$lt_globsym_save_CFLAGS 3498 CFLAGS="$lt_save_CFLAGS"
3765 else 3499 else
3766 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 3500 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
3767 fi 3501 fi
@@ -3794,13 +3528,6 @@ else
3794 AC_MSG_RESULT(ok) 3528 AC_MSG_RESULT(ok)
3795fi 3529fi
3796 3530
3797# Response file support.
3798if test "$lt_cv_nm_interface" = "MS dumpbin"; then
3799 nm_file_list_spec='@'
3800elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
3801 nm_file_list_spec='@'
3802fi
3803
3804_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 3531_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
3805 [Take the output of nm and produce a listing of raw symbols and C names]) 3532 [Take the output of nm and produce a listing of raw symbols and C names])
3806_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 3533_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3811,8 +3538,6 @@ _LT_DECL([global_symbol_to_c_name_address],
3811_LT_DECL([global_symbol_to_c_name_address_lib_prefix], 3538_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
3812 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 3539 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
3813 [Transform the output of nm in a C name address pair when lib prefix is needed]) 3540 [Transform the output of nm in a C name address pair when lib prefix is needed])
3814_LT_DECL([], [nm_file_list_spec], [1],
3815 [Specify filename containing input files for $NM])
3816]) # _LT_CMD_GLOBAL_SYMBOLS 3541]) # _LT_CMD_GLOBAL_SYMBOLS
3817 3542
3818 3543
@@ -3824,6 +3549,7 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
3824_LT_TAGVAR(lt_prog_compiler_pic, $1)= 3549_LT_TAGVAR(lt_prog_compiler_pic, $1)=
3825_LT_TAGVAR(lt_prog_compiler_static, $1)= 3550_LT_TAGVAR(lt_prog_compiler_static, $1)=
3826 3551
3552AC_MSG_CHECKING([for $compiler option to produce PIC])
3827m4_if([$1], [CXX], [ 3553m4_if([$1], [CXX], [
3828 # C++ specific cases for pic, static, wl, etc. 3554 # C++ specific cases for pic, static, wl, etc.
3829 if test "$GXX" = yes; then 3555 if test "$GXX" = yes; then
@@ -3874,11 +3600,6 @@ m4_if([$1], [CXX], [
3874 # DJGPP does not support shared libraries at all 3600 # DJGPP does not support shared libraries at all
3875 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 3601 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
3876 ;; 3602 ;;
3877 haiku*)
3878 # PIC is the default for Haiku.
3879 # The "-static" flag exists, but is broken.
3880 _LT_TAGVAR(lt_prog_compiler_static, $1)=
3881 ;;
3882 interix[[3-9]]*) 3603 interix[[3-9]]*)
3883 # Interix 3.x gcc -fpic/-fPIC options generate broken code. 3604 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
3884 # Instead, we relocate shared libraries at runtime. 3605 # Instead, we relocate shared libraries at runtime.
@@ -3928,12 +3649,6 @@ m4_if([$1], [CXX], [
3928 ;; 3649 ;;
3929 esac 3650 esac
3930 ;; 3651 ;;
3931 mingw* | cygwin* | os2* | pw32* | cegcc*)
3932 # This hack is so that the source file can tell whether it is being
3933 # built for inclusion in a dll (and should export symbols for example).
3934 m4_if([$1], [GCJ], [],
3935 [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
3936 ;;
3937 dgux*) 3652 dgux*)
3938 case $cc_basename in 3653 case $cc_basename in
3939 ec++*) 3654 ec++*)
@@ -4023,8 +3738,8 @@ m4_if([$1], [CXX], [
4023 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 3738 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
4024 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' 3739 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4025 ;; 3740 ;;
4026 xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) 3741 xlc* | xlC*)
4027 # IBM XL 8.0, 9.0 on PPC and BlueGene 3742 # IBM XL 8.0 on PPC
4028 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3743 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4029 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' 3744 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
4030 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' 3745 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4086,7 +3801,7 @@ m4_if([$1], [CXX], [
4086 ;; 3801 ;;
4087 solaris*) 3802 solaris*)
4088 case $cc_basename in 3803 case $cc_basename in
4089 CC* | sunCC*) 3804 CC*)
4090 # Sun C++ 4.2, 5.x and Centerline C++ 3805 # Sun C++ 4.2, 5.x and Centerline C++
4091 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3806 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4092 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 3807 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4190,12 +3905,6 @@ m4_if([$1], [CXX], [
4190 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' 3905 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
4191 ;; 3906 ;;
4192 3907
4193 haiku*)
4194 # PIC is the default for Haiku.
4195 # The "-static" flag exists, but is broken.
4196 _LT_TAGVAR(lt_prog_compiler_static, $1)=
4197 ;;
4198
4199 hpux*) 3908 hpux*)
4200 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit 3909 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
4201 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag 3910 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -4238,13 +3947,6 @@ m4_if([$1], [CXX], [
4238 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3947 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4239 ;; 3948 ;;
4240 esac 3949 esac
4241
4242 case $cc_basename in
4243 nvcc*) # Cuda Compiler Driver 2.2
4244 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
4245 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
4246 ;;
4247 esac
4248 else 3950 else
4249 # PORTME Check for flag to pass linker flags through the system compiler. 3951 # PORTME Check for flag to pass linker flags through the system compiler.
4250 case $host_os in 3952 case $host_os in
@@ -4308,13 +4010,7 @@ m4_if([$1], [CXX], [
4308 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 4010 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
4309 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 4011 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
4310 ;; 4012 ;;
4311 nagfor*) 4013 pgcc* | pgf77* | pgf90* | pgf95*)
4312 # NAG Fortran compiler
4313 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
4314 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
4315 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4316 ;;
4317 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4318 # Portland Group compilers (*not* the Pentium gcc compiler, 4014 # Portland Group compilers (*not* the Pentium gcc compiler,
4319 # which looks to be a dead project) 4015 # which looks to be a dead project)
4320 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4016 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4326,26 +4022,26 @@ m4_if([$1], [CXX], [
4326 # All Alpha code is PIC. 4022 # All Alpha code is PIC.
4327 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' 4023 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4328 ;; 4024 ;;
4329 xl* | bgxl* | bgf* | mpixl*) 4025 xl*)
4330 # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene 4026 # IBM XL C 8.0/Fortran 10.1 on PPC
4331 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4027 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4332 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' 4028 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
4333 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' 4029 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
4334 ;; 4030 ;;
4335 *) 4031 *)
4336 case `$CC -V 2>&1 | sed 5q` in 4032 case `$CC -V 2>&1 | sed 5q` in
4337 *Sun\ F* | *Sun*Fortran*)
4338 # Sun Fortran 8.3 passes all unrecognized flags to the linker
4339 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4340 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4341 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
4342 ;;
4343 *Sun\ C*) 4033 *Sun\ C*)
4344 # Sun C 5.9 4034 # Sun C 5.9
4345 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4035 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4346 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 4036 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4347 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4037 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4348 ;; 4038 ;;
4039 *Sun\ F*)
4040 # Sun Fortran 8.3 passes all unrecognized flags to the linker
4041 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4042 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4043 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
4044 ;;
4349 esac 4045 esac
4350 ;; 4046 ;;
4351 esac 4047 esac
@@ -4376,7 +4072,7 @@ m4_if([$1], [CXX], [
4376 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4072 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4377 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 4073 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4378 case $cc_basename in 4074 case $cc_basename in
4379 f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 4075 f77* | f90* | f95*)
4380 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 4076 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
4381 *) 4077 *)
4382 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 4078 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4433,11 +4129,9 @@ case $host_os in
4433 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 4129 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
4434 ;; 4130 ;;
4435esac 4131esac
4436 4132AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
4437AC_CACHE_CHECK([for $compiler option to produce PIC], 4133_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
4438 [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], 4134 [How to pass a linker flag through the compiler])
4439 [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
4440_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
4441 4135
4442# 4136#
4443# Check to make sure the PIC flag actually works. 4137# Check to make sure the PIC flag actually works.
@@ -4456,8 +4150,6 @@ fi
4456_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 4150_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
4457 [Additional compiler flags for building library objects]) 4151 [Additional compiler flags for building library objects])
4458 4152
4459_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
4460 [How to pass a linker flag through the compiler])
4461# 4153#
4462# Check to make sure the static flag actually works. 4154# Check to make sure the static flag actually works.
4463# 4155#
@@ -4478,7 +4170,6 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
4478m4_defun([_LT_LINKER_SHLIBS], 4170m4_defun([_LT_LINKER_SHLIBS],
4479[AC_REQUIRE([LT_PATH_LD])dnl 4171[AC_REQUIRE([LT_PATH_LD])dnl
4480AC_REQUIRE([LT_PATH_NM])dnl 4172AC_REQUIRE([LT_PATH_NM])dnl
4481m4_require([_LT_PATH_MANIFEST_TOOL])dnl
4482m4_require([_LT_FILEUTILS_DEFAULTS])dnl 4173m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4483m4_require([_LT_DECL_EGREP])dnl 4174m4_require([_LT_DECL_EGREP])dnl
4484m4_require([_LT_DECL_SED])dnl 4175m4_require([_LT_DECL_SED])dnl
@@ -4487,38 +4178,30 @@ m4_require([_LT_TAG_COMPILER])dnl
4487AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 4178AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
4488m4_if([$1], [CXX], [ 4179m4_if([$1], [CXX], [
4489 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 4180 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4490 _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
4491 case $host_os in 4181 case $host_os in
4492 aix[[4-9]]*) 4182 aix[[4-9]]*)
4493 # If we're using GNU nm, then we don't want the "-C" option. 4183 # If we're using GNU nm, then we don't want the "-C" option.
4494 # -C means demangle to AIX nm, but means don't demangle with GNU nm 4184 # -C means demangle to AIX nm, but means don't demangle with GNU nm
4495 # Also, AIX nm treats weak defined symbols like other global defined
4496 # symbols, whereas GNU nm marks them as "W".
4497 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then 4185 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
4498 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 4186 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4499 else 4187 else
4500 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 4188 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4501 fi 4189 fi
4502 ;; 4190 ;;
4503 pw32*) 4191 pw32*)
4504 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 4192 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4505 ;; 4193 ;;
4506 cygwin* | mingw* | cegcc*) 4194 cygwin* | mingw* | cegcc*)
4507 case $cc_basename in 4195 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4508 cl*) ;; 4196 ;;
4509 *) 4197 linux* | k*bsd*-gnu)
4510 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4511 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
4512 ;;
4513 esac
4514 ;;
4515 linux* | k*bsd*-gnu | gnu*)
4516 _LT_TAGVAR(link_all_deplibs, $1)=no 4198 _LT_TAGVAR(link_all_deplibs, $1)=no
4517 ;; 4199 ;;
4518 *) 4200 *)
4519 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 4201 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4520 ;; 4202 ;;
4521 esac 4203 esac
4204 _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
4522], [ 4205], [
4523 runpath_var= 4206 runpath_var=
4524 _LT_TAGVAR(allow_undefined_flag, $1)= 4207 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4578,39 +4261,13 @@ dnl Note also adjust exclude_expsyms for C++ above.
4578 openbsd*) 4261 openbsd*)
4579 with_gnu_ld=no 4262 with_gnu_ld=no
4580 ;; 4263 ;;
4581 linux* | k*bsd*-gnu | gnu*) 4264 linux* | k*bsd*-gnu)
4582 _LT_TAGVAR(link_all_deplibs, $1)=no 4265 _LT_TAGVAR(link_all_deplibs, $1)=no
4583 ;; 4266 ;;
4584 esac 4267 esac
4585 4268
4586 _LT_TAGVAR(ld_shlibs, $1)=yes 4269 _LT_TAGVAR(ld_shlibs, $1)=yes
4587
4588 # On some targets, GNU ld is compatible enough with the native linker
4589 # that we're better off using the native interface for both.
4590 lt_use_gnu_ld_interface=no
4591 if test "$with_gnu_ld" = yes; then 4270 if test "$with_gnu_ld" = yes; then
4592 case $host_os in
4593 aix*)
4594 # The AIX port of GNU ld has always aspired to compatibility
4595 # with the native linker. However, as the warning in the GNU ld
4596 # block says, versions before 2.19.5* couldn't really create working
4597 # shared libraries, regardless of the interface used.
4598 case `$LD -v 2>&1` in
4599 *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
4600 *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
4601 *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
4602 *)
4603 lt_use_gnu_ld_interface=yes
4604 ;;
4605 esac
4606 ;;
4607 *)
4608 lt_use_gnu_ld_interface=yes
4609 ;;
4610 esac
4611 fi
4612
4613 if test "$lt_use_gnu_ld_interface" = yes; then
4614 # If archive_cmds runs LD, not CC, wlarc should be empty 4271 # If archive_cmds runs LD, not CC, wlarc should be empty
4615 wlarc='${wl}' 4272 wlarc='${wl}'
4616 4273
@@ -4644,12 +4301,11 @@ dnl Note also adjust exclude_expsyms for C++ above.
4644 _LT_TAGVAR(ld_shlibs, $1)=no 4301 _LT_TAGVAR(ld_shlibs, $1)=no
4645 cat <<_LT_EOF 1>&2 4302 cat <<_LT_EOF 1>&2
4646 4303
4647*** Warning: the GNU linker, at least up to release 2.19, is reported 4304*** Warning: the GNU linker, at least up to release 2.9.1, is reported
4648*** to be unable to reliably create shared libraries on AIX. 4305*** to be unable to reliably create shared libraries on AIX.
4649*** Therefore, libtool is disabling shared libraries support. If you 4306*** Therefore, libtool is disabling shared libraries support. If you
4650*** really care for shared libraries, you may want to install binutils 4307*** really care for shared libraries, you may want to modify your PATH
4651*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. 4308*** so that a non-GNU linker is found, and then restart.
4652*** You will then need to restart the configuration process.
4653 4309
4654_LT_EOF 4310_LT_EOF
4655 fi 4311 fi
@@ -4685,12 +4341,10 @@ _LT_EOF
4685 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 4341 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
4686 # as there is no search path for DLLs. 4342 # as there is no search path for DLLs.
4687 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 4343 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
4688 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
4689 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 4344 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
4690 _LT_TAGVAR(always_export_symbols, $1)=no 4345 _LT_TAGVAR(always_export_symbols, $1)=no
4691 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 4346 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
4692 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' 4347 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
4693 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
4694 4348
4695 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4349 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4696 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4350 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4708,11 +4362,6 @@ _LT_EOF
4708 fi 4362 fi
4709 ;; 4363 ;;
4710 4364
4711 haiku*)
4712 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4713 _LT_TAGVAR(link_all_deplibs, $1)=yes
4714 ;;
4715
4716 interix[[3-9]]*) 4365 interix[[3-9]]*)
4717 _LT_TAGVAR(hardcode_direct, $1)=no 4366 _LT_TAGVAR(hardcode_direct, $1)=no
4718 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 4367 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4738,16 +4387,15 @@ _LT_EOF
4738 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 4387 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
4739 && test "$tmp_diet" = no 4388 && test "$tmp_diet" = no
4740 then 4389 then
4741 tmp_addflag=' $pic_flag' 4390 tmp_addflag=
4742 tmp_sharedflag='-shared' 4391 tmp_sharedflag='-shared'
4743 case $cc_basename,$host_cpu in 4392 case $cc_basename,$host_cpu in
4744 pgcc*) # Portland Group C compiler 4393 pgcc*) # Portland Group C compiler
4745 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' 4394 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4746 tmp_addflag=' $pic_flag' 4395 tmp_addflag=' $pic_flag'
4747 ;; 4396 ;;
4748 pgf77* | pgf90* | pgf95* | pgfortran*) 4397 pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
4749 # Portland Group f77 and f90 compilers 4398 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4750 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4751 tmp_addflag=' $pic_flag -Mnomain' ;; 4399 tmp_addflag=' $pic_flag -Mnomain' ;;
4752 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 4400 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
4753 tmp_addflag=' -i_dynamic' ;; 4401 tmp_addflag=' -i_dynamic' ;;
@@ -4758,17 +4406,13 @@ _LT_EOF
4758 lf95*) # Lahey Fortran 8.1 4406 lf95*) # Lahey Fortran 8.1
4759 _LT_TAGVAR(whole_archive_flag_spec, $1)= 4407 _LT_TAGVAR(whole_archive_flag_spec, $1)=
4760 tmp_sharedflag='--shared' ;; 4408 tmp_sharedflag='--shared' ;;
4761 xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) 4409 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4762 tmp_sharedflag='-qmkshrobj' 4410 tmp_sharedflag='-qmkshrobj'
4763 tmp_addflag= ;; 4411 tmp_addflag= ;;
4764 nvcc*) # Cuda Compiler Driver 2.2
4765 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4766 _LT_TAGVAR(compiler_needs_object, $1)=yes
4767 ;;
4768 esac 4412 esac
4769 case `$CC -V 2>&1 | sed 5q` in 4413 case `$CC -V 2>&1 | sed 5q` in
4770 *Sun\ C*) # Sun C 5.9 4414 *Sun\ C*) # Sun C 5.9
4771 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' 4415 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4772 _LT_TAGVAR(compiler_needs_object, $1)=yes 4416 _LT_TAGVAR(compiler_needs_object, $1)=yes
4773 tmp_sharedflag='-G' ;; 4417 tmp_sharedflag='-G' ;;
4774 *Sun\ F*) # Sun Fortran 8.3 4418 *Sun\ F*) # Sun Fortran 8.3
@@ -4784,17 +4428,17 @@ _LT_EOF
4784 fi 4428 fi
4785 4429
4786 case $cc_basename in 4430 case $cc_basename in
4787 xlf* | bgf* | bgxlf* | mpixlf*) 4431 xlf*)
4788 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself 4432 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
4789 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 4433 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
4790 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 4434 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4791 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 4435 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
4792 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 4436 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4793 if test "x$supports_anon_versioning" = xyes; then 4437 if test "x$supports_anon_versioning" = xyes; then
4794 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ 4438 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
4795 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 4439 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4796 echo "local: *; };" >> $output_objdir/$libname.ver~ 4440 echo "local: *; };" >> $output_objdir/$libname.ver~
4797 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 4441 $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4798 fi 4442 fi
4799 ;; 4443 ;;
4800 esac 4444 esac
@@ -4808,8 +4452,8 @@ _LT_EOF
4808 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4452 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4809 wlarc= 4453 wlarc=
4810 else 4454 else
4811 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4455 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4812 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4456 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4813 fi 4457 fi
4814 ;; 4458 ;;
4815 4459
@@ -4827,8 +4471,8 @@ _LT_EOF
4827 4471
4828_LT_EOF 4472_LT_EOF
4829 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4473 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4830 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4474 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4831 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4475 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4832 else 4476 else
4833 _LT_TAGVAR(ld_shlibs, $1)=no 4477 _LT_TAGVAR(ld_shlibs, $1)=no
4834 fi 4478 fi
@@ -4874,8 +4518,8 @@ _LT_EOF
4874 4518
4875 *) 4519 *)
4876 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4520 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4877 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4521 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4878 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4522 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4879 else 4523 else
4880 _LT_TAGVAR(ld_shlibs, $1)=no 4524 _LT_TAGVAR(ld_shlibs, $1)=no
4881 fi 4525 fi
@@ -4915,10 +4559,8 @@ _LT_EOF
4915 else 4559 else
4916 # If we're using GNU nm, then we don't want the "-C" option. 4560 # If we're using GNU nm, then we don't want the "-C" option.
4917 # -C means demangle to AIX nm, but means don't demangle with GNU nm 4561 # -C means demangle to AIX nm, but means don't demangle with GNU nm
4918 # Also, AIX nm treats weak defined symbols like other global
4919 # defined symbols, whereas GNU nm marks them as "W".
4920 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then 4562 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
4921 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 4563 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4922 else 4564 else
4923 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 4565 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4924 fi 4566 fi
@@ -5006,9 +4648,9 @@ _LT_EOF
5006 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 4648 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
5007 # Determine the default libpath from the value encoded in an 4649 # Determine the default libpath from the value encoded in an
5008 # empty executable. 4650 # empty executable.
5009 _LT_SYS_MODULE_PATH_AIX([$1]) 4651 _LT_SYS_MODULE_PATH_AIX
5010 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 4652 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5011 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 4653 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
5012 else 4654 else
5013 if test "$host_cpu" = ia64; then 4655 if test "$host_cpu" = ia64; then
5014 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' 4656 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5017,19 +4659,14 @@ _LT_EOF
5017 else 4659 else
5018 # Determine the default libpath from the value encoded in an 4660 # Determine the default libpath from the value encoded in an
5019 # empty executable. 4661 # empty executable.
5020 _LT_SYS_MODULE_PATH_AIX([$1]) 4662 _LT_SYS_MODULE_PATH_AIX
5021 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 4663 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5022 # Warning - without using the other run time loading flags, 4664 # Warning - without using the other run time loading flags,
5023 # -berok will link without error, but may produce a broken library. 4665 # -berok will link without error, but may produce a broken library.
5024 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' 4666 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
5025 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' 4667 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
5026 if test "$with_gnu_ld" = yes; then 4668 # Exported symbols can be pulled into shared objects from archives
5027 # We only use this code for GNU lds that support --whole-archive. 4669 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
5028 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
5029 else
5030 # Exported symbols can be pulled into shared objects from archives
5031 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
5032 fi
5033 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes 4670 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
5034 # This is similar to how AIX traditionally builds its shared libraries. 4671 # This is similar to how AIX traditionally builds its shared libraries.
5035 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' 4672 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5061,63 +4698,20 @@ _LT_EOF
5061 # Microsoft Visual C++. 4698 # Microsoft Visual C++.
5062 # hardcode_libdir_flag_spec is actually meaningless, as there is 4699 # hardcode_libdir_flag_spec is actually meaningless, as there is
5063 # no search path for DLLs. 4700 # no search path for DLLs.
5064 case $cc_basename in 4701 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
5065 cl*) 4702 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5066 # Native MSVC 4703 # Tell ltmain to make .lib files, not .a files.
5067 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 4704 libext=lib
5068 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 4705 # Tell ltmain to make .dll files, not .so files.
5069 _LT_TAGVAR(always_export_symbols, $1)=yes 4706 shrext_cmds=".dll"
5070 _LT_TAGVAR(file_list_spec, $1)='@' 4707 # FIXME: Setting linknames here is a bad hack.
5071 # Tell ltmain to make .lib files, not .a files. 4708 _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
5072 libext=lib 4709 # The linker will automatically build a .lib file if we build a DLL.
5073 # Tell ltmain to make .dll files, not .so files. 4710 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5074 shrext_cmds=".dll" 4711 # FIXME: Should let the user specify the lib program.
5075 # FIXME: Setting linknames here is a bad hack. 4712 _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
5076 _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 4713 _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
5077 _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 4714 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5078 sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
5079 else
5080 sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
5081 fi~
5082 $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
5083 linknames='
5084 # The linker will not automatically build a static lib if we build a DLL.
5085 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5086 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5087 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
5088 # Don't use ranlib
5089 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
5090 _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
5091 lt_tool_outputfile="@TOOL_OUTPUT@"~
5092 case $lt_outputfile in
5093 *.exe|*.EXE) ;;
5094 *)
5095 lt_outputfile="$lt_outputfile.exe"
5096 lt_tool_outputfile="$lt_tool_outputfile.exe"
5097 ;;
5098 esac~
5099 if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
5100 $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
5101 $RM "$lt_outputfile.manifest";
5102 fi'
5103 ;;
5104 *)
5105 # Assume MSVC wrapper
5106 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
5107 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5108 # Tell ltmain to make .lib files, not .a files.
5109 libext=lib
5110 # Tell ltmain to make .dll files, not .so files.
5111 shrext_cmds=".dll"
5112 # FIXME: Setting linknames here is a bad hack.
5113 _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
5114 # The linker will automatically build a .lib file if we build a DLL.
5115 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5116 # FIXME: Should let the user specify the lib program.
5117 _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
5118 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5119 ;;
5120 esac
5121 ;; 4715 ;;
5122 4716
5123 darwin* | rhapsody*) 4717 darwin* | rhapsody*)
@@ -5155,7 +4749,7 @@ _LT_EOF
5155 4749
5156 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4750 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5157 freebsd* | dragonfly*) 4751 freebsd* | dragonfly*)
5158 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 4752 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
5159 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 4753 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5160 _LT_TAGVAR(hardcode_direct, $1)=yes 4754 _LT_TAGVAR(hardcode_direct, $1)=yes
5161 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 4755 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5163,7 +4757,7 @@ _LT_EOF
5163 4757
5164 hpux9*) 4758 hpux9*)
5165 if test "$GCC" = yes; then 4759 if test "$GCC" = yes; then
5166 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 4760 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
5167 else 4761 else
5168 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 4762 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
5169 fi 4763 fi
@@ -5178,8 +4772,8 @@ _LT_EOF
5178 ;; 4772 ;;
5179 4773
5180 hpux10*) 4774 hpux10*)
5181 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4775 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
5182 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4776 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5183 else 4777 else
5184 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4778 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
5185 fi 4779 fi
@@ -5197,16 +4791,16 @@ _LT_EOF
5197 ;; 4791 ;;
5198 4792
5199 hpux11*) 4793 hpux11*)
5200 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4794 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
5201 case $host_cpu in 4795 case $host_cpu in
5202 hppa*64*) 4796 hppa*64*)
5203 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4797 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5204 ;; 4798 ;;
5205 ia64*) 4799 ia64*)
5206 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4800 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5207 ;; 4801 ;;
5208 *) 4802 *)
5209 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4803 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5210 ;; 4804 ;;
5211 esac 4805 esac
5212 else 4806 else
@@ -5218,14 +4812,7 @@ _LT_EOF
5218 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4812 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5219 ;; 4813 ;;
5220 *) 4814 *)
5221 m4_if($1, [], [ 4815 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5222 # Older versions of the 11.00 compiler do not understand -b yet
5223 # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
5224 _LT_LINKER_OPTION([if $CC understands -b],
5225 _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
5226 [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
5227 [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
5228 [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
5229 ;; 4816 ;;
5230 esac 4817 esac
5231 fi 4818 fi
@@ -5253,34 +4840,19 @@ _LT_EOF
5253 4840
5254 irix5* | irix6* | nonstopux*) 4841 irix5* | irix6* | nonstopux*)
5255 if test "$GCC" = yes; then 4842 if test "$GCC" = yes; then
5256 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 4843 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5257 # Try to use the -exported_symbol ld option, if it does not 4844 # Try to use the -exported_symbol ld option, if it does not
5258 # work, assume that -exports_file does not work either and 4845 # work, assume that -exports_file does not work either and
5259 # implicitly export all symbols. 4846 # implicitly export all symbols.
5260 # This should be the same for all languages, so no per-tag cache variable. 4847 save_LDFLAGS="$LDFLAGS"
5261 AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], 4848 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5262 [lt_cv_irix_exported_symbol], 4849 AC_LINK_IFELSE(int foo(void) {},
5263 [save_LDFLAGS="$LDFLAGS" 4850 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
5264 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 4851 )
5265 AC_LINK_IFELSE( 4852 LDFLAGS="$save_LDFLAGS"
5266 [AC_LANG_SOURCE(
5267 [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
5268 [C++], [[int foo (void) { return 0; }]],
5269 [Fortran 77], [[
5270 subroutine foo
5271 end]],
5272 [Fortran], [[
5273 subroutine foo
5274 end]])])],
5275 [lt_cv_irix_exported_symbol=yes],
5276 [lt_cv_irix_exported_symbol=no])
5277 LDFLAGS="$save_LDFLAGS"])
5278 if test "$lt_cv_irix_exported_symbol" = yes; then
5279 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
5280 fi
5281 else 4853 else
5282 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 4854 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5283 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 4855 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5284 fi 4856 fi
5285 _LT_TAGVAR(archive_cmds_need_lc, $1)='no' 4857 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
5286 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 4858 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5342,17 +4914,17 @@ _LT_EOF
5342 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 4914 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
5343 _LT_TAGVAR(hardcode_minus_L, $1)=yes 4915 _LT_TAGVAR(hardcode_minus_L, $1)=yes
5344 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 4916 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5345 _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' 4917 _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
5346 _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' 4918 _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
5347 ;; 4919 ;;
5348 4920
5349 osf3*) 4921 osf3*)
5350 if test "$GCC" = yes; then 4922 if test "$GCC" = yes; then
5351 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 4923 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5352 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 4924 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5353 else 4925 else
5354 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 4926 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5355 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 4927 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5356 fi 4928 fi
5357 _LT_TAGVAR(archive_cmds_need_lc, $1)='no' 4929 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
5358 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 4930 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5362,13 +4934,13 @@ _LT_EOF
5362 osf4* | osf5*) # as osf3* with the addition of -msym flag 4934 osf4* | osf5*) # as osf3* with the addition of -msym flag
5363 if test "$GCC" = yes; then 4935 if test "$GCC" = yes; then
5364 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 4936 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5365 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 4937 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5366 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 4938 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5367 else 4939 else
5368 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 4940 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5369 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 4941 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5370 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ 4942 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
5371 $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' 4943 $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
5372 4944
5373 # Both c and cxx compiler support -rpath directly 4945 # Both c and cxx compiler support -rpath directly
5374 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' 4946 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5381,9 +4953,9 @@ _LT_EOF
5381 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 4953 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
5382 if test "$GCC" = yes; then 4954 if test "$GCC" = yes; then
5383 wlarc='${wl}' 4955 wlarc='${wl}'
5384 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4956 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5385 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 4957 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5386 $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 4958 $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5387 else 4959 else
5388 case `$CC -V 2>&1` in 4960 case `$CC -V 2>&1` in
5389 *"Compilers 5.0"*) 4961 *"Compilers 5.0"*)
@@ -5559,38 +5131,36 @@ x|xyes)
5559 # Test whether the compiler implicitly links with -lc since on some 5131 # Test whether the compiler implicitly links with -lc since on some
5560 # systems, -lgcc has to come before -lc. If gcc already passes -lc 5132 # systems, -lgcc has to come before -lc. If gcc already passes -lc
5561 # to ld, don't add -lc before -lgcc. 5133 # to ld, don't add -lc before -lgcc.
5562 AC_CACHE_CHECK([whether -lc should be explicitly linked in], 5134 AC_MSG_CHECKING([whether -lc should be explicitly linked in])
5563 [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), 5135 $RM conftest*
5564 [$RM conftest* 5136 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
5565 echo "$lt_simple_compile_test_code" > conftest.$ac_ext 5137
5566 5138 if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
5567 if AC_TRY_EVAL(ac_compile) 2>conftest.err; then 5139 soname=conftest
5568 soname=conftest 5140 lib=conftest
5569 lib=conftest 5141 libobjs=conftest.$ac_objext
5570 libobjs=conftest.$ac_objext 5142 deplibs=
5571 deplibs= 5143 wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
5572 wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) 5144 pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
5573 pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) 5145 compiler_flags=-v
5574 compiler_flags=-v 5146 linker_flags=-v
5575 linker_flags=-v 5147 verstring=
5576 verstring= 5148 output_objdir=.
5577 output_objdir=. 5149 libname=conftest
5578 libname=conftest 5150 lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
5579 lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) 5151 _LT_TAGVAR(allow_undefined_flag, $1)=
5580 _LT_TAGVAR(allow_undefined_flag, $1)= 5152 if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
5581 if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 5153 then
5582 then 5154 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
5583 lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no 5155 else
5584 else 5156 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
5585 lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes 5157 fi
5586 fi 5158 _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
5587 _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag 5159 else
5588 else 5160 cat conftest.err 1>&5
5589 cat conftest.err 1>&5 5161 fi
5590 fi 5162 $RM conftest*
5591 $RM conftest* 5163 AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
5592 ])
5593 _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
5594 ;; 5164 ;;
5595 esac 5165 esac
5596 fi 5166 fi
@@ -5655,6 +5225,8 @@ _LT_TAGDECL([], [inherit_rpath], [0],
5655 to runtime path list]) 5225 to runtime path list])
5656_LT_TAGDECL([], [link_all_deplibs], [0], 5226_LT_TAGDECL([], [link_all_deplibs], [0],
5657 [Whether libtool must link a program against all its dependency libraries]) 5227 [Whether libtool must link a program against all its dependency libraries])
5228_LT_TAGDECL([], [fix_srcfile_path], [1],
5229 [Fix the shell variable $srcfile for the compiler])
5658_LT_TAGDECL([], [always_export_symbols], [0], 5230_LT_TAGDECL([], [always_export_symbols], [0],
5659 [Set to "yes" if exported symbols are required]) 5231 [Set to "yes" if exported symbols are required])
5660_LT_TAGDECL([], [export_symbols_cmds], [2], 5232_LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5665,8 +5237,6 @@ _LT_TAGDECL([], [include_expsyms], [1],
5665 [Symbols that must always be exported]) 5237 [Symbols that must always be exported])
5666_LT_TAGDECL([], [prelink_cmds], [2], 5238_LT_TAGDECL([], [prelink_cmds], [2],
5667 [Commands necessary for linking programs (against libraries) with templates]) 5239 [Commands necessary for linking programs (against libraries) with templates])
5668_LT_TAGDECL([], [postlink_cmds], [2],
5669 [Commands necessary for finishing linking programs])
5670_LT_TAGDECL([], [file_list_spec], [1], 5240_LT_TAGDECL([], [file_list_spec], [1],
5671 [Specify filename containing input files]) 5241 [Specify filename containing input files])
5672dnl FIXME: Not yet implemented 5242dnl FIXME: Not yet implemented
@@ -5760,15 +5330,14 @@ CC="$lt_save_CC"
5760])# _LT_LANG_C_CONFIG 5330])# _LT_LANG_C_CONFIG
5761 5331
5762 5332
5763# _LT_LANG_CXX_CONFIG([TAG]) 5333# _LT_PROG_CXX
5764# -------------------------- 5334# ------------
5765# Ensure that the configuration variables for a C++ compiler are suitably 5335# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
5766# defined. These variables are subsequently used by _LT_CONFIG to write 5336# compiler, we have our own version here.
5767# the compiler configuration to `libtool'. 5337m4_defun([_LT_PROG_CXX],
5768m4_defun([_LT_LANG_CXX_CONFIG], 5338[
5769[m4_require([_LT_FILEUTILS_DEFAULTS])dnl 5339pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
5770m4_require([_LT_DECL_EGREP])dnl 5340AC_PROG_CXX
5771m4_require([_LT_PATH_MANIFEST_TOOL])dnl
5772if test -n "$CXX" && ( test "X$CXX" != "Xno" && 5341if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5773 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 5342 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
5774 (test "X$CXX" != "Xg++"))) ; then 5343 (test "X$CXX" != "Xg++"))) ; then
@@ -5776,6 +5345,22 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5776else 5345else
5777 _lt_caught_CXX_error=yes 5346 _lt_caught_CXX_error=yes
5778fi 5347fi
5348popdef([AC_MSG_ERROR])
5349])# _LT_PROG_CXX
5350
5351dnl aclocal-1.4 backwards compatibility:
5352dnl AC_DEFUN([_LT_PROG_CXX], [])
5353
5354
5355# _LT_LANG_CXX_CONFIG([TAG])
5356# --------------------------
5357# Ensure that the configuration variables for a C++ compiler are suitably
5358# defined. These variables are subsequently used by _LT_CONFIG to write
5359# the compiler configuration to `libtool'.
5360m4_defun([_LT_LANG_CXX_CONFIG],
5361[AC_REQUIRE([_LT_PROG_CXX])dnl
5362m4_require([_LT_FILEUTILS_DEFAULTS])dnl
5363m4_require([_LT_DECL_EGREP])dnl
5779 5364
5780AC_LANG_PUSH(C++) 5365AC_LANG_PUSH(C++)
5781_LT_TAGVAR(archive_cmds_need_lc, $1)=no 5366_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5797,8 +5382,6 @@ _LT_TAGVAR(module_cmds, $1)=
5797_LT_TAGVAR(module_expsym_cmds, $1)= 5382_LT_TAGVAR(module_expsym_cmds, $1)=
5798_LT_TAGVAR(link_all_deplibs, $1)=unknown 5383_LT_TAGVAR(link_all_deplibs, $1)=unknown
5799_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds 5384_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
5800_LT_TAGVAR(reload_flag, $1)=$reload_flag
5801_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
5802_LT_TAGVAR(no_undefined_flag, $1)= 5385_LT_TAGVAR(no_undefined_flag, $1)=
5803_LT_TAGVAR(whole_archive_flag_spec, $1)= 5386_LT_TAGVAR(whole_archive_flag_spec, $1)=
5804_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no 5387_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5830,7 +5413,6 @@ if test "$_lt_caught_CXX_error" != yes; then
5830 5413
5831 # Allow CC to be a program name with arguments. 5414 # Allow CC to be a program name with arguments.
5832 lt_save_CC=$CC 5415 lt_save_CC=$CC
5833 lt_save_CFLAGS=$CFLAGS
5834 lt_save_LD=$LD 5416 lt_save_LD=$LD
5835 lt_save_GCC=$GCC 5417 lt_save_GCC=$GCC
5836 GCC=$GXX 5418 GCC=$GXX
@@ -5848,7 +5430,6 @@ if test "$_lt_caught_CXX_error" != yes; then
5848 fi 5430 fi
5849 test -z "${LDCXX+set}" || LD=$LDCXX 5431 test -z "${LDCXX+set}" || LD=$LDCXX
5850 CC=${CXX-"c++"} 5432 CC=${CXX-"c++"}
5851 CFLAGS=$CXXFLAGS
5852 compiler=$CC 5433 compiler=$CC
5853 _LT_TAGVAR(compiler, $1)=$CC 5434 _LT_TAGVAR(compiler, $1)=$CC
5854 _LT_CC_BASENAME([$compiler]) 5435 _LT_CC_BASENAME([$compiler])
@@ -5870,8 +5451,8 @@ if test "$_lt_caught_CXX_error" != yes; then
5870 # Check if GNU C++ uses GNU ld as the underlying linker, since the 5451 # Check if GNU C++ uses GNU ld as the underlying linker, since the
5871 # archiving commands below assume that GNU ld is being used. 5452 # archiving commands below assume that GNU ld is being used.
5872 if test "$with_gnu_ld" = yes; then 5453 if test "$with_gnu_ld" = yes; then
5873 _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' 5454 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
5874 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 5455 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5875 5456
5876 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 5457 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5877 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 5458 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5903,7 +5484,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5903 # Commands to make compiler produce verbose output that lists 5484 # Commands to make compiler produce verbose output that lists
5904 # what "hidden" libraries, object files and flags are used when 5485 # what "hidden" libraries, object files and flags are used when
5905 # linking a shared library. 5486 # linking a shared library.
5906 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' 5487 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
5907 5488
5908 else 5489 else
5909 GXX=no 5490 GXX=no
@@ -6012,10 +5593,10 @@ if test "$_lt_caught_CXX_error" != yes; then
6012 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 5593 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
6013 # Determine the default libpath from the value encoded in an empty 5594 # Determine the default libpath from the value encoded in an empty
6014 # executable. 5595 # executable.
6015 _LT_SYS_MODULE_PATH_AIX([$1]) 5596 _LT_SYS_MODULE_PATH_AIX
6016 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 5597 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
6017 5598
6018 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 5599 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
6019 else 5600 else
6020 if test "$host_cpu" = ia64; then 5601 if test "$host_cpu" = ia64; then
6021 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' 5602 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6024,19 +5605,14 @@ if test "$_lt_caught_CXX_error" != yes; then
6024 else 5605 else
6025 # Determine the default libpath from the value encoded in an 5606 # Determine the default libpath from the value encoded in an
6026 # empty executable. 5607 # empty executable.
6027 _LT_SYS_MODULE_PATH_AIX([$1]) 5608 _LT_SYS_MODULE_PATH_AIX
6028 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 5609 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
6029 # Warning - without using the other run time loading flags, 5610 # Warning - without using the other run time loading flags,
6030 # -berok will link without error, but may produce a broken library. 5611 # -berok will link without error, but may produce a broken library.
6031 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' 5612 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
6032 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' 5613 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
6033 if test "$with_gnu_ld" = yes; then 5614 # Exported symbols can be pulled into shared objects from archives
6034 # We only use this code for GNU lds that support --whole-archive. 5615 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
6035 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
6036 else
6037 # Exported symbols can be pulled into shared objects from archives
6038 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
6039 fi
6040 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes 5616 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
6041 # This is similar to how AIX traditionally builds its shared 5617 # This is similar to how AIX traditionally builds its shared
6042 # libraries. 5618 # libraries.
@@ -6066,75 +5642,28 @@ if test "$_lt_caught_CXX_error" != yes; then
6066 ;; 5642 ;;
6067 5643
6068 cygwin* | mingw* | pw32* | cegcc*) 5644 cygwin* | mingw* | pw32* | cegcc*)
6069 case $GXX,$cc_basename in 5645 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
6070 ,cl* | no,cl*) 5646 # as there is no search path for DLLs.
6071 # Native MSVC 5647 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
6072 # hardcode_libdir_flag_spec is actually meaningless, as there is 5648 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6073 # no search path for DLLs. 5649 _LT_TAGVAR(always_export_symbols, $1)=no
6074 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 5650 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
6075 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 5651
6076 _LT_TAGVAR(always_export_symbols, $1)=yes 5652 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6077 _LT_TAGVAR(file_list_spec, $1)='@' 5653 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6078 # Tell ltmain to make .lib files, not .a files. 5654 # If the export-symbols file already is a .def file (1st line
6079 libext=lib 5655 # is EXPORTS), use it as is; otherwise, prepend...
6080 # Tell ltmain to make .dll files, not .so files. 5656 _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6081 shrext_cmds=".dll" 5657 cp $export_symbols $output_objdir/$soname.def;
6082 # FIXME: Setting linknames here is a bad hack. 5658 else
6083 _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 5659 echo EXPORTS > $output_objdir/$soname.def;
6084 _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 5660 cat $export_symbols >> $output_objdir/$soname.def;
6085 $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 5661 fi~
6086 else 5662 $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6087 $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 5663 else
6088 fi~ 5664 _LT_TAGVAR(ld_shlibs, $1)=no
6089 $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 5665 fi
6090 linknames=' 5666 ;;
6091 # The linker will not automatically build a static lib if we build a DLL.
6092 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
6093 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
6094 # Don't use ranlib
6095 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
6096 _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
6097 lt_tool_outputfile="@TOOL_OUTPUT@"~
6098 case $lt_outputfile in
6099 *.exe|*.EXE) ;;
6100 *)
6101 lt_outputfile="$lt_outputfile.exe"
6102 lt_tool_outputfile="$lt_tool_outputfile.exe"
6103 ;;
6104 esac~
6105 func_to_tool_file "$lt_outputfile"~
6106 if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6107 $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6108 $RM "$lt_outputfile.manifest";
6109 fi'
6110 ;;
6111 *)
6112 # g++
6113 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
6114 # as there is no search path for DLLs.
6115 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
6116 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
6117 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6118 _LT_TAGVAR(always_export_symbols, $1)=no
6119 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
6120
6121 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6122 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6123 # If the export-symbols file already is a .def file (1st line
6124 # is EXPORTS), use it as is; otherwise, prepend...
6125 _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6126 cp $export_symbols $output_objdir/$soname.def;
6127 else
6128 echo EXPORTS > $output_objdir/$soname.def;
6129 cat $export_symbols >> $output_objdir/$soname.def;
6130 fi~
6131 $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6132 else
6133 _LT_TAGVAR(ld_shlibs, $1)=no
6134 fi
6135 ;;
6136 esac
6137 ;;
6138 darwin* | rhapsody*) 5667 darwin* | rhapsody*)
6139 _LT_DARWIN_LINKER_FEATURES($1) 5668 _LT_DARWIN_LINKER_FEATURES($1)
6140 ;; 5669 ;;
@@ -6176,11 +5705,6 @@ if test "$_lt_caught_CXX_error" != yes; then
6176 gnu*) 5705 gnu*)
6177 ;; 5706 ;;
6178 5707
6179 haiku*)
6180 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6181 _LT_TAGVAR(link_all_deplibs, $1)=yes
6182 ;;
6183
6184 hpux9*) 5708 hpux9*)
6185 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' 5709 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
6186 _LT_TAGVAR(hardcode_libdir_separator, $1)=: 5710 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6205,11 +5729,11 @@ if test "$_lt_caught_CXX_error" != yes; then
6205 # explicitly linking system object files so we need to strip them 5729 # explicitly linking system object files so we need to strip them
6206 # from the output so that they don't get included in the library 5730 # from the output so that they don't get included in the library
6207 # dependencies. 5731 # dependencies.
6208 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' 5732 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6209 ;; 5733 ;;
6210 *) 5734 *)
6211 if test "$GXX" = yes; then 5735 if test "$GXX" = yes; then
6212 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 5736 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6213 else 5737 else
6214 # FIXME: insert proper C++ library support 5738 # FIXME: insert proper C++ library support
6215 _LT_TAGVAR(ld_shlibs, $1)=no 5739 _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6270,7 +5794,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6270 # explicitly linking system object files so we need to strip them 5794 # explicitly linking system object files so we need to strip them
6271 # from the output so that they don't get included in the library 5795 # from the output so that they don't get included in the library
6272 # dependencies. 5796 # dependencies.
6273 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' 5797 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6274 ;; 5798 ;;
6275 *) 5799 *)
6276 if test "$GXX" = yes; then 5800 if test "$GXX" = yes; then
@@ -6280,10 +5804,10 @@ if test "$_lt_caught_CXX_error" != yes; then
6280 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 5804 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
6281 ;; 5805 ;;
6282 ia64*) 5806 ia64*)
6283 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 5807 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
6284 ;; 5808 ;;
6285 *) 5809 *)
6286 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 5810 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
6287 ;; 5811 ;;
6288 esac 5812 esac
6289 fi 5813 fi
@@ -6313,7 +5837,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6313 case $cc_basename in 5837 case $cc_basename in
6314 CC*) 5838 CC*)
6315 # SGI C++ 5839 # SGI C++
6316 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 5840 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6317 5841
6318 # Archives containing C++ object files must be created using 5842 # Archives containing C++ object files must be created using
6319 # "CC -ar", where "CC" is the IRIX C++ compiler. This is 5843 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6324,9 +5848,9 @@ if test "$_lt_caught_CXX_error" != yes; then
6324 *) 5848 *)
6325 if test "$GXX" = yes; then 5849 if test "$GXX" = yes; then
6326 if test "$with_gnu_ld" = no; then 5850 if test "$with_gnu_ld" = no; then
6327 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 5851 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6328 else 5852 else
6329 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' 5853 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
6330 fi 5854 fi
6331 fi 5855 fi
6332 _LT_TAGVAR(link_all_deplibs, $1)=yes 5856 _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6355,7 +5879,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6355 # explicitly linking system object files so we need to strip them 5879 # explicitly linking system object files so we need to strip them
6356 # from the output so that they don't get included in the library 5880 # from the output so that they don't get included in the library
6357 # dependencies. 5881 # dependencies.
6358 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' 5882 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6359 5883
6360 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' 5884 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
6361 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 5885 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6392,26 +5916,26 @@ if test "$_lt_caught_CXX_error" != yes; then
6392 pgCC* | pgcpp*) 5916 pgCC* | pgcpp*)
6393 # Portland Group C++ compiler 5917 # Portland Group C++ compiler
6394 case `$CC -V` in 5918 case `$CC -V` in
6395 *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) 5919 *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
6396 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 5920 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
6397 rm -rf $tpldir~ 5921 rm -rf $tpldir~
6398 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 5922 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
6399 compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 5923 compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
6400 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ 5924 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
6401 rm -rf $tpldir~ 5925 rm -rf $tpldir~
6402 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 5926 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
6403 $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 5927 $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
6404 $RANLIB $oldlib' 5928 $RANLIB $oldlib'
6405 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ 5929 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
6406 rm -rf $tpldir~ 5930 rm -rf $tpldir~
6407 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 5931 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
6408 $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 5932 $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
6409 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ 5933 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
6410 rm -rf $tpldir~ 5934 rm -rf $tpldir~
6411 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 5935 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
6412 $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' 5936 $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
6413 ;; 5937 ;;
6414 *) # Version 6 and above use weak symbols 5938 *) # Version 6 will use weak symbols
6415 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 5939 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
6416 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' 5940 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
6417 ;; 5941 ;;
@@ -6419,7 +5943,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6419 5943
6420 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' 5944 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
6421 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 5945 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
6422 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' 5946 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
6423 ;; 5947 ;;
6424 cxx*) 5948 cxx*)
6425 # Compaq C++ 5949 # Compaq C++
@@ -6438,9 +5962,9 @@ if test "$_lt_caught_CXX_error" != yes; then
6438 # explicitly linking system object files so we need to strip them 5962 # explicitly linking system object files so we need to strip them
6439 # from the output so that they don't get included in the library 5963 # from the output so that they don't get included in the library
6440 # dependencies. 5964 # dependencies.
6441 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' 5965 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6442 ;; 5966 ;;
6443 xl* | mpixl* | bgxl*) 5967 xl*)
6444 # IBM XL 8.0 on PPC, with GNU ld 5968 # IBM XL 8.0 on PPC, with GNU ld
6445 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 5969 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
6446 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 5970 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6460,13 +5984,13 @@ if test "$_lt_caught_CXX_error" != yes; then
6460 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 5984 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
6461 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' 5985 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
6462 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 5986 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
6463 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' 5987 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
6464 _LT_TAGVAR(compiler_needs_object, $1)=yes 5988 _LT_TAGVAR(compiler_needs_object, $1)=yes
6465 5989
6466 # Not sure whether something based on 5990 # Not sure whether something based on
6467 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 5991 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
6468 # would be better. 5992 # would be better.
6469 output_verbose_link_cmd='func_echo_all' 5993 output_verbose_link_cmd='echo'
6470 5994
6471 # Archives containing C++ object files must be created using 5995 # Archives containing C++ object files must be created using
6472 # "CC -xar", where "CC" is the Sun C++ compiler. This is 5996 # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6535,7 +6059,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6535 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' 6059 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
6536 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' 6060 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
6537 fi 6061 fi
6538 output_verbose_link_cmd=func_echo_all 6062 output_verbose_link_cmd=echo
6539 else 6063 else
6540 _LT_TAGVAR(ld_shlibs, $1)=no 6064 _LT_TAGVAR(ld_shlibs, $1)=no
6541 fi 6065 fi
@@ -6570,15 +6094,15 @@ if test "$_lt_caught_CXX_error" != yes; then
6570 case $host in 6094 case $host in
6571 osf3*) 6095 osf3*)
6572 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 6096 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
6573 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 6097 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6574 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 6098 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
6575 ;; 6099 ;;
6576 *) 6100 *)
6577 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 6101 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
6578 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 6102 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6579 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ 6103 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
6580 echo "-hidden">> $lib.exp~ 6104 echo "-hidden">> $lib.exp~
6581 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ 6105 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
6582 $RM $lib.exp' 6106 $RM $lib.exp'
6583 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' 6107 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
6584 ;; 6108 ;;
@@ -6594,17 +6118,17 @@ if test "$_lt_caught_CXX_error" != yes; then
6594 # explicitly linking system object files so we need to strip them 6118 # explicitly linking system object files so we need to strip them
6595 # from the output so that they don't get included in the library 6119 # from the output so that they don't get included in the library
6596 # dependencies. 6120 # dependencies.
6597 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' 6121 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6598 ;; 6122 ;;
6599 *) 6123 *)
6600 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 6124 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
6601 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 6125 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
6602 case $host in 6126 case $host in
6603 osf3*) 6127 osf3*)
6604 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 6128 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6605 ;; 6129 ;;
6606 *) 6130 *)
6607 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 6131 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6608 ;; 6132 ;;
6609 esac 6133 esac
6610 6134
@@ -6614,7 +6138,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6614 # Commands to make compiler produce verbose output that lists 6138 # Commands to make compiler produce verbose output that lists
6615 # what "hidden" libraries, object files and flags are used when 6139 # what "hidden" libraries, object files and flags are used when
6616 # linking a shared library. 6140 # linking a shared library.
6617 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' 6141 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
6618 6142
6619 else 6143 else
6620 # FIXME: insert proper C++ library support 6144 # FIXME: insert proper C++ library support
@@ -6650,7 +6174,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6650 6174
6651 solaris*) 6175 solaris*)
6652 case $cc_basename in 6176 case $cc_basename in
6653 CC* | sunCC*) 6177 CC*)
6654 # Sun C++ 4.2, 5.x and Centerline C++ 6178 # Sun C++ 4.2, 5.x and Centerline C++
6655 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 6179 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
6656 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 6180 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6671,7 +6195,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6671 esac 6195 esac
6672 _LT_TAGVAR(link_all_deplibs, $1)=yes 6196 _LT_TAGVAR(link_all_deplibs, $1)=yes
6673 6197
6674 output_verbose_link_cmd='func_echo_all' 6198 output_verbose_link_cmd='echo'
6675 6199
6676 # Archives containing C++ object files must be created using 6200 # Archives containing C++ object files must be created using
6677 # "CC -xar", where "CC" is the Sun C++ compiler. This is 6201 # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6691,14 +6215,14 @@ if test "$_lt_caught_CXX_error" != yes; then
6691 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 6215 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
6692 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 6216 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
6693 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 6217 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
6694 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 6218 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
6695 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 6219 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6696 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 6220 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
6697 6221
6698 # Commands to make compiler produce verbose output that lists 6222 # Commands to make compiler produce verbose output that lists
6699 # what "hidden" libraries, object files and flags are used when 6223 # what "hidden" libraries, object files and flags are used when
6700 # linking a shared library. 6224 # linking a shared library.
6701 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' 6225 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
6702 else 6226 else
6703 # g++ 2.7 appears to require `-G' NOT `-shared' on this 6227 # g++ 2.7 appears to require `-G' NOT `-shared' on this
6704 # platform. 6228 # platform.
@@ -6709,7 +6233,7 @@ if test "$_lt_caught_CXX_error" != yes; then
6709 # Commands to make compiler produce verbose output that lists 6233 # Commands to make compiler produce verbose output that lists
6710 # what "hidden" libraries, object files and flags are used when 6234 # what "hidden" libraries, object files and flags are used when
6711 # linking a shared library. 6235 # linking a shared library.
6712 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' 6236 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
6713 fi 6237 fi
6714 6238
6715 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' 6239 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6763,10 +6287,6 @@ if test "$_lt_caught_CXX_error" != yes; then
6763 CC*) 6287 CC*)
6764 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' 6288 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
6765 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' 6289 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
6766 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
6767 '"$_LT_TAGVAR(old_archive_cmds, $1)"
6768 _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
6769 '"$_LT_TAGVAR(reload_cmds, $1)"
6770 ;; 6290 ;;
6771 *) 6291 *)
6772 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' 6292 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6822,7 +6342,6 @@ if test "$_lt_caught_CXX_error" != yes; then
6822 fi # test -n "$compiler" 6342 fi # test -n "$compiler"
6823 6343
6824 CC=$lt_save_CC 6344 CC=$lt_save_CC
6825 CFLAGS=$lt_save_CFLAGS
6826 LDCXX=$LD 6345 LDCXX=$LD
6827 LD=$lt_save_LD 6346 LD=$lt_save_LD
6828 GCC=$lt_save_GCC 6347 GCC=$lt_save_GCC
@@ -6837,29 +6356,6 @@ AC_LANG_POP
6837])# _LT_LANG_CXX_CONFIG 6356])# _LT_LANG_CXX_CONFIG
6838 6357
6839 6358
6840# _LT_FUNC_STRIPNAME_CNF
6841# ----------------------
6842# func_stripname_cnf prefix suffix name
6843# strip PREFIX and SUFFIX off of NAME.
6844# PREFIX and SUFFIX must not contain globbing or regex special
6845# characters, hashes, percent signs, but SUFFIX may contain a leading
6846# dot (in which case that matches only a dot).
6847#
6848# This function is identical to the (non-XSI) version of func_stripname,
6849# except this one can be used by m4 code that may be executed by configure,
6850# rather than the libtool script.
6851m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
6852AC_REQUIRE([_LT_DECL_SED])
6853AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
6854func_stripname_cnf ()
6855{
6856 case ${2} in
6857 .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
6858 *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
6859 esac
6860} # func_stripname_cnf
6861])# _LT_FUNC_STRIPNAME_CNF
6862
6863# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 6359# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
6864# --------------------------------- 6360# ---------------------------------
6865# Figure out "hidden" library dependencies from verbose 6361# Figure out "hidden" library dependencies from verbose
@@ -6868,7 +6364,6 @@ func_stripname_cnf ()
6868# objects, libraries and library flags. 6364# objects, libraries and library flags.
6869m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 6365m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
6870[m4_require([_LT_FILEUTILS_DEFAULTS])dnl 6366[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
6871AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
6872# Dependencies to place before and after the object being linked: 6367# Dependencies to place before and after the object being linked:
6873_LT_TAGVAR(predep_objects, $1)= 6368_LT_TAGVAR(predep_objects, $1)=
6874_LT_TAGVAR(postdep_objects, $1)= 6369_LT_TAGVAR(postdep_objects, $1)=
@@ -6919,13 +6414,6 @@ public class foo {
6919}; 6414};
6920_LT_EOF 6415_LT_EOF
6921]) 6416])
6922
6923_lt_libdeps_save_CFLAGS=$CFLAGS
6924case "$CC $CFLAGS " in #(
6925*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
6926*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
6927esac
6928
6929dnl Parse the compiler output and extract the necessary 6417dnl Parse the compiler output and extract the necessary
6930dnl objects, libraries and library flags. 6418dnl objects, libraries and library flags.
6931if AC_TRY_EVAL(ac_compile); then 6419if AC_TRY_EVAL(ac_compile); then
@@ -6937,7 +6425,7 @@ if AC_TRY_EVAL(ac_compile); then
6937 pre_test_object_deps_done=no 6425 pre_test_object_deps_done=no
6938 6426
6939 for p in `eval "$output_verbose_link_cmd"`; do 6427 for p in `eval "$output_verbose_link_cmd"`; do
6940 case ${prev}${p} in 6428 case $p in
6941 6429
6942 -L* | -R* | -l*) 6430 -L* | -R* | -l*)
6943 # Some compilers place space between "-{L,R}" and the path. 6431 # Some compilers place space between "-{L,R}" and the path.
@@ -6946,22 +6434,13 @@ if AC_TRY_EVAL(ac_compile); then
6946 test $p = "-R"; then 6434 test $p = "-R"; then
6947 prev=$p 6435 prev=$p
6948 continue 6436 continue
6437 else
6438 prev=
6949 fi 6439 fi
6950 6440
6951 # Expand the sysroot to ease extracting the directories later.
6952 if test -z "$prev"; then
6953 case $p in
6954 -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
6955 -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
6956 -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
6957 esac
6958 fi
6959 case $p in
6960 =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
6961 esac
6962 if test "$pre_test_object_deps_done" = no; then 6441 if test "$pre_test_object_deps_done" = no; then
6963 case ${prev} in 6442 case $p in
6964 -L | -R) 6443 -L* | -R*)
6965 # Internal compiler library paths should come after those 6444 # Internal compiler library paths should come after those
6966 # provided the user. The postdeps already come after the 6445 # provided the user. The postdeps already come after the
6967 # user supplied libs so there is no need to process them. 6446 # user supplied libs so there is no need to process them.
@@ -6981,10 +6460,8 @@ if AC_TRY_EVAL(ac_compile); then
6981 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 6460 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
6982 fi 6461 fi
6983 fi 6462 fi
6984 prev=
6985 ;; 6463 ;;
6986 6464
6987 *.lto.$objext) ;; # Ignore GCC LTO objects
6988 *.$objext) 6465 *.$objext)
6989 # This assumes that the test object file only shows up 6466 # This assumes that the test object file only shows up
6990 # once in the compiler output. 6467 # once in the compiler output.
@@ -7020,7 +6497,6 @@ else
7020fi 6497fi
7021 6498
7022$RM -f confest.$objext 6499$RM -f confest.$objext
7023CFLAGS=$_lt_libdeps_save_CFLAGS
7024 6500
7025# PORTME: override above test on systems where it is broken 6501# PORTME: override above test on systems where it is broken
7026m4_if([$1], [CXX], 6502m4_if([$1], [CXX],
@@ -7057,7 +6533,7 @@ linux*)
7057 6533
7058solaris*) 6534solaris*)
7059 case $cc_basename in 6535 case $cc_basename in
7060 CC* | sunCC*) 6536 CC*)
7061 # The more standards-conforming stlport4 library is 6537 # The more standards-conforming stlport4 library is
7062 # incompatible with the Cstd library. Avoid specifying 6538 # incompatible with the Cstd library. Avoid specifying
7063 # it if it's in CXXFLAGS. Ignore libCrun as 6539 # it if it's in CXXFLAGS. Ignore libCrun as
@@ -7101,16 +6577,32 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
7101])# _LT_SYS_HIDDEN_LIBDEPS 6577])# _LT_SYS_HIDDEN_LIBDEPS
7102 6578
7103 6579
6580# _LT_PROG_F77
6581# ------------
6582# Since AC_PROG_F77 is broken, in that it returns the empty string
6583# if there is no fortran compiler, we have our own version here.
6584m4_defun([_LT_PROG_F77],
6585[
6586pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
6587AC_PROG_F77
6588if test -z "$F77" || test "X$F77" = "Xno"; then
6589 _lt_disable_F77=yes
6590fi
6591popdef([AC_MSG_ERROR])
6592])# _LT_PROG_F77
6593
6594dnl aclocal-1.4 backwards compatibility:
6595dnl AC_DEFUN([_LT_PROG_F77], [])
6596
6597
7104# _LT_LANG_F77_CONFIG([TAG]) 6598# _LT_LANG_F77_CONFIG([TAG])
7105# -------------------------- 6599# --------------------------
7106# Ensure that the configuration variables for a Fortran 77 compiler are 6600# Ensure that the configuration variables for a Fortran 77 compiler are
7107# suitably defined. These variables are subsequently used by _LT_CONFIG 6601# suitably defined. These variables are subsequently used by _LT_CONFIG
7108# to write the compiler configuration to `libtool'. 6602# to write the compiler configuration to `libtool'.
7109m4_defun([_LT_LANG_F77_CONFIG], 6603m4_defun([_LT_LANG_F77_CONFIG],
7110[AC_LANG_PUSH(Fortran 77) 6604[AC_REQUIRE([_LT_PROG_F77])dnl
7111if test -z "$F77" || test "X$F77" = "Xno"; then 6605AC_LANG_PUSH(Fortran 77)
7112 _lt_disable_F77=yes
7113fi
7114 6606
7115_LT_TAGVAR(archive_cmds_need_lc, $1)=no 6607_LT_TAGVAR(archive_cmds_need_lc, $1)=no
7116_LT_TAGVAR(allow_undefined_flag, $1)= 6608_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7129,8 +6621,6 @@ _LT_TAGVAR(module_cmds, $1)=
7129_LT_TAGVAR(module_expsym_cmds, $1)= 6621_LT_TAGVAR(module_expsym_cmds, $1)=
7130_LT_TAGVAR(link_all_deplibs, $1)=unknown 6622_LT_TAGVAR(link_all_deplibs, $1)=unknown
7131_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds 6623_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7132_LT_TAGVAR(reload_flag, $1)=$reload_flag
7133_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
7134_LT_TAGVAR(no_undefined_flag, $1)= 6624_LT_TAGVAR(no_undefined_flag, $1)=
7135_LT_TAGVAR(whole_archive_flag_spec, $1)= 6625_LT_TAGVAR(whole_archive_flag_spec, $1)=
7136_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no 6626_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7170,9 +6660,7 @@ if test "$_lt_disable_F77" != yes; then
7170 # Allow CC to be a program name with arguments. 6660 # Allow CC to be a program name with arguments.
7171 lt_save_CC="$CC" 6661 lt_save_CC="$CC"
7172 lt_save_GCC=$GCC 6662 lt_save_GCC=$GCC
7173 lt_save_CFLAGS=$CFLAGS
7174 CC=${F77-"f77"} 6663 CC=${F77-"f77"}
7175 CFLAGS=$FFLAGS
7176 compiler=$CC 6664 compiler=$CC
7177 _LT_TAGVAR(compiler, $1)=$CC 6665 _LT_TAGVAR(compiler, $1)=$CC
7178 _LT_CC_BASENAME([$compiler]) 6666 _LT_CC_BASENAME([$compiler])
@@ -7226,24 +6714,38 @@ if test "$_lt_disable_F77" != yes; then
7226 6714
7227 GCC=$lt_save_GCC 6715 GCC=$lt_save_GCC
7228 CC="$lt_save_CC" 6716 CC="$lt_save_CC"
7229 CFLAGS="$lt_save_CFLAGS"
7230fi # test "$_lt_disable_F77" != yes 6717fi # test "$_lt_disable_F77" != yes
7231 6718
7232AC_LANG_POP 6719AC_LANG_POP
7233])# _LT_LANG_F77_CONFIG 6720])# _LT_LANG_F77_CONFIG
7234 6721
7235 6722
6723# _LT_PROG_FC
6724# -----------
6725# Since AC_PROG_FC is broken, in that it returns the empty string
6726# if there is no fortran compiler, we have our own version here.
6727m4_defun([_LT_PROG_FC],
6728[
6729pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
6730AC_PROG_FC
6731if test -z "$FC" || test "X$FC" = "Xno"; then
6732 _lt_disable_FC=yes
6733fi
6734popdef([AC_MSG_ERROR])
6735])# _LT_PROG_FC
6736
6737dnl aclocal-1.4 backwards compatibility:
6738dnl AC_DEFUN([_LT_PROG_FC], [])
6739
6740
7236# _LT_LANG_FC_CONFIG([TAG]) 6741# _LT_LANG_FC_CONFIG([TAG])
7237# ------------------------- 6742# -------------------------
7238# Ensure that the configuration variables for a Fortran compiler are 6743# Ensure that the configuration variables for a Fortran compiler are
7239# suitably defined. These variables are subsequently used by _LT_CONFIG 6744# suitably defined. These variables are subsequently used by _LT_CONFIG
7240# to write the compiler configuration to `libtool'. 6745# to write the compiler configuration to `libtool'.
7241m4_defun([_LT_LANG_FC_CONFIG], 6746m4_defun([_LT_LANG_FC_CONFIG],
7242[AC_LANG_PUSH(Fortran) 6747[AC_REQUIRE([_LT_PROG_FC])dnl
7243 6748AC_LANG_PUSH(Fortran)
7244if test -z "$FC" || test "X$FC" = "Xno"; then
7245 _lt_disable_FC=yes
7246fi
7247 6749
7248_LT_TAGVAR(archive_cmds_need_lc, $1)=no 6750_LT_TAGVAR(archive_cmds_need_lc, $1)=no
7249_LT_TAGVAR(allow_undefined_flag, $1)= 6751_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7262,8 +6764,6 @@ _LT_TAGVAR(module_cmds, $1)=
7262_LT_TAGVAR(module_expsym_cmds, $1)= 6764_LT_TAGVAR(module_expsym_cmds, $1)=
7263_LT_TAGVAR(link_all_deplibs, $1)=unknown 6765_LT_TAGVAR(link_all_deplibs, $1)=unknown
7264_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds 6766_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7265_LT_TAGVAR(reload_flag, $1)=$reload_flag
7266_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
7267_LT_TAGVAR(no_undefined_flag, $1)= 6767_LT_TAGVAR(no_undefined_flag, $1)=
7268_LT_TAGVAR(whole_archive_flag_spec, $1)= 6768_LT_TAGVAR(whole_archive_flag_spec, $1)=
7269_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no 6769_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7303,9 +6803,7 @@ if test "$_lt_disable_FC" != yes; then
7303 # Allow CC to be a program name with arguments. 6803 # Allow CC to be a program name with arguments.
7304 lt_save_CC="$CC" 6804 lt_save_CC="$CC"
7305 lt_save_GCC=$GCC 6805 lt_save_GCC=$GCC
7306 lt_save_CFLAGS=$CFLAGS
7307 CC=${FC-"f95"} 6806 CC=${FC-"f95"}
7308 CFLAGS=$FCFLAGS
7309 compiler=$CC 6807 compiler=$CC
7310 GCC=$ac_cv_fc_compiler_gnu 6808 GCC=$ac_cv_fc_compiler_gnu
7311 6809
@@ -7361,8 +6859,7 @@ if test "$_lt_disable_FC" != yes; then
7361 fi # test -n "$compiler" 6859 fi # test -n "$compiler"
7362 6860
7363 GCC=$lt_save_GCC 6861 GCC=$lt_save_GCC
7364 CC=$lt_save_CC 6862 CC="$lt_save_CC"
7365 CFLAGS=$lt_save_CFLAGS
7366fi # test "$_lt_disable_FC" != yes 6863fi # test "$_lt_disable_FC" != yes
7367 6864
7368AC_LANG_POP 6865AC_LANG_POP
@@ -7399,12 +6896,10 @@ _LT_COMPILER_BOILERPLATE
7399_LT_LINKER_BOILERPLATE 6896_LT_LINKER_BOILERPLATE
7400 6897
7401# Allow CC to be a program name with arguments. 6898# Allow CC to be a program name with arguments.
7402lt_save_CC=$CC 6899lt_save_CC="$CC"
7403lt_save_CFLAGS=$CFLAGS
7404lt_save_GCC=$GCC 6900lt_save_GCC=$GCC
7405GCC=yes 6901GCC=yes
7406CC=${GCJ-"gcj"} 6902CC=${GCJ-"gcj"}
7407CFLAGS=$GCJFLAGS
7408compiler=$CC 6903compiler=$CC
7409_LT_TAGVAR(compiler, $1)=$CC 6904_LT_TAGVAR(compiler, $1)=$CC
7410_LT_TAGVAR(LD, $1)="$LD" 6905_LT_TAGVAR(LD, $1)="$LD"
@@ -7414,8 +6909,6 @@ _LT_CC_BASENAME([$compiler])
7414_LT_TAGVAR(archive_cmds_need_lc, $1)=no 6909_LT_TAGVAR(archive_cmds_need_lc, $1)=no
7415 6910
7416_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds 6911_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7417_LT_TAGVAR(reload_flag, $1)=$reload_flag
7418_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
7419 6912
7420## CAVEAT EMPTOR: 6913## CAVEAT EMPTOR:
7421## There is no encapsulation within the following macros, do not change 6914## There is no encapsulation within the following macros, do not change
@@ -7435,8 +6928,7 @@ fi
7435AC_LANG_RESTORE 6928AC_LANG_RESTORE
7436 6929
7437GCC=$lt_save_GCC 6930GCC=$lt_save_GCC
7438CC=$lt_save_CC 6931CC="$lt_save_CC"
7439CFLAGS=$lt_save_CFLAGS
7440])# _LT_LANG_GCJ_CONFIG 6932])# _LT_LANG_GCJ_CONFIG
7441 6933
7442 6934
@@ -7471,11 +6963,9 @@ _LT_LINKER_BOILERPLATE
7471 6963
7472# Allow CC to be a program name with arguments. 6964# Allow CC to be a program name with arguments.
7473lt_save_CC="$CC" 6965lt_save_CC="$CC"
7474lt_save_CFLAGS=$CFLAGS
7475lt_save_GCC=$GCC 6966lt_save_GCC=$GCC
7476GCC= 6967GCC=
7477CC=${RC-"windres"} 6968CC=${RC-"windres"}
7478CFLAGS=
7479compiler=$CC 6969compiler=$CC
7480_LT_TAGVAR(compiler, $1)=$CC 6970_LT_TAGVAR(compiler, $1)=$CC
7481_LT_CC_BASENAME([$compiler]) 6971_LT_CC_BASENAME([$compiler])
@@ -7488,8 +6978,7 @@ fi
7488 6978
7489GCC=$lt_save_GCC 6979GCC=$lt_save_GCC
7490AC_LANG_RESTORE 6980AC_LANG_RESTORE
7491CC=$lt_save_CC 6981CC="$lt_save_CC"
7492CFLAGS=$lt_save_CFLAGS
7493])# _LT_LANG_RC_CONFIG 6982])# _LT_LANG_RC_CONFIG
7494 6983
7495 6984
@@ -7548,15 +7037,6 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
7548AC_SUBST([OBJDUMP]) 7037AC_SUBST([OBJDUMP])
7549]) 7038])
7550 7039
7551# _LT_DECL_DLLTOOL
7552# ----------------
7553# Ensure DLLTOOL variable is set.
7554m4_defun([_LT_DECL_DLLTOOL],
7555[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
7556test -z "$DLLTOOL" && DLLTOOL=dlltool
7557_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
7558AC_SUBST([DLLTOOL])
7559])
7560 7040
7561# _LT_DECL_SED 7041# _LT_DECL_SED
7562# ------------ 7042# ------------
@@ -7650,8 +7130,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
7650# Try some XSI features 7130# Try some XSI features
7651xsi_shell=no 7131xsi_shell=no
7652( _lt_dummy="a/b/c" 7132( _lt_dummy="a/b/c"
7653 test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 7133 test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7654 = c,a/b,b/c, \ 7134 = c,a/b,, \
7655 && eval 'test $(( 1 + 1 )) -eq 2 \ 7135 && eval 'test $(( 1 + 1 )) -eq 2 \
7656 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7136 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7657 && xsi_shell=yes 7137 && xsi_shell=yes
@@ -7690,162 +7170,208 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
7690])# _LT_CHECK_SHELL_FEATURES 7170])# _LT_CHECK_SHELL_FEATURES
7691 7171
7692 7172
7693# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) 7173# _LT_PROG_XSI_SHELLFNS
7694# ------------------------------------------------------ 7174# ---------------------
7695# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and 7175# Bourne and XSI compatible variants of some useful shell functions.
7696# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. 7176m4_defun([_LT_PROG_XSI_SHELLFNS],
7697m4_defun([_LT_PROG_FUNCTION_REPLACE], 7177[case $xsi_shell in
7698[dnl { 7178 yes)
7699sed -e '/^$1 ()$/,/^} # $1 /c\ 7179 cat << \_LT_EOF >> "$cfgfile"
7700$1 ()\ 7180
7701{\ 7181# func_dirname file append nondir_replacement
7702m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) 7182# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7703} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ 7183# otherwise set result to NONDIR_REPLACEMENT.
7704 && mv -f "$cfgfile.tmp" "$cfgfile" \ 7184func_dirname ()
7705 || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7185{
7706test 0 -eq $? || _lt_function_replace_fail=: 7186 case ${1} in
7707]) 7187 */*) func_dirname_result="${1%/*}${2}" ;;
7188 * ) func_dirname_result="${3}" ;;
7189 esac
7190}
7708 7191
7192# func_basename file
7193func_basename ()
7194{
7195 func_basename_result="${1##*/}"
7196}
7709 7197
7710# _LT_PROG_REPLACE_SHELLFNS 7198# func_dirname_and_basename file append nondir_replacement
7711# ------------------------- 7199# perform func_basename and func_dirname in a single function
7712# Replace existing portable implementations of several shell functions with 7200# call:
7713# equivalent extended shell implementations where those features are available.. 7201# dirname: Compute the dirname of FILE. If nonempty,
7714m4_defun([_LT_PROG_REPLACE_SHELLFNS], 7202# add APPEND to the result, otherwise set result
7715[if test x"$xsi_shell" = xyes; then 7203# to NONDIR_REPLACEMENT.
7716 _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl 7204# value returned in "$func_dirname_result"
7717 case ${1} in 7205# basename: Compute filename of FILE.
7718 */*) func_dirname_result="${1%/*}${2}" ;; 7206# value retuned in "$func_basename_result"
7719 * ) func_dirname_result="${3}" ;; 7207# Implementation must be kept synchronized with func_dirname
7720 esac]) 7208# and func_basename. For efficiency, we do not delegate to
7721 7209# those functions but instead duplicate the functionality here.
7722 _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl 7210func_dirname_and_basename ()
7723 func_basename_result="${1##*/}"]) 7211{
7724 7212 case ${1} in
7725 _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl 7213 */*) func_dirname_result="${1%/*}${2}" ;;
7726 case ${1} in 7214 * ) func_dirname_result="${3}" ;;
7727 */*) func_dirname_result="${1%/*}${2}" ;; 7215 esac
7728 * ) func_dirname_result="${3}" ;; 7216 func_basename_result="${1##*/}"
7729 esac 7217}
7730 func_basename_result="${1##*/}"])
7731 7218
7732 _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl 7219# func_stripname prefix suffix name
7733 # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 7220# strip PREFIX and SUFFIX off of NAME.
7734 # positional parameters, so assign one to ordinary parameter first. 7221# PREFIX and SUFFIX must not contain globbing or regex special
7735 func_stripname_result=${3} 7222# characters, hashes, percent signs, but SUFFIX may contain a leading
7736 func_stripname_result=${func_stripname_result#"${1}"} 7223# dot (in which case that matches only a dot).
7737 func_stripname_result=${func_stripname_result%"${2}"}]) 7224func_stripname ()
7225{
7226 # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7227 # positional parameters, so assign one to ordinary parameter first.
7228 func_stripname_result=${3}
7229 func_stripname_result=${func_stripname_result#"${1}"}
7230 func_stripname_result=${func_stripname_result%"${2}"}
7231}
7738 7232
7739 _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl 7233# func_opt_split
7740 func_split_long_opt_name=${1%%=*} 7234func_opt_split ()
7741 func_split_long_opt_arg=${1#*=}]) 7235{
7236 func_opt_split_opt=${1%%=*}
7237 func_opt_split_arg=${1#*=}
7238}
7742 7239
7743 _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl 7240# func_lo2o object
7744 func_split_short_opt_arg=${1#??} 7241func_lo2o ()
7745 func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) 7242{
7243 case ${1} in
7244 *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7245 *) func_lo2o_result=${1} ;;
7246 esac
7247}
7746 7248
7747 _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl 7249# func_xform libobj-or-source
7748 case ${1} in 7250func_xform ()
7749 *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 7251{
7750 *) func_lo2o_result=${1} ;; 7252 func_xform_result=${1%.*}.lo
7751 esac]) 7253}
7752 7254
7753 _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) 7255# func_arith arithmetic-term...
7256func_arith ()
7257{
7258 func_arith_result=$(( $[*] ))
7259}
7754 7260
7755 _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) 7261# func_len string
7262# STRING may not start with a hyphen.
7263func_len ()
7264{
7265 func_len_result=${#1}
7266}
7756 7267
7757 _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) 7268_LT_EOF
7758fi 7269 ;;
7270 *) # Bourne compatible functions.
7271 cat << \_LT_EOF >> "$cfgfile"
7759 7272
7760if test x"$lt_shell_append" = xyes; then 7273# func_dirname file append nondir_replacement
7761 _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) 7274# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7275# otherwise set result to NONDIR_REPLACEMENT.
7276func_dirname ()
7277{
7278 # Extract subdirectory from the argument.
7279 func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
7280 if test "X$func_dirname_result" = "X${1}"; then
7281 func_dirname_result="${3}"
7282 else
7283 func_dirname_result="$func_dirname_result${2}"
7284 fi
7285}
7762 7286
7763 _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl 7287# func_basename file
7764 func_quote_for_eval "${2}" 7288func_basename ()
7765dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ 7289{
7766 eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) 7290 func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
7291}
7767 7292
7768 # Save a `func_append' function call where possible by direct use of '+=' 7293dnl func_dirname_and_basename
7769 sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 7294dnl A portable version of this function is already defined in general.m4sh
7770 && mv -f "$cfgfile.tmp" "$cfgfile" \ 7295dnl so there is no need for it here.
7771 || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7772 test 0 -eq $? || _lt_function_replace_fail=:
7773else
7774 # Save a `func_append' function call even when '+=' is not available
7775 sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7776 && mv -f "$cfgfile.tmp" "$cfgfile" \
7777 || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7778 test 0 -eq $? || _lt_function_replace_fail=:
7779fi
7780 7296
7781if test x"$_lt_function_replace_fail" = x":"; then 7297# func_stripname prefix suffix name
7782 AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 7298# strip PREFIX and SUFFIX off of NAME.
7783fi 7299# PREFIX and SUFFIX must not contain globbing or regex special
7784]) 7300# characters, hashes, percent signs, but SUFFIX may contain a leading
7301# dot (in which case that matches only a dot).
7302# func_strip_suffix prefix name
7303func_stripname ()
7304{
7305 case ${2} in
7306 .*) func_stripname_result=`$ECHO "X${3}" \
7307 | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
7308 *) func_stripname_result=`$ECHO "X${3}" \
7309 | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
7310 esac
7311}
7785 7312
7786# _LT_PATH_CONVERSION_FUNCTIONS 7313# sed scripts:
7787# ----------------------------- 7314my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
7788# Determine which file name conversion functions should be used by 7315my_sed_long_arg='1s/^-[[^=]]*=//'
7789# func_to_host_file (and, implicitly, by func_to_host_path). These are needed 7316
7790# for certain cross-compile configurations and native mingw. 7317# func_opt_split
7791m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], 7318func_opt_split ()
7792[AC_REQUIRE([AC_CANONICAL_HOST])dnl 7319{
7793AC_REQUIRE([AC_CANONICAL_BUILD])dnl 7320 func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
7794AC_MSG_CHECKING([how to convert $build file names to $host format]) 7321 func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
7795AC_CACHE_VAL(lt_cv_to_host_file_cmd, 7322}
7796[case $host in 7323
7797 *-*-mingw* ) 7324# func_lo2o object
7798 case $build in 7325func_lo2o ()
7799 *-*-mingw* ) # actually msys 7326{
7800 lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 7327 func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
7801 ;; 7328}
7802 *-*-cygwin* ) 7329
7803 lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 7330# func_xform libobj-or-source
7804 ;; 7331func_xform ()
7805 * ) # otherwise, assume *nix 7332{
7806 lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 7333 func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
7807 ;; 7334}
7808 esac 7335
7809 ;; 7336# func_arith arithmetic-term...
7810 *-*-cygwin* ) 7337func_arith ()
7811 case $build in 7338{
7812 *-*-mingw* ) # actually msys 7339 func_arith_result=`expr "$[@]"`
7813 lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 7340}
7814 ;; 7341
7815 *-*-cygwin* ) 7342# func_len string
7816 lt_cv_to_host_file_cmd=func_convert_file_noop 7343# STRING may not start with a hyphen.
7817 ;; 7344func_len ()
7818 * ) # otherwise, assume *nix 7345{
7819 lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 7346 func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
7820 ;; 7347}
7821 esac 7348
7822 ;; 7349_LT_EOF
7823 * ) # unhandled hosts (and "normal" native builds)
7824 lt_cv_to_host_file_cmd=func_convert_file_noop
7825 ;;
7826esac 7350esac
7827]) 7351
7828to_host_file_cmd=$lt_cv_to_host_file_cmd 7352case $lt_shell_append in
7829AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) 7353 yes)
7830_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], 7354 cat << \_LT_EOF >> "$cfgfile"
7831 [0], [convert $build file names to $host format])dnl 7355
7832 7356# func_append var value
7833AC_MSG_CHECKING([how to convert $build file names to toolchain format]) 7357# Append VALUE to the end of shell variable VAR.
7834AC_CACHE_VAL(lt_cv_to_tool_file_cmd, 7358func_append ()
7835[#assume ordinary cross tools, or native build. 7359{
7836lt_cv_to_tool_file_cmd=func_convert_file_noop 7360 eval "$[1]+=\$[2]"
7837case $host in 7361}
7838 *-*-mingw* ) 7362_LT_EOF
7839 case $build in
7840 *-*-mingw* ) # actually msys
7841 lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7842 ;;
7843 esac
7844 ;; 7363 ;;
7845esac 7364 *)
7365 cat << \_LT_EOF >> "$cfgfile"
7366
7367# func_append var value
7368# Append VALUE to the end of shell variable VAR.
7369func_append ()
7370{
7371 eval "$[1]=\$$[1]\$[2]"
7372}
7373
7374_LT_EOF
7375 ;;
7376 esac
7846]) 7377])
7847to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7848AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
7849_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
7850 [0], [convert $build files to toolchain format])dnl
7851])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 17cfd51..34151a3 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,13 @@
1# Helper functions for option handling. -*- Autoconf -*- 1# Helper functions for option handling. -*- Autoconf -*-
2# 2#
3# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, 3# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
4# Inc.
5# Written by Gary V. Vaughan, 2004 4# Written by Gary V. Vaughan, 2004
6# 5#
7# This file is free software; the Free Software Foundation gives 6# This file is free software; the Free Software Foundation gives
8# unlimited permission to copy and/or distribute it, with or without 7# unlimited permission to copy and/or distribute it, with or without
9# modifications, as long as this notice is preserved. 8# modifications, as long as this notice is preserved.
10 9
11# serial 7 ltoptions.m4 10# serial 6 ltoptions.m4
12 11
13# This is to help aclocal find these macros, as it can't see m4_define. 12# This is to help aclocal find these macros, as it can't see m4_define.
14AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 13AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -126,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
126[enable_win32_dll=yes 125[enable_win32_dll=yes
127 126
128case $host in 127case $host in
129*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 128*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
130 AC_CHECK_TOOL(AS, as, false) 129 AC_CHECK_TOOL(AS, as, false)
131 AC_CHECK_TOOL(DLLTOOL, dlltool, false) 130 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
132 AC_CHECK_TOOL(OBJDUMP, objdump, false) 131 AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -134,13 +133,13 @@ case $host in
134esac 133esac
135 134
136test -z "$AS" && AS=as 135test -z "$AS" && AS=as
137_LT_DECL([], [AS], [1], [Assembler program])dnl 136_LT_DECL([], [AS], [0], [Assembler program])dnl
138 137
139test -z "$DLLTOOL" && DLLTOOL=dlltool 138test -z "$DLLTOOL" && DLLTOOL=dlltool
140_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl 139_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
141 140
142test -z "$OBJDUMP" && OBJDUMP=objdump 141test -z "$OBJDUMP" && OBJDUMP=objdump
143_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl 142_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
144])# win32-dll 143])# win32-dll
145 144
146AU_DEFUN([AC_LIBTOOL_WIN32_DLL], 145AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 9c7b5d4..f3c5309 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -7,17 +7,17 @@
7# unlimited permission to copy and/or distribute it, with or without 7# unlimited permission to copy and/or distribute it, with or without
8# modifications, as long as this notice is preserved. 8# modifications, as long as this notice is preserved.
9 9
10# @configure_input@ 10# Generated from ltversion.in.
11 11
12# serial 3293 ltversion.m4 12# serial 3017 ltversion.m4
13# This file is part of GNU Libtool 13# This file is part of GNU Libtool
14 14
15m4_define([LT_PACKAGE_VERSION], [2.4]) 15m4_define([LT_PACKAGE_VERSION], [2.2.6b])
16m4_define([LT_PACKAGE_REVISION], [1.3293]) 16m4_define([LT_PACKAGE_REVISION], [1.3017])
17 17
18AC_DEFUN([LTVERSION_VERSION], 18AC_DEFUN([LTVERSION_VERSION],
19[macro_version='2.4' 19[macro_version='2.2.6b'
20macro_revision='1.3293' 20macro_revision='1.3017'
21_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 21_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22_LT_DECL(, macro_revision, 0) 22_LT_DECL(, macro_revision, 0)
23]) 23])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..637bb20 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,13 +1,13 @@
1# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- 1# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
2# 2#
3# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. 3# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
4# Written by Scott James Remnant, 2004. 4# Written by Scott James Remnant, 2004.
5# 5#
6# This file is free software; the Free Software Foundation gives 6# This file is free software; the Free Software Foundation gives
7# unlimited permission to copy and/or distribute it, with or without 7# unlimited permission to copy and/or distribute it, with or without
8# modifications, as long as this notice is preserved. 8# modifications, as long as this notice is preserved.
9 9
10# serial 5 lt~obsolete.m4 10# serial 4 lt~obsolete.m4
11 11
12# These exist entirely to fool aclocal when bootstrapping libtool. 12# These exist entirely to fool aclocal when bootstrapping libtool.
13# 13#
@@ -77,6 +77,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
77m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) 77m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
78m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) 78m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
79m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) 79m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
80m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
80m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) 81m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
81m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) 82m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
82m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) 83m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -89,10 +90,3 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
89m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) 90m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
90m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) 91m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
91m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) 92m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
92m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
93m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
94m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
95m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
96m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
97m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
98m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/m4/nls.m4 b/m4/nls.m4
new file mode 100644
index 0000000..003704c
--- /dev/null
+++ b/m4/nls.m4
@@ -0,0 +1,32 @@
1# nls.m4 serial 5 (gettext-0.18)
2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
3dnl Inc.
4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved.
7dnl
8dnl This file can can be used in projects which are not available under
9dnl the GNU General Public License or the GNU Library General Public
10dnl License but which still want to provide support for the GNU gettext
11dnl functionality.
12dnl Please note that the actual code of the GNU gettext library is covered
13dnl by the GNU Library General Public License, and the rest of the GNU
14dnl gettext package package is covered by the GNU General Public License.
15dnl They are *not* in the public domain.
16
17dnl Authors:
18dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
19dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
20
21AC_PREREQ([2.50])
22
23AC_DEFUN([AM_NLS],
24[
25 AC_MSG_CHECKING([whether NLS is requested])
26 dnl Default is enabled NLS
27 AC_ARG_ENABLE([nls],
28 [ --disable-nls do not use Native Language Support],
29 USE_NLS=$enableval, USE_NLS=yes)
30 AC_MSG_RESULT([$USE_NLS])
31 AC_SUBST([USE_NLS])
32])
diff --git a/m4/pkg.m4 b/m4/pkg.m4
new file mode 100644
index 0000000..f2bfc2d
--- /dev/null
+++ b/m4/pkg.m4
@@ -0,0 +1,57 @@
1
2dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
3dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
4dnl also defines GSTUFF_PKG_ERRORS on error
5AC_DEFUN([PKG_CHECK_MODULES], [
6 succeeded=no
7
8 if test -z "$PKG_CONFIG"; then
9 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
10 fi
11
12 if test "$PKG_CONFIG" = "no" ; then
13 echo "*** The pkg-config script could not be found. Make sure it is"
14 echo "*** in your path, or set the PKG_CONFIG environment variable"
15 echo "*** to the full path to pkg-config."
16 echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
17 else
18 PKG_CONFIG_MIN_VERSION=0.9.0
19 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
20 AC_MSG_CHECKING(for $2)
21
22 if $PKG_CONFIG --exists "$2" ; then
23 AC_MSG_RESULT(yes)
24 succeeded=yes
25
26 AC_MSG_CHECKING($1_CFLAGS)
27 $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
28 AC_MSG_RESULT($$1_CFLAGS)
29
30 AC_MSG_CHECKING($1_LIBS)
31 $1_LIBS=`$PKG_CONFIG --libs "$2"`
32 AC_MSG_RESULT($$1_LIBS)
33 else
34 $1_CFLAGS=""
35 $1_LIBS=""
36 ## If we have a custom action on failure, don't print errors, but
37 ## do set a variable so people can do so.
38 $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
39 ifelse([$4], ,echo $$1_PKG_ERRORS,)
40 fi
41
42 AC_SUBST($1_CFLAGS)
43 AC_SUBST($1_LIBS)
44 else
45 echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
46 echo "*** See http://www.freedesktop.org/software/pkgconfig"
47 fi
48 fi
49
50 if test $succeeded = yes; then
51 ifelse([$3], , :, [$3])
52 else
53 ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
54 fi
55])
56
57
diff --git a/m4/po.m4 b/m4/po.m4
new file mode 100644
index 0000000..47f36a4
--- /dev/null
+++ b/m4/po.m4
@@ -0,0 +1,449 @@
1# po.m4 serial 17 (gettext-0.18)
2dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19
20AC_PREREQ([2.50])
21
22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS],
24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
28 AC_REQUIRE([AM_NLS])dnl
29
30 dnl Release version of the gettext macros. This is used to ensure that
31 dnl the gettext macros and po/Makefile.in.in are in sync.
32 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
33
34 dnl Perform the following tests also if --disable-nls has been given,
35 dnl because they are needed for "make dist" to work.
36
37 dnl Search for GNU msgfmt in the PATH.
38 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
39 dnl The second test excludes FreeBSD msgfmt.
40 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
41 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
42 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
43 :)
44 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
45
46 dnl Test whether it is GNU msgfmt >= 0.15.
47changequote(,)dnl
48 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
49 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
50 *) MSGFMT_015=$MSGFMT ;;
51 esac
52changequote([,])dnl
53 AC_SUBST([MSGFMT_015])
54changequote(,)dnl
55 case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
56 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
57 *) GMSGFMT_015=$GMSGFMT ;;
58 esac
59changequote([,])dnl
60 AC_SUBST([GMSGFMT_015])
61
62 dnl Search for GNU xgettext 0.12 or newer in the PATH.
63 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
64 dnl The second test excludes FreeBSD xgettext.
65 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
66 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
67 (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)],
68 :)
69 dnl Remove leftover from FreeBSD xgettext call.
70 rm -f messages.po
71
72 dnl Test whether it is GNU xgettext >= 0.15.
73changequote(,)dnl
74 case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
75 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
76 *) XGETTEXT_015=$XGETTEXT ;;
77 esac
78changequote([,])dnl
79 AC_SUBST([XGETTEXT_015])
80
81 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
82 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
83 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
84
85 dnl Installation directories.
86 dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
87 dnl have to define it here, so that it can be used in po/Makefile.
88 test -n "$localedir" || localedir='${datadir}/locale'
89 AC_SUBST([localedir])
90
91 dnl Support for AM_XGETTEXT_OPTION.
92 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
93 AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
94
95 AC_CONFIG_COMMANDS([po-directories], [[
96 for ac_file in $CONFIG_FILES; do
97 # Support "outfile[:infile[:infile...]]"
98 case "$ac_file" in
99 *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
100 esac
101 # PO directories have a Makefile.in generated from Makefile.in.in.
102 case "$ac_file" in */Makefile.in)
103 # Adjust a relative srcdir.
104 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
105 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
106 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
107 # In autoconf-2.13 it is called $ac_given_srcdir.
108 # In autoconf-2.50 it is called $srcdir.
109 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
110 case "$ac_given_srcdir" in
111 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
112 /*) top_srcdir="$ac_given_srcdir" ;;
113 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
114 esac
115 # Treat a directory as a PO directory if and only if it has a
116 # POTFILES.in file. This allows packages to have multiple PO
117 # directories under different names or in different locations.
118 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
119 rm -f "$ac_dir/POTFILES"
120 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
121 cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
122 POMAKEFILEDEPS="POTFILES.in"
123 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
124 # on $ac_dir but don't depend on user-specified configuration
125 # parameters.
126 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
127 # The LINGUAS file contains the set of available languages.
128 if test -n "$OBSOLETE_ALL_LINGUAS"; then
129 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
130 fi
131 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
132 # Hide the ALL_LINGUAS assigment from automake < 1.5.
133 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
134 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
135 else
136 # The set of available languages was given in configure.in.
137 # Hide the ALL_LINGUAS assigment from automake < 1.5.
138 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
139 fi
140 # Compute POFILES
141 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
142 # Compute UPDATEPOFILES
143 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
144 # Compute DUMMYPOFILES
145 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
146 # Compute GMOFILES
147 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
148 case "$ac_given_srcdir" in
149 .) srcdirpre= ;;
150 *) srcdirpre='$(srcdir)/' ;;
151 esac
152 POFILES=
153 UPDATEPOFILES=
154 DUMMYPOFILES=
155 GMOFILES=
156 for lang in $ALL_LINGUAS; do
157 POFILES="$POFILES $srcdirpre$lang.po"
158 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
159 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
160 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
161 done
162 # CATALOGS depends on both $ac_dir and the user's LINGUAS
163 # environment variable.
164 INST_LINGUAS=
165 if test -n "$ALL_LINGUAS"; then
166 for presentlang in $ALL_LINGUAS; do
167 useit=no
168 if test "%UNSET%" != "$LINGUAS"; then
169 desiredlanguages="$LINGUAS"
170 else
171 desiredlanguages="$ALL_LINGUAS"
172 fi
173 for desiredlang in $desiredlanguages; do
174 # Use the presentlang catalog if desiredlang is
175 # a. equal to presentlang, or
176 # b. a variant of presentlang (because in this case,
177 # presentlang can be used as a fallback for messages
178 # which are not translated in the desiredlang catalog).
179 case "$desiredlang" in
180 "$presentlang"*) useit=yes;;
181 esac
182 done
183 if test $useit = yes; then
184 INST_LINGUAS="$INST_LINGUAS $presentlang"
185 fi
186 done
187 fi
188 CATALOGS=
189 if test -n "$INST_LINGUAS"; then
190 for lang in $INST_LINGUAS; do
191 CATALOGS="$CATALOGS $lang.gmo"
192 done
193 fi
194 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
195 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"
196 for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
197 if test -f "$f"; then
198 case "$f" in
199 *.orig | *.bak | *~) ;;
200 *) cat "$f" >> "$ac_dir/Makefile" ;;
201 esac
202 fi
203 done
204 fi
205 ;;
206 esac
207 done]],
208 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
209 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
210 # from automake < 1.5.
211 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
212 # Capture the value of LINGUAS because we need it to compute CATALOGS.
213 LINGUAS="${LINGUAS-%UNSET%}"
214 ])
215])
216
217dnl Postprocesses a Makefile in a directory containing PO files.
218AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
219[
220 # When this code is run, in config.status, two variables have already been
221 # set:
222 # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
223 # - LINGUAS is the value of the environment variable LINGUAS at configure
224 # time.
225
226changequote(,)dnl
227 # Adjust a relative srcdir.
228 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
229 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
230 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
231 # In autoconf-2.13 it is called $ac_given_srcdir.
232 # In autoconf-2.50 it is called $srcdir.
233 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
234 case "$ac_given_srcdir" in
235 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
236 /*) top_srcdir="$ac_given_srcdir" ;;
237 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
238 esac
239
240 # Find a way to echo strings without interpreting backslash.
241 if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
242 gt_echo='echo'
243 else
244 if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
245 gt_echo='printf %s\n'
246 else
247 echo_func () {
248 cat <<EOT
249$*
250EOT
251 }
252 gt_echo='echo_func'
253 fi
254 fi
255
256 # A sed script that extracts the value of VARIABLE from a Makefile.
257 sed_x_variable='
258# Test if the hold space is empty.
259x
260s/P/P/
261x
262ta
263# Yes it was empty. Look if we have the expected variable definition.
264/^[ ]*VARIABLE[ ]*=/{
265 # Seen the first line of the variable definition.
266 s/^[ ]*VARIABLE[ ]*=//
267 ba
268}
269bd
270:a
271# Here we are processing a line from the variable definition.
272# Remove comment, more precisely replace it with a space.
273s/#.*$/ /
274# See if the line ends in a backslash.
275tb
276:b
277s/\\$//
278# Print the line, without the trailing backslash.
279p
280tc
281# There was no trailing backslash. The end of the variable definition is
282# reached. Clear the hold space.
283s/^.*$//
284x
285bd
286:c
287# A trailing backslash means that the variable definition continues in the
288# next line. Put a nonempty string into the hold space to indicate this.
289s/^.*$/P/
290x
291:d
292'
293changequote([,])dnl
294
295 # Set POTFILES to the value of the Makefile variable POTFILES.
296 sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
297 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
298 # Compute POTFILES_DEPS as
299 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
300 POTFILES_DEPS=
301 for file in $POTFILES; do
302 POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
303 done
304 POMAKEFILEDEPS=""
305
306 if test -n "$OBSOLETE_ALL_LINGUAS"; then
307 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
308 fi
309 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
310 # The LINGUAS file contains the set of available languages.
311 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
312 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
313 else
314 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
315 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
316 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
317 fi
318 # Hide the ALL_LINGUAS assigment from automake < 1.5.
319 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
320 # Compute POFILES
321 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
322 # Compute UPDATEPOFILES
323 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
324 # Compute DUMMYPOFILES
325 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
326 # Compute GMOFILES
327 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
328 # Compute PROPERTIESFILES
329 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
330 # Compute CLASSFILES
331 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
332 # Compute QMFILES
333 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
334 # Compute MSGFILES
335 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
336 # Compute RESOURCESDLLFILES
337 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
338 case "$ac_given_srcdir" in
339 .) srcdirpre= ;;
340 *) srcdirpre='$(srcdir)/' ;;
341 esac
342 POFILES=
343 UPDATEPOFILES=
344 DUMMYPOFILES=
345 GMOFILES=
346 PROPERTIESFILES=
347 CLASSFILES=
348 QMFILES=
349 MSGFILES=
350 RESOURCESDLLFILES=
351 for lang in $ALL_LINGUAS; do
352 POFILES="$POFILES $srcdirpre$lang.po"
353 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
354 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
355 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
356 PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
357 CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
358 QMFILES="$QMFILES $srcdirpre$lang.qm"
359 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
360 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
361 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
362 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
363 done
364 # CATALOGS depends on both $ac_dir and the user's LINGUAS
365 # environment variable.
366 INST_LINGUAS=
367 if test -n "$ALL_LINGUAS"; then
368 for presentlang in $ALL_LINGUAS; do
369 useit=no
370 if test "%UNSET%" != "$LINGUAS"; then
371 desiredlanguages="$LINGUAS"
372 else
373 desiredlanguages="$ALL_LINGUAS"
374 fi
375 for desiredlang in $desiredlanguages; do
376 # Use the presentlang catalog if desiredlang is
377 # a. equal to presentlang, or
378 # b. a variant of presentlang (because in this case,
379 # presentlang can be used as a fallback for messages
380 # which are not translated in the desiredlang catalog).
381 case "$desiredlang" in
382 "$presentlang"*) useit=yes;;
383 esac
384 done
385 if test $useit = yes; then
386 INST_LINGUAS="$INST_LINGUAS $presentlang"
387 fi
388 done
389 fi
390 CATALOGS=
391 JAVACATALOGS=
392 QTCATALOGS=
393 TCLCATALOGS=
394 CSHARPCATALOGS=
395 if test -n "$INST_LINGUAS"; then
396 for lang in $INST_LINGUAS; do
397 CATALOGS="$CATALOGS $lang.gmo"
398 JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
399 QTCATALOGS="$QTCATALOGS $lang.qm"
400 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
401 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
402 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
403 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
404 done
405 fi
406
407 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"
408 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
409 # Add dependencies that cannot be formulated as a simple suffix rule.
410 for lang in $ALL_LINGUAS; do
411 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
412 cat >> "$ac_file.tmp" <<EOF
413$frobbedlang.msg: $lang.po
414 @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
415 \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
416EOF
417 done
418 fi
419 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
420 # Add dependencies that cannot be formulated as a simple suffix rule.
421 for lang in $ALL_LINGUAS; do
422 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
423 cat >> "$ac_file.tmp" <<EOF
424$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
425 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
426 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
427EOF
428 done
429 fi
430 if test -n "$POMAKEFILEDEPS"; then
431 cat >> "$ac_file.tmp" <<EOF
432Makefile: $POMAKEFILEDEPS
433EOF
434 fi
435 mv "$ac_file.tmp" "$ac_file"
436])
437
438dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
439AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
440[
441 XGETTEXT_EXTRA_OPTIONS=
442])
443
444dnl Registers an option to be passed to xgettext in the po subdirectory.
445AC_DEFUN([AM_XGETTEXT_OPTION],
446[
447 AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
448 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
449])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
new file mode 100644
index 0000000..2d804ac
--- /dev/null
+++ b/m4/progtest.m4
@@ -0,0 +1,92 @@
1# progtest.m4 serial 6 (gettext-0.18)
2dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU
13dnl gettext package package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
18
19AC_PREREQ([2.50])
20
21# Search path for a program which passes the given test.
22
23dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
24dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
25AC_DEFUN([AM_PATH_PROG_WITH_TEST],
26[
27# Prepare PATH_SEPARATOR.
28# The user is always right.
29if test "${PATH_SEPARATOR+set}" != set; then
30 echo "#! /bin/sh" >conf$$.sh
31 echo "exit 0" >>conf$$.sh
32 chmod +x conf$$.sh
33 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
34 PATH_SEPARATOR=';'
35 else
36 PATH_SEPARATOR=:
37 fi
38 rm -f conf$$.sh
39fi
40
41# Find out how to test for executable files. Don't use a zero-byte file,
42# as systems may use methods other than mode bits to determine executability.
43cat >conf$$.file <<_ASEOF
44#! /bin/sh
45exit 0
46_ASEOF
47chmod +x conf$$.file
48if test -x conf$$.file >/dev/null 2>&1; then
49 ac_executable_p="test -x"
50else
51 ac_executable_p="test -f"
52fi
53rm -f conf$$.file
54
55# Extract the first word of "$2", so it can be a program name with args.
56set dummy $2; ac_word=[$]2
57AC_MSG_CHECKING([for $ac_word])
58AC_CACHE_VAL([ac_cv_path_$1],
59[case "[$]$1" in
60 [[\\/]]* | ?:[[\\/]]*)
61 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
62 ;;
63 *)
64 ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
65 for ac_dir in ifelse([$5], , $PATH, [$5]); do
66 IFS="$ac_save_IFS"
67 test -z "$ac_dir" && ac_dir=.
68 for ac_exec_ext in '' $ac_executable_extensions; do
69 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
70 echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
71 if [$3]; then
72 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
73 break 2
74 fi
75 fi
76 done
77 done
78 IFS="$ac_save_IFS"
79dnl If no 4th arg is given, leave the cache variable unset,
80dnl so AC_PATH_PROGS will keep looking.
81ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
82])dnl
83 ;;
84esac])dnl
85$1="$ac_cv_path_$1"
86if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
87 AC_MSG_RESULT([$][$1])
88else
89 AC_MSG_RESULT([no])
90fi
91AC_SUBST([$1])dnl
92])
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 0000000..16bda42
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,12 @@
12012-03-07 gettextize <bug-gnu-gettext@gnu.org>
2
3 * Makefile.in.in: New file, from gettext-0.18.1.
4 * Rules-quot: New file, from gettext-0.18.1.
5 * boldquot.sed: New file, from gettext-0.18.1.
6 * en@boldquot.header: New file, from gettext-0.18.1.
7 * en@quot.header: New file, from gettext-0.18.1.
8 * insert-header.sin: New file, from gettext-0.18.1.
9 * quot.sed: New file, from gettext-0.18.1.
10 * remove-potcdate.sin: New file, from gettext-0.18.1.
11 * POTFILES.in: New file.
12
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..83d8838
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,444 @@
1# Makefile for PO directory in any package using GNU gettext.
2# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
3#
4# This file can be copied and used freely without restrictions. It can
5# be used in projects which are not available under the GNU General Public
6# License but which still want to provide support for the GNU gettext
7# functionality.
8# Please note that the actual code of GNU gettext is covered by the GNU
9# General Public License and is *not* in the public domain.
10#
11# Origin: gettext-0.18
12GETTEXT_MACRO_VERSION = 0.18
13
14PACKAGE = @PACKAGE@
15VERSION = @VERSION@
16PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
17
18SHELL = /bin/sh
19@SET_MAKE@
20
21srcdir = @srcdir@
22top_srcdir = @top_srcdir@
23VPATH = @srcdir@
24
25prefix = @prefix@
26exec_prefix = @exec_prefix@
27datarootdir = @datarootdir@
28datadir = @datadir@
29localedir = @localedir@
30gettextsrcdir = $(datadir)/gettext/po
31
32INSTALL = @INSTALL@
33INSTALL_DATA = @INSTALL_DATA@
34
35# We use $(mkdir_p).
36# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
37# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
38# @install_sh@ does not start with $(SHELL), so we add it.
39# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
40# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
41# versions, $(mkinstalldirs) and $(install_sh) are unused.
42mkinstalldirs = $(SHELL) @install_sh@ -d
43install_sh = $(SHELL) @install_sh@
44MKDIR_P = @MKDIR_P@
45mkdir_p = @mkdir_p@
46
47GMSGFMT_ = @GMSGFMT@
48GMSGFMT_no = @GMSGFMT@
49GMSGFMT_yes = @GMSGFMT_015@
50GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
51MSGFMT_ = @MSGFMT@
52MSGFMT_no = @MSGFMT@
53MSGFMT_yes = @MSGFMT_015@
54MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
55XGETTEXT_ = @XGETTEXT@
56XGETTEXT_no = @XGETTEXT@
57XGETTEXT_yes = @XGETTEXT_015@
58XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
59MSGMERGE = msgmerge
60MSGMERGE_UPDATE = @MSGMERGE@ --update
61MSGINIT = msginit
62MSGCONV = msgconv
63MSGFILTER = msgfilter
64
65POFILES = @POFILES@
66GMOFILES = @GMOFILES@
67UPDATEPOFILES = @UPDATEPOFILES@
68DUMMYPOFILES = @DUMMYPOFILES@
69DISTFILES.common = Makefile.in.in remove-potcdate.sin \
70$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
71DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
72$(POFILES) $(GMOFILES) \
73$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
74
75POTFILES = \
76
77CATALOGS = @CATALOGS@
78
79# Makevars gets inserted here. (Don't remove this line!)
80
81.SUFFIXES:
82.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
83
84.po.mo:
85 @echo "$(MSGFMT) -c -o $@ $<"; \
86 $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
87
88.po.gmo:
89 @lang=`echo $* | sed -e 's,.*/,,'`; \
90 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
91 echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
92 cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
93
94.sin.sed:
95 sed -e '/^#/d' $< > t-$@
96 mv t-$@ $@
97
98
99all: check-macro-version all-@USE_NLS@
100
101all-yes: stamp-po
102all-no:
103
104# Ensure that the gettext macros and this Makefile.in.in are in sync.
105check-macro-version:
106 @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
107 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
108 exit 1; \
109 }
110
111# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
112# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
113# we don't want to bother translators with empty POT files). We assume that
114# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
115# In this case, stamp-po is a nop (i.e. a phony target).
116
117# stamp-po is a timestamp denoting the last time at which the CATALOGS have
118# been loosely updated. Its purpose is that when a developer or translator
119# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
120# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
121# invocations of "make" will do nothing. This timestamp would not be necessary
122# if updating the $(CATALOGS) would always touch them; however, the rule for
123# $(POFILES) has been designed to not touch files that don't need to be
124# changed.
125stamp-po: $(srcdir)/$(DOMAIN).pot
126 test ! -f $(srcdir)/$(DOMAIN).pot || \
127 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
128 @test ! -f $(srcdir)/$(DOMAIN).pot || { \
129 echo "touch stamp-po" && \
130 echo timestamp > stamp-poT && \
131 mv stamp-poT stamp-po; \
132 }
133
134# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
135# otherwise packages like GCC can not be built if only parts of the source
136# have been downloaded.
137
138# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
139# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
140$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
141 if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
142 package_gnu='GNU '; \
143 else \
144 package_gnu=''; \
145 fi; \
146 if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
147 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
148 else \
149 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
150 fi; \
151 case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
152 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
153 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
154 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
155 --files-from=$(srcdir)/POTFILES.in \
156 --copyright-holder='$(COPYRIGHT_HOLDER)' \
157 --msgid-bugs-address="$$msgid_bugs_address" \
158 ;; \
159 *) \
160 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
161 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
162 --files-from=$(srcdir)/POTFILES.in \
163 --copyright-holder='$(COPYRIGHT_HOLDER)' \
164 --package-name="$${package_gnu}@PACKAGE@" \
165 --package-version='@VERSION@' \
166 --msgid-bugs-address="$$msgid_bugs_address" \
167 ;; \
168 esac
169 test ! -f $(DOMAIN).po || { \
170 if test -f $(srcdir)/$(DOMAIN).pot; then \
171 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
172 sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
173 if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
174 rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
175 else \
176 rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
177 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
178 fi; \
179 else \
180 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
181 fi; \
182 }
183
184# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
185# every "make" invocation, only create it when it is missing.
186# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
187$(srcdir)/$(DOMAIN).pot:
188 $(MAKE) $(DOMAIN).pot-update
189
190# This target rebuilds a PO file if $(DOMAIN).pot has changed.
191# Note that a PO file is not touched if it doesn't need to be changed.
192$(POFILES): $(srcdir)/$(DOMAIN).pot
193 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
194 if test -f "$(srcdir)/$${lang}.po"; then \
195 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
196 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
197 cd $(srcdir) \
198 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
199 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
200 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
201 *) \
202 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
203 esac; \
204 }; \
205 else \
206 $(MAKE) $${lang}.po-create; \
207 fi
208
209
210install: install-exec install-data
211install-exec:
212install-data: install-data-@USE_NLS@
213 if test "$(PACKAGE)" = "gettext-tools"; then \
214 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
215 for file in $(DISTFILES.common) Makevars.template; do \
216 $(INSTALL_DATA) $(srcdir)/$$file \
217 $(DESTDIR)$(gettextsrcdir)/$$file; \
218 done; \
219 for file in Makevars; do \
220 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
221 done; \
222 else \
223 : ; \
224 fi
225install-data-no: all
226install-data-yes: all
227 @catalogs='$(CATALOGS)'; \
228 for cat in $$catalogs; do \
229 cat=`basename $$cat`; \
230 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
231 dir=$(localedir)/$$lang/LC_MESSAGES; \
232 $(mkdir_p) $(DESTDIR)$$dir; \
233 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
234 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
235 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
236 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
237 if test -n "$$lc"; then \
238 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
239 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
240 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
241 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
242 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
243 for file in *; do \
244 if test -f $$file; then \
245 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
246 fi; \
247 done); \
248 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
249 else \
250 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
251 :; \
252 else \
253 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
254 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
255 fi; \
256 fi; \
257 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
258 ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
259 ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
260 cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
261 echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
262 fi; \
263 done; \
264 done
265
266install-strip: install
267
268installdirs: installdirs-exec installdirs-data
269installdirs-exec:
270installdirs-data: installdirs-data-@USE_NLS@
271 if test "$(PACKAGE)" = "gettext-tools"; then \
272 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
273 else \
274 : ; \
275 fi
276installdirs-data-no:
277installdirs-data-yes:
278 @catalogs='$(CATALOGS)'; \
279 for cat in $$catalogs; do \
280 cat=`basename $$cat`; \
281 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
282 dir=$(localedir)/$$lang/LC_MESSAGES; \
283 $(mkdir_p) $(DESTDIR)$$dir; \
284 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
285 if test -n "$$lc"; then \
286 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
287 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
288 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
289 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
290 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
291 for file in *; do \
292 if test -f $$file; then \
293 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
294 fi; \
295 done); \
296 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
297 else \
298 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
299 :; \
300 else \
301 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
302 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
303 fi; \
304 fi; \
305 fi; \
306 done; \
307 done
308
309# Define this as empty until I found a useful application.
310installcheck:
311
312uninstall: uninstall-exec uninstall-data
313uninstall-exec:
314uninstall-data: uninstall-data-@USE_NLS@
315 if test "$(PACKAGE)" = "gettext-tools"; then \
316 for file in $(DISTFILES.common) Makevars.template; do \
317 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
318 done; \
319 else \
320 : ; \
321 fi
322uninstall-data-no:
323uninstall-data-yes:
324 catalogs='$(CATALOGS)'; \
325 for cat in $$catalogs; do \
326 cat=`basename $$cat`; \
327 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
328 for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
329 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
330 done; \
331 done
332
333check: all
334
335info dvi ps pdf html tags TAGS ctags CTAGS ID:
336
337mostlyclean:
338 rm -f remove-potcdate.sed
339 rm -f stamp-poT
340 rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
341 rm -fr *.o
342
343clean: mostlyclean
344
345distclean: clean
346 rm -f Makefile Makefile.in POTFILES *.mo
347
348maintainer-clean: distclean
349 @echo "This command is intended for maintainers to use;"
350 @echo "it deletes files that may require special tools to rebuild."
351 rm -f stamp-po $(GMOFILES)
352
353distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
354dist distdir:
355 $(MAKE) update-po
356 @$(MAKE) dist2
357# This is a separate target because 'update-po' must be executed before.
358dist2: stamp-po $(DISTFILES)
359 dists="$(DISTFILES)"; \
360 if test "$(PACKAGE)" = "gettext-tools"; then \
361 dists="$$dists Makevars.template"; \
362 fi; \
363 if test -f $(srcdir)/$(DOMAIN).pot; then \
364 dists="$$dists $(DOMAIN).pot stamp-po"; \
365 fi; \
366 if test -f $(srcdir)/ChangeLog; then \
367 dists="$$dists ChangeLog"; \
368 fi; \
369 for i in 0 1 2 3 4 5 6 7 8 9; do \
370 if test -f $(srcdir)/ChangeLog.$$i; then \
371 dists="$$dists ChangeLog.$$i"; \
372 fi; \
373 done; \
374 if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
375 for file in $$dists; do \
376 if test -f $$file; then \
377 cp -p $$file $(distdir) || exit 1; \
378 else \
379 cp -p $(srcdir)/$$file $(distdir) || exit 1; \
380 fi; \
381 done
382
383update-po: Makefile
384 $(MAKE) $(DOMAIN).pot-update
385 test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
386 $(MAKE) update-gmo
387
388# General rule for creating PO files.
389
390.nop.po-create:
391 @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
392 echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
393 exit 1
394
395# General rule for updating PO files.
396
397.nop.po-update:
398 @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
399 if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
400 tmpdir=`pwd`; \
401 echo "$$lang:"; \
402 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
403 echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
404 cd $(srcdir); \
405 if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
406 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
407 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
408 *) \
409 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
410 esac; \
411 }; then \
412 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
413 rm -f $$tmpdir/$$lang.new.po; \
414 else \
415 if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
416 :; \
417 else \
418 echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
419 exit 1; \
420 fi; \
421 fi; \
422 else \
423 echo "msgmerge for $$lang.po failed!" 1>&2; \
424 rm -f $$tmpdir/$$lang.new.po; \
425 fi
426
427$(DUMMYPOFILES):
428
429update-gmo: Makefile $(GMOFILES)
430 @:
431
432# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
433# because execution permission bits may not work on the current file system.
434# Use @SHELL@, which is the shell determined by autoconf for the use by its
435# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
436Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
437 cd $(top_builddir) \
438 && @SHELL@ ./config.status $(subdir)/$@.in po-directories
439
440force:
441
442# Tell versions [3.59,3.63) of GNU make not to export all variables.
443# Otherwise a system limit (for SysV at least) may be exceeded.
444.NOEXPORT:
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644
index 0000000..32692ab
--- /dev/null
+++ b/po/Makevars.template
@@ -0,0 +1,41 @@
1# Makefile variables for PO directory in any package using GNU gettext.
2
3# Usually the message domain is the same as the package name.
4DOMAIN = $(PACKAGE)
5
6# These two variables depend on the location of this directory.
7subdir = po
8top_builddir = ..
9
10# These options get passed to xgettext.
11XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
12
13# This is the copyright holder that gets inserted into the header of the
14# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
15# package. (Note that the msgstr strings, extracted from the package's
16# sources, belong to the copyright holder of the package.) Translators are
17# expected to transfer the copyright for their translations to this person
18# or entity, or to disclaim their copyright. The empty string stands for
19# the public domain; in this case the translators are expected to disclaim
20# their copyright.
21COPYRIGHT_HOLDER = Free Software Foundation, Inc.
22
23# This is the email address or URL to which the translators shall report
24# bugs in the untranslated strings:
25# - Strings which are not entire sentences, see the maintainer guidelines
26# in the GNU gettext documentation, section 'Preparing Strings'.
27# - Strings which use unclear terms or require additional context to be
28# understood.
29# - Strings which make invalid assumptions about notation of date, time or
30# money.
31# - Pluralisation problems.
32# - Incorrect English spelling.
33# - Incorrect formatting.
34# It can be your email address, or a mailing list address where translators
35# can write to without being subscribed, or the URL of a web page through
36# which the translators can contact you.
37MSGID_BUGS_ADDRESS =
38
39# This is the list of locale categories, beyond LC_MESSAGES, for which the
40# message catalogs shall be used. It is usually empty.
41EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..667e27c
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1 @@
# List of source files which contain translatable strings.
diff --git a/po/Rules-quot b/po/Rules-quot
new file mode 100644
index 0000000..af52487
--- /dev/null
+++ b/po/Rules-quot
@@ -0,0 +1,47 @@
1# Special Makefile rules for English message catalogs with quotation marks.
2
3DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
4
5.SUFFIXES: .insert-header .po-update-en
6
7en@quot.po-create:
8 $(MAKE) en@quot.po-update
9en@boldquot.po-create:
10 $(MAKE) en@boldquot.po-update
11
12en@quot.po-update: en@quot.po-update-en
13en@boldquot.po-update: en@boldquot.po-update-en
14
15.insert-header.po-update-en:
16 @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
17 if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
18 tmpdir=`pwd`; \
19 echo "$$lang:"; \
20 ll=`echo $$lang | sed -e 's/@.*//'`; \
21 LC_ALL=C; export LC_ALL; \
22 cd $(srcdir); \
23 if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -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 \
24 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
25 rm -f $$tmpdir/$$lang.new.po; \
26 else \
27 if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
28 :; \
29 else \
30 echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
31 exit 1; \
32 fi; \
33 fi; \
34 else \
35 echo "creation of $$lang.po failed!" 1>&2; \
36 rm -f $$tmpdir/$$lang.new.po; \
37 fi
38
39en@quot.insert-header: insert-header.sin
40 sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
41
42en@boldquot.insert-header: insert-header.sin
43 sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
44
45mostlyclean: mostlyclean-quot
46mostlyclean-quot:
47 rm -f *.insert-header
diff --git a/po/boldquot.sed b/po/boldquot.sed
new file mode 100644
index 0000000..4b937aa
--- /dev/null
+++ b/po/boldquot.sed
@@ -0,0 +1,10 @@
1s/"\([^"]*\)"/“\1”/g
2s/`\([^`']*\)'/‘\1’/g
3s/ '\([^`']*\)' / ‘\1’ /g
4s/ '\([^`']*\)'$/ ‘\1’/g
5s/^'\([^`']*\)' /‘\1’ /g
6s/“”/""/g
7s/“/“/g
8s/”/”/g
9s/‘/‘/g
10s/’/’/g
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
new file mode 100644
index 0000000..fedb6a0
--- /dev/null
+++ b/po/en@boldquot.header
@@ -0,0 +1,25 @@
1# All this catalog "translates" are quotation characters.
2# The msgids must be ASCII and therefore cannot contain real quotation
3# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
4# and double quote (0x22). These substitutes look strange; see
5# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
6#
7# This catalog translates grave accent (0x60) and apostrophe (0x27) to
8# left single quotation mark (U+2018) and right single quotation mark (U+2019).
9# It also translates pairs of apostrophe (0x27) to
10# left single quotation mark (U+2018) and right single quotation mark (U+2019)
11# and pairs of quotation mark (0x22) to
12# left double quotation mark (U+201C) and right double quotation mark (U+201D).
13#
14# When output to an UTF-8 terminal, the quotation characters appear perfectly.
15# When output to an ISO-8859-1 terminal, the single quotation marks are
16# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
17# grave/acute accent (by libiconv), and the double quotation marks are
18# transliterated to 0x22.
19# When output to an ASCII terminal, the single quotation marks are
20# transliterated to apostrophes, and the double quotation marks are
21# transliterated to 0x22.
22#
23# This catalog furthermore displays the text between the quotation marks in
24# bold face, assuming the VT100/XTerm escape sequences.
25#
diff --git a/po/en@quot.header b/po/en@quot.header
new file mode 100644
index 0000000..a9647fc
--- /dev/null
+++ b/po/en@quot.header
@@ -0,0 +1,22 @@
1# All this catalog "translates" are quotation characters.
2# The msgids must be ASCII and therefore cannot contain real quotation
3# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
4# and double quote (0x22). These substitutes look strange; see
5# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
6#
7# This catalog translates grave accent (0x60) and apostrophe (0x27) to
8# left single quotation mark (U+2018) and right single quotation mark (U+2019).
9# It also translates pairs of apostrophe (0x27) to
10# left single quotation mark (U+2018) and right single quotation mark (U+2019)
11# and pairs of quotation mark (0x22) to
12# left double quotation mark (U+201C) and right double quotation mark (U+201D).
13#
14# When output to an UTF-8 terminal, the quotation characters appear perfectly.
15# When output to an ISO-8859-1 terminal, the single quotation marks are
16# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
17# grave/acute accent (by libiconv), and the double quotation marks are
18# transliterated to 0x22.
19# When output to an ASCII terminal, the single quotation marks are
20# transliterated to apostrophes, and the double quotation marks are
21# transliterated to 0x22.
22#
diff --git a/po/insert-header.sin b/po/insert-header.sin
new file mode 100644
index 0000000..b26de01
--- /dev/null
+++ b/po/insert-header.sin
@@ -0,0 +1,23 @@
1# Sed script that inserts the file called HEADER before the header entry.
2#
3# At each occurrence of a line starting with "msgid ", we execute the following
4# commands. At the first occurrence, insert the file. At the following
5# occurrences, do nothing. The distinction between the first and the following
6# occurrences is achieved by looking at the hold space.
7/^msgid /{
8x
9# Test if the hold space is empty.
10s/m/m/
11ta
12# Yes it was empty. First occurrence. Read the file.
13r HEADER
14# Output the file's contents by reading the next line. But don't lose the
15# current line while doing this.
16g
17N
18bb
19:a
20# The hold space was nonempty. Following occurrences. Do nothing.
21x
22:b
23}
diff --git a/po/quot.sed b/po/quot.sed
new file mode 100644
index 0000000..0122c46
--- /dev/null
+++ b/po/quot.sed
@@ -0,0 +1,6 @@
1s/"\([^"]*\)"/“\1”/g
2s/`\([^`']*\)'/‘\1’/g
3s/ '\([^`']*\)' / ‘\1’ /g
4s/ '\([^`']*\)'$/ ‘\1’/g
5s/^'\([^`']*\)' /‘\1’ /g
6s/“”/""/g
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
new file mode 100644
index 0000000..2436c49
--- /dev/null
+++ b/po/remove-potcdate.sin
@@ -0,0 +1,19 @@
1# Sed script that remove the POT-Creation-Date line in the header entry
2# from a POT file.
3#
4# The distinction between the first and the following occurrences of the
5# pattern is achieved by looking at the hold space.
6/^"POT-Creation-Date: .*"$/{
7x
8# Test if the hold space is empty.
9s/P/P/
10ta
11# Yes it was empty. First occurrence. Remove the line.
12g
13d
14bb
15:a
16# The hold space was nonempty. Following occurrences. Do nothing.
17x
18:b
19}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 15:18:31 +0000