1 diff -urN BUILD/abook-0.6.0pre2/abook.1 abook/abook.1
2 --- BUILD/abook-0.6.0pre2/abook.1 2006-09-06 07:26:10.000000000 +0200
3 +++ abook/abook.1 2013-03-13 15:07:45.000000000 +0100
5 \fB\-\-datafile\fP \fI<filename>\fR
6 Use an alternative addressbook file (default is \fI$HOME/.abook/addressbook\fR).
8 -\fB\-\-mutt\-query\fP \fI<string>\fR
9 +\fB\-\-mutt\-query\fP \fI<string>\fR [ \fB\-\-outformat\fP \fI<outputformat>\fR ]
10 Make a query for mutt (search the addressbook for \fI<string>\fR).
12 The \fB\-\-datafile\fP option, as documented above, may be used
14 this option to search a different addressbook file.
16 +Only a subset of the below \fI<outputformat>\fR are allowed: \fBmutt\fP (default), \fBvcard\fP and \fBcustom\fP
18 \fB\-\-convert\fP [ \fB\-\-informat\fP \fI<inputformat>\fR ] [ \fB\-\-infile\fP \fI<inputfile>\fR ] [ \fB\-\-outformat\fP \fI<outputformat>\fR ] [ \fB\-\-outfile\fP \fI<outputfile>\fR ]
19 Converts \fI<inputfile>\fR in \fI<inputformat>\fR to \fI<outputfile>\fR in \fI<outputformat>\fR
21 - \fBcsv\fP comma separated values
23 - \fBpalmcsv\fP Palm comma separated values
25 +- \fBvcard\fP VCard addressbook
28 The following \fIoutputformats\fR are supported:
31 - \fBpine\fP pine addressbook
33 -- \fBgcrd\fP GnomeCard (VCard) addressbook
34 +- \fBvcard\fP VCard addressbook
36 - \fBcsv\fP comma separated values
39 - \fBwl\fP Wanderlust address book
41 - \fBbsdcal\fP BSD calendar
43 +- \fBcustom\fP Custom output format, see below
45 +\fB\-\-outformatstr\fP \fI<string>\fR
46 +Only used if \fB\-\-mutt\-query\fP \fIor\fR \fB\-\-convert\fP is specified \fIand\fR \fB\-\-outformat\fP=\fIcustom\fR. \fI<string>\fR is a format string allowing placeholders.
48 +A placeholder can be any of the standard fields names (see \fBabookrc\fP(5)) and must be encapsulated by curly brackets.
50 +The default value is "{nick} ({name}): {mobile}"
52 +If \fI<string>\fR starts with \fI!\fR only entries whose all fields from \fI<string>\fR are non-NULL are included.
55 Read an e-mail message from stdin and add the sender to the addressbook.
56 diff -urN BUILD/abook-0.6.0pre2/abook.c abook/abook.c
57 --- BUILD/abook-0.6.0pre2/abook.c 2006-09-04 21:24:12.000000000 +0200
58 +++ abook/abook.c 2013-03-13 15:07:45.000000000 +0100
61 - * $Id: abook.c,v 1.60 2006/09/04 18:29:24 cduval Exp $
64 * by JH <jheinonen@users.sourceforge.net>
67 char *datafile = NULL;
68 static char *rcfile = NULL;
71 +char custom_format[FORMAT_STRING_LEN] = "{nick} ({name}): {mobile}";
72 +char *parsed_custom_format = NULL;
73 +enum field_types *custom_format_fields = 0;
74 +struct abook_output_item_filter selected_item_filter;
76 bool alternative_datafile = FALSE;
77 bool alternative_rcfile = FALSE;
80 main(int argc, char **argv)
82 #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
83 - setlocale(LC_ALL, "");
84 + setlocale(LC_MESSAGES, "");
85 + setlocale(LC_TIME, "");
86 + setlocale(LC_CTYPE, "");
87 + setlocale(LC_COLLATE, "");
90 bindtextdomain(PACKAGE, LOCALEDIR);
97 + selected_item_filter = select_output_item_filter("muttq");
100 int option_index = 0;
110 { "convert", 0, 0, OPT_CONVERT },
111 { "informat", 1, 0, OPT_INFORMAT },
112 { "outformat", 1, 0, OPT_OUTFORMAT },
113 + { "outformatstr", 1, 0, OPT_OUTFORMAT_STR },
114 { "infile", 1, 0, OPT_INFILE },
115 { "outfile", 1, 0, OPT_OUTFILE },
116 { "formats", 0, 0, OPT_FORMATS },
118 set_convert_var(informat);
121 - set_convert_var(outformat);
122 + if(mode != MODE_CONVERT && mode != MODE_QUERY) {
124 + _("please use option --outformat after --convert or --mutt-query option\n"));
125 + exit(EXIT_FAILURE);
127 + // ascii-name is stored, it's used to traverse
128 + // e_filters[] in MODE_CONVERT (see export_file())
129 + outformat = optarg;
130 + // but in case a query-compatible filter is requested
131 + // try to guess right now which one it is, from u_filters[]
132 + selected_item_filter = select_output_item_filter(outformat);
134 + case OPT_OUTFORMAT_STR:
135 + strncpy(custom_format, optarg, FORMAT_STRING_LEN);
136 + custom_format[FORMAT_STRING_LEN - 1] = 0;
139 set_convert_var(infile);
144 + // if the output format requested does not allow filtered querying
145 + // (not in u_filter[]) and --convert has not been specified; bailout
146 + if(! selected_item_filter.func && mode != MODE_CONVERT) {
147 + printf("output format %s not supported or incompatible with --mutt-query\n", outformat);
148 + exit(EXIT_FAILURE);
150 + if(! selected_item_filter.func)
151 + selected_item_filter = select_output_item_filter("muttq");
152 + else if (! strcmp(outformat, "custom")) {
153 + if(! *custom_format) {
154 + fprintf(stderr, _("Invalid custom format string\n"));
155 + exit(EXIT_FAILURE);
157 + parsed_custom_format = (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
158 + custom_format_fields = (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
159 + parse_custom_format(custom_format, parsed_custom_format, custom_format_fields);
162 fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
165 puts (_(" (default: text)"));
166 puts (_(" --outfile <file> destination file"));
167 puts (_(" (default: stdout)"));
168 + puts (_(" --outformatstr <str> format to use for \"custom\" --outformat"));
169 + puts (_(" (default: \"{nick} ({name}): {mobile}\")"));
170 puts (_(" --formats list available formats"));
173 @@ -445,34 +489,12 @@
177 -muttq_print_item(FILE *file, int item)
179 - abook_list *emails, *e;
180 - char *tmp = db_email_get(item);
182 - emails = csv_to_abook_list(tmp);
185 - for(e = emails; e; e = e->next) {
186 - fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
187 - !db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
189 - if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
192 - abook_list_free(&emails);
196 mutt_query(char *str)
200 if( str == NULL || !strcasecmp(str, "all") ) {
201 - struct db_enumerator e = init_db_enumerator(ENUM_ALL);
202 - printf("All items\n");
203 - db_enumerate_items(e)
204 - muttq_print_item(stdout, e.item);
205 + export_file("muttq", "-");
207 int search_fields[] = {NAME, EMAIL, NICK, -1};
210 printf("Not found\n");
211 quit_mutt_query(EXIT_FAILURE);
214 + // mutt expects a leading line containing
215 + // a message about the query.
216 + // Others output filter supporting query (vcard, custom)
217 + // don't needs this.
218 + if(!strcmp(selected_item_filter.filtname, "muttq"))
221 - muttq_print_item(stdout, i);
222 + e_write_item(stdout, i, selected_item_filter.func);
223 i = find_item(str, i + 1, search_fields);
227 check_abook_directory();
230 + init_standard_fields();
234 diff -urN BUILD/abook-0.6.0pre2/abook.h abook/abook.h
235 --- BUILD/abook-0.6.0pre2/abook.h 2005-10-26 01:27:24.000000000 +0200
236 +++ abook/abook.h 2013-03-13 15:07:45.000000000 +0100
238 #define ISSPACE(c) isspace((unsigned char)c)
240 #define SKIPWS(c) while(*(c) && ISSPACE(*(c))) c++
241 +#define SKIPNONWS(c) while(*(c) && ! ISSPACE(*(c))) c++
245 diff -urN BUILD/abook-0.6.0pre2/abookrc.5 abook/abookrc.5
246 --- BUILD/abook-0.6.0pre2/abookrc.5 2006-09-04 21:24:13.000000000 +0200
247 +++ abook/abookrc.5 2013-03-13 15:07:45.000000000 +0100
250 displays the \fIname\fP field with a maximal width of 22 characters.
252 -\fI{phone:-13|workphone|mobile}\fP
253 +\fI{phone:-12|workphone|mobile}\fP
254 displays (right aligned within a width of 13 characters), either the \fIphone\fP, \fIworkphone\fP or \fImobile\fP field, whichever being the first to be non-empty.
258 \fBshow_cursor\fP=[true|false]
259 Defines if the cursor is visible in main display. Default is false.
262 +\fBuse_mouse\fP=[true|false]
263 +Defines if navigation via the mouse is activated. Default is false.
266 +\fBuse_colors\fP=[true|false]
267 +Defines if the output of abook is colorized. Default is false.
271 +\fBcolor_header_fg\fP=color
272 +Foreground color for header bar
274 +\fBcolor_header_bg\fP=color
275 +Background color for header bar
277 +\fBcolor_footer_fg\fP=color
278 +Foreground color for footer bar
280 +\fBcolor_footer_bg\fP=color
281 +Background color for footer bar
283 +\fBcolor_list_even_fg\fP=color
284 +Foreground color for normal list entries with even index in the list (starting
287 +\fBcolor_list_even_bg\fP=color
288 +Background color for normal list entries with even index in the list (starting
291 +\fBcolor_list_odd_fg\fP=color
292 +Foreground color for normal list entries with odd index in the list (starting
295 +\fBcolor_list_odd_bg\fP=color
296 +Background color for normal list entries with odd index in the list (starting
299 +\fBcolor_list_header_fg\fP=color
300 +Foreground color for the list header
302 +\fBcolor_list_header_bg\fP=color
303 +Background color for the list header
305 +\fBcolor_list_highlight_fg\fP=color
306 +Foreground color for highlighted list entries
308 +\fBcolor_list_highlight_bg\fP=color
309 +Background color for highlighted list entries
311 +\fBcolor_tab_border_fg\fP=color
312 +Foreground color for tab borders on details page
314 +\fBcolor_tab_border_bg\fP=color
315 +Background color for tab borders on details page
317 +\fBcolor_tab_label_fg\fP=color
318 +Foreground color for tab labes on details page
320 +\fBcolor_tab_label_bg\fP=color
321 +Background color for tab labes on details page
323 +\fBcolor_field_name_fg\fP=color
324 +Foreground color for field names on details page
326 +\fBcolor_field_name_bg\fP=color
327 +Background color for field names on details page
329 +\fBcolor_field_value_fg\fP=color
330 +Foreground color for field values on details page
332 +\fBcolor_field_value_bg\fP=color
333 +Background color for field values on details page
335 +Where \fBcolor\fP can be: default, black, red, green, yellow, blue, magenta, cyan, white
339 .SH SAMPLE CONFIGURATION FILE
342 diff -urN BUILD/abook-0.6.0pre2/abook_rl.c abook/abook_rl.c
343 --- BUILD/abook-0.6.0pre2/abook_rl.c 2005-09-23 17:42:11.000000000 +0200
344 +++ abook/abook_rl.c 2013-03-13 15:07:45.000000000 +0100
347 - * $Id: abook_rl.c,v 1.16 2005/09/23 15:42:11 jheinonen Exp $
350 * by JH <jheinonen@users.sourceforge.net>
352 diff -urN BUILD/abook-0.6.0pre2/abook.spec abook/abook.spec
353 --- BUILD/abook-0.6.0pre2/abook.spec 2006-09-06 11:45:14.000000000 +0200
354 +++ abook/abook.spec 1970-01-01 01:00:00.000000000 +0100
356 -Summary: Text-based addressbook program
362 -Source: http://prdownloads.sourceforge.net/abook/%{name}-%{version}.tar.gz
363 -URL: http://abook.sourceforge.net/
364 -BuildPreReq: ncurses-devel readline-devel gettext
365 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
368 -Abook is a text-based addressbook program designed to
369 -use with mutt mail client.
388 -rm -rf -- "%{buildroot}"
391 -%files -f %{name}.lang
392 -%defattr(-,root,root)
393 -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO sample.abookrc
395 -%{_mandir}/man1/abook.*
396 -%{_mandir}/man5/abookrc.*
400 -* Mon Mar 11 2002 Jaakko Heinonen <jheinonen@users.sourceforge.net>
401 -- rewrote the spec file originally written by
402 - Gustavo Niemeyer <niemeyer@conectiva.com>
403 diff -urN BUILD/abook-0.6.0pre2/ABOUT-NLS abook/ABOUT-NLS
404 --- BUILD/abook-0.6.0pre2/ABOUT-NLS 2005-09-17 12:10:23.000000000 +0200
405 +++ abook/ABOUT-NLS 2013-03-13 15:07:45.000000000 +0100
407 available translations. They tell how people wanting to contribute and
408 work on translations can contact the appropriate team.
410 - When reporting bugs in the `intl/' directory or bugs which may be
411 -related to internationalization, you should tell about the version of
412 -`gettext' which is used. The information can be found in the
413 -`intl/VERSION' file, in internationalized packages.
415 -1.1 Quick configuration advice
416 -==============================
418 -If you want to exploit the full power of internationalization, you
419 -should configure it using
421 - ./configure --with-included-gettext
423 -to force usage of internationalizing routines provided within this
424 -package, despite the existence of internationalizing capabilities in the
425 -operating system where this package is being installed. So far, only
426 -the `gettext' implementation in the GNU C library version 2 provides as
427 -many features (such as locale alias, message inheritance, automatic
428 -charset conversion or plural form handling) as the implementation here.
429 -It is also not possible to offer this additional functionality on top
430 -of a `catgets' implementation. Future versions of GNU `gettext' will
431 -very likely convey even more functionality. So it might be a good idea
432 -to change to GNU `gettext' as soon as possible.
434 - So you need _not_ provide this option if you are using GNU libc 2 or
435 -you have installed a recent copy of the GNU gettext package with the
442 Some packages are "localizable" when properly installed; the programs
445 By default, this package will be installed to allow translation of
446 messages. It will automatically detect whether the system already
447 -provides the GNU `gettext' functions. If not, the included GNU
448 -`gettext' library will be used. This library is wholly contained
449 -within this package, usually in the `intl/' subdirectory, so prior
450 -installation of the GNU `gettext' package is _not_ required.
451 -Installers may use special options at configuration time for changing
452 -the default behaviour. The commands:
453 +provides the GNU `gettext' functions. Installers may use special
454 +options at configuration time for changing the default behaviour. The
457 - ./configure --with-included-gettext
458 ./configure --disable-nls
460 -will, respectively, bypass any pre-existing `gettext' to use the
461 -internationalizing routines provided within this package, or else,
462 -_totally_ disable translation of messages.
463 +will _totally_ disable translation of messages.
465 When you already have GNU `gettext' installed on your system and run
466 configure without an option for your new package, `configure' will
467 -probably detect the previously built and installed `libintl.a' file and
468 -will decide to use this. This might not be desirable. You should use
469 -the more recent version of the GNU `gettext' library. I.e. if the file
470 -`intl/VERSION' shows that the library which comes with this package is
471 -more recent, you should use
473 - ./configure --with-included-gettext
475 -to prevent auto-detection.
477 - The configuration process will not test for the `catgets' function
478 -and therefore it will not be used. The reason is that even an
479 -emulation of `gettext' on top of `catgets' could not provide all the
480 -extensions of the GNU `gettext' library.
481 +probably detect the previously built and installed `libintl' library
482 +and will decide to use it. If not, you may have to to use the
483 +`--with-libintl-prefix' option to tell `configure' where to look for it.
485 Internationalized packages usually have many `po/LL.po' files, where
486 LL gives an ISO 639 two-letter code identifying the language. Unless
488 `LINGUAS' should then contain a space separated list of two-letter
489 codes, stating which languages are allowed.
491 -1.3 Using This Package
492 +1.2 Using This Package
493 ======================
495 As a user, if your language has been installed for this package, you
496 only have to set the `LANG' environment variable to the appropriate
497 -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
498 -and `CC' is an ISO 3166 two-letter country code. For example, let's
499 +`LL_CC' combination. If you happen to have the `LC_ALL' or some other
500 +`LC_xxx' environment variables set, you should unset them before
501 +setting `LANG', otherwise the setting of `LANG' will not have the
502 +desired effect. Here `LL' is an ISO 639 two-letter language code, and
503 +`CC' is an ISO 3166 two-letter country code. For example, let's
504 suppose that you speak German and live in Germany. At the shell
505 prompt, merely execute `setenv LANG de_DE' (in `csh'),
506 `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
508 language and `CC' denoting the country, is the one use on systems based
509 on GNU libc. On other systems, some variations of this scheme are
510 used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
511 -locales supported by your system for your country by running the command
512 -`locale -a | grep '^LL''.
513 +locales supported by your system for your language by running the
514 +command `locale -a | grep '^LL''.
516 Not all programs have translations for all languages. By default, an
517 English message is shown in place of a nonexistent translation. If you
519 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
520 (Portuguese as spoken in Portugal) in this context.
522 -1.4 Translating Teams
523 +1.3 Translating Teams
524 =====================
526 For the Free Translation Project to be a success, we need interested
528 able to synergize with other translators speaking the same language.
529 Each translation team has its own mailing list. The up-to-date list of
530 teams can be found at the Free Translation Project's homepage,
531 -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
533 +`http://translationproject.org/', in the "Teams" area.
535 If you'd like to volunteer to _work_ at translating messages, you
536 should become a member of the translating team for your own language.
537 @@ -168,786 +125,1125 @@
538 _actively_ in translations, or at solving translational difficulties,
539 rather than merely lurking around. If your team does not exist yet and
540 you want to start one, or if you are unsure about what to do or how to
541 -get started, please write to `translation@iro.umontreal.ca' to reach the
542 -coordinator for all translator teams.
543 +get started, please write to `coordinator@translationproject.org' to
544 +reach the coordinator for all translator teams.
546 The English team is special. It works at improving and uniformizing
547 -the terminology in use. Proven linguistic skill are praised more than
548 -programming skill, here.
549 +the terminology in use. Proven linguistic skills are praised more than
550 +programming skills, here.
552 -1.5 Available Packages
553 +1.4 Available Packages
554 ======================
556 Languages are not equally supported in all packages. The following
557 -matrix shows the current state of internationalization, as of April
558 -2005. The matrix shows, in regard of each package, for which languages
559 +matrix shows the current state of internationalization, as of June
560 +2010. The matrix shows, in regard of each package, for which languages
561 PO files have been submitted to translation coordination, with a
562 translation percentage of at least 50%.
564 - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB
565 + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca
566 + +--------------------------------------------------+
577 + bison-runtime | [] |
578 + bluez-pin | [] [] |
583 + coreutils | [] [] |
605 + gettext-examples | [] [] [] [] |
606 + gettext-runtime | [] [] |
607 + gettext-tools | [] [] |
611 + glunarclock | [] [] |
628 + gpe-filemanager | |
631 + gpe-ownerinfo | [] |
635 + gpe-taskmanager | [] |
636 + gpe-timesheet | [] |
647 + gst-plugins-bad | [] |
648 + gst-plugins-base | [] |
649 + gst-plugins-good | [] |
650 + gst-plugins-ugly | [] |
651 + gstreamer | [] [] [] |
655 + gtkspell | [] [] [] |
663 + iso_3166 | [] [] [] [] [] [] [] |
666 + iso_639 | [] [] [] [] |
671 + keytouch-editor | |
672 + keytouch-keyboa... | [] |
684 + libgphoto2_port | |
700 + man-db-manpages | |
719 + scrollkeeper | [] [] [] |
721 + sharutils | [] [] |
732 + unicode-han-tra... | |
733 + unicode-transla... | |
734 + util-linux-ng | [] |
742 + xchat | [] [] [] [] |
743 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
744 + xkeyboard-config | [] [] |
745 + +--------------------------------------------------+
746 + af am an ar as ast az be be@latin bg bn_IN bs ca
747 + 6 0 1 2 3 19 1 10 3 28 3 1 38
749 + crh cs da de el en en_GB en_ZA eo es et eu fa
750 +-------------------------------------------------+
752 - a2ps | [] [] [] [] [] |
757 - aspell | [] [] [] [] |
764 - bluez-pin | [] [] [] [] |
766 - console-tools | [] [] |
767 - coreutils | [] [] [] [] |
768 + a2ps | [] [] [] [] [] [] [] |
770 + ant-phone | [] () |
772 + aspell | [] [] [] [] [] |
775 + bibshelf | [] [] [] |
778 + bison-runtime | [] [] [] [] |
779 + bluez-pin | [] [] [] [] [] [] |
781 + buzztard | [] [] [] |
783 + clisp | [] [] [] [] |
784 + coreutils | [] [] [] [] |
786 - cpplib | [] [] [] |
787 - darkstat | [] () [] |
788 - dialog | [] [] [] [] [] [] |
789 - diffutils | [] [] [] [] [] |
791 - e2fsprogs | [] [] |
792 - enscript | [] [] [] [] |
793 - error | [] [] [] [] |
794 - fetchmail | [] () [] [] [] |
795 - fileutils | [] [] |
796 - findutils | [] [] [] |
804 - gettext-examples | [] [] [] [] |
805 - gettext-runtime | [] [] [] [] |
806 - gettext-tools | [] [] |
807 - gimp-print | [] [] [] [] |
813 - gnucash | [] () () [] |
814 - gnucash-glossary | [] () |
815 - gpe-aerial | [] [] |
817 - gpe-calendar | [] [] |
818 - gpe-clock | [] [] |
823 - gpe-login | [] [] |
824 - gpe-ownerinfo | [] [] |
825 - gpe-sketchbook | [] [] |
827 - gpe-taskmanager | [] [] |
828 - gpe-timesheet | [] |
829 - gpe-today | [] [] |
831 - gphoto2 | [] [] [] [] |
834 - gramadoir | [] [] |
835 - grep | [] [] [] [] [] [] |
839 + cpplib | [] [] [] |
842 + dialog | [] [] [] [] [] |
844 + diffutils | [] [] [] [] [] [] |
847 + e2fsprogs | [] [] [] |
848 + enscript | [] [] [] |
850 + fetchmail | [] [] () [] [] [] |
851 + findutils | [] [] [] |
853 + freedink | [] [] [] |
858 + gettext-examples | [] [] [] [] |
859 + gettext-runtime | [] [] [] [] |
860 + gettext-tools | [] [] [] |
861 + gip | [] [] [] [] |
864 + glunarclock | [] [] |
866 + gnucash | [] () () () () |
873 + gpe-aerial | [] [] [] [] |
874 + gpe-beam | [] [] [] [] |
875 + gpe-bluetooth | [] [] |
876 + gpe-calendar | [] |
877 + gpe-clock | [] [] [] [] |
878 + gpe-conf | [] [] [] |
879 + gpe-contacts | [] [] [] |
881 + gpe-filemanager | [] [] [] |
882 + gpe-go | [] [] [] [] |
883 + gpe-login | [] [] |
884 + gpe-ownerinfo | [] [] [] [] |
885 + gpe-package | [] [] [] |
886 + gpe-sketchbook | [] [] [] [] |
887 + gpe-su | [] [] [] [] |
888 + gpe-taskmanager | [] [] [] [] |
889 + gpe-timesheet | [] [] [] [] |
890 + gpe-today | [] [] [] [] |
891 + gpe-todo | [] [] [] |
892 + gphoto2 | [] [] () [] [] [] |
894 + gpsdrive | [] [] [] |
895 + gramadoir | [] [] [] |
900 - gst-plugins | [] [] [] [] [] [] |
901 - gstreamer | [] [] [] [] [] |
903 - gtkspell | [] [] [] |
904 - hello | [] [] [] [] |
909 - iso_3166_1 | [] [] [] [] [] |
917 - kbd | [] [] [] [] |
920 - libc | [] [] [] [] [] |
921 + gst-plugins-bad | [] [] [] [] [] |
922 + gst-plugins-base | [] [] [] [] [] |
923 + gst-plugins-good | [] [] [] [] [] [] |
924 + gst-plugins-ugly | [] [] [] [] [] [] |
925 + gstreamer | [] [] [] [] [] |
927 + gtkam | [] [] () [] [] |
928 + gtkorphan | [] [] [] [] |
929 + gtkspell | [] [] [] [] [] [] [] |
930 + gutenprint | [] [] [] |
931 + hello | [] [] [] [] |
935 + indent | [] [] [] [] [] [] [] |
936 + iso_15924 | [] () [] [] |
937 + iso_3166 | [] [] [] [] () [] [] [] () |
939 + iso_4217 | [] [] [] () [] [] |
940 + iso_639 | [] [] [] [] () [] [] |
943 + kbd | [] [] [] [] [] |
945 + keytouch-editor | [] [] |
946 + keytouch-keyboa... | [] |
947 + klavaro | [] [] [] [] |
950 + leafpad | [] [] [] [] [] [] |
951 + libc | [] [] [] [] |
952 + libexif | [] [] () |
954 - libgpewidget | [] [] [] |
956 + libgpewidget | [] [] |
957 + libgpg-error | [] [] |
958 + libgphoto2 | [] () |
959 + libgphoto2_port | [] () [] |
961 - libiconv | [] [] [] [] [] |
963 - lifelines | [] () |
966 - lynx | [] [] [] [] |
970 - man-db | [] () [] [] |
972 - mysecretdiary | [] [] |
974 - nano_1_0 | [] () [] [] |
976 - parted | [] [] [] [] |
982 - recode | [] [] [] [] [] |
984 + libiconv | [] [] [] [] [] |
985 + libidn | [] [] [] |
986 + lifelines | [] () |
987 + liferea | [] [] [] [] [] |
988 + lilypond | [] [] [] |
989 + linkdr | [] [] [] |
992 + lynx | [] [] [] [] |
998 + man-db-manpages | |
999 + minicom | [] [] [] [] |
1006 + popt | [] [] [] [] [] |
1007 + psmisc | [] [] [] |
1011 + recode | [] [] [] [] [] [] |
1012 + rosegarden | () () () |
1017 - scrollkeeper | [] [] [] [] [] [] [] [] |
1019 - sh-utils | [] [] |
1020 - shared-mime-info | [] [] |
1021 - sharutils | [] [] [] [] [] |
1026 - soundtracker | [] [] |
1031 - textutils | [] [] [] |
1034 - tuxpaint | [] [] [] [] [] [] [] |
1035 + scrollkeeper | [] [] [] [] [] |
1036 + sed | [] [] [] [] [] [] |
1037 + sharutils | [] [] [] [] |
1039 + skencil | [] () [] |
1040 + solfege | [] [] [] |
1041 + solfege-manual | [] [] |
1042 + soundtracker | [] [] [] |
1044 + sysstat | [] [] [] |
1045 + tar | [] [] [] [] |
1046 + texinfo | [] [] [] |
1048 unicode-han-tra... | |
1049 unicode-transla... | |
1050 - util-linux | [] [] [] [] |
1051 - vorbis-tools | [] [] [] [] |
1053 - wdiff | [] [] [] [] |
1054 - wget | [] [] [] [] [] [] |
1055 - xchat | [] [] [] [] |
1056 - xkeyboard-config | |
1058 + util-linux-ng | [] [] [] [] |
1061 + vorbis-tools | [] [] |
1066 + xchat | [] [] [] [] [] |
1067 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
1068 + xkeyboard-config | [] [] [] [] [] [] |
1069 +-------------------------------------------------+
1070 - af am ar az be bg bs ca cs cy da de el en en_GB
1071 - 10 0 0 2 7 4 0 41 43 3 52 90 20 1 15
1072 + crh cs da de el en en_GB en_ZA eo es et eu fa
1073 + 5 64 105 117 18 1 8 0 28 89 18 19 0
1075 - eo es et eu fa fi fr ga gl he hr hu id is it
1076 - +-----------------------------------------------+
1078 - a2ps | [] [] [] () |
1084 - bash | [] [] [] [] |
1085 - batchelor | [] [] |
1087 - bibshelf | [] [] [] |
1088 - binutils | [] [] |
1089 - bison | [] [] [] [] [] [] |
1090 - bluez-pin | [] [] [] [] [] [] |
1093 - coreutils | [] [] [] [] [] |
1096 - darkstat | [] () [] [] [] |
1097 - dialog | [] [] [] [] [] [] [] [] |
1098 - diffutils | [] [] [] [] [] [] [] [] [] [] |
1100 - e2fsprogs | [] [] [] |
1101 - enscript | [] [] |
1102 - error | [] [] [] [] [] |
1104 - fileutils | [] [] [] [] [] [] |
1105 - findutils | [] [] [] [] [] |
1109 - gawk | [] [] [] [] |
1113 - gettext-examples | [] [] [] [] |
1114 - gettext-runtime | [] [] [] [] [] [] |
1115 - gettext-tools | [] [] [] |
1116 - gimp-print | [] [] |
1119 - glunarclock | [] [] [] |
1120 - gmult | [] [] [] |
1122 - gnucash | [] () [] |
1123 - gnucash-glossary | [] [] |
1124 - gpe-aerial | [] [] |
1125 - gpe-beam | [] [] |
1126 - gpe-calendar | [] [] [] [] |
1127 - gpe-clock | [] [] [] |
1129 - gpe-contacts | [] |
1130 - gpe-edit | [] [] |
1132 - gpe-login | [] [] [] |
1133 - gpe-ownerinfo | [] [] [] [] [] |
1134 - gpe-sketchbook | [] [] |
1135 - gpe-su | [] [] [] |
1136 - gpe-taskmanager | [] [] [] |
1137 - gpe-timesheet | [] [] [] [] |
1138 - gpe-today | [] [] [] [] |
1139 - gpe-todo | [] [] [] |
1140 - gphoto2 | [] [] [] [] [] |
1141 - gprof | [] [] [] |
1142 - gpsdrive | () () [] () |
1143 - gramadoir | [] [] |
1144 - grep | [] [] [] [] [] [] [] [] [] [] [] [] |
1145 - gretl | [] [] [] |
1146 - gsasl | [] [] [] |
1148 - gst-plugins | [] [] [] |
1150 - gtick | [] [] [] [] [] |
1151 - gtkspell | [] [] [] [] [] [] |
1152 - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
1153 - id-utils | [] [] [] [] |
1155 - indent | [] [] [] [] [] [] [] [] [] [] [] |
1156 - iso_3166 | [] [] [] |
1157 - iso_3166_1 | [] [] [] [] [] [] [] |
1160 - iso_4217 | [] [] [] |
1161 - iso_639 | [] [] [] [] |
1164 - jwhois | [] [] [] [] [] |
1166 - latrine | [] [] [] |
1168 - libc | [] [] [] [] [] |
1170 - libgpewidget | [] [] [] [] [] |
1171 - libgsasl | [] [] |
1172 - libiconv | [] [] [] [] [] [] [] [] [] [] [] |
1176 - lingoteach | [] [] [] |
1178 - m4 | [] [] [] [] |
1179 - mailutils | [] [] |
1180 - make | [] [] [] [] [] [] [] |
1182 - minicom | [] [] [] [] |
1183 - mysecretdiary | [] [] [] |
1184 - nano | [] [] () [] [] |
1185 - nano_1_0 | [] [] [] [] [] |
1187 - parted | [] [] [] [] |
1189 - ptx | [] [] [] [] [] [] [] [] [] |
1193 - recode | [] [] [] [] [] [] [] [] |
1196 - scrollkeeper | [] [] [] |
1197 - sed | [] [] [] [] [] |
1198 - sh-utils | [] [] [] [] [] [] [] |
1199 - shared-mime-info | [] [] [] [] [] [] |
1200 - sharutils | [] [] [] [] [] [] [] |
1205 - soundtracker | [] [] [] |
1208 - tar | [] [] [] [] [] |
1209 - texinfo | [] [] [] |
1210 - textutils | [] [] [] [] [] |
1212 - tp-robot | [] [] |
1213 - tuxpaint | [] [] [] [] [] [] [] [] [] |
1214 - unicode-han-tra... | |
1215 - unicode-transla... | [] [] |
1216 - util-linux | [] [] [] [] [] [] |
1217 - vorbis-tools | [] [] |
1219 - wdiff | [] [] [] [] [] [] [] [] |
1220 - wget | [] [] [] [] [] [] [] [] [] [] |
1221 - xchat | [] [] [] [] [] |
1222 - xkeyboard-config | |
1224 - +-----------------------------------------------+
1225 - eo es et eu fa fi fr ga gl he hr hu id is it
1226 - 13 85 21 15 2 35 115 45 17 8 6 40 27 1 45
1227 + fi fr ga gl gu he hi hr hu hy id is it ja ka kn
1228 + +----------------------------------------------------+
1229 + a2ps | [] [] [] [] |
1231 + ant-phone | [] [] |
1232 + anubis | [] [] [] [] |
1233 + aspell | [] [] [] [] |
1234 + bash | [] [] [] [] |
1236 + bibshelf | [] [] [] [] [] |
1237 + binutils | [] [] [] |
1238 + bison | [] [] [] [] |
1239 + bison-runtime | [] [] [] [] [] [] |
1240 + bluez-pin | [] [] [] [] [] [] [] [] |
1241 + bombono-dvd | [] |
1243 + cflow | [] [] [] |
1245 + coreutils | [] [] [] [] [] |
1246 + cpio | [] [] [] [] |
1248 + cpplib | [] [] [] |
1249 + cryptsetup | [] [] [] |
1250 + dfarc | [] [] [] |
1251 + dialog | [] [] [] [] [] [] [] |
1253 + diffutils | [] [] [] [] [] [] [] [] [] |
1256 + e2fsprogs | [] [] |
1257 + enscript | [] [] [] [] |
1258 + exif | [] [] [] [] [] [] |
1259 + fetchmail | [] [] [] [] |
1260 + findutils | [] [] [] [] [] [] |
1262 + freedink | [] [] [] |
1264 + gawk | [] [] [] [] () [] |
1267 + gettext-examples | [] [] [] [] [] [] [] |
1268 + gettext-runtime | [] [] [] [] [] [] |
1269 + gettext-tools | [] [] [] [] |
1270 + gip | [] [] [] [] [] [] |
1273 + glunarclock | [] [] [] [] |
1274 + gnubiff | () [] () |
1275 + gnucash | () () () () () [] |
1277 + gnulib | [] [] [] [] [] [] |
1282 + gpe-aerial | [] [] [] |
1283 + gpe-beam | [] [] [] [] |
1284 + gpe-bluetooth | [] [] [] [] |
1285 + gpe-calendar | [] [] |
1286 + gpe-clock | [] [] [] [] [] |
1287 + gpe-conf | [] [] [] [] |
1288 + gpe-contacts | [] [] [] [] |
1289 + gpe-edit | [] [] [] |
1290 + gpe-filemanager | [] [] [] [] |
1291 + gpe-go | [] [] [] [] [] |
1292 + gpe-login | [] [] [] |
1293 + gpe-ownerinfo | [] [] [] [] [] |
1294 + gpe-package | [] [] [] |
1295 + gpe-sketchbook | [] [] [] [] |
1296 + gpe-su | [] [] [] [] [] [] |
1297 + gpe-taskmanager | [] [] [] [] [] |
1298 + gpe-timesheet | [] [] [] [] [] |
1299 + gpe-today | [] [] [] [] [] [] [] |
1300 + gpe-todo | [] [] [] |
1301 + gphoto2 | [] [] [] [] [] [] |
1302 + gprof | [] [] [] [] |
1303 + gpsdrive | [] [] [] |
1304 + gramadoir | [] [] [] |
1306 + grub | [] [] [] [] |
1307 + gsasl | [] [] [] [] [] |
1308 + gss | [] [] [] [] [] |
1309 + gst-plugins-bad | [] [] [] [] [] [] |
1310 + gst-plugins-base | [] [] [] [] [] [] |
1311 + gst-plugins-good | [] [] [] [] [] [] |
1312 + gst-plugins-ugly | [] [] [] [] [] [] |
1313 + gstreamer | [] [] [] [] [] |
1314 + gtick | [] [] [] [] [] |
1315 + gtkam | [] [] [] [] [] |
1316 + gtkorphan | [] [] [] |
1317 + gtkspell | [] [] [] [] [] [] [] [] [] |
1318 + gutenprint | [] [] [] [] |
1319 + hello | [] [] [] |
1320 + help2man | [] [] |
1322 + idutils | [] [] [] [] [] [] |
1323 + indent | [] [] [] [] [] [] [] [] |
1324 + iso_15924 | [] () [] [] |
1325 + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] |
1326 + iso_3166_2 | () [] [] [] |
1327 + iso_4217 | [] () [] [] [] [] |
1328 + iso_639 | [] () [] [] [] [] [] [] [] |
1329 + iso_639_3 | () [] [] |
1330 + jwhois | [] [] [] [] [] |
1332 + keytouch | [] [] [] [] [] [] |
1333 + keytouch-editor | [] [] [] [] [] |
1334 + keytouch-keyboa... | [] [] [] [] [] |
1336 + latrine | [] [] [] |
1337 + ld | [] [] [] [] |
1338 + leafpad | [] [] [] [] [] [] [] () |
1339 + libc | [] [] [] [] [] |
1342 + libgnutls | [] [] |
1343 + libgpewidget | [] [] [] [] |
1344 + libgpg-error | [] [] |
1345 + libgphoto2 | [] [] [] |
1346 + libgphoto2_port | [] [] [] |
1347 + libgsasl | [] [] [] [] [] |
1348 + libiconv | [] [] [] [] [] [] |
1349 + libidn | [] [] [] [] |
1351 + liferea | [] [] [] [] |
1352 + lilypond | [] [] |
1353 + linkdr | [] [] [] [] [] |
1356 + lynx | [] [] [] [] [] |
1357 + m4 | [] [] [] [] [] [] |
1359 + mailutils | [] [] |
1360 + make | [] [] [] [] [] [] [] [] [] |
1362 + man-db-manpages | [] |
1363 + minicom | [] [] [] [] [] |
1364 + mkisofs | [] [] [] [] |
1366 + nano | [] [] [] [] [] [] |
1367 + opcodes | [] [] [] [] |
1368 + parted | [] [] [] [] |
1370 + popt | [] [] [] [] [] [] [] [] [] |
1371 + psmisc | [] [] [] |
1373 + pwdutils | [] [] |
1375 + recode | [] [] [] [] [] [] [] [] |
1376 + rosegarden | () () () () () |
1381 + scrollkeeper | [] [] [] [] |
1382 + sed | [] [] [] [] [] [] [] [] |
1383 + sharutils | [] [] [] [] [] [] [] |
1386 + solfege | [] [] [] [] |
1387 + solfege-manual | [] [] |
1388 + soundtracker | [] [] |
1390 + sysstat | [] [] [] [] [] |
1391 + tar | [] [] [] [] [] [] [] |
1392 + texinfo | [] [] [] [] |
1394 + unicode-han-tra... | |
1395 + unicode-transla... | [] [] |
1396 + util-linux-ng | [] [] [] [] [] [] |
1399 + vorbis-tools | [] |
1400 + wastesedge | () () |
1402 + wget | [] [] [] [] [] [] [] [] |
1403 + wyslij-po | [] [] [] |
1404 + xchat | [] [] [] [] [] [] [] [] [] |
1405 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] |
1406 + xkeyboard-config | [] [] [] [] [] |
1407 + +----------------------------------------------------+
1408 + fi fr ga gl gu he hi hr hu hy id is it ja ka kn
1409 + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4
1411 - ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
1412 + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
1413 +-----------------------------------------------+
1415 - a2ps | () [] [] () |
1418 - anubis | [] [] [] |
1431 + bibshelf | [] [] |
1433 - bison | [] [] [] |
1437 - coreutils | [] [] |
1439 + bison-runtime | [] [] [] [] [] |
1440 + bluez-pin | [] [] [] [] [] |
1449 - darkstat | [] [] |
1451 - diffutils | [] [] [] |
1454 + dialog | [] [] [] [] [] |
1456 + diffutils | [] [] |
1462 - fetchmail | [] [] |
1463 - fileutils | [] [] |
1479 - gettext-examples | [] [] |
1480 - gettext-runtime | [] [] [] |
1481 - gettext-tools | [] [] |
1482 - gimp-print | [] [] |
1485 - glunarclock | [] [] |
1487 + gettext-examples | [] [] [] [] |
1488 + gettext-runtime | [] |
1489 + gettext-tools | [] |
1493 + glunarclock | [] |
1495 - gnucash | () () [] |
1496 - gnucash-glossary | [] |
1499 - gpe-calendar | [] |
1506 - gpe-ownerinfo | [] |
1507 - gpe-sketchbook | [] |
1509 - gpe-taskmanager | [] [] |
1510 - gpe-timesheet | [] |
1515 - gpsdrive | () () () |
1520 + gnucash | () () () () |
1529 + gpe-bluetooth | [] [] |
1530 + gpe-calendar | [] |
1531 + gpe-clock | [] [] [] [] [] |
1532 + gpe-conf | [] [] |
1533 + gpe-contacts | [] [] |
1535 + gpe-filemanager | [] [] |
1536 + gpe-go | [] [] [] |
1538 + gpe-ownerinfo | [] [] |
1539 + gpe-package | [] [] |
1540 + gpe-sketchbook | [] [] |
1541 + gpe-su | [] [] [] [] [] [] |
1542 + gpe-taskmanager | [] [] [] [] [] [] |
1543 + gpe-timesheet | [] [] |
1544 + gpe-today | [] [] [] [] |
1545 + gpe-todo | [] [] |
1554 - gst-plugins | [] |
1557 - gtkspell | [] [] |
1558 - hello | [] [] [] [] [] [] [] [] |
1563 - iso_3166_1 | [] [] |
1566 - iso_4217 | [] [] [] |
1567 - iso_639 | [] [] [] |
1568 - jpilot | () () () |
1573 + gst-plugins-bad | [] [] [] [] |
1574 + gst-plugins-base | [] [] |
1575 + gst-plugins-good | [] [] |
1576 + gst-plugins-ugly | [] [] [] [] [] |
1580 + gtkorphan | [] [] |
1581 + gtkspell | [] [] [] [] [] [] [] |
1583 + hello | [] [] [] |
1588 + iso_15924 | [] [] |
1589 + iso_3166 | [] [] () [] [] [] [] [] |
1591 + iso_4217 | [] [] |
1597 + keytouch-editor | [] |
1598 + keytouch-keyboa... | [] |
1602 - libc | [] [] [] [] [] |
1603 + leafpad | [] [] [] |
1607 - libgpewidget | [] |
1611 + libgpewidget | [] [] |
1614 + libgphoto2_port | |
1636 - mysecretdiary | [] |
1638 - nano_1_0 | [] [] [] |
1645 + man-db-manpages | |
1662 - scrollkeeper | [] [] [] |
1664 - sh-utils | [] [] |
1665 - shared-mime-info | [] [] [] [] |
1666 - sharutils | [] [] |
1674 + scrollkeeper | [] [] |
1682 + solfege-manual | |
1685 - stardict | [] [] |
1687 - texinfo | [] [] [] |
1688 - textutils | [] [] [] |
1695 - tuxpaint | [] [] [] [] [] [] |
1696 unicode-han-tra... | |
1697 unicode-transla... | |
1698 - util-linux | [] [] |
1699 - vorbis-tools | [] |
1703 - xchat | [] [] [] [] |
1704 - xkeyboard-config | [] |
1714 + xchat | [] [] [] |
1715 + xdg-user-dirs | [] [] [] [] [] [] [] [] |
1716 + xkeyboard-config | [] [] [] |
1717 +-----------------------------------------------+
1718 - ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
1719 - 33 11 1 1 1 2 2 3 11 0 15 96 7 5 0
1721 - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
1722 - +-------------------------------------------------+
1724 - a2ps | () [] [] [] [] [] [] |
1727 - anubis | [] [] [] |
1734 - binutils | [] [] |
1735 - bison | [] [] [] [] [] |
1736 - bluez-pin | [] [] [] [] [] [] [] [] |
1738 - console-tools | [] |
1739 - coreutils | [] [] [] [] |
1742 - darkstat | [] [] [] [] [] [] |
1743 - dialog | [] [] [] [] [] [] [] |
1744 - diffutils | [] [] [] [] [] [] |
1746 - e2fsprogs | [] [] |
1747 - enscript | [] [] [] [] |
1748 - error | [] [] [] |
1749 - fetchmail | [] () [] [] [] |
1750 - fileutils | [] [] [] [] [] |
1751 - findutils | [] [] [] [] [] [] |
1752 - flex | [] [] [] [] [] |
1753 - fslint | [] [] [] |
1755 - gawk | [] [] [] [] |
1759 - gettext-examples | [] [] [] [] [] [] |
1760 - gettext-runtime | [] [] [] [] [] [] [] |
1761 - gettext-tools | [] [] [] [] [] [] [] |
1762 - gimp-print | [] [] |
1765 - glunarclock | [] [] [] [] [] [] |
1766 - gmult | [] [] [] [] |
1768 - gnucash | () [] [] [] [] |
1769 - gnucash-glossary | [] [] [] |
1770 - gpe-aerial | [] [] [] [] [] [] |
1771 - gpe-beam | [] [] [] [] [] [] |
1772 - gpe-calendar | [] [] [] [] [] [] [] |
1773 - gpe-clock | [] [] [] [] [] [] [] |
1774 - gpe-conf | [] [] [] [] [] [] |
1775 - gpe-contacts | [] [] [] |
1776 - gpe-edit | [] [] [] [] [] [] [] |
1777 - gpe-go | [] [] [] [] [] |
1778 - gpe-login | [] [] [] [] [] [] [] |
1779 - gpe-ownerinfo | [] [] [] [] [] [] [] |
1780 - gpe-sketchbook | [] [] [] [] [] [] [] |
1781 - gpe-su | [] [] [] [] [] [] [] |
1782 - gpe-taskmanager | [] [] [] [] [] [] [] |
1783 - gpe-timesheet | [] [] [] [] [] [] [] |
1784 - gpe-today | [] [] [] [] [] [] [] |
1785 - gpe-todo | [] [] [] [] [] [] [] |
1786 - gphoto2 | [] [] [] [] |
1787 - gprof | [] [] [] |
1790 - grep | [] [] [] [] [] [] [] |
1792 - gsasl | [] [] [] [] [] |
1794 - gst-plugins | [] [] [] [] |
1795 - gstreamer | [] [] [] [] |
1796 - gtick | [] [] [] |
1797 - gtkspell | [] [] [] [] [] [] |
1798 - hello | [] [] [] [] [] [] [] |
1799 - id-utils | [] [] [] [] |
1801 - indent | [] [] [] [] [] [] |
1802 - iso_3166 | [] [] [] [] [] |
1803 - iso_3166_1 | [] [] [] [] |
1805 - iso_3166_3 | [] [] [] |
1806 - iso_4217 | [] [] |
1807 - iso_639 | [] [] [] |
1810 - jwhois | [] [] [] () () |
1814 - libc | [] [] [] [] [] |
1815 - libextractor | [] |
1816 - libgpewidget | [] [] [] [] [] [] |
1817 - libgsasl | [] [] [] |
1818 - libiconv | [] [] [] [] [] [] [] [] [] [] |
1820 - lifelines | [] [] |
1824 - m4 | [] [] [] [] [] |
1825 - mailutils | [] [] [] |
1826 - make | [] [] [] [] |
1828 - minicom | [] [] [] [] |
1829 - mysecretdiary | [] [] [] [] |
1831 - nano_1_0 | [] [] [] [] |
1833 - parted | [] [] [] [] |
1835 - ptx | [] [] [] [] [] [] |
1839 - recode | [] [] [] [] [] [] |
1840 - rpm | [] [] [] [] |
1842 - scrollkeeper | [] [] [] [] [] [] [] |
1843 - sed | [] [] [] [] [] [] [] [] |
1844 - sh-utils | [] [] [] |
1845 - shared-mime-info | [] [] [] [] [] |
1846 - sharutils | [] [] [] |
1848 - skencil | [] [] [] |
1849 - sketch | [] [] [] |
1851 - soundtracker | [] [] |
1853 - stardict | [] [] |
1854 - tar | [] [] [] [] |
1855 - texinfo | [] [] [] [] |
1856 - textutils | [] [] [] |
1859 - tuxpaint | [] [] [] [] [] [] [] [] |
1860 - unicode-han-tra... | |
1861 - unicode-transla... | |
1862 - util-linux | [] [] [] |
1863 - vorbis-tools | [] [] |
1865 - wdiff | [] [] [] [] [] [] |
1866 - wget | [] [] [] [] [] [] [] [] [] |
1867 - xchat | [] [] [] [] [] [] |
1868 - xkeyboard-config | |
1870 - +-------------------------------------------------+
1871 - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
1872 - 1 0 48 30 58 6 79 71 5 45 13 12 50 86 0
1873 + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
1874 + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1
1876 - tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
1877 - +--------------------------------------------+
1879 - a2ps | [] [] [] | 19
1881 - ant-phone | [] | 4
1884 - aspell | [] [] [] | 13
1886 - batchelor | [] [] | 7
1891 - bluez-pin | [] [] [] [] [] | 24
1893 - console-tools | [] | 4
1894 - coreutils | [] | 16
1896 - cpplib | [] [] | 7
1897 - darkstat | [] () () | 15
1898 - dialog | [] [] [] | 25
1899 - diffutils | [] [] [] [] | 28
1901 - e2fsprogs | [] | 8
1902 - enscript | [] | 12
1903 - error | [] [] [] | 16
1904 - fetchmail | [] | 12
1905 - fileutils | [] [] [] | 18
1906 - findutils | [] [] | 17
1914 - gettext-examples | [] [] [] [] | 20
1915 - gettext-runtime | [] [] [] [] [] | 25
1916 - gettext-tools | [] [] [] | 17
1917 - gimp-print | [] | 11
1920 - glunarclock | [] [] | 13
1921 - gmult | [] [] [] | 13
1923 - gnucash | () [] | 10
1924 - gnucash-glossary | [] | 8
1925 - gpe-aerial | [] [] | 13
1926 - gpe-beam | [] [] | 13
1927 - gpe-calendar | [] [] [] [] | 18
1928 - gpe-clock | [] [] [] [] | 17
1929 - gpe-conf | [] [] | 12
1930 - gpe-contacts | [] [] | 6
1931 - gpe-edit | [] [] [] [] | 15
1932 - gpe-go | [] [] | 11
1933 - gpe-login | [] [] [] [] [] | 18
1934 - gpe-ownerinfo | [] [] [] [] | 19
1935 - gpe-sketchbook | [] [] | 14
1936 - gpe-su | [] [] [] | 16
1937 - gpe-taskmanager | [] [] [] | 17
1938 - gpe-timesheet | [] [] [] [] | 17
1939 - gpe-today | [] [] [] [] [] | 19
1940 - gpe-todo | [] [] [] | 16
1941 - gphoto2 | [] [] | 17
1942 - gprof | [] [] | 10
1944 - gramadoir | [] | 6
1945 - grep | [] [] [] [] | 32
1947 - gsasl | [] [] | 12
1949 - gst-plugins | [] [] | 16
1950 - gstreamer | [] [] [] | 14
1952 - gtkspell | [] [] [] | 20
1953 - hello | [] [] [] [] | 37
1954 - id-utils | [] [] | 13
1956 - indent | [] [] [] | 24
1957 - iso_3166 | [] [] [] | 12
1958 - iso_3166_1 | [] [] | 20
1960 - iso_3166_3 | [] [] | 8
1961 - iso_4217 | [] [] | 10
1962 - iso_639 | [] [] | 12
1963 - jpilot | [] [] [] | 6
1965 - jwhois | [] [] [] | 12
1967 - latrine | [] [] | 8
1970 - libextractor | | 1
1971 - libgpewidget | [] [] | 17
1973 - libiconv | [] [] [] [] [] | 32
1974 - libidn | [] [] | 5
1980 - mailutils | [] | 7
1984 - mysecretdiary | [] [] | 12
1986 - nano_1_0 | [] [] | 17
1988 - parted | [] [] [] | 17
1994 - recode | [] [] | 22
1997 - scrollkeeper | [] [] | 23
1999 - sh-utils | [] | 15
2000 - shared-mime-info | [] [] | 19
2001 - sharutils | [] [] [] | 20
2006 - soundtracker | [] | 8
2008 - stardict | [] [] [] [] | 10
2010 - texinfo | [] [] | 14
2011 - textutils | [] [] [] | 17
2013 - tp-robot | [] [] | 7
2014 - tuxpaint | [] [] [] [] | 34
2015 - unicode-han-tra... | | 0
2016 - unicode-transla... | | 2
2017 - util-linux | [] [] | 17
2018 - vorbis-tools | [] | 10
2020 - wdiff | [] [] | 22
2021 - wget | [] [] [] [] | 31
2022 - xchat | [] [] [] | 22
2023 - xkeyboard-config | | 1
2025 - +--------------------------------------------+
2026 - 72 teams tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
2027 - 147 domains 0 0 1 78 29 0 71 16 0 41 20 0 1711
2028 + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
2029 + +---------------------------------------------------+
2030 + a2ps | [] [] [] [] [] [] [] [] |
2031 + aegis | [] [] [] |
2032 + ant-phone | [] [] |
2033 + anubis | [] [] [] |
2034 + aspell | [] [] [] [] [] |
2037 + bibshelf | [] [] |
2038 + binutils | [] [] |
2039 + bison | [] [] [] |
2040 + bison-runtime | [] [] [] [] [] [] [] |
2041 + bluez-pin | [] [] [] [] [] [] [] [] |
2042 + bombono-dvd | [] () |
2043 + buzztard | [] [] |
2046 + coreutils | [] [] [] [] [] [] |
2052 + dialog | [] [] [] [] |
2054 + diffutils | [] [] [] [] [] [] |
2057 + e2fsprogs | [] [] |
2058 + enscript | [] [] [] [] [] |
2059 + exif | [] [] [] () [] |
2060 + fetchmail | [] [] [] [] |
2061 + findutils | [] [] [] [] [] |
2062 + flex | [] [] [] [] [] |
2063 + freedink | [] [] |
2065 + gawk | [] [] [] [] |
2068 + gettext-examples | [] [] [] [] [] [] [] [] |
2069 + gettext-runtime | [] [] [] [] [] [] [] [] [] |
2070 + gettext-tools | [] [] [] [] [] [] |
2071 + gip | [] [] [] [] [] |
2073 + gliv | [] [] [] [] [] [] |
2074 + glunarclock | [] [] [] [] [] |
2076 + gnucash | [] () () () |
2078 + gnulib | [] [] [] [] |
2083 + gpe-aerial | [] [] [] [] [] [] [] |
2084 + gpe-beam | [] [] [] [] [] [] [] |
2085 + gpe-bluetooth | [] [] |
2086 + gpe-calendar | [] [] [] [] |
2087 + gpe-clock | [] [] [] [] [] [] [] [] |
2088 + gpe-conf | [] [] [] [] [] [] [] |
2089 + gpe-contacts | [] [] [] [] [] |
2090 + gpe-edit | [] [] [] |
2091 + gpe-filemanager | [] [] [] |
2092 + gpe-go | [] [] [] [] [] [] [] [] |
2093 + gpe-login | [] [] |
2094 + gpe-ownerinfo | [] [] [] [] [] [] [] [] |
2095 + gpe-package | [] [] |
2096 + gpe-sketchbook | [] [] [] [] [] [] [] |
2097 + gpe-su | [] [] [] [] [] [] [] [] |
2098 + gpe-taskmanager | [] [] [] [] [] [] [] [] |
2099 + gpe-timesheet | [] [] [] [] [] [] [] [] |
2100 + gpe-today | [] [] [] [] [] [] [] [] |
2101 + gpe-todo | [] [] [] [] [] |
2102 + gphoto2 | [] [] [] [] [] [] [] [] |
2103 + gprof | [] [] [] |
2104 + gpsdrive | [] [] |
2105 + gramadoir | [] [] |
2106 + grep | [] [] [] [] |
2108 + gsasl | [] [] [] [] |
2110 + gst-plugins-bad | [] [] [] [] [] [] |
2111 + gst-plugins-base | [] [] [] [] [] |
2112 + gst-plugins-good | [] [] [] [] [] |
2113 + gst-plugins-ugly | [] [] [] [] [] [] |
2114 + gstreamer | [] [] [] [] [] |
2115 + gtick | [] [] [] |
2116 + gtkam | [] [] [] [] [] [] |
2118 + gtkspell | [] [] [] [] [] [] [] [] [] [] |
2119 + gutenprint | [] [] |
2120 + hello | [] [] [] [] |
2121 + help2man | [] [] |
2123 + idutils | [] [] [] [] [] |
2124 + indent | [] [] [] [] [] [] [] |
2125 + iso_15924 | [] [] [] [] |
2126 + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
2127 + iso_3166_2 | [] [] [] |
2128 + iso_4217 | [] [] [] [] [] [] [] [] |
2129 + iso_639 | [] [] [] [] [] [] [] [] [] |
2130 + iso_639_3 | [] [] |
2131 + jwhois | [] [] [] [] |
2133 + keytouch | [] [] [] |
2134 + keytouch-editor | [] [] [] |
2135 + keytouch-keyboa... | [] [] [] |
2139 + leafpad | [] [] [] [] [] [] [] [] [] |
2140 + libc | [] [] [] [] |
2141 + libexif | [] [] () [] |
2143 + libgnutls | [] [] |
2144 + libgpewidget | [] [] [] |
2145 + libgpg-error | [] [] |
2146 + libgphoto2 | [] [] |
2147 + libgphoto2_port | [] [] [] [] [] |
2148 + libgsasl | [] [] [] [] [] |
2149 + libiconv | [] [] [] [] [] |
2151 + lifelines | [] [] |
2152 + liferea | [] [] [] [] [] () () [] |
2154 + linkdr | [] [] [] |
2158 + m4 | [] [] [] [] [] |
2161 + make | [] [] [] [] |
2162 + man-db | [] [] [] |
2163 + man-db-manpages | [] [] [] |
2164 + minicom | [] [] [] [] |
2165 + mkisofs | [] [] [] |
2167 + nano | [] [] [] [] |
2169 + parted | [] [] [] [] |
2171 + popt | [] [] [] [] |
2172 + psmisc | [] [] [] |
2175 + radius | [] [] [] |
2176 + recode | [] [] [] [] [] [] [] [] |
2177 + rosegarden | () () |
2182 + scrollkeeper | [] [] [] [] [] [] [] [] |
2183 + sed | [] [] [] [] [] [] [] [] [] |
2184 + sharutils | [] [] [] [] |
2187 + solfege | [] [] [] [] |
2188 + solfege-manual | [] [] [] |
2189 + soundtracker | [] |
2191 + sysstat | [] [] [] [] |
2192 + tar | [] [] [] [] |
2193 + texinfo | [] [] [] [] |
2195 + unicode-han-tra... | |
2196 + unicode-transla... | |
2197 + util-linux-ng | [] [] [] [] [] |
2200 + vorbis-tools | [] [] |
2203 + wget | [] [] [] [] [] [] [] |
2204 + wyslij-po | [] [] [] |
2205 + xchat | [] [] [] [] [] [] [] [] [] |
2206 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
2207 + xkeyboard-config | [] [] [] |
2208 + +---------------------------------------------------+
2209 + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
2210 + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37
2212 + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
2213 + +---------------------------------------------------+
2214 + a2ps | [] [] [] [] [] | 27
2216 + ant-phone | [] [] [] [] | 9
2217 + anubis | [] [] [] [] | 15
2218 + aspell | [] [] [] | 20
2219 + bash | [] [] [] | 12
2221 + bibshelf | [] [] [] | 16
2222 + binutils | [] [] | 8
2223 + bison | [] [] | 12
2224 + bison-runtime | [] [] [] [] [] [] | 29
2225 + bluez-pin | [] [] [] [] [] [] [] [] | 37
2226 + bombono-dvd | [] | 4
2228 + cflow | [] [] [] | 9
2230 + coreutils | [] [] [] [] | 22
2231 + cpio | [] [] [] [] [] [] | 13
2233 + cpplib | [] [] [] [] [] [] | 14
2234 + cryptsetup | [] [] | 7
2236 + dialog | [] [] [] [] [] [] [] | 30
2238 + diffutils | [] [] [] [] [] [] | 30
2240 + doodle | [] [] | 7
2241 + e2fsprogs | [] [] [] | 11
2242 + enscript | [] [] [] [] | 17
2243 + exif | [] [] [] | 16
2244 + fetchmail | [] [] [] | 17
2245 + findutils | [] [] [] [] [] | 20
2246 + flex | [] [] [] [] | 15
2247 + freedink | [] | 10
2249 + gawk | [] [] [] [] | 18
2251 + gcc | [] [] [] | 7
2252 + gettext-examples | [] [] [] [] [] [] [] | 34
2253 + gettext-runtime | [] [] [] [] [] [] [] | 29
2254 + gettext-tools | [] [] [] [] [] [] | 22
2255 + gip | [] [] [] [] | 22
2257 + gliv | [] [] [] | 14
2258 + glunarclock | [] [] [] [] [] | 19
2259 + gnubiff | [] [] | 4
2260 + gnucash | () [] () [] () | 10
2261 + gnuedu | [] [] | 7
2262 + gnulib | [] [] [] [] | 16
2264 + gnunet-gtk | [] [] [] | 5
2265 + gnutls | [] [] [] | 10
2267 + gpe-aerial | [] [] [] | 18
2268 + gpe-beam | [] [] [] | 19
2269 + gpe-bluetooth | [] [] [] | 13
2270 + gpe-calendar | [] [] [] [] | 12
2271 + gpe-clock | [] [] [] [] [] | 28
2272 + gpe-conf | [] [] [] [] | 20
2273 + gpe-contacts | [] [] [] | 17
2274 + gpe-edit | [] [] [] | 12
2275 + gpe-filemanager | [] [] [] [] | 16
2276 + gpe-go | [] [] [] [] [] | 25
2277 + gpe-login | [] [] [] | 11
2278 + gpe-ownerinfo | [] [] [] [] [] | 25
2279 + gpe-package | [] [] [] | 13
2280 + gpe-sketchbook | [] [] [] | 20
2281 + gpe-su | [] [] [] [] [] | 30
2282 + gpe-taskmanager | [] [] [] [] [] | 29
2283 + gpe-timesheet | [] [] [] [] [] | 25
2284 + gpe-today | [] [] [] [] [] [] | 30
2285 + gpe-todo | [] [] [] [] | 17
2286 + gphoto2 | [] [] [] [] [] | 24
2287 + gprof | [] [] [] | 15
2288 + gpsdrive | [] [] [] | 11
2289 + gramadoir | [] [] [] | 11
2290 + grep | [] [] [] | 10
2291 + grub | [] [] [] | 14
2292 + gsasl | [] [] [] [] | 14
2293 + gss | [] [] [] | 11
2294 + gst-plugins-bad | [] [] [] [] | 26
2295 + gst-plugins-base | [] [] [] [] [] | 24
2296 + gst-plugins-good | [] [] [] [] | 24
2297 + gst-plugins-ugly | [] [] [] [] [] | 29
2298 + gstreamer | [] [] [] [] | 22
2299 + gtick | [] [] [] | 13
2300 + gtkam | [] [] [] | 20
2301 + gtkorphan | [] [] [] | 14
2302 + gtkspell | [] [] [] [] [] [] [] [] [] | 45
2303 + gutenprint | [] | 10
2304 + hello | [] [] [] [] [] [] | 21
2305 + help2man | [] [] | 7
2307 + idutils | [] [] [] [] | 17
2308 + indent | [] [] [] [] [] [] | 30
2309 + iso_15924 | () [] () [] [] | 16
2310 + iso_3166 | [] [] () [] [] () [] [] [] () | 53
2311 + iso_3166_2 | () [] () [] | 9
2312 + iso_4217 | [] () [] [] () [] [] | 26
2313 + iso_639 | [] [] [] () [] () [] [] [] [] | 38
2314 + iso_639_3 | [] () | 8
2315 + jwhois | [] [] [] [] [] | 16
2316 + kbd | [] [] [] [] [] | 15
2317 + keytouch | [] [] [] | 16
2318 + keytouch-editor | [] [] [] | 14
2319 + keytouch-keyboa... | [] [] [] | 14
2321 + latrine | [] [] [] | 10
2322 + ld | [] [] [] [] | 11
2323 + leafpad | [] [] [] [] [] [] | 33
2324 + libc | [] [] [] [] [] | 21
2325 + libexif | [] () | 7
2326 + libextractor | [] | 1
2327 + libgnutls | [] [] [] | 9
2328 + libgpewidget | [] [] [] | 14
2329 + libgpg-error | [] [] [] | 9
2330 + libgphoto2 | [] [] | 8
2331 + libgphoto2_port | [] [] [] [] | 14
2332 + libgsasl | [] [] [] | 13
2333 + libiconv | [] [] [] [] | 21
2334 + libidn | () [] [] | 11
2335 + lifelines | [] | 4
2336 + liferea | [] [] [] | 21
2338 + linkdr | [] [] [] [] [] | 17
2341 + lynx | [] [] [] [] | 17
2342 + m4 | [] [] [] [] | 19
2343 + mailfromd | [] [] | 3
2344 + mailutils | [] | 5
2345 + make | [] [] [] [] | 21
2346 + man-db | [] [] [] | 8
2347 + man-db-manpages | | 4
2348 + minicom | [] [] | 16
2349 + mkisofs | [] [] | 9
2351 + nano | [] [] [] [] | 21
2352 + opcodes | [] [] [] | 11
2353 + parted | [] [] [] [] [] | 15
2355 + popt | [] [] [] [] [] [] | 27
2356 + psmisc | [] [] | 11
2358 + pwdutils | [] [] | 6
2359 + radius | [] [] | 9
2360 + recode | [] [] [] [] | 28
2361 + rosegarden | () | 0
2362 + rpm | [] [] [] | 11
2366 + scrollkeeper | [] [] [] [] [] | 27
2367 + sed | [] [] [] [] [] | 30
2368 + sharutils | [] [] [] [] [] | 22
2370 + skencil | [] [] | 7
2371 + solfege | [] [] [] [] | 16
2372 + solfege-manual | [] | 8
2373 + soundtracker | [] [] [] | 9
2375 + sysstat | [] [] | 15
2376 + tar | [] [] [] [] [] [] | 23
2377 + texinfo | [] [] [] [] [] | 17
2379 + unicode-han-tra... | | 0
2380 + unicode-transla... | | 2
2381 + util-linux-ng | [] [] [] [] | 20
2384 + vorbis-tools | [] | 6
2387 + wget | [] [] [] [] [] | 26
2388 + wyslij-po | [] [] | 8
2389 + xchat | [] [] [] [] [] [] | 36
2390 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63
2391 + xkeyboard-config | [] [] [] | 22
2392 + +---------------------------------------------------+
2393 + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
2394 + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618
2396 Some counters in the preceding matrix are higher than the number of
2397 visible blocks let us expect. This is because a few extra PO files are
2398 @@ -960,12 +1256,12 @@
2399 lag between the mere existence a PO file and its wide availability in a
2402 - If April 2005 seems to be old, you may fetch a more recent copy of
2403 + If June 2010 seems to be old, you may fetch a more recent copy of
2404 this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
2405 matrix with full percentage details can be found at
2406 -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
2407 +`http://translationproject.org/extra/matrix.html'.
2409 -1.6 Using `gettext' in new packages
2410 +1.5 Using `gettext' in new packages
2411 ===================================
2413 If you are writing a freely available program and want to
2414 @@ -981,6 +1277,6 @@
2415 Free Translation Project is also available for packages which are not
2416 developed inside the GNU project. Therefore the information given above
2417 applies also for every other Free Software Project. Contact
2418 -`translation@iro.umontreal.ca' to make the `.pot' files available to
2419 -the translation teams.
2420 +`coordinator@translationproject.org' to make the `.pot' files available
2421 +to the translation teams.
2423 AC_DEFUN([AC_LIB_READLINE], [
2424 diff -urN BUILD/abook-0.6.0pre2/aclocal.m4 abook/aclocal.m4
2425 --- BUILD/abook-0.6.0pre2/aclocal.m4 2006-09-05 10:19:33.000000000 +0200
2426 +++ abook/aclocal.m4 2013-03-13 15:07:45.000000000 +0100
2428 -# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
2429 +# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
2431 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
2432 -# Free Software Foundation, Inc.
2433 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2434 +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
2436 # This file is free software; the Free Software Foundation
2437 # gives unlimited permission to copy and/or distribute it,
2438 # with or without modifications, as long as this notice is preserved.
2440 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
2441 # PARTICULAR PURPOSE.
2444 -# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
2445 -# Generated from amversion.in; do not edit by hand.
2447 -# This program is free software; you can redistribute it and/or modify
2448 -# it under the terms of the GNU General Public License as published by
2449 -# the Free Software Foundation; either version 2, or (at your option)
2450 -# any later version.
2451 +m4_ifndef([AC_AUTOCONF_VERSION],
2452 + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2453 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
2454 +[m4_warning([this file was generated for autoconf 2.69.
2455 +You have another version of autoconf. It may work, but is not guaranteed to.
2456 +If you have problems, you may need to regenerate the build system entirely.
2457 +To do so, use the procedure documented by the package, typically `autoreconf'.])])
2459 -# This program is distributed in the hope that it will be useful,
2460 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2461 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2462 -# GNU General Public License for more details.
2464 -# You should have received a copy of the GNU General Public License
2465 -# along with this program; if not, write to the Free Software
2466 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2467 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
2470 +# This file is free software; the Free Software Foundation
2471 +# gives unlimited permission to copy and/or distribute it,
2472 +# with or without modifications, as long as this notice is preserved.
2476 # AM_AUTOMAKE_VERSION(VERSION)
2477 # ----------------------------
2478 # Automake X.Y traces this macro to ensure aclocal.m4 has been
2479 # generated from the m4 files accompanying Automake X.Y.
2480 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
2481 +# (This private macro should not be called outside this file.)
2482 +AC_DEFUN([AM_AUTOMAKE_VERSION],
2483 +[am__api_version='1.11'
2484 +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2485 +dnl require some minimum version. Point them to the right macro.
2486 +m4_if([$1], [1.11.6], [],
2487 + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2490 +# _AM_AUTOCONF_VERSION(VERSION)
2491 +# -----------------------------
2492 +# aclocal traces this macro to find the Autoconf version.
2493 +# This is a private macro too. Using m4_define simplifies
2494 +# the logic in aclocal, which can simply ignore this definition.
2495 +m4_define([_AM_AUTOCONF_VERSION], [])
2497 # AM_SET_CURRENT_AUTOMAKE_VERSION
2498 # -------------------------------
2499 -# Call AM_AUTOMAKE_VERSION so it can be traced.
2500 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
2501 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2502 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2503 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2504 - [AM_AUTOMAKE_VERSION([1.9.3])])
2506 -# AM_AUX_DIR_EXPAND
2507 +[AM_AUTOMAKE_VERSION([1.11.6])dnl
2508 +m4_ifndef([AC_AUTOCONF_VERSION],
2509 + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2510 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
2512 -# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
2513 +# AM_AUX_DIR_EXPAND -*- Autoconf -*-
2515 -# This program is free software; you can redistribute it and/or modify
2516 -# it under the terms of the GNU General Public License as published by
2517 -# the Free Software Foundation; either version 2, or (at your option)
2518 -# any later version.
2519 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
2521 +# This file is free software; the Free Software Foundation
2522 +# gives unlimited permission to copy and/or distribute it,
2523 +# with or without modifications, as long as this notice is preserved.
2525 -# This program is distributed in the hope that it will be useful,
2526 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2527 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2528 -# GNU General Public License for more details.
2530 -# You should have received a copy of the GNU General Public License
2531 -# along with this program; if not, write to the Free Software
2532 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2536 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
2537 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
2538 @@ -106,26 +114,16 @@
2539 am_aux_dir=`cd $ac_aux_dir && pwd`
2542 -# AM_CONDITIONAL -*- Autoconf -*-
2544 -# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
2545 +# AM_CONDITIONAL -*- Autoconf -*-
2547 -# This program is free software; you can redistribute it and/or modify
2548 -# it under the terms of the GNU General Public License as published by
2549 -# the Free Software Foundation; either version 2, or (at your option)
2550 -# any later version.
2552 -# This program is distributed in the hope that it will be useful,
2553 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2554 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2555 -# GNU General Public License for more details.
2557 -# You should have received a copy of the GNU General Public License
2558 -# along with this program; if not, write to the Free Software
2559 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2561 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
2562 +# Free Software Foundation, Inc.
2564 +# This file is free software; the Free Software Foundation
2565 +# gives unlimited permission to copy and/or distribute it,
2566 +# with or without modifications, as long as this notice is preserved.
2571 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
2572 # -------------------------------------
2573 @@ -134,8 +132,11 @@
2575 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
2576 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
2577 -AC_SUBST([$1_TRUE])
2578 -AC_SUBST([$1_FALSE])
2579 +AC_SUBST([$1_TRUE])dnl
2580 +AC_SUBST([$1_FALSE])dnl
2581 +_AM_SUBST_NOTMAKE([$1_TRUE])dnl
2582 +_AM_SUBST_NOTMAKE([$1_FALSE])dnl
2583 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
2587 @@ -149,26 +150,14 @@
2588 Usually this means the macro was only invoked conditionally.]])
2591 -# serial 7 -*- Autoconf -*-
2593 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
2594 -# Free Software Foundation, Inc.
2596 -# This program is free software; you can redistribute it and/or modify
2597 -# it under the terms of the GNU General Public License as published by
2598 -# the Free Software Foundation; either version 2, or (at your option)
2599 -# any later version.
2601 -# This program is distributed in the hope that it will be useful,
2602 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2603 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2604 -# GNU General Public License for more details.
2606 -# You should have received a copy of the GNU General Public License
2607 -# along with this program; if not, write to the Free Software
2608 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2610 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
2611 +# 2010, 2011 Free Software Foundation, Inc.
2613 +# This file is free software; the Free Software Foundation
2614 +# gives unlimited permission to copy and/or distribute it,
2615 +# with or without modifications, as long as this notice is preserved.
2619 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
2620 # written in clear, in which case automake, when reading aclocal.m4,
2622 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
2626 # _AM_DEPENDENCIES(NAME)
2627 # ----------------------
2628 # See how the compiler implements dependency checking.
2630 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
2631 [$1], CXX, [depcc="$CXX" am_compiler_list=],
2632 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
2633 + [$1], UPC, [depcc="$UPC" am_compiler_list=],
2634 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
2635 [depcc="$$1" am_compiler_list=])
2638 # instance it was reported that on HP-UX the gcc test will end up
2639 # making a dummy file named `D' -- because `-MD' means `put the output
2641 + rm -rf conftest.dir
2643 # Copy depcomp to subdir because otherwise we won't find it if we're
2644 # using a relative directory.
2645 @@ -225,6 +215,16 @@
2646 if test "$am_compiler_list" = ""; then
2647 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
2649 + am__universal=false
2650 + m4_case([$1], [CC],
2651 + [case " $depcc " in #(
2652 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
2655 + [case " $depcc " in #(
2656 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
2659 for depmode in $am_compiler_list; do
2660 # Setup a source with many dependencies, because some compilers
2661 # like to wrap large dependency lists on column 80 (with \), and
2662 @@ -242,7 +242,17 @@
2664 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2666 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
2667 + # mode. It turns out that the SunPro C++ compiler does not properly
2668 + # handle `-M -o', and we need to detect this. Also, some Intel
2669 + # versions had trouble with output in subdirs
2670 + am__obj=sub/conftest.${OBJEXT-o}
2671 + am__minus_obj="-o $am__obj"
2674 + # This depmode causes a compiler race in universal mode.
2675 + test "$am__universal" = false || continue
2678 # after this tag, mechanisms are not by side-effect, so they'll
2679 # only be used when explicitly requested
2680 @@ -252,18 +262,23 @@
2684 + msvc7 | msvc7msys | msvisualcpp | msvcmsys)
2685 + # This compiler won't grok `-c -o', but also, the minuso test has
2686 + # not run yet. These depmodes are late enough in the game, and
2687 + # so weak that their functioning should not be impacted.
2688 + am__obj=conftest.${OBJEXT-o}
2693 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
2694 - # mode. It turns out that the SunPro C++ compiler does not properly
2695 - # handle `-M -o', and we need to detect this.
2696 if depmode=$depmode \
2697 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
2698 + source=sub/conftest.c object=$am__obj \
2699 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
2700 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
2701 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
2702 >/dev/null 2>conftest.err &&
2703 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
2704 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
2705 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
2706 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
2707 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
2708 # icc doesn't choke on unknown options, it will just issue warnings
2709 # or remarks (even with -Werror). So we grep stderr for any message
2710 @@ -312,74 +327,79 @@
2711 if test "x$enable_dependency_tracking" != xno; then
2712 am_depcomp="$ac_aux_dir/depcomp"
2716 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
2717 -AC_SUBST([AMDEPBACKSLASH])
2718 +AC_SUBST([AMDEPBACKSLASH])dnl
2719 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
2720 +AC_SUBST([am__nodep])dnl
2721 +_AM_SUBST_NOTMAKE([am__nodep])dnl
2724 -# Generate code to set up dependency tracking. -*- Autoconf -*-
2726 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
2727 -# Free Software Foundation, Inc.
2729 -# This program is free software; you can redistribute it and/or modify
2730 -# it under the terms of the GNU General Public License as published by
2731 -# the Free Software Foundation; either version 2, or (at your option)
2732 -# any later version.
2733 +# Generate code to set up dependency tracking. -*- Autoconf -*-
2735 -# This program is distributed in the hope that it will be useful,
2736 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2737 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2738 -# GNU General Public License for more details.
2740 -# You should have received a copy of the GNU General Public License
2741 -# along with this program; if not, write to the Free Software
2742 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2744 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
2745 +# Free Software Foundation, Inc.
2747 +# This file is free software; the Free Software Foundation
2748 +# gives unlimited permission to copy and/or distribute it,
2749 +# with or without modifications, as long as this notice is preserved.
2754 # _AM_OUTPUT_DEPENDENCY_COMMANDS
2755 # ------------------------------
2756 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2757 -[for mf in $CONFIG_FILES; do
2758 - # Strip MF so we end up with the name of the file.
2759 - mf=`echo "$mf" | sed -e 's/:.*$//'`
2760 - # Check whether this is an Automake generated Makefile or not.
2761 - # We used to match only the files named `Makefile.in', but
2762 - # some people rename them; so instead we look at the file content.
2763 - # Grep'ing the first line is not enough: some people post-process
2764 - # each Makefile.in and add a new line on top of each file to say so.
2765 - # So let's grep whole file.
2766 - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
2767 - dirpart=`AS_DIRNAME("$mf")`
2771 - # Extract the definition of DEPDIR, am__include, and am__quote
2772 - # from the Makefile without running `make'.
2773 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2774 - test -z "$DEPDIR" && continue
2775 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
2776 - test -z "am__include" && continue
2777 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2778 - # When using ansi2knr, U may be empty or an underscore; expand it
2779 - U=`sed -n 's/^U = //p' < "$mf"`
2780 - # Find all dependency output files, they are included files with
2781 - # $(DEPDIR) in their names. We invoke sed twice because it is the
2782 - # simplest approach to changing $(DEPDIR) to its actual value in the
2784 - for file in `sed -n "
2785 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2786 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
2787 - # Make sure the directory exists.
2788 - test -f "$dirpart/$file" && continue
2789 - fdir=`AS_DIRNAME(["$file"])`
2790 - AS_MKDIR_P([$dirpart/$fdir])
2791 - # echo "creating $dirpart/$file"
2792 - echo '# dummy' > "$dirpart/$file"
2794 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
2795 + # are listed without --file. Let's play safe and only enable the eval
2796 + # if we detect the quoting.
2797 + case $CONFIG_FILES in
2798 + *\'*) eval set x "$CONFIG_FILES" ;;
2799 + *) set x $CONFIG_FILES ;;
2804 + # Strip MF so we end up with the name of the file.
2805 + mf=`echo "$mf" | sed -e 's/:.*$//'`
2806 + # Check whether this is an Automake generated Makefile or not.
2807 + # We used to match only the files named `Makefile.in', but
2808 + # some people rename them; so instead we look at the file content.
2809 + # Grep'ing the first line is not enough: some people post-process
2810 + # each Makefile.in and add a new line on top of each file to say so.
2811 + # Grep'ing the whole file is not good either: AIX grep has a line
2812 + # limit of 2048, but all sed's we know have understand at least 4000.
2813 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
2814 + dirpart=`AS_DIRNAME("$mf")`
2818 + # Extract the definition of DEPDIR, am__include, and am__quote
2819 + # from the Makefile without running `make'.
2820 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2821 + test -z "$DEPDIR" && continue
2822 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
2823 + test -z "am__include" && continue
2824 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2825 + # When using ansi2knr, U may be empty or an underscore; expand it
2826 + U=`sed -n 's/^U = //p' < "$mf"`
2827 + # Find all dependency output files, they are included files with
2828 + # $(DEPDIR) in their names. We invoke sed twice because it is the
2829 + # simplest approach to changing $(DEPDIR) to its actual value in the
2831 + for file in `sed -n "
2832 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2833 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
2834 + # Make sure the directory exists.
2835 + test -f "$dirpart/$file" && continue
2836 + fdir=`AS_DIRNAME(["$file"])`
2837 + AS_MKDIR_P([$dirpart/$fdir])
2838 + # echo "creating $dirpart/$file"
2839 + echo '# dummy' > "$dirpart/$file"
2844 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
2847 @@ -396,55 +416,20 @@
2848 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
2851 -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
2852 +# Do all the work for Automake. -*- Autoconf -*-
2854 -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
2856 -# This program is free software; you can redistribute it and/or modify
2857 -# it under the terms of the GNU General Public License as published by
2858 -# the Free Software Foundation; either version 2, or (at your option)
2859 -# any later version.
2861 -# This program is distributed in the hope that it will be useful,
2862 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2863 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2864 -# GNU General Public License for more details.
2866 -# You should have received a copy of the GNU General Public License
2867 -# along with this program; if not, write to the Free Software
2868 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2873 -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
2874 -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
2875 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2876 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
2878 +# This file is free software; the Free Software Foundation
2879 +# gives unlimited permission to copy and/or distribute it,
2880 +# with or without modifications, as long as this notice is preserved.
2882 -# Do all the work for Automake. -*- Autoconf -*-
2885 -# This macro actually does too much some checks are only needed if
2886 +# This macro actually does too much. Some checks are only needed if
2887 # your package does certain things. But this isn't really a big deal.
2889 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
2890 -# Free Software Foundation, Inc.
2892 -# This program is free software; you can redistribute it and/or modify
2893 -# it under the terms of the GNU General Public License as published by
2894 -# the Free Software Foundation; either version 2, or (at your option)
2895 -# any later version.
2897 -# This program is distributed in the hope that it will be useful,
2898 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2899 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2900 -# GNU General Public License for more details.
2902 -# You should have received a copy of the GNU General Public License
2903 -# along with this program; if not, write to the Free Software
2904 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2909 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
2910 # AM_INIT_AUTOMAKE([OPTIONS])
2911 # -----------------------------------------------
2912 @@ -457,16 +442,20 @@
2913 # arguments mandatory, and then we can depend on a new Autoconf
2914 # release and drop the old call support.
2915 AC_DEFUN([AM_INIT_AUTOMAKE],
2916 -[AC_PREREQ([2.58])dnl
2917 +[AC_PREREQ([2.62])dnl
2918 dnl Autoconf wants to disallow AM_ names. We explicitly allow
2919 dnl the ones we care about.
2920 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
2921 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
2922 AC_REQUIRE([AC_PROG_INSTALL])dnl
2923 -# test to see if srcdir already configured
2924 -if test "`cd $srcdir && pwd`" != "`pwd`" &&
2925 - test -f $srcdir/config.status; then
2926 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
2927 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
2928 + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2929 + # is not polluted with repeated "-I."
2930 + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
2931 + # test to see if srcdir already configured
2932 + if test -f $srcdir/config.status; then
2933 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
2937 # test whether we have cygpath
2939 AC_SUBST([PACKAGE], [$1])dnl
2940 AC_SUBST([VERSION], [$2])],
2941 [_AM_SET_OPTIONS([$1])dnl
2942 +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
2943 +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
2944 + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
2945 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
2946 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
2949 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
2950 AM_MISSING_PROG(AUTOHEADER, autoheader)
2951 AM_MISSING_PROG(MAKEINFO, makeinfo)
2953 -AM_PROG_INSTALL_STRIP
2954 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2955 +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
2956 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
2957 # We need awk for the "check" target. The system "awk" is bad on
2959 @@ -510,19 +502,36 @@
2960 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
2961 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
2962 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
2963 - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
2964 - [_AM_PROG_TAR([v7])])])
2965 + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
2966 + [_AM_PROG_TAR([v7])])])
2967 _AM_IF_OPTION([no-dependencies],,
2968 [AC_PROVIDE_IFELSE([AC_PROG_CC],
2969 - [_AM_DEPENDENCIES(CC)],
2970 - [define([AC_PROG_CC],
2971 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
2972 + [_AM_DEPENDENCIES(CC)],
2973 + [define([AC_PROG_CC],
2974 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
2975 AC_PROVIDE_IFELSE([AC_PROG_CXX],
2976 - [_AM_DEPENDENCIES(CXX)],
2977 - [define([AC_PROG_CXX],
2978 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2981 + [_AM_DEPENDENCIES(CXX)],
2982 + [define([AC_PROG_CXX],
2983 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2984 +AC_PROVIDE_IFELSE([AC_PROG_OBJC],
2985 + [_AM_DEPENDENCIES(OBJC)],
2986 + [define([AC_PROG_OBJC],
2987 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
2989 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
2990 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
2991 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
2992 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
2993 +AC_CONFIG_COMMANDS_PRE(dnl
2994 +[m4_provide_if([_AM_COMPILER_EXEEXT],
2995 + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
2998 +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
2999 +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
3000 +dnl mangled by Autoconf and run in a shell conditional statement.
3001 +m4_define([_AC_COMPILER_EXEEXT],
3002 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
3005 # When config.status generates a header, we must update the stamp-h file.
3006 @@ -534,62 +543,49 @@
3007 # our stamp files there.
3008 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
3009 [# Compute $1's index in $config_headers.
3012 for _am_header in $config_headers :; do
3015 + $_am_arg | $_am_arg:* )
3018 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
3021 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
3022 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
3024 +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
3027 +# This file is free software; the Free Software Foundation
3028 +# gives unlimited permission to copy and/or distribute it,
3029 +# with or without modifications, as long as this notice is preserved.
3033 # AM_PROG_INSTALL_SH
3034 # ------------------
3035 # Define $install_sh.
3037 -# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
3039 -# This program is free software; you can redistribute it and/or modify
3040 -# it under the terms of the GNU General Public License as published by
3041 -# the Free Software Foundation; either version 2, or (at your option)
3042 -# any later version.
3044 -# This program is distributed in the hope that it will be useful,
3045 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3046 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3047 -# GNU General Public License for more details.
3049 -# You should have received a copy of the GNU General Public License
3050 -# along with this program; if not, write to the Free Software
3051 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3054 AC_DEFUN([AM_PROG_INSTALL_SH],
3055 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3056 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
3057 +if test x"${install_sh}" != xset; then
3058 + case $am_aux_dir in
3060 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
3062 + install_sh="\${SHELL} $am_aux_dir/install-sh"
3065 AC_SUBST(install_sh)])
3068 -# Copyright (C) 2003 Free Software Foundation, Inc.
3070 -# This program is free software; you can redistribute it and/or modify
3071 -# it under the terms of the GNU General Public License as published by
3072 -# the Free Software Foundation; either version 2, or (at your option)
3073 -# any later version.
3075 -# This program is distributed in the hope that it will be useful,
3076 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3077 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3078 -# GNU General Public License for more details.
3080 -# You should have received a copy of the GNU General Public License
3081 -# along with this program; if not, write to the Free Software
3082 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3084 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
3086 +# This file is free software; the Free Software Foundation
3087 +# gives unlimited permission to copy and/or distribute it,
3088 +# with or without modifications, as long as this notice is preserved.
3093 # Check whether the underlying file-system supports filenames
3094 # with a leading dot. For instance MS-DOS doesn't.
3095 @@ -604,26 +600,15 @@
3096 rmdir .tst 2>/dev/null
3097 AC_SUBST([am__leading_dot])])
3099 -# Check to see how 'make' treats includes. -*- Autoconf -*-
3101 -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
3102 +# Check to see how 'make' treats includes. -*- Autoconf -*-
3104 -# This program is free software; you can redistribute it and/or modify
3105 -# it under the terms of the GNU General Public License as published by
3106 -# the Free Software Foundation; either version 2, or (at your option)
3107 -# any later version.
3109 -# This program is distributed in the hope that it will be useful,
3110 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3111 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3112 -# GNU General Public License for more details.
3114 -# You should have received a copy of the GNU General Public License
3115 -# along with this program; if not, write to the Free Software
3116 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3118 +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
3120 +# This file is free software; the Free Software Foundation
3121 +# gives unlimited permission to copy and/or distribute it,
3122 +# with or without modifications, as long as this notice is preserved.
3130 [am_make=${MAKE-make}
3131 cat > confinc << 'END'
3134 + @echo this is the am__doit target
3137 # If we don't find an include directive, just comment out the code.
3138 @@ -642,24 +627,24 @@
3140 # First try GNU make style include.
3141 echo "include confinc" > confmf
3142 -# We grep out `Entering directory' and `Leaving directory'
3143 -# messages which can occur if `w' ends up in MAKEFLAGS.
3144 -# In particular we don't look at `^make:' because GNU make might
3145 -# be invoked under some other name (usually "gmake"), in which
3146 -# case it prints its new name instead of `make'.
3147 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
3148 - am__include=include
3152 +# Ignore all kinds of additional output from `make'.
3153 +case `$am_make -s -f confmf 2> /dev/null` in #(
3154 +*the\ am__doit\ target*)
3155 + am__include=include
3160 # Now try BSD make style include.
3161 if test "$am__include" = "#"; then
3162 echo '.include "confinc"' > confmf
3163 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
3164 - am__include=.include
3168 + case `$am_make -s -f confmf 2> /dev/null` in #(
3169 + *the\ am__doit\ target*)
3170 + am__include=.include
3176 AC_SUBST([am__include])
3177 AC_SUBST([am__quote])
3178 @@ -667,27 +652,16 @@
3179 rm -f confinc confmf
3183 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
3185 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
3186 +# Free Software Foundation, Inc.
3188 +# This file is free software; the Free Software Foundation
3189 +# gives unlimited permission to copy and/or distribute it,
3190 +# with or without modifications, as long as this notice is preserved.
3192 -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
3194 -# This program is free software; you can redistribute it and/or modify
3195 -# it under the terms of the GNU General Public License as published by
3196 -# the Free Software Foundation; either version 2, or (at your option)
3197 -# any later version.
3199 -# This program is distributed in the hope that it will be useful,
3200 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3201 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3202 -# GNU General Public License for more details.
3204 -# You should have received a copy of the GNU General Public License
3205 -# along with this program; if not, write to the Free Software
3206 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3212 # AM_MISSING_PROG(NAME, PROGRAM)
3213 # ------------------------------
3214 @@ -703,7 +677,15 @@
3215 # If it does, set am_missing_run to use it, otherwise, to nothing.
3216 AC_DEFUN([AM_MISSING_HAS_RUN],
3217 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3218 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
3219 +AC_REQUIRE_AUX_FILE([missing])dnl
3220 +if test x"${MISSING+set}" != xset; then
3221 + case $am_aux_dir in
3223 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
3225 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
3228 # Use eval to expand $SHELL
3229 if eval "$MISSING --run true"; then
3230 am_missing_run="$MISSING --run "
3231 @@ -713,100 +695,45 @@
3237 -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
3239 -# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
3240 +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
3243 +# This file is free software; the Free Software Foundation
3244 +# gives unlimited permission to copy and/or distribute it,
3245 +# with or without modifications, as long as this notice is preserved.
3247 -# This program is free software; you can redistribute it and/or modify
3248 -# it under the terms of the GNU General Public License as published by
3249 -# the Free Software Foundation; either version 2, or (at your option)
3250 -# any later version.
3253 -# This program is distributed in the hope that it will be useful,
3254 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3255 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3256 -# GNU General Public License for more details.
3258 -# You should have received a copy of the GNU General Public License
3259 -# along with this program; if not, write to the Free Software
3260 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3263 -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
3264 -# created by `make install' are always world readable, even if the
3265 -# installer happens to have an overly restrictive umask (e.g. 077).
3266 -# This was a mistake. There are at least two reasons why we must not
3268 -# - it causes special bits like SGID to be ignored,
3269 -# - it may be too restrictive (some setups expect 775 directories).
3271 -# Do not use -m 0755 and let people choose whatever they expect by
3274 -# We cannot accept any implementation of `mkdir' that recognizes `-p'.
3275 -# Some implementations (such as Solaris 8's) are not thread-safe: if a
3276 -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
3277 -# concurrently, both version can detect that a/ is missing, but only
3278 -# one can create it and the other will error out. Consequently we
3279 -# restrict ourselves to GNU make (using the --version option ensures
3283 +# Check for `mkdir -p'.
3284 AC_DEFUN([AM_PROG_MKDIR_P],
3285 -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
3286 - # We used to keeping the `.' as first argument, in order to
3287 - # allow $(mkdir_p) to be used without argument. As in
3288 - # $(mkdir_p) $(somedir)
3289 - # where $(somedir) is conditionally defined. However this is wrong
3290 - # for two reasons:
3291 - # 1. if the package is installed by a user who cannot write `.'
3292 - # make install will fail,
3293 - # 2. the above comment should most certainly read
3294 - # $(mkdir_p) $(DESTDIR)$(somedir)
3295 - # so it does not work when $(somedir) is undefined and
3296 - # $(DESTDIR) is not.
3297 - # To support the latter case, we have to write
3298 - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
3299 - # so the `.' trick is pointless.
3300 - mkdir_p='mkdir -p --'
3302 - # On NextStep and OpenStep, the `mkdir' command does not
3303 - # recognize any option. It will interpret all options as
3304 - # directories to create, and then abort because `.' already
3306 - for d in ./-p ./--version;
3308 - test -d $d && rmdir $d
3310 - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
3311 - if test -f "$ac_aux_dir/mkinstalldirs"; then
3312 - mkdir_p='$(mkinstalldirs)'
3314 - mkdir_p='$(install_sh) -d'
3317 -AC_SUBST([mkdir_p])])
3319 -# Helper functions for option handling. -*- Autoconf -*-
3321 -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
3322 +[AC_PREREQ([2.60])dnl
3323 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
3324 +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
3325 +dnl while keeping a definition of mkdir_p for backward compatibility.
3326 +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
3327 +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
3328 +dnl Makefile.ins that do not define MKDIR_P, so we do our own
3329 +dnl adjustment using top_builddir (which is defined more often than
3331 +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
3333 + [[\\/$]]* | ?:[[\\/]]*) ;;
3334 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3338 -# This program is free software; you can redistribute it and/or modify
3339 -# it under the terms of the GNU General Public License as published by
3340 -# the Free Software Foundation; either version 2, or (at your option)
3341 -# any later version.
3342 +# Helper functions for option handling. -*- Autoconf -*-
3344 -# This program is distributed in the hope that it will be useful,
3345 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3346 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3347 -# GNU General Public License for more details.
3349 -# You should have received a copy of the GNU General Public License
3350 -# along with this program; if not, write to the Free Software
3351 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3353 +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
3356 +# This file is free software; the Free Software Foundation
3357 +# gives unlimited permission to copy and/or distribute it,
3358 +# with or without modifications, as long as this notice is preserved.
3363 # _AM_MANGLE_OPTION(NAME)
3364 # -----------------------
3365 @@ -814,16 +741,16 @@
3366 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
3368 # _AM_SET_OPTION(NAME)
3369 -# ------------------------------
3370 +# --------------------
3371 # Set option NAME. Presently that only means defining a flag for this option.
3372 AC_DEFUN([_AM_SET_OPTION],
3373 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
3375 # _AM_SET_OPTIONS(OPTIONS)
3376 -# ----------------------------------
3377 +# ------------------------
3378 # OPTIONS is a space-separated list of Automake options.
3379 AC_DEFUN([_AM_SET_OPTIONS],
3380 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
3381 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
3383 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
3384 # -------------------------------------------
3385 @@ -831,29 +758,19 @@
3386 AC_DEFUN([_AM_IF_OPTION],
3387 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
3390 -# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
3391 +# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
3392 # Free Software Foundation, Inc.
3394 +# This file is free software; the Free Software Foundation
3395 +# gives unlimited permission to copy and/or distribute it,
3396 +# with or without modifications, as long as this notice is preserved.
3398 -# This program is free software; you can redistribute it and/or modify
3399 -# it under the terms of the GNU General Public License as published by
3400 -# the Free Software Foundation; either version 2, or (at your option)
3401 -# any later version.
3403 -# This program is distributed in the hope that it will be useful,
3404 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3405 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3406 -# GNU General Public License for more details.
3408 -# You should have received a copy of the GNU General Public License
3409 -# along with this program; if not, write to the Free Software
3410 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3416 AC_DEFUN([AM_C_PROTOTYPES],
3417 [AC_REQUIRE([AC_C_PROTOTYPES])
3418 +AC_DIAGNOSE([obsolete],
3419 + [$0: automatic de-ANSI-fication support is deprecated])
3420 if test "$ac_cv_prog_cc_stdc" != no; then
3423 @@ -861,35 +778,24 @@
3425 # Ensure some checks needed by ansi2knr itself.
3426 AC_REQUIRE([AC_HEADER_STDC])
3427 -AC_CHECK_HEADERS(string.h)
3429 -AC_SUBST(ANSI2KNR)dnl
3430 +AC_CHECK_HEADERS([string.h])
3432 +AC_SUBST([ANSI2KNR])dnl
3433 +_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
3436 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
3439 -# Check to make sure that the build environment is sane.
3442 -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
3443 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
3445 -# This program is free software; you can redistribute it and/or modify
3446 -# it under the terms of the GNU General Public License as published by
3447 -# the Free Software Foundation; either version 2, or (at your option)
3448 -# any later version.
3450 -# This program is distributed in the hope that it will be useful,
3451 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3452 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3453 -# GNU General Public License for more details.
3455 -# You should have received a copy of the GNU General Public License
3456 -# along with this program; if not, write to the Free Software
3457 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3459 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
3460 +# Free Software Foundation, Inc.
3462 +# This file is free software; the Free Software Foundation
3463 +# gives unlimited permission to copy and/or distribute it,
3464 +# with or without modifications, as long as this notice is preserved.
3471 @@ -898,16 +804,29 @@
3474 echo timestamp > conftest.file
3475 +# Reject unsafe characters in $srcdir or the absolute working directory
3476 +# name. Accept space and tab only in the latter.
3480 + *[[\\\"\#\$\&\'\`$am_lf]]*)
3481 + AC_MSG_ERROR([unsafe absolute working directory name]);;
3484 + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
3485 + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
3488 # Do `set' in a subshell so we don't clobber the current shell's
3489 # arguments. Must try -L first in case configure is actually a
3490 # symlink; some systems play weird games with the mod time of symlinks
3491 # (eg FreeBSD returns the mod time of the symlink's containing
3494 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
3495 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3496 if test "$[*]" = "X"; then
3498 - set X `ls -t $srcdir/configure conftest.file`
3499 + set X `ls -t "$srcdir/configure" conftest.file`
3502 if test "$[*]" != "X $srcdir/configure conftest.file" \
3503 @@ -932,25 +851,16 @@
3505 AC_MSG_RESULT(yes)])
3507 -# AM_PROG_INSTALL_STRIP
3509 -# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
3511 -# This program is free software; you can redistribute it and/or modify
3512 -# it under the terms of the GNU General Public License as published by
3513 -# the Free Software Foundation; either version 2, or (at your option)
3514 -# any later version.
3515 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
3517 +# This file is free software; the Free Software Foundation
3518 +# gives unlimited permission to copy and/or distribute it,
3519 +# with or without modifications, as long as this notice is preserved.
3521 -# This program is distributed in the hope that it will be useful,
3522 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3523 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3524 -# GNU General Public License for more details.
3526 -# You should have received a copy of the GNU General Public License
3527 -# along with this program; if not, write to the Free Software
3528 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3532 +# AM_PROG_INSTALL_STRIP
3533 +# ---------------------
3534 # One issue with vendor `install' (even GNU) is that you can't
3535 # specify the program used to strip binaries. This is especially
3536 # annoying in cross-compiling environments, where the build's strip
3537 @@ -968,30 +878,37 @@
3538 if test "$cross_compiling" != no; then
3539 AC_CHECK_TOOL([STRIP], [strip], :)
3541 -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
3542 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3543 AC_SUBST([INSTALL_STRIP_PROGRAM])])
3545 -# Check how to create a tarball. -*- Autoconf -*-
3546 +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
3548 +# This file is free software; the Free Software Foundation
3549 +# gives unlimited permission to copy and/or distribute it,
3550 +# with or without modifications, as long as this notice is preserved.
3552 -# Copyright (C) 2004 Free Software Foundation, Inc.
3555 -# This program is free software; you can redistribute it and/or modify
3556 -# it under the terms of the GNU General Public License as published by
3557 -# the Free Software Foundation; either version 2, or (at your option)
3558 -# any later version.
3559 +# _AM_SUBST_NOTMAKE(VARIABLE)
3560 +# ---------------------------
3561 +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
3562 +# This macro is traced by Automake.
3563 +AC_DEFUN([_AM_SUBST_NOTMAKE])
3565 +# AM_SUBST_NOTMAKE(VARIABLE)
3566 +# --------------------------
3567 +# Public sister of _AM_SUBST_NOTMAKE.
3568 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
3570 -# This program is distributed in the hope that it will be useful,
3571 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
3572 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3573 -# GNU General Public License for more details.
3575 -# You should have received a copy of the GNU General Public License
3576 -# along with this program; if not, write to the Free Software
3577 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3579 +# Check how to create a tarball. -*- Autoconf -*-
3582 +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
3584 +# This file is free software; the Free Software Foundation
3585 +# gives unlimited permission to copy and/or distribute it,
3586 +# with or without modifications, as long as this notice is preserved.
3590 # _AM_PROG_TAR(FORMAT)
3591 # --------------------
3592 @@ -1007,10 +924,11 @@
3593 # a tarball read from stdin.
3594 # $(am__untar) < result.tar
3595 AC_DEFUN([_AM_PROG_TAR],
3596 -[# Always define AMTAR for backward compatibility.
3597 -AM_MISSING_PROG([AMTAR], [tar])
3598 +[# Always define AMTAR for backward compatibility. Yes, it's still used
3599 +# in the wild :-( We should find a proper way to deprecate it ...
3600 +AC_SUBST([AMTAR], ['$${TAR-tar}'])
3602 - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
3603 + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
3604 [m4_case([$1], [ustar],, [pax],,
3605 [m4_fatal([Unknown tar format])])
3606 AC_MSG_CHECKING([how to create a $1 tar archive])
3607 @@ -1079,32 +997,13 @@
3608 AC_SUBST([am__untar])
3611 -m4_include([m4/codeset.m4])
3612 m4_include([m4/gettext.m4])
3613 -m4_include([m4/glibc2.m4])
3614 -m4_include([m4/glibc21.m4])
3615 m4_include([m4/iconv.m4])
3616 -m4_include([m4/intdiv0.m4])
3617 -m4_include([m4/intmax.m4])
3618 -m4_include([m4/inttypes-pri.m4])
3619 -m4_include([m4/inttypes.m4])
3620 -m4_include([m4/inttypes_h.m4])
3621 -m4_include([m4/lcmessage.m4])
3622 +m4_include([m4/intlmacosx.m4])
3623 m4_include([m4/lib-ld.m4])
3624 m4_include([m4/lib-link.m4])
3625 m4_include([m4/lib-prefix.m4])
3626 -m4_include([m4/longdouble.m4])
3627 -m4_include([m4/longlong.m4])
3628 m4_include([m4/nls.m4])
3629 m4_include([m4/po.m4])
3630 -m4_include([m4/printf-posix.m4])
3631 m4_include([m4/progtest.m4])
3632 -m4_include([m4/signed.m4])
3633 -m4_include([m4/size_max.m4])
3634 -m4_include([m4/stdint_h.m4])
3635 -m4_include([m4/uintmax_t.m4])
3636 -m4_include([m4/ulonglong.m4])
3637 -m4_include([m4/wchar_t.m4])
3638 -m4_include([m4/wint_t.m4])
3639 -m4_include([m4/xsize.m4])
3640 m4_include([acinclude.m4])
3641 diff -urN BUILD/abook-0.6.0pre2/AUTHORS abook/AUTHORS
3642 --- BUILD/abook-0.6.0pre2/AUTHORS 2006-08-30 12:32:15.000000000 +0200
3643 +++ abook/AUTHORS 2013-03-13 15:07:45.000000000 +0100
3645 - palmcsv export filter
3648 +Michael Krolikowski <mkroli@yahoo.de>
3649 + - built-in vcard import filter
3651 +Raphaƫl Droz <raphael.droz+floss@gmail.com>
3652 + - custom output format
3653 + - reworked ldif input/output
3654 + - vcard import filter through libvformat
3657 +Thorsten WiĆmann <edu@thorsten-wissmann.de>
3661 +Fabio Zanini <fabio.zanini@fastmail.fm>
3663 + - duplicated entries removal
3666 diff -urN BUILD/abook-0.6.0pre2/ChangeLog abook/ChangeLog
3667 --- BUILD/abook-0.6.0pre2/ChangeLog 2006-09-06 15:22:53.000000000 +0200
3668 +++ abook/ChangeLog 2013-03-13 15:07:45.000000000 +0100
3671 + - custom output format (Raphaƫl Droz)
3672 + - remove duplicates (Fabio Zanini)
3673 + - merge entries (Fabio Zanini)
3674 + - mutt groups support (Fabio Zanini)
3675 + - vcard initial input filter (Michael Krolikowski)
3676 + - vcard parser improvements (Fabio Zanini, Raphaƫl Droz)
3677 + - color support (Thorsten WiĆmann)
3678 + - mouse support (Thorsten WiĆmann)
3679 + - extra-fields deletion bugfix (Jorrit Tijben)
3680 + - additinal keybinding (Hagen Fuchs)
3681 + - autotools update (Fabio Zanini)
3682 + - case-sensitive ldif fields parsing (Christian Brabandt)
3683 + - ldif standard input support (Raphaƫl Droz)
3684 + - ldif extensible field management rewritting (Raphaƫl Droz)
3687 - configurable views (Cedric Duval)
3688 - new field types, lists and improved custom field support (Cedric Duval)
3689 - index_format option (Cedric Duval)
3690 - Italian translation (Claudio Stazzone)
3691 - - BSD calendar export filter (Guillem Jover)
3692 - - translation updates
3697 diff -urN BUILD/abook-0.6.0pre2/color.h abook/color.h
3698 --- BUILD/abook-0.6.0pre2/color.h 1970-01-01 01:00:00.000000000 +0100
3699 +++ abook/color.h 2013-03-13 15:07:45.000000000 +0100
3702 +#ifndef __ABOOK_COLORS_H_
3703 +#define __ABOOK_COLORS_H_
3705 +#define COLOR_DEFAULT -1
3713 + CP_LIST_HIGHLIGHT,
3722 diff -urN BUILD/abook-0.6.0pre2/config.guess abook/config.guess
3723 --- BUILD/abook-0.6.0pre2/config.guess 2006-08-04 22:18:23.000000000 +0200
3724 +++ abook/config.guess 2013-03-13 15:07:45.000000000 +0100
3727 # Attempt to guess a canonical system name.
3728 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3729 -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
3730 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
3731 +# 2011, 2012 Free Software Foundation, Inc.
3733 -timestamp='2006-02-23'
3734 +timestamp='2012-09-25'
3736 # This file is free software; you can redistribute it and/or modify it
3737 # under the terms of the GNU General Public License as published by
3739 # General Public License for more details.
3741 # You should have received a copy of the GNU General Public License
3742 -# along with this program; if not, write to the Free Software
3743 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
3745 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
3747 # As a special exception to the GNU General Public License, if you
3748 # distribute this file as part of a program that contains a
3750 # the same distribution terms that you use for the rest of that program.
3753 -# Originally written by Per Bothner <per@bothner.com>.
3754 -# Please send patches to <config-patches@gnu.org>. Submit a context
3755 -# diff and a properly formatted ChangeLog entry.
3756 +# Originally written by Per Bothner. Please send patches (context
3757 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
3760 # This script attempts to guess a canonical system name similar to
3761 # config.sub. If it succeeds, it prints the system name on stdout, and
3762 # exits with 0. Otherwise, it exits with 1.
3764 -# The plan is that this can be called by configure scripts if you
3765 -# don't specify an explicit build system type.
3766 +# You can get the latest version of this script from:
3767 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
3769 me=`echo "$0" | sed -e 's,.*/,,'`
3772 GNU config.guess ($timestamp)
3774 Originally written by Per Bothner.
3775 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
3776 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
3777 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
3778 Free Software Foundation, Inc.
3780 This is free software; see the source for copying conditions. There is NO
3781 @@ -138,12 +138,35 @@
3782 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
3783 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
3785 +case "${UNAME_SYSTEM}" in
3787 + eval $set_cc_for_build
3788 + cat <<-EOF > $dummy.c
3789 + #include <features.h>
3791 + # ifdef __UCLIBC_CONFIG_VERSION__
3792 + LIBC=uclibc __UCLIBC_CONFIG_VERSION__
3797 + # ifdef __dietlibc__
3804 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
3808 # Note: order is significant - the case branches are not exclusive.
3810 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3812 # NetBSD (nbsd) targets should (where applicable) match one or
3813 - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
3814 + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
3815 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
3816 # switched to ELF, *-*-netbsd* would select the old
3817 # object file format. This provides both forward
3819 arm*) machine=arm-unknown ;;
3820 sh3el) machine=shl-unknown ;;
3821 sh3eb) machine=sh-unknown ;;
3822 + sh5el) machine=sh5le-unknown ;;
3823 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
3825 # The Operating System including object format, if it has switched
3827 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
3828 eval $set_cc_for_build
3829 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
3830 - | grep __ELF__ >/dev/null
3833 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
3834 # Return netbsd for either. FIX?
3844 @@ -199,6 +223,10 @@
3845 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
3846 echo "${machine}-${os}${release}"
3849 + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
3850 + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
3853 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
3854 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
3856 echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
3859 - echo powerppc-unknown-mirbsd${UNAME_RELEASE}
3860 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
3863 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
3865 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
3868 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
3869 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
3872 # According to Compaq, /usr/sbin/psrinfo has been available on
3873 @@ -267,7 +295,10 @@
3874 # A Xn.n version is an unreleased experimental baselevel.
3875 # 1.2 uses "1.2" for uname -r.
3876 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
3878 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
3882 Alpha\ *:Windows_NT*:*)
3883 # How do we know it's Interix rather than the generic POSIX subsystem?
3884 # Should we change UNAME_MACHINE based on the output of uname instead
3885 @@ -293,12 +324,12 @@
3889 - echo powerpc-ibm-os400
3890 + echo powerpc-ibm-os400
3892 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
3893 echo arm-acorn-riscix${UNAME_RELEASE}
3895 - arm:riscos:*:*|arm:RISCOS:*:*)
3896 + arm*:riscos:*:*|arm*:RISCOS:*:*)
3897 echo arm-unknown-riscos
3899 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
3900 @@ -322,14 +353,33 @@
3901 case `/usr/bin/uname -p` in
3902 sparc) echo sparc-icl-nx7; exit ;;
3905 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3908 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3910 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
3911 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3913 - i86pc:SunOS:5.*:*)
3914 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3915 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
3916 + echo i386-pc-auroraux${UNAME_RELEASE}
3918 + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
3919 + eval $set_cc_for_build
3921 + # If there is a compiler, see if it is configured for 64-bit objects.
3922 + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
3923 + # This test works for both compilers.
3924 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
3925 + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
3926 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
3927 + grep IS_64BIT_ARCH >/dev/null
3932 + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3935 # According to config.sub, this is the proper way to canonicalize
3936 @@ -373,23 +423,23 @@
3937 # MiNT. But MiNT is downward compatible to TOS, so this should
3939 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
3940 - echo m68k-atari-mint${UNAME_RELEASE}
3941 + echo m68k-atari-mint${UNAME_RELEASE}
3943 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
3944 echo m68k-atari-mint${UNAME_RELEASE}
3947 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
3948 - echo m68k-atari-mint${UNAME_RELEASE}
3949 + echo m68k-atari-mint${UNAME_RELEASE}
3951 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
3952 - echo m68k-milan-mint${UNAME_RELEASE}
3954 + echo m68k-milan-mint${UNAME_RELEASE}
3956 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
3957 - echo m68k-hades-mint${UNAME_RELEASE}
3959 + echo m68k-hades-mint${UNAME_RELEASE}
3961 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
3962 - echo m68k-unknown-mint${UNAME_RELEASE}
3964 + echo m68k-unknown-mint${UNAME_RELEASE}
3967 echo m68k-apple-machten${UNAME_RELEASE}
3970 echo m88k-motorola-sysv3
3973 - # DG/UX returns AViiON for all architectures
3974 - UNAME_PROCESSOR=`/usr/bin/uname -p`
3975 + # DG/UX returns AViiON for all architectures
3976 + UNAME_PROCESSOR=`/usr/bin/uname -p`
3977 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
3979 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
3982 echo i586-dg-dgux${UNAME_RELEASE}
3986 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
3987 echo m88k-dolphin-sysv3
3990 echo rs6000-ibm-aix3.2
3995 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
3996 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
3998 @@ -573,52 +623,52 @@
3999 9000/[678][0-9][0-9])
4000 if [ -x /usr/bin/getconf ]; then
4001 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
4002 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
4003 - case "${sc_cpu_version}" in
4004 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
4005 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
4006 - 532) # CPU_PA_RISC2_0
4007 - case "${sc_kernel_bits}" in
4008 - 32) HP_ARCH="hppa2.0n" ;;
4009 - 64) HP_ARCH="hppa2.0w" ;;
4010 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
4011 + case "${sc_cpu_version}" in
4012 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
4013 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
4014 + 532) # CPU_PA_RISC2_0
4015 + case "${sc_kernel_bits}" in
4016 + 32) HP_ARCH="hppa2.0n" ;;
4017 + 64) HP_ARCH="hppa2.0w" ;;
4018 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
4024 if [ "${HP_ARCH}" = "" ]; then
4025 eval $set_cc_for_build
4026 - sed 's/^ //' << EOF >$dummy.c
4027 + sed 's/^ //' << EOF >$dummy.c
4029 - #define _HPUX_SOURCE
4030 - #include <stdlib.h>
4031 - #include <unistd.h>
4035 - #if defined(_SC_KERNEL_BITS)
4036 - long bits = sysconf(_SC_KERNEL_BITS);
4038 - long cpu = sysconf (_SC_CPU_VERSION);
4042 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
4043 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
4044 - case CPU_PA_RISC2_0:
4045 - #if defined(_SC_KERNEL_BITS)
4048 - case 64: puts ("hppa2.0w"); break;
4049 - case 32: puts ("hppa2.0n"); break;
4050 - default: puts ("hppa2.0"); break;
4052 - #else /* !defined(_SC_KERNEL_BITS) */
4053 - puts ("hppa2.0"); break;
4055 - default: puts ("hppa1.0"); break;
4059 + #define _HPUX_SOURCE
4060 + #include <stdlib.h>
4061 + #include <unistd.h>
4065 + #if defined(_SC_KERNEL_BITS)
4066 + long bits = sysconf(_SC_KERNEL_BITS);
4068 + long cpu = sysconf (_SC_CPU_VERSION);
4072 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
4073 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
4074 + case CPU_PA_RISC2_0:
4075 + #if defined(_SC_KERNEL_BITS)
4078 + case 64: puts ("hppa2.0w"); break;
4079 + case 32: puts ("hppa2.0n"); break;
4080 + default: puts ("hppa2.0"); break;
4082 + #else /* !defined(_SC_KERNEL_BITS) */
4083 + puts ("hppa2.0"); break;
4085 + default: puts ("hppa1.0"); break;
4090 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
4091 test -z "$HP_ARCH" && HP_ARCH=hppa
4093 # => hppa64-hp-hpux11.23
4095 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
4096 - grep __LP64__ >/dev/null
4101 @@ -709,22 +759,22 @@
4103 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
4107 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
4108 if getsysinfo -f scalar_acc
4109 then echo c32-convex-bsd
4110 else echo c2-convex-bsd
4114 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
4118 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
4122 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
4127 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
4129 @@ -748,14 +798,14 @@
4131 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
4132 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
4133 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
4134 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
4135 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
4137 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
4138 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
4139 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
4141 5000:UNIX_System_V:4.*:*)
4142 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
4143 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
4144 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
4145 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
4146 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
4147 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
4149 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
4150 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
4151 @@ -767,38 +817,51 @@
4152 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
4155 - case ${UNAME_MACHINE} in
4157 - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
4158 + UNAME_PROCESSOR=`/usr/bin/uname -p`
4159 + case ${UNAME_PROCESSOR} in
4161 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
4163 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
4164 + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
4168 echo ${UNAME_MACHINE}-pc-cygwin
4171 - echo ${UNAME_MACHINE}-pc-mingw32
4173 + echo ${UNAME_MACHINE}-pc-mingw64
4177 echo ${UNAME_MACHINE}-pc-mingw32
4180 + echo ${UNAME_MACHINE}-pc-msys
4183 - # uname -m includes "-pc" on this system.
4184 - echo ${UNAME_MACHINE}-mingw32
4185 + # uname -m includes "-pc" on this system.
4186 + echo ${UNAME_MACHINE}-mingw32
4189 echo ${UNAME_MACHINE}-pc-pw32
4191 - x86:Interix*:[345]*)
4192 - echo i586-pc-interix${UNAME_RELEASE}
4194 - EM64T:Interix*:[345]*)
4195 - echo x86_64-unknown-interix${UNAME_RELEASE}
4198 + case ${UNAME_MACHINE} in
4200 + echo i586-pc-interix${UNAME_RELEASE}
4202 + authenticamd | genuineintel | EM64T)
4203 + echo x86_64-unknown-interix${UNAME_RELEASE}
4206 + echo ia64-unknown-interix${UNAME_RELEASE}
4209 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
4210 echo i${UNAME_MACHINE}-pc-mks
4212 + 8664:Windows_NT:*)
4213 + echo x86_64-pc-mks
4215 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
4216 # How do we know it's Interix rather than the generic POSIX subsystem?
4217 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
4218 @@ -819,197 +882,145 @@
4222 - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
4223 + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
4226 # other systems with GNU libc and userland
4227 - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
4228 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
4231 echo ${UNAME_MACHINE}-pc-minix
4233 + aarch64:Linux:*:*)
4234 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4236 + aarch64_be:Linux:*:*)
4237 + UNAME_MACHINE=aarch64_be
4238 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4241 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
4242 + EV5) UNAME_MACHINE=alphaev5 ;;
4243 + EV56) UNAME_MACHINE=alphaev56 ;;
4244 + PCA56) UNAME_MACHINE=alphapca56 ;;
4245 + PCA57) UNAME_MACHINE=alphapca56 ;;
4246 + EV6) UNAME_MACHINE=alphaev6 ;;
4247 + EV67) UNAME_MACHINE=alphaev67 ;;
4248 + EV68*) UNAME_MACHINE=alphaev68 ;;
4250 + objdump --private-headers /bin/sh | grep -q ld.so.1
4251 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
4252 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4255 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4256 + eval $set_cc_for_build
4257 + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
4258 + | grep -q __ARM_EABI__
4260 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4262 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
4263 + | grep -q __ARM_PCS_VFP
4265 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
4267 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
4272 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4275 - echo cris-axis-linux-gnu
4276 + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
4279 - echo crisv32-axis-linux-gnu
4280 + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
4283 - echo frv-unknown-linux-gnu
4284 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4286 + hexagon:Linux:*:*)
4287 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4290 + echo ${UNAME_MACHINE}-pc-linux-${LIBC}
4293 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4294 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4297 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4298 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4301 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4302 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4305 + mips:Linux:*:* | mips64:Linux:*:*)
4306 eval $set_cc_for_build
4307 sed 's/^ //' << EOF >$dummy.c
4311 + #undef ${UNAME_MACHINE}
4312 + #undef ${UNAME_MACHINE}el
4313 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
4315 + CPU=${UNAME_MACHINE}el
4317 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
4319 + CPU=${UNAME_MACHINE}
4325 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
4330 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
4333 - eval $set_cc_for_build
4334 - sed 's/^ //' << EOF >$dummy.c
4338 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
4341 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
4348 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
4353 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
4354 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
4355 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
4358 - echo or32-unknown-linux-gnu
4359 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4362 - echo powerpc-unknown-linux-gnu
4364 + echo sparc-unknown-linux-${LIBC}
4367 - echo powerpc64-unknown-linux-gnu
4370 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
4371 - EV5) UNAME_MACHINE=alphaev5 ;;
4372 - EV56) UNAME_MACHINE=alphaev56 ;;
4373 - PCA56) UNAME_MACHINE=alphapca56 ;;
4374 - PCA57) UNAME_MACHINE=alphapca56 ;;
4375 - EV6) UNAME_MACHINE=alphaev6 ;;
4376 - EV67) UNAME_MACHINE=alphaev67 ;;
4377 - EV68*) UNAME_MACHINE=alphaev68 ;;
4379 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
4380 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
4381 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
4382 + parisc64:Linux:*:* | hppa64:Linux:*:*)
4383 + echo hppa64-unknown-linux-${LIBC}
4385 parisc:Linux:*:* | hppa:Linux:*:*)
4386 # Look for CPU level
4387 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
4388 - PA7*) echo hppa1.1-unknown-linux-gnu ;;
4389 - PA8*) echo hppa2.0-unknown-linux-gnu ;;
4390 - *) echo hppa-unknown-linux-gnu ;;
4391 + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
4392 + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
4393 + *) echo hppa-unknown-linux-${LIBC} ;;
4396 - parisc64:Linux:*:* | hppa64:Linux:*:*)
4397 - echo hppa64-unknown-linux-gnu
4399 + echo powerpc64-unknown-linux-${LIBC}
4402 + echo powerpc-unknown-linux-${LIBC}
4404 s390:Linux:*:* | s390x:Linux:*:*)
4405 echo ${UNAME_MACHINE}-ibm-linux
4408 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4409 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4412 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4413 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4415 sparc:Linux:*:* | sparc64:Linux:*:*)
4416 - echo ${UNAME_MACHINE}-unknown-linux-gnu
4417 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4420 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4423 - echo ${UNAME_MACHINE}-dec-linux-gnu
4424 + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
4427 - echo x86_64-unknown-linux-gnu
4428 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4430 + xtensa*:Linux:*:*)
4431 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4434 - # The BFD linker knows what the default object file format is, so
4435 - # first see if it will tell us. cd to the root directory to prevent
4436 - # problems with other programs or directories called `ld' in the path.
4437 - # Set LC_ALL=C to ensure ld outputs messages in English.
4438 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
4439 - | sed -ne '/supported targets:/!d
4441 - s/.*supported targets: *//
4444 - case "$ld_supported_targets" in
4446 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
4449 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
4452 - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
4455 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
4456 - # one that does not give us useful --help.
4457 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
4460 - # Determine whether the default compiler is a.out or elf
4461 - eval $set_cc_for_build
4462 - sed 's/^ //' << EOF >$dummy.c
4463 - #include <features.h>
4466 - # if __GLIBC__ >= 2
4475 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
4481 - #ifdef __dietlibc__
4485 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
4490 - test x"${LIBC}" != x && {
4491 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
4494 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
4496 i*86:DYNIX/ptx:4*:*)
4497 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
4498 # earlier versions are messed up and put the nodename in both
4499 @@ -1017,11 +1028,11 @@
4500 echo i386-sequent-sysv4
4502 i*86:UNIX_SV:4.2MP:2.*)
4503 - # Unixware is an offshoot of SVR4, but it has its own version
4504 - # number series starting with 2...
4505 - # I am not positive that other SVR4 systems won't match this,
4506 + # Unixware is an offshoot of SVR4, but it has its own version
4507 + # number series starting with 2...
4508 + # I am not positive that other SVR4 systems won't match this,
4509 # I just have to hope. -- rms.
4510 - # Use sysv4.2uw... so that sysv4* matches it.
4511 + # Use sysv4.2uw... so that sysv4* matches it.
4512 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
4515 @@ -1038,7 +1049,7 @@
4517 echo ${UNAME_MACHINE}-pc-syllable
4519 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
4520 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
4521 echo i386-unknown-lynxos${UNAME_RELEASE}
4524 @@ -1053,7 +1064,7 @@
4528 - # UnixWare 7.x, OpenUNIX and OpenServer 6.
4529 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
4530 case `/bin/uname -X | grep "^Machine"` in
4531 *486*) UNAME_MACHINE=i486 ;;
4532 *Pentium) UNAME_MACHINE=i586 ;;
4533 @@ -1081,10 +1092,13 @@
4536 # Left here for compatibility:
4537 - # uname -m prints for DJGPP always 'pc', but it prints nothing about
4538 - # the processor, so we play safe by assuming i386.
4539 - echo i386-pc-msdosdjgpp
4541 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
4542 + # the processor, so we play safe by assuming i586.
4543 + # Note: whatever this is, it MUST be the same as what config.sub
4544 + # prints for the "djgpp" host, or else GDB configury will decide that
4545 + # this is a cross-build.
4546 + echo i586-pc-msdosdjgpp
4551 @@ -1119,8 +1133,18 @@
4552 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
4553 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
4554 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
4555 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
4556 - && { echo i486-ncr-sysv4; exit; } ;;
4557 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
4558 + && { echo i486-ncr-sysv4; exit; } ;;
4559 + NCR*:*:4.2:* | MPRAS*:*:4.2:*)
4561 + test -r /etc/.relid \
4562 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
4563 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
4564 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
4565 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
4566 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
4567 + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
4568 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
4569 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
4570 echo m68k-unknown-lynxos${UNAME_RELEASE}
4572 @@ -1133,7 +1157,7 @@
4573 rs6000:LynxOS:2.*:*)
4574 echo rs6000-unknown-lynxos${UNAME_RELEASE}
4576 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
4577 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
4578 echo powerpc-unknown-lynxos${UNAME_RELEASE}
4580 SM[BE]S:UNIX_SV:*:*)
4581 @@ -1153,10 +1177,10 @@
4585 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
4586 - # says <Richard.M.Bartel@ccMail.Census.GOV>
4587 - echo i586-unisys-sysv4
4589 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
4590 + # says <Richard.M.Bartel@ccMail.Census.GOV>
4591 + echo i586-unisys-sysv4
4593 *:UNIX_System_V:4*:FTX*)
4594 # From Gerald Hewes <hewes@openmarket.com>.
4595 # How about differentiating between stratus architectures? -djm
4596 @@ -1182,11 +1206,11 @@
4598 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
4599 if [ -d /usr/nec ]; then
4600 - echo mips-nec-sysv${UNAME_RELEASE}
4601 + echo mips-nec-sysv${UNAME_RELEASE}
4603 - echo mips-unknown-sysv${UNAME_RELEASE}
4604 + echo mips-unknown-sysv${UNAME_RELEASE}
4608 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
4609 echo powerpc-be-beos
4611 @@ -1196,6 +1220,12 @@
4612 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
4615 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
4616 + echo i586-pc-haiku
4619 + echo x86_64-unknown-haiku
4622 echo sx4-nec-superux${UNAME_RELEASE}
4624 @@ -1205,6 +1235,15 @@
4626 echo sx6-nec-superux${UNAME_RELEASE}
4628 + SX-7:SUPER-UX:*:*)
4629 + echo sx7-nec-superux${UNAME_RELEASE}
4631 + SX-8:SUPER-UX:*:*)
4632 + echo sx8-nec-superux${UNAME_RELEASE}
4634 + SX-8R:SUPER-UX:*:*)
4635 + echo sx8r-nec-superux${UNAME_RELEASE}
4637 Power*:Rhapsody:*:*)
4638 echo powerpc-apple-rhapsody${UNAME_RELEASE}
4640 @@ -1214,6 +1253,16 @@
4642 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
4643 case $UNAME_PROCESSOR in
4645 + eval $set_cc_for_build
4646 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
4647 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
4648 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
4649 + grep IS_64BIT_ARCH >/dev/null
4651 + UNAME_PROCESSOR="x86_64"
4654 unknown) UNAME_PROCESSOR=powerpc ;;
4656 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
4657 @@ -1229,7 +1278,10 @@
4661 - NSE-?:NONSTOP_KERNEL:*:*)
4662 + NEO-?:NONSTOP_KERNEL:*:*)
4663 + echo neo-tandem-nsk${UNAME_RELEASE}
4665 + NSE-*:NONSTOP_KERNEL:*:*)
4666 echo nse-tandem-nsk${UNAME_RELEASE}
4668 NSR-?:NONSTOP_KERNEL:*:*)
4669 @@ -1274,13 +1326,13 @@
4670 echo pdp10-unknown-its
4673 - echo mips-sei-seiux${UNAME_RELEASE}
4674 + echo mips-sei-seiux${UNAME_RELEASE}
4677 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
4680 - UNAME_MACHINE=`(uname -p) 2>/dev/null`
4681 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
4682 case "${UNAME_MACHINE}" in
4683 A*) echo alpha-dec-vms ; exit ;;
4684 I*) echo ia64-dec-vms ; exit ;;
4685 @@ -1295,11 +1347,14 @@
4687 echo ${UNAME_MACHINE}-pc-rdos
4690 + echo ${UNAME_MACHINE}-pc-aros
4692 + x86_64:VMkernel:*:*)
4693 + echo ${UNAME_MACHINE}-unknown-esx
4697 -#echo '(No uname command or uname output not recognized.)' 1>&2
4698 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
4700 eval $set_cc_for_build
4703 @@ -1317,11 +1372,11 @@
4704 #include <sys/param.h>
4705 printf ("m68k-sony-newsos%s\n",
4718 @@ -1455,9 +1510,9 @@
4719 the operating system you are using. It is advised that you
4720 download the most up to date version of the config scripts from
4722 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
4723 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
4725 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
4726 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
4728 If the version you run ($0) is already up to date, please
4729 send the following data and any information you think might be
4730 diff -urN BUILD/abook-0.6.0pre2/config.h.in abook/config.h.in
4731 --- BUILD/abook-0.6.0pre2/config.h.in 2006-09-05 10:19:48.000000000 +0200
4732 +++ abook/config.h.in 2013-03-13 15:07:45.000000000 +0100
4734 -/* config.h.in. Generated from configure.in by autoheader. */
4736 -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
4737 - systems. This function is required for `alloca.c' support on those systems.
4739 -#undef CRAY_STACKSEG_END
4741 -/* Define to 1 if using `alloca.c'. */
4743 +/* config.h.in. Generated from configure.ac by autoheader. */
4745 /* Define to 1 if translation of program messages to the user's native
4746 language is requested. */
4748 /* Handle multibyte characters */
4749 #undef HANDLE_MULTIBYTE
4751 -/* Define to 1 if you have `alloca', as a function or macro. */
4754 -/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
4756 -#undef HAVE_ALLOCA_H
4758 -/* Define to 1 if you have the <argz.h> header file. */
4761 -/* Define to 1 if you have the `asprintf' function. */
4762 -#undef HAVE_ASPRINTF
4764 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
4765 CoreFoundation framework. */
4766 #undef HAVE_CFLOCALECOPYCURRENT
4769 #undef HAVE_DCGETTEXT
4771 -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
4773 -#undef HAVE_DECL_FEOF_UNLOCKED
4775 -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
4777 -#undef HAVE_DECL_FGETS_UNLOCKED
4779 -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
4781 -#undef HAVE_DECL_GETC_UNLOCKED
4783 /* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
4785 #undef HAVE_DECL_WCWIDTH
4787 -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
4789 -#undef HAVE_DECL__SNPRINTF
4791 -/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
4793 -#undef HAVE_DECL__SNWPRINTF
4795 -/* Define to 1 if you have the `fwprintf' function. */
4796 -#undef HAVE_FWPRINTF
4798 -/* Define to 1 if you have the `getcwd' function. */
4801 -/* Define to 1 if you have the `getegid' function. */
4802 -#undef HAVE_GETEGID
4804 -/* Define to 1 if you have the `geteuid' function. */
4805 -#undef HAVE_GETEUID
4807 -/* Define to 1 if you have the `getgid' function. */
4810 -/* Define to 1 if you have the `getpagesize' function. */
4811 -#undef HAVE_GETPAGESIZE
4813 /* Define if the GNU gettext() function is already present or preinstalled. */
4816 -/* Define to 1 if you have the `getuid' function. */
4819 /* Define to 1 if you have the <history.h> header file. */
4820 #undef HAVE_HISTORY_H
4822 -/* Define if you have the iconv() function. */
4823 +/* Define if you have the iconv() function and it works. */
4826 /* Define to 1 if you have the <iconv.h> header file. */
4829 -/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
4830 -#undef HAVE_INTMAX_T
4832 -/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
4833 +/* Define to 1 if you have the <inttypes.h> header file. */
4834 #undef HAVE_INTTYPES_H
4836 -/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
4837 - declares uintmax_t. */
4838 -#undef HAVE_INTTYPES_H_WITH_UINTMAX
4840 -/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
4841 -#undef HAVE_LANGINFO_CODESET
4843 -/* Define if your <locale.h> file defines LC_MESSAGES. */
4844 -#undef HAVE_LC_MESSAGES
4846 /* Define if you have a readline compatible library */
4847 #undef HAVE_LIBREADLINE
4849 -/* Define to 1 if you have the <limits.h> header file. */
4850 -#undef HAVE_LIMITS_H
4852 /* Define to 1 if you have the <locale.h> header file. */
4853 #undef HAVE_LOCALE_H
4855 -/* Define if you have the 'long double' type. */
4856 -#undef HAVE_LONG_DOUBLE
4858 -/* Define if you have the 'long long' type. */
4859 -#undef HAVE_LONG_LONG
4861 -/* Define to 1 if you have the <malloc.h> header file. */
4862 -#undef HAVE_MALLOC_H
4864 /* Define to 1 if you have the `mbrtowc' function. */
4868 /* Define to 1 if you have the <memory.h> header file. */
4869 #undef HAVE_MEMORY_H
4871 -/* Define to 1 if you have the `mempcpy' function. */
4872 -#undef HAVE_MEMPCPY
4874 -/* Define to 1 if you have a working `mmap' system call. */
4877 -/* Define to 1 if you have the `munmap' function. */
4880 /* Define to 1 if you have the <ncurses.h> header file. */
4881 #undef HAVE_NCURSES_H
4883 -/* Define to 1 if you have the <nl_types.h> header file. */
4884 -#undef HAVE_NL_TYPES_H
4886 -/* Define if your printf() function supports format strings with positions. */
4887 -#undef HAVE_POSIX_PRINTF
4889 -/* Define to 1 if you have the `putenv' function. */
4892 /* Define to 1 if you have the <readline.h> header file. */
4893 #undef HAVE_READLINE_H
4896 /* Define to 1 if you have the `resizeterm' function. */
4897 #undef HAVE_RESIZETERM
4899 -/* Define to 1 if you have the `setenv' function. */
4902 /* Define to 1 if you have the `setlocale' function. */
4903 #undef HAVE_SETLOCALE
4905 @@ -191,64 +83,39 @@
4906 /* Define if you have the <stdarg.h> header file. */
4907 #undef HAVE_STDARG_H
4909 -/* Define to 1 if you have the <stddef.h> header file. */
4910 -#undef HAVE_STDDEF_H
4912 /* Define to 1 if you have the <stdint.h> header file. */
4913 #undef HAVE_STDINT_H
4915 -/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
4917 -#undef HAVE_STDINT_H_WITH_UINTMAX
4919 /* Define to 1 if you have the <stdlib.h> header file. */
4920 #undef HAVE_STDLIB_H
4922 -/* Define to 1 if you have the `stpcpy' function. */
4925 -/* Define to 1 if you have the `strcasecmp' function. */
4926 -#undef HAVE_STRCASECMP
4927 +/* Define to 1 if you have the `strcasestr' function. */
4928 +#undef HAVE_STRCASESTR
4930 /* Define to 1 if you have the `strcoll' function and it is properly defined.
4934 -/* Define to 1 if you have the `strdup' function. */
4937 /* Define to 1 if you have the <strings.h> header file. */
4938 #undef HAVE_STRINGS_H
4940 /* Define to 1 if you have the <string.h> header file. */
4941 #undef HAVE_STRING_H
4943 -/* Define to 1 if you have the `strtoul' function. */
4944 -#undef HAVE_STRTOUL
4946 /* Define to 1 if you have the <sys/ioctl.h> header file. */
4947 #undef HAVE_SYS_IOCTL_H
4949 -/* Define to 1 if you have the <sys/param.h> header file. */
4950 -#undef HAVE_SYS_PARAM_H
4952 /* Define to 1 if you have the <sys/stat.h> header file. */
4953 #undef HAVE_SYS_STAT_H
4955 /* Define to 1 if you have the <sys/types.h> header file. */
4956 #undef HAVE_SYS_TYPES_H
4958 -/* Define to 1 if you have the `tsearch' function. */
4959 -#undef HAVE_TSEARCH
4961 -/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
4962 -#undef HAVE_UINTMAX_T
4964 /* Define to 1 if you have the <unistd.h> header file. */
4965 #undef HAVE_UNISTD_H
4967 -/* Define if you have the 'unsigned long long' type. */
4968 -#undef HAVE_UNSIGNED_LONG_LONG
4969 +/* Defined if the vformat library is available */
4970 +#undef HAVE_VFORMAT
4972 /* Define to 1 if you have the `vsnprintf' function. */
4973 #undef HAVE_VSNPRINTF
4974 @@ -256,36 +123,9 @@
4975 /* Define if you have the <wchar.h> header file. */
4978 -/* Define if you have the 'wchar_t' type. */
4979 -#undef HAVE_WCHAR_T
4981 -/* Define to 1 if you have the `wcslen' function. */
4984 /* Define to 1 if you have the `wcwidth' function. */
4987 -/* Define if you have the 'wint_t' type. */
4990 -/* Define to 1 if you have the `__argz_count' function. */
4991 -#undef HAVE___ARGZ_COUNT
4993 -/* Define to 1 if you have the `__argz_next' function. */
4994 -#undef HAVE___ARGZ_NEXT
4996 -/* Define to 1 if you have the `__argz_stringify' function. */
4997 -#undef HAVE___ARGZ_STRINGIFY
4999 -/* Define to 1 if you have the `__fsetlocking' function. */
5000 -#undef HAVE___FSETLOCKING
5002 -/* Define as const if the declaration of iconv() needs const. */
5005 -/* Define if integer division by zero raises signal SIGFPE. */
5006 -#undef INTDIV0_RAISES_SIGFPE
5008 /* locale directory */
5011 @@ -304,58 +144,58 @@
5012 /* Define to the one symbol short name of this package. */
5013 #undef PACKAGE_TARNAME
5015 +/* Define to the home page for this package. */
5018 /* Define to the version of this package. */
5019 #undef PACKAGE_VERSION
5021 -/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
5022 -#undef PRI_MACROS_BROKEN
5024 /* Define to 1 if the C compiler supports function prototypes. */
5027 -/* Define as the maximum value of type 'size_t', if the system doesn't define
5031 -/* If using the C implementation of alloca, define if you know the
5032 - direction of stack growth for your system; otherwise it will be
5033 - automatically deduced at run-time.
5034 - STACK_DIRECTION > 0 => grows toward higher addresses
5035 - STACK_DIRECTION < 0 => grows toward lower addresses
5036 - STACK_DIRECTION = 0 => direction of growth unknown */
5037 -#undef STACK_DIRECTION
5039 /* Define to 1 if you have the ANSI C header files. */
5042 +/* Enable extensions on AIX 3, Interix. */
5043 +#ifndef _ALL_SOURCE
5044 +# undef _ALL_SOURCE
5046 +/* Enable GNU extensions on systems that have them. */
5047 +#ifndef _GNU_SOURCE
5048 +# undef _GNU_SOURCE
5050 +/* Enable threading extensions on Solaris. */
5051 +#ifndef _POSIX_PTHREAD_SEMANTICS
5052 +# undef _POSIX_PTHREAD_SEMANTICS
5054 +/* Enable extensions on HP NonStop. */
5055 +#ifndef _TANDEM_SOURCE
5056 +# undef _TANDEM_SOURCE
5058 +/* Enable general extensions on Solaris. */
5059 +#ifndef __EXTENSIONS__
5060 +# undef __EXTENSIONS__
5064 /* Version number of package */
5067 +/* Define to 1 if on MINIX. */
5070 +/* Define to 2 if the system does not provide POSIX.1 features except with
5072 +#undef _POSIX_1_SOURCE
5074 +/* Define to 1 if you need to in order for `stat' and other things to work. */
5075 +#undef _POSIX_SOURCE
5077 /* Define like PROTOTYPES; this can be used by system headers. */
5080 -/* Define to empty if `const' does not conform to ANSI C. */
5083 /* Define to `__inline__' or `__inline' if that's what the C compiler
5084 calls it, or to nothing if 'inline' is not supported under any name. */
5089 -/* Define to `long' if <sys/types.h> does not define. */
5092 -/* Define as the type of the result of subtracting two pointers, if the system
5093 - doesn't define it. */
5096 -/* Define to empty if the C compiler doesn't support this keyword. */
5099 -/* Define to `unsigned' if <sys/types.h> does not define. */
5102 -/* Define to unsigned long or unsigned long long if <stdint.h> and
5103 - <inttypes.h> don't define. */
5105 diff -urN BUILD/abook-0.6.0pre2/config.rpath abook/config.rpath
5106 --- BUILD/abook-0.6.0pre2/config.rpath 2005-09-17 12:10:25.000000000 +0200
5107 +++ abook/config.rpath 2013-03-13 15:07:45.000000000 +0100
5109 # Output a system dependent set of variables, describing how to set the
5110 # run time search path of shared libraries in an executable.
5112 -# Copyright 1996-2005 Free Software Foundation, Inc.
5113 +# Copyright 1996-2010 Free Software Foundation, Inc.
5114 # Taken from GNU libtool, 2001
5115 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
5118 # known workaround is to choose shorter directory names for the build
5119 # directory and/or the installation directory.
5121 -# All known linkers require a `.a' archive for static linking (except M$VC,
5122 +# All known linkers require a `.a' archive for static linking (except MSVC,
5123 # which needs '.lib').
5127 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
5128 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
5130 -cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
5131 +# Code taken from libtool.m4's _LT_CC_BASENAME.
5133 -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
5134 +for cc_temp in $CC""; do
5136 + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
5137 + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
5142 +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
5144 +# Code taken from libtool.m4's _LT_COMPILER_PIC.
5147 if test "$GCC" = yes; then
5152 - case "$cc_basename" in
5153 + case $cc_basename in
5159 - mingw* | pw32* | os2*)
5160 + mingw* | cygwin* | pw32* | os2* | cegcc*)
5162 hpux9* | hpux10* | hpux11*)
5169 + linux* | k*bsd*-gnu)
5170 case $cc_basename in
5181 pgcc | pgf77 | pgf90)
5187 + case `$CC -V 2>&1 | sed 5q` in
5195 osf3* | osf4* | osf5*)
5203 @@ -91,11 +114,14 @@
5207 - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
5208 + sysv4 | sysv4.2uw2* | sysv4.3*)
5213 + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
5223 -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
5224 +# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
5226 hardcode_libdir_flag_spec=
5227 hardcode_libdir_separator=
5232 - cygwin* | mingw* | pw32*)
5233 + cygwin* | mingw* | pw32* | cegcc*)
5234 # FIXME: the MSVC++ port hasn't been tested in a loooong time
5235 # When not using gcc, we currently assume that we are using
5236 # Microsoft Visual C++.
5237 @@ -120,6 +146,10 @@
5242 + # we just hope/assume this is gcc and not c89 (= MSVC++)
5248 @@ -127,8 +157,14 @@
5251 if test "$with_gnu_ld" = yes; then
5252 + # Set some defaults for GNU ld with shared library support. These
5253 + # are reset later if shared libraries are not supported. Putting them
5254 + # here allows them to be overridden if necessary.
5255 + # Unlike libtool, we use -rpath here, not --rpath, since the documented
5256 + # option of GNU ld is called -rpath, not --rpath.
5257 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5259 - aix3* | aix4* | aix5*)
5261 # On AIX/PPC, the GNU linker is very broken
5262 if test "$host_cpu" != ia64; then
5268 - cygwin* | mingw* | pw32*)
5269 + cygwin* | mingw* | pw32* | cegcc*)
5270 # hardcode_libdir_flag_spec is actually meaningless, as there is
5271 # no search path for DLLs.
5272 hardcode_libdir_flag_spec='-L$libdir'
5273 @@ -162,9 +198,20 @@
5278 + hardcode_direct=no
5279 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5281 + gnu* | linux* | k*bsd*-gnu)
5282 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5290 - solaris* | sysv5*)
5292 if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
5294 elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5295 @@ -173,16 +220,23 @@
5299 + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
5300 + case `$LD -v 2>&1` in
5301 + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
5305 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5306 + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
5317 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5324 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5326 @@ -191,10 +245,8 @@
5330 - if test "$ld_shlibs" = yes; then
5331 - # Unlike libtool, we use -rpath here, not --rpath, since the documented
5332 - # option of GNU ld is called -rpath, not --rpath.
5333 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5334 + if test "$ld_shlibs" = no; then
5335 + hardcode_libdir_flag_spec=
5340 hardcode_direct=unsupported
5345 if test "$host_cpu" = ia64; then
5346 # On IA64, the linker does run time linking by default, so we don't
5347 # have to do anything special.
5348 @@ -218,13 +270,14 @@
5349 # Test if we are trying to use run time linking or normal
5350 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
5351 # need to do runtime linking.
5352 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
5353 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
5354 for ld_flag in $LDFLAGS; do
5355 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
5356 aix_use_runtimelinking=yes
5365 strings "$collect2name" | grep resolve_lib_name >/dev/null
5367 # We have reworked collect2
5368 - hardcode_direct=yes
5371 # We have old collect2
5372 hardcode_direct=unsupported
5374 hardcode_libdir_flag_spec='-L$libdir'
5375 hardcode_libdir_separator=
5380 # Begin _LT_AC_SYS_LIBPATH_AIX.
5385 - cygwin* | mingw* | pw32*)
5386 + cygwin* | mingw* | pw32* | cegcc*)
5387 # When not using gcc, we currently assume that we are using
5388 # Microsoft Visual C++.
5389 # hardcode_libdir_flag_spec is actually meaningless, as there is
5391 if test "$GCC" = yes ; then
5394 - case "$cc_basename" in
5395 + case $cc_basename in
5401 hardcode_minus_L=yes
5403 - freebsd* | kfreebsd*-gnu | dragonfly*)
5404 + freebsd* | dragonfly*)
5405 hardcode_libdir_flag_spec='-R$libdir'
5408 @@ -326,24 +380,25 @@
5409 # but as the default location of the library.
5410 hardcode_minus_L=yes
5412 - hpux10* | hpux11*)
5414 if test "$with_gnu_ld" = no; then
5415 - case "$host_cpu" in
5417 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5418 - hardcode_libdir_separator=:
5419 - hardcode_direct=no
5422 - hardcode_libdir_flag_spec='-L$libdir'
5423 + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5424 + hardcode_libdir_separator=:
5425 + hardcode_direct=yes
5426 + # hardcode_minus_L: Not really in the search PATH,
5427 + # but as the default location of the library.
5428 + hardcode_minus_L=yes
5432 + if test "$with_gnu_ld" = no; then
5433 + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5434 + hardcode_libdir_separator=:
5438 - # hardcode_minus_L: Not really in the search PATH,
5439 - # but as the default location of the library.
5440 - hardcode_minus_L=yes
5443 - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5444 - hardcode_libdir_separator=:
5446 # hardcode_minus_L: Not really in the search PATH,
5447 # but as the default location of the library.
5448 @@ -366,18 +421,22 @@
5449 hardcode_libdir_separator=:
5452 - hardcode_direct=yes
5453 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5454 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5455 + if test -f /usr/libexec/ld.so; then
5456 + hardcode_direct=yes
5457 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5458 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5460 + case "$host_os" in
5461 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
5462 + hardcode_libdir_flag_spec='-R$libdir'
5465 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5470 - case "$host_os" in
5471 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
5472 - hardcode_libdir_flag_spec='-R$libdir'
5475 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5484 hardcode_libdir_separator=:
5489 hardcode_libdir_flag_spec='-R$libdir'
5491 @@ -427,14 +484,11 @@
5496 - hardcode_direct=yes
5497 - hardcode_minus_L=no
5499 - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
5500 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
5503 - hardcode_libdir_flag_spec=
5504 + sysv5* | sco3.2v5* | sco5v6*)
5505 + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
5506 + hardcode_libdir_separator=':'
5509 hardcode_libdir_flag_spec='-L$libdir'
5510 @@ -446,37 +500,55 @@
5513 # Check dynamic linker characteristics
5514 -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
5515 +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
5516 +# Unlike libtool.m4, here we don't care about _all_ names of the library, but
5517 +# only about the one the linker finds when passed -lNAME. This is the last
5518 +# element of library_names_spec in libtool.m4, or possibly two of them if the
5519 +# linker has special search rules.
5520 +library_names_spec= # the last element of library_names_spec in libtool.m4
5521 libname_spec='lib$name'
5524 + library_names_spec='$libname.a'
5528 + library_names_spec='$libname$shrext'
5531 + library_names_spec='$libname.a'
5534 + library_names_spec='$libname$shrext'
5537 + library_names_spec='$libname$shrext'
5539 - cygwin* | mingw* | pw32*)
5540 + cygwin* | mingw* | pw32* | cegcc*)
5542 + library_names_spec='$libname.dll.a $libname.lib'
5544 darwin* | rhapsody*)
5546 + library_names_spec='$libname$shrext'
5549 + library_names_spec='$libname$shrext'
5556 + freebsd* | dragonfly*)
5557 + case "$host_os" in
5559 + library_names_spec='$libname$shrext$versuffix' ;;
5561 + library_names_spec='$libname$shrext' ;;
5565 + library_names_spec='$libname$shrext'
5567 hpux9* | hpux10* | hpux11*)
5568 - case "$host_cpu" in
5573 @@ -487,8 +559,13 @@
5577 + library_names_spec='$libname$shrext'
5580 + library_names_spec='$libname$shrext'
5582 irix5* | irix6* | nonstopux*)
5583 + library_names_spec='$libname$shrext'
5585 irix5* | nonstopux*)
5587 @@ -505,41 +582,59 @@
5589 linux*oldld* | linux*aout* | linux*coff*)
5592 + linux* | k*bsd*-gnu)
5593 + library_names_spec='$libname$shrext'
5596 + library_names_spec='$libname$shrext'
5599 + library_names_spec='$libname$shrext'
5602 + library_names_spec='$libname$shrext'
5605 + library_names_spec='$libname$shrext'
5608 + library_names_spec='$libname$shrext$versuffix'
5611 libname_spec='$name'
5613 + library_names_spec='$libname.a'
5615 osf3* | osf4* | osf5*)
5616 + library_names_spec='$libname$shrext'
5622 + library_names_spec='$libname$shrext'
5625 + library_names_spec='$libname$shrext$versuffix'
5627 - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
5629 + library_names_spec='$libname$shrext'
5632 + library_names_spec='$libname$shrext'
5634 + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
5635 + library_names_spec='$libname$shrext'
5638 + library_names_spec='$libname$shrext'
5642 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
5643 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
5644 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
5645 +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
5646 +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
5647 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
5649 LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
5650 @@ -553,6 +648,12 @@
5651 # Shared library suffix (normally "so").
5652 shlibext="$shlibext"
5654 +# Format of library name prefix.
5655 +libname_spec="$escaped_libname_spec"
5657 +# Library names that the linker finds when passed -lNAME.
5658 +library_names_spec="$escaped_library_names_spec"
5660 # Flag to hardcode \$libdir into a binary during linking.
5661 # This must work even if \$libdir does not exist.
5662 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
5663 diff -urN BUILD/abook-0.6.0pre2/config.sub abook/config.sub
5664 --- BUILD/abook-0.6.0pre2/config.sub 2006-08-04 22:18:23.000000000 +0200
5665 +++ abook/config.sub 2013-03-13 15:07:45.000000000 +0100
5668 # Configuration validation subroutine script.
5669 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
5670 -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5671 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5672 +# 2011, 2012 Free Software Foundation, Inc.
5674 -timestamp='2006-02-23'
5675 +timestamp='2012-10-10'
5677 # This file is (in principle) common to ALL GNU software.
5678 # The presence of a machine in this file suggests that SOME GNU software
5680 # GNU General Public License for more details.
5682 # You should have received a copy of the GNU General Public License
5683 -# along with this program; if not, write to the Free Software
5684 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
5686 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
5688 # As a special exception to the GNU General Public License, if you
5689 # distribute this file as part of a program that contains a
5693 # Please send patches to <config-patches@gnu.org>. Submit a context
5694 -# diff and a properly formatted ChangeLog entry.
5695 +# diff and a properly formatted GNU ChangeLog entry.
5697 # Configuration subroutine to validate and canonicalize a configuration type.
5698 # Supply the specified configuration type as an argument.
5699 # If it is invalid, we print an error message on stderr and exit with code 1.
5700 # Otherwise, we print the canonical config type on stdout and succeed.
5702 +# You can get the latest version of this script from:
5703 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
5705 # This file is supposed to be the same for all GNU packages
5706 # and recognize all the CPU types, system types and aliases
5707 # that are meaningful with *any* GNU software.
5710 GNU config.sub ($timestamp)
5712 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
5713 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
5714 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
5715 Free Software Foundation, Inc.
5717 This is free software; see the source for copying conditions. There is NO
5718 @@ -119,12 +122,18 @@
5719 # Here we must recognize all the valid KERNEL-OS combinations.
5720 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
5722 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
5723 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
5724 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
5725 + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
5726 + knetbsd*-gnu* | netbsd*-gnu* | \
5727 + kopensolaris*-gnu* | \
5728 storm-chaos* | os2-emx* | rtmk-nova*)
5730 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
5734 + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
5737 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
5738 if [ $basic_machine != $1 ]
5739 @@ -147,10 +156,13 @@
5740 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
5741 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
5742 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
5743 - -apple | -axis | -knuth | -cray)
5744 + -apple | -axis | -knuth | -cray | -microblaze*)
5751 -sim | -cisco | -oki | -wec | -winbond)
5754 @@ -165,10 +177,10 @@
5768 @@ -213,6 +225,12 @@
5770 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
5781 @@ -237,23 +255,32 @@
5782 # Some are omitted here because they have special meanings below.
5785 + | aarch64 | aarch64_be \
5786 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
5787 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
5789 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
5790 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
5794 - | d10v | d30v | dlx | dsp16xx \
5796 + | d10v | d30v | dlx | dsp16xx | dvp \
5798 + | fido | fr30 | frv \
5799 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
5801 | i370 | i860 | i960 | ia64 \
5803 - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
5806 + | m32c | m32r | m32rle | m68000 | m68k | m88k \
5807 + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
5808 | mips | mipsbe | mipseb | mipsel | mipsle \
5810 | mips64 | mips64el \
5811 - | mips64vr | mips64vrel \
5812 + | mips64octeon | mips64octeonel \
5813 | mips64orion | mips64orionel \
5814 + | mips64r5900 | mips64r5900el \
5815 + | mips64vr | mips64vrel \
5816 | mips64vr4100 | mips64vr4100el \
5817 | mips64vr4300 | mips64vr4300el \
5818 | mips64vr5000 | mips64vr5000el \
5819 @@ -266,31 +293,42 @@
5820 | mipsisa64sr71k | mipsisa64sr71kel \
5821 | mipstx39 | mipstx39el \
5822 | mn10200 | mn10300 \
5826 + | nds32 | nds32le | nds32be \
5831 | pdp10 | pdp11 | pj | pjl \
5832 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
5833 + | powerpc | powerpc64 | powerpc64le | powerpcle \
5835 - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
5838 + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
5840 - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
5841 - | sparcv8 | sparcv9 | sparcv9b \
5843 - | tahoe | thumb | tic4x | tic80 | tron \
5845 + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
5846 + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
5848 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
5850 + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
5852 - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
5854 + | x86 | xc16x | xstormy16 | xtensa \
5856 basic_machine=$basic_machine-unknown
5859 - basic_machine=$basic_machine-unknown
5861 + basic_machine=tic54x-unknown
5864 + basic_machine=tic55x-unknown
5867 + basic_machine=tic6x-unknown
5869 - m6811 | m68hc11 | m6812 | m68hc12)
5870 - # Motorola 68HC11/12.
5871 + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
5872 basic_machine=$basic_machine-unknown
5875 @@ -300,6 +338,21 @@
5876 basic_machine=mt-unknown
5879 + strongarm | thumb | xscale)
5880 + basic_machine=arm-unknown
5883 + basic_machine=$basic_machine-unknown
5887 + basic_machine=armeb-unknown
5891 + basic_machine=armel-unknown
5894 # We use `pc' rather than `unknown'
5895 # because (1) that's what they normally are, and
5896 # (2) the word "unknown" tends to confuse beginning users.
5897 @@ -314,29 +367,37 @@
5898 # Recognize the basic CPU types with company name.
5901 + | aarch64-* | aarch64_be-* \
5902 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
5903 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
5904 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
5905 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
5907 + | avr-* | avr32-* \
5908 + | be32-* | be64-* \
5909 | bfin-* | bs2000-* \
5910 - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
5911 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
5912 | clipper-* | craynv-* | cydra-* \
5913 | d10v-* | d30v-* | dlx-* \
5915 - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
5916 + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
5917 | h8300-* | h8500-* \
5918 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
5920 | i*86-* | i860-* | i960-* | ia64-* \
5921 | ip2k-* | iq2000-* \
5922 - | m32r-* | m32rle-* \
5923 + | le32-* | le64-* \
5925 + | m32c-* | m32r-* | m32rle-* \
5926 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
5927 - | m88110-* | m88k-* | maxq-* | mcore-* \
5928 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
5929 + | microblaze-* | microblazeel-* \
5930 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
5932 | mips64-* | mips64el-* \
5933 - | mips64vr-* | mips64vrel-* \
5934 + | mips64octeon-* | mips64octeonel-* \
5935 | mips64orion-* | mips64orionel-* \
5936 + | mips64r5900-* | mips64r5900el-* \
5937 + | mips64vr-* | mips64vrel-* \
5938 | mips64vr4100-* | mips64vr4100el-* \
5939 | mips64vr4300-* | mips64vr4300el-* \
5940 | mips64vr5000-* | mips64vr5000el-* \
5941 @@ -351,29 +412,36 @@
5945 + | nds32-* | nds32le-* | nds32be-* \
5946 | nios-* | nios2-* \
5947 | none-* | np1-* | ns16k-* | ns32k-* \
5950 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
5951 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
5952 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
5954 - | romp-* | rs6000-* \
5955 - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
5956 + | rl78-* | romp-* | rs6000-* | rx-* \
5957 + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
5958 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
5959 - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
5960 + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
5962 - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
5963 - | tahoe-* | thumb-* \
5964 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
5966 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
5969 - | v850-* | v850e-* | vax-* \
5971 + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
5974 - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
5975 - | xstormy16-* | xtensa-* \
5976 + | x86-* | x86_64-* | xc16x-* | xps100-* \
5977 + | xstormy16-* | xtensa*-* \
5983 + # Recognize the basic CPU types without company name, with glob match.
5985 + basic_machine=$basic_machine-unknown
5987 # Recognize the various machine names and aliases which stand
5988 # for a CPU type and a company and sometimes even an OS.
5990 basic_machine=a29k-amd
5995 basic_machine=abacus-unknown
5998 @@ -437,6 +505,10 @@
5999 basic_machine=m68k-apollo
6003 + basic_machine=i386-pc
6007 basic_machine=m68k-apple
6009 @@ -445,10 +517,35 @@
6010 basic_machine=ns32k-sequent
6014 + basic_machine=bfin-unknown
6018 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
6022 + basic_machine=powerpc-ibm
6026 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
6029 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
6032 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
6035 basic_machine=c90-cray
6039 + basic_machine=arm-unknown
6043 basic_machine=c1-convex
6046 basic_machine=craynv-cray
6050 - basic_machine=cr16c-unknown
6052 + basic_machine=cr16-unknown
6056 @@ -516,6 +613,10 @@
6057 basic_machine=m88k-motorola
6061 + basic_machine=i686-pc
6065 basic_machine=i586-pc
6069 basic_machine=i370-ibm
6071 -# I'm not sure what "Sysv32" means. Should this be sysv3.2?
6073 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
6075 @@ -670,6 +770,14 @@
6076 basic_machine=m68k-isi
6080 + basic_machine=m68k-unknown
6084 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
6088 basic_machine=m88k-omron
6090 @@ -681,10 +789,21 @@
6091 basic_machine=ns32k-utek
6095 + basic_machine=microblaze-xilinx
6098 + basic_machine=x86_64-pc
6102 basic_machine=i386-pc
6106 + basic_machine=arm-unknown
6110 basic_machine=m68000-convergent
6112 @@ -692,6 +811,24 @@
6113 basic_machine=m68k-atari
6116 + mipsEE* | ee | ps2)
6117 + basic_machine=mips64r5900el-scei
6127 + basic_machine=mipsel-scei
6131 + basic_machine=dvp-scei
6135 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
6137 @@ -713,10 +850,18 @@
6139 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
6142 + basic_machine=i386-pc
6146 basic_machine=i370-ibm
6150 + basic_machine=le32-unknown
6154 basic_machine=i486-ncr
6156 @@ -781,6 +926,12 @@
6158 basic_machine=np1-gould
6161 + basic_machine=neo-tandem
6164 + basic_machine=nse-tandem
6167 basic_machine=nsr-tandem
6169 @@ -811,6 +962,14 @@
6170 basic_machine=i860-intel
6174 + basic_machine=hppa-unknown
6178 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
6182 basic_machine=sparc-tti
6184 @@ -855,9 +1014,10 @@
6186 power) basic_machine=power-ibm
6188 - ppc) basic_machine=powerpc-unknown
6189 + ppc | ppcbe) basic_machine=powerpc-unknown
6191 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
6193 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
6195 ppcle | powerpclittle | ppc-le | powerpc-little)
6196 basic_machine=powerpcle-unknown
6197 @@ -912,6 +1072,10 @@
6199 basic_machine=mipsisa64sb1el-unknown
6202 + basic_machine=mipsisa32-sde
6206 basic_machine=mips-sei
6208 @@ -923,6 +1087,9 @@
6209 basic_machine=sh-hitachi
6213 + basic_machine=sh5le-unknown
6216 basic_machine=sh64-unknown
6218 @@ -944,6 +1111,9 @@
6219 basic_machine=i860-stratus
6222 + strongarm-* | thumb-*)
6223 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
6226 basic_machine=m68000-sun
6228 @@ -1000,17 +1170,9 @@
6229 basic_machine=t90-cray
6233 - basic_machine=tic54x-unknown
6237 - basic_machine=tic55x-unknown
6241 - basic_machine=tic6x-unknown
6244 + basic_machine=$basic_machine-unknown
6248 basic_machine=mipstx39-unknown
6249 @@ -1079,6 +1241,9 @@
6251 basic_machine=xps100-honeywell
6253 + xscale-* | xscalee[bl]-*)
6254 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
6257 basic_machine=ymp-cray
6259 @@ -1087,6 +1252,10 @@
6260 basic_machine=z8k-unknown
6264 + basic_machine=z80-unknown
6268 basic_machine=none-none
6270 @@ -1125,10 +1294,10 @@
6272 basic_machine=we32k-att
6274 - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
6275 + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
6276 basic_machine=sh-unknown
6278 - sparc | sparcv8 | sparcv9 | sparcv9b)
6279 + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
6280 basic_machine=sparc-sun
6283 @@ -1172,9 +1341,12 @@
6284 if [ x"$os" != x"" ]
6287 - # First match some system type aliases
6288 - # that might get confused with valid system types.
6289 + # First match some system type aliases
6290 + # that might get confused with valid system types.
6291 # -solaris* is a basic system type, with this one exception.
6295 -solaris1 | -solaris1.*)
6296 os=`echo $os | sed -e 's|solaris1|sunos4|'`
6298 @@ -1195,29 +1367,31 @@
6299 # Each alternative MUST END IN A *, to match a version number.
6300 # -sysv* is not here because it comes later, after sysvr4.
6301 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
6302 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
6303 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
6304 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
6305 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
6306 + | -sym* | -kopensolaris* \
6307 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
6309 + | -aos* | -aros* \
6310 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
6311 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
6312 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
6313 - | -openbsd* | -solidbsd* \
6314 + | -bitrig* | -openbsd* | -solidbsd* \
6315 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
6316 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
6317 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
6318 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
6319 - | -chorusos* | -chorusrdb* \
6320 - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
6321 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
6322 + | -chorusos* | -chorusrdb* | -cegcc* \
6323 + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
6324 + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
6325 + | -linux-newlib* | -linux-musl* | -linux-uclibc* \
6326 | -uxpv* | -beos* | -mpeix* | -udk* \
6327 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
6328 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
6329 - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
6330 + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
6331 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
6332 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
6333 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
6334 - | -skyos* | -haiku* | -rdos*)
6335 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
6336 # Remember, each alternative MUST END IN *, to match a version number.
6339 @@ -1256,7 +1430,7 @@
6348 @@ -1305,7 +1479,7 @@
6357 @@ -1347,6 +1521,11 @@
6369 @@ -1369,6 +1548,12 @@
6370 # system, and we'll never get to this point.
6372 case $basic_machine in
6382 @@ -1378,9 +1563,21 @@
6404 # This must come before the *-dec entry.
6407 @@ -1399,13 +1596,13 @@
6411 - # This also exists in the configure program, but was not the
6424 @@ -1430,7 +1627,7 @@
6433 @@ -1535,7 +1732,7 @@
6442 diff -urN BUILD/abook-0.6.0pre2/configure abook/configure
6443 --- BUILD/abook-0.6.0pre2/configure 2006-09-05 10:19:36.000000000 +0200
6444 +++ abook/configure 2013-03-13 15:07:45.000000000 +0100
6447 # Guess values for system-dependent variables and create Makefiles.
6448 -# Generated by GNU Autoconf 2.59.
6449 +# Generated by GNU Autoconf 2.69.
6452 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
6455 -# Copyright (C) 2003 Free Software Foundation, Inc.
6456 # This configure script is free software; the Free Software Foundation
6457 # gives unlimited permission to copy, distribute and modify it.
6458 -## --------------------- ##
6459 -## M4sh Initialization. ##
6460 -## --------------------- ##
6461 +## -------------------- ##
6462 +## M4sh Initialization. ##
6463 +## -------------------- ##
6465 -# Be Bourne compatible
6466 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
6467 +# Be more Bourne compatible
6468 +DUALCASE=1; export DUALCASE # for MKS sh
6469 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
6472 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
6473 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
6474 # is contrary to our usage. Disable this feature.
6475 alias -g '${1+"$@"}'='"$@"'
6476 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
6478 + setopt NO_GLOB_SUBST
6480 + case `(set -o) 2>/dev/null` in #(
6482 + set -o posix ;; #(
6487 -DUALCASE=1; export DUALCASE # for MKS sh
6489 -# Support unset when possible.
6490 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
6498 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
6499 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
6500 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
6501 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
6502 +# Prefer a ksh shell builtin over an external printf program on Solaris,
6503 +# but without wasting forks for bash or zsh.
6504 +if test -z "$BASH_VERSION$ZSH_VERSION" \
6505 + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
6506 + as_echo='print -r --'
6507 + as_echo_n='print -rn --'
6508 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
6509 + as_echo='printf %s\n'
6510 + as_echo_n='printf %s'
6512 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
6513 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
6514 + as_echo_n='/usr/ucb/echo -n'
6516 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
6517 + as_echo_n_body='eval
6521 + expr "X$arg" : "X\\(.*\\)$as_nl";
6522 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
6524 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
6526 + export as_echo_n_body
6527 + as_echo_n='sh -c $as_echo_n_body as_echo'
6529 + export as_echo_body
6530 + as_echo='sh -c $as_echo_body as_echo'
6533 +# The user is always right.
6534 +if test "${PATH_SEPARATOR+set}" != set; then
6536 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
6537 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
6538 + PATH_SEPARATOR=';'
6543 -# Work around bugs in pre-3.0 UWIN ksh.
6544 -$as_unset ENV MAIL MAILPATH
6546 +# We need space, tab and new line, in precisely that order. Quoting is
6547 +# there to prevent editors from complaining about space-tab.
6548 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
6549 +# splitting by setting IFS to empty value.)
6552 +# Find who we are. Look in the path if we contain no directory separator.
6555 + *[\\/]* ) as_myself=$0 ;;
6556 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6557 +for as_dir in $PATH
6560 + test -z "$as_dir" && as_dir=.
6561 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
6567 +# We did not find ourselves, most probably we were run as `sh COMMAND'
6568 +# in which case we are not to be found in the path.
6569 +if test "x$as_myself" = x; then
6572 +if test ! -f "$as_myself"; then
6573 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
6577 +# Unset variables that we do not need and which cause bugs (e.g. in
6578 +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
6579 +# suppresses any "Segmentation fault" message there. '((' could
6580 +# trigger a bug in pdksh 5.2.14.
6581 +for as_var in BASH_ENV ENV MAIL MAILPATH
6582 +do eval test x\${$as_var+set} = xset \
6583 + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
6591 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
6592 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
6593 - LC_TELEPHONE LC_TIME
6600 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
6602 +# Use a proper internal environment variable to ensure we don't fall
6603 + # into an infinite loop, continuously re-executing ourselves.
6604 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
6605 + _as_can_reexec=no; export _as_can_reexec;
6606 + # We cannot yet assume a decent shell, so we have to provide a
6607 +# neutralization value for shells without unset; and this also
6608 +# works around shells that cannot unset nonexistent variables.
6609 +# Preserve -v and -x to the replacement shell.
6612 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
6614 + *v*x* | *x*v* ) as_opts=-vx ;;
6615 + *v* ) as_opts=-v ;;
6616 + *x* ) as_opts=-x ;;
6619 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
6620 +# Admittedly, this is quite paranoid, since all the known shells bail
6621 +# out after a failed `exec'.
6622 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
6625 + # We don't want this to propagate to other subprocesses.
6626 + { _as_can_reexec=; unset _as_can_reexec;}
6627 +if test "x$CONFIG_SHELL" = x; then
6628 + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
6631 + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
6632 + # is contrary to our usage. Disable this feature.
6633 + alias -g '\${1+\"\$@\"}'='\"\$@\"'
6634 + setopt NO_GLOB_SUBST
6636 + case \`(set -o) 2>/dev/null\` in #(
6638 + set -o posix ;; #(
6644 + as_required="as_fn_return () { (exit \$1); }
6645 +as_fn_success () { as_fn_return 0; }
6646 +as_fn_failure () { as_fn_return 1; }
6647 +as_fn_ret_success () { return 0; }
6648 +as_fn_ret_failure () { return 1; }
6651 +as_fn_success || { exitcode=1; echo as_fn_success failed.; }
6652 +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
6653 +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
6654 +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
6655 +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
6658 + exitcode=1; echo positional parameters were not saved.
6660 +test x\$exitcode = x0 || exit 1
6661 +test -x / || exit 1"
6662 + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
6663 + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
6664 + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
6665 + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
6666 +test \$(( 1 + 1 )) = 2 || exit 1"
6667 + if (eval "$as_required") 2>/dev/null; then :
6668 + as_have_required=yes
6670 + as_have_required=no
6672 + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
6675 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6677 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
6679 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
6680 - eval $as_var=C; export $as_var
6684 + test -z "$as_dir" && as_dir=.
6686 + case $as_dir in #(
6688 + for as_base in sh bash ksh sh5; do
6689 + # Try only shells that exist, to save several forks.
6690 + as_shell=$as_dir/$as_base
6691 + if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
6692 + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
6693 + CONFIG_SHELL=$as_shell as_have_required=yes
6694 + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
6702 +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
6703 + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
6704 + CONFIG_SHELL=$SHELL as_have_required=yes
6709 + if test "x$CONFIG_SHELL" != x; then :
6710 + export CONFIG_SHELL
6711 + # We cannot yet assume a decent shell, so we have to provide a
6712 +# neutralization value for shells without unset; and this also
6713 +# works around shells that cannot unset nonexistent variables.
6714 +# Preserve -v and -x to the replacement shell.
6717 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
6719 + *v*x* | *x*v* ) as_opts=-vx ;;
6720 + *v* ) as_opts=-v ;;
6721 + *x* ) as_opts=-x ;;
6724 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
6725 +# Admittedly, this is quite paranoid, since all the known shells bail
6726 +# out after a failed `exec'.
6727 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
6731 + if test x$as_have_required = xno; then :
6732 + $as_echo "$0: This script requires a shell more modern than all"
6733 + $as_echo "$0: the shells that I found on your system."
6734 + if test x${ZSH_VERSION+set} = xset ; then
6735 + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
6736 + $as_echo "$0: be upgraded to zsh 4.3.4 or later."
6738 + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
6739 +$0: including any error possibly output before this
6740 +$0: message. Then install a modern shell, or manually run
6741 +$0: the script under such a shell if you do have one."
6748 +SHELL=${CONFIG_SHELL-/bin/sh}
6750 +# Unset more variables known to interfere with behavior of common tools.
6751 +CLICOLOR_FORCE= GREP_OPTIONS=
6752 +unset CLICOLOR_FORCE GREP_OPTIONS
6754 +## --------------------- ##
6755 +## M4sh Shell Functions. ##
6756 +## --------------------- ##
6759 +# Portably unset VAR.
6762 + { eval $1=; unset $1;}
6764 +as_unset=as_fn_unset
6766 +# as_fn_set_status STATUS
6767 +# -----------------------
6768 +# Set $? to STATUS, without forking.
6769 +as_fn_set_status ()
6772 +} # as_fn_set_status
6774 +# as_fn_exit STATUS
6775 +# -----------------
6776 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
6780 + as_fn_set_status $1
6786 +# Create "$as_dir" as a directory, including parents if necessary.
6790 + case $as_dir in #(
6791 + -*) as_dir=./$as_dir;;
6793 + test -d "$as_dir" || eval $as_mkdir_p || {
6796 + case $as_dir in #(
6797 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
6798 + *) as_qdir=$as_dir;;
6800 + as_dirs="'$as_qdir' $as_dirs"
6801 + as_dir=`$as_dirname -- "$as_dir" ||
6802 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
6803 + X"$as_dir" : 'X\(//\)[^/]' \| \
6804 + X"$as_dir" : 'X\(//\)$' \| \
6805 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
6806 +$as_echo X"$as_dir" |
6807 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
6811 + /^X\(\/\/\)[^/].*/{
6824 + test -d "$as_dir" && break
6826 + test -z "$as_dirs" || eval "mkdir $as_dirs"
6827 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
6832 +# as_fn_executable_p FILE
6833 +# -----------------------
6834 +# Test if FILE is an executable regular file.
6835 +as_fn_executable_p ()
6837 + test -f "$1" && test -x "$1"
6838 +} # as_fn_executable_p
6839 +# as_fn_append VAR VALUE
6840 +# ----------------------
6841 +# Append the text in VALUE to the end of the definition contained in VAR. Take
6842 +# advantage of any shell optimizations that allow amortized linear growth over
6843 +# repeated appends, instead of the typical quadratic growth present in naive
6845 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
6846 + eval 'as_fn_append ()
6857 +# as_fn_arith ARG...
6858 +# ------------------
6859 +# Perform arithmetic evaluation on the ARGs, and store the result in the
6860 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
6861 +# must be portable across $(()) and expr.
6862 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
6863 + eval 'as_fn_arith ()
6870 + as_val=`expr "$@" || test $? -eq 1`
6875 -# Required to use basename.
6876 -if expr a : '\(a\)' >/dev/null 2>&1; then
6877 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
6878 +# ----------------------------------------
6879 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
6880 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
6881 +# script with STATUS, using 1 if that was 0.
6884 + as_status=$1; test $as_status -eq 0 && as_status=1
6885 + if test "$4"; then
6886 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
6887 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
6889 + $as_echo "$as_me: error: $2" >&2
6890 + as_fn_exit $as_status
6893 +if expr a : '\(a\)' >/dev/null 2>&1 &&
6894 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
6900 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
6901 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
6902 as_basename=basename
6907 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
6908 + as_dirname=dirname
6913 -# Name of the executable.
6914 -as_me=`$as_basename "$0" ||
6915 +as_me=`$as_basename -- "$0" ||
6916 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
6917 X"$0" : 'X\(//\)$' \| \
6918 - X"$0" : 'X\(/\)$' \| \
6919 - . : '\(.\)' 2>/dev/null ||
6921 - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
6922 - /^X\/\(\/\/\)$/{ s//\1/; q; }
6923 - /^X\/\(\/\).*/{ s//\1/; q; }
6926 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
6928 + sed '/^.*\/\([^/][^/]*\)\/*$/{
6942 -# PATH needs CR, and LINENO needs CR and PATH.
6943 # Avoid depending upon Character Ranges.
6944 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
6945 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
6946 @@ -83,146 +461,91 @@
6947 as_cr_digits='0123456789'
6948 as_cr_alnum=$as_cr_Letters$as_cr_digits
6950 -# The user is always right.
6951 -if test "${PATH_SEPARATOR+set}" != set; then
6952 - echo "#! /bin/sh" >conf$$.sh
6953 - echo "exit 0" >>conf$$.sh
6954 - chmod +x conf$$.sh
6955 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
6956 - PATH_SEPARATOR=';'
6964 - as_lineno_1=$LINENO
6965 - as_lineno_2=$LINENO
6966 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
6967 - test "x$as_lineno_1" != "x$as_lineno_2" &&
6968 - test "x$as_lineno_3" = "x$as_lineno_2" || {
6969 - # Find who we are. Look in the path if we contain no path at all
6970 - # relative or not.
6972 - *[\\/]* ) as_myself=$0 ;;
6973 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6974 -for as_dir in $PATH
6977 - test -z "$as_dir" && as_dir=.
6978 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
6983 - # We did not find ourselves, most probably we were run as `sh COMMAND'
6984 - # in which case we are not to be found in the path.
6985 - if test "x$as_myself" = x; then
6988 - if test ! -f "$as_myself"; then
6989 - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
6990 - { (exit 1); exit 1; }; }
6992 - case $CONFIG_SHELL in
6994 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6995 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
6998 - test -z "$as_dir" && as_dir=.
6999 - for as_base in sh bash ksh sh5; do
7002 - if ("$as_dir/$as_base" -c '
7003 - as_lineno_1=$LINENO
7004 - as_lineno_2=$LINENO
7005 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
7006 - test "x$as_lineno_1" != "x$as_lineno_2" &&
7007 - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
7008 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
7009 - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
7010 - CONFIG_SHELL=$as_dir/$as_base
7011 - export CONFIG_SHELL
7012 - exec "$CONFIG_SHELL" "$0" ${1+"$@"}
7020 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
7021 - # uniformly replaced by the line number. The first 'sed' inserts a
7022 - # line-number line before each line; the second 'sed' does the real
7023 - # work. The second script uses 'N' to pair each line-number line
7024 - # with the numbered line, and appends trailing '-' during
7025 - # substitution so that $LINENO is not a special case at line end.
7026 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
7027 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
7028 - sed '=' <$as_myself |
7029 + as_lineno_1=$LINENO as_lineno_1a=$LINENO
7030 + as_lineno_2=$LINENO as_lineno_2a=$LINENO
7031 + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
7032 + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
7033 + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
7046 - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
7048 + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
7051 - s,^['$as_cr_digits']*\n,,
7054 - chmod +x $as_me.lineno ||
7055 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
7056 - { (exit 1); exit 1; }; }
7057 + chmod +x "$as_me.lineno" ||
7058 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
7060 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
7061 + # already done that, so ensure we don't try to do so again and fall
7062 + # in an infinite loop. This has already happened in practice.
7063 + _as_can_reexec=no; export _as_can_reexec
7064 # Don't try to exec as it changes $[0], causing all sort of problems
7065 # (the dirname of $[0] is not the place where we might find the
7066 - # original and so on. Autoconf is especially sensible to this).
7068 + # original and so on. Autoconf is especially sensitive to this).
7069 + . "./$as_me.lineno"
7070 # Exit status is that of the last command.
7075 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
7076 - *c*,-n*) ECHO_N= ECHO_C='
7078 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
7079 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
7080 +ECHO_C= ECHO_N= ECHO_T=
7081 +case `echo -n x` in #(((((
7083 + case `echo 'xy\c'` in
7084 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
7086 + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
7093 -if expr a : '\(a\)' >/dev/null 2>&1; then
7095 +rm -f conf$$ conf$$.exe conf$$.file
7096 +if test -d conf$$.dir; then
7097 + rm -f conf$$.dir/conf$$.file
7101 + mkdir conf$$.dir 2>/dev/null
7104 -rm -f conf$$ conf$$.exe conf$$.file
7106 -if ln -s conf$$.file conf$$ 2>/dev/null; then
7107 - # We could just check for DJGPP; but this test a) works b) is more generic
7108 - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
7109 - if test -f conf$$.exe; then
7110 - # Don't use ln at all; we don't have any links
7113 +if (echo >conf$$.file) 2>/dev/null; then
7114 + if ln -s conf$$.file conf$$ 2>/dev/null; then
7116 + # ... but there are two gotchas:
7117 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
7118 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
7119 + # In both cases, we have to default to `cp -pR'.
7120 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
7122 + elif ln conf$$.file conf$$ 2>/dev/null; then
7127 -elif ln conf$$.file conf$$ 2>/dev/null; then
7133 -rm -f conf$$ conf$$.exe conf$$.file
7134 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
7135 +rmdir conf$$.dir 2>/dev/null
7137 if mkdir -p . 2>/dev/null; then
7139 + as_mkdir_p='mkdir -p "$as_dir"'
7141 test -d ./-p && rmdir ./-p
7145 -as_executable_p="test -f"
7146 +as_test_x='test -x'
7147 +as_executable_p=as_fn_executable_p
7149 # Sed expression to map a string onto a valid CPP name.
7150 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
7151 @@ -231,38 +554,25 @@
7152 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
7156 -# We need space, tab and new line, in precisely that order.
7164 +test -n "$DJDIR" || exec 7<&0 </dev/null
7168 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
7169 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
7170 # so uname gets run too.
7171 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
7178 ac_default_prefix=/usr/local
7180 ac_config_libobj_dir=.
7186 -SHELL=${CONFIG_SHELL-/bin/sh}
7188 -# Maximum number of lines to put in a shell here document.
7189 -# This variable seems obsolete. It should probably be removed, and
7190 -# only ac_max_sed_lines should be used.
7191 -: ${ac_max_here_lines=38}
7193 # Identity of this package.
7195 @@ -270,51 +580,193 @@
7201 ac_unique_file="abook.c"
7202 # Factoring default headers for most tests.
7203 ac_includes_default="\
7205 -#if HAVE_SYS_TYPES_H
7206 +#ifdef HAVE_SYS_TYPES_H
7207 # include <sys/types.h>
7209 -#if HAVE_SYS_STAT_H
7210 +#ifdef HAVE_SYS_STAT_H
7211 # include <sys/stat.h>
7214 +#ifdef STDC_HEADERS
7215 # include <stdlib.h>
7216 # include <stddef.h>
7219 +# ifdef HAVE_STDLIB_H
7220 # include <stdlib.h>
7224 -# if !STDC_HEADERS && HAVE_MEMORY_H
7225 +#ifdef HAVE_STRING_H
7226 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
7227 # include <memory.h>
7229 # include <string.h>
7232 +#ifdef HAVE_STRINGS_H
7233 # include <strings.h>
7235 -#if HAVE_INTTYPES_H
7236 +#ifdef HAVE_INTTYPES_H
7237 # include <inttypes.h>
7240 -# include <stdint.h>
7244 +#ifdef HAVE_STDINT_H
7245 +# include <stdint.h>
7247 +#ifdef HAVE_UNISTD_H
7248 # include <unistd.h>
7251 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP GLIBC2 RANLIB ac_ct_RANLIB ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB localedir USE_INCLUDED_INTL_H_TRUE USE_INCLUDED_INTL_H_FALSE U ANSI2KNR LIBOBJS LTLIBOBJS'
7253 +ac_subst_vars='am__EXEEXT_FALSE
7257 +ENABLE_VFORMAT_SUPPORT_FALSE
7258 +ENABLE_VFORMAT_SUPPORT_TRUE
7261 +USE_INCLUDED_INTL_H_FALSE
7262 +USE_INCLUDED_INTL_H_TRUE
7278 +XGETTEXT_EXTRA_OPTIONS
7286 +GETTEXT_MACRO_VERSION
7291 +am__fastdepCC_FALSE
7316 +INSTALL_STRIP_PROGRAM
7358 +program_transform_name
7371 +enable_option_checking
7372 +enable_dependency_tracking
7376 +with_libiconv_prefix
7377 +with_libintl_prefix
7384 + ac_precious_vars='build_alias
7395 # Initialize some variables set by options.
7397 ac_init_version=false
7398 +ac_unrecognized_opts=
7399 +ac_unrecognized_sep=
7400 # The variables have the same names as the options, with
7401 # dashes changed to underlines.
7402 cache_file=/dev/null
7403 @@ -337,34 +789,49 @@
7404 # and all the variables that are supposed to be based on exec_prefix
7405 # by default will actually change.
7406 # Use braces instead of parens because sh, perl, etc. also accept them.
7407 +# (The list follows the same order as the GNU Coding Standards.)
7408 bindir='${exec_prefix}/bin'
7409 sbindir='${exec_prefix}/sbin'
7410 libexecdir='${exec_prefix}/libexec'
7411 -datadir='${prefix}/share'
7412 +datarootdir='${prefix}/share'
7413 +datadir='${datarootdir}'
7414 sysconfdir='${prefix}/etc'
7415 sharedstatedir='${prefix}/com'
7416 localstatedir='${prefix}/var'
7417 -libdir='${exec_prefix}/lib'
7418 includedir='${prefix}/include'
7419 oldincludedir='/usr/include'
7420 -infodir='${prefix}/info'
7421 -mandir='${prefix}/man'
7422 +docdir='${datarootdir}/doc/${PACKAGE}'
7423 +infodir='${datarootdir}/info'
7424 +htmldir='${docdir}'
7428 +libdir='${exec_prefix}/lib'
7429 +localedir='${datarootdir}/locale'
7430 +mandir='${datarootdir}/man'
7436 # If the previous option needs an argument, assign it.
7437 if test -n "$ac_prev"; then
7438 - eval "$ac_prev=\$ac_option"
7439 + eval $ac_prev=\$ac_option
7444 - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
7445 + case $ac_option in
7446 + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
7448 + *) ac_optarg=yes ;;
7451 # Accept the important Cygnus configure options, so we can diagnose typos.
7453 - case $ac_option in
7454 + case $ac_dashdash$ac_option in
7456 + ac_dashdash=yes ;;
7458 -bindir | --bindir | --bindi | --bind | --bin | --bi)
7460 @@ -386,33 +853,59 @@
7461 --config-cache | -C)
7462 cache_file=config.cache ;;
7464 - -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
7465 + -datadir | --datadir | --datadi | --datad)
7467 - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
7469 + -datadir=* | --datadir=* | --datadi=* | --datad=*)
7470 datadir=$ac_optarg ;;
7472 + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
7473 + | --dataroo | --dataro | --datar)
7474 + ac_prev=datarootdir ;;
7475 + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
7476 + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
7477 + datarootdir=$ac_optarg ;;
7479 -disable-* | --disable-*)
7480 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
7481 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
7482 # Reject names that are not valid shell variable names.
7483 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
7484 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
7485 - { (exit 1); exit 1; }; }
7486 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
7487 - eval "enable_$ac_feature=no" ;;
7488 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
7489 + as_fn_error $? "invalid feature name: $ac_useropt"
7490 + ac_useropt_orig=$ac_useropt
7491 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
7492 + case $ac_user_opts in
7494 +"enable_$ac_useropt"
7496 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
7497 + ac_unrecognized_sep=', ';;
7499 + eval enable_$ac_useropt=no ;;
7501 + -docdir | --docdir | --docdi | --doc | --do)
7503 + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
7504 + docdir=$ac_optarg ;;
7506 + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
7508 + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
7509 + dvidir=$ac_optarg ;;
7511 -enable-* | --enable-*)
7512 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
7513 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
7514 # Reject names that are not valid shell variable names.
7515 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
7516 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
7517 - { (exit 1); exit 1; }; }
7518 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
7519 - case $ac_option in
7520 - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
7521 - *) ac_optarg=yes ;;
7522 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
7523 + as_fn_error $? "invalid feature name: $ac_useropt"
7524 + ac_useropt_orig=$ac_useropt
7525 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
7526 + case $ac_user_opts in
7528 +"enable_$ac_useropt"
7530 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
7531 + ac_unrecognized_sep=', ';;
7533 - eval "enable_$ac_feature='$ac_optarg'" ;;
7534 + eval enable_$ac_useropt=\$ac_optarg ;;
7536 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
7537 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
7538 @@ -439,6 +932,12 @@
7539 -host=* | --host=* | --hos=* | --ho=*)
7540 host_alias=$ac_optarg ;;
7542 + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
7543 + ac_prev=htmldir ;;
7544 + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
7546 + htmldir=$ac_optarg ;;
7548 -includedir | --includedir | --includedi | --included | --include \
7549 | --includ | --inclu | --incl | --inc)
7550 ac_prev=includedir ;;
7551 @@ -463,13 +962,16 @@
7552 | --libexe=* | --libex=* | --libe=*)
7553 libexecdir=$ac_optarg ;;
7555 + -localedir | --localedir | --localedi | --localed | --locale)
7556 + ac_prev=localedir ;;
7557 + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
7558 + localedir=$ac_optarg ;;
7560 -localstatedir | --localstatedir | --localstatedi | --localstated \
7561 - | --localstate | --localstat | --localsta | --localst \
7562 - | --locals | --local | --loca | --loc | --lo)
7563 + | --localstate | --localstat | --localsta | --localst | --locals)
7564 ac_prev=localstatedir ;;
7565 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
7566 - | --localstate=* | --localstat=* | --localsta=* | --localst=* \
7567 - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
7568 + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
7569 localstatedir=$ac_optarg ;;
7571 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
7572 @@ -534,6 +1036,16 @@
7573 | --progr-tra=* | --program-tr=* | --program-t=*)
7574 program_transform_name=$ac_optarg ;;
7576 + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
7578 + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
7579 + pdfdir=$ac_optarg ;;
7581 + -psdir | --psdir | --psdi | --psd | --ps)
7583 + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
7584 + psdir=$ac_optarg ;;
7586 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
7587 | -silent | --silent | --silen | --sile | --sil)
7589 @@ -584,26 +1096,36 @@
7590 ac_init_version=: ;;
7593 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
7594 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
7595 # Reject names that are not valid shell variable names.
7596 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
7597 - { echo "$as_me: error: invalid package name: $ac_package" >&2
7598 - { (exit 1); exit 1; }; }
7599 - ac_package=`echo $ac_package| sed 's/-/_/g'`
7600 - case $ac_option in
7601 - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
7602 - *) ac_optarg=yes ;;
7603 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
7604 + as_fn_error $? "invalid package name: $ac_useropt"
7605 + ac_useropt_orig=$ac_useropt
7606 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
7607 + case $ac_user_opts in
7611 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
7612 + ac_unrecognized_sep=', ';;
7614 - eval "with_$ac_package='$ac_optarg'" ;;
7615 + eval with_$ac_useropt=\$ac_optarg ;;
7617 -without-* | --without-*)
7618 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
7619 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
7620 # Reject names that are not valid shell variable names.
7621 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
7622 - { echo "$as_me: error: invalid package name: $ac_package" >&2
7623 - { (exit 1); exit 1; }; }
7624 - ac_package=`echo $ac_package | sed 's/-/_/g'`
7625 - eval "with_$ac_package=no" ;;
7626 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
7627 + as_fn_error $? "invalid package name: $ac_useropt"
7628 + ac_useropt_orig=$ac_useropt
7629 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
7630 + case $ac_user_opts in
7634 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
7635 + ac_unrecognized_sep=', ';;
7637 + eval with_$ac_useropt=no ;;
7640 # Obsolete; use --with-x.
7641 @@ -623,27 +1145,26 @@
7642 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
7643 x_libraries=$ac_optarg ;;
7645 - -*) { echo "$as_me: error: unrecognized option: $ac_option
7646 -Try \`$0 --help' for more information." >&2
7647 - { (exit 1); exit 1; }; }
7648 + -*) as_fn_error $? "unrecognized option: \`$ac_option'
7649 +Try \`$0 --help' for more information"
7653 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
7654 # Reject names that are not valid shell variable names.
7655 - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
7656 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
7657 - { (exit 1); exit 1; }; }
7658 - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
7659 - eval "$ac_envvar='$ac_optarg'"
7660 + case $ac_envvar in #(
7661 + '' | [0-9]* | *[!_$as_cr_alnum]* )
7662 + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
7664 + eval $ac_envvar=\$ac_optarg
7665 export $ac_envvar ;;
7668 # FIXME: should be removed in autoconf 3.0.
7669 - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
7670 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
7671 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
7672 - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
7673 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
7674 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
7675 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
7679 @@ -651,31 +1172,36 @@
7681 if test -n "$ac_prev"; then
7682 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
7683 - { echo "$as_me: error: missing argument to $ac_option" >&2
7684 - { (exit 1); exit 1; }; }
7685 + as_fn_error $? "missing argument to $ac_option"
7688 -# Be sure to have absolute paths.
7689 -for ac_var in exec_prefix prefix
7691 - eval ac_val=$`echo $ac_var`
7693 - [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
7694 - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
7695 - { (exit 1); exit 1; }; };;
7696 +if test -n "$ac_unrecognized_opts"; then
7697 + case $enable_option_checking in
7699 + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
7700 + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
7705 -# Be sure to have absolute paths.
7706 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
7707 - localstatedir libdir includedir oldincludedir infodir mandir
7708 +# Check all directory arguments for consistency.
7709 +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
7710 + datadir sysconfdir sharedstatedir localstatedir includedir \
7711 + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
7712 + libdir localedir mandir
7714 - eval ac_val=$`echo $ac_var`
7715 + eval ac_val=\$$ac_var
7716 + # Remove trailing slashes.
7719 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
7720 + eval $ac_var=\$ac_val;;
7722 + # Be sure to have absolute directory names.
7724 - [\\/$]* | ?:[\\/]* ) ;;
7725 - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
7726 - { (exit 1); exit 1; }; };;
7727 + [\\/$]* | ?:[\\/]* ) continue;;
7728 + NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
7730 + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
7733 # There might be people who depend on the old broken behavior: `$host'
7734 @@ -689,8 +1215,6 @@
7735 if test "x$host_alias" != x; then
7736 if test "x$build_alias" = x; then
7737 cross_compiling=maybe
7738 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
7739 - If a cross compiler is detected then cross compile mode will be used." >&2
7740 elif test "x$build_alias" != "x$host_alias"; then
7743 @@ -702,74 +1226,72 @@
7744 test "$silent" = yes && exec 6>/dev/null
7747 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
7748 +ac_ls_di=`ls -di .` &&
7749 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
7750 + as_fn_error $? "working directory cannot be determined"
7751 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
7752 + as_fn_error $? "pwd does not report name of working directory"
7755 # Find the source files, if location was not specified.
7756 if test -z "$srcdir"; then
7757 ac_srcdir_defaulted=yes
7758 - # Try the directory containing this script, then its parent.
7759 - ac_confdir=`(dirname "$0") 2>/dev/null ||
7760 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
7761 - X"$0" : 'X\(//\)[^/]' \| \
7762 - X"$0" : 'X\(//\)$' \| \
7763 - X"$0" : 'X\(/\)' \| \
7764 - . : '\(.\)' 2>/dev/null ||
7766 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
7767 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
7768 - /^X\(\/\/\)$/{ s//\1/; q; }
7769 - /^X\(\/\).*/{ s//\1/; q; }
7771 + # Try the directory containing this script, then the parent directory.
7772 + ac_confdir=`$as_dirname -- "$as_myself" ||
7773 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
7774 + X"$as_myself" : 'X\(//\)[^/]' \| \
7775 + X"$as_myself" : 'X\(//\)$' \| \
7776 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
7777 +$as_echo X"$as_myself" |
7778 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
7782 + /^X\(\/\/\)[^/].*/{
7796 - if test ! -r $srcdir/$ac_unique_file; then
7797 + if test ! -r "$srcdir/$ac_unique_file"; then
7801 ac_srcdir_defaulted=no
7803 -if test ! -r $srcdir/$ac_unique_file; then
7804 - if test "$ac_srcdir_defaulted" = yes; then
7805 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
7806 - { (exit 1); exit 1; }; }
7808 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
7809 - { (exit 1); exit 1; }; }
7812 -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
7813 - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
7814 - { (exit 1); exit 1; }; }
7815 -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
7816 -ac_env_build_alias_set=${build_alias+set}
7817 -ac_env_build_alias_value=$build_alias
7818 -ac_cv_env_build_alias_set=${build_alias+set}
7819 -ac_cv_env_build_alias_value=$build_alias
7820 -ac_env_host_alias_set=${host_alias+set}
7821 -ac_env_host_alias_value=$host_alias
7822 -ac_cv_env_host_alias_set=${host_alias+set}
7823 -ac_cv_env_host_alias_value=$host_alias
7824 -ac_env_target_alias_set=${target_alias+set}
7825 -ac_env_target_alias_value=$target_alias
7826 -ac_cv_env_target_alias_set=${target_alias+set}
7827 -ac_cv_env_target_alias_value=$target_alias
7828 -ac_env_CC_set=${CC+set}
7829 -ac_env_CC_value=$CC
7830 -ac_cv_env_CC_set=${CC+set}
7831 -ac_cv_env_CC_value=$CC
7832 -ac_env_CFLAGS_set=${CFLAGS+set}
7833 -ac_env_CFLAGS_value=$CFLAGS
7834 -ac_cv_env_CFLAGS_set=${CFLAGS+set}
7835 -ac_cv_env_CFLAGS_value=$CFLAGS
7836 -ac_env_LDFLAGS_set=${LDFLAGS+set}
7837 -ac_env_LDFLAGS_value=$LDFLAGS
7838 -ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
7839 -ac_cv_env_LDFLAGS_value=$LDFLAGS
7840 -ac_env_CPPFLAGS_set=${CPPFLAGS+set}
7841 -ac_env_CPPFLAGS_value=$CPPFLAGS
7842 -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
7843 -ac_cv_env_CPPFLAGS_value=$CPPFLAGS
7844 -ac_env_CPP_set=${CPP+set}
7845 -ac_env_CPP_value=$CPP
7846 -ac_cv_env_CPP_set=${CPP+set}
7847 -ac_cv_env_CPP_value=$CPP
7848 +if test ! -r "$srcdir/$ac_unique_file"; then
7849 + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
7850 + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
7852 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
7854 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
7856 +# When building in place, set srcdir=.
7857 +if test "$ac_abs_confdir" = "$ac_pwd"; then
7860 +# Remove unnecessary trailing slashes from srcdir.
7861 +# Double slashes in file names in object file debugging info
7862 +# mess up M-x gdb in Emacs.
7864 +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
7866 +for ac_var in $ac_precious_vars; do
7867 + eval ac_env_${ac_var}_set=\${${ac_var}+set}
7868 + eval ac_env_${ac_var}_value=\$${ac_var}
7869 + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
7870 + eval ac_cv_env_${ac_var}_value=\$${ac_var}
7874 # Report the --help message.
7875 @@ -792,20 +1314,17 @@
7876 --help=short display options specific to this package
7877 --help=recursive display the short help of all the included packages
7878 -V, --version display version information and exit
7879 - -q, --quiet, --silent do not print \`checking...' messages
7880 + -q, --quiet, --silent do not print \`checking ...' messages
7881 --cache-file=FILE cache test results in FILE [disabled]
7882 -C, --config-cache alias for \`--cache-file=config.cache'
7883 -n, --no-create do not create output files
7884 --srcdir=DIR find the sources in DIR [configure dir or \`..']
7889 Installation directories:
7890 --prefix=PREFIX install architecture-independent files in PREFIX
7891 - [$ac_default_prefix]
7892 + [$ac_default_prefix]
7893 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
7897 By default, \`make install' will install all the files in
7898 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
7899 @@ -815,18 +1334,25 @@
7900 For better control, use the options below.
7902 Fine tuning of the installation directories:
7903 - --bindir=DIR user executables [EPREFIX/bin]
7904 - --sbindir=DIR system admin executables [EPREFIX/sbin]
7905 - --libexecdir=DIR program executables [EPREFIX/libexec]
7906 - --datadir=DIR read-only architecture-independent data [PREFIX/share]
7907 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
7908 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
7909 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
7910 - --libdir=DIR object code libraries [EPREFIX/lib]
7911 - --includedir=DIR C header files [PREFIX/include]
7912 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
7913 - --infodir=DIR info documentation [PREFIX/info]
7914 - --mandir=DIR man documentation [PREFIX/man]
7915 + --bindir=DIR user executables [EPREFIX/bin]
7916 + --sbindir=DIR system admin executables [EPREFIX/sbin]
7917 + --libexecdir=DIR program executables [EPREFIX/libexec]
7918 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
7919 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
7920 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
7921 + --libdir=DIR object code libraries [EPREFIX/lib]
7922 + --includedir=DIR C header files [PREFIX/include]
7923 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
7924 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
7925 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
7926 + --infodir=DIR info documentation [DATAROOTDIR/info]
7927 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
7928 + --mandir=DIR man documentation [DATAROOTDIR/man]
7929 + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
7930 + --htmldir=DIR html documentation [DOCDIR]
7931 + --dvidir=DIR dvi documentation [DOCDIR]
7932 + --pdfdir=DIR pdf documentation [DOCDIR]
7933 + --psdir=DIR ps documentation [DOCDIR]
7937 @@ -847,12 +1373,14 @@
7941 + --disable-option-checking ignore unrecognized --enable/--with options
7942 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
7943 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
7944 - --disable-nls do not use Native Language Support
7945 --disable-dependency-tracking speeds up one-time build
7946 --enable-dependency-tracking do not reject slow dependency extractors
7947 + --disable-nls do not use Native Language Support
7948 --disable-rpath do not hardcode runtime library paths
7949 + --enable-vformat Use libvformat is available
7950 --enable-debug Enable debugging support
7953 @@ -861,7 +1389,6 @@
7954 --with-gnu-ld assume the C compiler uses GNU ld default=no
7955 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
7956 --without-libiconv-prefix don't search for libiconv in includedir and libdir
7957 - --with-included-gettext use the GNU gettext library included here
7958 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
7959 --without-libintl-prefix don't search for libintl in includedir and libdir
7960 --with-localedir=PATH Where the locale files are installed
7961 @@ -873,158 +1400,582 @@
7962 CFLAGS C compiler flags
7963 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
7964 nonstandard directory <lib dir>
7965 - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
7966 - headers in a nonstandard directory <include dir>
7967 + LIBS libraries to pass to the linker, e.g. -l<library>
7968 + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
7969 + you have headers in a nonstandard directory <include dir>
7972 Use these variables to override the choices made by `configure' or to help
7973 it to find libraries and programs with nonstandard names/locations.
7975 +Report bugs to the package provider.
7980 if test "$ac_init_help" = "recursive"; then
7981 # If there are subdirs, report their specific --help.
7983 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
7984 - test -d $ac_dir || continue
7985 + test -d "$ac_dir" ||
7986 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
7990 -if test "$ac_dir" != .; then
7991 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
7992 - # A "../" for each directory in $ac_dir_suffix.
7993 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
7995 - ac_dir_suffix= ac_top_builddir=
7998 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
8000 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
8001 + # A ".." for each directory in $ac_dir_suffix.
8002 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
8003 + case $ac_top_builddir_sub in
8004 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
8005 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
8008 +ac_abs_top_builddir=$ac_pwd
8009 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
8010 +# for backward compatibility:
8011 +ac_top_builddir=$ac_top_build_prefix
8014 - .) # No --srcdir option. We are building in place.
8015 + .) # We are building in place.
8017 - if test -z "$ac_top_builddir"; then
8020 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
8022 - [\\/]* | ?:[\\/]* ) # Absolute path.
8023 + ac_top_srcdir=$ac_top_builddir_sub
8024 + ac_abs_top_srcdir=$ac_pwd ;;
8025 + [\\/]* | ?:[\\/]* ) # Absolute name.
8026 ac_srcdir=$srcdir$ac_dir_suffix;
8027 - ac_top_srcdir=$srcdir ;;
8028 - *) # Relative path.
8029 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
8030 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
8033 -# Do not use `cd foo && pwd` to compute absolute paths, because
8034 -# the directories may not exist.
8036 -.) ac_abs_builddir="$ac_dir";;
8039 - .) ac_abs_builddir=`pwd`;;
8040 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
8041 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
8044 -case $ac_abs_builddir in
8045 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
8047 - case ${ac_top_builddir}. in
8048 - .) ac_abs_top_builddir=$ac_abs_builddir;;
8049 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
8050 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
8053 -case $ac_abs_builddir in
8054 -.) ac_abs_srcdir=$ac_srcdir;;
8056 - case $ac_srcdir in
8057 - .) ac_abs_srcdir=$ac_abs_builddir;;
8058 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
8059 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
8062 -case $ac_abs_builddir in
8063 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
8065 - case $ac_top_srcdir in
8066 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
8067 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
8068 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
8073 - # Check for guested configure; otherwise get Cygnus style configure.
8074 - if test -f $ac_srcdir/configure.gnu; then
8076 - $SHELL $ac_srcdir/configure.gnu --help=recursive
8077 - elif test -f $ac_srcdir/configure; then
8079 - $SHELL $ac_srcdir/configure --help=recursive
8080 - elif test -f $ac_srcdir/configure.ac ||
8081 - test -f $ac_srcdir/configure.in; then
8083 - $ac_configure --help
8084 + ac_top_srcdir=$srcdir
8085 + ac_abs_top_srcdir=$srcdir ;;
8086 + *) # Relative name.
8087 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
8088 + ac_top_srcdir=$ac_top_build_prefix$srcdir
8089 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
8091 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
8093 + cd "$ac_dir" || { ac_status=$?; continue; }
8094 + # Check for guested configure.
8095 + if test -f "$ac_srcdir/configure.gnu"; then
8097 + $SHELL "$ac_srcdir/configure.gnu" --help=recursive
8098 + elif test -f "$ac_srcdir/configure"; then
8100 + $SHELL "$ac_srcdir/configure" --help=recursive
8102 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
8105 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
8106 + fi || ac_status=$?
8107 + cd "$ac_pwd" || { ac_status=$?; break; }
8111 -test -n "$ac_init_help" && exit 0
8112 +test -n "$ac_init_help" && exit $ac_status
8113 if $ac_init_version; then
8116 +generated by GNU Autoconf 2.69
8118 -Copyright (C) 2003 Free Software Foundation, Inc.
8119 +Copyright (C) 2012 Free Software Foundation, Inc.
8120 This configure script is free software; the Free Software Foundation
8121 gives unlimited permission to copy, distribute and modify it.
8128 -This file contains any messages produced by compilers while
8129 -running configure, to aid debugging if configure makes a mistake.
8131 -It was created by $as_me, which was
8132 -generated by GNU Autoconf 2.59. Invocation command line was
8137 +## ------------------------ ##
8138 +## Autoconf initialization. ##
8139 +## ------------------------ ##
8141 +# ac_fn_c_try_compile LINENO
8142 +# --------------------------
8143 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
8144 +ac_fn_c_try_compile ()
8150 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8151 + rm -f conftest.$ac_objext
8152 + if { { ac_try="$ac_compile"
8153 +case "(($ac_try" in
8154 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8155 + *) ac_try_echo=$ac_try;;
8157 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8158 +$as_echo "$ac_try_echo"; } >&5
8159 + (eval "$ac_compile") 2>conftest.err
8161 + if test -s conftest.err; then
8162 + grep -v '^ *+' conftest.err >conftest.er1
8163 + cat conftest.er1 >&5
8164 + mv -f conftest.er1 conftest.err
8166 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8167 + test $ac_status = 0; } && {
8168 + test -z "$ac_c_werror_flag" ||
8169 + test ! -s conftest.err
8170 + } && test -s conftest.$ac_objext; then :
8173 + $as_echo "$as_me: failed program was:" >&5
8174 +sed 's/^/| /' conftest.$ac_ext >&5
8176 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
8177 -uname -m = `(uname -m) 2>/dev/null || echo unknown`
8178 -uname -r = `(uname -r) 2>/dev/null || echo unknown`
8179 -uname -s = `(uname -s) 2>/dev/null || echo unknown`
8180 -uname -v = `(uname -v) 2>/dev/null || echo unknown`
8183 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8184 + as_fn_set_status $ac_retval
8186 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
8187 -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
8188 +} # ac_fn_c_try_compile
8190 -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
8191 -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
8192 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
8193 -hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
8194 -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
8195 -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
8196 -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
8197 +# ac_fn_c_try_cpp LINENO
8198 +# ----------------------
8199 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
8202 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8203 + if { { ac_try="$ac_cpp conftest.$ac_ext"
8204 +case "(($ac_try" in
8205 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8206 + *) ac_try_echo=$ac_try;;
8208 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8209 +$as_echo "$ac_try_echo"; } >&5
8210 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
8212 + if test -s conftest.err; then
8213 + grep -v '^ *+' conftest.err >conftest.er1
8214 + cat conftest.er1 >&5
8215 + mv -f conftest.er1 conftest.err
8217 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8218 + test $ac_status = 0; } > conftest.i && {
8219 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
8220 + test ! -s conftest.err
8224 + $as_echo "$as_me: failed program was:" >&5
8225 +sed 's/^/| /' conftest.$ac_ext >&5
8229 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8230 + as_fn_set_status $ac_retval
8232 +} # ac_fn_c_try_cpp
8234 +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
8235 +# -------------------------------------------------------
8236 +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
8237 +# the include files in INCLUDES and setting the cache variable VAR
8239 +ac_fn_c_check_header_mongrel ()
8241 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8242 + if eval \${$3+:} false; then :
8243 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8244 +$as_echo_n "checking for $2... " >&6; }
8245 +if eval \${$3+:} false; then :
8246 + $as_echo_n "(cached) " >&6
8249 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
8250 +$as_echo "$ac_res" >&6; }
8252 + # Is the header compilable?
8253 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
8254 +$as_echo_n "checking $2 usability... " >&6; }
8255 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8256 +/* end confdefs.h. */
8260 +if ac_fn_c_try_compile "$LINENO"; then :
8261 + ac_header_compiler=yes
8263 + ac_header_compiler=no
8265 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8266 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
8267 +$as_echo "$ac_header_compiler" >&6; }
8270 +# Is the header present?
8271 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
8272 +$as_echo_n "checking $2 presence... " >&6; }
8273 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8274 +/* end confdefs.h. */
8277 +if ac_fn_c_try_cpp "$LINENO"; then :
8278 + ac_header_preproc=yes
8280 + ac_header_preproc=no
8282 +rm -f conftest.err conftest.i conftest.$ac_ext
8283 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
8284 +$as_echo "$ac_header_preproc" >&6; }
8286 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8287 -for as_dir in $PATH
8290 - test -z "$as_dir" && as_dir=.
8291 - echo "PATH: $as_dir"
8293 +# So? What about this header?
8294 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
8296 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
8297 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
8298 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
8299 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
8302 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
8303 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
8304 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
8305 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
8306 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
8307 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
8308 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
8309 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
8310 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
8311 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
8314 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8315 +$as_echo_n "checking for $2... " >&6; }
8316 +if eval \${$3+:} false; then :
8317 + $as_echo_n "(cached) " >&6
8319 + eval "$3=\$ac_header_compiler"
8322 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
8323 +$as_echo "$ac_res" >&6; }
8325 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8327 +} # ac_fn_c_check_header_mongrel
8329 +# ac_fn_c_try_run LINENO
8330 +# ----------------------
8331 +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
8332 +# that executables *can* be run.
8335 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8336 + if { { ac_try="$ac_link"
8337 +case "(($ac_try" in
8338 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8339 + *) ac_try_echo=$ac_try;;
8341 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8342 +$as_echo "$ac_try_echo"; } >&5
8343 + (eval "$ac_link") 2>&5
8345 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8346 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
8347 + { { case "(($ac_try" in
8348 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8349 + *) ac_try_echo=$ac_try;;
8351 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8352 +$as_echo "$ac_try_echo"; } >&5
8353 + (eval "$ac_try") 2>&5
8355 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8356 + test $ac_status = 0; }; }; then :
8359 + $as_echo "$as_me: program exited with status $ac_status" >&5
8360 + $as_echo "$as_me: failed program was:" >&5
8361 +sed 's/^/| /' conftest.$ac_ext >&5
8363 + ac_retval=$ac_status
8365 + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
8366 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8367 + as_fn_set_status $ac_retval
8369 +} # ac_fn_c_try_run
8371 +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
8372 +# -------------------------------------------------------
8373 +# Tests whether HEADER exists and can be compiled using the include files in
8374 +# INCLUDES, setting the cache variable VAR accordingly.
8375 +ac_fn_c_check_header_compile ()
8377 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8378 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8379 +$as_echo_n "checking for $2... " >&6; }
8380 +if eval \${$3+:} false; then :
8381 + $as_echo_n "(cached) " >&6
8383 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8384 +/* end confdefs.h. */
8388 +if ac_fn_c_try_compile "$LINENO"; then :
8393 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8396 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
8397 +$as_echo "$ac_res" >&6; }
8398 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8400 +} # ac_fn_c_check_header_compile
8402 +# ac_fn_c_try_link LINENO
8403 +# -----------------------
8404 +# Try to link conftest.$ac_ext, and return whether this succeeded.
8405 +ac_fn_c_try_link ()
8407 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8408 + rm -f conftest.$ac_objext conftest$ac_exeext
8409 + if { { ac_try="$ac_link"
8410 +case "(($ac_try" in
8411 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8412 + *) ac_try_echo=$ac_try;;
8414 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
8415 +$as_echo "$ac_try_echo"; } >&5
8416 + (eval "$ac_link") 2>conftest.err
8418 + if test -s conftest.err; then
8419 + grep -v '^ *+' conftest.err >conftest.er1
8420 + cat conftest.er1 >&5
8421 + mv -f conftest.er1 conftest.err
8423 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8424 + test $ac_status = 0; } && {
8425 + test -z "$ac_c_werror_flag" ||
8426 + test ! -s conftest.err
8427 + } && test -s conftest$ac_exeext && {
8428 + test "$cross_compiling" = yes ||
8429 + test -x conftest$ac_exeext
8433 + $as_echo "$as_me: failed program was:" >&5
8434 +sed 's/^/| /' conftest.$ac_ext >&5
8438 + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
8439 + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
8440 + # interfere with the next link command; also delete a directory that is
8441 + # left behind by Apple's compiler. We do this before executing the actions.
8442 + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
8443 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8444 + as_fn_set_status $ac_retval
8446 +} # ac_fn_c_try_link
8448 +# ac_fn_c_check_func LINENO FUNC VAR
8449 +# ----------------------------------
8450 +# Tests whether FUNC exists, setting the cache variable VAR accordingly
8451 +ac_fn_c_check_func ()
8453 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8454 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8455 +$as_echo_n "checking for $2... " >&6; }
8456 +if eval \${$3+:} false; then :
8457 + $as_echo_n "(cached) " >&6
8459 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8460 +/* end confdefs.h. */
8461 +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
8462 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
8463 +#define $2 innocuous_$2
8465 +/* System header to define __stub macros and hopefully few prototypes,
8466 + which can conflict with char $2 (); below.
8467 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8468 + <limits.h> exists even on freestanding compilers. */
8471 +# include <limits.h>
8473 +# include <assert.h>
8478 +/* Override any GCC internal prototype to avoid an error.
8479 + Use char because int might match the return type of a GCC
8480 + builtin and then its argument prototype would still apply. */
8485 +/* The GNU C library defines this for functions which it implements
8486 + to always fail with ENOSYS. Some functions are actually named
8487 + something starting with __ and the normal name is an alias. */
8488 +#if defined __stub_$2 || defined __stub___$2
8500 +if ac_fn_c_try_link "$LINENO"; then :
8505 +rm -f core conftest.err conftest.$ac_objext \
8506 + conftest$ac_exeext conftest.$ac_ext
8509 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
8510 +$as_echo "$ac_res" >&6; }
8511 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8513 +} # ac_fn_c_check_func
8515 +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
8516 +# ---------------------------------------------
8517 +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
8519 +ac_fn_c_check_decl ()
8521 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8522 + as_decl_name=`echo $2|sed 's/ *(.*//'`
8523 + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
8524 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
8525 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
8526 +if eval \${$3+:} false; then :
8527 + $as_echo_n "(cached) " >&6
8529 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8530 +/* end confdefs.h. */
8535 +#ifndef $as_decl_name
8537 + (void) $as_decl_use;
8539 + (void) $as_decl_name;
8547 +if ac_fn_c_try_compile "$LINENO"; then :
8552 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8555 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
8556 +$as_echo "$ac_res" >&6; }
8557 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8559 +} # ac_fn_c_check_decl
8561 +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
8562 +# -------------------------------------------
8563 +# Tests whether TYPE exists after having included INCLUDES, setting cache
8564 +# variable VAR accordingly.
8565 +ac_fn_c_check_type ()
8567 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8568 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8569 +$as_echo_n "checking for $2... " >&6; }
8570 +if eval \${$3+:} false; then :
8571 + $as_echo_n "(cached) " >&6
8574 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8575 +/* end confdefs.h. */
8586 +if ac_fn_c_try_compile "$LINENO"; then :
8587 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8588 +/* end confdefs.h. */
8599 +if ac_fn_c_try_compile "$LINENO"; then :
8604 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8606 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8609 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
8610 +$as_echo "$ac_res" >&6; }
8611 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
8613 +} # ac_fn_c_check_type
8614 +cat >config.log <<_ACEOF
8615 +This file contains any messages produced by compilers while
8616 +running configure, to aid debugging if configure makes a mistake.
8618 +It was created by $as_me, which was
8619 +generated by GNU Autoconf 2.69. Invocation command line was
8631 +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
8632 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
8633 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
8634 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
8635 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
8637 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
8638 +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
8640 +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
8641 +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
8642 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
8643 +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
8644 +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
8645 +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
8646 +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
8650 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8651 +for as_dir in $PATH
8654 + test -z "$as_dir" && as_dir=.
8655 + $as_echo "PATH: $as_dir"
8661 @@ -1046,7 +1997,6 @@
8666 ac_must_keep_next=false
8669 @@ -1057,13 +2007,13 @@
8670 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
8671 | -silent | --silent | --silen | --sile | --sil)
8673 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
8674 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
8676 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
8679 - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
8680 + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
8682 - ac_configure_args1="$ac_configure_args1 '$ac_arg'"
8683 + as_fn_append ac_configure_args1 " '$ac_arg'"
8684 if test $ac_must_keep_next = true; then
8685 ac_must_keep_next=false # Got value, back to normal.
8687 @@ -1079,104 +2029,115 @@
8688 -* ) ac_must_keep_next=true ;;
8691 - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
8692 - # Get rid of the leading space.
8694 + as_fn_append ac_configure_args " '$ac_arg'"
8699 -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
8700 -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
8701 +{ ac_configure_args0=; unset ac_configure_args0;}
8702 +{ ac_configure_args1=; unset ac_configure_args1;}
8704 # When interrupted or exit'd, cleanup temporary files, and complete
8705 # config.log. We remove comments because anyway the quotes in there
8706 # would cause problems or look ugly.
8707 -# WARNING: Be sure not to use single quotes in there, as some shells,
8708 -# such as our DU 5.0 friend, will then `close' the trap.
8709 +# WARNING: Use '\'' to represent an apostrophe within the trap.
8710 +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
8711 trap 'exit_status=$?
8712 # Save into config.log some information that might help in debugging.
8717 -## ---------------- ##
8718 + $as_echo "## ---------------- ##
8719 ## Cache variables. ##
8720 -## ---------------- ##
8722 +## ---------------- ##"
8724 # The following way of writing the cache mishandles newlines in values,
8727 + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
8728 + eval ac_val=\$$ac_var
8729 + case $ac_val in #(
8731 + case $ac_var in #(
8732 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
8733 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
8735 + case $ac_var in #(
8736 + _ | IFS | as_nl) ;; #(
8737 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
8738 + *) { eval $ac_var=; unset $ac_var;} ;;
8743 - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
8745 + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
8746 + *${as_nl}ac_space=\ *)
8748 - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
8749 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
8751 + "s/'\''/'\''\\\\'\'''\''/g;
8752 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
8756 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
8757 + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
8767 -## ----------------- ##
8768 + $as_echo "## ----------------- ##
8769 ## Output variables. ##
8770 -## ----------------- ##
8772 +## ----------------- ##"
8774 for ac_var in $ac_subst_vars
8776 - eval ac_val=$`echo $ac_var`
8777 - echo "$ac_var='"'"'$ac_val'"'"'"
8778 + eval ac_val=\$$ac_var
8780 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
8782 + $as_echo "$ac_var='\''$ac_val'\''"
8786 if test -n "$ac_subst_files"; then
8788 -## ------------- ##
8789 -## Output files. ##
8790 -## ------------- ##
8792 + $as_echo "## ------------------- ##
8793 +## File substitutions. ##
8794 +## ------------------- ##"
8796 for ac_var in $ac_subst_files
8798 - eval ac_val=$`echo $ac_var`
8799 - echo "$ac_var='"'"'$ac_val'"'"'"
8800 + eval ac_val=\$$ac_var
8802 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
8804 + $as_echo "$ac_var='\''$ac_val'\''"
8809 if test -s confdefs.h; then
8812 + $as_echo "## ----------- ##
8818 - sed "/^$/d" confdefs.h | sort
8822 test "$ac_signal" != 0 &&
8823 - echo "$as_me: caught signal $ac_signal"
8824 - echo "$as_me: exit $exit_status"
8825 + $as_echo "$as_me: caught signal $ac_signal"
8826 + $as_echo "$as_me: exit $exit_status"
8828 - rm -f core *.core &&
8829 - rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
8830 + rm -f core *.core core.conftest.* &&
8831 + rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
8835 for ac_signal in 1 2 13 15; do
8836 - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
8837 + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
8841 # confdefs.h avoids OS command line length limits that DEFS can exceed.
8842 -rm -rf conftest* confdefs.h
8843 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
8845 +rm -f -r conftest* confdefs.h
8847 +$as_echo "/* confdefs.h */" > confdefs.h
8849 # Predefined preprocessor variables.
8851 @@ -1184,112 +2145,138 @@
8852 #define PACKAGE_NAME "$PACKAGE_NAME"
8856 cat >>confdefs.h <<_ACEOF
8857 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
8861 cat >>confdefs.h <<_ACEOF
8862 #define PACKAGE_VERSION "$PACKAGE_VERSION"
8866 cat >>confdefs.h <<_ACEOF
8867 #define PACKAGE_STRING "$PACKAGE_STRING"
8871 cat >>confdefs.h <<_ACEOF
8872 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
8875 +cat >>confdefs.h <<_ACEOF
8876 +#define PACKAGE_URL "$PACKAGE_URL"
8880 # Let the site file select an alternate cache file if it wants to.
8881 -# Prefer explicitly selected file to automatically selected ones.
8882 -if test -z "$CONFIG_SITE"; then
8883 - if test "x$prefix" != xNONE; then
8884 - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
8886 - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
8889 -for ac_site_file in $CONFIG_SITE; do
8890 - if test -r "$ac_site_file"; then
8891 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
8892 -echo "$as_me: loading site script $ac_site_file" >&6;}
8893 +# Prefer an explicitly selected file to automatically selected ones.
8896 +if test -n "$CONFIG_SITE"; then
8897 + # We do not want a PATH search for config.site.
8898 + case $CONFIG_SITE in #((
8899 + -*) ac_site_file1=./$CONFIG_SITE;;
8900 + */*) ac_site_file1=$CONFIG_SITE;;
8901 + *) ac_site_file1=./$CONFIG_SITE;;
8903 +elif test "x$prefix" != xNONE; then
8904 + ac_site_file1=$prefix/share/config.site
8905 + ac_site_file2=$prefix/etc/config.site
8907 + ac_site_file1=$ac_default_prefix/share/config.site
8908 + ac_site_file2=$ac_default_prefix/etc/config.site
8910 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
8912 + test "x$ac_site_file" = xNONE && continue
8913 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
8914 + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
8915 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
8916 sed 's/^/| /' "$ac_site_file" >&5
8918 + . "$ac_site_file" \
8919 + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8920 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8921 +as_fn_error $? "failed to load site script $ac_site_file
8922 +See \`config.log' for more details" "$LINENO" 5; }
8926 if test -r "$cache_file"; then
8927 - # Some versions of bash will fail to source /dev/null (special
8928 - # files actually), so we avoid doing that.
8929 - if test -f "$cache_file"; then
8930 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
8931 -echo "$as_me: loading cache $cache_file" >&6;}
8932 + # Some versions of bash will fail to source /dev/null (special files
8933 + # actually), so we avoid doing that. DJGPP emulates it as a regular file.
8934 + if test /dev/null != "$cache_file" && test -f "$cache_file"; then
8935 + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
8936 +$as_echo "$as_me: loading cache $cache_file" >&6;}
8938 - [\\/]* | ?:[\\/]* ) . $cache_file;;
8939 - *) . ./$cache_file;;
8940 + [\\/]* | ?:[\\/]* ) . "$cache_file";;
8941 + *) . "./$cache_file";;
8945 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
8946 -echo "$as_me: creating cache $cache_file" >&6;}
8947 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
8948 +$as_echo "$as_me: creating cache $cache_file" >&6;}
8952 +gt_needs="$gt_needs "
8953 # Check that the precious variables saved in the cache have kept the same
8955 ac_cache_corrupted=false
8956 -for ac_var in `(set) 2>&1 |
8957 - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
8958 +for ac_var in $ac_precious_vars; do
8959 eval ac_old_set=\$ac_cv_env_${ac_var}_set
8960 eval ac_new_set=\$ac_env_${ac_var}_set
8961 - eval ac_old_val="\$ac_cv_env_${ac_var}_value"
8962 - eval ac_new_val="\$ac_env_${ac_var}_value"
8963 + eval ac_old_val=\$ac_cv_env_${ac_var}_value
8964 + eval ac_new_val=\$ac_env_${ac_var}_value
8965 case $ac_old_set,$ac_new_set in
8967 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
8968 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
8969 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
8970 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
8971 ac_cache_corrupted=: ;;
8973 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
8974 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
8975 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
8976 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
8977 ac_cache_corrupted=: ;;
8980 if test "x$ac_old_val" != "x$ac_new_val"; then
8981 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
8982 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
8983 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
8984 -echo "$as_me: former value: $ac_old_val" >&2;}
8985 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
8986 -echo "$as_me: current value: $ac_new_val" >&2;}
8987 - ac_cache_corrupted=:
8988 + # differences in whitespace do not lead to failure.
8989 + ac_old_val_w=`echo x $ac_old_val`
8990 + ac_new_val_w=`echo x $ac_new_val`
8991 + if test "$ac_old_val_w" != "$ac_new_val_w"; then
8992 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
8993 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
8994 + ac_cache_corrupted=:
8996 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
8997 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
8998 + eval $ac_var=\$ac_old_val
9000 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
9001 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
9002 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
9003 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
9006 # Pass precious variables to config.status.
9007 if test "$ac_new_set" = set; then
9009 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
9010 - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
9011 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
9012 *) ac_arg=$ac_var=$ac_new_val ;;
9014 case " $ac_configure_args " in
9015 *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
9016 - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
9017 + *) as_fn_append ac_configure_args " '$ac_arg'" ;;
9021 if $ac_cache_corrupted; then
9022 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
9023 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
9024 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
9025 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
9026 - { (exit 1); exit 1; }; }
9028 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9029 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9030 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
9031 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
9032 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
9034 +## -------------------- ##
9035 +## Main body of script. ##
9036 +## -------------------- ##
9039 ac_cpp='$CPP $CPPFLAGS'
9040 @@ -1299,47 +2286,36 @@
9044 +am__api_version='1.11'
9061 -am__api_version="1.9"
9063 -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
9064 - if test -f $ac_dir/install-sh; then
9065 +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
9066 + if test -f "$ac_dir/install-sh"; then
9068 ac_install_sh="$ac_aux_dir/install-sh -c"
9070 - elif test -f $ac_dir/install.sh; then
9071 + elif test -f "$ac_dir/install.sh"; then
9073 ac_install_sh="$ac_aux_dir/install.sh -c"
9075 - elif test -f $ac_dir/shtool; then
9076 + elif test -f "$ac_dir/shtool"; then
9078 ac_install_sh="$ac_aux_dir/shtool install -c"
9082 if test -z "$ac_aux_dir"; then
9083 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
9084 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
9085 - { (exit 1); exit 1; }; }
9087 -ac_config_guess="$SHELL $ac_aux_dir/config.guess"
9088 -ac_config_sub="$SHELL $ac_aux_dir/config.sub"
9089 -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
9090 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
9093 +# These three variables are undocumented and unsupported,
9094 +# and are intended to be withdrawn in a future Autoconf release.
9095 +# They can cause serious problems if a builder's source tree is in a directory
9096 +# whose full name contains unusual characters.
9097 +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
9098 +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
9099 +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
9102 # Find a good install program. We prefer a C program (faster),
9103 # so one script is as good as another. But avoid the broken or
9104 @@ -1354,22 +2330,23 @@
9105 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
9106 # OS/2's system install, which has a completely different semantic
9107 # ./install, which can be erroneously created by make from ./install.sh.
9108 -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
9109 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
9110 +# Reject install programs that cannot install multiple files.
9111 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
9112 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
9113 if test -z "$INSTALL"; then
9114 -if test "${ac_cv_path_install+set}" = set; then
9115 - echo $ECHO_N "(cached) $ECHO_C" >&6
9116 +if ${ac_cv_path_install+:} false; then :
9117 + $as_echo_n "(cached) " >&6
9119 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9123 test -z "$as_dir" && as_dir=.
9124 - # Account for people who put trailing slashes in PATH elements.
9126 - ./ | .// | /cC/* | \
9127 + # Account for people who put trailing slashes in PATH elements.
9128 +case $as_dir/ in #((
9129 + ./ | .// | /[cC]/* | \
9130 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
9131 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
9132 + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
9135 # OSF1 and SCO ODT 3.0 have their own names for install.
9136 @@ -1377,7 +2354,7 @@
9138 for ac_prog in ginstall scoinst install; do
9139 for ac_exec_ext in '' $ac_executable_extensions; do
9140 - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
9141 + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
9142 if test $ac_prog = install &&
9143 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
9144 # AIX install. It has an incompatible calling convention.
9145 @@ -1387,30 +2364,43 @@
9146 # program-specific install script used by HP pwplus--don't use.
9149 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
9151 + rm -rf conftest.one conftest.two conftest.dir
9152 + echo one > conftest.one
9153 + echo two > conftest.two
9154 + mkdir conftest.dir
9155 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
9156 + test -s conftest.one && test -s conftest.two &&
9157 + test -s conftest.dir/conftest.one &&
9158 + test -s conftest.dir/conftest.two
9160 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
9174 +rm -rf conftest.one conftest.two conftest.dir
9177 if test "${ac_cv_path_install+set}" = set; then
9178 INSTALL=$ac_cv_path_install
9180 - # As a last resort, use the slow shell script. We don't cache a
9181 - # path for INSTALL within a source directory, because that will
9182 + # As a last resort, use the slow shell script. Don't cache a
9183 + # value for INSTALL within a source directory, because that will
9184 # break other packages using the cache if that directory is
9185 - # removed, or if the path is relative.
9186 + # removed, or if the value is a relative name.
9187 INSTALL=$ac_install_sh
9190 -echo "$as_me:$LINENO: result: $INSTALL" >&5
9191 -echo "${ECHO_T}$INSTALL" >&6
9192 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
9193 +$as_echo "$INSTALL" >&6; }
9195 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
9196 # It thinks the first close brace ends the variable substitution.
9197 @@ -1420,21 +2410,34 @@
9199 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
9201 -echo "$as_me:$LINENO: checking whether build environment is sane" >&5
9202 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
9203 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
9204 +$as_echo_n "checking whether build environment is sane... " >&6; }
9207 echo timestamp > conftest.file
9208 +# Reject unsafe characters in $srcdir or the absolute working directory
9209 +# name. Accept space and tab only in the latter.
9213 + *[\\\"\#\$\&\'\`$am_lf]*)
9214 + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
9217 + *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
9218 + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
9221 # Do `set' in a subshell so we don't clobber the current shell's
9222 # arguments. Must try -L first in case configure is actually a
9223 # symlink; some systems play weird games with the mod time of symlinks
9224 # (eg FreeBSD returns the mod time of the symlink's containing
9227 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
9228 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
9229 if test "$*" = "X"; then
9231 - set X `ls -t $srcdir/configure conftest.file`
9232 + set X `ls -t "$srcdir/configure" conftest.file`
9235 if test "$*" != "X $srcdir/configure conftest.file" \
9236 @@ -1444,11 +2447,8 @@
9237 # if, for instance, CONFIG_SHELL is bash and it inherits a
9238 # broken ls alias from the environment. This has actually
9239 # happened. Such a system could not be considered "sane".
9240 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
9241 -alias in your environment" >&5
9242 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
9243 -alias in your environment" >&2;}
9244 - { (exit 1); exit 1; }; }
9245 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
9246 +alias in your environment" "$LINENO" 5
9249 test "$2" = conftest.file
9250 @@ -1457,139 +2457,268 @@
9254 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
9255 -Check your system clock" >&5
9256 -echo "$as_me: error: newly created file is older than distributed files!
9257 -Check your system clock" >&2;}
9258 - { (exit 1); exit 1; }; }
9259 + as_fn_error $? "newly created file is older than distributed files!
9260 +Check your system clock" "$LINENO" 5
9262 -echo "$as_me:$LINENO: result: yes" >&5
9263 -echo "${ECHO_T}yes" >&6
9264 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9265 +$as_echo "yes" >&6; }
9266 test "$program_prefix" != NONE &&
9267 - program_transform_name="s,^,$program_prefix,;$program_transform_name"
9268 + program_transform_name="s&^&$program_prefix&;$program_transform_name"
9269 # Use a double $ so make ignores it.
9270 test "$program_suffix" != NONE &&
9271 - program_transform_name="s,\$,$program_suffix,;$program_transform_name"
9272 -# Double any \ or $. echo might interpret backslashes.
9273 + program_transform_name="s&\$&$program_suffix&;$program_transform_name"
9274 +# Double any \ or $.
9275 # By default was `s,x,x', remove it if useless.
9276 -cat <<\_ACEOF >conftest.sed
9277 -s/[\\$]/&&/g;s/;s,x,x,$//
9279 -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
9281 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
9282 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
9284 # expand $ac_aux_dir to an absolute path
9285 am_aux_dir=`cd $ac_aux_dir && pwd`
9287 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
9288 +if test x"${MISSING+set}" != xset; then
9289 + case $am_aux_dir in
9291 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
9293 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
9296 # Use eval to expand $SHELL
9297 if eval "$MISSING --run true"; then
9298 am_missing_run="$MISSING --run "
9301 - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
9302 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
9303 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
9304 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
9307 -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
9308 - # We used to keeping the `.' as first argument, in order to
9309 - # allow $(mkdir_p) to be used without argument. As in
9310 - # $(mkdir_p) $(somedir)
9311 - # where $(somedir) is conditionally defined. However this is wrong
9312 - # for two reasons:
9313 - # 1. if the package is installed by a user who cannot write `.'
9314 - # make install will fail,
9315 - # 2. the above comment should most certainly read
9316 - # $(mkdir_p) $(DESTDIR)$(somedir)
9317 - # so it does not work when $(somedir) is undefined and
9318 - # $(DESTDIR) is not.
9319 - # To support the latter case, we have to write
9320 - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
9321 - # so the `.' trick is pointless.
9322 - mkdir_p='mkdir -p --'
9324 - # On NextStep and OpenStep, the `mkdir' command does not
9325 - # recognize any option. It will interpret all options as
9326 - # directories to create, and then abort because `.' already
9328 - for d in ./-p ./--version;
9330 - test -d $d && rmdir $d
9332 - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
9333 - if test -f "$ac_aux_dir/mkinstalldirs"; then
9334 - mkdir_p='$(mkinstalldirs)'
9336 - mkdir_p='$(install_sh) -d'
9338 +if test x"${install_sh}" != xset; then
9339 + case $am_aux_dir in
9341 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
9343 + install_sh="\${SHELL} $am_aux_dir/install-sh"
9347 -for ac_prog in gawk mawk nawk awk
9349 - # Extract the first word of "$ac_prog", so it can be a program name with args.
9350 -set dummy $ac_prog; ac_word=$2
9351 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9352 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9353 -if test "${ac_cv_prog_AWK+set}" = set; then
9354 - echo $ECHO_N "(cached) $ECHO_C" >&6
9355 +# Installed binaries are usually stripped using `strip' when the user
9356 +# run `make install-strip'. However `strip' might not be the right
9357 +# tool to use in cross-compilation environments, therefore Automake
9358 +# will honor the `STRIP' environment variable to overrule this program.
9359 +if test "$cross_compiling" != no; then
9360 + if test -n "$ac_tool_prefix"; then
9361 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9362 +set dummy ${ac_tool_prefix}strip; ac_word=$2
9363 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9364 +$as_echo_n "checking for $ac_word... " >&6; }
9365 +if ${ac_cv_prog_STRIP+:} false; then :
9366 + $as_echo_n "(cached) " >&6
9368 - if test -n "$AWK"; then
9369 - ac_cv_prog_AWK="$AWK" # Let the user override the test.
9370 + if test -n "$STRIP"; then
9371 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
9373 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9377 test -z "$as_dir" && as_dir=.
9378 - for ac_exec_ext in '' $ac_executable_extensions; do
9379 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9380 - ac_cv_prog_AWK="$ac_prog"
9381 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9382 + for ac_exec_ext in '' $ac_executable_extensions; do
9383 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9384 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
9385 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9395 -AWK=$ac_cv_prog_AWK
9396 -if test -n "$AWK"; then
9397 - echo "$as_me:$LINENO: result: $AWK" >&5
9398 -echo "${ECHO_T}$AWK" >&6
9399 +STRIP=$ac_cv_prog_STRIP
9400 +if test -n "$STRIP"; then
9401 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
9402 +$as_echo "$STRIP" >&6; }
9404 - echo "$as_me:$LINENO: result: no" >&5
9405 -echo "${ECHO_T}no" >&6
9406 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9407 +$as_echo "no" >&6; }
9410 - test -n "$AWK" && break
9413 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
9414 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
9415 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
9416 -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
9417 - echo $ECHO_N "(cached) $ECHO_C" >&6
9419 - cat >conftest.make <<\_ACEOF
9421 - @echo 'ac_maketemp="$(MAKE)"'
9423 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
9424 -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
9425 -if test -n "$ac_maketemp"; then
9426 - eval ac_cv_prog_make_${ac_make}_set=yes
9428 - eval ac_cv_prog_make_${ac_make}_set=no
9430 -rm -f conftest.make
9432 -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
9433 - echo "$as_me:$LINENO: result: yes" >&5
9434 -echo "${ECHO_T}yes" >&6
9436 +if test -z "$ac_cv_prog_STRIP"; then
9437 + ac_ct_STRIP=$STRIP
9438 + # Extract the first word of "strip", so it can be a program name with args.
9439 +set dummy strip; ac_word=$2
9440 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9441 +$as_echo_n "checking for $ac_word... " >&6; }
9442 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
9443 + $as_echo_n "(cached) " >&6
9445 + if test -n "$ac_ct_STRIP"; then
9446 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
9448 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9449 +for as_dir in $PATH
9452 + test -z "$as_dir" && as_dir=.
9453 + for ac_exec_ext in '' $ac_executable_extensions; do
9454 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9455 + ac_cv_prog_ac_ct_STRIP="strip"
9456 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9465 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
9466 +if test -n "$ac_ct_STRIP"; then
9467 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
9468 +$as_echo "$ac_ct_STRIP" >&6; }
9470 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9471 +$as_echo "no" >&6; }
9474 + if test "x$ac_ct_STRIP" = x; then
9477 + case $cross_compiling:$ac_tool_warned in
9479 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9480 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9481 +ac_tool_warned=yes ;;
9483 + STRIP=$ac_ct_STRIP
9486 + STRIP="$ac_cv_prog_STRIP"
9490 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
9492 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
9493 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
9494 +if test -z "$MKDIR_P"; then
9495 + if ${ac_cv_path_mkdir+:} false; then :
9496 + $as_echo_n "(cached) " >&6
9498 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9499 +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
9502 + test -z "$as_dir" && as_dir=.
9503 + for ac_prog in mkdir gmkdir; do
9504 + for ac_exec_ext in '' $ac_executable_extensions; do
9505 + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
9506 + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
9507 + 'mkdir (GNU coreutils) '* | \
9508 + 'mkdir (coreutils) '* | \
9509 + 'mkdir (fileutils) '4.1*)
9510 + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
9520 + test -d ./--version && rmdir ./--version
9521 + if test "${ac_cv_path_mkdir+set}" = set; then
9522 + MKDIR_P="$ac_cv_path_mkdir -p"
9524 + # As a last resort, use the slow shell script. Don't cache a
9525 + # value for MKDIR_P within a source directory, because that will
9526 + # break other packages using the cache if that directory is
9527 + # removed, or if the value is a relative name.
9528 + MKDIR_P="$ac_install_sh -d"
9531 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
9532 +$as_echo "$MKDIR_P" >&6; }
9536 + [\\/$]* | ?:[\\/]*) ;;
9537 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
9540 +for ac_prog in gawk mawk nawk awk
9542 + # Extract the first word of "$ac_prog", so it can be a program name with args.
9543 +set dummy $ac_prog; ac_word=$2
9544 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9545 +$as_echo_n "checking for $ac_word... " >&6; }
9546 +if ${ac_cv_prog_AWK+:} false; then :
9547 + $as_echo_n "(cached) " >&6
9549 + if test -n "$AWK"; then
9550 + ac_cv_prog_AWK="$AWK" # Let the user override the test.
9552 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9553 +for as_dir in $PATH
9556 + test -z "$as_dir" && as_dir=.
9557 + for ac_exec_ext in '' $ac_executable_extensions; do
9558 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9559 + ac_cv_prog_AWK="$ac_prog"
9560 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9569 +AWK=$ac_cv_prog_AWK
9570 +if test -n "$AWK"; then
9571 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
9572 +$as_echo "$AWK" >&6; }
9574 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9575 +$as_echo "no" >&6; }
9579 + test -n "$AWK" && break
9582 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
9583 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
9585 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
9586 +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
9587 + $as_echo_n "(cached) " >&6
9589 + cat >conftest.make <<\_ACEOF
9592 + @echo '@@@%%%=$(MAKE)=@@@%%%'
9594 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
9595 +case `${MAKE-make} -f conftest.make 2>/dev/null` in
9596 + *@@@%%%=?*=@@@%%%*)
9597 + eval ac_cv_prog_make_${ac_make}_set=yes;;
9599 + eval ac_cv_prog_make_${ac_make}_set=no;;
9601 +rm -f conftest.make
9603 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
9604 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9605 +$as_echo "yes" >&6; }
9608 - echo "$as_me:$LINENO: result: no" >&5
9609 -echo "${ECHO_T}no" >&6
9610 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9611 +$as_echo "no" >&6; }
9612 SET_MAKE="MAKE=${MAKE-make}"
9615 @@ -1602,12 +2731,14 @@
9617 rmdir .tst 2>/dev/null
9619 -# test to see if srcdir already configured
9620 -if test "`cd $srcdir && pwd`" != "`pwd`" &&
9621 - test -f $srcdir/config.status; then
9622 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
9623 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
9624 - { (exit 1); exit 1; }; }
9625 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
9626 + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
9627 + # is not polluted with repeated "-I."
9628 + am__isrc=' -I$(srcdir)'
9629 + # test to see if srcdir already configured
9630 + if test -f $srcdir/config.status; then
9631 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
9635 # test whether we have cygpath
9636 @@ -1650,1448 +2781,910 @@
9638 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
9640 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
9641 +# We need awk for the "check" target. The system "awk" is bad on
9643 +# Always define AMTAR for backward compatibility. Yes, it's still used
9644 +# in the wild :-( We should find a proper way to deprecate it ...
9645 +AMTAR='$${TAR-tar}'
9647 -# Installed binaries are usually stripped using `strip' when the user
9648 -# run `make install-strip'. However `strip' might not be the right
9649 -# tool to use in cross-compilation environments, therefore Automake
9650 -# will honor the `STRIP' environment variable to overrule this program.
9651 -if test "$cross_compiling" != no; then
9652 - if test -n "$ac_tool_prefix"; then
9653 - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9654 -set dummy ${ac_tool_prefix}strip; ac_word=$2
9655 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9656 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9657 -if test "${ac_cv_prog_STRIP+set}" = set; then
9658 - echo $ECHO_N "(cached) $ECHO_C" >&6
9659 +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
9665 +ac_config_headers="$ac_config_headers config.h"
9669 +DEPDIR="${am__leading_dot}deps"
9671 +ac_config_commands="$ac_config_commands depfiles"
9674 +am_make=${MAKE-make}
9675 +cat > confinc << 'END'
9677 + @echo this is the am__doit target
9680 +# If we don't find an include directive, just comment out the code.
9681 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
9682 +$as_echo_n "checking for style of include used by $am_make... " >&6; }
9686 +# First try GNU make style include.
9687 +echo "include confinc" > confmf
9688 +# Ignore all kinds of additional output from `make'.
9689 +case `$am_make -s -f confmf 2> /dev/null` in #(
9690 +*the\ am__doit\ target*)
9691 + am__include=include
9696 +# Now try BSD make style include.
9697 +if test "$am__include" = "#"; then
9698 + echo '.include "confinc"' > confmf
9699 + case `$am_make -s -f confmf 2> /dev/null` in #(
9700 + *the\ am__doit\ target*)
9701 + am__include=.include
9709 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
9710 +$as_echo "$_am_result" >&6; }
9711 +rm -f confinc confmf
9713 +# Check whether --enable-dependency-tracking was given.
9714 +if test "${enable_dependency_tracking+set}" = set; then :
9715 + enableval=$enable_dependency_tracking;
9718 +if test "x$enable_dependency_tracking" != xno; then
9719 + am_depcomp="$ac_aux_dir/depcomp"
9720 + AMDEPBACKSLASH='\'
9723 + if test "x$enable_dependency_tracking" != xno; then
9727 - if test -n "$STRIP"; then
9728 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
9735 +ac_cpp='$CPP $CPPFLAGS'
9736 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9737 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9738 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
9739 +if test -n "$ac_tool_prefix"; then
9740 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
9741 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
9742 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9743 +$as_echo_n "checking for $ac_word... " >&6; }
9744 +if ${ac_cv_prog_CC+:} false; then :
9745 + $as_echo_n "(cached) " >&6
9747 + if test -n "$CC"; then
9748 + ac_cv_prog_CC="$CC" # Let the user override the test.
9750 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9754 test -z "$as_dir" && as_dir=.
9755 - for ac_exec_ext in '' $ac_executable_extensions; do
9756 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9757 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
9758 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9759 + for ac_exec_ext in '' $ac_executable_extensions; do
9760 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9761 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
9762 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9772 -STRIP=$ac_cv_prog_STRIP
9773 -if test -n "$STRIP"; then
9774 - echo "$as_me:$LINENO: result: $STRIP" >&5
9775 -echo "${ECHO_T}$STRIP" >&6
9777 +if test -n "$CC"; then
9778 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
9779 +$as_echo "$CC" >&6; }
9781 - echo "$as_me:$LINENO: result: no" >&5
9782 -echo "${ECHO_T}no" >&6
9783 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9784 +$as_echo "no" >&6; }
9789 -if test -z "$ac_cv_prog_STRIP"; then
9790 - ac_ct_STRIP=$STRIP
9791 - # Extract the first word of "strip", so it can be a program name with args.
9792 -set dummy strip; ac_word=$2
9793 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9794 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9795 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
9796 - echo $ECHO_N "(cached) $ECHO_C" >&6
9797 +if test -z "$ac_cv_prog_CC"; then
9799 + # Extract the first word of "gcc", so it can be a program name with args.
9800 +set dummy gcc; ac_word=$2
9801 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9802 +$as_echo_n "checking for $ac_word... " >&6; }
9803 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
9804 + $as_echo_n "(cached) " >&6
9806 - if test -n "$ac_ct_STRIP"; then
9807 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
9808 + if test -n "$ac_ct_CC"; then
9809 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
9811 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9815 test -z "$as_dir" && as_dir=.
9816 - for ac_exec_ext in '' $ac_executable_extensions; do
9817 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9818 - ac_cv_prog_ac_ct_STRIP="strip"
9819 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9820 + for ac_exec_ext in '' $ac_executable_extensions; do
9821 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9822 + ac_cv_prog_ac_ct_CC="gcc"
9823 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9831 - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
9834 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
9835 -if test -n "$ac_ct_STRIP"; then
9836 - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
9837 -echo "${ECHO_T}$ac_ct_STRIP" >&6
9838 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
9839 +if test -n "$ac_ct_CC"; then
9840 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
9841 +$as_echo "$ac_ct_CC" >&6; }
9843 - echo "$as_me:$LINENO: result: no" >&5
9844 -echo "${ECHO_T}no" >&6
9845 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9846 +$as_echo "no" >&6; }
9849 - STRIP=$ac_ct_STRIP
9850 + if test "x$ac_ct_CC" = x; then
9853 + case $cross_compiling:$ac_tool_warned in
9855 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9856 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9857 +ac_tool_warned=yes ;;
9862 - STRIP="$ac_cv_prog_STRIP"
9865 + CC="$ac_cv_prog_CC"
9867 -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
9869 -# We need awk for the "check" target. The system "awk" is bad on
9871 -# Always define AMTAR for backward compatibility.
9873 -AMTAR=${AMTAR-"${am_missing_run}tar"}
9875 -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
9881 - ac_config_headers="$ac_config_headers config.h"
9888 - if test -n "$ac_aux_dir"; then
9889 - case "$ac_aux_dir" in
9890 - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
9891 - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
9894 - if test -z "$MKINSTALLDIRS"; then
9895 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
9896 +if test -z "$CC"; then
9897 + if test -n "$ac_tool_prefix"; then
9898 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
9899 +set dummy ${ac_tool_prefix}cc; ac_word=$2
9900 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9901 +$as_echo_n "checking for $ac_word... " >&6; }
9902 +if ${ac_cv_prog_CC+:} false; then :
9903 + $as_echo_n "(cached) " >&6
9905 + if test -n "$CC"; then
9906 + ac_cv_prog_CC="$CC" # Let the user override the test.
9908 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9909 +for as_dir in $PATH
9912 + test -z "$as_dir" && as_dir=.
9913 + for ac_exec_ext in '' $ac_executable_extensions; do
9914 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9915 + ac_cv_prog_CC="${ac_tool_prefix}cc"
9916 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9925 - echo "$as_me:$LINENO: checking whether NLS is requested" >&5
9926 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
9927 - # Check whether --enable-nls or --disable-nls was given.
9928 -if test "${enable_nls+set}" = set; then
9929 - enableval="$enable_nls"
9930 - USE_NLS=$enableval
9934 +if test -n "$CC"; then
9935 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
9936 +$as_echo "$CC" >&6; }
9940 - echo "$as_me:$LINENO: result: $USE_NLS" >&5
9941 -echo "${ECHO_T}$USE_NLS" >&6
9946 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9947 +$as_echo "no" >&6; }
9951 -# Prepare PATH_SEPARATOR.
9952 -# The user is always right.
9953 -if test "${PATH_SEPARATOR+set}" != set; then
9954 - echo "#! /bin/sh" >conf$$.sh
9955 - echo "exit 0" >>conf$$.sh
9956 - chmod +x conf$$.sh
9957 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
9958 - PATH_SEPARATOR=';'
9965 -# Find out how to test for executable files. Don't use a zero-byte file,
9966 -# as systems may use methods other than mode bits to determine executability.
9967 -cat >conf$$.file <<_ASEOF
9971 -chmod +x conf$$.file
9972 -if test -x conf$$.file >/dev/null 2>&1; then
9973 - ac_executable_p="test -x"
9974 +if test -z "$CC"; then
9975 + # Extract the first word of "cc", so it can be a program name with args.
9976 +set dummy cc; ac_word=$2
9977 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9978 +$as_echo_n "checking for $ac_word... " >&6; }
9979 +if ${ac_cv_prog_CC+:} false; then :
9980 + $as_echo_n "(cached) " >&6
9982 - ac_executable_p="test -f"
9986 -# Extract the first word of "msgfmt", so it can be a program name with args.
9987 -set dummy msgfmt; ac_word=$2
9988 -echo "$as_me:$LINENO: checking for $ac_word" >&5
9989 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9990 -if test "${ac_cv_path_MSGFMT+set}" = set; then
9991 - echo $ECHO_N "(cached) $ECHO_C" >&6
9992 + if test -n "$CC"; then
9993 + ac_cv_prog_CC="$CC" # Let the user override the test.
9996 - [\\/]* | ?:[\\/]*)
9997 - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
10000 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
10001 - for ac_dir in $PATH; do
10002 - IFS="$ac_save_IFS"
10003 - test -z "$ac_dir" && ac_dir=.
10004 - for ac_exec_ext in '' $ac_executable_extensions; do
10005 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
10006 - echo "$as_me: trying $ac_dir/$ac_word..." >&5
10007 - if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
10008 - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
10009 - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
10015 - IFS="$ac_save_IFS"
10016 - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
10019 + ac_prog_rejected=no
10020 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10021 +for as_dir in $PATH
10024 + test -z "$as_dir" && as_dir=.
10025 + for ac_exec_ext in '' $ac_executable_extensions; do
10026 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10027 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
10028 + ac_prog_rejected=yes
10031 + ac_cv_prog_CC="cc"
10032 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10039 +if test $ac_prog_rejected = yes; then
10040 + # We found a bogon in the path, so make sure we never use it.
10041 + set dummy $ac_cv_prog_CC
10043 + if test $# != 0; then
10044 + # We chose a different compiler from the bogus one.
10045 + # However, it has the same basename, so the bogon will be chosen
10046 + # first if we set CC to just the basename; use the full file name.
10048 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
10051 -MSGFMT="$ac_cv_path_MSGFMT"
10052 -if test "$MSGFMT" != ":"; then
10053 - echo "$as_me:$LINENO: result: $MSGFMT" >&5
10054 -echo "${ECHO_T}$MSGFMT" >&6
10058 +if test -n "$CC"; then
10059 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
10060 +$as_echo "$CC" >&6; }
10062 - echo "$as_me:$LINENO: result: no" >&5
10063 -echo "${ECHO_T}no" >&6
10064 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10065 +$as_echo "no" >&6; }
10068 - # Extract the first word of "gmsgfmt", so it can be a program name with args.
10069 -set dummy gmsgfmt; ac_word=$2
10070 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10071 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10072 -if test "${ac_cv_path_GMSGFMT+set}" = set; then
10073 - echo $ECHO_N "(cached) $ECHO_C" >&6
10076 +if test -z "$CC"; then
10077 + if test -n "$ac_tool_prefix"; then
10078 + for ac_prog in cl.exe
10080 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10081 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10082 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10083 +$as_echo_n "checking for $ac_word... " >&6; }
10084 +if ${ac_cv_prog_CC+:} false; then :
10085 + $as_echo_n "(cached) " >&6
10088 - [\\/]* | ?:[\\/]*)
10089 - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
10092 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10093 + if test -n "$CC"; then
10094 + ac_cv_prog_CC="$CC" # Let the user override the test.
10096 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10097 for as_dir in $PATH
10100 test -z "$as_dir" && as_dir=.
10101 - for ac_exec_ext in '' $ac_executable_extensions; do
10102 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10103 - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
10104 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10105 + for ac_exec_ext in '' $ac_executable_extensions; do
10106 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10107 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
10108 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10116 - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
10120 -GMSGFMT=$ac_cv_path_GMSGFMT
10122 -if test -n "$GMSGFMT"; then
10123 - echo "$as_me:$LINENO: result: $GMSGFMT" >&5
10124 -echo "${ECHO_T}$GMSGFMT" >&6
10127 +if test -n "$CC"; then
10128 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
10129 +$as_echo "$CC" >&6; }
10131 - echo "$as_me:$LINENO: result: no" >&5
10132 -echo "${ECHO_T}no" >&6
10133 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10134 +$as_echo "no" >&6; }
10139 -# Prepare PATH_SEPARATOR.
10140 -# The user is always right.
10141 -if test "${PATH_SEPARATOR+set}" != set; then
10142 - echo "#! /bin/sh" >conf$$.sh
10143 - echo "exit 0" >>conf$$.sh
10144 - chmod +x conf$$.sh
10145 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
10146 - PATH_SEPARATOR=';'
10151 + test -n "$CC" && break
10155 -# Find out how to test for executable files. Don't use a zero-byte file,
10156 -# as systems may use methods other than mode bits to determine executability.
10157 -cat >conf$$.file <<_ASEOF
10161 -chmod +x conf$$.file
10162 -if test -x conf$$.file >/dev/null 2>&1; then
10163 - ac_executable_p="test -x"
10164 +if test -z "$CC"; then
10166 + for ac_prog in cl.exe
10168 + # Extract the first word of "$ac_prog", so it can be a program name with args.
10169 +set dummy $ac_prog; ac_word=$2
10170 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10171 +$as_echo_n "checking for $ac_word... " >&6; }
10172 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
10173 + $as_echo_n "(cached) " >&6
10175 - ac_executable_p="test -f"
10179 -# Extract the first word of "xgettext", so it can be a program name with args.
10180 -set dummy xgettext; ac_word=$2
10181 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10182 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10183 -if test "${ac_cv_path_XGETTEXT+set}" = set; then
10184 - echo $ECHO_N "(cached) $ECHO_C" >&6
10185 + if test -n "$ac_ct_CC"; then
10186 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
10188 - case "$XGETTEXT" in
10189 - [\\/]* | ?:[\\/]*)
10190 - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
10193 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
10194 - for ac_dir in $PATH; do
10195 - IFS="$ac_save_IFS"
10196 - test -z "$ac_dir" && ac_dir=.
10197 - for ac_exec_ext in '' $ac_executable_extensions; do
10198 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
10199 - echo "$as_me: trying $ac_dir/$ac_word..." >&5
10200 - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
10201 - (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); then
10202 - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
10208 - IFS="$ac_save_IFS"
10209 - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
10212 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10213 +for as_dir in $PATH
10216 + test -z "$as_dir" && as_dir=.
10217 + for ac_exec_ext in '' $ac_executable_extensions; do
10218 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10219 + ac_cv_prog_ac_ct_CC="$ac_prog"
10220 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10228 -XGETTEXT="$ac_cv_path_XGETTEXT"
10229 -if test "$XGETTEXT" != ":"; then
10230 - echo "$as_me:$LINENO: result: $XGETTEXT" >&5
10231 -echo "${ECHO_T}$XGETTEXT" >&6
10233 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
10234 +if test -n "$ac_ct_CC"; then
10235 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
10236 +$as_echo "$ac_ct_CC" >&6; }
10238 - echo "$as_me:$LINENO: result: no" >&5
10239 -echo "${ECHO_T}no" >&6
10240 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10241 +$as_echo "no" >&6; }
10244 - rm -f messages.po
10246 + test -n "$ac_ct_CC" && break
10249 -# Prepare PATH_SEPARATOR.
10250 -# The user is always right.
10251 -if test "${PATH_SEPARATOR+set}" != set; then
10252 - echo "#! /bin/sh" >conf$$.sh
10253 - echo "exit 0" >>conf$$.sh
10254 - chmod +x conf$$.sh
10255 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
10256 - PATH_SEPARATOR=';'
10257 + if test "x$ac_ct_CC" = x; then
10261 + case $cross_compiling:$ac_tool_warned in
10263 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10264 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10265 +ac_tool_warned=yes ;;
10272 -# Find out how to test for executable files. Don't use a zero-byte file,
10273 -# as systems may use methods other than mode bits to determine executability.
10274 -cat >conf$$.file <<_ASEOF
10278 -chmod +x conf$$.file
10279 -if test -x conf$$.file >/dev/null 2>&1; then
10280 - ac_executable_p="test -x"
10282 - ac_executable_p="test -f"
10286 -# Extract the first word of "msgmerge", so it can be a program name with args.
10287 -set dummy msgmerge; ac_word=$2
10288 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10289 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10290 -if test "${ac_cv_path_MSGMERGE+set}" = set; then
10291 - echo $ECHO_N "(cached) $ECHO_C" >&6
10293 - case "$MSGMERGE" in
10294 - [\\/]* | ?:[\\/]*)
10295 - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
10298 - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
10299 - for ac_dir in $PATH; do
10300 - IFS="$ac_save_IFS"
10301 - test -z "$ac_dir" && ac_dir=.
10302 - for ac_exec_ext in '' $ac_executable_extensions; do
10303 - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
10304 - echo "$as_me: trying $ac_dir/$ac_word..." >&5
10305 - if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
10306 - ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
10312 - IFS="$ac_save_IFS"
10313 - test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
10317 -MSGMERGE="$ac_cv_path_MSGMERGE"
10318 -if test "$MSGMERGE" != ":"; then
10319 - echo "$as_me:$LINENO: result: $MSGMERGE" >&5
10320 -echo "${ECHO_T}$MSGMERGE" >&6
10322 - echo "$as_me:$LINENO: result: no" >&5
10323 -echo "${ECHO_T}no" >&6
10327 - if test "$GMSGFMT" != ":"; then
10328 - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
10329 - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
10332 - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
10333 - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
10334 -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
10338 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10339 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10340 +as_fn_error $? "no acceptable C compiler found in \$PATH
10341 +See \`config.log' for more details" "$LINENO" 5; }
10343 - if test "$XGETTEXT" != ":"; then
10344 - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
10345 - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
10348 - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
10349 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
10352 - rm -f messages.po
10353 +# Provide some information about the compiler.
10354 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
10357 +for ac_option in --version -v -V -qversion; do
10358 + { { ac_try="$ac_compiler $ac_option >&5"
10359 +case "(($ac_try" in
10360 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10361 + *) ac_try_echo=$ac_try;;
10363 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
10364 +$as_echo "$ac_try_echo"; } >&5
10365 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err
10367 + if test -s conftest.err; then
10369 +... rest of stderr output deleted ...
10370 + 10q' conftest.err >conftest.er1
10371 + cat conftest.er1 >&5
10373 + rm -f conftest.er1 conftest.err
10374 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10375 + test $ac_status = 0; }
10378 - ac_config_commands="$ac_config_commands default-1"
10380 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10381 +/* end confdefs.h. */
10383 -DEPDIR="${am__leading_dot}deps"
10388 - ac_config_commands="$ac_config_commands depfiles"
10391 -am_make=${MAKE-make}
10392 -cat > confinc << 'END'
10397 -# If we don't find an include directive, just comment out the code.
10398 -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
10399 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
10403 -# First try GNU make style include.
10404 -echo "include confinc" > confmf
10405 -# We grep out `Entering directory' and `Leaving directory'
10406 -# messages which can occur if `w' ends up in MAKEFLAGS.
10407 -# In particular we don't look at `^make:' because GNU make might
10408 -# be invoked under some other name (usually "gmake"), in which
10409 -# case it prints its new name instead of `make'.
10410 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
10411 - am__include=include
10415 -# Now try BSD make style include.
10416 -if test "$am__include" = "#"; then
10417 - echo '.include "confinc"' > confmf
10418 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
10419 - am__include=.include
10428 +ac_clean_files_save=$ac_clean_files
10429 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
10430 +# Try to create an executable without -o first, disregard a.out.
10431 +# It will help us diagnose broken compilers, and finding out an intuition
10433 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
10434 +$as_echo_n "checking whether the C compiler works... " >&6; }
10435 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
10437 +# The possible output files:
10438 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
10440 -echo "$as_me:$LINENO: result: $_am_result" >&5
10441 -echo "${ECHO_T}$_am_result" >&6
10442 -rm -f confinc confmf
10444 +for ac_file in $ac_files
10447 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
10448 + * ) ac_rmfiles="$ac_rmfiles $ac_file";;
10453 -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
10454 -if test "${enable_dependency_tracking+set}" = set; then
10455 - enableval="$enable_dependency_tracking"
10456 +if { { ac_try="$ac_link_default"
10457 +case "(($ac_try" in
10458 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10459 + *) ac_try_echo=$ac_try;;
10461 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
10462 +$as_echo "$ac_try_echo"; } >&5
10463 + (eval "$ac_link_default") 2>&5
10465 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10466 + test $ac_status = 0; }; then :
10467 + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
10468 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
10469 +# in a Makefile. We should not override ac_cv_exeext if it was cached,
10470 +# so that the user can short-circuit this test for compilers unknown to
10472 +for ac_file in $ac_files ''
10474 + test -f "$ac_file" || continue
10476 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
10479 + # We found the default executable, but exeext='' is most
10480 + # certainly right.
10483 + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
10485 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
10487 + # We set ac_cv_exeext here because the later test for it is not
10488 + # safe: cross compilers may not add the suffix if given an `-o'
10489 + # argument, so we may need to know it at that point already.
10490 + # Even if this section looks crufty: it has the advantage of
10491 + # actually working.
10497 +test "$ac_cv_exeext" = no && ac_cv_exeext=
10500 -if test "x$enable_dependency_tracking" != xno; then
10501 - am_depcomp="$ac_aux_dir/depcomp"
10502 - AMDEPBACKSLASH='\'
10506 +if test -z "$ac_file"; then :
10507 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10508 +$as_echo "no" >&6; }
10509 +$as_echo "$as_me: failed program was:" >&5
10510 +sed 's/^/| /' conftest.$ac_ext >&5
10513 -if test "x$enable_dependency_tracking" != xno; then
10516 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10517 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10518 +as_fn_error 77 "C compiler cannot create executables
10519 +See \`config.log' for more details" "$LINENO" 5; }
10523 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10524 +$as_echo "yes" >&6; }
10526 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
10527 +$as_echo_n "checking for C compiler default output file name... " >&6; }
10528 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
10529 +$as_echo "$ac_file" >&6; }
10530 +ac_exeext=$ac_cv_exeext
10532 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
10533 +ac_clean_files=$ac_clean_files_save
10534 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
10535 +$as_echo_n "checking for suffix of executables... " >&6; }
10536 +if { { ac_try="$ac_link"
10537 +case "(($ac_try" in
10538 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10539 + *) ac_try_echo=$ac_try;;
10541 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
10542 +$as_echo "$ac_try_echo"; } >&5
10543 + (eval "$ac_link") 2>&5
10545 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10546 + test $ac_status = 0; }; then :
10547 + # If both `conftest.exe' and `conftest' are `present' (well, observable)
10548 +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
10549 +# work properly (i.e., refer to `conftest.exe'), while it won't with
10551 +for ac_file in conftest.exe conftest conftest.*; do
10552 + test -f "$ac_file" || continue
10554 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
10555 + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
10561 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10562 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10563 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
10564 +See \`config.log' for more details" "$LINENO" 5; }
10566 +rm -f conftest conftest$ac_cv_exeext
10567 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
10568 +$as_echo "$ac_cv_exeext" >&6; }
10570 +rm -f conftest.$ac_ext
10571 +EXEEXT=$ac_cv_exeext
10573 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10574 +/* end confdefs.h. */
10575 +#include <stdio.h>
10579 +FILE *f = fopen ("conftest.out", "w");
10580 + return ferror (f) || fclose (f) != 0;
10583 -ac_cpp='$CPP $CPPFLAGS'
10584 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10585 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10586 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
10587 -if test -n "$ac_tool_prefix"; then
10588 - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
10589 -set dummy ${ac_tool_prefix}gcc; ac_word=$2
10590 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10591 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10592 -if test "${ac_cv_prog_CC+set}" = set; then
10593 - echo $ECHO_N "(cached) $ECHO_C" >&6
10595 - if test -n "$CC"; then
10596 - ac_cv_prog_CC="$CC" # Let the user override the test.
10598 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10599 -for as_dir in $PATH
10602 - test -z "$as_dir" && as_dir=.
10603 - for ac_exec_ext in '' $ac_executable_extensions; do
10604 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10605 - ac_cv_prog_CC="${ac_tool_prefix}gcc"
10606 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10612 +ac_clean_files="$ac_clean_files conftest.out"
10613 +# Check that the compiler produces executables we can run. If not, either
10614 +# the compiler is broken, or we cross compile.
10615 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
10616 +$as_echo_n "checking whether we are cross compiling... " >&6; }
10617 +if test "$cross_compiling" != yes; then
10618 + { { ac_try="$ac_link"
10619 +case "(($ac_try" in
10620 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10621 + *) ac_try_echo=$ac_try;;
10623 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
10624 +$as_echo "$ac_try_echo"; } >&5
10625 + (eval "$ac_link") 2>&5
10627 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10628 + test $ac_status = 0; }
10629 + if { ac_try='./conftest$ac_cv_exeext'
10630 + { { case "(($ac_try" in
10631 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10632 + *) ac_try_echo=$ac_try;;
10634 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
10635 +$as_echo "$ac_try_echo"; } >&5
10636 + (eval "$ac_try") 2>&5
10638 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10639 + test $ac_status = 0; }; }; then
10640 + cross_compiling=no
10642 + if test "$cross_compiling" = maybe; then
10643 + cross_compiling=yes
10645 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10646 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10647 +as_fn_error $? "cannot run C compiled programs.
10648 +If you meant to cross compile, use \`--host'.
10649 +See \`config.log' for more details" "$LINENO" 5; }
10658 -if test -n "$CC"; then
10659 - echo "$as_me:$LINENO: result: $CC" >&5
10660 -echo "${ECHO_T}$CC" >&6
10662 - echo "$as_me:$LINENO: result: no" >&5
10663 -echo "${ECHO_T}no" >&6
10665 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
10666 +$as_echo "$cross_compiling" >&6; }
10669 -if test -z "$ac_cv_prog_CC"; then
10671 - # Extract the first word of "gcc", so it can be a program name with args.
10672 -set dummy gcc; ac_word=$2
10673 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10674 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10675 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
10676 - echo $ECHO_N "(cached) $ECHO_C" >&6
10678 - if test -n "$ac_ct_CC"; then
10679 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
10680 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
10681 +ac_clean_files=$ac_clean_files_save
10682 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
10683 +$as_echo_n "checking for suffix of object files... " >&6; }
10684 +if ${ac_cv_objext+:} false; then :
10685 + $as_echo_n "(cached) " >&6
10687 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10688 -for as_dir in $PATH
10691 - test -z "$as_dir" && as_dir=.
10692 - for ac_exec_ext in '' $ac_executable_extensions; do
10693 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10694 - ac_cv_prog_ac_ct_CC="gcc"
10695 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10699 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10700 +/* end confdefs.h. */
10710 +rm -f conftest.o conftest.obj
10711 +if { { ac_try="$ac_compile"
10712 +case "(($ac_try" in
10713 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10714 + *) ac_try_echo=$ac_try;;
10716 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
10717 +$as_echo "$ac_try_echo"; } >&5
10718 + (eval "$ac_compile") 2>&5
10720 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10721 + test $ac_status = 0; }; then :
10722 + for ac_file in conftest.o conftest.obj conftest.*; do
10723 + test -f "$ac_file" || continue;
10725 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
10726 + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
10731 + $as_echo "$as_me: failed program was:" >&5
10732 +sed 's/^/| /' conftest.$ac_ext >&5
10734 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10735 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10736 +as_fn_error $? "cannot compute suffix of object files: cannot compile
10737 +See \`config.log' for more details" "$LINENO" 5; }
10739 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
10741 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
10742 -if test -n "$ac_ct_CC"; then
10743 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
10744 -echo "${ECHO_T}$ac_ct_CC" >&6
10745 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
10746 +$as_echo "$ac_cv_objext" >&6; }
10747 +OBJEXT=$ac_cv_objext
10749 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
10750 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
10751 +if ${ac_cv_c_compiler_gnu+:} false; then :
10752 + $as_echo_n "(cached) " >&6
10754 - echo "$as_me:$LINENO: result: no" >&5
10755 -echo "${ECHO_T}no" >&6
10757 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10758 +/* end confdefs.h. */
10762 - CC="$ac_cv_prog_CC"
10771 -if test -z "$CC"; then
10772 - if test -n "$ac_tool_prefix"; then
10773 - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
10774 -set dummy ${ac_tool_prefix}cc; ac_word=$2
10775 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10776 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10777 -if test "${ac_cv_prog_CC+set}" = set; then
10778 - echo $ECHO_N "(cached) $ECHO_C" >&6
10780 - if test -n "$CC"; then
10781 - ac_cv_prog_CC="$CC" # Let the user override the test.
10786 +if ac_fn_c_try_compile "$LINENO"; then :
10787 + ac_compiler_gnu=yes
10789 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10790 -for as_dir in $PATH
10793 - test -z "$as_dir" && as_dir=.
10794 - for ac_exec_ext in '' $ac_executable_extensions; do
10795 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10796 - ac_cv_prog_CC="${ac_tool_prefix}cc"
10797 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10803 + ac_compiler_gnu=no
10805 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10806 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
10810 -if test -n "$CC"; then
10811 - echo "$as_me:$LINENO: result: $CC" >&5
10812 -echo "${ECHO_T}$CC" >&6
10813 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
10814 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
10815 +if test $ac_compiler_gnu = yes; then
10818 - echo "$as_me:$LINENO: result: no" >&5
10819 -echo "${ECHO_T}no" >&6
10822 +ac_test_CFLAGS=${CFLAGS+set}
10823 +ac_save_CFLAGS=$CFLAGS
10824 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
10825 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
10826 +if ${ac_cv_prog_cc_g+:} false; then :
10827 + $as_echo_n "(cached) " >&6
10829 + ac_save_c_werror_flag=$ac_c_werror_flag
10830 + ac_c_werror_flag=yes
10831 + ac_cv_prog_cc_g=no
10833 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10834 +/* end confdefs.h. */
10837 -if test -z "$ac_cv_prog_CC"; then
10839 - # Extract the first word of "cc", so it can be a program name with args.
10840 -set dummy cc; ac_word=$2
10841 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10842 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10843 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
10844 - echo $ECHO_N "(cached) $ECHO_C" >&6
10853 +if ac_fn_c_try_compile "$LINENO"; then :
10854 + ac_cv_prog_cc_g=yes
10856 - if test -n "$ac_ct_CC"; then
10857 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
10859 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10860 +/* end confdefs.h. */
10870 +if ac_fn_c_try_compile "$LINENO"; then :
10873 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10874 -for as_dir in $PATH
10877 - test -z "$as_dir" && as_dir=.
10878 - for ac_exec_ext in '' $ac_executable_extensions; do
10879 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10880 - ac_cv_prog_ac_ct_CC="cc"
10881 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10886 + ac_c_werror_flag=$ac_save_c_werror_flag
10888 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10889 +/* end confdefs.h. */
10899 +if ac_fn_c_try_compile "$LINENO"; then :
10900 + ac_cv_prog_cc_g=yes
10902 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10904 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
10905 -if test -n "$ac_ct_CC"; then
10906 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
10907 -echo "${ECHO_T}$ac_ct_CC" >&6
10909 - echo "$as_me:$LINENO: result: no" >&5
10910 -echo "${ECHO_T}no" >&6
10911 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10916 - CC="$ac_cv_prog_CC"
10917 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10918 + ac_c_werror_flag=$ac_save_c_werror_flag
10922 -if test -z "$CC"; then
10923 - # Extract the first word of "cc", so it can be a program name with args.
10924 -set dummy cc; ac_word=$2
10925 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10926 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10927 -if test "${ac_cv_prog_CC+set}" = set; then
10928 - echo $ECHO_N "(cached) $ECHO_C" >&6
10930 - if test -n "$CC"; then
10931 - ac_cv_prog_CC="$CC" # Let the user override the test.
10933 - ac_prog_rejected=no
10934 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10935 -for as_dir in $PATH
10938 - test -z "$as_dir" && as_dir=.
10939 - for ac_exec_ext in '' $ac_executable_extensions; do
10940 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10941 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
10942 - ac_prog_rejected=yes
10945 - ac_cv_prog_CC="cc"
10946 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10952 -if test $ac_prog_rejected = yes; then
10953 - # We found a bogon in the path, so make sure we never use it.
10954 - set dummy $ac_cv_prog_CC
10956 - if test $# != 0; then
10957 - # We chose a different compiler from the bogus one.
10958 - # However, it has the same basename, so the bogon will be chosen
10959 - # first if we set CC to just the basename; use the full file name.
10961 - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
10967 -if test -n "$CC"; then
10968 - echo "$as_me:$LINENO: result: $CC" >&5
10969 -echo "${ECHO_T}$CC" >&6
10971 - echo "$as_me:$LINENO: result: no" >&5
10972 -echo "${ECHO_T}no" >&6
10976 -if test -z "$CC"; then
10977 - if test -n "$ac_tool_prefix"; then
10978 - for ac_prog in cl
10980 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10981 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10982 -echo "$as_me:$LINENO: checking for $ac_word" >&5
10983 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10984 -if test "${ac_cv_prog_CC+set}" = set; then
10985 - echo $ECHO_N "(cached) $ECHO_C" >&6
10987 - if test -n "$CC"; then
10988 - ac_cv_prog_CC="$CC" # Let the user override the test.
10990 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10991 -for as_dir in $PATH
10994 - test -z "$as_dir" && as_dir=.
10995 - for ac_exec_ext in '' $ac_executable_extensions; do
10996 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10997 - ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
10998 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11000 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
11001 +$as_echo "$ac_cv_prog_cc_g" >&6; }
11002 +if test "$ac_test_CFLAGS" = set; then
11003 + CFLAGS=$ac_save_CFLAGS
11004 +elif test $ac_cv_prog_cc_g = yes; then
11005 + if test "$GCC" = yes; then
11016 -if test -n "$CC"; then
11017 - echo "$as_me:$LINENO: result: $CC" >&5
11018 -echo "${ECHO_T}$CC" >&6
11020 - echo "$as_me:$LINENO: result: no" >&5
11021 -echo "${ECHO_T}no" >&6
11024 - test -n "$CC" && break
11027 -if test -z "$CC"; then
11029 - for ac_prog in cl
11031 - # Extract the first word of "$ac_prog", so it can be a program name with args.
11032 -set dummy $ac_prog; ac_word=$2
11033 -echo "$as_me:$LINENO: checking for $ac_word" >&5
11034 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
11035 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
11036 - echo $ECHO_N "(cached) $ECHO_C" >&6
11038 - if test -n "$ac_ct_CC"; then
11039 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
11041 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11042 -for as_dir in $PATH
11045 - test -z "$as_dir" && as_dir=.
11046 - for ac_exec_ext in '' $ac_executable_extensions; do
11047 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11048 - ac_cv_prog_ac_ct_CC="$ac_prog"
11049 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11051 + if test "$GCC" = yes; then
11061 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
11062 -if test -n "$ac_ct_CC"; then
11063 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
11064 -echo "${ECHO_T}$ac_ct_CC" >&6
11065 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
11066 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
11067 +if ${ac_cv_prog_cc_c89+:} false; then :
11068 + $as_echo_n "(cached) " >&6
11070 - echo "$as_me:$LINENO: result: no" >&5
11071 -echo "${ECHO_T}no" >&6
11074 - test -n "$ac_ct_CC" && break
11083 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
11084 -See \`config.log' for more details." >&5
11085 -echo "$as_me: error: no acceptable C compiler found in \$PATH
11086 -See \`config.log' for more details." >&2;}
11087 - { (exit 1); exit 1; }; }
11088 + ac_cv_prog_cc_c89=no
11090 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11091 +/* end confdefs.h. */
11092 +#include <stdarg.h>
11093 +#include <stdio.h>
11095 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
11096 +struct buf { int x; };
11097 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
11098 +static char *e (p, i)
11104 +static char *f (char * (*g) (char **, int), char **p, ...)
11109 + s = g (p, va_arg (v,int));
11114 -# Provide some information about the compiler.
11115 -echo "$as_me:$LINENO:" \
11116 - "checking for C compiler version" >&5
11117 -ac_compiler=`set X $ac_compile; echo $2`
11118 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
11119 - (eval $ac_compiler --version </dev/null >&5) 2>&5
11121 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11122 - (exit $ac_status); }
11123 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
11124 - (eval $ac_compiler -v </dev/null >&5) 2>&5
11126 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11127 - (exit $ac_status); }
11128 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
11129 - (eval $ac_compiler -V </dev/null >&5) 2>&5
11131 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11132 - (exit $ac_status); }
11133 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
11134 + function prototypes and stuff, but not '\xHH' hex character constants.
11135 + These don't provoke an error unfortunately, instead are silently treated
11136 + as 'x'. The following induces an error, until -std is added to get
11137 + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
11138 + array size at least. It's necessary to write '\x00'==0 to get something
11139 + that's true only with -std. */
11140 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
11142 -cat >conftest.$ac_ext <<_ACEOF
11145 -cat confdefs.h >>conftest.$ac_ext
11146 -cat >>conftest.$ac_ext <<_ACEOF
11147 -/* end confdefs.h. */
11148 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
11149 + inside strings and character constants. */
11150 +#define FOO(x) 'x'
11151 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
11153 +int test (int i, double x);
11154 +struct s1 {int (*f) (int a);};
11155 +struct s2 {int (*f) (double a);};
11156 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
11163 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
11168 -ac_clean_files_save=$ac_clean_files
11169 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
11170 -# Try to create an executable without -o first, disregard a.out.
11171 -# It will help us diagnose broken compilers, and finding out an intuition
11173 -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
11174 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
11175 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
11176 -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
11177 - (eval $ac_link_default) 2>&5
11179 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11180 - (exit $ac_status); }; then
11181 - # Find the output, starting from the most likely. This scheme is
11182 -# not robust to junk in `.', hence go to wildcards (a.*) only as a last
11185 -# Be careful to initialize this variable, since it used to be cached.
11186 -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
11188 -# b.out is created by i960 compilers.
11189 -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
11190 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
11191 + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
11193 - test -f "$ac_file" || continue
11195 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
11197 - conftest.$ac_ext )
11198 - # This is the source file.
11201 - # We found the default executable, but exeext='' is most
11202 - # certainly right.
11205 - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
11206 - # FIXME: I believe we export ac_cv_exeext for Libtool,
11207 - # but it would be cool to find out if it's true. Does anybody
11208 - # maintain Libtool? --akim.
11209 - export ac_cv_exeext
11214 + CC="$ac_save_CC $ac_arg"
11215 + if ac_fn_c_try_compile "$LINENO"; then :
11216 + ac_cv_prog_cc_c89=$ac_arg
11218 +rm -f core conftest.err conftest.$ac_objext
11219 + test "x$ac_cv_prog_cc_c89" != "xno" && break
11222 - echo "$as_me: failed program was:" >&5
11223 -sed 's/^/| /' conftest.$ac_ext >&5
11224 +rm -f conftest.$ac_ext
11227 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
11228 -See \`config.log' for more details." >&5
11229 -echo "$as_me: error: C compiler cannot create executables
11230 -See \`config.log' for more details." >&2;}
11231 - { (exit 77); exit 77; }; }
11234 +case "x$ac_cv_prog_cc_c89" in
11236 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
11237 +$as_echo "none needed" >&6; } ;;
11239 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
11240 +$as_echo "unsupported" >&6; } ;;
11242 + CC="$CC $ac_cv_prog_cc_c89"
11243 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
11244 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
11246 +if test "x$ac_cv_prog_cc_c89" != xno; then :
11248 -ac_exeext=$ac_cv_exeext
11249 -echo "$as_me:$LINENO: result: $ac_file" >&5
11250 -echo "${ECHO_T}$ac_file" >&6
11252 -# Check the compiler produces executables we can run. If not, either
11253 -# the compiler is broken, or we cross compile.
11254 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
11255 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
11256 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
11257 -# If not cross compiling, check that we can run a simple program.
11258 -if test "$cross_compiling" != yes; then
11259 - if { ac_try='./$ac_file'
11260 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11261 - (eval $ac_try) 2>&5
11263 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11264 - (exit $ac_status); }; }; then
11265 - cross_compiling=no
11267 - if test "$cross_compiling" = maybe; then
11268 - cross_compiling=yes
11270 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
11271 -If you meant to cross compile, use \`--host'.
11272 -See \`config.log' for more details." >&5
11273 -echo "$as_me: error: cannot run C compiled programs.
11274 -If you meant to cross compile, use \`--host'.
11275 -See \`config.log' for more details." >&2;}
11276 - { (exit 1); exit 1; }; }
11280 -echo "$as_me:$LINENO: result: yes" >&5
11281 -echo "${ECHO_T}yes" >&6
11283 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
11284 -ac_clean_files=$ac_clean_files_save
11285 -# Check the compiler produces executables we can run. If not, either
11286 -# the compiler is broken, or we cross compile.
11287 -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
11288 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
11289 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
11290 -echo "${ECHO_T}$cross_compiling" >&6
11292 -echo "$as_me:$LINENO: checking for suffix of executables" >&5
11293 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
11294 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11295 - (eval $ac_link) 2>&5
11297 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11298 - (exit $ac_status); }; then
11299 - # If both `conftest.exe' and `conftest' are `present' (well, observable)
11300 -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
11301 -# work properly (i.e., refer to `conftest.exe'), while it won't with
11303 -for ac_file in conftest.exe conftest conftest.*; do
11304 - test -f "$ac_file" || continue
11306 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
11307 - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
11308 - export ac_cv_exeext
11314 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
11315 -See \`config.log' for more details." >&5
11316 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
11317 -See \`config.log' for more details." >&2;}
11318 - { (exit 1); exit 1; }; }
11321 +ac_cpp='$CPP $CPPFLAGS'
11322 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11323 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11324 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
11326 -rm -f conftest$ac_cv_exeext
11327 -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
11328 -echo "${ECHO_T}$ac_cv_exeext" >&6
11329 +depcc="$CC" am_compiler_list=
11331 -rm -f conftest.$ac_ext
11332 -EXEEXT=$ac_cv_exeext
11334 -echo "$as_me:$LINENO: checking for suffix of object files" >&5
11335 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
11336 -if test "${ac_cv_objext+set}" = set; then
11337 - echo $ECHO_N "(cached) $ECHO_C" >&6
11338 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
11339 +$as_echo_n "checking dependency style of $depcc... " >&6; }
11340 +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
11341 + $as_echo_n "(cached) " >&6
11343 - cat >conftest.$ac_ext <<_ACEOF
11346 -cat confdefs.h >>conftest.$ac_ext
11347 -cat >>conftest.$ac_ext <<_ACEOF
11348 -/* end confdefs.h. */
11349 + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
11350 + # We make a subdir and do the tests there. Otherwise we can end up
11351 + # making bogus files that we don't know about and never remove. For
11352 + # instance it was reported that on HP-UX the gcc test will end up
11353 + # making a dummy file named `D' -- because `-MD' means `put the output
11355 + rm -rf conftest.dir
11356 + mkdir conftest.dir
11357 + # Copy depcomp to subdir because otherwise we won't find it if we're
11358 + # using a relative directory.
11359 + cp "$am_depcomp" conftest.dir
11361 + # We will build objects and dependencies in a subdirectory because
11362 + # it helps to detect inapplicable dependency modes. For instance
11363 + # both Tru64's cc and ICC support -MD to output dependencies as a
11364 + # side effect of compilation, but ICC will put the dependencies in
11365 + # the current directory while Tru64 will put them in the object
11372 + am_cv_CC_dependencies_compiler_type=none
11373 + if test "$am_compiler_list" = ""; then
11374 + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
11376 + am__universal=false
11377 + case " $depcc " in #(
11378 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
11385 -rm -f conftest.o conftest.obj
11386 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11387 - (eval $ac_compile) 2>&5
11389 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11390 - (exit $ac_status); }; then
11391 - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
11393 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
11394 - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
11399 - echo "$as_me: failed program was:" >&5
11400 -sed 's/^/| /' conftest.$ac_ext >&5
11402 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
11403 -See \`config.log' for more details." >&5
11404 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
11405 -See \`config.log' for more details." >&2;}
11406 - { (exit 1); exit 1; }; }
11409 -rm -f conftest.$ac_cv_objext conftest.$ac_ext
11411 -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
11412 -echo "${ECHO_T}$ac_cv_objext" >&6
11413 -OBJEXT=$ac_cv_objext
11415 -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
11416 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
11417 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
11418 - echo $ECHO_N "(cached) $ECHO_C" >&6
11420 - cat >conftest.$ac_ext <<_ACEOF
11423 -cat confdefs.h >>conftest.$ac_ext
11424 -cat >>conftest.$ac_ext <<_ACEOF
11425 -/* end confdefs.h. */
11438 -rm -f conftest.$ac_objext
11439 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11440 - (eval $ac_compile) 2>conftest.er1
11442 - grep -v '^ *+' conftest.er1 >conftest.err
11443 - rm -f conftest.er1
11444 - cat conftest.err >&5
11445 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11446 - (exit $ac_status); } &&
11447 - { ac_try='test -z "$ac_c_werror_flag"
11448 - || test ! -s conftest.err'
11449 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11450 - (eval $ac_try) 2>&5
11452 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11453 - (exit $ac_status); }; } &&
11454 - { ac_try='test -s conftest.$ac_objext'
11455 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11456 - (eval $ac_try) 2>&5
11458 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11459 - (exit $ac_status); }; }; then
11460 - ac_compiler_gnu=yes
11462 - echo "$as_me: failed program was:" >&5
11463 -sed 's/^/| /' conftest.$ac_ext >&5
11465 -ac_compiler_gnu=no
11467 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11468 -ac_cv_c_compiler_gnu=$ac_compiler_gnu
11471 -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
11472 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
11473 -GCC=`test $ac_compiler_gnu = yes && echo yes`
11474 -ac_test_CFLAGS=${CFLAGS+set}
11475 -ac_save_CFLAGS=$CFLAGS
11477 -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
11478 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
11479 -if test "${ac_cv_prog_cc_g+set}" = set; then
11480 - echo $ECHO_N "(cached) $ECHO_C" >&6
11482 - cat >conftest.$ac_ext <<_ACEOF
11485 -cat confdefs.h >>conftest.$ac_ext
11486 -cat >>conftest.$ac_ext <<_ACEOF
11487 -/* end confdefs.h. */
11497 -rm -f conftest.$ac_objext
11498 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11499 - (eval $ac_compile) 2>conftest.er1
11501 - grep -v '^ *+' conftest.er1 >conftest.err
11502 - rm -f conftest.er1
11503 - cat conftest.err >&5
11504 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11505 - (exit $ac_status); } &&
11506 - { ac_try='test -z "$ac_c_werror_flag"
11507 - || test ! -s conftest.err'
11508 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11509 - (eval $ac_try) 2>&5
11511 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11512 - (exit $ac_status); }; } &&
11513 - { ac_try='test -s conftest.$ac_objext'
11514 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11515 - (eval $ac_try) 2>&5
11517 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11518 - (exit $ac_status); }; }; then
11519 - ac_cv_prog_cc_g=yes
11521 - echo "$as_me: failed program was:" >&5
11522 -sed 's/^/| /' conftest.$ac_ext >&5
11524 -ac_cv_prog_cc_g=no
11526 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11528 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
11529 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
11530 -if test "$ac_test_CFLAGS" = set; then
11531 - CFLAGS=$ac_save_CFLAGS
11532 -elif test $ac_cv_prog_cc_g = yes; then
11533 - if test "$GCC" = yes; then
11539 - if test "$GCC" = yes; then
11545 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
11546 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
11547 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
11548 - echo $ECHO_N "(cached) $ECHO_C" >&6
11550 - ac_cv_prog_cc_stdc=no
11552 -cat >conftest.$ac_ext <<_ACEOF
11555 -cat confdefs.h >>conftest.$ac_ext
11556 -cat >>conftest.$ac_ext <<_ACEOF
11557 -/* end confdefs.h. */
11558 -#include <stdarg.h>
11559 -#include <stdio.h>
11560 -#include <sys/types.h>
11561 -#include <sys/stat.h>
11562 -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
11563 -struct buf { int x; };
11564 -FILE * (*rcsopen) (struct buf *, struct stat *, int);
11565 -static char *e (p, i)
11571 -static char *f (char * (*g) (char **, int), char **p, ...)
11576 - s = g (p, va_arg (v,int));
11581 -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
11582 - function prototypes and stuff, but not '\xHH' hex character constants.
11583 - These don't provoke an error unfortunately, instead are silently treated
11584 - as 'x'. The following induces an error, until -std1 is added to get
11585 - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
11586 - array size at least. It's necessary to write '\x00'==0 to get something
11587 - that's true only with -std1. */
11588 -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
11590 -int test (int i, double x);
11591 -struct s1 {int (*f) (int a);};
11592 -struct s2 {int (*f) (double a);};
11593 -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
11599 -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
11604 -# Don't try gcc -ansi; that turns off useful extensions and
11605 -# breaks some systems' header files.
11606 -# AIX -qlanglvl=ansi
11607 -# Ultrix and OSF/1 -std1
11608 -# HP-UX 10.20 and later -Ae
11609 -# HP-UX older versions -Aa -D_HPUX_SOURCE
11610 -# SVR4 -Xc -D__EXTENSIONS__
11611 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
11613 - CC="$ac_save_CC $ac_arg"
11614 - rm -f conftest.$ac_objext
11615 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11616 - (eval $ac_compile) 2>conftest.er1
11618 - grep -v '^ *+' conftest.er1 >conftest.err
11619 - rm -f conftest.er1
11620 - cat conftest.err >&5
11621 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11622 - (exit $ac_status); } &&
11623 - { ac_try='test -z "$ac_c_werror_flag"
11624 - || test ! -s conftest.err'
11625 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11626 - (eval $ac_try) 2>&5
11628 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11629 - (exit $ac_status); }; } &&
11630 - { ac_try='test -s conftest.$ac_objext'
11631 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11632 - (eval $ac_try) 2>&5
11634 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11635 - (exit $ac_status); }; }; then
11636 - ac_cv_prog_cc_stdc=$ac_arg
11639 - echo "$as_me: failed program was:" >&5
11640 -sed 's/^/| /' conftest.$ac_ext >&5
11643 -rm -f conftest.err conftest.$ac_objext
11645 -rm -f conftest.$ac_ext conftest.$ac_objext
11650 -case "x$ac_cv_prog_cc_stdc" in
11652 - echo "$as_me:$LINENO: result: none needed" >&5
11653 -echo "${ECHO_T}none needed" >&6 ;;
11655 - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
11656 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
11657 - CC="$CC $ac_cv_prog_cc_stdc" ;;
11660 -# Some people use a C++ compiler to compile C. Since we use `exit',
11661 -# in C++ we need to declare it. In case someone uses the same compiler
11662 -# for both compiling C and C++ we need to have the C++ compiler decide
11663 -# the declaration of exit, since it's the most demanding environment.
11664 -cat >conftest.$ac_ext <<_ACEOF
11665 -#ifndef __cplusplus
11669 -rm -f conftest.$ac_objext
11670 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11671 - (eval $ac_compile) 2>conftest.er1
11673 - grep -v '^ *+' conftest.er1 >conftest.err
11674 - rm -f conftest.er1
11675 - cat conftest.err >&5
11676 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11677 - (exit $ac_status); } &&
11678 - { ac_try='test -z "$ac_c_werror_flag"
11679 - || test ! -s conftest.err'
11680 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11681 - (eval $ac_try) 2>&5
11683 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11684 - (exit $ac_status); }; } &&
11685 - { ac_try='test -s conftest.$ac_objext'
11686 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11687 - (eval $ac_try) 2>&5
11689 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11690 - (exit $ac_status); }; }; then
11691 - for ac_declaration in \
11693 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
11694 - 'extern "C" void std::exit (int); using std::exit;' \
11695 - 'extern "C" void exit (int) throw ();' \
11696 - 'extern "C" void exit (int);' \
11697 - 'void exit (int);'
11699 - cat >conftest.$ac_ext <<_ACEOF
11702 -cat confdefs.h >>conftest.$ac_ext
11703 -cat >>conftest.$ac_ext <<_ACEOF
11704 -/* end confdefs.h. */
11706 -#include <stdlib.h>
11715 -rm -f conftest.$ac_objext
11716 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11717 - (eval $ac_compile) 2>conftest.er1
11719 - grep -v '^ *+' conftest.er1 >conftest.err
11720 - rm -f conftest.er1
11721 - cat conftest.err >&5
11722 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11723 - (exit $ac_status); } &&
11724 - { ac_try='test -z "$ac_c_werror_flag"
11725 - || test ! -s conftest.err'
11726 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11727 - (eval $ac_try) 2>&5
11729 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11730 - (exit $ac_status); }; } &&
11731 - { ac_try='test -s conftest.$ac_objext'
11732 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11733 - (eval $ac_try) 2>&5
11735 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11736 - (exit $ac_status); }; }; then
11739 - echo "$as_me: failed program was:" >&5
11740 -sed 's/^/| /' conftest.$ac_ext >&5
11744 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11745 - cat >conftest.$ac_ext <<_ACEOF
11748 -cat confdefs.h >>conftest.$ac_ext
11749 -cat >>conftest.$ac_ext <<_ACEOF
11750 -/* end confdefs.h. */
11760 -rm -f conftest.$ac_objext
11761 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11762 - (eval $ac_compile) 2>conftest.er1
11764 - grep -v '^ *+' conftest.er1 >conftest.err
11765 - rm -f conftest.er1
11766 - cat conftest.err >&5
11767 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11768 - (exit $ac_status); } &&
11769 - { ac_try='test -z "$ac_c_werror_flag"
11770 - || test ! -s conftest.err'
11771 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11772 - (eval $ac_try) 2>&5
11774 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11775 - (exit $ac_status); }; } &&
11776 - { ac_try='test -s conftest.$ac_objext'
11777 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11778 - (eval $ac_try) 2>&5
11780 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11781 - (exit $ac_status); }; }; then
11784 - echo "$as_me: failed program was:" >&5
11785 -sed 's/^/| /' conftest.$ac_ext >&5
11788 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11791 -if test -n "$ac_declaration"; then
11792 - echo '#ifdef __cplusplus' >>confdefs.h
11793 - echo $ac_declaration >>confdefs.h
11794 - echo '#endif' >>confdefs.h
11798 - echo "$as_me: failed program was:" >&5
11799 -sed 's/^/| /' conftest.$ac_ext >&5
11802 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11804 -ac_cpp='$CPP $CPPFLAGS'
11805 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11806 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11807 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
11809 -depcc="$CC" am_compiler_list=
11811 -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
11812 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
11813 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
11814 - echo $ECHO_N "(cached) $ECHO_C" >&6
11816 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
11817 - # We make a subdir and do the tests there. Otherwise we can end up
11818 - # making bogus files that we don't know about and never remove. For
11819 - # instance it was reported that on HP-UX the gcc test will end up
11820 - # making a dummy file named `D' -- because `-MD' means `put the output
11822 - mkdir conftest.dir
11823 - # Copy depcomp to subdir because otherwise we won't find it if we're
11824 - # using a relative directory.
11825 - cp "$am_depcomp" conftest.dir
11827 - # We will build objects and dependencies in a subdirectory because
11828 - # it helps to detect inapplicable dependency modes. For instance
11829 - # both Tru64's cc and ICC support -MD to output dependencies as a
11830 - # side effect of compilation, but ICC will put the dependencies in
11831 - # the current directory while Tru64 will put them in the object
11835 - am_cv_CC_dependencies_compiler_type=none
11836 - if test "$am_compiler_list" = ""; then
11837 - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
11839 for depmode in $am_compiler_list; do
11840 # Setup a source with many dependencies, because some compilers
11841 # like to wrap large dependency lists on column 80 (with \), and
11842 @@ -3109,7 +3702,17 @@
11844 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
11846 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
11847 + # mode. It turns out that the SunPro C++ compiler does not properly
11848 + # handle `-M -o', and we need to detect this. Also, some Intel
11849 + # versions had trouble with output in subdirs
11850 + am__obj=sub/conftest.${OBJEXT-o}
11851 + am__minus_obj="-o $am__obj"
11854 + # This depmode causes a compiler race in universal mode.
11855 + test "$am__universal" = false || continue
11858 # after this tag, mechanisms are not by side-effect, so they'll
11859 # only be used when explicitly requested
11860 @@ -3119,18 +3722,23 @@
11864 + msvc7 | msvc7msys | msvisualcpp | msvcmsys)
11865 + # This compiler won't grok `-c -o', but also, the minuso test has
11866 + # not run yet. These depmodes are late enough in the game, and
11867 + # so weak that their functioning should not be impacted.
11868 + am__obj=conftest.${OBJEXT-o}
11873 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
11874 - # mode. It turns out that the SunPro C++ compiler does not properly
11875 - # handle `-M -o', and we need to detect this.
11876 if depmode=$depmode \
11877 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
11878 + source=sub/conftest.c object=$am__obj \
11879 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
11880 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
11881 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
11882 >/dev/null 2>conftest.err &&
11883 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
11884 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
11885 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
11886 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
11887 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
11888 # icc doesn't choke on unknown options, it will just issue warnings
11889 # or remarks (even with -Werror). So we grep stderr for any message
11890 @@ -3154,13 +3762,11 @@
11894 -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
11895 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
11896 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
11897 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
11898 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
11904 test "x$enable_dependency_tracking" != xno \
11905 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
11906 am__fastdepCC_TRUE=
11907 @@ -3171,75 +3777,21 @@
11911 -# Make sure we can run config.sub.
11912 -$ac_config_sub sun4 >/dev/null 2>&1 ||
11913 - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
11914 -echo "$as_me: error: cannot run $ac_config_sub" >&2;}
11915 - { (exit 1); exit 1; }; }
11917 -echo "$as_me:$LINENO: checking build system type" >&5
11918 -echo $ECHO_N "checking build system type... $ECHO_C" >&6
11919 -if test "${ac_cv_build+set}" = set; then
11920 - echo $ECHO_N "(cached) $ECHO_C" >&6
11922 - ac_cv_build_alias=$build_alias
11923 -test -z "$ac_cv_build_alias" &&
11924 - ac_cv_build_alias=`$ac_config_guess`
11925 -test -z "$ac_cv_build_alias" &&
11926 - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
11927 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
11928 - { (exit 1); exit 1; }; }
11929 -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
11930 - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
11931 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
11932 - { (exit 1); exit 1; }; }
11935 -echo "$as_me:$LINENO: result: $ac_cv_build" >&5
11936 -echo "${ECHO_T}$ac_cv_build" >&6
11937 -build=$ac_cv_build
11938 -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
11939 -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
11940 -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
11943 -echo "$as_me:$LINENO: checking host system type" >&5
11944 -echo $ECHO_N "checking host system type... $ECHO_C" >&6
11945 -if test "${ac_cv_host+set}" = set; then
11946 - echo $ECHO_N "(cached) $ECHO_C" >&6
11948 - ac_cv_host_alias=$host_alias
11949 -test -z "$ac_cv_host_alias" &&
11950 - ac_cv_host_alias=$ac_cv_build_alias
11951 -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
11952 - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
11953 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
11954 - { (exit 1); exit 1; }; }
11957 -echo "$as_me:$LINENO: result: $ac_cv_host" >&5
11958 -echo "${ECHO_T}$ac_cv_host" >&6
11960 -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
11961 -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
11962 -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
11967 ac_cpp='$CPP $CPPFLAGS'
11968 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11969 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11970 ac_compiler_gnu=$ac_cv_c_compiler_gnu
11971 -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
11972 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
11973 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
11974 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
11975 # On Suns, sometimes $CPP names a directory.
11976 if test -n "$CPP" && test -d "$CPP"; then
11979 if test -z "$CPP"; then
11980 - if test "${ac_cv_prog_CPP+set}" = set; then
11981 - echo $ECHO_N "(cached) $ECHO_C" >&6
11982 + if ${ac_cv_prog_CPP+:} false; then :
11983 + $as_echo_n "(cached) " >&6
11985 # Double quotes because CPP needs to be expanded
11986 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
11987 @@ -3253,11 +3805,7 @@
11988 # <limits.h> exists even on freestanding compilers.
11989 # On the NeXT, cc -E runs the code through the compiler's parser,
11990 # not just through cpp. "Syntax error" is here to catch this case.
11991 - cat >conftest.$ac_ext <<_ACEOF
11994 -cat confdefs.h >>conftest.$ac_ext
11995 -cat >>conftest.$ac_ext <<_ACEOF
11996 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11997 /* end confdefs.h. */
11999 # include <limits.h>
12000 @@ -3266,78 +3814,34 @@
12004 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
12005 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12007 - grep -v '^ *+' conftest.er1 >conftest.err
12008 - rm -f conftest.er1
12009 - cat conftest.err >&5
12010 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12011 - (exit $ac_status); } >/dev/null; then
12012 - if test -s conftest.err; then
12013 - ac_cpp_err=$ac_c_preproc_warn_flag
12014 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
12021 -if test -z "$ac_cpp_err"; then
12024 - echo "$as_me: failed program was:" >&5
12025 -sed 's/^/| /' conftest.$ac_ext >&5
12026 +if ac_fn_c_try_cpp "$LINENO"; then :
12029 # Broken: fails on valid input.
12032 -rm -f conftest.err conftest.$ac_ext
12033 +rm -f conftest.err conftest.i conftest.$ac_ext
12035 - # OK, works on sane cases. Now check whether non-existent headers
12036 + # OK, works on sane cases. Now check whether nonexistent headers
12037 # can be detected and how.
12038 - cat >conftest.$ac_ext <<_ACEOF
12041 -cat confdefs.h >>conftest.$ac_ext
12042 -cat >>conftest.$ac_ext <<_ACEOF
12043 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12044 /* end confdefs.h. */
12045 #include <ac_nonexistent.h>
12047 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
12048 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12050 - grep -v '^ *+' conftest.er1 >conftest.err
12051 - rm -f conftest.er1
12052 - cat conftest.err >&5
12053 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12054 - (exit $ac_status); } >/dev/null; then
12055 - if test -s conftest.err; then
12056 - ac_cpp_err=$ac_c_preproc_warn_flag
12057 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
12064 -if test -z "$ac_cpp_err"; then
12065 +if ac_fn_c_try_cpp "$LINENO"; then :
12066 # Broken: success on invalid input.
12069 - echo "$as_me: failed program was:" >&5
12070 -sed 's/^/| /' conftest.$ac_ext >&5
12072 # Passes both tests.
12076 -rm -f conftest.err conftest.$ac_ext
12077 +rm -f conftest.err conftest.i conftest.$ac_ext
12080 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
12081 -rm -f conftest.err conftest.$ac_ext
12082 -if $ac_preproc_ok; then
12083 +rm -f conftest.i conftest.err conftest.$ac_ext
12084 +if $ac_preproc_ok; then :
12088 @@ -3349,8 +3853,8 @@
12090 ac_cv_prog_CPP=$CPP
12092 -echo "$as_me:$LINENO: result: $CPP" >&5
12093 -echo "${ECHO_T}$CPP" >&6
12094 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
12095 +$as_echo "$CPP" >&6; }
12096 ac_preproc_ok=false
12097 for ac_c_preproc_warn_flag in '' yes
12099 @@ -3360,11 +3864,7 @@
12100 # <limits.h> exists even on freestanding compilers.
12101 # On the NeXT, cc -E runs the code through the compiler's parser,
12102 # not just through cpp. "Syntax error" is here to catch this case.
12103 - cat >conftest.$ac_ext <<_ACEOF
12106 -cat confdefs.h >>conftest.$ac_ext
12107 -cat >>conftest.$ac_ext <<_ACEOF
12108 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12109 /* end confdefs.h. */
12111 # include <limits.h>
12112 @@ -3373,85 +3873,40 @@
12116 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
12117 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12119 - grep -v '^ *+' conftest.er1 >conftest.err
12120 - rm -f conftest.er1
12121 - cat conftest.err >&5
12122 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12123 - (exit $ac_status); } >/dev/null; then
12124 - if test -s conftest.err; then
12125 - ac_cpp_err=$ac_c_preproc_warn_flag
12126 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
12133 -if test -z "$ac_cpp_err"; then
12136 - echo "$as_me: failed program was:" >&5
12137 -sed 's/^/| /' conftest.$ac_ext >&5
12138 +if ac_fn_c_try_cpp "$LINENO"; then :
12141 # Broken: fails on valid input.
12144 -rm -f conftest.err conftest.$ac_ext
12145 +rm -f conftest.err conftest.i conftest.$ac_ext
12147 - # OK, works on sane cases. Now check whether non-existent headers
12148 + # OK, works on sane cases. Now check whether nonexistent headers
12149 # can be detected and how.
12150 - cat >conftest.$ac_ext <<_ACEOF
12153 -cat confdefs.h >>conftest.$ac_ext
12154 -cat >>conftest.$ac_ext <<_ACEOF
12155 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12156 /* end confdefs.h. */
12157 #include <ac_nonexistent.h>
12159 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
12160 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12162 - grep -v '^ *+' conftest.er1 >conftest.err
12163 - rm -f conftest.er1
12164 - cat conftest.err >&5
12165 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12166 - (exit $ac_status); } >/dev/null; then
12167 - if test -s conftest.err; then
12168 - ac_cpp_err=$ac_c_preproc_warn_flag
12169 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
12176 -if test -z "$ac_cpp_err"; then
12177 +if ac_fn_c_try_cpp "$LINENO"; then :
12178 # Broken: success on invalid input.
12181 - echo "$as_me: failed program was:" >&5
12182 -sed 's/^/| /' conftest.$ac_ext >&5
12184 # Passes both tests.
12188 -rm -f conftest.err conftest.$ac_ext
12189 +rm -f conftest.err conftest.i conftest.$ac_ext
12192 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
12193 -rm -f conftest.err conftest.$ac_ext
12194 -if $ac_preproc_ok; then
12196 +rm -f conftest.i conftest.err conftest.$ac_ext
12197 +if $ac_preproc_ok; then :
12200 - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
12201 -See \`config.log' for more details." >&5
12202 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
12203 -See \`config.log' for more details." >&2;}
12204 - { (exit 1); exit 1; }; }
12205 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12206 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12207 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
12208 +See \`config.log' for more details" "$LINENO" 5; }
12212 @@ -3461,275 +3916,142 @@
12213 ac_compiler_gnu=$ac_cv_c_compiler_gnu
12216 -echo "$as_me:$LINENO: checking for egrep" >&5
12217 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6
12218 -if test "${ac_cv_prog_egrep+set}" = set; then
12219 - echo $ECHO_N "(cached) $ECHO_C" >&6
12221 - if echo a | (grep -E '(a|b)') >/dev/null 2>&1
12222 - then ac_cv_prog_egrep='grep -E'
12223 - else ac_cv_prog_egrep='egrep'
12224 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
12225 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
12226 +if ${ac_cv_path_GREP+:} false; then :
12227 + $as_echo_n "(cached) " >&6
12229 + if test -z "$GREP"; then
12230 + ac_path_GREP_found=false
12231 + # Loop through the user's path and test for each of PROGNAME-LIST
12232 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12233 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
12236 + test -z "$as_dir" && as_dir=.
12237 + for ac_prog in grep ggrep; do
12238 + for ac_exec_ext in '' $ac_executable_extensions; do
12239 + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
12240 + as_fn_executable_p "$ac_path_GREP" || continue
12241 +# Check for GNU ac_path_GREP and select it if it is found.
12242 + # Check for GNU $ac_path_GREP
12243 +case `"$ac_path_GREP" --version 2>&1` in
12245 + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
12248 + $as_echo_n 0123456789 >"conftest.in"
12251 + cat "conftest.in" "conftest.in" >"conftest.tmp"
12252 + mv "conftest.tmp" "conftest.in"
12253 + cp "conftest.in" "conftest.nl"
12254 + $as_echo 'GREP' >> "conftest.nl"
12255 + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
12256 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
12257 + as_fn_arith $ac_count + 1 && ac_count=$as_val
12258 + if test $ac_count -gt ${ac_path_GREP_max-0}; then
12259 + # Best one so far, save it but keep looking for a better one
12260 + ac_cv_path_GREP="$ac_path_GREP"
12261 + ac_path_GREP_max=$ac_count
12264 -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
12265 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
12266 - EGREP=$ac_cv_prog_egrep
12270 - echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
12271 -echo $ECHO_N "checking whether we are using the GNU C Library 2 or newer... $ECHO_C" >&6
12272 -if test "${ac_cv_gnu_library_2+set}" = set; then
12273 - echo $ECHO_N "(cached) $ECHO_C" >&6
12275 - cat >conftest.$ac_ext <<_ACEOF
12278 -cat confdefs.h >>conftest.$ac_ext
12279 -cat >>conftest.$ac_ext <<_ACEOF
12280 -/* end confdefs.h. */
12282 -#include <features.h>
12283 -#ifdef __GNU_LIBRARY__
12284 - #if (__GLIBC__ >= 2)
12288 + # 10*(2^10) chars as input seems more than enough
12289 + test $ac_count -gt 10 && break
12291 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
12295 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
12296 - $EGREP "Lucky GNU user" >/dev/null 2>&1; then
12297 - ac_cv_gnu_library_2=yes
12298 + $ac_path_GREP_found && break 3
12303 + if test -z "$ac_cv_path_GREP"; then
12304 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
12307 - ac_cv_gnu_library_2=no
12308 + ac_cv_path_GREP=$GREP
12315 -echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
12316 -echo "${ECHO_T}$ac_cv_gnu_library_2" >&6
12318 - GLIBC2="$ac_cv_gnu_library_2"
12319 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
12320 +$as_echo "$ac_cv_path_GREP" >&6; }
12321 + GREP="$ac_cv_path_GREP"
12324 -if test -n "$ac_tool_prefix"; then
12325 - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
12326 -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
12327 -echo "$as_me:$LINENO: checking for $ac_word" >&5
12328 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12329 -if test "${ac_cv_prog_RANLIB+set}" = set; then
12330 - echo $ECHO_N "(cached) $ECHO_C" >&6
12332 - if test -n "$RANLIB"; then
12333 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
12334 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
12335 +$as_echo_n "checking for egrep... " >&6; }
12336 +if ${ac_cv_path_EGREP+:} false; then :
12337 + $as_echo_n "(cached) " >&6
12339 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12340 -for as_dir in $PATH
12341 + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
12342 + then ac_cv_path_EGREP="$GREP -E"
12344 + if test -z "$EGREP"; then
12345 + ac_path_EGREP_found=false
12346 + # Loop through the user's path and test for each of PROGNAME-LIST
12347 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12348 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
12351 test -z "$as_dir" && as_dir=.
12352 - for ac_exec_ext in '' $ac_executable_extensions; do
12353 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12354 - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
12355 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12363 -RANLIB=$ac_cv_prog_RANLIB
12364 -if test -n "$RANLIB"; then
12365 - echo "$as_me:$LINENO: result: $RANLIB" >&5
12366 -echo "${ECHO_T}$RANLIB" >&6
12368 - echo "$as_me:$LINENO: result: no" >&5
12369 -echo "${ECHO_T}no" >&6
12371 + for ac_prog in egrep; do
12372 + for ac_exec_ext in '' $ac_executable_extensions; do
12373 + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
12374 + as_fn_executable_p "$ac_path_EGREP" || continue
12375 +# Check for GNU ac_path_EGREP and select it if it is found.
12376 + # Check for GNU $ac_path_EGREP
12377 +case `"$ac_path_EGREP" --version 2>&1` in
12379 + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
12382 + $as_echo_n 0123456789 >"conftest.in"
12385 + cat "conftest.in" "conftest.in" >"conftest.tmp"
12386 + mv "conftest.tmp" "conftest.in"
12387 + cp "conftest.in" "conftest.nl"
12388 + $as_echo 'EGREP' >> "conftest.nl"
12389 + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
12390 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
12391 + as_fn_arith $ac_count + 1 && ac_count=$as_val
12392 + if test $ac_count -gt ${ac_path_EGREP_max-0}; then
12393 + # Best one so far, save it but keep looking for a better one
12394 + ac_cv_path_EGREP="$ac_path_EGREP"
12395 + ac_path_EGREP_max=$ac_count
12397 + # 10*(2^10) chars as input seems more than enough
12398 + test $ac_count -gt 10 && break
12400 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
12404 -if test -z "$ac_cv_prog_RANLIB"; then
12405 - ac_ct_RANLIB=$RANLIB
12406 - # Extract the first word of "ranlib", so it can be a program name with args.
12407 -set dummy ranlib; ac_word=$2
12408 -echo "$as_me:$LINENO: checking for $ac_word" >&5
12409 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12410 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
12411 - echo $ECHO_N "(cached) $ECHO_C" >&6
12413 - if test -n "$ac_ct_RANLIB"; then
12414 - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
12416 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12417 -for as_dir in $PATH
12420 - test -z "$as_dir" && as_dir=.
12421 - for ac_exec_ext in '' $ac_executable_extensions; do
12422 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12423 - ac_cv_prog_ac_ct_RANLIB="ranlib"
12424 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12426 + $ac_path_EGREP_found && break 3
12431 + if test -z "$ac_cv_path_EGREP"; then
12432 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
12437 - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
12440 -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
12441 -if test -n "$ac_ct_RANLIB"; then
12442 - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
12443 -echo "${ECHO_T}$ac_ct_RANLIB" >&6
12445 - echo "$as_me:$LINENO: result: no" >&5
12446 -echo "${ECHO_T}no" >&6
12449 - RANLIB=$ac_ct_RANLIB
12451 - RANLIB="$ac_cv_prog_RANLIB"
12452 + ac_cv_path_EGREP=$EGREP
12455 -echo "$as_me:$LINENO: checking for library containing strerror" >&5
12456 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
12457 -if test "${ac_cv_search_strerror+set}" = set; then
12458 - echo $ECHO_N "(cached) $ECHO_C" >&6
12460 - ac_func_search_save_LIBS=$LIBS
12461 -ac_cv_search_strerror=no
12462 -cat >conftest.$ac_ext <<_ACEOF
12465 -cat confdefs.h >>conftest.$ac_ext
12466 -cat >>conftest.$ac_ext <<_ACEOF
12467 -/* end confdefs.h. */
12469 -/* Override any gcc2 internal prototype to avoid an error. */
12470 -#ifdef __cplusplus
12473 -/* We use char because int might match the return type of a gcc2
12474 - builtin and then its argument prototype would still apply. */
12484 -rm -f conftest.$ac_objext conftest$ac_exeext
12485 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12486 - (eval $ac_link) 2>conftest.er1
12488 - grep -v '^ *+' conftest.er1 >conftest.err
12489 - rm -f conftest.er1
12490 - cat conftest.err >&5
12491 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12492 - (exit $ac_status); } &&
12493 - { ac_try='test -z "$ac_c_werror_flag"
12494 - || test ! -s conftest.err'
12495 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12496 - (eval $ac_try) 2>&5
12498 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12499 - (exit $ac_status); }; } &&
12500 - { ac_try='test -s conftest$ac_exeext'
12501 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12502 - (eval $ac_try) 2>&5
12504 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12505 - (exit $ac_status); }; }; then
12506 - ac_cv_search_strerror="none required"
12508 - echo "$as_me: failed program was:" >&5
12509 -sed 's/^/| /' conftest.$ac_ext >&5
12512 -rm -f conftest.err conftest.$ac_objext \
12513 - conftest$ac_exeext conftest.$ac_ext
12514 -if test "$ac_cv_search_strerror" = no; then
12515 - for ac_lib in cposix; do
12516 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
12517 - cat >conftest.$ac_ext <<_ACEOF
12520 -cat confdefs.h >>conftest.$ac_ext
12521 -cat >>conftest.$ac_ext <<_ACEOF
12522 -/* end confdefs.h. */
12524 -/* Override any gcc2 internal prototype to avoid an error. */
12525 -#ifdef __cplusplus
12528 -/* We use char because int might match the return type of a gcc2
12529 - builtin and then its argument prototype would still apply. */
12539 -rm -f conftest.$ac_objext conftest$ac_exeext
12540 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12541 - (eval $ac_link) 2>conftest.er1
12543 - grep -v '^ *+' conftest.er1 >conftest.err
12544 - rm -f conftest.er1
12545 - cat conftest.err >&5
12546 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12547 - (exit $ac_status); } &&
12548 - { ac_try='test -z "$ac_c_werror_flag"
12549 - || test ! -s conftest.err'
12550 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12551 - (eval $ac_try) 2>&5
12553 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12554 - (exit $ac_status); }; } &&
12555 - { ac_try='test -s conftest$ac_exeext'
12556 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12557 - (eval $ac_try) 2>&5
12559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12560 - (exit $ac_status); }; }; then
12561 - ac_cv_search_strerror="-l$ac_lib"
12564 - echo "$as_me: failed program was:" >&5
12565 -sed 's/^/| /' conftest.$ac_ext >&5
12568 -rm -f conftest.err conftest.$ac_objext \
12569 - conftest$ac_exeext conftest.$ac_ext
12572 -LIBS=$ac_func_search_save_LIBS
12575 -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
12576 -echo "${ECHO_T}$ac_cv_search_strerror" >&6
12577 -if test "$ac_cv_search_strerror" != no; then
12578 - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
12579 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
12580 +$as_echo "$ac_cv_path_EGREP" >&6; }
12581 + EGREP="$ac_cv_path_EGREP"
12585 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
12586 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
12587 -if test "${ac_cv_header_stdc+set}" = set; then
12588 - echo $ECHO_N "(cached) $ECHO_C" >&6
12589 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
12590 +$as_echo_n "checking for ANSI C header files... " >&6; }
12591 +if ${ac_cv_header_stdc+:} false; then :
12592 + $as_echo_n "(cached) " >&6
12594 - cat >conftest.$ac_ext <<_ACEOF
12597 -cat confdefs.h >>conftest.$ac_ext
12598 -cat >>conftest.$ac_ext <<_ACEOF
12599 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12600 /* end confdefs.h. */
12601 #include <stdlib.h>
12602 #include <stdarg.h>
12603 @@ -3744,51 +4066,23 @@
12607 -rm -f conftest.$ac_objext
12608 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12609 - (eval $ac_compile) 2>conftest.er1
12611 - grep -v '^ *+' conftest.er1 >conftest.err
12612 - rm -f conftest.er1
12613 - cat conftest.err >&5
12614 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12615 - (exit $ac_status); } &&
12616 - { ac_try='test -z "$ac_c_werror_flag"
12617 - || test ! -s conftest.err'
12618 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12619 - (eval $ac_try) 2>&5
12621 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12622 - (exit $ac_status); }; } &&
12623 - { ac_try='test -s conftest.$ac_objext'
12624 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12625 - (eval $ac_try) 2>&5
12627 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12628 - (exit $ac_status); }; }; then
12629 +if ac_fn_c_try_compile "$LINENO"; then :
12630 ac_cv_header_stdc=yes
12632 - echo "$as_me: failed program was:" >&5
12633 -sed 's/^/| /' conftest.$ac_ext >&5
12635 -ac_cv_header_stdc=no
12636 + ac_cv_header_stdc=no
12638 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12639 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12641 if test $ac_cv_header_stdc = yes; then
12642 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
12643 - cat >conftest.$ac_ext <<_ACEOF
12646 -cat confdefs.h >>conftest.$ac_ext
12647 -cat >>conftest.$ac_ext <<_ACEOF
12648 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12649 /* end confdefs.h. */
12650 #include <string.h>
12653 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
12654 - $EGREP "memchr" >/dev/null 2>&1; then
12656 + $EGREP "memchr" >/dev/null 2>&1; then :
12659 ac_cv_header_stdc=no
12661 @@ -3798,18 +4092,14 @@
12663 if test $ac_cv_header_stdc = yes; then
12664 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
12665 - cat >conftest.$ac_ext <<_ACEOF
12668 -cat confdefs.h >>conftest.$ac_ext
12669 -cat >>conftest.$ac_ext <<_ACEOF
12670 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12671 /* end confdefs.h. */
12672 #include <stdlib.h>
12675 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
12676 - $EGREP "free" >/dev/null 2>&1; then
12678 + $EGREP "free" >/dev/null 2>&1; then :
12681 ac_cv_header_stdc=no
12683 @@ -3819,16 +4109,13 @@
12685 if test $ac_cv_header_stdc = yes; then
12686 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
12687 - if test "$cross_compiling" = yes; then
12688 + if test "$cross_compiling" = yes; then :
12691 - cat >conftest.$ac_ext <<_ACEOF
12694 -cat confdefs.h >>conftest.$ac_ext
12695 -cat >>conftest.$ac_ext <<_ACEOF
12696 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12697 /* end confdefs.h. */
12699 +#include <stdlib.h>
12700 #if ((' ' & 0x0FF) == 0x020)
12701 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
12702 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
12703 @@ -3848,5807 +4135,897 @@
12704 for (i = 0; i < 256; i++)
12705 if (XOR (islower (i), ISLOWER (i))
12706 || toupper (i) != TOUPPER (i))
12713 -rm -f conftest$ac_exeext
12714 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12715 - (eval $ac_link) 2>&5
12717 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12718 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12719 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12720 - (eval $ac_try) 2>&5
12722 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12723 - (exit $ac_status); }; }; then
12726 - echo "$as_me: program exited with status $ac_status" >&5
12727 -echo "$as_me: failed program was:" >&5
12728 -sed 's/^/| /' conftest.$ac_ext >&5
12729 +if ac_fn_c_try_run "$LINENO"; then :
12731 -( exit $ac_status )
12732 -ac_cv_header_stdc=no
12734 + ac_cv_header_stdc=no
12736 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
12737 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
12738 + conftest.$ac_objext conftest.beam conftest.$ac_ext
12743 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
12744 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
12745 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
12746 +$as_echo "$ac_cv_header_stdc" >&6; }
12747 if test $ac_cv_header_stdc = yes; then
12749 -cat >>confdefs.h <<\_ACEOF
12750 -#define STDC_HEADERS 1
12752 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
12756 -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
12757 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
12758 -if test "${ac_cv_c_const+set}" = set; then
12759 - echo $ECHO_N "(cached) $ECHO_C" >&6
12761 - cat >conftest.$ac_ext <<_ACEOF
12763 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
12764 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
12765 + inttypes.h stdint.h unistd.h
12767 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
12768 +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
12770 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
12771 + cat >>confdefs.h <<_ACEOF
12772 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
12774 -cat confdefs.h >>conftest.$ac_ext
12775 -cat >>conftest.$ac_ext <<_ACEOF
12776 -/* end confdefs.h. */
12781 -/* FIXME: Include the comments suggested by Paul. */
12782 -#ifndef __cplusplus
12783 - /* Ultrix mips cc rejects this. */
12784 - typedef int charset[2];
12786 - /* SunOS 4.1.1 cc rejects this. */
12787 - char const *const *ccp;
12789 - /* NEC SVR4.0.2 mips cc rejects this. */
12790 - struct point {int x, y;};
12791 - static struct point const zero = {0,0};
12792 - /* AIX XL C 1.02.0.0 rejects this.
12793 - It does not let you subtract one const X* pointer from another in
12794 - an arm of an if-expression whose if-part is not a constant
12796 - const char *g = "string";
12797 - ccp = &g + (g ? g-g : 0);
12798 - /* HPUX 7.0 cc rejects these. */
12800 - p = (char**) ccp;
12801 - ccp = (char const *const *) p;
12802 - { /* SCO 3.2v4 cc rejects this. */
12804 - char const *s = 0 ? (char *) 0 : (char const *) 0;
12809 - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
12810 - int x[] = {25, 17};
12811 - const int *foo = &x[0];
12814 - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
12815 - typedef const int *iptr;
12819 - { /* AIX XL C 1.02.0.0 rejects this saying
12820 - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
12821 - struct s { int j; const int *ap[3]; };
12822 - struct s *b; b->j = 5;
12824 - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
12825 - const int foo = 10;
12834 -rm -f conftest.$ac_objext
12835 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12836 - (eval $ac_compile) 2>conftest.er1
12838 - grep -v '^ *+' conftest.er1 >conftest.err
12839 - rm -f conftest.er1
12840 - cat conftest.err >&5
12841 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12842 - (exit $ac_status); } &&
12843 - { ac_try='test -z "$ac_c_werror_flag"
12844 - || test ! -s conftest.err'
12845 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12846 - (eval $ac_try) 2>&5
12848 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12849 - (exit $ac_status); }; } &&
12850 - { ac_try='test -s conftest.$ac_objext'
12851 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12852 - (eval $ac_try) 2>&5
12854 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12855 - (exit $ac_status); }; }; then
12856 - ac_cv_c_const=yes
12858 - echo "$as_me: failed program was:" >&5
12859 -sed 's/^/| /' conftest.$ac_ext >&5
12863 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12865 + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
12866 +if test "x$ac_cv_header_minix_config_h" = xyes; then :
12871 -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
12872 -echo "${ECHO_T}$ac_cv_c_const" >&6
12873 -if test $ac_cv_c_const = no; then
12875 -cat >>confdefs.h <<\_ACEOF
12880 + if test "$MINIX" = yes; then
12882 +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
12885 +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
12887 - echo "$as_me:$LINENO: checking for signed" >&5
12888 -echo $ECHO_N "checking for signed... $ECHO_C" >&6
12889 -if test "${bh_cv_c_signed+set}" = set; then
12890 - echo $ECHO_N "(cached) $ECHO_C" >&6
12892 +$as_echo "#define _MINIX 1" >>confdefs.h
12897 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
12898 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
12899 +if ${ac_cv_safe_to_define___extensions__+:} false; then :
12900 + $as_echo_n "(cached) " >&6
12902 - cat >conftest.$ac_ext <<_ACEOF
12905 -cat confdefs.h >>conftest.$ac_ext
12906 -cat >>conftest.$ac_ext <<_ACEOF
12907 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12908 /* end confdefs.h. */
12910 +# define __EXTENSIONS__ 1
12911 + $ac_includes_default
12921 -rm -f conftest.$ac_objext
12922 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12923 - (eval $ac_compile) 2>conftest.er1
12925 - grep -v '^ *+' conftest.er1 >conftest.err
12926 - rm -f conftest.er1
12927 - cat conftest.err >&5
12928 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12929 - (exit $ac_status); } &&
12930 - { ac_try='test -z "$ac_c_werror_flag"
12931 - || test ! -s conftest.err'
12932 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12933 - (eval $ac_try) 2>&5
12935 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12936 - (exit $ac_status); }; } &&
12937 - { ac_try='test -s conftest.$ac_objext'
12938 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12939 - (eval $ac_try) 2>&5
12941 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12942 - (exit $ac_status); }; }; then
12943 - bh_cv_c_signed=yes
12944 +if ac_fn_c_try_compile "$LINENO"; then :
12945 + ac_cv_safe_to_define___extensions__=yes
12947 - echo "$as_me: failed program was:" >&5
12948 -sed 's/^/| /' conftest.$ac_ext >&5
12951 + ac_cv_safe_to_define___extensions__=no
12953 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12954 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12956 -echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
12957 -echo "${ECHO_T}$bh_cv_c_signed" >&6
12958 - if test $bh_cv_c_signed = no; then
12959 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
12960 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
12961 + test $ac_cv_safe_to_define___extensions__ = yes &&
12962 + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
12964 -cat >>confdefs.h <<\_ACEOF
12967 + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
12970 + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
12972 -echo "$as_me:$LINENO: checking for inline" >&5
12973 -echo $ECHO_N "checking for inline... $ECHO_C" >&6
12974 -if test "${ac_cv_c_inline+set}" = set; then
12975 - echo $ECHO_N "(cached) $ECHO_C" >&6
12977 - ac_cv_c_inline=no
12978 -for ac_kw in inline __inline__ __inline; do
12979 - cat >conftest.$ac_ext <<_ACEOF
12982 -cat confdefs.h >>conftest.$ac_ext
12983 -cat >>conftest.$ac_ext <<_ACEOF
12984 -/* end confdefs.h. */
12985 -#ifndef __cplusplus
12986 -typedef int foo_t;
12987 -static $ac_kw foo_t static_foo () {return 0; }
12988 -$ac_kw foo_t foo () {return 0; }
12990 + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
12993 -rm -f conftest.$ac_objext
12994 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12995 - (eval $ac_compile) 2>conftest.er1
12997 - grep -v '^ *+' conftest.er1 >conftest.err
12998 - rm -f conftest.er1
12999 - cat conftest.err >&5
13000 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13001 - (exit $ac_status); } &&
13002 - { ac_try='test -z "$ac_c_werror_flag"
13003 - || test ! -s conftest.err'
13004 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13005 - (eval $ac_try) 2>&5
13007 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13008 - (exit $ac_status); }; } &&
13009 - { ac_try='test -s conftest.$ac_objext'
13010 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13011 - (eval $ac_try) 2>&5
13013 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13014 - (exit $ac_status); }; }; then
13015 - ac_cv_c_inline=$ac_kw; break
13017 - echo "$as_me: failed program was:" >&5
13018 -sed 's/^/| /' conftest.$ac_ext >&5
13019 + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
13022 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13026 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
13027 +$as_echo_n "checking whether NLS is requested... " >&6; }
13028 + # Check whether --enable-nls was given.
13029 +if test "${enable_nls+set}" = set; then :
13030 + enableval=$enable_nls; USE_NLS=$enableval
13034 -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
13035 -echo "${ECHO_T}$ac_cv_c_inline" >&6
13038 -case $ac_cv_c_inline in
13041 - case $ac_cv_c_inline in
13043 - *) ac_val=$ac_cv_c_inline;;
13045 - cat >>confdefs.h <<_ACEOF
13046 -#ifndef __cplusplus
13047 -#define inline $ac_val
13053 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
13054 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
13055 +$as_echo "$USE_NLS" >&6; }
13060 + GETTEXT_MACRO_VERSION=0.18
13066 -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
13067 - inttypes.h stdint.h unistd.h
13069 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
13070 -echo "$as_me:$LINENO: checking for $ac_header" >&5
13071 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
13072 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
13073 - echo $ECHO_N "(cached) $ECHO_C" >&6
13075 - cat >conftest.$ac_ext <<_ACEOF
13078 -cat confdefs.h >>conftest.$ac_ext
13079 -cat >>conftest.$ac_ext <<_ACEOF
13080 -/* end confdefs.h. */
13081 -$ac_includes_default
13083 -#include <$ac_header>
13085 -rm -f conftest.$ac_objext
13086 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13087 - (eval $ac_compile) 2>conftest.er1
13089 - grep -v '^ *+' conftest.er1 >conftest.err
13090 - rm -f conftest.er1
13091 - cat conftest.err >&5
13092 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13093 - (exit $ac_status); } &&
13094 - { ac_try='test -z "$ac_c_werror_flag"
13095 - || test ! -s conftest.err'
13096 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13097 - (eval $ac_try) 2>&5
13099 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13100 - (exit $ac_status); }; } &&
13101 - { ac_try='test -s conftest.$ac_objext'
13102 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13103 - (eval $ac_try) 2>&5
13105 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13106 - (exit $ac_status); }; }; then
13107 - eval "$as_ac_Header=yes"
13109 - echo "$as_me: failed program was:" >&5
13110 -sed 's/^/| /' conftest.$ac_ext >&5
13112 -eval "$as_ac_Header=no"
13114 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13115 +# Prepare PATH_SEPARATOR.
13116 +# The user is always right.
13117 +if test "${PATH_SEPARATOR+set}" != set; then
13118 + echo "#! /bin/sh" >conf$$.sh
13119 + echo "exit 0" >>conf$$.sh
13120 + chmod +x conf$$.sh
13121 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
13122 + PATH_SEPARATOR=';'
13128 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
13129 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
13130 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
13131 - cat >>confdefs.h <<_ACEOF
13132 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
13135 +# Find out how to test for executable files. Don't use a zero-byte file,
13136 +# as systems may use methods other than mode bits to determine executability.
13137 +cat >conf$$.file <<_ASEOF
13141 +chmod +x conf$$.file
13142 +if test -x conf$$.file >/dev/null 2>&1; then
13143 + ac_executable_p="test -x"
13145 + ac_executable_p="test -f"
13152 -echo "$as_me:$LINENO: checking for off_t" >&5
13153 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6
13154 -if test "${ac_cv_type_off_t+set}" = set; then
13155 - echo $ECHO_N "(cached) $ECHO_C" >&6
13157 - cat >conftest.$ac_ext <<_ACEOF
13160 -cat confdefs.h >>conftest.$ac_ext
13161 -cat >>conftest.$ac_ext <<_ACEOF
13162 -/* end confdefs.h. */
13163 -$ac_includes_default
13169 -if (sizeof (off_t))
13175 -rm -f conftest.$ac_objext
13176 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13177 - (eval $ac_compile) 2>conftest.er1
13179 - grep -v '^ *+' conftest.er1 >conftest.err
13180 - rm -f conftest.er1
13181 - cat conftest.err >&5
13182 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13183 - (exit $ac_status); } &&
13184 - { ac_try='test -z "$ac_c_werror_flag"
13185 - || test ! -s conftest.err'
13186 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13187 - (eval $ac_try) 2>&5
13189 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13190 - (exit $ac_status); }; } &&
13191 - { ac_try='test -s conftest.$ac_objext'
13192 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13193 - (eval $ac_try) 2>&5
13195 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13196 - (exit $ac_status); }; }; then
13197 - ac_cv_type_off_t=yes
13198 +# Extract the first word of "msgfmt", so it can be a program name with args.
13199 +set dummy msgfmt; ac_word=$2
13200 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13201 +$as_echo_n "checking for $ac_word... " >&6; }
13202 +if ${ac_cv_path_MSGFMT+:} false; then :
13203 + $as_echo_n "(cached) " >&6
13205 - echo "$as_me: failed program was:" >&5
13206 -sed 's/^/| /' conftest.$ac_ext >&5
13208 -ac_cv_type_off_t=no
13210 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13211 + case "$MSGFMT" in
13212 + [\\/]* | ?:[\\/]*)
13213 + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
13216 + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
13217 + for ac_dir in $PATH; do
13218 + IFS="$ac_save_IFS"
13219 + test -z "$ac_dir" && ac_dir=.
13220 + for ac_exec_ext in '' $ac_executable_extensions; do
13221 + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
13222 + echo "$as_me: trying $ac_dir/$ac_word..." >&5
13223 + if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
13224 + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
13225 + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
13231 + IFS="$ac_save_IFS"
13232 + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
13236 -echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
13237 -echo "${ECHO_T}$ac_cv_type_off_t" >&6
13238 -if test $ac_cv_type_off_t = yes; then
13240 +MSGFMT="$ac_cv_path_MSGFMT"
13241 +if test "$MSGFMT" != ":"; then
13242 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
13243 +$as_echo "$MSGFMT" >&6; }
13246 -cat >>confdefs.h <<_ACEOF
13247 -#define off_t long
13250 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13251 +$as_echo "no" >&6; }
13254 -echo "$as_me:$LINENO: checking for size_t" >&5
13255 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6
13256 -if test "${ac_cv_type_size_t+set}" = set; then
13257 - echo $ECHO_N "(cached) $ECHO_C" >&6
13259 - cat >conftest.$ac_ext <<_ACEOF
13262 -cat confdefs.h >>conftest.$ac_ext
13263 -cat >>conftest.$ac_ext <<_ACEOF
13264 -/* end confdefs.h. */
13265 -$ac_includes_default
13271 -if (sizeof (size_t))
13277 -rm -f conftest.$ac_objext
13278 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13279 - (eval $ac_compile) 2>conftest.er1
13281 - grep -v '^ *+' conftest.er1 >conftest.err
13282 - rm -f conftest.er1
13283 - cat conftest.err >&5
13284 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13285 - (exit $ac_status); } &&
13286 - { ac_try='test -z "$ac_c_werror_flag"
13287 - || test ! -s conftest.err'
13288 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13289 - (eval $ac_try) 2>&5
13291 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13292 - (exit $ac_status); }; } &&
13293 - { ac_try='test -s conftest.$ac_objext'
13294 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13295 - (eval $ac_try) 2>&5
13297 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13298 - (exit $ac_status); }; }; then
13299 - ac_cv_type_size_t=yes
13300 + # Extract the first word of "gmsgfmt", so it can be a program name with args.
13301 +set dummy gmsgfmt; ac_word=$2
13302 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13303 +$as_echo_n "checking for $ac_word... " >&6; }
13304 +if ${ac_cv_path_GMSGFMT+:} false; then :
13305 + $as_echo_n "(cached) " >&6
13307 - echo "$as_me: failed program was:" >&5
13308 -sed 's/^/| /' conftest.$ac_ext >&5
13310 + [\\/]* | ?:[\\/]*)
13311 + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
13314 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13315 +for as_dir in $PATH
13318 + test -z "$as_dir" && as_dir=.
13319 + for ac_exec_ext in '' $ac_executable_extensions; do
13320 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13321 + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
13322 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13329 -ac_cv_type_size_t=no
13331 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13332 + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
13336 -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
13337 -echo "${ECHO_T}$ac_cv_type_size_t" >&6
13338 -if test $ac_cv_type_size_t = yes; then
13340 +GMSGFMT=$ac_cv_path_GMSGFMT
13341 +if test -n "$GMSGFMT"; then
13342 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
13343 +$as_echo "$GMSGFMT" >&6; }
13345 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13346 +$as_echo "no" >&6; }
13349 -cat >>confdefs.h <<_ACEOF
13350 -#define size_t unsigned
13355 + case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
13356 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
13357 + *) MSGFMT_015=$MSGFMT ;;
13360 - echo "$as_me:$LINENO: checking for long long" >&5
13361 -echo $ECHO_N "checking for long long... $ECHO_C" >&6
13362 -if test "${ac_cv_type_long_long+set}" = set; then
13363 - echo $ECHO_N "(cached) $ECHO_C" >&6
13365 - cat >conftest.$ac_ext <<_ACEOF
13368 -cat confdefs.h >>conftest.$ac_ext
13369 -cat >>conftest.$ac_ext <<_ACEOF
13370 -/* end confdefs.h. */
13371 -long long ll = 1LL; int i = 63;
13375 -long long llmax = (long long) -1;
13376 - return ll << i | ll >> i | llmax / ll | llmax % ll;
13381 -rm -f conftest.$ac_objext conftest$ac_exeext
13382 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13383 - (eval $ac_link) 2>conftest.er1
13385 - grep -v '^ *+' conftest.er1 >conftest.err
13386 - rm -f conftest.er1
13387 - cat conftest.err >&5
13388 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13389 - (exit $ac_status); } &&
13390 - { ac_try='test -z "$ac_c_werror_flag"
13391 - || test ! -s conftest.err'
13392 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13393 - (eval $ac_try) 2>&5
13395 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13396 - (exit $ac_status); }; } &&
13397 - { ac_try='test -s conftest$ac_exeext'
13398 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13399 - (eval $ac_try) 2>&5
13401 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13402 - (exit $ac_status); }; }; then
13403 - ac_cv_type_long_long=yes
13405 - echo "$as_me: failed program was:" >&5
13406 -sed 's/^/| /' conftest.$ac_ext >&5
13407 + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
13408 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
13409 + *) GMSGFMT_015=$GMSGFMT ;;
13412 -ac_cv_type_long_long=no
13414 -rm -f conftest.err conftest.$ac_objext \
13415 - conftest$ac_exeext conftest.$ac_ext
13417 -echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
13418 -echo "${ECHO_T}$ac_cv_type_long_long" >&6
13419 - if test $ac_cv_type_long_long = yes; then
13421 -cat >>confdefs.h <<\_ACEOF
13422 -#define HAVE_LONG_LONG 1
13425 +# Prepare PATH_SEPARATOR.
13426 +# The user is always right.
13427 +if test "${PATH_SEPARATOR+set}" != set; then
13428 + echo "#! /bin/sh" >conf$$.sh
13429 + echo "exit 0" >>conf$$.sh
13430 + chmod +x conf$$.sh
13431 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
13432 + PATH_SEPARATOR=';'
13440 - echo "$as_me:$LINENO: checking for long double" >&5
13441 -echo $ECHO_N "checking for long double... $ECHO_C" >&6
13442 -if test "${gt_cv_c_long_double+set}" = set; then
13443 - echo $ECHO_N "(cached) $ECHO_C" >&6
13444 +# Find out how to test for executable files. Don't use a zero-byte file,
13445 +# as systems may use methods other than mode bits to determine executability.
13446 +cat >conf$$.file <<_ASEOF
13450 +chmod +x conf$$.file
13451 +if test -x conf$$.file >/dev/null 2>&1; then
13452 + ac_executable_p="test -x"
13454 - if test "$GCC" = yes; then
13455 - gt_cv_c_long_double=yes
13457 - cat >conftest.$ac_ext <<_ACEOF
13460 -cat confdefs.h >>conftest.$ac_ext
13461 -cat >>conftest.$ac_ext <<_ACEOF
13462 -/* end confdefs.h. */
13464 - /* The Stardent Vistra knows sizeof(long double), but does not support it. */
13465 - long double foo = 0.0;
13466 - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
13467 - int array [2*(sizeof(long double) >= sizeof(double)) - 1];
13472 + ac_executable_p="test -f"
13480 -rm -f conftest.$ac_objext
13481 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13482 - (eval $ac_compile) 2>conftest.er1
13484 - grep -v '^ *+' conftest.er1 >conftest.err
13485 - rm -f conftest.er1
13486 - cat conftest.err >&5
13487 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13488 - (exit $ac_status); } &&
13489 - { ac_try='test -z "$ac_c_werror_flag"
13490 - || test ! -s conftest.err'
13491 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13492 - (eval $ac_try) 2>&5
13494 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13495 - (exit $ac_status); }; } &&
13496 - { ac_try='test -s conftest.$ac_objext'
13497 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13498 - (eval $ac_try) 2>&5
13500 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13501 - (exit $ac_status); }; }; then
13502 - gt_cv_c_long_double=yes
13503 +# Extract the first word of "xgettext", so it can be a program name with args.
13504 +set dummy xgettext; ac_word=$2
13505 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13506 +$as_echo_n "checking for $ac_word... " >&6; }
13507 +if ${ac_cv_path_XGETTEXT+:} false; then :
13508 + $as_echo_n "(cached) " >&6
13510 - echo "$as_me: failed program was:" >&5
13511 -sed 's/^/| /' conftest.$ac_ext >&5
13513 -gt_cv_c_long_double=no
13514 + case "$XGETTEXT" in
13515 + [\\/]* | ?:[\\/]*)
13516 + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
13519 + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
13520 + for ac_dir in $PATH; do
13521 + IFS="$ac_save_IFS"
13522 + test -z "$ac_dir" && ac_dir=.
13523 + for ac_exec_ext in '' $ac_executable_extensions; do
13524 + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
13525 + echo "$as_me: trying $ac_dir/$ac_word..." >&5
13526 + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
13527 + (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); then
13528 + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
13534 + IFS="$ac_save_IFS"
13535 + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
13539 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13541 +XGETTEXT="$ac_cv_path_XGETTEXT"
13542 +if test "$XGETTEXT" != ":"; then
13543 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
13544 +$as_echo "$XGETTEXT" >&6; }
13546 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13547 +$as_echo "no" >&6; }
13549 -echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
13550 -echo "${ECHO_T}$gt_cv_c_long_double" >&6
13551 - if test $gt_cv_c_long_double = yes; then
13553 -cat >>confdefs.h <<\_ACEOF
13554 -#define HAVE_LONG_DOUBLE 1
13556 + rm -f messages.po
13559 + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
13560 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
13561 + *) XGETTEXT_015=$XGETTEXT ;;
13565 - echo "$as_me:$LINENO: checking for wchar_t" >&5
13566 -echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
13567 -if test "${gt_cv_c_wchar_t+set}" = set; then
13568 - echo $ECHO_N "(cached) $ECHO_C" >&6
13570 - cat >conftest.$ac_ext <<_ACEOF
13573 -cat confdefs.h >>conftest.$ac_ext
13574 -cat >>conftest.$ac_ext <<_ACEOF
13575 -/* end confdefs.h. */
13576 -#include <stddef.h>
13577 - wchar_t foo = (wchar_t)'\0';
13586 -rm -f conftest.$ac_objext
13587 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13588 - (eval $ac_compile) 2>conftest.er1
13590 - grep -v '^ *+' conftest.er1 >conftest.err
13591 - rm -f conftest.er1
13592 - cat conftest.err >&5
13593 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13594 - (exit $ac_status); } &&
13595 - { ac_try='test -z "$ac_c_werror_flag"
13596 - || test ! -s conftest.err'
13597 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13598 - (eval $ac_try) 2>&5
13600 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13601 - (exit $ac_status); }; } &&
13602 - { ac_try='test -s conftest.$ac_objext'
13603 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13604 - (eval $ac_try) 2>&5
13606 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13607 - (exit $ac_status); }; }; then
13608 - gt_cv_c_wchar_t=yes
13609 +# Prepare PATH_SEPARATOR.
13610 +# The user is always right.
13611 +if test "${PATH_SEPARATOR+set}" != set; then
13612 + echo "#! /bin/sh" >conf$$.sh
13613 + echo "exit 0" >>conf$$.sh
13614 + chmod +x conf$$.sh
13615 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
13616 + PATH_SEPARATOR=';'
13623 +# Find out how to test for executable files. Don't use a zero-byte file,
13624 +# as systems may use methods other than mode bits to determine executability.
13625 +cat >conf$$.file <<_ASEOF
13629 +chmod +x conf$$.file
13630 +if test -x conf$$.file >/dev/null 2>&1; then
13631 + ac_executable_p="test -x"
13633 - echo "$as_me: failed program was:" >&5
13634 -sed 's/^/| /' conftest.$ac_ext >&5
13635 + ac_executable_p="test -f"
13639 -gt_cv_c_wchar_t=no
13640 +# Extract the first word of "msgmerge", so it can be a program name with args.
13641 +set dummy msgmerge; ac_word=$2
13642 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13643 +$as_echo_n "checking for $ac_word... " >&6; }
13644 +if ${ac_cv_path_MSGMERGE+:} false; then :
13645 + $as_echo_n "(cached) " >&6
13647 + case "$MSGMERGE" in
13648 + [\\/]* | ?:[\\/]*)
13649 + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
13652 + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
13653 + for ac_dir in $PATH; do
13654 + IFS="$ac_save_IFS"
13655 + test -z "$ac_dir" && ac_dir=.
13656 + for ac_exec_ext in '' $ac_executable_extensions; do
13657 + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
13658 + echo "$as_me: trying $ac_dir/$ac_word..." >&5
13659 + if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
13660 + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
13666 + IFS="$ac_save_IFS"
13667 + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
13671 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13672 +MSGMERGE="$ac_cv_path_MSGMERGE"
13673 +if test "$MSGMERGE" != ":"; then
13674 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
13675 +$as_echo "$MSGMERGE" >&6; }
13677 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13678 +$as_echo "no" >&6; }
13680 -echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
13681 -echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
13682 - if test $gt_cv_c_wchar_t = yes; then
13684 -cat >>confdefs.h <<\_ACEOF
13685 -#define HAVE_WCHAR_T 1
13689 + test -n "$localedir" || localedir='${datadir}/locale'
13692 - echo "$as_me:$LINENO: checking for wint_t" >&5
13693 -echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
13694 -if test "${gt_cv_c_wint_t+set}" = set; then
13695 - echo $ECHO_N "(cached) $ECHO_C" >&6
13697 - cat >conftest.$ac_ext <<_ACEOF
13700 -cat confdefs.h >>conftest.$ac_ext
13701 -cat >>conftest.$ac_ext <<_ACEOF
13702 -/* end confdefs.h. */
13703 -#include <wchar.h>
13704 - wint_t foo = (wchar_t)'\0';
13708 + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
13714 -rm -f conftest.$ac_objext
13715 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13716 - (eval $ac_compile) 2>conftest.er1
13718 - grep -v '^ *+' conftest.er1 >conftest.err
13719 - rm -f conftest.er1
13720 - cat conftest.err >&5
13721 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13722 - (exit $ac_status); } &&
13723 - { ac_try='test -z "$ac_c_werror_flag"
13724 - || test ! -s conftest.err'
13725 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13726 - (eval $ac_try) 2>&5
13728 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13729 - (exit $ac_status); }; } &&
13730 - { ac_try='test -s conftest.$ac_objext'
13731 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13732 - (eval $ac_try) 2>&5
13734 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13735 - (exit $ac_status); }; }; then
13736 - gt_cv_c_wint_t=yes
13738 - echo "$as_me: failed program was:" >&5
13739 -sed 's/^/| /' conftest.$ac_ext >&5
13743 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13745 -echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
13746 -echo "${ECHO_T}$gt_cv_c_wint_t" >&6
13747 - if test $gt_cv_c_wint_t = yes; then
13748 + ac_config_commands="$ac_config_commands po-directories"
13750 -cat >>confdefs.h <<\_ACEOF
13751 -#define HAVE_WINT_T 1
13756 + if test "X$prefix" = "XNONE"; then
13757 + acl_final_prefix="$ac_default_prefix"
13759 + acl_final_prefix="$prefix"
13761 + if test "X$exec_prefix" = "XNONE"; then
13762 + acl_final_exec_prefix='${prefix}'
13764 + acl_final_exec_prefix="$exec_prefix"
13766 + acl_save_prefix="$prefix"
13767 + prefix="$acl_final_prefix"
13768 + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
13769 + prefix="$acl_save_prefix"
13771 - echo "$as_me:$LINENO: checking for inttypes.h" >&5
13772 -echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
13773 -if test "${gl_cv_header_inttypes_h+set}" = set; then
13774 - echo $ECHO_N "(cached) $ECHO_C" >&6
13776 - cat >conftest.$ac_ext <<_ACEOF
13779 -cat confdefs.h >>conftest.$ac_ext
13780 -cat >>conftest.$ac_ext <<_ACEOF
13781 -/* end confdefs.h. */
13782 -#include <sys/types.h>
13783 -#include <inttypes.h>
13787 -uintmax_t i = (uintmax_t) -1;
13792 -rm -f conftest.$ac_objext
13793 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13794 - (eval $ac_compile) 2>conftest.er1
13796 - grep -v '^ *+' conftest.er1 >conftest.err
13797 - rm -f conftest.er1
13798 - cat conftest.err >&5
13799 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13800 - (exit $ac_status); } &&
13801 - { ac_try='test -z "$ac_c_werror_flag"
13802 - || test ! -s conftest.err'
13803 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13804 - (eval $ac_try) 2>&5
13806 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13807 - (exit $ac_status); }; } &&
13808 - { ac_try='test -s conftest.$ac_objext'
13809 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13810 - (eval $ac_try) 2>&5
13812 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13813 - (exit $ac_status); }; }; then
13814 - gl_cv_header_inttypes_h=yes
13816 - echo "$as_me: failed program was:" >&5
13817 -sed 's/^/| /' conftest.$ac_ext >&5
13818 +# Make sure we can run config.sub.
13819 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
13820 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
13822 -gl_cv_header_inttypes_h=no
13823 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
13824 +$as_echo_n "checking build system type... " >&6; }
13825 +if ${ac_cv_build+:} false; then :
13826 + $as_echo_n "(cached) " >&6
13828 + ac_build_alias=$build_alias
13829 +test "x$ac_build_alias" = x &&
13830 + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
13831 +test "x$ac_build_alias" = x &&
13832 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
13833 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
13834 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
13837 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
13838 +$as_echo "$ac_cv_build" >&6; }
13839 +case $ac_cv_build in
13841 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
13843 +build=$ac_cv_build
13844 +ac_save_IFS=$IFS; IFS='-'
13845 +set x $ac_cv_build
13850 +# Remember, the first character of IFS is used to create $*,
13851 +# except with old shells:
13854 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
13857 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
13858 +$as_echo_n "checking host system type... " >&6; }
13859 +if ${ac_cv_host+:} false; then :
13860 + $as_echo_n "(cached) " >&6
13862 + if test "x$host_alias" = x; then
13863 + ac_cv_host=$ac_cv_build
13865 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
13866 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
13868 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13871 -echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
13872 -echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6
13873 - if test $gl_cv_header_inttypes_h = yes; then
13874 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
13875 +$as_echo "$ac_cv_host" >&6; }
13876 +case $ac_cv_host in
13878 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
13881 +ac_save_IFS=$IFS; IFS='-'
13887 +# Remember, the first character of IFS is used to create $*,
13888 +# except with old shells:
13891 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
13893 -cat >>confdefs.h <<_ACEOF
13894 -#define HAVE_INTTYPES_H_WITH_UINTMAX 1
13899 +# Check whether --with-gnu-ld was given.
13900 +if test "${with_gnu_ld+set}" = set; then :
13901 + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
13906 - echo "$as_me:$LINENO: checking for stdint.h" >&5
13907 -echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
13908 -if test "${gl_cv_header_stdint_h+set}" = set; then
13909 - echo $ECHO_N "(cached) $ECHO_C" >&6
13910 +# Prepare PATH_SEPARATOR.
13911 +# The user is always right.
13912 +if test "${PATH_SEPARATOR+set}" != set; then
13913 + echo "#! /bin/sh" >conf$$.sh
13914 + echo "exit 0" >>conf$$.sh
13915 + chmod +x conf$$.sh
13916 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
13917 + PATH_SEPARATOR=';'
13924 +if test "$GCC" = yes; then
13925 + # Check if gcc -print-prog-name=ld gives a path.
13926 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
13927 +$as_echo_n "checking for ld used by GCC... " >&6; }
13930 + # gcc leaves a trailing carriage return which upsets mingw
13931 + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
13933 + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
13936 + # Accept absolute paths.
13937 + [\\/]* | [A-Za-z]:[\\/]*)
13938 + re_direlt='/[^/][^/]*/\.\./'
13939 + # Canonicalize the path of ld
13940 + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
13941 + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
13942 + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
13944 + test -z "$LD" && LD="$ac_prog"
13947 + # If it fails, then pretend we aren't using GCC.
13951 + # If it is relative, then search for the first ld in PATH.
13952 + with_gnu_ld=unknown
13955 +elif test "$with_gnu_ld" = yes; then
13956 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
13957 +$as_echo_n "checking for GNU ld... " >&6; }
13959 - cat >conftest.$ac_ext <<_ACEOF
13962 -cat confdefs.h >>conftest.$ac_ext
13963 -cat >>conftest.$ac_ext <<_ACEOF
13964 -/* end confdefs.h. */
13965 -#include <sys/types.h>
13966 -#include <stdint.h>
13970 -uintmax_t i = (uintmax_t) -1;
13975 -rm -f conftest.$ac_objext
13976 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13977 - (eval $ac_compile) 2>conftest.er1
13979 - grep -v '^ *+' conftest.er1 >conftest.err
13980 - rm -f conftest.er1
13981 - cat conftest.err >&5
13982 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13983 - (exit $ac_status); } &&
13984 - { ac_try='test -z "$ac_c_werror_flag"
13985 - || test ! -s conftest.err'
13986 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13987 - (eval $ac_try) 2>&5
13989 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13990 - (exit $ac_status); }; } &&
13991 - { ac_try='test -s conftest.$ac_objext'
13992 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13993 - (eval $ac_try) 2>&5
13995 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13996 - (exit $ac_status); }; }; then
13997 - gl_cv_header_stdint_h=yes
13998 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
13999 +$as_echo_n "checking for non-GNU ld... " >&6; }
14001 +if ${acl_cv_path_LD+:} false; then :
14002 + $as_echo_n "(cached) " >&6
14004 - echo "$as_me: failed program was:" >&5
14005 -sed 's/^/| /' conftest.$ac_ext >&5
14007 -gl_cv_header_stdint_h=no
14008 + if test -z "$LD"; then
14009 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
14010 + for ac_dir in $PATH; do
14011 + test -z "$ac_dir" && ac_dir=.
14012 + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
14013 + acl_cv_path_LD="$ac_dir/$ac_prog"
14014 + # Check to see if the program is GNU ld. I'd rather use --version,
14015 + # but apparently some GNU ld's only accept -v.
14016 + # Break only if it was the GNU/non-GNU ld that we prefer.
14017 + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
14018 + *GNU* | *'with BFD'*)
14019 + test "$with_gnu_ld" != no && break ;;
14021 + test "$with_gnu_ld" != yes && break ;;
14025 + IFS="$ac_save_ifs"
14027 + acl_cv_path_LD="$LD" # Let the user override the test with a path.
14029 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14031 -echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
14032 -echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
14033 - if test $gl_cv_header_stdint_h = yes; then
14035 -cat >>confdefs.h <<_ACEOF
14036 -#define HAVE_STDINT_H_WITH_UINTMAX 1
14040 +LD="$acl_cv_path_LD"
14041 +if test -n "$LD"; then
14042 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
14043 +$as_echo "$LD" >&6; }
14045 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14046 +$as_echo "no" >&6; }
14048 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
14049 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
14050 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
14051 +if ${acl_cv_prog_gnu_ld+:} false; then :
14052 + $as_echo_n "(cached) " >&6
14054 + # I'd rather use --version here, but apparently some GNU ld's only accept -v.
14055 +case `$LD -v 2>&1 </dev/null` in
14056 +*GNU* | *'with BFD'*)
14057 + acl_cv_prog_gnu_ld=yes ;;
14059 + acl_cv_prog_gnu_ld=no ;;
14062 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
14063 +$as_echo "$acl_cv_prog_gnu_ld" >&6; }
14064 +with_gnu_ld=$acl_cv_prog_gnu_ld
14069 - echo "$as_me:$LINENO: checking for intmax_t" >&5
14070 -echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
14071 -if test "${gt_cv_c_intmax_t+set}" = set; then
14072 - echo $ECHO_N "(cached) $ECHO_C" >&6
14073 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
14074 +$as_echo_n "checking for shared library run path origin... " >&6; }
14075 +if ${acl_cv_rpath+:} false; then :
14076 + $as_echo_n "(cached) " >&6
14078 - cat >conftest.$ac_ext <<_ACEOF
14081 -cat confdefs.h >>conftest.$ac_ext
14082 -cat >>conftest.$ac_ext <<_ACEOF
14083 -/* end confdefs.h. */
14085 -#include <stddef.h>
14086 -#include <stdlib.h>
14087 -#if HAVE_STDINT_H_WITH_UINTMAX
14088 -#include <stdint.h>
14090 -#if HAVE_INTTYPES_H_WITH_UINTMAX
14091 -#include <inttypes.h>
14102 -rm -f conftest.$ac_objext
14103 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14104 - (eval $ac_compile) 2>conftest.er1
14106 - grep -v '^ *+' conftest.er1 >conftest.err
14107 - rm -f conftest.er1
14108 - cat conftest.err >&5
14109 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14110 - (exit $ac_status); } &&
14111 - { ac_try='test -z "$ac_c_werror_flag"
14112 - || test ! -s conftest.err'
14113 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14114 - (eval $ac_try) 2>&5
14116 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14117 - (exit $ac_status); }; } &&
14118 - { ac_try='test -s conftest.$ac_objext'
14119 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14120 - (eval $ac_try) 2>&5
14122 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14123 - (exit $ac_status); }; }; then
14124 - gt_cv_c_intmax_t=yes
14126 - echo "$as_me: failed program was:" >&5
14127 -sed 's/^/| /' conftest.$ac_ext >&5
14128 + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
14129 + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
14131 + rm -f ./conftest.sh
14132 + acl_cv_rpath=done
14134 -gt_cv_c_intmax_t=no
14136 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14137 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
14138 +$as_echo "$acl_cv_rpath" >&6; }
14140 + acl_libext="$acl_cv_libext"
14141 + acl_shlibext="$acl_cv_shlibext"
14142 + acl_libname_spec="$acl_cv_libname_spec"
14143 + acl_library_names_spec="$acl_cv_library_names_spec"
14144 + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
14145 + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
14146 + acl_hardcode_direct="$acl_cv_hardcode_direct"
14147 + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
14148 + # Check whether --enable-rpath was given.
14149 +if test "${enable_rpath+set}" = set; then :
14150 + enableval=$enable_rpath; :
14154 -echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
14155 -echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
14156 - if test $gt_cv_c_intmax_t = yes; then
14158 -cat >>confdefs.h <<\_ACEOF
14159 -#define HAVE_INTMAX_T 1
14166 - echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
14167 -echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6
14168 -if test "${gt_cv_func_printf_posix+set}" = set; then
14169 - echo $ECHO_N "(cached) $ECHO_C" >&6
14170 + acl_libdirstem=lib
14172 + case "$host_os" in
14174 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
14175 +$as_echo_n "checking for 64-bit host... " >&6; }
14176 +if ${gl_cv_solaris_64bit+:} false; then :
14177 + $as_echo_n "(cached) " >&6
14180 - if test "$cross_compiling" = yes; then
14182 - cat >conftest.$ac_ext <<_ACEOF
14185 -cat confdefs.h >>conftest.$ac_ext
14186 -cat >>conftest.$ac_ext <<_ACEOF
14187 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14188 /* end confdefs.h. */
14190 -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
14197 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14198 - $EGREP "notposix" >/dev/null 2>&1; then
14199 - gt_cv_func_printf_posix="guessing no"
14200 + $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
14201 + gl_cv_solaris_64bit=yes
14203 - gt_cv_func_printf_posix="guessing yes"
14204 + gl_cv_solaris_64bit=no
14210 - cat >conftest.$ac_ext <<_ACEOF
14213 -cat confdefs.h >>conftest.$ac_ext
14214 -cat >>conftest.$ac_ext <<_ACEOF
14215 -/* end confdefs.h. */
14217 -#include <stdio.h>
14218 -#include <string.h>
14219 -/* The string "%2$d %1$d", with dollar characters protected from the shell's
14220 - dollar expansion (possibly an autoconf bug). */
14221 -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
14222 -static char buf[100];
14225 - sprintf (buf, format, 33, 55);
14226 - return (strcmp (buf, "55 33") != 0);
14229 -rm -f conftest$ac_exeext
14230 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14231 - (eval $ac_link) 2>&5
14233 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14234 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14235 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14236 - (eval $ac_try) 2>&5
14238 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14239 - (exit $ac_status); }; }; then
14240 - gt_cv_func_printf_posix=yes
14242 - echo "$as_me: program exited with status $ac_status" >&5
14243 -echo "$as_me: failed program was:" >&5
14244 -sed 's/^/| /' conftest.$ac_ext >&5
14246 -( exit $ac_status )
14247 -gt_cv_func_printf_posix=no
14249 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14253 -echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
14254 -echo "${ECHO_T}$gt_cv_func_printf_posix" >&6
14255 - case $gt_cv_func_printf_posix in
14258 -cat >>confdefs.h <<\_ACEOF
14259 -#define HAVE_POSIX_PRINTF 1
14262 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
14263 +$as_echo "$gl_cv_solaris_64bit" >&6; }
14264 + if test $gl_cv_solaris_64bit = yes; then
14265 + acl_libdirstem=lib/64
14266 + case "$host_cpu" in
14267 + sparc*) acl_libdirstem2=lib/sparcv9 ;;
14268 + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
14273 + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
14274 + if test -n "$searchpath"; then
14275 + acl_save_IFS="${IFS= }"; IFS=":"
14276 + for searchdir in $searchpath; do
14277 + if test -d "$searchdir"; then
14278 + case "$searchdir" in
14279 + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
14281 + # Better ignore directories of this form. They are misleading.
14283 + *) searchdir=`cd "$searchdir" && pwd`
14284 + case "$searchdir" in
14285 + */lib64 ) acl_libdirstem=lib64 ;;
14290 + IFS="$acl_save_IFS"
14294 + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
14296 -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
14297 -# for constant arguments. Useless!
14298 -echo "$as_me:$LINENO: checking for working alloca.h" >&5
14299 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
14300 -if test "${ac_cv_working_alloca_h+set}" = set; then
14301 - echo $ECHO_N "(cached) $ECHO_C" >&6
14303 - cat >conftest.$ac_ext <<_ACEOF
14306 -cat confdefs.h >>conftest.$ac_ext
14307 -cat >>conftest.$ac_ext <<_ACEOF
14308 -/* end confdefs.h. */
14309 -#include <alloca.h>
14313 -char *p = (char *) alloca (2 * sizeof (int));
14318 -rm -f conftest.$ac_objext conftest$ac_exeext
14319 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14320 - (eval $ac_link) 2>conftest.er1
14322 - grep -v '^ *+' conftest.er1 >conftest.err
14323 - rm -f conftest.er1
14324 - cat conftest.err >&5
14325 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14326 - (exit $ac_status); } &&
14327 - { ac_try='test -z "$ac_c_werror_flag"
14328 - || test ! -s conftest.err'
14329 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14330 - (eval $ac_try) 2>&5
14332 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14333 - (exit $ac_status); }; } &&
14334 - { ac_try='test -s conftest$ac_exeext'
14335 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14336 - (eval $ac_try) 2>&5
14338 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14339 - (exit $ac_status); }; }; then
14340 - ac_cv_working_alloca_h=yes
14342 - echo "$as_me: failed program was:" >&5
14343 -sed 's/^/| /' conftest.$ac_ext >&5
14345 -ac_cv_working_alloca_h=no
14347 -rm -f conftest.err conftest.$ac_objext \
14348 - conftest$ac_exeext conftest.$ac_ext
14350 -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
14351 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
14352 -if test $ac_cv_working_alloca_h = yes; then
14354 -cat >>confdefs.h <<\_ACEOF
14355 -#define HAVE_ALLOCA_H 1
14360 -echo "$as_me:$LINENO: checking for alloca" >&5
14361 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6
14362 -if test "${ac_cv_func_alloca_works+set}" = set; then
14363 - echo $ECHO_N "(cached) $ECHO_C" >&6
14365 - cat >conftest.$ac_ext <<_ACEOF
14368 -cat confdefs.h >>conftest.$ac_ext
14369 -cat >>conftest.$ac_ext <<_ACEOF
14370 -/* end confdefs.h. */
14372 -# define alloca __builtin_alloca
14375 -# include <malloc.h>
14376 -# define alloca _alloca
14378 -# if HAVE_ALLOCA_H
14379 -# include <alloca.h>
14384 -# ifndef alloca /* predefined by HP cc +Olibcalls */
14395 -char *p = (char *) alloca (1);
14400 -rm -f conftest.$ac_objext conftest$ac_exeext
14401 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14402 - (eval $ac_link) 2>conftest.er1
14404 - grep -v '^ *+' conftest.er1 >conftest.err
14405 - rm -f conftest.er1
14406 - cat conftest.err >&5
14407 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14408 - (exit $ac_status); } &&
14409 - { ac_try='test -z "$ac_c_werror_flag"
14410 - || test ! -s conftest.err'
14411 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14412 - (eval $ac_try) 2>&5
14414 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14415 - (exit $ac_status); }; } &&
14416 - { ac_try='test -s conftest$ac_exeext'
14417 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14418 - (eval $ac_try) 2>&5
14420 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14421 - (exit $ac_status); }; }; then
14422 - ac_cv_func_alloca_works=yes
14424 - echo "$as_me: failed program was:" >&5
14425 -sed 's/^/| /' conftest.$ac_ext >&5
14427 -ac_cv_func_alloca_works=no
14429 -rm -f conftest.err conftest.$ac_objext \
14430 - conftest$ac_exeext conftest.$ac_ext
14432 -echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
14433 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
14435 -if test $ac_cv_func_alloca_works = yes; then
14437 -cat >>confdefs.h <<\_ACEOF
14438 -#define HAVE_ALLOCA 1
14442 - # The SVR3 libPW and SVR4 libucb both contain incompatible functions
14443 -# that cause trouble. Some versions do not even contain alloca or
14444 -# contain a buggy version. If you still want to use their alloca,
14445 -# use ar to extract alloca.o from them instead of compiling alloca.c.
14447 -ALLOCA=alloca.$ac_objext
14449 -cat >>confdefs.h <<\_ACEOF
14450 -#define C_ALLOCA 1
14454 -echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
14455 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
14456 -if test "${ac_cv_os_cray+set}" = set; then
14457 - echo $ECHO_N "(cached) $ECHO_C" >&6
14459 - cat >conftest.$ac_ext <<_ACEOF
14462 -cat confdefs.h >>conftest.$ac_ext
14463 -cat >>conftest.$ac_ext <<_ACEOF
14464 -/* end confdefs.h. */
14465 -#if defined(CRAY) && ! defined(CRAY2)
14472 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14473 - $EGREP "webecray" >/dev/null 2>&1; then
14474 - ac_cv_os_cray=yes
14481 -echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
14482 -echo "${ECHO_T}$ac_cv_os_cray" >&6
14483 -if test $ac_cv_os_cray = yes; then
14484 - for ac_func in _getb67 GETB67 getb67; do
14485 - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
14486 -echo "$as_me:$LINENO: checking for $ac_func" >&5
14487 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
14488 -if eval "test \"\${$as_ac_var+set}\" = set"; then
14489 - echo $ECHO_N "(cached) $ECHO_C" >&6
14491 - cat >conftest.$ac_ext <<_ACEOF
14494 -cat confdefs.h >>conftest.$ac_ext
14495 -cat >>conftest.$ac_ext <<_ACEOF
14496 -/* end confdefs.h. */
14497 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
14498 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
14499 -#define $ac_func innocuous_$ac_func
14501 -/* System header to define __stub macros and hopefully few prototypes,
14502 - which can conflict with char $ac_func (); below.
14503 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
14504 - <limits.h> exists even on freestanding compilers. */
14507 -# include <limits.h>
14509 -# include <assert.h>
14514 -/* Override any gcc2 internal prototype to avoid an error. */
14515 -#ifdef __cplusplus
14519 -/* We use char because int might match the return type of a gcc2
14520 - builtin and then its argument prototype would still apply. */
14522 -/* The GNU C library defines this for functions which it implements
14523 - to always fail with ENOSYS. Some functions are actually named
14524 - something starting with __ and the normal name is an alias. */
14525 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
14528 -char (*f) () = $ac_func;
14530 -#ifdef __cplusplus
14537 -return f != $ac_func;
14542 -rm -f conftest.$ac_objext conftest$ac_exeext
14543 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14544 - (eval $ac_link) 2>conftest.er1
14546 - grep -v '^ *+' conftest.er1 >conftest.err
14547 - rm -f conftest.er1
14548 - cat conftest.err >&5
14549 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14550 - (exit $ac_status); } &&
14551 - { ac_try='test -z "$ac_c_werror_flag"
14552 - || test ! -s conftest.err'
14553 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14554 - (eval $ac_try) 2>&5
14556 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14557 - (exit $ac_status); }; } &&
14558 - { ac_try='test -s conftest$ac_exeext'
14559 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14560 - (eval $ac_try) 2>&5
14562 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14563 - (exit $ac_status); }; }; then
14564 - eval "$as_ac_var=yes"
14566 - echo "$as_me: failed program was:" >&5
14567 -sed 's/^/| /' conftest.$ac_ext >&5
14568 + use_additional=yes
14570 -eval "$as_ac_var=no"
14572 -rm -f conftest.err conftest.$ac_objext \
14573 - conftest$ac_exeext conftest.$ac_ext
14575 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
14576 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
14577 -if test `eval echo '${'$as_ac_var'}'` = yes; then
14578 + acl_save_prefix="$prefix"
14579 + prefix="$acl_final_prefix"
14580 + acl_save_exec_prefix="$exec_prefix"
14581 + exec_prefix="$acl_final_exec_prefix"
14583 -cat >>confdefs.h <<_ACEOF
14584 -#define CRAY_STACKSEG_END $ac_func
14586 + eval additional_includedir=\"$includedir\"
14587 + eval additional_libdir=\"$libdir\"
14591 + exec_prefix="$acl_save_exec_prefix"
14592 + prefix="$acl_save_prefix"
14597 -echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
14598 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
14599 -if test "${ac_cv_c_stack_direction+set}" = set; then
14600 - echo $ECHO_N "(cached) $ECHO_C" >&6
14602 - if test "$cross_compiling" = yes; then
14603 - ac_cv_c_stack_direction=0
14605 - cat >conftest.$ac_ext <<_ACEOF
14608 -cat confdefs.h >>conftest.$ac_ext
14609 -cat >>conftest.$ac_ext <<_ACEOF
14610 -/* end confdefs.h. */
14612 -find_stack_direction ()
14614 - static char *addr = 0;
14619 - return find_stack_direction ();
14622 - return (&dummy > addr) ? 1 : -1;
14624 +# Check whether --with-libiconv-prefix was given.
14625 +if test "${with_libiconv_prefix+set}" = set; then :
14626 + withval=$with_libiconv_prefix;
14627 + if test "X$withval" = "Xno"; then
14628 + use_additional=no
14630 + if test "X$withval" = "X"; then
14635 - exit (find_stack_direction () < 0);
14638 -rm -f conftest$ac_exeext
14639 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14640 - (eval $ac_link) 2>&5
14642 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14643 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14644 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14645 - (eval $ac_try) 2>&5
14647 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14648 - (exit $ac_status); }; }; then
14649 - ac_cv_c_stack_direction=1
14651 - echo "$as_me: program exited with status $ac_status" >&5
14652 -echo "$as_me: failed program was:" >&5
14653 -sed 's/^/| /' conftest.$ac_ext >&5
14654 + acl_save_prefix="$prefix"
14655 + prefix="$acl_final_prefix"
14656 + acl_save_exec_prefix="$exec_prefix"
14657 + exec_prefix="$acl_final_exec_prefix"
14659 -( exit $ac_status )
14660 -ac_cv_c_stack_direction=-1
14662 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14665 -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
14666 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
14667 + eval additional_includedir=\"$includedir\"
14668 + eval additional_libdir=\"$libdir\"
14670 -cat >>confdefs.h <<_ACEOF
14671 -#define STACK_DIRECTION $ac_cv_c_stack_direction
14673 + exec_prefix="$acl_save_exec_prefix"
14674 + prefix="$acl_save_prefix"
14677 + additional_includedir="$withval/include"
14678 + additional_libdir="$withval/$acl_libdirstem"
14679 + if test "$acl_libdirstem2" != "$acl_libdirstem" \
14680 + && ! test -d "$withval/$acl_libdirstem"; then
14681 + additional_libdir="$withval/$acl_libdirstem2"
14695 + names_already_handled=
14696 + names_next_round='iconv '
14697 + while test -n "$names_next_round"; do
14698 + names_this_round="$names_next_round"
14699 + names_next_round=
14700 + for name in $names_this_round; do
14702 + for n in $names_already_handled; do
14703 + if test "$n" = "$name"; then
14704 + already_handled=yes
14708 + if test -z "$already_handled"; then
14709 + names_already_handled="$names_already_handled $name"
14710 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
14711 + eval value=\"\$HAVE_LIB$uppername\"
14712 + if test -n "$value"; then
14713 + if test "$value" = yes; then
14714 + eval value=\"\$LIB$uppername\"
14715 + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
14716 + eval value=\"\$LTLIB$uppername\"
14717 + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
14726 + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
14727 + if test -n "$acl_shlibext"; then
14728 + shrext=".$acl_shlibext" # typically: shrext=.so
14732 + if test $use_additional = yes; then
14733 + dir="$additional_libdir"
14734 + if test -n "$acl_shlibext"; then
14735 + if test -f "$dir/$libname$shrext"; then
14737 + found_so="$dir/$libname$shrext"
14739 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
14740 + ver=`(cd "$dir" && \
14741 + for f in "$libname$shrext".*; do echo "$f"; done \
14742 + | sed -e "s,^$libname$shrext\\\\.,," \
14743 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
14744 + | sed 1q ) 2>/dev/null`
14745 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
14747 + found_so="$dir/$libname$shrext.$ver"
14750 + eval library_names=\"$acl_library_names_spec\"
14751 + for f in $library_names; do
14752 + if test -f "$dir/$f"; then
14754 + found_so="$dir/$f"
14761 + if test "X$found_dir" = "X"; then
14762 + if test -f "$dir/$libname.$acl_libext"; then
14764 + found_a="$dir/$libname.$acl_libext"
14767 + if test "X$found_dir" != "X"; then
14768 + if test -f "$dir/$libname.la"; then
14769 + found_la="$dir/$libname.la"
14773 + if test "X$found_dir" = "X"; then
14774 + for x in $LDFLAGS $LTLIBICONV; do
14777 -for ac_header in stdlib.h unistd.h
14779 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14780 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
14781 - echo "$as_me:$LINENO: checking for $ac_header" >&5
14782 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14783 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
14784 - echo $ECHO_N "(cached) $ECHO_C" >&6
14786 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
14787 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14789 - # Is the header compilable?
14790 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
14791 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
14792 -cat >conftest.$ac_ext <<_ACEOF
14795 -cat confdefs.h >>conftest.$ac_ext
14796 -cat >>conftest.$ac_ext <<_ACEOF
14797 -/* end confdefs.h. */
14798 -$ac_includes_default
14799 -#include <$ac_header>
14801 -rm -f conftest.$ac_objext
14802 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14803 - (eval $ac_compile) 2>conftest.er1
14805 - grep -v '^ *+' conftest.er1 >conftest.err
14806 - rm -f conftest.er1
14807 - cat conftest.err >&5
14808 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14809 - (exit $ac_status); } &&
14810 - { ac_try='test -z "$ac_c_werror_flag"
14811 - || test ! -s conftest.err'
14812 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14813 - (eval $ac_try) 2>&5
14815 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14816 - (exit $ac_status); }; } &&
14817 - { ac_try='test -s conftest.$ac_objext'
14818 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14819 - (eval $ac_try) 2>&5
14821 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14822 - (exit $ac_status); }; }; then
14823 - ac_header_compiler=yes
14825 - echo "$as_me: failed program was:" >&5
14826 -sed 's/^/| /' conftest.$ac_ext >&5
14828 -ac_header_compiler=no
14830 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14831 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14832 -echo "${ECHO_T}$ac_header_compiler" >&6
14834 -# Is the header present?
14835 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
14836 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
14837 -cat >conftest.$ac_ext <<_ACEOF
14840 -cat confdefs.h >>conftest.$ac_ext
14841 -cat >>conftest.$ac_ext <<_ACEOF
14842 -/* end confdefs.h. */
14843 -#include <$ac_header>
14845 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
14846 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14848 - grep -v '^ *+' conftest.er1 >conftest.err
14849 - rm -f conftest.er1
14850 - cat conftest.err >&5
14851 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14852 - (exit $ac_status); } >/dev/null; then
14853 - if test -s conftest.err; then
14854 - ac_cpp_err=$ac_c_preproc_warn_flag
14855 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14862 -if test -z "$ac_cpp_err"; then
14863 - ac_header_preproc=yes
14865 - echo "$as_me: failed program was:" >&5
14866 -sed 's/^/| /' conftest.$ac_ext >&5
14868 - ac_header_preproc=no
14870 -rm -f conftest.err conftest.$ac_ext
14871 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14872 -echo "${ECHO_T}$ac_header_preproc" >&6
14874 -# So? What about this header?
14875 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14877 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
14878 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
14879 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
14880 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
14881 - ac_header_preproc=yes
14884 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
14885 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
14886 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
14887 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
14888 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
14889 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
14890 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
14891 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
14892 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
14893 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
14894 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
14895 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
14898 -## ------------------------------------------ ##
14899 -## Report this to the AC_PACKAGE_NAME lists. ##
14900 -## ------------------------------------------ ##
14903 - sed "s/^/$as_me: WARNING: /" >&2
14906 -echo "$as_me:$LINENO: checking for $ac_header" >&5
14907 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14908 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
14909 - echo $ECHO_N "(cached) $ECHO_C" >&6
14911 - eval "$as_ac_Header=\$ac_header_preproc"
14913 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
14914 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14917 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
14918 - cat >>confdefs.h <<_ACEOF
14919 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
14927 -for ac_func in getpagesize
14929 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
14930 -echo "$as_me:$LINENO: checking for $ac_func" >&5
14931 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
14932 -if eval "test \"\${$as_ac_var+set}\" = set"; then
14933 - echo $ECHO_N "(cached) $ECHO_C" >&6
14935 - cat >conftest.$ac_ext <<_ACEOF
14938 -cat confdefs.h >>conftest.$ac_ext
14939 -cat >>conftest.$ac_ext <<_ACEOF
14940 -/* end confdefs.h. */
14941 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
14942 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
14943 -#define $ac_func innocuous_$ac_func
14945 -/* System header to define __stub macros and hopefully few prototypes,
14946 - which can conflict with char $ac_func (); below.
14947 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
14948 - <limits.h> exists even on freestanding compilers. */
14951 -# include <limits.h>
14953 -# include <assert.h>
14958 -/* Override any gcc2 internal prototype to avoid an error. */
14959 -#ifdef __cplusplus
14963 -/* We use char because int might match the return type of a gcc2
14964 - builtin and then its argument prototype would still apply. */
14966 -/* The GNU C library defines this for functions which it implements
14967 - to always fail with ENOSYS. Some functions are actually named
14968 - something starting with __ and the normal name is an alias. */
14969 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
14972 -char (*f) () = $ac_func;
14974 -#ifdef __cplusplus
14981 -return f != $ac_func;
14986 -rm -f conftest.$ac_objext conftest$ac_exeext
14987 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14988 - (eval $ac_link) 2>conftest.er1
14990 - grep -v '^ *+' conftest.er1 >conftest.err
14991 - rm -f conftest.er1
14992 - cat conftest.err >&5
14993 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14994 - (exit $ac_status); } &&
14995 - { ac_try='test -z "$ac_c_werror_flag"
14996 - || test ! -s conftest.err'
14997 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14998 - (eval $ac_try) 2>&5
15000 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15001 - (exit $ac_status); }; } &&
15002 - { ac_try='test -s conftest$ac_exeext'
15003 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15004 - (eval $ac_try) 2>&5
15006 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15007 - (exit $ac_status); }; }; then
15008 - eval "$as_ac_var=yes"
15010 - echo "$as_me: failed program was:" >&5
15011 -sed 's/^/| /' conftest.$ac_ext >&5
15013 -eval "$as_ac_var=no"
15015 -rm -f conftest.err conftest.$ac_objext \
15016 - conftest$ac_exeext conftest.$ac_ext
15018 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
15019 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
15020 -if test `eval echo '${'$as_ac_var'}'` = yes; then
15021 - cat >>confdefs.h <<_ACEOF
15022 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
15028 -echo "$as_me:$LINENO: checking for working mmap" >&5
15029 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
15030 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
15031 - echo $ECHO_N "(cached) $ECHO_C" >&6
15033 - if test "$cross_compiling" = yes; then
15034 - ac_cv_func_mmap_fixed_mapped=no
15036 - cat >conftest.$ac_ext <<_ACEOF
15039 -cat confdefs.h >>conftest.$ac_ext
15040 -cat >>conftest.$ac_ext <<_ACEOF
15041 -/* end confdefs.h. */
15042 -$ac_includes_default
15043 -/* malloc might have been renamed as rpl_malloc. */
15046 -/* Thanks to Mike Haertel and Jim Avera for this test.
15047 - Here is a matrix of mmap possibilities:
15048 - mmap private not fixed
15049 - mmap private fixed at somewhere currently unmapped
15050 - mmap private fixed at somewhere already mapped
15051 - mmap shared not fixed
15052 - mmap shared fixed at somewhere currently unmapped
15053 - mmap shared fixed at somewhere already mapped
15054 - For private mappings, we should verify that changes cannot be read()
15055 - back from the file, nor mmap's back from the file at a different
15056 - address. (There have been systems where private was not correctly
15057 - implemented like the infamous i386 svr4.0, and systems where the
15058 - VM page cache was not coherent with the file system buffer cache
15059 - like early versions of FreeBSD and possibly contemporary NetBSD.)
15060 - For shared mappings, we should conversely verify that changes get
15061 - propagated back to all the places they're supposed to be.
15063 - Grep wants private fixed already mapped.
15064 - The main things grep needs to know about mmap are:
15065 - * does it exist and is it safe to write into the mmap'd area
15066 - * how to use it (BSD variants) */
15068 -#include <fcntl.h>
15069 -#include <sys/mman.h>
15071 -#if !STDC_HEADERS && !HAVE_STDLIB_H
15075 -/* This mess was copied from the GNU getpagesize.h. */
15076 -#if !HAVE_GETPAGESIZE
15077 -/* Assume that all systems that can run configure have sys/param.h. */
15078 -# if !HAVE_SYS_PARAM_H
15079 -# define HAVE_SYS_PARAM_H 1
15082 -# ifdef _SC_PAGESIZE
15083 -# define getpagesize() sysconf(_SC_PAGESIZE)
15084 -# else /* no _SC_PAGESIZE */
15085 -# if HAVE_SYS_PARAM_H
15086 -# include <sys/param.h>
15087 -# ifdef EXEC_PAGESIZE
15088 -# define getpagesize() EXEC_PAGESIZE
15089 -# else /* no EXEC_PAGESIZE */
15091 -# define getpagesize() NBPG * CLSIZE
15094 -# endif /* no CLSIZE */
15095 -# else /* no NBPG */
15097 -# define getpagesize() NBPC
15098 -# else /* no NBPC */
15100 -# define getpagesize() PAGESIZE
15101 -# endif /* PAGESIZE */
15102 -# endif /* no NBPC */
15103 -# endif /* no NBPG */
15104 -# endif /* no EXEC_PAGESIZE */
15105 -# else /* no HAVE_SYS_PARAM_H */
15106 -# define getpagesize() 8192 /* punt totally */
15107 -# endif /* no HAVE_SYS_PARAM_H */
15108 -# endif /* no _SC_PAGESIZE */
15110 -#endif /* no HAVE_GETPAGESIZE */
15115 - char *data, *data2, *data3;
15119 - pagesize = getpagesize ();
15121 - /* First, make a file with some known garbage in it. */
15122 - data = (char *) malloc (pagesize);
15125 - for (i = 0; i < pagesize; ++i)
15126 - *(data + i) = rand ();
15128 - fd = creat ("conftest.mmap", 0600);
15131 - if (write (fd, data, pagesize) != pagesize)
15135 - /* Next, try to mmap the file at a fixed address which already has
15136 - something else allocated at it. If we can, also make sure that
15137 - we see the same garbage. */
15138 - fd = open ("conftest.mmap", O_RDWR);
15141 - data2 = (char *) malloc (2 * pagesize);
15144 - data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
15145 - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
15146 - MAP_PRIVATE | MAP_FIXED, fd, 0L))
15148 - for (i = 0; i < pagesize; ++i)
15149 - if (*(data + i) != *(data2 + i))
15152 - /* Finally, make sure that changes to the mapped area do not
15153 - percolate back to the file as seen by read(). (This is a bug on
15154 - some variants of i386 svr4.0.) */
15155 - for (i = 0; i < pagesize; ++i)
15156 - *(data2 + i) = *(data2 + i) + 1;
15157 - data3 = (char *) malloc (pagesize);
15160 - if (read (fd, data3, pagesize) != pagesize)
15162 - for (i = 0; i < pagesize; ++i)
15163 - if (*(data + i) != *(data3 + i))
15169 -rm -f conftest$ac_exeext
15170 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15171 - (eval $ac_link) 2>&5
15173 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15174 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
15175 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15176 - (eval $ac_try) 2>&5
15178 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15179 - (exit $ac_status); }; }; then
15180 - ac_cv_func_mmap_fixed_mapped=yes
15182 - echo "$as_me: program exited with status $ac_status" >&5
15183 -echo "$as_me: failed program was:" >&5
15184 -sed 's/^/| /' conftest.$ac_ext >&5
15186 -( exit $ac_status )
15187 -ac_cv_func_mmap_fixed_mapped=no
15189 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15192 -echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
15193 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
15194 -if test $ac_cv_func_mmap_fixed_mapped = yes; then
15196 -cat >>confdefs.h <<\_ACEOF
15197 -#define HAVE_MMAP 1
15201 -rm -f conftest.mmap
15204 - echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
15205 -echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
15206 -if test "${ac_cv_gnu_library_2_1+set}" = set; then
15207 - echo $ECHO_N "(cached) $ECHO_C" >&6
15209 - cat >conftest.$ac_ext <<_ACEOF
15212 -cat confdefs.h >>conftest.$ac_ext
15213 -cat >>conftest.$ac_ext <<_ACEOF
15214 -/* end confdefs.h. */
15216 -#include <features.h>
15217 -#ifdef __GNU_LIBRARY__
15218 - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
15224 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
15225 - $EGREP "Lucky GNU user" >/dev/null 2>&1; then
15226 - ac_cv_gnu_library_2_1=yes
15228 - ac_cv_gnu_library_2_1=no
15235 -echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
15236 -echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
15238 - GLIBC21="$ac_cv_gnu_library_2_1"
15243 - echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
15244 -echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
15245 -if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
15246 - echo $ECHO_N "(cached) $ECHO_C" >&6
15249 - if test "$cross_compiling" = yes; then
15251 - # Guess based on the CPU.
15252 - case "$host_cpu" in
15253 - alpha* | i3456786 | m68k | s390*)
15254 - gt_cv_int_divbyzero_sigfpe="guessing yes";;
15256 - gt_cv_int_divbyzero_sigfpe="guessing no";;
15260 - cat >conftest.$ac_ext <<_ACEOF
15263 -cat confdefs.h >>conftest.$ac_ext
15264 -cat >>conftest.$ac_ext <<_ACEOF
15265 -/* end confdefs.h. */
15267 -#include <stdlib.h>
15268 -#include <signal.h>
15271 -#ifdef __cplusplus
15272 -sigfpe_handler (int sig)
15274 -sigfpe_handler (sig) int sig;
15277 - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
15278 - exit (sig != SIGFPE);
15288 - signal (SIGFPE, sigfpe_handler);
15289 -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
15290 -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
15291 - signal (SIGTRAP, sigfpe_handler);
15293 -/* Linux/SPARC yields signal SIGILL. */
15294 -#if defined (__sparc__) && defined (__linux__)
15295 - signal (SIGILL, sigfpe_handler);
15304 -rm -f conftest$ac_exeext
15305 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15306 - (eval $ac_link) 2>&5
15308 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15309 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
15310 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15311 - (eval $ac_try) 2>&5
15313 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15314 - (exit $ac_status); }; }; then
15315 - gt_cv_int_divbyzero_sigfpe=yes
15317 - echo "$as_me: program exited with status $ac_status" >&5
15318 -echo "$as_me: failed program was:" >&5
15319 -sed 's/^/| /' conftest.$ac_ext >&5
15321 -( exit $ac_status )
15322 -gt_cv_int_divbyzero_sigfpe=no
15324 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15328 -echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
15329 -echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
15330 - case "$gt_cv_int_divbyzero_sigfpe" in
15335 -cat >>confdefs.h <<_ACEOF
15336 -#define INTDIV0_RAISES_SIGFPE $value
15341 - echo "$as_me:$LINENO: checking for unsigned long long" >&5
15342 -echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
15343 -if test "${ac_cv_type_unsigned_long_long+set}" = set; then
15344 - echo $ECHO_N "(cached) $ECHO_C" >&6
15346 - cat >conftest.$ac_ext <<_ACEOF
15349 -cat confdefs.h >>conftest.$ac_ext
15350 -cat >>conftest.$ac_ext <<_ACEOF
15351 -/* end confdefs.h. */
15352 -unsigned long long ull = 1ULL; int i = 63;
15356 -unsigned long long ullmax = (unsigned long long) -1;
15357 - return ull << i | ull >> i | ullmax / ull | ullmax % ull;
15362 -rm -f conftest.$ac_objext conftest$ac_exeext
15363 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15364 - (eval $ac_link) 2>conftest.er1
15366 - grep -v '^ *+' conftest.er1 >conftest.err
15367 - rm -f conftest.er1
15368 - cat conftest.err >&5
15369 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15370 - (exit $ac_status); } &&
15371 - { ac_try='test -z "$ac_c_werror_flag"
15372 - || test ! -s conftest.err'
15373 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15374 - (eval $ac_try) 2>&5
15376 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15377 - (exit $ac_status); }; } &&
15378 - { ac_try='test -s conftest$ac_exeext'
15379 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15380 - (eval $ac_try) 2>&5
15382 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15383 - (exit $ac_status); }; }; then
15384 - ac_cv_type_unsigned_long_long=yes
15386 - echo "$as_me: failed program was:" >&5
15387 -sed 's/^/| /' conftest.$ac_ext >&5
15389 -ac_cv_type_unsigned_long_long=no
15391 -rm -f conftest.err conftest.$ac_objext \
15392 - conftest$ac_exeext conftest.$ac_ext
15394 -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
15395 -echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
15396 - if test $ac_cv_type_unsigned_long_long = yes; then
15398 -cat >>confdefs.h <<\_ACEOF
15399 -#define HAVE_UNSIGNED_LONG_LONG 1
15407 - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
15409 - test $ac_cv_type_unsigned_long_long = yes \
15410 - && ac_type='unsigned long long' \
15411 - || ac_type='unsigned long'
15413 -cat >>confdefs.h <<_ACEOF
15414 -#define uintmax_t $ac_type
15419 -cat >>confdefs.h <<\_ACEOF
15420 -#define HAVE_UINTMAX_T 1
15426 - echo "$as_me:$LINENO: checking for inttypes.h" >&5
15427 -echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
15428 -if test "${gt_cv_header_inttypes_h+set}" = set; then
15429 - echo $ECHO_N "(cached) $ECHO_C" >&6
15432 - cat >conftest.$ac_ext <<_ACEOF
15435 -cat confdefs.h >>conftest.$ac_ext
15436 -cat >>conftest.$ac_ext <<_ACEOF
15437 -/* end confdefs.h. */
15438 -#include <sys/types.h>
15439 -#include <inttypes.h>
15448 -rm -f conftest.$ac_objext
15449 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15450 - (eval $ac_compile) 2>conftest.er1
15452 - grep -v '^ *+' conftest.er1 >conftest.err
15453 - rm -f conftest.er1
15454 - cat conftest.err >&5
15455 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15456 - (exit $ac_status); } &&
15457 - { ac_try='test -z "$ac_c_werror_flag"
15458 - || test ! -s conftest.err'
15459 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15460 - (eval $ac_try) 2>&5
15462 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15463 - (exit $ac_status); }; } &&
15464 - { ac_try='test -s conftest.$ac_objext'
15465 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15466 - (eval $ac_try) 2>&5
15468 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15469 - (exit $ac_status); }; }; then
15470 - gt_cv_header_inttypes_h=yes
15472 - echo "$as_me: failed program was:" >&5
15473 -sed 's/^/| /' conftest.$ac_ext >&5
15475 -gt_cv_header_inttypes_h=no
15477 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15480 -echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
15481 -echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
15482 - if test $gt_cv_header_inttypes_h = yes; then
15484 -cat >>confdefs.h <<_ACEOF
15485 -#define HAVE_INTTYPES_H 1
15492 - if test $gt_cv_header_inttypes_h = yes; then
15493 - echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
15494 -echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
15495 -if test "${gt_cv_inttypes_pri_broken+set}" = set; then
15496 - echo $ECHO_N "(cached) $ECHO_C" >&6
15499 - cat >conftest.$ac_ext <<_ACEOF
15502 -cat confdefs.h >>conftest.$ac_ext
15503 -cat >>conftest.$ac_ext <<_ACEOF
15504 -/* end confdefs.h. */
15505 -#include <inttypes.h>
15518 -rm -f conftest.$ac_objext
15519 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15520 - (eval $ac_compile) 2>conftest.er1
15522 - grep -v '^ *+' conftest.er1 >conftest.err
15523 - rm -f conftest.er1
15524 - cat conftest.err >&5
15525 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15526 - (exit $ac_status); } &&
15527 - { ac_try='test -z "$ac_c_werror_flag"
15528 - || test ! -s conftest.err'
15529 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15530 - (eval $ac_try) 2>&5
15532 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15533 - (exit $ac_status); }; } &&
15534 - { ac_try='test -s conftest.$ac_objext'
15535 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15536 - (eval $ac_try) 2>&5
15538 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15539 - (exit $ac_status); }; }; then
15540 - gt_cv_inttypes_pri_broken=no
15542 - echo "$as_me: failed program was:" >&5
15543 -sed 's/^/| /' conftest.$ac_ext >&5
15545 -gt_cv_inttypes_pri_broken=yes
15547 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15550 -echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
15551 -echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
15553 - if test "$gt_cv_inttypes_pri_broken" = yes; then
15555 -cat >>confdefs.h <<_ACEOF
15556 -#define PRI_MACROS_BROKEN 1
15563 -for ac_header in stdint.h
15565 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
15566 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
15567 - echo "$as_me:$LINENO: checking for $ac_header" >&5
15568 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
15569 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
15570 - echo $ECHO_N "(cached) $ECHO_C" >&6
15572 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
15573 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
15575 - # Is the header compilable?
15576 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
15577 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
15578 -cat >conftest.$ac_ext <<_ACEOF
15581 -cat confdefs.h >>conftest.$ac_ext
15582 -cat >>conftest.$ac_ext <<_ACEOF
15583 -/* end confdefs.h. */
15584 -$ac_includes_default
15585 -#include <$ac_header>
15587 -rm -f conftest.$ac_objext
15588 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15589 - (eval $ac_compile) 2>conftest.er1
15591 - grep -v '^ *+' conftest.er1 >conftest.err
15592 - rm -f conftest.er1
15593 - cat conftest.err >&5
15594 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15595 - (exit $ac_status); } &&
15596 - { ac_try='test -z "$ac_c_werror_flag"
15597 - || test ! -s conftest.err'
15598 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15599 - (eval $ac_try) 2>&5
15601 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15602 - (exit $ac_status); }; } &&
15603 - { ac_try='test -s conftest.$ac_objext'
15604 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15605 - (eval $ac_try) 2>&5
15607 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15608 - (exit $ac_status); }; }; then
15609 - ac_header_compiler=yes
15611 - echo "$as_me: failed program was:" >&5
15612 -sed 's/^/| /' conftest.$ac_ext >&5
15614 -ac_header_compiler=no
15616 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15617 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
15618 -echo "${ECHO_T}$ac_header_compiler" >&6
15620 -# Is the header present?
15621 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
15622 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
15623 -cat >conftest.$ac_ext <<_ACEOF
15626 -cat confdefs.h >>conftest.$ac_ext
15627 -cat >>conftest.$ac_ext <<_ACEOF
15628 -/* end confdefs.h. */
15629 -#include <$ac_header>
15631 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
15632 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
15634 - grep -v '^ *+' conftest.er1 >conftest.err
15635 - rm -f conftest.er1
15636 - cat conftest.err >&5
15637 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15638 - (exit $ac_status); } >/dev/null; then
15639 - if test -s conftest.err; then
15640 - ac_cpp_err=$ac_c_preproc_warn_flag
15641 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15648 -if test -z "$ac_cpp_err"; then
15649 - ac_header_preproc=yes
15651 - echo "$as_me: failed program was:" >&5
15652 -sed 's/^/| /' conftest.$ac_ext >&5
15654 - ac_header_preproc=no
15656 -rm -f conftest.err conftest.$ac_ext
15657 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
15658 -echo "${ECHO_T}$ac_header_preproc" >&6
15660 -# So? What about this header?
15661 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
15663 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
15664 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
15665 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
15666 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
15667 - ac_header_preproc=yes
15670 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
15671 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
15672 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
15673 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
15674 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
15675 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
15676 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
15677 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
15678 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
15679 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
15680 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
15681 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
15684 -## ------------------------------------------ ##
15685 -## Report this to the AC_PACKAGE_NAME lists. ##
15686 -## ------------------------------------------ ##
15689 - sed "s/^/$as_me: WARNING: /" >&2
15692 -echo "$as_me:$LINENO: checking for $ac_header" >&5
15693 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
15694 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
15695 - echo $ECHO_N "(cached) $ECHO_C" >&6
15697 - eval "$as_ac_Header=\$ac_header_preproc"
15699 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
15700 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
15703 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
15704 - cat >>confdefs.h <<_ACEOF
15705 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
15712 - echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
15713 -echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
15715 - cat >conftest.$ac_ext <<_ACEOF
15718 -cat confdefs.h >>conftest.$ac_ext
15719 -cat >>conftest.$ac_ext <<_ACEOF
15720 -/* end confdefs.h. */
15722 -#include <limits.h>
15724 -#include <stdint.h>
15731 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
15732 - $EGREP "Found it" >/dev/null 2>&1; then
15737 - if test -z "$result"; then
15738 - if test "$cross_compiling" = yes; then
15739 - # Depending upon the size, compute the lo and hi bounds.
15740 -cat >conftest.$ac_ext <<_ACEOF
15743 -cat confdefs.h >>conftest.$ac_ext
15744 -cat >>conftest.$ac_ext <<_ACEOF
15745 -/* end confdefs.h. */
15746 -#include <stddef.h>
15750 -static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
15751 -test_array [0] = 0
15757 -rm -f conftest.$ac_objext
15758 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15759 - (eval $ac_compile) 2>conftest.er1
15761 - grep -v '^ *+' conftest.er1 >conftest.err
15762 - rm -f conftest.er1
15763 - cat conftest.err >&5
15764 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15765 - (exit $ac_status); } &&
15766 - { ac_try='test -z "$ac_c_werror_flag"
15767 - || test ! -s conftest.err'
15768 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15769 - (eval $ac_try) 2>&5
15771 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15772 - (exit $ac_status); }; } &&
15773 - { ac_try='test -s conftest.$ac_objext'
15774 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15775 - (eval $ac_try) 2>&5
15777 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15778 - (exit $ac_status); }; }; then
15781 - cat >conftest.$ac_ext <<_ACEOF
15784 -cat confdefs.h >>conftest.$ac_ext
15785 -cat >>conftest.$ac_ext <<_ACEOF
15786 -/* end confdefs.h. */
15787 -#include <stddef.h>
15791 -static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
15792 -test_array [0] = 0
15798 -rm -f conftest.$ac_objext
15799 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15800 - (eval $ac_compile) 2>conftest.er1
15802 - grep -v '^ *+' conftest.er1 >conftest.err
15803 - rm -f conftest.er1
15804 - cat conftest.err >&5
15805 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15806 - (exit $ac_status); } &&
15807 - { ac_try='test -z "$ac_c_werror_flag"
15808 - || test ! -s conftest.err'
15809 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15810 - (eval $ac_try) 2>&5
15812 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15813 - (exit $ac_status); }; } &&
15814 - { ac_try='test -s conftest.$ac_objext'
15815 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15816 - (eval $ac_try) 2>&5
15818 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15819 - (exit $ac_status); }; }; then
15820 - ac_hi=$ac_mid; break
15822 - echo "$as_me: failed program was:" >&5
15823 -sed 's/^/| /' conftest.$ac_ext >&5
15825 -ac_lo=`expr $ac_mid + 1`
15826 - if test $ac_lo -le $ac_mid; then
15830 - ac_mid=`expr 2 '*' $ac_mid + 1`
15832 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15835 - echo "$as_me: failed program was:" >&5
15836 -sed 's/^/| /' conftest.$ac_ext >&5
15838 -cat >conftest.$ac_ext <<_ACEOF
15841 -cat confdefs.h >>conftest.$ac_ext
15842 -cat >>conftest.$ac_ext <<_ACEOF
15843 -/* end confdefs.h. */
15844 -#include <stddef.h>
15848 -static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
15849 -test_array [0] = 0
15855 -rm -f conftest.$ac_objext
15856 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15857 - (eval $ac_compile) 2>conftest.er1
15859 - grep -v '^ *+' conftest.er1 >conftest.err
15860 - rm -f conftest.er1
15861 - cat conftest.err >&5
15862 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15863 - (exit $ac_status); } &&
15864 - { ac_try='test -z "$ac_c_werror_flag"
15865 - || test ! -s conftest.err'
15866 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15867 - (eval $ac_try) 2>&5
15869 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15870 - (exit $ac_status); }; } &&
15871 - { ac_try='test -s conftest.$ac_objext'
15872 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15873 - (eval $ac_try) 2>&5
15875 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15876 - (exit $ac_status); }; }; then
15877 - ac_hi=-1 ac_mid=-1
15879 - cat >conftest.$ac_ext <<_ACEOF
15882 -cat confdefs.h >>conftest.$ac_ext
15883 -cat >>conftest.$ac_ext <<_ACEOF
15884 -/* end confdefs.h. */
15885 -#include <stddef.h>
15889 -static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
15890 -test_array [0] = 0
15896 -rm -f conftest.$ac_objext
15897 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15898 - (eval $ac_compile) 2>conftest.er1
15900 - grep -v '^ *+' conftest.er1 >conftest.err
15901 - rm -f conftest.er1
15902 - cat conftest.err >&5
15903 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15904 - (exit $ac_status); } &&
15905 - { ac_try='test -z "$ac_c_werror_flag"
15906 - || test ! -s conftest.err'
15907 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15908 - (eval $ac_try) 2>&5
15910 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15911 - (exit $ac_status); }; } &&
15912 - { ac_try='test -s conftest.$ac_objext'
15913 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15914 - (eval $ac_try) 2>&5
15916 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15917 - (exit $ac_status); }; }; then
15918 - ac_lo=$ac_mid; break
15920 - echo "$as_me: failed program was:" >&5
15921 -sed 's/^/| /' conftest.$ac_ext >&5
15923 -ac_hi=`expr '(' $ac_mid ')' - 1`
15924 - if test $ac_mid -le $ac_hi; then
15928 - ac_mid=`expr 2 '*' $ac_mid`
15930 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15933 - echo "$as_me: failed program was:" >&5
15934 -sed 's/^/| /' conftest.$ac_ext >&5
15938 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15940 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15941 -# Binary search between lo and hi bounds.
15942 -while test "x$ac_lo" != "x$ac_hi"; do
15943 - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
15944 - cat >conftest.$ac_ext <<_ACEOF
15947 -cat confdefs.h >>conftest.$ac_ext
15948 -cat >>conftest.$ac_ext <<_ACEOF
15949 -/* end confdefs.h. */
15950 -#include <stddef.h>
15954 -static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
15955 -test_array [0] = 0
15961 -rm -f conftest.$ac_objext
15962 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15963 - (eval $ac_compile) 2>conftest.er1
15965 - grep -v '^ *+' conftest.er1 >conftest.err
15966 - rm -f conftest.er1
15967 - cat conftest.err >&5
15968 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15969 - (exit $ac_status); } &&
15970 - { ac_try='test -z "$ac_c_werror_flag"
15971 - || test ! -s conftest.err'
15972 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15973 - (eval $ac_try) 2>&5
15975 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15976 - (exit $ac_status); }; } &&
15977 - { ac_try='test -s conftest.$ac_objext'
15978 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15979 - (eval $ac_try) 2>&5
15981 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15982 - (exit $ac_status); }; }; then
15985 - echo "$as_me: failed program was:" >&5
15986 -sed 's/^/| /' conftest.$ac_ext >&5
15988 -ac_lo=`expr '(' $ac_mid ')' + 1`
15990 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15993 -?*) res_hi=$ac_lo;;
15997 - if test "$cross_compiling" = yes; then
15998 - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
15999 -See \`config.log' for more details." >&5
16000 -echo "$as_me: error: cannot run test program while cross compiling
16001 -See \`config.log' for more details." >&2;}
16002 - { (exit 1); exit 1; }; }
16004 - cat >conftest.$ac_ext <<_ACEOF
16007 -cat confdefs.h >>conftest.$ac_ext
16008 -cat >>conftest.$ac_ext <<_ACEOF
16009 -/* end confdefs.h. */
16010 -#include <stddef.h>
16011 -long longval () { return ~(size_t)0 / 10; }
16012 -unsigned long ulongval () { return ~(size_t)0 / 10; }
16013 -#include <stdio.h>
16014 -#include <stdlib.h>
16019 - FILE *f = fopen ("conftest.val", "w");
16022 - if ((~(size_t)0 / 10) < 0)
16024 - long i = longval ();
16025 - if (i != (~(size_t)0 / 10))
16027 - fprintf (f, "%ld\n", i);
16031 - unsigned long i = ulongval ();
16032 - if (i != (~(size_t)0 / 10))
16034 - fprintf (f, "%lu\n", i);
16036 - exit (ferror (f) || fclose (f) != 0);
16042 -rm -f conftest$ac_exeext
16043 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16044 - (eval $ac_link) 2>&5
16046 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16047 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16048 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16049 - (eval $ac_try) 2>&5
16051 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16052 - (exit $ac_status); }; }; then
16053 - res_hi=`cat conftest.val`
16055 - echo "$as_me: program exited with status $ac_status" >&5
16056 -echo "$as_me: failed program was:" >&5
16057 -sed 's/^/| /' conftest.$ac_ext >&5
16059 -( exit $ac_status )
16062 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16065 -rm -f conftest.val
16066 - if test "$cross_compiling" = yes; then
16067 - # Depending upon the size, compute the lo and hi bounds.
16068 -cat >conftest.$ac_ext <<_ACEOF
16071 -cat confdefs.h >>conftest.$ac_ext
16072 -cat >>conftest.$ac_ext <<_ACEOF
16073 -/* end confdefs.h. */
16074 -#include <stddef.h>
16078 -static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
16079 -test_array [0] = 0
16085 -rm -f conftest.$ac_objext
16086 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16087 - (eval $ac_compile) 2>conftest.er1
16089 - grep -v '^ *+' conftest.er1 >conftest.err
16090 - rm -f conftest.er1
16091 - cat conftest.err >&5
16092 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16093 - (exit $ac_status); } &&
16094 - { ac_try='test -z "$ac_c_werror_flag"
16095 - || test ! -s conftest.err'
16096 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16097 - (eval $ac_try) 2>&5
16099 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16100 - (exit $ac_status); }; } &&
16101 - { ac_try='test -s conftest.$ac_objext'
16102 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16103 - (eval $ac_try) 2>&5
16105 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16106 - (exit $ac_status); }; }; then
16109 - cat >conftest.$ac_ext <<_ACEOF
16112 -cat confdefs.h >>conftest.$ac_ext
16113 -cat >>conftest.$ac_ext <<_ACEOF
16114 -/* end confdefs.h. */
16115 -#include <stddef.h>
16119 -static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
16120 -test_array [0] = 0
16126 -rm -f conftest.$ac_objext
16127 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16128 - (eval $ac_compile) 2>conftest.er1
16130 - grep -v '^ *+' conftest.er1 >conftest.err
16131 - rm -f conftest.er1
16132 - cat conftest.err >&5
16133 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16134 - (exit $ac_status); } &&
16135 - { ac_try='test -z "$ac_c_werror_flag"
16136 - || test ! -s conftest.err'
16137 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16138 - (eval $ac_try) 2>&5
16140 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16141 - (exit $ac_status); }; } &&
16142 - { ac_try='test -s conftest.$ac_objext'
16143 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16144 - (eval $ac_try) 2>&5
16146 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16147 - (exit $ac_status); }; }; then
16148 - ac_hi=$ac_mid; break
16150 - echo "$as_me: failed program was:" >&5
16151 -sed 's/^/| /' conftest.$ac_ext >&5
16153 -ac_lo=`expr $ac_mid + 1`
16154 - if test $ac_lo -le $ac_mid; then
16158 - ac_mid=`expr 2 '*' $ac_mid + 1`
16160 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16163 - echo "$as_me: failed program was:" >&5
16164 -sed 's/^/| /' conftest.$ac_ext >&5
16166 -cat >conftest.$ac_ext <<_ACEOF
16169 -cat confdefs.h >>conftest.$ac_ext
16170 -cat >>conftest.$ac_ext <<_ACEOF
16171 -/* end confdefs.h. */
16172 -#include <stddef.h>
16176 -static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
16177 -test_array [0] = 0
16183 -rm -f conftest.$ac_objext
16184 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16185 - (eval $ac_compile) 2>conftest.er1
16187 - grep -v '^ *+' conftest.er1 >conftest.err
16188 - rm -f conftest.er1
16189 - cat conftest.err >&5
16190 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16191 - (exit $ac_status); } &&
16192 - { ac_try='test -z "$ac_c_werror_flag"
16193 - || test ! -s conftest.err'
16194 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16195 - (eval $ac_try) 2>&5
16197 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16198 - (exit $ac_status); }; } &&
16199 - { ac_try='test -s conftest.$ac_objext'
16200 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16201 - (eval $ac_try) 2>&5
16203 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16204 - (exit $ac_status); }; }; then
16205 - ac_hi=-1 ac_mid=-1
16207 - cat >conftest.$ac_ext <<_ACEOF
16210 -cat confdefs.h >>conftest.$ac_ext
16211 -cat >>conftest.$ac_ext <<_ACEOF
16212 -/* end confdefs.h. */
16213 -#include <stddef.h>
16217 -static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
16218 -test_array [0] = 0
16224 -rm -f conftest.$ac_objext
16225 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16226 - (eval $ac_compile) 2>conftest.er1
16228 - grep -v '^ *+' conftest.er1 >conftest.err
16229 - rm -f conftest.er1
16230 - cat conftest.err >&5
16231 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16232 - (exit $ac_status); } &&
16233 - { ac_try='test -z "$ac_c_werror_flag"
16234 - || test ! -s conftest.err'
16235 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16236 - (eval $ac_try) 2>&5
16238 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16239 - (exit $ac_status); }; } &&
16240 - { ac_try='test -s conftest.$ac_objext'
16241 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16242 - (eval $ac_try) 2>&5
16244 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16245 - (exit $ac_status); }; }; then
16246 - ac_lo=$ac_mid; break
16248 - echo "$as_me: failed program was:" >&5
16249 -sed 's/^/| /' conftest.$ac_ext >&5
16251 -ac_hi=`expr '(' $ac_mid ')' - 1`
16252 - if test $ac_mid -le $ac_hi; then
16256 - ac_mid=`expr 2 '*' $ac_mid`
16258 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16261 - echo "$as_me: failed program was:" >&5
16262 -sed 's/^/| /' conftest.$ac_ext >&5
16266 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16268 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16269 -# Binary search between lo and hi bounds.
16270 -while test "x$ac_lo" != "x$ac_hi"; do
16271 - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
16272 - cat >conftest.$ac_ext <<_ACEOF
16275 -cat confdefs.h >>conftest.$ac_ext
16276 -cat >>conftest.$ac_ext <<_ACEOF
16277 -/* end confdefs.h. */
16278 -#include <stddef.h>
16282 -static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
16283 -test_array [0] = 0
16289 -rm -f conftest.$ac_objext
16290 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16291 - (eval $ac_compile) 2>conftest.er1
16293 - grep -v '^ *+' conftest.er1 >conftest.err
16294 - rm -f conftest.er1
16295 - cat conftest.err >&5
16296 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16297 - (exit $ac_status); } &&
16298 - { ac_try='test -z "$ac_c_werror_flag"
16299 - || test ! -s conftest.err'
16300 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16301 - (eval $ac_try) 2>&5
16303 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16304 - (exit $ac_status); }; } &&
16305 - { ac_try='test -s conftest.$ac_objext'
16306 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16307 - (eval $ac_try) 2>&5
16309 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16310 - (exit $ac_status); }; }; then
16313 - echo "$as_me: failed program was:" >&5
16314 -sed 's/^/| /' conftest.$ac_ext >&5
16316 -ac_lo=`expr '(' $ac_mid ')' + 1`
16318 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16321 -?*) res_lo=$ac_lo;;
16325 - if test "$cross_compiling" = yes; then
16326 - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
16327 -See \`config.log' for more details." >&5
16328 -echo "$as_me: error: cannot run test program while cross compiling
16329 -See \`config.log' for more details." >&2;}
16330 - { (exit 1); exit 1; }; }
16332 - cat >conftest.$ac_ext <<_ACEOF
16335 -cat confdefs.h >>conftest.$ac_ext
16336 -cat >>conftest.$ac_ext <<_ACEOF
16337 -/* end confdefs.h. */
16338 -#include <stddef.h>
16339 -long longval () { return ~(size_t)0 % 10; }
16340 -unsigned long ulongval () { return ~(size_t)0 % 10; }
16341 -#include <stdio.h>
16342 -#include <stdlib.h>
16347 - FILE *f = fopen ("conftest.val", "w");
16350 - if ((~(size_t)0 % 10) < 0)
16352 - long i = longval ();
16353 - if (i != (~(size_t)0 % 10))
16355 - fprintf (f, "%ld\n", i);
16359 - unsigned long i = ulongval ();
16360 - if (i != (~(size_t)0 % 10))
16362 - fprintf (f, "%lu\n", i);
16364 - exit (ferror (f) || fclose (f) != 0);
16370 -rm -f conftest$ac_exeext
16371 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16372 - (eval $ac_link) 2>&5
16374 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16375 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16376 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16377 - (eval $ac_try) 2>&5
16379 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16380 - (exit $ac_status); }; }; then
16381 - res_lo=`cat conftest.val`
16383 - echo "$as_me: program exited with status $ac_status" >&5
16384 -echo "$as_me: failed program was:" >&5
16385 -sed 's/^/| /' conftest.$ac_ext >&5
16387 -( exit $ac_status )
16390 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16393 -rm -f conftest.val
16394 - if test "$cross_compiling" = yes; then
16395 - # Depending upon the size, compute the lo and hi bounds.
16396 -cat >conftest.$ac_ext <<_ACEOF
16399 -cat confdefs.h >>conftest.$ac_ext
16400 -cat >>conftest.$ac_ext <<_ACEOF
16401 -/* end confdefs.h. */
16402 -#include <stddef.h>
16406 -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
16407 -test_array [0] = 0
16413 -rm -f conftest.$ac_objext
16414 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16415 - (eval $ac_compile) 2>conftest.er1
16417 - grep -v '^ *+' conftest.er1 >conftest.err
16418 - rm -f conftest.er1
16419 - cat conftest.err >&5
16420 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16421 - (exit $ac_status); } &&
16422 - { ac_try='test -z "$ac_c_werror_flag"
16423 - || test ! -s conftest.err'
16424 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16425 - (eval $ac_try) 2>&5
16427 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16428 - (exit $ac_status); }; } &&
16429 - { ac_try='test -s conftest.$ac_objext'
16430 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16431 - (eval $ac_try) 2>&5
16433 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16434 - (exit $ac_status); }; }; then
16437 - cat >conftest.$ac_ext <<_ACEOF
16440 -cat confdefs.h >>conftest.$ac_ext
16441 -cat >>conftest.$ac_ext <<_ACEOF
16442 -/* end confdefs.h. */
16443 -#include <stddef.h>
16447 -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
16448 -test_array [0] = 0
16454 -rm -f conftest.$ac_objext
16455 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16456 - (eval $ac_compile) 2>conftest.er1
16458 - grep -v '^ *+' conftest.er1 >conftest.err
16459 - rm -f conftest.er1
16460 - cat conftest.err >&5
16461 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16462 - (exit $ac_status); } &&
16463 - { ac_try='test -z "$ac_c_werror_flag"
16464 - || test ! -s conftest.err'
16465 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16466 - (eval $ac_try) 2>&5
16468 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16469 - (exit $ac_status); }; } &&
16470 - { ac_try='test -s conftest.$ac_objext'
16471 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16472 - (eval $ac_try) 2>&5
16474 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16475 - (exit $ac_status); }; }; then
16476 - ac_hi=$ac_mid; break
16478 - echo "$as_me: failed program was:" >&5
16479 -sed 's/^/| /' conftest.$ac_ext >&5
16481 -ac_lo=`expr $ac_mid + 1`
16482 - if test $ac_lo -le $ac_mid; then
16486 - ac_mid=`expr 2 '*' $ac_mid + 1`
16488 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16491 - echo "$as_me: failed program was:" >&5
16492 -sed 's/^/| /' conftest.$ac_ext >&5
16494 -cat >conftest.$ac_ext <<_ACEOF
16497 -cat confdefs.h >>conftest.$ac_ext
16498 -cat >>conftest.$ac_ext <<_ACEOF
16499 -/* end confdefs.h. */
16500 -#include <stddef.h>
16504 -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
16505 -test_array [0] = 0
16511 -rm -f conftest.$ac_objext
16512 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16513 - (eval $ac_compile) 2>conftest.er1
16515 - grep -v '^ *+' conftest.er1 >conftest.err
16516 - rm -f conftest.er1
16517 - cat conftest.err >&5
16518 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16519 - (exit $ac_status); } &&
16520 - { ac_try='test -z "$ac_c_werror_flag"
16521 - || test ! -s conftest.err'
16522 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16523 - (eval $ac_try) 2>&5
16525 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16526 - (exit $ac_status); }; } &&
16527 - { ac_try='test -s conftest.$ac_objext'
16528 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16529 - (eval $ac_try) 2>&5
16531 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16532 - (exit $ac_status); }; }; then
16533 - ac_hi=-1 ac_mid=-1
16535 - cat >conftest.$ac_ext <<_ACEOF
16538 -cat confdefs.h >>conftest.$ac_ext
16539 -cat >>conftest.$ac_ext <<_ACEOF
16540 -/* end confdefs.h. */
16541 -#include <stddef.h>
16545 -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
16546 -test_array [0] = 0
16552 -rm -f conftest.$ac_objext
16553 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16554 - (eval $ac_compile) 2>conftest.er1
16556 - grep -v '^ *+' conftest.er1 >conftest.err
16557 - rm -f conftest.er1
16558 - cat conftest.err >&5
16559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16560 - (exit $ac_status); } &&
16561 - { ac_try='test -z "$ac_c_werror_flag"
16562 - || test ! -s conftest.err'
16563 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16564 - (eval $ac_try) 2>&5
16566 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16567 - (exit $ac_status); }; } &&
16568 - { ac_try='test -s conftest.$ac_objext'
16569 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16570 - (eval $ac_try) 2>&5
16572 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16573 - (exit $ac_status); }; }; then
16574 - ac_lo=$ac_mid; break
16576 - echo "$as_me: failed program was:" >&5
16577 -sed 's/^/| /' conftest.$ac_ext >&5
16579 -ac_hi=`expr '(' $ac_mid ')' - 1`
16580 - if test $ac_mid -le $ac_hi; then
16584 - ac_mid=`expr 2 '*' $ac_mid`
16586 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16589 - echo "$as_me: failed program was:" >&5
16590 -sed 's/^/| /' conftest.$ac_ext >&5
16594 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16596 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16597 -# Binary search between lo and hi bounds.
16598 -while test "x$ac_lo" != "x$ac_hi"; do
16599 - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
16600 - cat >conftest.$ac_ext <<_ACEOF
16603 -cat confdefs.h >>conftest.$ac_ext
16604 -cat >>conftest.$ac_ext <<_ACEOF
16605 -/* end confdefs.h. */
16606 -#include <stddef.h>
16610 -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
16611 -test_array [0] = 0
16617 -rm -f conftest.$ac_objext
16618 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16619 - (eval $ac_compile) 2>conftest.er1
16621 - grep -v '^ *+' conftest.er1 >conftest.err
16622 - rm -f conftest.er1
16623 - cat conftest.err >&5
16624 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16625 - (exit $ac_status); } &&
16626 - { ac_try='test -z "$ac_c_werror_flag"
16627 - || test ! -s conftest.err'
16628 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16629 - (eval $ac_try) 2>&5
16631 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16632 - (exit $ac_status); }; } &&
16633 - { ac_try='test -s conftest.$ac_objext'
16634 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16635 - (eval $ac_try) 2>&5
16637 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16638 - (exit $ac_status); }; }; then
16641 - echo "$as_me: failed program was:" >&5
16642 -sed 's/^/| /' conftest.$ac_ext >&5
16644 -ac_lo=`expr '(' $ac_mid ')' + 1`
16646 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16649 -?*) fits_in_uint=$ac_lo;;
16653 - if test "$cross_compiling" = yes; then
16654 - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
16655 -See \`config.log' for more details." >&5
16656 -echo "$as_me: error: cannot run test program while cross compiling
16657 -See \`config.log' for more details." >&2;}
16658 - { (exit 1); exit 1; }; }
16660 - cat >conftest.$ac_ext <<_ACEOF
16663 -cat confdefs.h >>conftest.$ac_ext
16664 -cat >>conftest.$ac_ext <<_ACEOF
16665 -/* end confdefs.h. */
16666 -#include <stddef.h>
16667 -long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
16668 -unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
16669 -#include <stdio.h>
16670 -#include <stdlib.h>
16675 - FILE *f = fopen ("conftest.val", "w");
16678 - if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
16680 - long i = longval ();
16681 - if (i != (sizeof (size_t) <= sizeof (unsigned int)))
16683 - fprintf (f, "%ld\n", i);
16687 - unsigned long i = ulongval ();
16688 - if (i != (sizeof (size_t) <= sizeof (unsigned int)))
16690 - fprintf (f, "%lu\n", i);
16692 - exit (ferror (f) || fclose (f) != 0);
16698 -rm -f conftest$ac_exeext
16699 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16700 - (eval $ac_link) 2>&5
16702 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16703 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16704 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16705 - (eval $ac_try) 2>&5
16707 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16708 - (exit $ac_status); }; }; then
16709 - fits_in_uint=`cat conftest.val`
16711 - echo "$as_me: program exited with status $ac_status" >&5
16712 -echo "$as_me: failed program was:" >&5
16713 -sed 's/^/| /' conftest.$ac_ext >&5
16715 -( exit $ac_status )
16718 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16721 -rm -f conftest.val
16722 - if test "$fits_in_uint" = 1; then
16723 - cat >conftest.$ac_ext <<_ACEOF
16726 -cat confdefs.h >>conftest.$ac_ext
16727 -cat >>conftest.$ac_ext <<_ACEOF
16728 -/* end confdefs.h. */
16729 -#include <stddef.h>
16730 - extern size_t foo;
16731 - extern unsigned long foo;
16741 -rm -f conftest.$ac_objext
16742 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16743 - (eval $ac_compile) 2>conftest.er1
16745 - grep -v '^ *+' conftest.er1 >conftest.err
16746 - rm -f conftest.er1
16747 - cat conftest.err >&5
16748 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16749 - (exit $ac_status); } &&
16750 - { ac_try='test -z "$ac_c_werror_flag"
16751 - || test ! -s conftest.err'
16752 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16753 - (eval $ac_try) 2>&5
16755 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16756 - (exit $ac_status); }; } &&
16757 - { ac_try='test -s conftest.$ac_objext'
16758 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16759 - (eval $ac_try) 2>&5
16761 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16762 - (exit $ac_status); }; }; then
16765 - echo "$as_me: failed program was:" >&5
16766 -sed 's/^/| /' conftest.$ac_ext >&5
16769 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16771 - if test -z "$result"; then
16772 - if test "$fits_in_uint" = 1; then
16773 - result="$res_hi$res_lo"U
16775 - result="$res_hi$res_lo"UL
16778 - result='~(size_t)0'
16781 - echo "$as_me:$LINENO: result: $result" >&5
16782 -echo "${ECHO_T}$result" >&6
16783 - if test "$result" != yes; then
16785 -cat >>confdefs.h <<_ACEOF
16786 -#define SIZE_MAX $result
16795 -for ac_header in stdint.h
16797 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
16798 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
16799 - echo "$as_me:$LINENO: checking for $ac_header" >&5
16800 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
16801 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
16802 - echo $ECHO_N "(cached) $ECHO_C" >&6
16804 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
16805 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
16807 - # Is the header compilable?
16808 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
16809 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
16810 -cat >conftest.$ac_ext <<_ACEOF
16813 -cat confdefs.h >>conftest.$ac_ext
16814 -cat >>conftest.$ac_ext <<_ACEOF
16815 -/* end confdefs.h. */
16816 -$ac_includes_default
16817 -#include <$ac_header>
16819 -rm -f conftest.$ac_objext
16820 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16821 - (eval $ac_compile) 2>conftest.er1
16823 - grep -v '^ *+' conftest.er1 >conftest.err
16824 - rm -f conftest.er1
16825 - cat conftest.err >&5
16826 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16827 - (exit $ac_status); } &&
16828 - { ac_try='test -z "$ac_c_werror_flag"
16829 - || test ! -s conftest.err'
16830 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16831 - (eval $ac_try) 2>&5
16833 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16834 - (exit $ac_status); }; } &&
16835 - { ac_try='test -s conftest.$ac_objext'
16836 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16837 - (eval $ac_try) 2>&5
16839 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16840 - (exit $ac_status); }; }; then
16841 - ac_header_compiler=yes
16843 - echo "$as_me: failed program was:" >&5
16844 -sed 's/^/| /' conftest.$ac_ext >&5
16846 -ac_header_compiler=no
16848 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16849 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
16850 -echo "${ECHO_T}$ac_header_compiler" >&6
16852 -# Is the header present?
16853 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
16854 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
16855 -cat >conftest.$ac_ext <<_ACEOF
16858 -cat confdefs.h >>conftest.$ac_ext
16859 -cat >>conftest.$ac_ext <<_ACEOF
16860 -/* end confdefs.h. */
16861 -#include <$ac_header>
16863 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
16864 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
16866 - grep -v '^ *+' conftest.er1 >conftest.err
16867 - rm -f conftest.er1
16868 - cat conftest.err >&5
16869 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16870 - (exit $ac_status); } >/dev/null; then
16871 - if test -s conftest.err; then
16872 - ac_cpp_err=$ac_c_preproc_warn_flag
16873 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
16880 -if test -z "$ac_cpp_err"; then
16881 - ac_header_preproc=yes
16883 - echo "$as_me: failed program was:" >&5
16884 -sed 's/^/| /' conftest.$ac_ext >&5
16886 - ac_header_preproc=no
16888 -rm -f conftest.err conftest.$ac_ext
16889 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
16890 -echo "${ECHO_T}$ac_header_preproc" >&6
16892 -# So? What about this header?
16893 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
16895 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
16896 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
16897 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
16898 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
16899 - ac_header_preproc=yes
16902 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
16903 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
16904 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
16905 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
16906 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
16907 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
16908 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
16909 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
16910 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
16911 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
16912 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
16913 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
16916 -## ------------------------------------------ ##
16917 -## Report this to the AC_PACKAGE_NAME lists. ##
16918 -## ------------------------------------------ ##
16921 - sed "s/^/$as_me: WARNING: /" >&2
16924 -echo "$as_me:$LINENO: checking for $ac_header" >&5
16925 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
16926 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
16927 - echo $ECHO_N "(cached) $ECHO_C" >&6
16929 - eval "$as_ac_Header=\$ac_header_preproc"
16931 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
16932 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
16935 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
16936 - cat >>confdefs.h <<_ACEOF
16937 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
16946 - echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
16947 -echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
16948 -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
16949 - echo $ECHO_N "(cached) $ECHO_C" >&6
16951 - gt_save_CPPFLAGS="$CPPFLAGS"
16952 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
16953 - gt_save_LIBS="$LIBS"
16954 - LIBS="$LIBS -framework CoreFoundation"
16955 - cat >conftest.$ac_ext <<_ACEOF
16958 -cat confdefs.h >>conftest.$ac_ext
16959 -cat >>conftest.$ac_ext <<_ACEOF
16960 -/* end confdefs.h. */
16961 -#include <CFPreferences.h>
16965 -CFPreferencesCopyAppValue(NULL, NULL)
16970 -rm -f conftest.$ac_objext conftest$ac_exeext
16971 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16972 - (eval $ac_link) 2>conftest.er1
16974 - grep -v '^ *+' conftest.er1 >conftest.err
16975 - rm -f conftest.er1
16976 - cat conftest.err >&5
16977 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16978 - (exit $ac_status); } &&
16979 - { ac_try='test -z "$ac_c_werror_flag"
16980 - || test ! -s conftest.err'
16981 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16982 - (eval $ac_try) 2>&5
16984 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16985 - (exit $ac_status); }; } &&
16986 - { ac_try='test -s conftest$ac_exeext'
16987 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16988 - (eval $ac_try) 2>&5
16990 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16991 - (exit $ac_status); }; }; then
16992 - gt_cv_func_CFPreferencesCopyAppValue=yes
16994 - echo "$as_me: failed program was:" >&5
16995 -sed 's/^/| /' conftest.$ac_ext >&5
16997 -gt_cv_func_CFPreferencesCopyAppValue=no
16999 -rm -f conftest.err conftest.$ac_objext \
17000 - conftest$ac_exeext conftest.$ac_ext
17001 - CPPFLAGS="$gt_save_CPPFLAGS"
17002 - LIBS="$gt_save_LIBS"
17004 -echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
17005 -echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
17006 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
17008 -cat >>confdefs.h <<\_ACEOF
17009 -#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
17013 - echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
17014 -echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
17015 -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
17016 - echo $ECHO_N "(cached) $ECHO_C" >&6
17018 - gt_save_CPPFLAGS="$CPPFLAGS"
17019 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
17020 - gt_save_LIBS="$LIBS"
17021 - LIBS="$LIBS -framework CoreFoundation"
17022 - cat >conftest.$ac_ext <<_ACEOF
17025 -cat confdefs.h >>conftest.$ac_ext
17026 -cat >>conftest.$ac_ext <<_ACEOF
17027 -/* end confdefs.h. */
17028 -#include <CFLocale.h>
17032 -CFLocaleCopyCurrent();
17037 -rm -f conftest.$ac_objext conftest$ac_exeext
17038 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17039 - (eval $ac_link) 2>conftest.er1
17041 - grep -v '^ *+' conftest.er1 >conftest.err
17042 - rm -f conftest.er1
17043 - cat conftest.err >&5
17044 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17045 - (exit $ac_status); } &&
17046 - { ac_try='test -z "$ac_c_werror_flag"
17047 - || test ! -s conftest.err'
17048 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17049 - (eval $ac_try) 2>&5
17051 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17052 - (exit $ac_status); }; } &&
17053 - { ac_try='test -s conftest$ac_exeext'
17054 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17055 - (eval $ac_try) 2>&5
17057 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17058 - (exit $ac_status); }; }; then
17059 - gt_cv_func_CFLocaleCopyCurrent=yes
17061 - echo "$as_me: failed program was:" >&5
17062 -sed 's/^/| /' conftest.$ac_ext >&5
17064 -gt_cv_func_CFLocaleCopyCurrent=no
17066 -rm -f conftest.err conftest.$ac_objext \
17067 - conftest$ac_exeext conftest.$ac_ext
17068 - CPPFLAGS="$gt_save_CPPFLAGS"
17069 - LIBS="$gt_save_LIBS"
17071 -echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
17072 -echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
17073 - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
17075 -cat >>confdefs.h <<\_ACEOF
17076 -#define HAVE_CFLOCALECOPYCURRENT 1
17080 - INTL_MACOSX_LIBS=
17081 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
17082 - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
17087 - if test "X$prefix" = "XNONE"; then
17088 - acl_final_prefix="$ac_default_prefix"
17090 - acl_final_prefix="$prefix"
17092 - if test "X$exec_prefix" = "XNONE"; then
17093 - acl_final_exec_prefix='${prefix}'
17095 - acl_final_exec_prefix="$exec_prefix"
17097 - acl_save_prefix="$prefix"
17098 - prefix="$acl_final_prefix"
17099 - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
17100 - prefix="$acl_save_prefix"
17103 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
17104 -if test "${with_gnu_ld+set}" = set; then
17105 - withval="$with_gnu_ld"
17106 - test "$withval" = no || with_gnu_ld=yes
17110 -# Prepare PATH_SEPARATOR.
17111 -# The user is always right.
17112 -if test "${PATH_SEPARATOR+set}" != set; then
17113 - echo "#! /bin/sh" >conf$$.sh
17114 - echo "exit 0" >>conf$$.sh
17115 - chmod +x conf$$.sh
17116 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
17117 - PATH_SEPARATOR=';'
17124 -if test "$GCC" = yes; then
17125 - # Check if gcc -print-prog-name=ld gives a path.
17126 - echo "$as_me:$LINENO: checking for ld used by GCC" >&5
17127 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
17130 - # gcc leaves a trailing carriage return which upsets mingw
17131 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
17133 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
17136 - # Accept absolute paths.
17137 - [\\/]* | [A-Za-z]:[\\/]*)
17138 - re_direlt='/[^/][^/]*/\.\./'
17139 - # Canonicalize the path of ld
17140 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
17141 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
17142 - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
17144 - test -z "$LD" && LD="$ac_prog"
17147 - # If it fails, then pretend we aren't using GCC.
17151 - # If it is relative, then search for the first ld in PATH.
17152 - with_gnu_ld=unknown
17155 -elif test "$with_gnu_ld" = yes; then
17156 - echo "$as_me:$LINENO: checking for GNU ld" >&5
17157 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
17159 - echo "$as_me:$LINENO: checking for non-GNU ld" >&5
17160 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
17162 -if test "${acl_cv_path_LD+set}" = set; then
17163 - echo $ECHO_N "(cached) $ECHO_C" >&6
17165 - if test -z "$LD"; then
17166 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
17167 - for ac_dir in $PATH; do
17168 - test -z "$ac_dir" && ac_dir=.
17169 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
17170 - acl_cv_path_LD="$ac_dir/$ac_prog"
17171 - # Check to see if the program is GNU ld. I'd rather use --version,
17172 - # but apparently some GNU ld's only accept -v.
17173 - # Break only if it was the GNU/non-GNU ld that we prefer.
17174 - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
17175 - *GNU* | *'with BFD'*)
17176 - test "$with_gnu_ld" != no && break ;;
17178 - test "$with_gnu_ld" != yes && break ;;
17182 - IFS="$ac_save_ifs"
17184 - acl_cv_path_LD="$LD" # Let the user override the test with a path.
17188 -LD="$acl_cv_path_LD"
17189 -if test -n "$LD"; then
17190 - echo "$as_me:$LINENO: result: $LD" >&5
17191 -echo "${ECHO_T}$LD" >&6
17193 - echo "$as_me:$LINENO: result: no" >&5
17194 -echo "${ECHO_T}no" >&6
17196 -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
17197 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
17198 - { (exit 1); exit 1; }; }
17199 -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
17200 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
17201 -if test "${acl_cv_prog_gnu_ld+set}" = set; then
17202 - echo $ECHO_N "(cached) $ECHO_C" >&6
17204 - # I'd rather use --version here, but apparently some GNU ld's only accept -v.
17205 -case `$LD -v 2>&1 </dev/null` in
17206 -*GNU* | *'with BFD'*)
17207 - acl_cv_prog_gnu_ld=yes ;;
17209 - acl_cv_prog_gnu_ld=no ;;
17212 -echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
17213 -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
17214 -with_gnu_ld=$acl_cv_prog_gnu_ld
17219 - echo "$as_me:$LINENO: checking for shared library run path origin" >&5
17220 -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
17221 -if test "${acl_cv_rpath+set}" = set; then
17222 - echo $ECHO_N "(cached) $ECHO_C" >&6
17225 - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
17226 - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
17228 - rm -f ./conftest.sh
17229 - acl_cv_rpath=done
17232 -echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
17233 -echo "${ECHO_T}$acl_cv_rpath" >&6
17235 - libext="$acl_cv_libext"
17236 - shlibext="$acl_cv_shlibext"
17237 - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
17238 - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
17239 - hardcode_direct="$acl_cv_hardcode_direct"
17240 - hardcode_minus_L="$acl_cv_hardcode_minus_L"
17241 - # Check whether --enable-rpath or --disable-rpath was given.
17242 -if test "${enable_rpath+set}" = set; then
17243 - enableval="$enable_rpath"
17255 - use_additional=yes
17257 - acl_save_prefix="$prefix"
17258 - prefix="$acl_final_prefix"
17259 - acl_save_exec_prefix="$exec_prefix"
17260 - exec_prefix="$acl_final_exec_prefix"
17262 - eval additional_includedir=\"$includedir\"
17263 - eval additional_libdir=\"$libdir\"
17265 - exec_prefix="$acl_save_exec_prefix"
17266 - prefix="$acl_save_prefix"
17269 -# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
17270 -if test "${with_libiconv_prefix+set}" = set; then
17271 - withval="$with_libiconv_prefix"
17273 - if test "X$withval" = "Xno"; then
17274 - use_additional=no
17276 - if test "X$withval" = "X"; then
17278 - acl_save_prefix="$prefix"
17279 - prefix="$acl_final_prefix"
17280 - acl_save_exec_prefix="$exec_prefix"
17281 - exec_prefix="$acl_final_exec_prefix"
17283 - eval additional_includedir=\"$includedir\"
17284 - eval additional_libdir=\"$libdir\"
17286 - exec_prefix="$acl_save_exec_prefix"
17287 - prefix="$acl_save_prefix"
17290 - additional_includedir="$withval/include"
17291 - additional_libdir="$withval/lib"
17301 - names_already_handled=
17302 - names_next_round='iconv '
17303 - while test -n "$names_next_round"; do
17304 - names_this_round="$names_next_round"
17305 - names_next_round=
17306 - for name in $names_this_round; do
17308 - for n in $names_already_handled; do
17309 - if test "$n" = "$name"; then
17310 - already_handled=yes
17314 - if test -z "$already_handled"; then
17315 - names_already_handled="$names_already_handled $name"
17316 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
17317 - eval value=\"\$HAVE_LIB$uppername\"
17318 - if test -n "$value"; then
17319 - if test "$value" = yes; then
17320 - eval value=\"\$LIB$uppername\"
17321 - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
17322 - eval value=\"\$LTLIB$uppername\"
17323 - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
17332 - if test $use_additional = yes; then
17333 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
17334 - found_dir="$additional_libdir"
17335 - found_so="$additional_libdir/lib$name.$shlibext"
17336 - if test -f "$additional_libdir/lib$name.la"; then
17337 - found_la="$additional_libdir/lib$name.la"
17340 - if test -f "$additional_libdir/lib$name.$libext"; then
17341 - found_dir="$additional_libdir"
17342 - found_a="$additional_libdir/lib$name.$libext"
17343 - if test -f "$additional_libdir/lib$name.la"; then
17344 - found_la="$additional_libdir/lib$name.la"
17349 - if test "X$found_dir" = "X"; then
17350 - for x in $LDFLAGS $LTLIBICONV; do
17352 - acl_save_prefix="$prefix"
17353 - prefix="$acl_final_prefix"
17354 - acl_save_exec_prefix="$exec_prefix"
17355 - exec_prefix="$acl_final_exec_prefix"
17357 - exec_prefix="$acl_save_exec_prefix"
17358 - prefix="$acl_save_prefix"
17362 - dir=`echo "X$x" | sed -e 's/^X-L//'`
17363 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
17365 - found_so="$dir/lib$name.$shlibext"
17366 - if test -f "$dir/lib$name.la"; then
17367 - found_la="$dir/lib$name.la"
17370 - if test -f "$dir/lib$name.$libext"; then
17372 - found_a="$dir/lib$name.$libext"
17373 - if test -f "$dir/lib$name.la"; then
17374 - found_la="$dir/lib$name.la"
17380 - if test "X$found_dir" != "X"; then
17385 - if test "X$found_dir" != "X"; then
17386 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
17387 - if test "X$found_so" != "X"; then
17388 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
17389 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
17392 - for x in $ltrpathdirs; do
17393 - if test "X$x" = "X$found_dir"; then
17398 - if test -z "$haveit"; then
17399 - ltrpathdirs="$ltrpathdirs $found_dir"
17401 - if test "$hardcode_direct" = yes; then
17402 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
17404 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
17405 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
17407 - for x in $rpathdirs; do
17408 - if test "X$x" = "X$found_dir"; then
17413 - if test -z "$haveit"; then
17414 - rpathdirs="$rpathdirs $found_dir"
17418 - for x in $LDFLAGS $LIBICONV; do
17420 - acl_save_prefix="$prefix"
17421 - prefix="$acl_final_prefix"
17422 - acl_save_exec_prefix="$exec_prefix"
17423 - exec_prefix="$acl_final_exec_prefix"
17425 - exec_prefix="$acl_save_exec_prefix"
17426 - prefix="$acl_save_prefix"
17428 - if test "X$x" = "X-L$found_dir"; then
17433 - if test -z "$haveit"; then
17434 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
17436 - if test "$hardcode_minus_L" != no; then
17437 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
17439 - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
17445 - if test "X$found_a" != "X"; then
17446 - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
17448 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
17451 - additional_includedir=
17452 - case "$found_dir" in
17454 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
17455 - additional_includedir="$basedir/include"
17458 - if test "X$additional_includedir" != "X"; then
17459 - if test "X$additional_includedir" != "X/usr/include"; then
17461 - if test "X$additional_includedir" = "X/usr/local/include"; then
17462 - if test -n "$GCC"; then
17464 - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
17468 - if test -z "$haveit"; then
17469 - for x in $CPPFLAGS $INCICONV; do
17471 - acl_save_prefix="$prefix"
17472 - prefix="$acl_final_prefix"
17473 - acl_save_exec_prefix="$exec_prefix"
17474 - exec_prefix="$acl_final_exec_prefix"
17476 - exec_prefix="$acl_save_exec_prefix"
17477 - prefix="$acl_save_prefix"
17479 - if test "X$x" = "X-I$additional_includedir"; then
17484 - if test -z "$haveit"; then
17485 - if test -d "$additional_includedir"; then
17486 - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
17492 - if test -n "$found_la"; then
17493 - save_libdir="$libdir"
17494 - case "$found_la" in
17495 - */* | *\\*) . "$found_la" ;;
17496 - *) . "./$found_la" ;;
17498 - libdir="$save_libdir"
17499 - for dep in $dependency_libs; do
17502 - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
17503 - if test "X$additional_libdir" != "X/usr/lib"; then
17505 - if test "X$additional_libdir" = "X/usr/local/lib"; then
17506 - if test -n "$GCC"; then
17508 - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
17512 - if test -z "$haveit"; then
17514 - for x in $LDFLAGS $LIBICONV; do
17516 - acl_save_prefix="$prefix"
17517 - prefix="$acl_final_prefix"
17518 - acl_save_exec_prefix="$exec_prefix"
17519 - exec_prefix="$acl_final_exec_prefix"
17521 - exec_prefix="$acl_save_exec_prefix"
17522 - prefix="$acl_save_prefix"
17524 - if test "X$x" = "X-L$additional_libdir"; then
17529 - if test -z "$haveit"; then
17530 - if test -d "$additional_libdir"; then
17531 - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
17535 - for x in $LDFLAGS $LTLIBICONV; do
17537 - acl_save_prefix="$prefix"
17538 - prefix="$acl_final_prefix"
17539 - acl_save_exec_prefix="$exec_prefix"
17540 - exec_prefix="$acl_final_exec_prefix"
17542 - exec_prefix="$acl_save_exec_prefix"
17543 - prefix="$acl_save_prefix"
17545 - if test "X$x" = "X-L$additional_libdir"; then
17550 - if test -z "$haveit"; then
17551 - if test -d "$additional_libdir"; then
17552 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
17559 - dir=`echo "X$dep" | sed -e 's/^X-R//'`
17560 - if test "$enable_rpath" != no; then
17562 - for x in $rpathdirs; do
17563 - if test "X$x" = "X$dir"; then
17568 - if test -z "$haveit"; then
17569 - rpathdirs="$rpathdirs $dir"
17572 - for x in $ltrpathdirs; do
17573 - if test "X$x" = "X$dir"; then
17578 - if test -z "$haveit"; then
17579 - ltrpathdirs="$ltrpathdirs $dir"
17584 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
17587 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
17590 - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
17591 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
17597 - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
17598 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
17604 - if test "X$rpathdirs" != "X"; then
17605 - if test -n "$hardcode_libdir_separator"; then
17607 - for found_dir in $rpathdirs; do
17608 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
17610 - acl_save_libdir="$libdir"
17611 - libdir="$alldirs"
17612 - eval flag=\"$hardcode_libdir_flag_spec\"
17613 - libdir="$acl_save_libdir"
17614 - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
17616 - for found_dir in $rpathdirs; do
17617 - acl_save_libdir="$libdir"
17618 - libdir="$found_dir"
17619 - eval flag=\"$hardcode_libdir_flag_spec\"
17620 - libdir="$acl_save_libdir"
17621 - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
17625 - if test "X$ltrpathdirs" != "X"; then
17626 - for found_dir in $ltrpathdirs; do
17627 - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
17638 - echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
17639 -echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
17640 -if test "${ac_cv_type_ptrdiff_t+set}" = set; then
17641 - echo $ECHO_N "(cached) $ECHO_C" >&6
17643 - cat >conftest.$ac_ext <<_ACEOF
17646 -cat confdefs.h >>conftest.$ac_ext
17647 -cat >>conftest.$ac_ext <<_ACEOF
17648 -/* end confdefs.h. */
17649 -$ac_includes_default
17653 -if ((ptrdiff_t *) 0)
17655 -if (sizeof (ptrdiff_t))
17661 -rm -f conftest.$ac_objext
17662 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17663 - (eval $ac_compile) 2>conftest.er1
17665 - grep -v '^ *+' conftest.er1 >conftest.err
17666 - rm -f conftest.er1
17667 - cat conftest.err >&5
17668 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17669 - (exit $ac_status); } &&
17670 - { ac_try='test -z "$ac_c_werror_flag"
17671 - || test ! -s conftest.err'
17672 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17673 - (eval $ac_try) 2>&5
17675 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17676 - (exit $ac_status); }; } &&
17677 - { ac_try='test -s conftest.$ac_objext'
17678 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17679 - (eval $ac_try) 2>&5
17681 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17682 - (exit $ac_status); }; }; then
17683 - ac_cv_type_ptrdiff_t=yes
17685 - echo "$as_me: failed program was:" >&5
17686 -sed 's/^/| /' conftest.$ac_ext >&5
17688 -ac_cv_type_ptrdiff_t=no
17690 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17692 -echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
17693 -echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
17694 -if test $ac_cv_type_ptrdiff_t = yes; then
17698 -cat >>confdefs.h <<\_ACEOF
17699 -#define ptrdiff_t long
17715 -for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
17716 -stdlib.h string.h unistd.h sys/param.h
17718 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
17719 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
17720 - echo "$as_me:$LINENO: checking for $ac_header" >&5
17721 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
17722 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
17723 - echo $ECHO_N "(cached) $ECHO_C" >&6
17725 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
17726 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
17728 - # Is the header compilable?
17729 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
17730 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
17731 -cat >conftest.$ac_ext <<_ACEOF
17734 -cat confdefs.h >>conftest.$ac_ext
17735 -cat >>conftest.$ac_ext <<_ACEOF
17736 -/* end confdefs.h. */
17737 -$ac_includes_default
17738 -#include <$ac_header>
17740 -rm -f conftest.$ac_objext
17741 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17742 - (eval $ac_compile) 2>conftest.er1
17744 - grep -v '^ *+' conftest.er1 >conftest.err
17745 - rm -f conftest.er1
17746 - cat conftest.err >&5
17747 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17748 - (exit $ac_status); } &&
17749 - { ac_try='test -z "$ac_c_werror_flag"
17750 - || test ! -s conftest.err'
17751 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17752 - (eval $ac_try) 2>&5
17754 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17755 - (exit $ac_status); }; } &&
17756 - { ac_try='test -s conftest.$ac_objext'
17757 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17758 - (eval $ac_try) 2>&5
17760 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17761 - (exit $ac_status); }; }; then
17762 - ac_header_compiler=yes
17764 - echo "$as_me: failed program was:" >&5
17765 -sed 's/^/| /' conftest.$ac_ext >&5
17767 -ac_header_compiler=no
17769 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17770 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
17771 -echo "${ECHO_T}$ac_header_compiler" >&6
17773 -# Is the header present?
17774 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
17775 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
17776 -cat >conftest.$ac_ext <<_ACEOF
17779 -cat confdefs.h >>conftest.$ac_ext
17780 -cat >>conftest.$ac_ext <<_ACEOF
17781 -/* end confdefs.h. */
17782 -#include <$ac_header>
17784 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
17785 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
17787 - grep -v '^ *+' conftest.er1 >conftest.err
17788 - rm -f conftest.er1
17789 - cat conftest.err >&5
17790 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17791 - (exit $ac_status); } >/dev/null; then
17792 - if test -s conftest.err; then
17793 - ac_cpp_err=$ac_c_preproc_warn_flag
17794 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
17801 -if test -z "$ac_cpp_err"; then
17802 - ac_header_preproc=yes
17804 - echo "$as_me: failed program was:" >&5
17805 -sed 's/^/| /' conftest.$ac_ext >&5
17807 - ac_header_preproc=no
17809 -rm -f conftest.err conftest.$ac_ext
17810 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
17811 -echo "${ECHO_T}$ac_header_preproc" >&6
17813 -# So? What about this header?
17814 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
17816 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
17817 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
17818 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
17819 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
17820 - ac_header_preproc=yes
17823 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
17824 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
17825 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
17826 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
17827 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
17828 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
17829 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
17830 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
17831 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
17832 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
17833 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
17834 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
17837 -## ------------------------------------------ ##
17838 -## Report this to the AC_PACKAGE_NAME lists. ##
17839 -## ------------------------------------------ ##
17842 - sed "s/^/$as_me: WARNING: /" >&2
17845 -echo "$as_me:$LINENO: checking for $ac_header" >&5
17846 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
17847 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
17848 - echo $ECHO_N "(cached) $ECHO_C" >&6
17850 - eval "$as_ac_Header=\$ac_header_preproc"
17852 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
17853 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
17856 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
17857 - cat >>confdefs.h <<_ACEOF
17858 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
17888 -for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
17889 -mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
17890 -strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
17893 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
17894 -echo "$as_me:$LINENO: checking for $ac_func" >&5
17895 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
17896 -if eval "test \"\${$as_ac_var+set}\" = set"; then
17897 - echo $ECHO_N "(cached) $ECHO_C" >&6
17899 - cat >conftest.$ac_ext <<_ACEOF
17902 -cat confdefs.h >>conftest.$ac_ext
17903 -cat >>conftest.$ac_ext <<_ACEOF
17904 -/* end confdefs.h. */
17905 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
17906 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
17907 -#define $ac_func innocuous_$ac_func
17909 -/* System header to define __stub macros and hopefully few prototypes,
17910 - which can conflict with char $ac_func (); below.
17911 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17912 - <limits.h> exists even on freestanding compilers. */
17915 -# include <limits.h>
17917 -# include <assert.h>
17922 -/* Override any gcc2 internal prototype to avoid an error. */
17923 -#ifdef __cplusplus
17927 -/* We use char because int might match the return type of a gcc2
17928 - builtin and then its argument prototype would still apply. */
17930 -/* The GNU C library defines this for functions which it implements
17931 - to always fail with ENOSYS. Some functions are actually named
17932 - something starting with __ and the normal name is an alias. */
17933 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
17936 -char (*f) () = $ac_func;
17938 -#ifdef __cplusplus
17945 -return f != $ac_func;
17950 -rm -f conftest.$ac_objext conftest$ac_exeext
17951 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17952 - (eval $ac_link) 2>conftest.er1
17954 - grep -v '^ *+' conftest.er1 >conftest.err
17955 - rm -f conftest.er1
17956 - cat conftest.err >&5
17957 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17958 - (exit $ac_status); } &&
17959 - { ac_try='test -z "$ac_c_werror_flag"
17960 - || test ! -s conftest.err'
17961 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17962 - (eval $ac_try) 2>&5
17964 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17965 - (exit $ac_status); }; } &&
17966 - { ac_try='test -s conftest$ac_exeext'
17967 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17968 - (eval $ac_try) 2>&5
17970 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17971 - (exit $ac_status); }; }; then
17972 - eval "$as_ac_var=yes"
17974 - echo "$as_me: failed program was:" >&5
17975 -sed 's/^/| /' conftest.$ac_ext >&5
17977 -eval "$as_ac_var=no"
17979 -rm -f conftest.err conftest.$ac_objext \
17980 - conftest$ac_exeext conftest.$ac_ext
17982 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
17983 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
17984 -if test `eval echo '${'$as_ac_var'}'` = yes; then
17985 - cat >>confdefs.h <<_ACEOF
17986 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
17994 - echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
17995 -echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6
17996 -if test "${ac_cv_have_decl__snprintf+set}" = set; then
17997 - echo $ECHO_N "(cached) $ECHO_C" >&6
17999 - cat >conftest.$ac_ext <<_ACEOF
18002 -cat confdefs.h >>conftest.$ac_ext
18003 -cat >>conftest.$ac_ext <<_ACEOF
18004 -/* end confdefs.h. */
18005 -#include <stdio.h>
18011 - char *p = (char *) _snprintf;
18018 -rm -f conftest.$ac_objext
18019 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18020 - (eval $ac_compile) 2>conftest.er1
18022 - grep -v '^ *+' conftest.er1 >conftest.err
18023 - rm -f conftest.er1
18024 - cat conftest.err >&5
18025 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18026 - (exit $ac_status); } &&
18027 - { ac_try='test -z "$ac_c_werror_flag"
18028 - || test ! -s conftest.err'
18029 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18030 - (eval $ac_try) 2>&5
18032 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18033 - (exit $ac_status); }; } &&
18034 - { ac_try='test -s conftest.$ac_objext'
18035 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18036 - (eval $ac_try) 2>&5
18038 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18039 - (exit $ac_status); }; }; then
18040 - ac_cv_have_decl__snprintf=yes
18042 - echo "$as_me: failed program was:" >&5
18043 -sed 's/^/| /' conftest.$ac_ext >&5
18045 -ac_cv_have_decl__snprintf=no
18047 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18049 -echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
18050 -echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6
18051 - if test $ac_cv_have_decl__snprintf = yes; then
18057 -cat >>confdefs.h <<_ACEOF
18058 -#define HAVE_DECL__SNPRINTF $gt_value
18063 - echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
18064 -echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6
18065 -if test "${ac_cv_have_decl__snwprintf+set}" = set; then
18066 - echo $ECHO_N "(cached) $ECHO_C" >&6
18068 - cat >conftest.$ac_ext <<_ACEOF
18071 -cat confdefs.h >>conftest.$ac_ext
18072 -cat >>conftest.$ac_ext <<_ACEOF
18073 -/* end confdefs.h. */
18074 -#include <stdio.h>
18079 -#ifndef _snwprintf
18080 - char *p = (char *) _snwprintf;
18087 -rm -f conftest.$ac_objext
18088 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18089 - (eval $ac_compile) 2>conftest.er1
18091 - grep -v '^ *+' conftest.er1 >conftest.err
18092 - rm -f conftest.er1
18093 - cat conftest.err >&5
18094 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18095 - (exit $ac_status); } &&
18096 - { ac_try='test -z "$ac_c_werror_flag"
18097 - || test ! -s conftest.err'
18098 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18099 - (eval $ac_try) 2>&5
18101 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18102 - (exit $ac_status); }; } &&
18103 - { ac_try='test -s conftest.$ac_objext'
18104 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18105 - (eval $ac_try) 2>&5
18107 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18108 - (exit $ac_status); }; }; then
18109 - ac_cv_have_decl__snwprintf=yes
18111 - echo "$as_me: failed program was:" >&5
18112 -sed 's/^/| /' conftest.$ac_ext >&5
18114 -ac_cv_have_decl__snwprintf=no
18116 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18118 -echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
18119 -echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6
18120 - if test $ac_cv_have_decl__snwprintf = yes; then
18126 -cat >>confdefs.h <<_ACEOF
18127 -#define HAVE_DECL__SNWPRINTF $gt_value
18133 - echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
18134 -echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
18135 -if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
18136 - echo $ECHO_N "(cached) $ECHO_C" >&6
18138 - cat >conftest.$ac_ext <<_ACEOF
18141 -cat confdefs.h >>conftest.$ac_ext
18142 -cat >>conftest.$ac_ext <<_ACEOF
18143 -/* end confdefs.h. */
18144 -#include <stdio.h>
18149 -#ifndef feof_unlocked
18150 - char *p = (char *) feof_unlocked;
18157 -rm -f conftest.$ac_objext
18158 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18159 - (eval $ac_compile) 2>conftest.er1
18161 - grep -v '^ *+' conftest.er1 >conftest.err
18162 - rm -f conftest.er1
18163 - cat conftest.err >&5
18164 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18165 - (exit $ac_status); } &&
18166 - { ac_try='test -z "$ac_c_werror_flag"
18167 - || test ! -s conftest.err'
18168 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18169 - (eval $ac_try) 2>&5
18171 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18172 - (exit $ac_status); }; } &&
18173 - { ac_try='test -s conftest.$ac_objext'
18174 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18175 - (eval $ac_try) 2>&5
18177 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18178 - (exit $ac_status); }; }; then
18179 - ac_cv_have_decl_feof_unlocked=yes
18181 - echo "$as_me: failed program was:" >&5
18182 -sed 's/^/| /' conftest.$ac_ext >&5
18184 -ac_cv_have_decl_feof_unlocked=no
18186 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18188 -echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
18189 -echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
18190 - if test $ac_cv_have_decl_feof_unlocked = yes; then
18196 -cat >>confdefs.h <<_ACEOF
18197 -#define HAVE_DECL_FEOF_UNLOCKED $gt_value
18202 - echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
18203 -echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
18204 -if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
18205 - echo $ECHO_N "(cached) $ECHO_C" >&6
18207 - cat >conftest.$ac_ext <<_ACEOF
18210 -cat confdefs.h >>conftest.$ac_ext
18211 -cat >>conftest.$ac_ext <<_ACEOF
18212 -/* end confdefs.h. */
18213 -#include <stdio.h>
18218 -#ifndef fgets_unlocked
18219 - char *p = (char *) fgets_unlocked;
18226 -rm -f conftest.$ac_objext
18227 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18228 - (eval $ac_compile) 2>conftest.er1
18230 - grep -v '^ *+' conftest.er1 >conftest.err
18231 - rm -f conftest.er1
18232 - cat conftest.err >&5
18233 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18234 - (exit $ac_status); } &&
18235 - { ac_try='test -z "$ac_c_werror_flag"
18236 - || test ! -s conftest.err'
18237 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18238 - (eval $ac_try) 2>&5
18240 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18241 - (exit $ac_status); }; } &&
18242 - { ac_try='test -s conftest.$ac_objext'
18243 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18244 - (eval $ac_try) 2>&5
18246 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18247 - (exit $ac_status); }; }; then
18248 - ac_cv_have_decl_fgets_unlocked=yes
18250 - echo "$as_me: failed program was:" >&5
18251 -sed 's/^/| /' conftest.$ac_ext >&5
18253 -ac_cv_have_decl_fgets_unlocked=no
18255 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18257 -echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
18258 -echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
18259 - if test $ac_cv_have_decl_fgets_unlocked = yes; then
18265 -cat >>confdefs.h <<_ACEOF
18266 -#define HAVE_DECL_FGETS_UNLOCKED $gt_value
18271 - echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
18272 -echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
18273 -if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
18274 - echo $ECHO_N "(cached) $ECHO_C" >&6
18276 - cat >conftest.$ac_ext <<_ACEOF
18279 -cat confdefs.h >>conftest.$ac_ext
18280 -cat >>conftest.$ac_ext <<_ACEOF
18281 -/* end confdefs.h. */
18282 -#include <stdio.h>
18287 -#ifndef getc_unlocked
18288 - char *p = (char *) getc_unlocked;
18295 -rm -f conftest.$ac_objext
18296 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18297 - (eval $ac_compile) 2>conftest.er1
18299 - grep -v '^ *+' conftest.er1 >conftest.err
18300 - rm -f conftest.er1
18301 - cat conftest.err >&5
18302 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18303 - (exit $ac_status); } &&
18304 - { ac_try='test -z "$ac_c_werror_flag"
18305 - || test ! -s conftest.err'
18306 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18307 - (eval $ac_try) 2>&5
18309 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18310 - (exit $ac_status); }; } &&
18311 - { ac_try='test -s conftest.$ac_objext'
18312 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18313 - (eval $ac_try) 2>&5
18315 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18316 - (exit $ac_status); }; }; then
18317 - ac_cv_have_decl_getc_unlocked=yes
18319 - echo "$as_me: failed program was:" >&5
18320 -sed 's/^/| /' conftest.$ac_ext >&5
18322 -ac_cv_have_decl_getc_unlocked=no
18324 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18326 -echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
18327 -echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
18328 - if test $ac_cv_have_decl_getc_unlocked = yes; then
18334 -cat >>confdefs.h <<_ACEOF
18335 -#define HAVE_DECL_GETC_UNLOCKED $gt_value
18340 - case $gt_cv_func_printf_posix in
18341 - *yes) HAVE_POSIX_PRINTF=1 ;;
18342 - *) HAVE_POSIX_PRINTF=0 ;;
18345 - if test "$ac_cv_func_asprintf" = yes; then
18351 - if test "$ac_cv_func_snprintf" = yes; then
18357 - if test "$ac_cv_func_wprintf" = yes; then
18369 - am_save_CPPFLAGS="$CPPFLAGS"
18371 - for element in $INCICONV; do
18373 - for x in $CPPFLAGS; do
18375 - acl_save_prefix="$prefix"
18376 - prefix="$acl_final_prefix"
18377 - acl_save_exec_prefix="$exec_prefix"
18378 - exec_prefix="$acl_final_exec_prefix"
18380 - exec_prefix="$acl_save_exec_prefix"
18381 - prefix="$acl_save_prefix"
18383 - if test "X$x" = "X$element"; then
18388 - if test -z "$haveit"; then
18389 - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
18394 - echo "$as_me:$LINENO: checking for iconv" >&5
18395 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6
18396 -if test "${am_cv_func_iconv+set}" = set; then
18397 - echo $ECHO_N "(cached) $ECHO_C" >&6
18400 - am_cv_func_iconv="no, consider installing GNU libiconv"
18401 - am_cv_lib_iconv=no
18402 - cat >conftest.$ac_ext <<_ACEOF
18405 -cat confdefs.h >>conftest.$ac_ext
18406 -cat >>conftest.$ac_ext <<_ACEOF
18407 -/* end confdefs.h. */
18408 -#include <stdlib.h>
18409 -#include <iconv.h>
18413 -iconv_t cd = iconv_open("","");
18414 - iconv(cd,NULL,NULL,NULL,NULL);
18420 -rm -f conftest.$ac_objext conftest$ac_exeext
18421 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18422 - (eval $ac_link) 2>conftest.er1
18424 - grep -v '^ *+' conftest.er1 >conftest.err
18425 - rm -f conftest.er1
18426 - cat conftest.err >&5
18427 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18428 - (exit $ac_status); } &&
18429 - { ac_try='test -z "$ac_c_werror_flag"
18430 - || test ! -s conftest.err'
18431 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18432 - (eval $ac_try) 2>&5
18434 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18435 - (exit $ac_status); }; } &&
18436 - { ac_try='test -s conftest$ac_exeext'
18437 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18438 - (eval $ac_try) 2>&5
18440 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18441 - (exit $ac_status); }; }; then
18442 - am_cv_func_iconv=yes
18444 - echo "$as_me: failed program was:" >&5
18445 -sed 's/^/| /' conftest.$ac_ext >&5
18448 -rm -f conftest.err conftest.$ac_objext \
18449 - conftest$ac_exeext conftest.$ac_ext
18450 - if test "$am_cv_func_iconv" != yes; then
18451 - am_save_LIBS="$LIBS"
18452 - LIBS="$LIBS $LIBICONV"
18453 - cat >conftest.$ac_ext <<_ACEOF
18456 -cat confdefs.h >>conftest.$ac_ext
18457 -cat >>conftest.$ac_ext <<_ACEOF
18458 -/* end confdefs.h. */
18459 -#include <stdlib.h>
18460 -#include <iconv.h>
18464 -iconv_t cd = iconv_open("","");
18465 - iconv(cd,NULL,NULL,NULL,NULL);
18471 -rm -f conftest.$ac_objext conftest$ac_exeext
18472 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18473 - (eval $ac_link) 2>conftest.er1
18475 - grep -v '^ *+' conftest.er1 >conftest.err
18476 - rm -f conftest.er1
18477 - cat conftest.err >&5
18478 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18479 - (exit $ac_status); } &&
18480 - { ac_try='test -z "$ac_c_werror_flag"
18481 - || test ! -s conftest.err'
18482 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18483 - (eval $ac_try) 2>&5
18485 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18486 - (exit $ac_status); }; } &&
18487 - { ac_try='test -s conftest$ac_exeext'
18488 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18489 - (eval $ac_try) 2>&5
18491 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18492 - (exit $ac_status); }; }; then
18493 - am_cv_lib_iconv=yes
18494 - am_cv_func_iconv=yes
18496 - echo "$as_me: failed program was:" >&5
18497 -sed 's/^/| /' conftest.$ac_ext >&5
18500 -rm -f conftest.err conftest.$ac_objext \
18501 - conftest$ac_exeext conftest.$ac_ext
18502 - LIBS="$am_save_LIBS"
18506 -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
18507 -echo "${ECHO_T}$am_cv_func_iconv" >&6
18508 - if test "$am_cv_func_iconv" = yes; then
18510 -cat >>confdefs.h <<\_ACEOF
18511 -#define HAVE_ICONV 1
18515 - if test "$am_cv_lib_iconv" = yes; then
18516 - echo "$as_me:$LINENO: checking how to link with libiconv" >&5
18517 -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
18518 - echo "$as_me:$LINENO: result: $LIBICONV" >&5
18519 -echo "${ECHO_T}$LIBICONV" >&6
18521 - CPPFLAGS="$am_save_CPPFLAGS"
18528 - if test "$am_cv_func_iconv" = yes; then
18529 - echo "$as_me:$LINENO: checking for iconv declaration" >&5
18530 -echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
18531 - if test "${am_cv_proto_iconv+set}" = set; then
18532 - echo $ECHO_N "(cached) $ECHO_C" >&6
18535 - cat >conftest.$ac_ext <<_ACEOF
18538 -cat confdefs.h >>conftest.$ac_ext
18539 -cat >>conftest.$ac_ext <<_ACEOF
18540 -/* end confdefs.h. */
18542 -#include <stdlib.h>
18543 -#include <iconv.h>
18545 -#ifdef __cplusplus
18548 -#if defined(__STDC__) || defined(__cplusplus)
18549 -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
18562 -rm -f conftest.$ac_objext
18563 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18564 - (eval $ac_compile) 2>conftest.er1
18566 - grep -v '^ *+' conftest.er1 >conftest.err
18567 - rm -f conftest.er1
18568 - cat conftest.err >&5
18569 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18570 - (exit $ac_status); } &&
18571 - { ac_try='test -z "$ac_c_werror_flag"
18572 - || test ! -s conftest.err'
18573 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18574 - (eval $ac_try) 2>&5
18576 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18577 - (exit $ac_status); }; } &&
18578 - { ac_try='test -s conftest.$ac_objext'
18579 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18580 - (eval $ac_try) 2>&5
18582 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18583 - (exit $ac_status); }; }; then
18584 - am_cv_proto_iconv_arg1=""
18586 - echo "$as_me: failed program was:" >&5
18587 -sed 's/^/| /' conftest.$ac_ext >&5
18589 -am_cv_proto_iconv_arg1="const"
18591 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18592 - 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);"
18595 - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
18596 - echo "$as_me:$LINENO: result: ${ac_t:-
18597 - }$am_cv_proto_iconv" >&5
18598 -echo "${ECHO_T}${ac_t:-
18599 - }$am_cv_proto_iconv" >&6
18601 -cat >>confdefs.h <<_ACEOF
18602 -#define ICONV_CONST $am_cv_proto_iconv_arg1
18608 - echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
18609 -echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
18610 -if test "${am_cv_langinfo_codeset+set}" = set; then
18611 - echo $ECHO_N "(cached) $ECHO_C" >&6
18613 - cat >conftest.$ac_ext <<_ACEOF
18616 -cat confdefs.h >>conftest.$ac_ext
18617 -cat >>conftest.$ac_ext <<_ACEOF
18618 -/* end confdefs.h. */
18619 -#include <langinfo.h>
18623 -char* cs = nl_langinfo(CODESET);
18628 -rm -f conftest.$ac_objext conftest$ac_exeext
18629 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18630 - (eval $ac_link) 2>conftest.er1
18632 - grep -v '^ *+' conftest.er1 >conftest.err
18633 - rm -f conftest.er1
18634 - cat conftest.err >&5
18635 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18636 - (exit $ac_status); } &&
18637 - { ac_try='test -z "$ac_c_werror_flag"
18638 - || test ! -s conftest.err'
18639 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18640 - (eval $ac_try) 2>&5
18642 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18643 - (exit $ac_status); }; } &&
18644 - { ac_try='test -s conftest$ac_exeext'
18645 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18646 - (eval $ac_try) 2>&5
18648 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18649 - (exit $ac_status); }; }; then
18650 - am_cv_langinfo_codeset=yes
18652 - echo "$as_me: failed program was:" >&5
18653 -sed 's/^/| /' conftest.$ac_ext >&5
18655 -am_cv_langinfo_codeset=no
18657 -rm -f conftest.err conftest.$ac_objext \
18658 - conftest$ac_exeext conftest.$ac_ext
18661 -echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
18662 -echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
18663 - if test $am_cv_langinfo_codeset = yes; then
18665 -cat >>confdefs.h <<\_ACEOF
18666 -#define HAVE_LANGINFO_CODESET 1
18671 - if test $ac_cv_header_locale_h = yes; then
18673 - echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
18674 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
18675 -if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
18676 - echo $ECHO_N "(cached) $ECHO_C" >&6
18678 - cat >conftest.$ac_ext <<_ACEOF
18681 -cat confdefs.h >>conftest.$ac_ext
18682 -cat >>conftest.$ac_ext <<_ACEOF
18683 -/* end confdefs.h. */
18684 -#include <locale.h>
18688 -return LC_MESSAGES
18693 -rm -f conftest.$ac_objext conftest$ac_exeext
18694 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18695 - (eval $ac_link) 2>conftest.er1
18697 - grep -v '^ *+' conftest.er1 >conftest.err
18698 - rm -f conftest.er1
18699 - cat conftest.err >&5
18700 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18701 - (exit $ac_status); } &&
18702 - { ac_try='test -z "$ac_c_werror_flag"
18703 - || test ! -s conftest.err'
18704 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18705 - (eval $ac_try) 2>&5
18707 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18708 - (exit $ac_status); }; } &&
18709 - { ac_try='test -s conftest$ac_exeext'
18710 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18711 - (eval $ac_try) 2>&5
18713 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18714 - (exit $ac_status); }; }; then
18715 - gt_cv_val_LC_MESSAGES=yes
18717 - echo "$as_me: failed program was:" >&5
18718 -sed 's/^/| /' conftest.$ac_ext >&5
18720 -gt_cv_val_LC_MESSAGES=no
18722 -rm -f conftest.err conftest.$ac_objext \
18723 - conftest$ac_exeext conftest.$ac_ext
18725 -echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
18726 -echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6
18727 - if test $gt_cv_val_LC_MESSAGES = yes; then
18729 -cat >>confdefs.h <<\_ACEOF
18730 -#define HAVE_LC_MESSAGES 1
18737 - if test -n "$INTL_MACOSX_LIBS"; then
18738 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
18741 - for ac_prog in bison
18743 - # Extract the first word of "$ac_prog", so it can be a program name with args.
18744 -set dummy $ac_prog; ac_word=$2
18745 -echo "$as_me:$LINENO: checking for $ac_word" >&5
18746 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
18747 -if test "${ac_cv_prog_INTLBISON+set}" = set; then
18748 - echo $ECHO_N "(cached) $ECHO_C" >&6
18750 - if test -n "$INTLBISON"; then
18751 - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
18753 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18754 -for as_dir in $PATH
18757 - test -z "$as_dir" && as_dir=.
18758 - for ac_exec_ext in '' $ac_executable_extensions; do
18759 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18760 - ac_cv_prog_INTLBISON="$ac_prog"
18761 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18769 -INTLBISON=$ac_cv_prog_INTLBISON
18770 -if test -n "$INTLBISON"; then
18771 - echo "$as_me:$LINENO: result: $INTLBISON" >&5
18772 -echo "${ECHO_T}$INTLBISON" >&6
18774 - echo "$as_me:$LINENO: result: no" >&5
18775 -echo "${ECHO_T}no" >&6
18778 - test -n "$INTLBISON" && break
18781 - if test -z "$INTLBISON"; then
18784 - echo "$as_me:$LINENO: checking version of bison" >&5
18785 -echo $ECHO_N "checking version of bison... $ECHO_C" >&6
18786 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
18787 - case $ac_prog_version in
18788 - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
18789 - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
18790 - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
18791 - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
18793 - echo "$as_me:$LINENO: result: $ac_prog_version" >&5
18794 -echo "${ECHO_T}$ac_prog_version" >&6
18796 - if test $ac_verc_fail = yes; then
18815 - echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
18816 -echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
18817 -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
18818 - echo $ECHO_N "(cached) $ECHO_C" >&6
18820 - gt_save_CPPFLAGS="$CPPFLAGS"
18821 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
18822 - gt_save_LIBS="$LIBS"
18823 - LIBS="$LIBS -framework CoreFoundation"
18824 - cat >conftest.$ac_ext <<_ACEOF
18827 -cat confdefs.h >>conftest.$ac_ext
18828 -cat >>conftest.$ac_ext <<_ACEOF
18829 -/* end confdefs.h. */
18830 -#include <CFPreferences.h>
18834 -CFPreferencesCopyAppValue(NULL, NULL)
18839 -rm -f conftest.$ac_objext conftest$ac_exeext
18840 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18841 - (eval $ac_link) 2>conftest.er1
18843 - grep -v '^ *+' conftest.er1 >conftest.err
18844 - rm -f conftest.er1
18845 - cat conftest.err >&5
18846 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18847 - (exit $ac_status); } &&
18848 - { ac_try='test -z "$ac_c_werror_flag"
18849 - || test ! -s conftest.err'
18850 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18851 - (eval $ac_try) 2>&5
18853 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18854 - (exit $ac_status); }; } &&
18855 - { ac_try='test -s conftest$ac_exeext'
18856 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18857 - (eval $ac_try) 2>&5
18859 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18860 - (exit $ac_status); }; }; then
18861 - gt_cv_func_CFPreferencesCopyAppValue=yes
18863 - echo "$as_me: failed program was:" >&5
18864 -sed 's/^/| /' conftest.$ac_ext >&5
18866 -gt_cv_func_CFPreferencesCopyAppValue=no
18868 -rm -f conftest.err conftest.$ac_objext \
18869 - conftest$ac_exeext conftest.$ac_ext
18870 - CPPFLAGS="$gt_save_CPPFLAGS"
18871 - LIBS="$gt_save_LIBS"
18873 -echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
18874 -echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
18875 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
18877 -cat >>confdefs.h <<\_ACEOF
18878 -#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
18882 - echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
18883 -echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
18884 -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
18885 - echo $ECHO_N "(cached) $ECHO_C" >&6
18887 - gt_save_CPPFLAGS="$CPPFLAGS"
18888 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
18889 - gt_save_LIBS="$LIBS"
18890 - LIBS="$LIBS -framework CoreFoundation"
18891 - cat >conftest.$ac_ext <<_ACEOF
18894 -cat confdefs.h >>conftest.$ac_ext
18895 -cat >>conftest.$ac_ext <<_ACEOF
18896 -/* end confdefs.h. */
18897 -#include <CFLocale.h>
18901 -CFLocaleCopyCurrent();
18906 -rm -f conftest.$ac_objext conftest$ac_exeext
18907 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18908 - (eval $ac_link) 2>conftest.er1
18910 - grep -v '^ *+' conftest.er1 >conftest.err
18911 - rm -f conftest.er1
18912 - cat conftest.err >&5
18913 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18914 - (exit $ac_status); } &&
18915 - { ac_try='test -z "$ac_c_werror_flag"
18916 - || test ! -s conftest.err'
18917 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18918 - (eval $ac_try) 2>&5
18920 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18921 - (exit $ac_status); }; } &&
18922 - { ac_try='test -s conftest$ac_exeext'
18923 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18924 - (eval $ac_try) 2>&5
18926 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18927 - (exit $ac_status); }; }; then
18928 - gt_cv_func_CFLocaleCopyCurrent=yes
18930 - echo "$as_me: failed program was:" >&5
18931 -sed 's/^/| /' conftest.$ac_ext >&5
18933 -gt_cv_func_CFLocaleCopyCurrent=no
18935 -rm -f conftest.err conftest.$ac_objext \
18936 - conftest$ac_exeext conftest.$ac_ext
18937 - CPPFLAGS="$gt_save_CPPFLAGS"
18938 - LIBS="$gt_save_LIBS"
18940 -echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
18941 -echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
18942 - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
18944 -cat >>confdefs.h <<\_ACEOF
18945 -#define HAVE_CFLOCALECOPYCURRENT 1
18949 - INTL_MACOSX_LIBS=
18950 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
18951 - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
18957 - echo "$as_me:$LINENO: checking whether NLS is requested" >&5
18958 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
18959 - # Check whether --enable-nls or --disable-nls was given.
18960 -if test "${enable_nls+set}" = set; then
18961 - enableval="$enable_nls"
18962 - USE_NLS=$enableval
18966 - echo "$as_me:$LINENO: result: $USE_NLS" >&5
18967 -echo "${ECHO_T}$USE_NLS" >&6
18972 - BUILD_INCLUDED_LIBINTL=no
18973 - USE_INCLUDED_LIBINTL=no
18979 - if test "$USE_NLS" = "yes"; then
18980 - gt_use_preinstalled_gnugettext=no
18982 - echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
18983 -echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
18985 -# Check whether --with-included-gettext or --without-included-gettext was given.
18986 -if test "${with_included_gettext+set}" = set; then
18987 - withval="$with_included_gettext"
18988 - nls_cv_force_use_gnu_gettext=$withval
18990 - nls_cv_force_use_gnu_gettext=no
18992 - echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
18993 -echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
18995 - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
18996 - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
19003 - echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
19004 -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
19005 -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
19006 - echo $ECHO_N "(cached) $ECHO_C" >&6
19008 - cat >conftest.$ac_ext <<_ACEOF
19011 -cat confdefs.h >>conftest.$ac_ext
19012 -cat >>conftest.$ac_ext <<_ACEOF
19013 -/* end confdefs.h. */
19014 -#include <libintl.h>
19015 -extern int _nl_msg_cat_cntr;
19016 -extern int *_nl_domain_bindings;
19020 -bindtextdomain ("", "");
19021 -return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
19026 -rm -f conftest.$ac_objext conftest$ac_exeext
19027 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19028 - (eval $ac_link) 2>conftest.er1
19030 - grep -v '^ *+' conftest.er1 >conftest.err
19031 - rm -f conftest.er1
19032 - cat conftest.err >&5
19033 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19034 - (exit $ac_status); } &&
19035 - { ac_try='test -z "$ac_c_werror_flag"
19036 - || test ! -s conftest.err'
19037 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19038 - (eval $ac_try) 2>&5
19040 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19041 - (exit $ac_status); }; } &&
19042 - { ac_try='test -s conftest$ac_exeext'
19043 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19044 - (eval $ac_try) 2>&5
19046 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19047 - (exit $ac_status); }; }; then
19048 - gt_cv_func_gnugettext1_libc=yes
19050 - echo "$as_me: failed program was:" >&5
19051 -sed 's/^/| /' conftest.$ac_ext >&5
19053 -gt_cv_func_gnugettext1_libc=no
19055 -rm -f conftest.err conftest.$ac_objext \
19056 - conftest$ac_exeext conftest.$ac_ext
19058 -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
19059 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
19061 - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
19065 - use_additional=yes
19067 - acl_save_prefix="$prefix"
19068 - prefix="$acl_final_prefix"
19069 - acl_save_exec_prefix="$exec_prefix"
19070 - exec_prefix="$acl_final_exec_prefix"
19072 - eval additional_includedir=\"$includedir\"
19073 - eval additional_libdir=\"$libdir\"
19075 - exec_prefix="$acl_save_exec_prefix"
19076 - prefix="$acl_save_prefix"
19079 -# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
19080 -if test "${with_libintl_prefix+set}" = set; then
19081 - withval="$with_libintl_prefix"
19083 - if test "X$withval" = "Xno"; then
19084 - use_additional=no
19086 - if test "X$withval" = "X"; then
19088 - acl_save_prefix="$prefix"
19089 - prefix="$acl_final_prefix"
19090 - acl_save_exec_prefix="$exec_prefix"
19091 - exec_prefix="$acl_final_exec_prefix"
19093 - eval additional_includedir=\"$includedir\"
19094 - eval additional_libdir=\"$libdir\"
19096 - exec_prefix="$acl_save_exec_prefix"
19097 - prefix="$acl_save_prefix"
19100 - additional_includedir="$withval/include"
19101 - additional_libdir="$withval/lib"
19111 - names_already_handled=
19112 - names_next_round='intl '
19113 - while test -n "$names_next_round"; do
19114 - names_this_round="$names_next_round"
19115 - names_next_round=
19116 - for name in $names_this_round; do
19118 - for n in $names_already_handled; do
19119 - if test "$n" = "$name"; then
19120 - already_handled=yes
19124 - if test -z "$already_handled"; then
19125 - names_already_handled="$names_already_handled $name"
19126 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
19127 - eval value=\"\$HAVE_LIB$uppername\"
19128 - if test -n "$value"; then
19129 - if test "$value" = yes; then
19130 - eval value=\"\$LIB$uppername\"
19131 - test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
19132 - eval value=\"\$LTLIB$uppername\"
19133 - test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
19142 - if test $use_additional = yes; then
19143 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
19144 - found_dir="$additional_libdir"
19145 - found_so="$additional_libdir/lib$name.$shlibext"
19146 - if test -f "$additional_libdir/lib$name.la"; then
19147 - found_la="$additional_libdir/lib$name.la"
19150 - if test -f "$additional_libdir/lib$name.$libext"; then
19151 - found_dir="$additional_libdir"
19152 - found_a="$additional_libdir/lib$name.$libext"
19153 - if test -f "$additional_libdir/lib$name.la"; then
19154 - found_la="$additional_libdir/lib$name.la"
19159 - if test "X$found_dir" = "X"; then
19160 - for x in $LDFLAGS $LTLIBINTL; do
19162 - acl_save_prefix="$prefix"
19163 - prefix="$acl_final_prefix"
19164 - acl_save_exec_prefix="$exec_prefix"
19165 - exec_prefix="$acl_final_exec_prefix"
19167 - exec_prefix="$acl_save_exec_prefix"
19168 - prefix="$acl_save_prefix"
19169 + acl_save_prefix="$prefix"
19170 + prefix="$acl_final_prefix"
19171 + acl_save_exec_prefix="$exec_prefix"
19172 + exec_prefix="$acl_final_exec_prefix"
19174 + exec_prefix="$acl_save_exec_prefix"
19175 + prefix="$acl_save_prefix"
19179 dir=`echo "X$x" | sed -e 's/^X-L//'`
19180 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
19182 - found_so="$dir/lib$name.$shlibext"
19183 - if test -f "$dir/lib$name.la"; then
19184 - found_la="$dir/lib$name.la"
19187 - if test -f "$dir/lib$name.$libext"; then
19188 + if test -n "$acl_shlibext"; then
19189 + if test -f "$dir/$libname$shrext"; then
19191 - found_a="$dir/lib$name.$libext"
19192 - if test -f "$dir/lib$name.la"; then
19193 - found_la="$dir/lib$name.la"
19194 + found_so="$dir/$libname$shrext"
19196 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
19197 + ver=`(cd "$dir" && \
19198 + for f in "$libname$shrext".*; do echo "$f"; done \
19199 + | sed -e "s,^$libname$shrext\\\\.,," \
19200 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
19201 + | sed 1q ) 2>/dev/null`
19202 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
19204 + found_so="$dir/$libname$shrext.$ver"
19207 + eval library_names=\"$acl_library_names_spec\"
19208 + for f in $library_names; do
19209 + if test -f "$dir/$f"; then
19211 + found_so="$dir/$f"
19218 + if test "X$found_dir" = "X"; then
19219 + if test -f "$dir/$libname.$acl_libext"; then
19221 + found_a="$dir/$libname.$acl_libext"
19224 + if test "X$found_dir" != "X"; then
19225 + if test -f "$dir/$libname.la"; then
19226 + found_la="$dir/$libname.la"
19231 if test "X$found_dir" != "X"; then
19232 @@ -9657,10 +5034,12 @@
19235 if test "X$found_dir" != "X"; then
19236 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
19237 + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
19238 if test "X$found_so" != "X"; then
19239 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
19240 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19241 + if test "$enable_rpath" = no \
19242 + || test "X$found_dir" = "X/usr/$acl_libdirstem" \
19243 + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
19244 + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
19247 for x in $ltrpathdirs; do
19248 @@ -9672,11 +5051,11 @@
19249 if test -z "$haveit"; then
19250 ltrpathdirs="$ltrpathdirs $found_dir"
19252 - if test "$hardcode_direct" = yes; then
19253 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19254 + if test "$acl_hardcode_direct" = yes; then
19255 + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
19257 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
19258 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19259 + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
19260 + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
19262 for x in $rpathdirs; do
19263 if test "X$x" = "X$found_dir"; then
19264 @@ -9689,7 +5068,7 @@
19268 - for x in $LDFLAGS $LIBINTL; do
19269 + for x in $LDFLAGS $LIBICONV; do
19271 acl_save_prefix="$prefix"
19272 prefix="$acl_final_prefix"
19273 @@ -9705,27 +5084,37 @@
19276 if test -z "$haveit"; then
19277 - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
19278 + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
19280 - if test "$hardcode_minus_L" != no; then
19281 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19282 + if test "$acl_hardcode_minus_L" != no; then
19283 + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
19285 - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
19286 + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
19292 if test "X$found_a" != "X"; then
19293 - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
19294 + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
19296 - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
19297 + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
19300 additional_includedir=
19301 case "$found_dir" in
19303 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
19304 + */$acl_libdirstem | */$acl_libdirstem/)
19305 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
19306 + if test "$name" = 'iconv'; then
19307 + LIBICONV_PREFIX="$basedir"
19309 + additional_includedir="$basedir/include"
19311 + */$acl_libdirstem2 | */$acl_libdirstem2/)
19312 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
19313 + if test "$name" = 'iconv'; then
19314 + LIBICONV_PREFIX="$basedir"
19316 additional_includedir="$basedir/include"
19319 @@ -9740,7 +5129,7 @@
19322 if test -z "$haveit"; then
19323 - for x in $CPPFLAGS $INCINTL; do
19324 + for x in $CPPFLAGS $INCICONV; do
19326 acl_save_prefix="$prefix"
19327 prefix="$acl_final_prefix"
19328 @@ -9757,7 +5146,7 @@
19330 if test -z "$haveit"; then
19331 if test -d "$additional_includedir"; then
19332 - INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
19333 + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
19337 @@ -9774,9 +5163,11 @@
19340 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
19341 - if test "X$additional_libdir" != "X/usr/lib"; then
19342 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
19343 + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
19345 - if test "X$additional_libdir" = "X/usr/local/lib"; then
19346 + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
19347 + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
19348 if test -n "$GCC"; then
19350 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
19351 @@ -9785,7 +5176,7 @@
19353 if test -z "$haveit"; then
19355 - for x in $LDFLAGS $LIBINTL; do
19356 + for x in $LDFLAGS $LIBICONV; do
19358 acl_save_prefix="$prefix"
19359 prefix="$acl_final_prefix"
19360 @@ -9802,11 +5193,11 @@
19362 if test -z "$haveit"; then
19363 if test -d "$additional_libdir"; then
19364 - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
19365 + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
19369 - for x in $LDFLAGS $LTLIBINTL; do
19370 + for x in $LDFLAGS $LTLIBICONV; do
19372 acl_save_prefix="$prefix"
19373 prefix="$acl_final_prefix"
19374 @@ -9823,7 +5214,7 @@
19376 if test -z "$haveit"; then
19377 if test -d "$additional_libdir"; then
19378 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
19379 + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
19383 @@ -9861,2691 +5252,2155 @@
19384 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
19387 - LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
19388 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
19389 + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
19390 + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
19396 - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
19397 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
19398 + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
19399 + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
19405 if test "X$rpathdirs" != "X"; then
19406 - if test -n "$hardcode_libdir_separator"; then
19407 + if test -n "$acl_hardcode_libdir_separator"; then
19409 for found_dir in $rpathdirs; do
19410 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
19411 + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
19413 acl_save_libdir="$libdir"
19415 - eval flag=\"$hardcode_libdir_flag_spec\"
19416 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
19417 libdir="$acl_save_libdir"
19418 - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
19419 + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
19421 for found_dir in $rpathdirs; do
19422 acl_save_libdir="$libdir"
19423 libdir="$found_dir"
19424 - eval flag=\"$hardcode_libdir_flag_spec\"
19425 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
19426 libdir="$acl_save_libdir"
19427 - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
19428 + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
19432 if test "X$ltrpathdirs" != "X"; then
19433 for found_dir in $ltrpathdirs; do
19434 - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
19435 + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
19439 - echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
19440 -echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
19441 -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
19442 - echo $ECHO_N "(cached) $ECHO_C" >&6
19444 - gt_save_CPPFLAGS="$CPPFLAGS"
19445 - CPPFLAGS="$CPPFLAGS $INCINTL"
19446 - gt_save_LIBS="$LIBS"
19447 - LIBS="$LIBS $LIBINTL"
19448 - cat >conftest.$ac_ext <<_ACEOF
19451 -cat confdefs.h >>conftest.$ac_ext
19452 -cat >>conftest.$ac_ext <<_ACEOF
19453 -/* end confdefs.h. */
19454 -#include <libintl.h>
19455 -extern int _nl_msg_cat_cntr;
19457 -#ifdef __cplusplus
19460 -const char *_nl_expand_alias (const char *);
19464 -bindtextdomain ("", "");
19465 -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
19470 -rm -f conftest.$ac_objext conftest$ac_exeext
19471 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19472 - (eval $ac_link) 2>conftest.er1
19474 - grep -v '^ *+' conftest.er1 >conftest.err
19475 - rm -f conftest.er1
19476 - cat conftest.err >&5
19477 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19478 - (exit $ac_status); } &&
19479 - { ac_try='test -z "$ac_c_werror_flag"
19480 - || test ! -s conftest.err'
19481 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19482 - (eval $ac_try) 2>&5
19484 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19485 - (exit $ac_status); }; } &&
19486 - { ac_try='test -s conftest$ac_exeext'
19487 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19488 - (eval $ac_try) 2>&5
19490 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19491 - (exit $ac_status); }; }; then
19492 - gt_cv_func_gnugettext1_libintl=yes
19494 - echo "$as_me: failed program was:" >&5
19495 -sed 's/^/| /' conftest.$ac_ext >&5
19497 -gt_cv_func_gnugettext1_libintl=no
19499 -rm -f conftest.err conftest.$ac_objext \
19500 - conftest$ac_exeext conftest.$ac_ext
19501 - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
19502 - LIBS="$LIBS $LIBICONV"
19503 - cat >conftest.$ac_ext <<_ACEOF
19506 -cat confdefs.h >>conftest.$ac_ext
19507 -cat >>conftest.$ac_ext <<_ACEOF
19508 -/* end confdefs.h. */
19509 -#include <libintl.h>
19510 -extern int _nl_msg_cat_cntr;
19512 -#ifdef __cplusplus
19515 -const char *_nl_expand_alias (const char *);
19519 -bindtextdomain ("", "");
19520 -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
19525 -rm -f conftest.$ac_objext conftest$ac_exeext
19526 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19527 - (eval $ac_link) 2>conftest.er1
19529 - grep -v '^ *+' conftest.er1 >conftest.err
19530 - rm -f conftest.er1
19531 - cat conftest.err >&5
19532 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19533 - (exit $ac_status); } &&
19534 - { ac_try='test -z "$ac_c_werror_flag"
19535 - || test ! -s conftest.err'
19536 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19537 - (eval $ac_try) 2>&5
19539 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19540 - (exit $ac_status); }; } &&
19541 - { ac_try='test -s conftest$ac_exeext'
19542 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19543 - (eval $ac_try) 2>&5
19545 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19546 - (exit $ac_status); }; }; then
19547 - LIBINTL="$LIBINTL $LIBICONV"
19548 - LTLIBINTL="$LTLIBINTL $LTLIBICONV"
19549 - gt_cv_func_gnugettext1_libintl=yes
19552 - echo "$as_me: failed program was:" >&5
19553 -sed 's/^/| /' conftest.$ac_ext >&5
19556 -rm -f conftest.err conftest.$ac_objext \
19557 - conftest$ac_exeext conftest.$ac_ext
19559 - CPPFLAGS="$gt_save_CPPFLAGS"
19560 - LIBS="$gt_save_LIBS"
19562 -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
19563 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
19566 - if test "$gt_cv_func_gnugettext1_libc" = "yes" \
19567 - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
19568 - && test "$PACKAGE" != gettext-runtime \
19569 - && test "$PACKAGE" != gettext-tools; }; then
19570 - gt_use_preinstalled_gnugettext=yes
19578 - if test "$gt_use_preinstalled_gnugettext" != "yes"; then
19579 - nls_cv_use_gnu_gettext=yes
19583 - if test "$nls_cv_use_gnu_gettext" = "yes"; then
19584 - BUILD_INCLUDED_LIBINTL=yes
19585 - USE_INCLUDED_LIBINTL=yes
19586 - LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
19587 - LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
19588 - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
19592 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
19593 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
19598 - if test -n "$INTL_MACOSX_LIBS"; then
19599 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
19600 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
19601 - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
19602 - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
19606 - if test "$gt_use_preinstalled_gnugettext" = "yes" \
19607 - || test "$nls_cv_use_gnu_gettext" = "yes"; then
19609 -cat >>confdefs.h <<\_ACEOF
19610 -#define ENABLE_NLS 1
19618 - echo "$as_me:$LINENO: checking whether to use NLS" >&5
19619 -echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
19620 - echo "$as_me:$LINENO: result: $USE_NLS" >&5
19621 -echo "${ECHO_T}$USE_NLS" >&6
19622 - if test "$USE_NLS" = "yes"; then
19623 - echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
19624 -echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
19625 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then
19626 - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
19627 - gt_source="external libintl"
19632 - gt_source="included intl directory"
19634 - echo "$as_me:$LINENO: result: $gt_source" >&5
19635 -echo "${ECHO_T}$gt_source" >&6
19638 - if test "$USE_NLS" = "yes"; then
19640 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then
19641 - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
19642 - echo "$as_me:$LINENO: checking how to link with libintl" >&5
19643 -echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
19644 - echo "$as_me:$LINENO: result: $LIBINTL" >&5
19645 -echo "${ECHO_T}$LIBINTL" >&6
19647 - for element in $INCINTL; do
19649 - for x in $CPPFLAGS; do
19651 - acl_save_prefix="$prefix"
19652 - prefix="$acl_final_prefix"
19653 - acl_save_exec_prefix="$exec_prefix"
19654 - exec_prefix="$acl_final_exec_prefix"
19656 - exec_prefix="$acl_save_exec_prefix"
19657 - prefix="$acl_save_prefix"
19659 - if test "X$x" = "X$element"; then
19664 - if test -z "$haveit"; then
19665 - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
19672 -cat >>confdefs.h <<\_ACEOF
19673 -#define HAVE_GETTEXT 1
19677 -cat >>confdefs.h <<\_ACEOF
19678 -#define HAVE_DCGETTEXT 1
19687 - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
19688 - BUILD_INCLUDED_LIBINTL=yes
19695 - nls_cv_header_intl=
19696 - nls_cv_header_libgt=
19698 - DATADIRNAME=share
19708 - if test "$USE_INCLUDED_LIBINTL" = yes; then
19709 - INTLOBJS="\$(GETTOBJS)"
19713 - INTL_LIBTOOL_SUFFIX_PREFIX=
19717 - INTLLIBS="$LIBINTL"
19720 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
19721 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
19722 +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
19723 + $as_echo_n "(cached) " >&6
19725 + gt_save_LIBS="$LIBS"
19726 + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
19727 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19728 +/* end confdefs.h. */
19729 +#include <CoreFoundation/CFPreferences.h>
19733 +CFPreferencesCopyAppValue(NULL, NULL)
19738 +if ac_fn_c_try_link "$LINENO"; then :
19739 + gt_cv_func_CFPreferencesCopyAppValue=yes
19741 + gt_cv_func_CFPreferencesCopyAppValue=no
19743 +rm -f core conftest.err conftest.$ac_objext \
19744 + conftest$ac_exeext conftest.$ac_ext
19745 + LIBS="$gt_save_LIBS"
19747 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
19748 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
19749 + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
19751 +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
19754 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
19755 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
19756 +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
19757 + $as_echo_n "(cached) " >&6
19759 + gt_save_LIBS="$LIBS"
19760 + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
19761 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19762 +/* end confdefs.h. */
19763 +#include <CoreFoundation/CFLocale.h>
19767 +CFLocaleCopyCurrent();
19772 +if ac_fn_c_try_link "$LINENO"; then :
19773 + gt_cv_func_CFLocaleCopyCurrent=yes
19775 + gt_cv_func_CFLocaleCopyCurrent=no
19777 +rm -f core conftest.err conftest.$ac_objext \
19778 + conftest$ac_exeext conftest.$ac_ext
19779 + LIBS="$gt_save_LIBS"
19781 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
19782 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
19783 + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
19785 +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
19788 + INTL_MACOSX_LIBS=
19789 + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
19790 + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
19797 - abook_localedir="$datadir/locale"
19798 - abook_localedir=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
19799 - eval tmp_abook_prefix=\""$abook_localedir"\"
19800 - eval echo $tmp_abook_prefix
19803 -localedir="\$(datadir)/locale"
19808 + case " $gt_needs " in
19809 + *" need-formatstring-macros "*) gt_api_version=3 ;;
19810 + *" need-ngettext "*) gt_api_version=2 ;;
19811 + *) gt_api_version=1 ;;
19813 + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
19814 + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
19816 -# Check whether --with-localedir or --without-localedir was given.
19817 -if test "${with_localedir+set}" = set; then
19818 - withval="$with_localedir"
19819 + if test "$USE_NLS" = "yes"; then
19820 + gt_use_preinstalled_gnugettext=no
19823 -if test "x$with_localedir" != "x"; then
19824 - abook_localedir="$with_localedir"
19825 - localedir="$with_localedir"
19828 + if test $gt_api_version -ge 3; then
19829 + gt_revision_test_code='
19830 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
19831 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
19833 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
19836 + gt_revision_test_code=
19838 + if test $gt_api_version -ge 2; then
19839 + gt_expression_test_code=' + * ngettext ("", "", 0)'
19841 + gt_expression_test_code=
19844 -cat >>confdefs.h <<_ACEOF
19845 -#define LOCALEDIR "$abook_localedir"
19846 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
19847 +$as_echo_n "checking for GNU gettext in libc... " >&6; }
19848 +if eval \${$gt_func_gnugettext_libc+:} false; then :
19849 + $as_echo_n "(cached) " >&6
19851 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19852 +/* end confdefs.h. */
19853 +#include <libintl.h>
19854 +$gt_revision_test_code
19855 +extern int _nl_msg_cat_cntr;
19856 +extern int *_nl_domain_bindings;
19860 +bindtextdomain ("", "");
19861 +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
19871 -if test x$USE_INCLUDED_LIBINTL = xyes; then
19872 - USE_INCLUDED_INTL_H_TRUE=
19873 - USE_INCLUDED_INTL_H_FALSE='#'
19874 +if ac_fn_c_try_link "$LINENO"; then :
19875 + eval "$gt_func_gnugettext_libc=yes"
19877 - USE_INCLUDED_INTL_H_TRUE='#'
19878 - USE_INCLUDED_INTL_H_FALSE=
19879 + eval "$gt_func_gnugettext_libc=no"
19881 +rm -f core conftest.err conftest.$ac_objext \
19882 + conftest$ac_exeext conftest.$ac_ext
19884 +eval ac_res=\$$gt_func_gnugettext_libc
19885 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19886 +$as_echo "$ac_res" >&6; }
19888 + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
19892 -ac_cpp='$CPP $CPPFLAGS'
19893 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19894 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19895 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
19896 -if test -n "$ac_tool_prefix"; then
19897 - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
19898 -set dummy ${ac_tool_prefix}gcc; ac_word=$2
19899 -echo "$as_me:$LINENO: checking for $ac_word" >&5
19900 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
19901 -if test "${ac_cv_prog_CC+set}" = set; then
19902 - echo $ECHO_N "(cached) $ECHO_C" >&6
19904 - if test -n "$CC"; then
19905 - ac_cv_prog_CC="$CC" # Let the user override the test.
19907 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19908 -for as_dir in $PATH
19911 - test -z "$as_dir" && as_dir=.
19912 - for ac_exec_ext in '' $ac_executable_extensions; do
19913 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19914 - ac_cv_prog_CC="${ac_tool_prefix}gcc"
19915 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19924 -if test -n "$CC"; then
19925 - echo "$as_me:$LINENO: result: $CC" >&5
19926 -echo "${ECHO_T}$CC" >&6
19928 - echo "$as_me:$LINENO: result: no" >&5
19929 -echo "${ECHO_T}no" >&6
19933 -if test -z "$ac_cv_prog_CC"; then
19935 - # Extract the first word of "gcc", so it can be a program name with args.
19936 -set dummy gcc; ac_word=$2
19937 -echo "$as_me:$LINENO: checking for $ac_word" >&5
19938 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
19939 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
19940 - echo $ECHO_N "(cached) $ECHO_C" >&6
19942 - if test -n "$ac_ct_CC"; then
19943 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
19945 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19946 -for as_dir in $PATH
19949 - test -z "$as_dir" && as_dir=.
19950 - for ac_exec_ext in '' $ac_executable_extensions; do
19951 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19952 - ac_cv_prog_ac_ct_CC="gcc"
19953 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19961 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
19962 -if test -n "$ac_ct_CC"; then
19963 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
19964 -echo "${ECHO_T}$ac_ct_CC" >&6
19966 - echo "$as_me:$LINENO: result: no" >&5
19967 -echo "${ECHO_T}no" >&6
19972 - CC="$ac_cv_prog_CC"
19975 -if test -z "$CC"; then
19976 - if test -n "$ac_tool_prefix"; then
19977 - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
19978 -set dummy ${ac_tool_prefix}cc; ac_word=$2
19979 -echo "$as_me:$LINENO: checking for $ac_word" >&5
19980 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
19981 -if test "${ac_cv_prog_CC+set}" = set; then
19982 - echo $ECHO_N "(cached) $ECHO_C" >&6
19984 - if test -n "$CC"; then
19985 - ac_cv_prog_CC="$CC" # Let the user override the test.
19987 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19988 -for as_dir in $PATH
19991 - test -z "$as_dir" && as_dir=.
19992 - for ac_exec_ext in '' $ac_executable_extensions; do
19993 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19994 - ac_cv_prog_CC="${ac_tool_prefix}cc"
19995 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20000 + am_save_CPPFLAGS="$CPPFLAGS"
20005 -if test -n "$CC"; then
20006 - echo "$as_me:$LINENO: result: $CC" >&5
20007 -echo "${ECHO_T}$CC" >&6
20009 - echo "$as_me:$LINENO: result: no" >&5
20010 -echo "${ECHO_T}no" >&6
20012 + for element in $INCICONV; do
20014 + for x in $CPPFLAGS; do
20017 -if test -z "$ac_cv_prog_CC"; then
20019 - # Extract the first word of "cc", so it can be a program name with args.
20020 -set dummy cc; ac_word=$2
20021 -echo "$as_me:$LINENO: checking for $ac_word" >&5
20022 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20023 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
20024 - echo $ECHO_N "(cached) $ECHO_C" >&6
20026 - if test -n "$ac_ct_CC"; then
20027 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
20029 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20030 -for as_dir in $PATH
20033 - test -z "$as_dir" && as_dir=.
20034 - for ac_exec_ext in '' $ac_executable_extensions; do
20035 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20036 - ac_cv_prog_ac_ct_CC="cc"
20037 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20042 + acl_save_prefix="$prefix"
20043 + prefix="$acl_final_prefix"
20044 + acl_save_exec_prefix="$exec_prefix"
20045 + exec_prefix="$acl_final_exec_prefix"
20047 + exec_prefix="$acl_save_exec_prefix"
20048 + prefix="$acl_save_prefix"
20052 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
20053 -if test -n "$ac_ct_CC"; then
20054 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
20055 -echo "${ECHO_T}$ac_ct_CC" >&6
20057 - echo "$as_me:$LINENO: result: no" >&5
20058 -echo "${ECHO_T}no" >&6
20060 + if test "X$x" = "X$element"; then
20065 + if test -z "$haveit"; then
20066 + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
20072 - CC="$ac_cv_prog_CC"
20076 -if test -z "$CC"; then
20077 - # Extract the first word of "cc", so it can be a program name with args.
20078 -set dummy cc; ac_word=$2
20079 -echo "$as_me:$LINENO: checking for $ac_word" >&5
20080 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20081 -if test "${ac_cv_prog_CC+set}" = set; then
20082 - echo $ECHO_N "(cached) $ECHO_C" >&6
20083 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
20084 +$as_echo_n "checking for iconv... " >&6; }
20085 +if ${am_cv_func_iconv+:} false; then :
20086 + $as_echo_n "(cached) " >&6
20088 - if test -n "$CC"; then
20089 - ac_cv_prog_CC="$CC" # Let the user override the test.
20091 - ac_prog_rejected=no
20092 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20093 -for as_dir in $PATH
20096 - test -z "$as_dir" && as_dir=.
20097 - for ac_exec_ext in '' $ac_executable_extensions; do
20098 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20099 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
20100 - ac_prog_rejected=yes
20103 - ac_cv_prog_CC="cc"
20104 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20110 -if test $ac_prog_rejected = yes; then
20111 - # We found a bogon in the path, so make sure we never use it.
20112 - set dummy $ac_cv_prog_CC
20114 - if test $# != 0; then
20115 - # We chose a different compiler from the bogus one.
20116 - # However, it has the same basename, so the bogon will be chosen
20117 - # first if we set CC to just the basename; use the full file name.
20119 - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
20123 + am_cv_func_iconv="no, consider installing GNU libiconv"
20124 + am_cv_lib_iconv=no
20125 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20126 +/* end confdefs.h. */
20127 +#include <stdlib.h>
20128 +#include <iconv.h>
20132 +iconv_t cd = iconv_open("","");
20133 + iconv(cd,NULL,NULL,NULL,NULL);
20139 +if ac_fn_c_try_link "$LINENO"; then :
20140 + am_cv_func_iconv=yes
20143 -if test -n "$CC"; then
20144 - echo "$as_me:$LINENO: result: $CC" >&5
20145 -echo "${ECHO_T}$CC" >&6
20147 - echo "$as_me:$LINENO: result: no" >&5
20148 -echo "${ECHO_T}no" >&6
20149 +rm -f core conftest.err conftest.$ac_objext \
20150 + conftest$ac_exeext conftest.$ac_ext
20151 + if test "$am_cv_func_iconv" != yes; then
20152 + am_save_LIBS="$LIBS"
20153 + LIBS="$LIBS $LIBICONV"
20154 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20155 +/* end confdefs.h. */
20156 +#include <stdlib.h>
20157 +#include <iconv.h>
20161 +iconv_t cd = iconv_open("","");
20162 + iconv(cd,NULL,NULL,NULL,NULL);
20168 +if ac_fn_c_try_link "$LINENO"; then :
20169 + am_cv_lib_iconv=yes
20170 + am_cv_func_iconv=yes
20172 +rm -f core conftest.err conftest.$ac_objext \
20173 + conftest$ac_exeext conftest.$ac_ext
20174 + LIBS="$am_save_LIBS"
20178 -if test -z "$CC"; then
20179 - if test -n "$ac_tool_prefix"; then
20180 - for ac_prog in cl
20182 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
20183 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
20184 -echo "$as_me:$LINENO: checking for $ac_word" >&5
20185 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20186 -if test "${ac_cv_prog_CC+set}" = set; then
20187 - echo $ECHO_N "(cached) $ECHO_C" >&6
20188 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
20189 +$as_echo "$am_cv_func_iconv" >&6; }
20190 + if test "$am_cv_func_iconv" = yes; then
20191 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
20192 +$as_echo_n "checking for working iconv... " >&6; }
20193 +if ${am_cv_func_iconv_works+:} false; then :
20194 + $as_echo_n "(cached) " >&6
20196 - if test -n "$CC"; then
20197 - ac_cv_prog_CC="$CC" # Let the user override the test.
20199 + am_save_LIBS="$LIBS"
20200 + if test $am_cv_lib_iconv = yes; then
20201 + LIBS="$LIBS $LIBICONV"
20203 + if test "$cross_compiling" = yes; then :
20204 + case "$host_os" in
20205 + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
20206 + *) am_cv_func_iconv_works="guessing yes" ;;
20209 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20210 -for as_dir in $PATH
20213 - test -z "$as_dir" && as_dir=.
20214 - for ac_exec_ext in '' $ac_executable_extensions; do
20215 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20216 - ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
20217 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20222 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20223 +/* end confdefs.h. */
20228 -if test -n "$CC"; then
20229 - echo "$as_me:$LINENO: result: $CC" >&5
20230 -echo "${ECHO_T}$CC" >&6
20231 +#include <iconv.h>
20232 +#include <string.h>
20235 + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
20238 + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
20239 + if (cd_utf8_to_88591 != (iconv_t)(-1))
20241 + static const char input[] = "\342\202\254"; /* EURO SIGN */
20243 + const char *inptr = input;
20244 + size_t inbytesleft = strlen (input);
20245 + char *outptr = buf;
20246 + size_t outbytesleft = sizeof (buf);
20247 + size_t res = iconv (cd_utf8_to_88591,
20248 + (char **) &inptr, &inbytesleft,
20249 + &outptr, &outbytesleft);
20254 + /* Test against Solaris 10 bug: Failures are not distinguishable from
20255 + successful returns. */
20257 + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
20258 + if (cd_ascii_to_88591 != (iconv_t)(-1))
20260 + static const char input[] = "\263";
20262 + const char *inptr = input;
20263 + size_t inbytesleft = strlen (input);
20264 + char *outptr = buf;
20265 + size_t outbytesleft = sizeof (buf);
20266 + size_t res = iconv (cd_ascii_to_88591,
20267 + (char **) &inptr, &inbytesleft,
20268 + &outptr, &outbytesleft);
20273 +#if 0 /* This bug could be worked around by the caller. */
20274 + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
20276 + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
20277 + if (cd_88591_to_utf8 != (iconv_t)(-1))
20279 + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
20281 + const char *inptr = input;
20282 + size_t inbytesleft = strlen (input);
20283 + char *outptr = buf;
20284 + size_t outbytesleft = sizeof (buf);
20285 + size_t res = iconv (cd_88591_to_utf8,
20286 + (char **) &inptr, &inbytesleft,
20287 + &outptr, &outbytesleft);
20288 + if ((int)res > 0)
20293 + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
20295 + if (/* Try standardized names. */
20296 + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
20297 + /* Try IRIX, OSF/1 names. */
20298 + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
20299 + /* Try AIX names. */
20300 + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
20301 + /* Try HP-UX names. */
20302 + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
20307 +if ac_fn_c_try_run "$LINENO"; then :
20308 + am_cv_func_iconv_works=yes
20310 - echo "$as_me:$LINENO: result: no" >&5
20311 -echo "${ECHO_T}no" >&6
20312 + am_cv_func_iconv_works=no
20314 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
20315 + conftest.$ac_objext conftest.beam conftest.$ac_ext
20318 - test -n "$CC" && break
20320 + LIBS="$am_save_LIBS"
20323 -if test -z "$CC"; then
20325 - for ac_prog in cl
20327 - # Extract the first word of "$ac_prog", so it can be a program name with args.
20328 -set dummy $ac_prog; ac_word=$2
20329 -echo "$as_me:$LINENO: checking for $ac_word" >&5
20330 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20331 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
20332 - echo $ECHO_N "(cached) $ECHO_C" >&6
20334 - if test -n "$ac_ct_CC"; then
20335 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
20337 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20338 -for as_dir in $PATH
20341 - test -z "$as_dir" && as_dir=.
20342 - for ac_exec_ext in '' $ac_executable_extensions; do
20343 - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20344 - ac_cv_prog_ac_ct_CC="$ac_prog"
20345 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20347 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
20348 +$as_echo "$am_cv_func_iconv_works" >&6; }
20349 + case "$am_cv_func_iconv_works" in
20350 + *no) am_func_iconv=no am_cv_lib_iconv=no ;;
20351 + *) am_func_iconv=yes ;;
20354 + am_func_iconv=no am_cv_lib_iconv=no
20358 + if test "$am_func_iconv" = yes; then
20362 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
20363 -if test -n "$ac_ct_CC"; then
20364 - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
20365 -echo "${ECHO_T}$ac_ct_CC" >&6
20367 - echo "$as_me:$LINENO: result: no" >&5
20368 -echo "${ECHO_T}no" >&6
20370 +$as_echo "#define HAVE_ICONV 1" >>confdefs.h
20372 - test -n "$ac_ct_CC" && break
20375 + if test "$am_cv_lib_iconv" = yes; then
20376 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
20377 +$as_echo_n "checking how to link with libiconv... " >&6; }
20378 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
20379 +$as_echo "$LIBICONV" >&6; }
20381 + CPPFLAGS="$am_save_CPPFLAGS"
20398 + use_additional=yes
20400 + acl_save_prefix="$prefix"
20401 + prefix="$acl_final_prefix"
20402 + acl_save_exec_prefix="$exec_prefix"
20403 + exec_prefix="$acl_final_exec_prefix"
20405 + eval additional_includedir=\"$includedir\"
20406 + eval additional_libdir=\"$libdir\"
20408 + exec_prefix="$acl_save_exec_prefix"
20409 + prefix="$acl_save_prefix"
20412 +# Check whether --with-libintl-prefix was given.
20413 +if test "${with_libintl_prefix+set}" = set; then :
20414 + withval=$with_libintl_prefix;
20415 + if test "X$withval" = "Xno"; then
20416 + use_additional=no
20418 + if test "X$withval" = "X"; then
20420 + acl_save_prefix="$prefix"
20421 + prefix="$acl_final_prefix"
20422 + acl_save_exec_prefix="$exec_prefix"
20423 + exec_prefix="$acl_final_exec_prefix"
20425 + eval additional_includedir=\"$includedir\"
20426 + eval additional_libdir=\"$libdir\"
20428 + exec_prefix="$acl_save_exec_prefix"
20429 + prefix="$acl_save_prefix"
20432 + additional_includedir="$withval/include"
20433 + additional_libdir="$withval/$acl_libdirstem"
20434 + if test "$acl_libdirstem2" != "$acl_libdirstem" \
20435 + && ! test -d "$withval/$acl_libdirstem"; then
20436 + additional_libdir="$withval/$acl_libdirstem2"
20450 + names_already_handled=
20451 + names_next_round='intl '
20452 + while test -n "$names_next_round"; do
20453 + names_this_round="$names_next_round"
20454 + names_next_round=
20455 + for name in $names_this_round; do
20457 + for n in $names_already_handled; do
20458 + if test "$n" = "$name"; then
20459 + already_handled=yes
20463 + if test -z "$already_handled"; then
20464 + names_already_handled="$names_already_handled $name"
20465 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
20466 + eval value=\"\$HAVE_LIB$uppername\"
20467 + if test -n "$value"; then
20468 + if test "$value" = yes; then
20469 + eval value=\"\$LIB$uppername\"
20470 + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
20471 + eval value=\"\$LTLIB$uppername\"
20472 + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
20481 + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
20482 + if test -n "$acl_shlibext"; then
20483 + shrext=".$acl_shlibext" # typically: shrext=.so
20487 + if test $use_additional = yes; then
20488 + dir="$additional_libdir"
20489 + if test -n "$acl_shlibext"; then
20490 + if test -f "$dir/$libname$shrext"; then
20492 + found_so="$dir/$libname$shrext"
20494 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
20495 + ver=`(cd "$dir" && \
20496 + for f in "$libname$shrext".*; do echo "$f"; done \
20497 + | sed -e "s,^$libname$shrext\\\\.,," \
20498 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
20499 + | sed 1q ) 2>/dev/null`
20500 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
20502 + found_so="$dir/$libname$shrext.$ver"
20505 + eval library_names=\"$acl_library_names_spec\"
20506 + for f in $library_names; do
20507 + if test -f "$dir/$f"; then
20509 + found_so="$dir/$f"
20516 + if test "X$found_dir" = "X"; then
20517 + if test -f "$dir/$libname.$acl_libext"; then
20519 + found_a="$dir/$libname.$acl_libext"
20522 + if test "X$found_dir" != "X"; then
20523 + if test -f "$dir/$libname.la"; then
20524 + found_la="$dir/$libname.la"
20528 + if test "X$found_dir" = "X"; then
20529 + for x in $LDFLAGS $LTLIBINTL; do
20531 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
20532 -See \`config.log' for more details." >&5
20533 -echo "$as_me: error: no acceptable C compiler found in \$PATH
20534 -See \`config.log' for more details." >&2;}
20535 - { (exit 1); exit 1; }; }
20536 + acl_save_prefix="$prefix"
20537 + prefix="$acl_final_prefix"
20538 + acl_save_exec_prefix="$exec_prefix"
20539 + exec_prefix="$acl_final_exec_prefix"
20541 + exec_prefix="$acl_save_exec_prefix"
20542 + prefix="$acl_save_prefix"
20544 -# Provide some information about the compiler.
20545 -echo "$as_me:$LINENO:" \
20546 - "checking for C compiler version" >&5
20547 -ac_compiler=`set X $ac_compile; echo $2`
20548 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
20549 - (eval $ac_compiler --version </dev/null >&5) 2>&5
20551 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20552 - (exit $ac_status); }
20553 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
20554 - (eval $ac_compiler -v </dev/null >&5) 2>&5
20556 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20557 - (exit $ac_status); }
20558 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
20559 - (eval $ac_compiler -V </dev/null >&5) 2>&5
20561 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20562 - (exit $ac_status); }
20565 + dir=`echo "X$x" | sed -e 's/^X-L//'`
20566 + if test -n "$acl_shlibext"; then
20567 + if test -f "$dir/$libname$shrext"; then
20569 + found_so="$dir/$libname$shrext"
20571 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
20572 + ver=`(cd "$dir" && \
20573 + for f in "$libname$shrext".*; do echo "$f"; done \
20574 + | sed -e "s,^$libname$shrext\\\\.,," \
20575 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
20576 + | sed 1q ) 2>/dev/null`
20577 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
20579 + found_so="$dir/$libname$shrext.$ver"
20582 + eval library_names=\"$acl_library_names_spec\"
20583 + for f in $library_names; do
20584 + if test -f "$dir/$f"; then
20586 + found_so="$dir/$f"
20593 + if test "X$found_dir" = "X"; then
20594 + if test -f "$dir/$libname.$acl_libext"; then
20596 + found_a="$dir/$libname.$acl_libext"
20599 + if test "X$found_dir" != "X"; then
20600 + if test -f "$dir/$libname.la"; then
20601 + found_la="$dir/$libname.la"
20606 + if test "X$found_dir" != "X"; then
20611 + if test "X$found_dir" != "X"; then
20612 + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
20613 + if test "X$found_so" != "X"; then
20614 + if test "$enable_rpath" = no \
20615 + || test "X$found_dir" = "X/usr/$acl_libdirstem" \
20616 + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
20617 + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
20620 + for x in $ltrpathdirs; do
20621 + if test "X$x" = "X$found_dir"; then
20626 + if test -z "$haveit"; then
20627 + ltrpathdirs="$ltrpathdirs $found_dir"
20629 + if test "$acl_hardcode_direct" = yes; then
20630 + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
20632 + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
20633 + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
20635 + for x in $rpathdirs; do
20636 + if test "X$x" = "X$found_dir"; then
20641 + if test -z "$haveit"; then
20642 + rpathdirs="$rpathdirs $found_dir"
20646 + for x in $LDFLAGS $LIBINTL; do
20648 -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
20649 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
20650 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
20651 - echo $ECHO_N "(cached) $ECHO_C" >&6
20653 - cat >conftest.$ac_ext <<_ACEOF
20656 -cat confdefs.h >>conftest.$ac_ext
20657 -cat >>conftest.$ac_ext <<_ACEOF
20658 -/* end confdefs.h. */
20659 + acl_save_prefix="$prefix"
20660 + prefix="$acl_final_prefix"
20661 + acl_save_exec_prefix="$exec_prefix"
20662 + exec_prefix="$acl_final_exec_prefix"
20664 + exec_prefix="$acl_save_exec_prefix"
20665 + prefix="$acl_save_prefix"
20673 + if test "X$x" = "X-L$found_dir"; then
20678 + if test -z "$haveit"; then
20679 + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
20681 + if test "$acl_hardcode_minus_L" != no; then
20682 + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
20684 + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
20690 + if test "X$found_a" != "X"; then
20691 + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
20693 + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
20696 + additional_includedir=
20697 + case "$found_dir" in
20698 + */$acl_libdirstem | */$acl_libdirstem/)
20699 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
20700 + if test "$name" = 'intl'; then
20701 + LIBINTL_PREFIX="$basedir"
20703 + additional_includedir="$basedir/include"
20705 + */$acl_libdirstem2 | */$acl_libdirstem2/)
20706 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
20707 + if test "$name" = 'intl'; then
20708 + LIBINTL_PREFIX="$basedir"
20710 + additional_includedir="$basedir/include"
20713 + if test "X$additional_includedir" != "X"; then
20714 + if test "X$additional_includedir" != "X/usr/include"; then
20716 + if test "X$additional_includedir" = "X/usr/local/include"; then
20717 + if test -n "$GCC"; then
20719 + linux* | gnu* | k*bsd*-gnu) haveit=yes;;
20723 + if test -z "$haveit"; then
20724 + for x in $CPPFLAGS $INCINTL; do
20730 -rm -f conftest.$ac_objext
20731 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20732 - (eval $ac_compile) 2>conftest.er1
20734 - grep -v '^ *+' conftest.er1 >conftest.err
20735 - rm -f conftest.er1
20736 - cat conftest.err >&5
20737 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20738 - (exit $ac_status); } &&
20739 - { ac_try='test -z "$ac_c_werror_flag"
20740 - || test ! -s conftest.err'
20741 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20742 - (eval $ac_try) 2>&5
20744 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20745 - (exit $ac_status); }; } &&
20746 - { ac_try='test -s conftest.$ac_objext'
20747 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20748 - (eval $ac_try) 2>&5
20750 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20751 - (exit $ac_status); }; }; then
20752 - ac_compiler_gnu=yes
20754 - echo "$as_me: failed program was:" >&5
20755 -sed 's/^/| /' conftest.$ac_ext >&5
20756 + acl_save_prefix="$prefix"
20757 + prefix="$acl_final_prefix"
20758 + acl_save_exec_prefix="$exec_prefix"
20759 + exec_prefix="$acl_final_exec_prefix"
20761 + exec_prefix="$acl_save_exec_prefix"
20762 + prefix="$acl_save_prefix"
20764 -ac_compiler_gnu=no
20766 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
20767 -ac_cv_c_compiler_gnu=$ac_compiler_gnu
20768 + if test "X$x" = "X-I$additional_includedir"; then
20773 + if test -z "$haveit"; then
20774 + if test -d "$additional_includedir"; then
20775 + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
20781 + if test -n "$found_la"; then
20782 + save_libdir="$libdir"
20783 + case "$found_la" in
20784 + */* | *\\*) . "$found_la" ;;
20785 + *) . "./$found_la" ;;
20787 + libdir="$save_libdir"
20788 + for dep in $dependency_libs; do
20791 + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
20792 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
20793 + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
20795 + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
20796 + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
20797 + if test -n "$GCC"; then
20799 + linux* | gnu* | k*bsd*-gnu) haveit=yes;;
20803 + if test -z "$haveit"; then
20805 + for x in $LDFLAGS $LIBINTL; do
20808 -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
20809 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
20810 -GCC=`test $ac_compiler_gnu = yes && echo yes`
20811 -ac_test_CFLAGS=${CFLAGS+set}
20812 -ac_save_CFLAGS=$CFLAGS
20814 -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
20815 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
20816 -if test "${ac_cv_prog_cc_g+set}" = set; then
20817 - echo $ECHO_N "(cached) $ECHO_C" >&6
20819 - cat >conftest.$ac_ext <<_ACEOF
20822 -cat confdefs.h >>conftest.$ac_ext
20823 -cat >>conftest.$ac_ext <<_ACEOF
20824 -/* end confdefs.h. */
20825 + acl_save_prefix="$prefix"
20826 + prefix="$acl_final_prefix"
20827 + acl_save_exec_prefix="$exec_prefix"
20828 + exec_prefix="$acl_final_exec_prefix"
20830 + exec_prefix="$acl_save_exec_prefix"
20831 + prefix="$acl_save_prefix"
20836 + if test "X$x" = "X-L$additional_libdir"; then
20841 + if test -z "$haveit"; then
20842 + if test -d "$additional_libdir"; then
20843 + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
20847 + for x in $LDFLAGS $LTLIBINTL; do
20853 -rm -f conftest.$ac_objext
20854 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20855 - (eval $ac_compile) 2>conftest.er1
20857 - grep -v '^ *+' conftest.er1 >conftest.err
20858 - rm -f conftest.er1
20859 - cat conftest.err >&5
20860 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20861 - (exit $ac_status); } &&
20862 - { ac_try='test -z "$ac_c_werror_flag"
20863 - || test ! -s conftest.err'
20864 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20865 - (eval $ac_try) 2>&5
20867 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20868 - (exit $ac_status); }; } &&
20869 - { ac_try='test -s conftest.$ac_objext'
20870 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20871 - (eval $ac_try) 2>&5
20873 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20874 - (exit $ac_status); }; }; then
20875 - ac_cv_prog_cc_g=yes
20877 - echo "$as_me: failed program was:" >&5
20878 -sed 's/^/| /' conftest.$ac_ext >&5
20879 + acl_save_prefix="$prefix"
20880 + prefix="$acl_final_prefix"
20881 + acl_save_exec_prefix="$exec_prefix"
20882 + exec_prefix="$acl_final_exec_prefix"
20884 + exec_prefix="$acl_save_exec_prefix"
20885 + prefix="$acl_save_prefix"
20887 -ac_cv_prog_cc_g=no
20889 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
20891 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
20892 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
20893 -if test "$ac_test_CFLAGS" = set; then
20894 - CFLAGS=$ac_save_CFLAGS
20895 -elif test $ac_cv_prog_cc_g = yes; then
20896 - if test "$GCC" = yes; then
20900 + if test "X$x" = "X-L$additional_libdir"; then
20905 + if test -z "$haveit"; then
20906 + if test -d "$additional_libdir"; then
20907 + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
20914 + dir=`echo "X$dep" | sed -e 's/^X-R//'`
20915 + if test "$enable_rpath" != no; then
20917 + for x in $rpathdirs; do
20918 + if test "X$x" = "X$dir"; then
20923 + if test -z "$haveit"; then
20924 + rpathdirs="$rpathdirs $dir"
20927 + for x in $ltrpathdirs; do
20928 + if test "X$x" = "X$dir"; then
20933 + if test -z "$haveit"; then
20934 + ltrpathdirs="$ltrpathdirs $dir"
20939 + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
20942 + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
20945 + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
20946 + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
20952 + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
20953 + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
20959 + if test "X$rpathdirs" != "X"; then
20960 + if test -n "$acl_hardcode_libdir_separator"; then
20962 + for found_dir in $rpathdirs; do
20963 + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
20965 + acl_save_libdir="$libdir"
20966 + libdir="$alldirs"
20967 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
20968 + libdir="$acl_save_libdir"
20969 + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
20971 + for found_dir in $rpathdirs; do
20972 + acl_save_libdir="$libdir"
20973 + libdir="$found_dir"
20974 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
20975 + libdir="$acl_save_libdir"
20976 + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
20981 - if test "$GCC" = yes; then
20985 + if test "X$ltrpathdirs" != "X"; then
20986 + for found_dir in $ltrpathdirs; do
20987 + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
20991 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
20992 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
20993 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
20994 - echo $ECHO_N "(cached) $ECHO_C" >&6
20996 - ac_cv_prog_cc_stdc=no
20998 -cat >conftest.$ac_ext <<_ACEOF
21001 -cat confdefs.h >>conftest.$ac_ext
21002 -cat >>conftest.$ac_ext <<_ACEOF
21003 -/* end confdefs.h. */
21004 -#include <stdarg.h>
21005 -#include <stdio.h>
21006 -#include <sys/types.h>
21007 -#include <sys/stat.h>
21008 -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
21009 -struct buf { int x; };
21010 -FILE * (*rcsopen) (struct buf *, struct stat *, int);
21011 -static char *e (p, i)
21017 -static char *f (char * (*g) (char **, int), char **p, ...)
21022 - s = g (p, va_arg (v,int));
21027 -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
21028 - function prototypes and stuff, but not '\xHH' hex character constants.
21029 - These don't provoke an error unfortunately, instead are silently treated
21030 - as 'x'. The following induces an error, until -std1 is added to get
21031 - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
21032 - array size at least. It's necessary to write '\x00'==0 to get something
21033 - that's true only with -std1. */
21034 -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
21036 -int test (int i, double x);
21037 -struct s1 {int (*f) (int a);};
21038 -struct s2 {int (*f) (double a);};
21039 -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
21045 -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
21050 -# Don't try gcc -ansi; that turns off useful extensions and
21051 -# breaks some systems' header files.
21052 -# AIX -qlanglvl=ansi
21053 -# Ultrix and OSF/1 -std1
21054 -# HP-UX 10.20 and later -Ae
21055 -# HP-UX older versions -Aa -D_HPUX_SOURCE
21056 -# SVR4 -Xc -D__EXTENSIONS__
21057 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
21059 - CC="$ac_save_CC $ac_arg"
21060 - rm -f conftest.$ac_objext
21061 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21062 - (eval $ac_compile) 2>conftest.er1
21064 - grep -v '^ *+' conftest.er1 >conftest.err
21065 - rm -f conftest.er1
21066 - cat conftest.err >&5
21067 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21068 - (exit $ac_status); } &&
21069 - { ac_try='test -z "$ac_c_werror_flag"
21070 - || test ! -s conftest.err'
21071 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21072 - (eval $ac_try) 2>&5
21074 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21075 - (exit $ac_status); }; } &&
21076 - { ac_try='test -s conftest.$ac_objext'
21077 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21078 - (eval $ac_try) 2>&5
21080 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21081 - (exit $ac_status); }; }; then
21082 - ac_cv_prog_cc_stdc=$ac_arg
21085 - echo "$as_me: failed program was:" >&5
21086 -sed 's/^/| /' conftest.$ac_ext >&5
21089 -rm -f conftest.err conftest.$ac_objext
21091 -rm -f conftest.$ac_ext conftest.$ac_objext
21096 -case "x$ac_cv_prog_cc_stdc" in
21098 - echo "$as_me:$LINENO: result: none needed" >&5
21099 -echo "${ECHO_T}none needed" >&6 ;;
21101 - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
21102 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
21103 - CC="$CC $ac_cv_prog_cc_stdc" ;;
21106 -# Some people use a C++ compiler to compile C. Since we use `exit',
21107 -# in C++ we need to declare it. In case someone uses the same compiler
21108 -# for both compiling C and C++ we need to have the C++ compiler decide
21109 -# the declaration of exit, since it's the most demanding environment.
21110 -cat >conftest.$ac_ext <<_ACEOF
21111 -#ifndef __cplusplus
21115 -rm -f conftest.$ac_objext
21116 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21117 - (eval $ac_compile) 2>conftest.er1
21119 - grep -v '^ *+' conftest.er1 >conftest.err
21120 - rm -f conftest.er1
21121 - cat conftest.err >&5
21122 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21123 - (exit $ac_status); } &&
21124 - { ac_try='test -z "$ac_c_werror_flag"
21125 - || test ! -s conftest.err'
21126 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21127 - (eval $ac_try) 2>&5
21129 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21130 - (exit $ac_status); }; } &&
21131 - { ac_try='test -s conftest.$ac_objext'
21132 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21133 - (eval $ac_try) 2>&5
21135 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21136 - (exit $ac_status); }; }; then
21137 - for ac_declaration in \
21139 - 'extern "C" void std::exit (int) throw (); using std::exit;' \
21140 - 'extern "C" void std::exit (int); using std::exit;' \
21141 - 'extern "C" void exit (int) throw ();' \
21142 - 'extern "C" void exit (int);' \
21143 - 'void exit (int);'
21145 - cat >conftest.$ac_ext <<_ACEOF
21148 -cat confdefs.h >>conftest.$ac_ext
21149 -cat >>conftest.$ac_ext <<_ACEOF
21150 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
21151 +$as_echo_n "checking for GNU gettext in libintl... " >&6; }
21152 +if eval \${$gt_func_gnugettext_libintl+:} false; then :
21153 + $as_echo_n "(cached) " >&6
21155 + gt_save_CPPFLAGS="$CPPFLAGS"
21156 + CPPFLAGS="$CPPFLAGS $INCINTL"
21157 + gt_save_LIBS="$LIBS"
21158 + LIBS="$LIBS $LIBINTL"
21159 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21160 /* end confdefs.h. */
21162 -#include <stdlib.h>
21163 +#include <libintl.h>
21164 +$gt_revision_test_code
21165 +extern int _nl_msg_cat_cntr;
21167 +#ifdef __cplusplus
21170 +const char *_nl_expand_alias (const char *);
21175 +bindtextdomain ("", "");
21176 +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
21181 -rm -f conftest.$ac_objext
21182 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21183 - (eval $ac_compile) 2>conftest.er1
21185 - grep -v '^ *+' conftest.er1 >conftest.err
21186 - rm -f conftest.er1
21187 - cat conftest.err >&5
21188 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21189 - (exit $ac_status); } &&
21190 - { ac_try='test -z "$ac_c_werror_flag"
21191 - || test ! -s conftest.err'
21192 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21193 - (eval $ac_try) 2>&5
21195 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21196 - (exit $ac_status); }; } &&
21197 - { ac_try='test -s conftest.$ac_objext'
21198 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21199 - (eval $ac_try) 2>&5
21201 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21202 - (exit $ac_status); }; }; then
21204 +if ac_fn_c_try_link "$LINENO"; then :
21205 + eval "$gt_func_gnugettext_libintl=yes"
21207 - echo "$as_me: failed program was:" >&5
21208 -sed 's/^/| /' conftest.$ac_ext >&5
21211 + eval "$gt_func_gnugettext_libintl=no"
21213 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
21214 - cat >conftest.$ac_ext <<_ACEOF
21217 -cat confdefs.h >>conftest.$ac_ext
21218 -cat >>conftest.$ac_ext <<_ACEOF
21219 +rm -f core conftest.err conftest.$ac_objext \
21220 + conftest$ac_exeext conftest.$ac_ext
21221 + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
21222 + LIBS="$LIBS $LIBICONV"
21223 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21224 /* end confdefs.h. */
21226 +#include <libintl.h>
21227 +$gt_revision_test_code
21228 +extern int _nl_msg_cat_cntr;
21230 +#ifdef __cplusplus
21233 +const char *_nl_expand_alias (const char *);
21238 +bindtextdomain ("", "");
21239 +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
21244 -rm -f conftest.$ac_objext
21245 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21246 - (eval $ac_compile) 2>conftest.er1
21248 - grep -v '^ *+' conftest.er1 >conftest.err
21249 - rm -f conftest.er1
21250 - cat conftest.err >&5
21251 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21252 - (exit $ac_status); } &&
21253 - { ac_try='test -z "$ac_c_werror_flag"
21254 - || test ! -s conftest.err'
21255 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21256 - (eval $ac_try) 2>&5
21258 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21259 - (exit $ac_status); }; } &&
21260 - { ac_try='test -s conftest.$ac_objext'
21261 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21262 - (eval $ac_try) 2>&5
21264 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21265 - (exit $ac_status); }; }; then
21268 - echo "$as_me: failed program was:" >&5
21269 -sed 's/^/| /' conftest.$ac_ext >&5
21270 +if ac_fn_c_try_link "$LINENO"; then :
21271 + LIBINTL="$LIBINTL $LIBICONV"
21272 + LTLIBINTL="$LTLIBINTL $LTLIBICONV"
21273 + eval "$gt_func_gnugettext_libintl=yes"
21276 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
21279 -if test -n "$ac_declaration"; then
21280 - echo '#ifdef __cplusplus' >>confdefs.h
21281 - echo $ac_declaration >>confdefs.h
21282 - echo '#endif' >>confdefs.h
21283 +rm -f core conftest.err conftest.$ac_objext \
21284 + conftest$ac_exeext conftest.$ac_ext
21286 + CPPFLAGS="$gt_save_CPPFLAGS"
21287 + LIBS="$gt_save_LIBS"
21289 +eval ac_res=\$$gt_func_gnugettext_libintl
21290 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
21291 +$as_echo "$ac_res" >&6; }
21295 - echo "$as_me: failed program was:" >&5
21296 -sed 's/^/| /' conftest.$ac_ext >&5
21297 + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
21298 + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
21299 + && test "$PACKAGE" != gettext-runtime \
21300 + && test "$PACKAGE" != gettext-tools; }; then
21301 + gt_use_preinstalled_gnugettext=yes
21309 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
21311 -ac_cpp='$CPP $CPPFLAGS'
21312 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
21313 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
21314 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
21316 -depcc="$CC" am_compiler_list=
21318 -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
21319 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
21320 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
21321 - echo $ECHO_N "(cached) $ECHO_C" >&6
21323 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
21324 - # We make a subdir and do the tests there. Otherwise we can end up
21325 - # making bogus files that we don't know about and never remove. For
21326 - # instance it was reported that on HP-UX the gcc test will end up
21327 - # making a dummy file named `D' -- because `-MD' means `put the output
21329 - mkdir conftest.dir
21330 - # Copy depcomp to subdir because otherwise we won't find it if we're
21331 - # using a relative directory.
21332 - cp "$am_depcomp" conftest.dir
21334 - # We will build objects and dependencies in a subdirectory because
21335 - # it helps to detect inapplicable dependency modes. For instance
21336 - # both Tru64's cc and ICC support -MD to output dependencies as a
21337 - # side effect of compilation, but ICC will put the dependencies in
21338 - # the current directory while Tru64 will put them in the object
21341 + if test -n "$INTL_MACOSX_LIBS"; then
21342 + if test "$gt_use_preinstalled_gnugettext" = "yes" \
21343 + || test "$nls_cv_use_gnu_gettext" = "yes"; then
21344 + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
21345 + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
21349 - am_cv_CC_dependencies_compiler_type=none
21350 - if test "$am_compiler_list" = ""; then
21351 - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
21352 + if test "$gt_use_preinstalled_gnugettext" = "yes" \
21353 + || test "$nls_cv_use_gnu_gettext" = "yes"; then
21355 +$as_echo "#define ENABLE_NLS 1" >>confdefs.h
21361 - for depmode in $am_compiler_list; do
21362 - # Setup a source with many dependencies, because some compilers
21363 - # like to wrap large dependency lists on column 80 (with \), and
21364 - # we should not choose a depcomp mode which is confused by this.
21366 - # We need to recreate these files for each test, as the compiler may
21367 - # overwrite some of them when testing with obscure command lines.
21368 - # This happens at least with the AIX C compiler.
21369 - : > sub/conftest.c
21370 - for i in 1 2 3 4 5 6; do
21371 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
21372 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
21373 - # Solaris 8's {/usr,}/bin/sh.
21374 - touch sub/conftst$i.h
21376 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
21380 - # after this tag, mechanisms are not by side-effect, so they'll
21381 - # only be used when explicitly requested
21382 - if test "x$enable_dependency_tracking" = xyes; then
21384 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
21385 +$as_echo_n "checking whether to use NLS... " >&6; }
21386 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
21387 +$as_echo "$USE_NLS" >&6; }
21388 + if test "$USE_NLS" = "yes"; then
21389 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
21390 +$as_echo_n "checking where the gettext function comes from... " >&6; }
21391 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then
21392 + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
21393 + gt_source="external libintl"
21400 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
21401 - # mode. It turns out that the SunPro C++ compiler does not properly
21402 - # handle `-M -o', and we need to detect this.
21403 - if depmode=$depmode \
21404 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
21405 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
21406 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
21407 - >/dev/null 2>conftest.err &&
21408 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
21409 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
21410 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
21411 - # icc doesn't choke on unknown options, it will just issue warnings
21412 - # or remarks (even with -Werror). So we grep stderr for any message
21413 - # that says an option was ignored or not supported.
21414 - # When given -MP, icc 7.0 and 7.1 complain thusly:
21415 - # icc: Command line warning: ignoring option '-M'; no argument required
21416 - # The diagnosis changed in icc 8.0:
21417 - # icc: Command line remark: option '-MP' not supported
21418 - if (grep 'ignoring option' conftest.err ||
21419 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
21420 - am_cv_CC_dependencies_compiler_type=$depmode
21425 + gt_source="included intl directory"
21428 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
21429 +$as_echo "$gt_source" >&6; }
21433 - rm -rf conftest.dir
21435 - am_cv_CC_dependencies_compiler_type=none
21437 + if test "$USE_NLS" = "yes"; then
21440 -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
21441 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
21442 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
21443 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then
21444 + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
21445 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
21446 +$as_echo_n "checking how to link with libintl... " >&6; }
21447 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
21448 +$as_echo "$LIBINTL" >&6; }
21450 + for element in $INCINTL; do
21452 + for x in $CPPFLAGS; do
21454 + acl_save_prefix="$prefix"
21455 + prefix="$acl_final_prefix"
21456 + acl_save_exec_prefix="$exec_prefix"
21457 + exec_prefix="$acl_final_exec_prefix"
21459 + exec_prefix="$acl_save_exec_prefix"
21460 + prefix="$acl_save_prefix"
21463 - test "x$enable_dependency_tracking" != xno \
21464 - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
21465 - am__fastdepCC_TRUE=
21466 - am__fastdepCC_FALSE='#'
21468 - am__fastdepCC_TRUE='#'
21469 - am__fastdepCC_FALSE=
21471 + if test "X$x" = "X$element"; then
21476 + if test -z "$haveit"; then
21477 + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
21484 -echo "$as_me:$LINENO: checking for library containing strerror" >&5
21485 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
21486 -if test "${ac_cv_search_strerror+set}" = set; then
21487 - echo $ECHO_N "(cached) $ECHO_C" >&6
21489 - ac_func_search_save_LIBS=$LIBS
21490 -ac_cv_search_strerror=no
21491 -cat >conftest.$ac_ext <<_ACEOF
21494 -cat confdefs.h >>conftest.$ac_ext
21495 -cat >>conftest.$ac_ext <<_ACEOF
21496 -/* end confdefs.h. */
21497 +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
21499 -/* Override any gcc2 internal prototype to avoid an error. */
21500 -#ifdef __cplusplus
21503 -/* We use char because int might match the return type of a gcc2
21504 - builtin and then its argument prototype would still apply. */
21514 -rm -f conftest.$ac_objext conftest$ac_exeext
21515 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
21516 - (eval $ac_link) 2>conftest.er1
21518 - grep -v '^ *+' conftest.er1 >conftest.err
21519 - rm -f conftest.er1
21520 - cat conftest.err >&5
21521 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21522 - (exit $ac_status); } &&
21523 - { ac_try='test -z "$ac_c_werror_flag"
21524 - || test ! -s conftest.err'
21525 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21526 - (eval $ac_try) 2>&5
21528 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21529 - (exit $ac_status); }; } &&
21530 - { ac_try='test -s conftest$ac_exeext'
21531 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21532 - (eval $ac_try) 2>&5
21534 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21535 - (exit $ac_status); }; }; then
21536 - ac_cv_search_strerror="none required"
21538 - echo "$as_me: failed program was:" >&5
21539 -sed 's/^/| /' conftest.$ac_ext >&5
21542 -rm -f conftest.err conftest.$ac_objext \
21543 - conftest$ac_exeext conftest.$ac_ext
21544 -if test "$ac_cv_search_strerror" = no; then
21545 - for ac_lib in cposix; do
21546 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
21547 - cat >conftest.$ac_ext <<_ACEOF
21550 -cat confdefs.h >>conftest.$ac_ext
21551 -cat >>conftest.$ac_ext <<_ACEOF
21552 -/* end confdefs.h. */
21553 +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
21555 -/* Override any gcc2 internal prototype to avoid an error. */
21556 -#ifdef __cplusplus
21559 -/* We use char because int might match the return type of a gcc2
21560 - builtin and then its argument prototype would still apply. */
21570 -rm -f conftest.$ac_objext conftest$ac_exeext
21571 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
21572 - (eval $ac_link) 2>conftest.er1
21574 - grep -v '^ *+' conftest.er1 >conftest.err
21575 - rm -f conftest.er1
21576 - cat conftest.err >&5
21577 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21578 - (exit $ac_status); } &&
21579 - { ac_try='test -z "$ac_c_werror_flag"
21580 - || test ! -s conftest.err'
21581 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21582 - (eval $ac_try) 2>&5
21584 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21585 - (exit $ac_status); }; } &&
21586 - { ac_try='test -s conftest$ac_exeext'
21587 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21588 - (eval $ac_try) 2>&5
21590 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21591 - (exit $ac_status); }; }; then
21592 - ac_cv_search_strerror="-l$ac_lib"
21595 - echo "$as_me: failed program was:" >&5
21596 -sed 's/^/| /' conftest.$ac_ext >&5
21600 -rm -f conftest.err conftest.$ac_objext \
21601 - conftest$ac_exeext conftest.$ac_ext
21604 -LIBS=$ac_func_search_save_LIBS
21606 -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
21607 -echo "${ECHO_T}$ac_cv_search_strerror" >&6
21608 -if test "$ac_cv_search_strerror" != no; then
21609 - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
21615 -echo "$as_me:$LINENO: checking for function prototypes" >&5
21616 -echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
21617 -if test "$ac_cv_prog_cc_stdc" != no; then
21618 - echo "$as_me:$LINENO: result: yes" >&5
21619 -echo "${ECHO_T}yes" >&6
21621 -cat >>confdefs.h <<\_ACEOF
21622 -#define PROTOTYPES 1
21624 + INTLLIBS="$LIBINTL"
21627 -cat >>confdefs.h <<\_ACEOF
21628 -#define __PROTOTYPES 1
21632 - echo "$as_me:$LINENO: result: no" >&5
21633 -echo "${ECHO_T}no" >&6
21637 -if test "$ac_cv_prog_cc_stdc" != no; then
21640 - U=_ ANSI2KNR=./ansi2knr
21642 -# Ensure some checks needed by ansi2knr itself.
21645 -for ac_header in string.h
21647 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
21648 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
21649 - echo "$as_me:$LINENO: checking for $ac_header" >&5
21650 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
21651 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
21652 - echo $ECHO_N "(cached) $ECHO_C" >&6
21654 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
21655 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
21657 - # Is the header compilable?
21658 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
21659 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
21660 -cat >conftest.$ac_ext <<_ACEOF
21663 -cat confdefs.h >>conftest.$ac_ext
21664 -cat >>conftest.$ac_ext <<_ACEOF
21665 -/* end confdefs.h. */
21666 -$ac_includes_default
21667 -#include <$ac_header>
21669 -rm -f conftest.$ac_objext
21670 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21671 - (eval $ac_compile) 2>conftest.er1
21673 - grep -v '^ *+' conftest.er1 >conftest.err
21674 - rm -f conftest.er1
21675 - cat conftest.err >&5
21676 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21677 - (exit $ac_status); } &&
21678 - { ac_try='test -z "$ac_c_werror_flag"
21679 - || test ! -s conftest.err'
21680 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21681 - (eval $ac_try) 2>&5
21683 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21684 - (exit $ac_status); }; } &&
21685 - { ac_try='test -s conftest.$ac_objext'
21686 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21687 - (eval $ac_try) 2>&5
21689 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21690 - (exit $ac_status); }; }; then
21691 - ac_header_compiler=yes
21693 - echo "$as_me: failed program was:" >&5
21694 -sed 's/^/| /' conftest.$ac_ext >&5
21696 -ac_header_compiler=no
21698 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
21699 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
21700 -echo "${ECHO_T}$ac_header_compiler" >&6
21702 -# Is the header present?
21703 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
21704 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
21705 -cat >conftest.$ac_ext <<_ACEOF
21708 -cat confdefs.h >>conftest.$ac_ext
21709 -cat >>conftest.$ac_ext <<_ACEOF
21710 -/* end confdefs.h. */
21711 -#include <$ac_header>
21713 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
21714 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
21716 - grep -v '^ *+' conftest.er1 >conftest.err
21717 - rm -f conftest.er1
21718 - cat conftest.err >&5
21719 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21720 - (exit $ac_status); } >/dev/null; then
21721 - if test -s conftest.err; then
21722 - ac_cpp_err=$ac_c_preproc_warn_flag
21723 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
21730 -if test -z "$ac_cpp_err"; then
21731 - ac_header_preproc=yes
21733 - echo "$as_me: failed program was:" >&5
21734 -sed 's/^/| /' conftest.$ac_ext >&5
21736 - ac_header_preproc=no
21738 -rm -f conftest.err conftest.$ac_ext
21739 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
21740 -echo "${ECHO_T}$ac_header_preproc" >&6
21742 -# So? What about this header?
21743 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
21745 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
21746 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
21747 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
21748 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
21749 - ac_header_preproc=yes
21752 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
21753 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
21754 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
21755 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
21756 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
21757 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
21758 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
21759 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
21760 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
21761 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
21762 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
21763 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
21766 -## ------------------------------------------ ##
21767 -## Report this to the AC_PACKAGE_NAME lists. ##
21768 -## ------------------------------------------ ##
21771 - sed "s/^/$as_me: WARNING: /" >&2
21774 -echo "$as_me:$LINENO: checking for $ac_header" >&5
21775 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
21776 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
21777 - echo $ECHO_N "(cached) $ECHO_C" >&6
21779 - eval "$as_ac_Header=\$ac_header_preproc"
21781 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
21782 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
21783 + abook_localedir="$datadir/locale"
21784 + abook_localedir=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
21785 + eval tmp_abook_prefix=\""$abook_localedir"\"
21786 + eval echo $tmp_abook_prefix
21790 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
21791 - cat >>confdefs.h <<_ACEOF
21792 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
21794 +localedir="\$(datadir)/locale"
21797 +# Check whether --with-localedir was given.
21798 +if test "${with_localedir+set}" = set; then :
21799 + withval=$with_localedir;
21803 +if test "x$with_localedir" != "x"; then
21804 + abook_localedir="$with_localedir"
21805 + localedir="$with_localedir"
21809 -if test "x$U" != "x"; then
21810 - { { echo "$as_me:$LINENO: error: Compiler not ANSI compliant" >&5
21811 -echo "$as_me: error: Compiler not ANSI compliant" >&2;}
21812 - { (exit 1); exit 1; }; }
21814 -echo "$as_me:$LINENO: checking for inline" >&5
21815 -echo $ECHO_N "checking for inline... $ECHO_C" >&6
21816 -if test "${ac_cv_c_inline+set}" = set; then
21817 - echo $ECHO_N "(cached) $ECHO_C" >&6
21819 - ac_cv_c_inline=no
21820 -for ac_kw in inline __inline__ __inline; do
21821 - cat >conftest.$ac_ext <<_ACEOF
21823 +cat >>confdefs.h <<_ACEOF
21824 +#define LOCALEDIR "$abook_localedir"
21826 -cat confdefs.h >>conftest.$ac_ext
21827 -cat >>conftest.$ac_ext <<_ACEOF
21828 -/* end confdefs.h. */
21829 -#ifndef __cplusplus
21830 -typedef int foo_t;
21831 -static $ac_kw foo_t static_foo () {return 0; }
21832 -$ac_kw foo_t foo () {return 0; }
21836 -rm -f conftest.$ac_objext
21837 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21838 - (eval $ac_compile) 2>conftest.er1
21840 - grep -v '^ *+' conftest.er1 >conftest.err
21841 - rm -f conftest.er1
21842 - cat conftest.err >&5
21843 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21844 - (exit $ac_status); } &&
21845 - { ac_try='test -z "$ac_c_werror_flag"
21846 - || test ! -s conftest.err'
21847 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21848 - (eval $ac_try) 2>&5
21850 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21851 - (exit $ac_status); }; } &&
21852 - { ac_try='test -s conftest.$ac_objext'
21853 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21854 - (eval $ac_try) 2>&5
21856 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21857 - (exit $ac_status); }; }; then
21858 - ac_cv_c_inline=$ac_kw; break
21860 - echo "$as_me: failed program was:" >&5
21861 -sed 's/^/| /' conftest.$ac_ext >&5
21864 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
21867 + if test x$USE_INCLUDED_LIBINTL = xyes; then
21868 + USE_INCLUDED_INTL_H_TRUE=
21869 + USE_INCLUDED_INTL_H_FALSE='#'
21871 + USE_INCLUDED_INTL_H_TRUE='#'
21872 + USE_INCLUDED_INTL_H_FALSE=
21874 -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
21875 -echo "${ECHO_T}$ac_cv_c_inline" >&6
21878 -case $ac_cv_c_inline in
21881 - case $ac_cv_c_inline in
21883 - *) ac_val=$ac_cv_c_inline;;
21885 - cat >>confdefs.h <<_ACEOF
21886 -#ifndef __cplusplus
21887 -#define inline $ac_val
21893 -# Find a good install program. We prefer a C program (faster),
21894 -# so one script is as good as another. But avoid the broken or
21895 -# incompatible versions:
21896 -# SysV /etc/install, /usr/sbin/install
21897 -# SunOS /usr/etc/install
21898 -# IRIX /sbin/install
21899 -# AIX /bin/install
21900 -# AmigaOS /C/install, which installs bootblocks on floppy discs
21901 -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
21902 -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
21903 -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
21904 -# OS/2's system install, which has a completely different semantic
21905 -# ./install, which can be erroneously created by make from ./install.sh.
21906 -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
21907 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
21908 -if test -z "$INSTALL"; then
21909 -if test "${ac_cv_path_install+set}" = set; then
21910 - echo $ECHO_N "(cached) $ECHO_C" >&6
21912 +ac_cpp='$CPP $CPPFLAGS'
21913 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
21914 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
21915 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
21916 +if test -n "$ac_tool_prefix"; then
21917 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
21918 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
21919 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21920 +$as_echo_n "checking for $ac_word... " >&6; }
21921 +if ${ac_cv_prog_CC+:} false; then :
21922 + $as_echo_n "(cached) " >&6
21924 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21925 + if test -n "$CC"; then
21926 + ac_cv_prog_CC="$CC" # Let the user override the test.
21928 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21929 for as_dir in $PATH
21932 test -z "$as_dir" && as_dir=.
21933 - # Account for people who put trailing slashes in PATH elements.
21935 - ./ | .// | /cC/* | \
21936 - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
21937 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
21940 - # OSF1 and SCO ODT 3.0 have their own names for install.
21941 - # Don't use installbsd from OSF since it installs stuff as root
21943 - for ac_prog in ginstall scoinst install; do
21944 - for ac_exec_ext in '' $ac_executable_extensions; do
21945 - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
21946 - if test $ac_prog = install &&
21947 - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
21948 - # AIX install. It has an incompatible calling convention.
21950 - elif test $ac_prog = install &&
21951 - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
21952 - # program-specific install script used by HP pwplus--don't use.
21955 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
21963 + for ac_exec_ext in '' $ac_executable_extensions; do
21964 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
21965 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
21966 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21975 - if test "${ac_cv_path_install+set}" = set; then
21976 - INSTALL=$ac_cv_path_install
21978 - # As a last resort, use the slow shell script. We don't cache a
21979 - # path for INSTALL within a source directory, because that will
21980 - # break other packages using the cache if that directory is
21981 - # removed, or if the path is relative.
21982 - INSTALL=$ac_install_sh
21985 -echo "$as_me:$LINENO: result: $INSTALL" >&5
21986 -echo "${ECHO_T}$INSTALL" >&6
21988 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
21989 -# It thinks the first close brace ends the variable substitution.
21990 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
21992 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
21994 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
21996 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
21997 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
21998 -if test "${ac_cv_header_stdc+set}" = set; then
21999 - echo $ECHO_N "(cached) $ECHO_C" >&6
22001 +if test -n "$CC"; then
22002 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22003 +$as_echo "$CC" >&6; }
22005 - cat >conftest.$ac_ext <<_ACEOF
22008 -cat confdefs.h >>conftest.$ac_ext
22009 -cat >>conftest.$ac_ext <<_ACEOF
22010 -/* end confdefs.h. */
22011 -#include <stdlib.h>
22012 -#include <stdarg.h>
22013 -#include <string.h>
22014 -#include <float.h>
22015 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22016 +$as_echo "no" >&6; }
22027 -rm -f conftest.$ac_objext
22028 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
22029 - (eval $ac_compile) 2>conftest.er1
22031 - grep -v '^ *+' conftest.er1 >conftest.err
22032 - rm -f conftest.er1
22033 - cat conftest.err >&5
22034 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22035 - (exit $ac_status); } &&
22036 - { ac_try='test -z "$ac_c_werror_flag"
22037 - || test ! -s conftest.err'
22038 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22039 - (eval $ac_try) 2>&5
22041 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22042 - (exit $ac_status); }; } &&
22043 - { ac_try='test -s conftest.$ac_objext'
22044 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22045 - (eval $ac_try) 2>&5
22047 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22048 - (exit $ac_status); }; }; then
22049 - ac_cv_header_stdc=yes
22051 +if test -z "$ac_cv_prog_CC"; then
22053 + # Extract the first word of "gcc", so it can be a program name with args.
22054 +set dummy gcc; ac_word=$2
22055 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22056 +$as_echo_n "checking for $ac_word... " >&6; }
22057 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
22058 + $as_echo_n "(cached) " >&6
22060 + if test -n "$ac_ct_CC"; then
22061 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
22063 - echo "$as_me: failed program was:" >&5
22064 -sed 's/^/| /' conftest.$ac_ext >&5
22065 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22066 +for as_dir in $PATH
22069 + test -z "$as_dir" && as_dir=.
22070 + for ac_exec_ext in '' $ac_executable_extensions; do
22071 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22072 + ac_cv_prog_ac_ct_CC="gcc"
22073 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22080 -ac_cv_header_stdc=no
22082 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
22084 -if test $ac_cv_header_stdc = yes; then
22085 - # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
22086 - cat >conftest.$ac_ext <<_ACEOF
22089 -cat confdefs.h >>conftest.$ac_ext
22090 -cat >>conftest.$ac_ext <<_ACEOF
22091 -/* end confdefs.h. */
22092 -#include <string.h>
22095 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
22096 - $EGREP "memchr" >/dev/null 2>&1; then
22099 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
22100 +if test -n "$ac_ct_CC"; then
22101 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
22102 +$as_echo "$ac_ct_CC" >&6; }
22104 - ac_cv_header_stdc=no
22105 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22106 +$as_echo "no" >&6; }
22110 + if test "x$ac_ct_CC" = x; then
22113 + case $cross_compiling:$ac_tool_warned in
22115 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
22116 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
22117 +ac_tool_warned=yes ;;
22122 + CC="$ac_cv_prog_CC"
22125 -if test $ac_cv_header_stdc = yes; then
22126 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
22127 - cat >conftest.$ac_ext <<_ACEOF
22130 -cat confdefs.h >>conftest.$ac_ext
22131 -cat >>conftest.$ac_ext <<_ACEOF
22132 -/* end confdefs.h. */
22133 -#include <stdlib.h>
22134 +if test -z "$CC"; then
22135 + if test -n "$ac_tool_prefix"; then
22136 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
22137 +set dummy ${ac_tool_prefix}cc; ac_word=$2
22138 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22139 +$as_echo_n "checking for $ac_word... " >&6; }
22140 +if ${ac_cv_prog_CC+:} false; then :
22141 + $as_echo_n "(cached) " >&6
22143 + if test -n "$CC"; then
22144 + ac_cv_prog_CC="$CC" # Let the user override the test.
22146 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22147 +for as_dir in $PATH
22150 + test -z "$as_dir" && as_dir=.
22151 + for ac_exec_ext in '' $ac_executable_extensions; do
22152 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22153 + ac_cv_prog_CC="${ac_tool_prefix}cc"
22154 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22162 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
22163 - $EGREP "free" >/dev/null 2>&1; then
22168 +if test -n "$CC"; then
22169 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22170 +$as_echo "$CC" >&6; }
22172 - ac_cv_header_stdc=no
22173 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22174 +$as_echo "no" >&6; }
22180 -if test $ac_cv_header_stdc = yes; then
22181 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
22182 - if test "$cross_compiling" = yes; then
22186 +if test -z "$CC"; then
22187 + # Extract the first word of "cc", so it can be a program name with args.
22188 +set dummy cc; ac_word=$2
22189 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22190 +$as_echo_n "checking for $ac_word... " >&6; }
22191 +if ${ac_cv_prog_CC+:} false; then :
22192 + $as_echo_n "(cached) " >&6
22194 - cat >conftest.$ac_ext <<_ACEOF
22197 -cat confdefs.h >>conftest.$ac_ext
22198 -cat >>conftest.$ac_ext <<_ACEOF
22199 -/* end confdefs.h. */
22200 -#include <ctype.h>
22201 -#if ((' ' & 0x0FF) == 0x020)
22202 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
22203 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
22205 -# define ISLOWER(c) \
22206 - (('a' <= (c) && (c) <= 'i') \
22207 - || ('j' <= (c) && (c) <= 'r') \
22208 - || ('s' <= (c) && (c) <= 'z'))
22209 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
22212 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
22217 - for (i = 0; i < 256; i++)
22218 - if (XOR (islower (i), ISLOWER (i))
22219 - || toupper (i) != TOUPPER (i))
22224 -rm -f conftest$ac_exeext
22225 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
22226 - (eval $ac_link) 2>&5
22228 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22229 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
22230 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22231 - (eval $ac_try) 2>&5
22233 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22234 - (exit $ac_status); }; }; then
22236 + if test -n "$CC"; then
22237 + ac_cv_prog_CC="$CC" # Let the user override the test.
22239 - echo "$as_me: program exited with status $ac_status" >&5
22240 -echo "$as_me: failed program was:" >&5
22241 -sed 's/^/| /' conftest.$ac_ext >&5
22242 + ac_prog_rejected=no
22243 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22244 +for as_dir in $PATH
22247 + test -z "$as_dir" && as_dir=.
22248 + for ac_exec_ext in '' $ac_executable_extensions; do
22249 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22250 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
22251 + ac_prog_rejected=yes
22254 + ac_cv_prog_CC="cc"
22255 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22262 -( exit $ac_status )
22263 -ac_cv_header_stdc=no
22264 +if test $ac_prog_rejected = yes; then
22265 + # We found a bogon in the path, so make sure we never use it.
22266 + set dummy $ac_cv_prog_CC
22268 + if test $# != 0; then
22269 + # We chose a different compiler from the bogus one.
22270 + # However, it has the same basename, so the bogon will be chosen
22271 + # first if we set CC to just the basename; use the full file name.
22273 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
22276 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
22280 +if test -n "$CC"; then
22281 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22282 +$as_echo "$CC" >&6; }
22284 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22285 +$as_echo "no" >&6; }
22287 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
22288 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
22289 -if test $ac_cv_header_stdc = yes; then
22291 -cat >>confdefs.h <<\_ACEOF
22292 -#define STDC_HEADERS 1
22296 +if test -z "$CC"; then
22297 + if test -n "$ac_tool_prefix"; then
22298 + for ac_prog in cl.exe
22300 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
22301 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
22302 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22303 +$as_echo_n "checking for $ac_word... " >&6; }
22304 +if ${ac_cv_prog_CC+:} false; then :
22305 + $as_echo_n "(cached) " >&6
22307 + if test -n "$CC"; then
22308 + ac_cv_prog_CC="$CC" # Let the user override the test.
22310 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22311 +for as_dir in $PATH
22314 + test -z "$as_dir" && as_dir=.
22315 + for ac_exec_ext in '' $ac_executable_extensions; do
22316 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22317 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
22318 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22328 +if test -n "$CC"; then
22329 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22330 +$as_echo "$CC" >&6; }
22332 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22333 +$as_echo "no" >&6; }
22339 -for ac_header in unistd.h locale.h sys/ioctl.h iconv.h
22341 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
22342 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
22343 - echo "$as_me:$LINENO: checking for $ac_header" >&5
22344 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
22345 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
22346 - echo $ECHO_N "(cached) $ECHO_C" >&6
22347 + test -n "$CC" && break
22350 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
22351 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
22352 +if test -z "$CC"; then
22354 + for ac_prog in cl.exe
22356 + # Extract the first word of "$ac_prog", so it can be a program name with args.
22357 +set dummy $ac_prog; ac_word=$2
22358 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22359 +$as_echo_n "checking for $ac_word... " >&6; }
22360 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
22361 + $as_echo_n "(cached) " >&6
22363 - # Is the header compilable?
22364 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
22365 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
22366 -cat >conftest.$ac_ext <<_ACEOF
22369 -cat confdefs.h >>conftest.$ac_ext
22370 -cat >>conftest.$ac_ext <<_ACEOF
22371 -/* end confdefs.h. */
22372 -$ac_includes_default
22373 -#include <$ac_header>
22375 -rm -f conftest.$ac_objext
22376 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
22377 - (eval $ac_compile) 2>conftest.er1
22379 - grep -v '^ *+' conftest.er1 >conftest.err
22380 - rm -f conftest.er1
22381 - cat conftest.err >&5
22382 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22383 - (exit $ac_status); } &&
22384 - { ac_try='test -z "$ac_c_werror_flag"
22385 - || test ! -s conftest.err'
22386 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22387 - (eval $ac_try) 2>&5
22389 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22390 - (exit $ac_status); }; } &&
22391 - { ac_try='test -s conftest.$ac_objext'
22392 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22393 - (eval $ac_try) 2>&5
22395 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22396 - (exit $ac_status); }; }; then
22397 - ac_header_compiler=yes
22398 + if test -n "$ac_ct_CC"; then
22399 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
22401 - echo "$as_me: failed program was:" >&5
22402 -sed 's/^/| /' conftest.$ac_ext >&5
22403 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22404 +for as_dir in $PATH
22407 + test -z "$as_dir" && as_dir=.
22408 + for ac_exec_ext in '' $ac_executable_extensions; do
22409 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
22410 + ac_cv_prog_ac_ct_CC="$ac_prog"
22411 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22418 -ac_header_compiler=no
22420 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
22421 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
22422 -echo "${ECHO_T}$ac_header_compiler" >&6
22424 -# Is the header present?
22425 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
22426 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
22427 -cat >conftest.$ac_ext <<_ACEOF
22430 -cat confdefs.h >>conftest.$ac_ext
22431 -cat >>conftest.$ac_ext <<_ACEOF
22432 -/* end confdefs.h. */
22433 -#include <$ac_header>
22435 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
22436 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
22438 - grep -v '^ *+' conftest.er1 >conftest.err
22439 - rm -f conftest.er1
22440 - cat conftest.err >&5
22441 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22442 - (exit $ac_status); } >/dev/null; then
22443 - if test -s conftest.err; then
22444 - ac_cpp_err=$ac_c_preproc_warn_flag
22445 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
22452 -if test -z "$ac_cpp_err"; then
22453 - ac_header_preproc=yes
22454 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
22455 +if test -n "$ac_ct_CC"; then
22456 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
22457 +$as_echo "$ac_ct_CC" >&6; }
22459 - echo "$as_me: failed program was:" >&5
22460 -sed 's/^/| /' conftest.$ac_ext >&5
22462 - ac_header_preproc=no
22463 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22464 +$as_echo "no" >&6; }
22466 -rm -f conftest.err conftest.$ac_ext
22467 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
22468 -echo "${ECHO_T}$ac_header_preproc" >&6
22470 -# So? What about this header?
22471 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
22473 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
22474 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
22475 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
22476 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
22477 - ac_header_preproc=yes
22480 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
22481 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
22482 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
22483 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
22484 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
22485 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
22486 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
22487 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
22488 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
22489 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
22490 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
22491 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
22494 -## ------------------------------------------ ##
22495 -## Report this to the AC_PACKAGE_NAME lists. ##
22496 -## ------------------------------------------ ##
22499 - sed "s/^/$as_me: WARNING: /" >&2
22502 + test -n "$ac_ct_CC" && break
22505 + if test "x$ac_ct_CC" = x; then
22508 + case $cross_compiling:$ac_tool_warned in
22510 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
22511 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
22512 +ac_tool_warned=yes ;;
22514 -echo "$as_me:$LINENO: checking for $ac_header" >&5
22515 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
22516 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
22517 - echo $ECHO_N "(cached) $ECHO_C" >&6
22519 - eval "$as_ac_Header=\$ac_header_preproc"
22523 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
22524 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
22527 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
22528 - cat >>confdefs.h <<_ACEOF
22529 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
22535 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22536 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22537 +as_fn_error $? "no acceptable C compiler found in \$PATH
22538 +See \`config.log' for more details" "$LINENO" 5; }
22540 -if test "${ac_cv_header_stdarg_h+set}" = set; then
22541 - echo "$as_me:$LINENO: checking for stdarg.h" >&5
22542 -echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
22543 -if test "${ac_cv_header_stdarg_h+set}" = set; then
22544 - echo $ECHO_N "(cached) $ECHO_C" >&6
22546 -echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
22547 -echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
22549 - # Is the header compilable?
22550 -echo "$as_me:$LINENO: checking stdarg.h usability" >&5
22551 -echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6
22552 -cat >conftest.$ac_ext <<_ACEOF
22555 -cat confdefs.h >>conftest.$ac_ext
22556 -cat >>conftest.$ac_ext <<_ACEOF
22557 -/* end confdefs.h. */
22558 -$ac_includes_default
22559 -#include <stdarg.h>
22561 -rm -f conftest.$ac_objext
22562 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
22563 - (eval $ac_compile) 2>conftest.er1
22565 - grep -v '^ *+' conftest.er1 >conftest.err
22566 - rm -f conftest.er1
22567 - cat conftest.err >&5
22568 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22569 - (exit $ac_status); } &&
22570 - { ac_try='test -z "$ac_c_werror_flag"
22571 - || test ! -s conftest.err'
22572 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22573 - (eval $ac_try) 2>&5
22575 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22576 - (exit $ac_status); }; } &&
22577 - { ac_try='test -s conftest.$ac_objext'
22578 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22579 - (eval $ac_try) 2>&5
22580 +# Provide some information about the compiler.
22581 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
22584 +for ac_option in --version -v -V -qversion; do
22585 + { { ac_try="$ac_compiler $ac_option >&5"
22586 +case "(($ac_try" in
22587 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22588 + *) ac_try_echo=$ac_try;;
22590 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
22591 +$as_echo "$ac_try_echo"; } >&5
22592 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err
22594 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22595 - (exit $ac_status); }; }; then
22596 - ac_header_compiler=yes
22597 + if test -s conftest.err; then
22599 +... rest of stderr output deleted ...
22600 + 10q' conftest.err >conftest.er1
22601 + cat conftest.er1 >&5
22603 + rm -f conftest.er1 conftest.err
22604 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22605 + test $ac_status = 0; }
22608 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
22609 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
22610 +if ${ac_cv_c_compiler_gnu+:} false; then :
22611 + $as_echo_n "(cached) " >&6
22613 - echo "$as_me: failed program was:" >&5
22614 -sed 's/^/| /' conftest.$ac_ext >&5
22615 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22616 +/* end confdefs.h. */
22618 -ac_header_compiler=no
22620 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
22621 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
22622 -echo "${ECHO_T}$ac_header_compiler" >&6
22630 -# Is the header present?
22631 -echo "$as_me:$LINENO: checking stdarg.h presence" >&5
22632 -echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6
22633 -cat >conftest.$ac_ext <<_ACEOF
22636 -cat confdefs.h >>conftest.$ac_ext
22637 -cat >>conftest.$ac_ext <<_ACEOF
22638 -/* end confdefs.h. */
22639 -#include <stdarg.h>
22641 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
22642 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
22644 - grep -v '^ *+' conftest.er1 >conftest.err
22645 - rm -f conftest.er1
22646 - cat conftest.err >&5
22647 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22648 - (exit $ac_status); } >/dev/null; then
22649 - if test -s conftest.err; then
22650 - ac_cpp_err=$ac_c_preproc_warn_flag
22651 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
22659 +if ac_fn_c_try_compile "$LINENO"; then :
22660 + ac_compiler_gnu=yes
22663 + ac_compiler_gnu=no
22665 -if test -z "$ac_cpp_err"; then
22666 - ac_header_preproc=yes
22668 - echo "$as_me: failed program was:" >&5
22669 -sed 's/^/| /' conftest.$ac_ext >&5
22670 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22671 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
22673 - ac_header_preproc=no
22675 -rm -f conftest.err conftest.$ac_ext
22676 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
22677 -echo "${ECHO_T}$ac_header_preproc" >&6
22679 -# So? What about this header?
22680 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
22682 - { echo "$as_me:$LINENO: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&5
22683 -echo "$as_me: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
22684 - { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the compiler's result" >&5
22685 -echo "$as_me: WARNING: stdarg.h: proceeding with the compiler's result" >&2;}
22686 - ac_header_preproc=yes
22689 - { echo "$as_me:$LINENO: WARNING: stdarg.h: present but cannot be compiled" >&5
22690 -echo "$as_me: WARNING: stdarg.h: present but cannot be compiled" >&2;}
22691 - { echo "$as_me:$LINENO: WARNING: stdarg.h: check for missing prerequisite headers?" >&5
22692 -echo "$as_me: WARNING: stdarg.h: check for missing prerequisite headers?" >&2;}
22693 - { echo "$as_me:$LINENO: WARNING: stdarg.h: see the Autoconf documentation" >&5
22694 -echo "$as_me: WARNING: stdarg.h: see the Autoconf documentation" >&2;}
22695 - { echo "$as_me:$LINENO: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&5
22696 -echo "$as_me: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&2;}
22697 - { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the preprocessor's result" >&5
22698 -echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;}
22699 - { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5
22700 -echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;}
22703 -## ------------------------------------------ ##
22704 -## Report this to the AC_PACKAGE_NAME lists. ##
22705 -## ------------------------------------------ ##
22708 - sed "s/^/$as_me: WARNING: /" >&2
22711 -echo "$as_me:$LINENO: checking for stdarg.h" >&5
22712 -echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
22713 -if test "${ac_cv_header_stdarg_h+set}" = set; then
22714 - echo $ECHO_N "(cached) $ECHO_C" >&6
22715 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
22716 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
22717 +if test $ac_compiler_gnu = yes; then
22720 - ac_cv_header_stdarg_h=$ac_header_preproc
22723 -echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
22724 -echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
22725 +ac_test_CFLAGS=${CFLAGS+set}
22726 +ac_save_CFLAGS=$CFLAGS
22727 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
22728 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
22729 +if ${ac_cv_prog_cc_g+:} false; then :
22730 + $as_echo_n "(cached) " >&6
22732 + ac_save_c_werror_flag=$ac_c_werror_flag
22733 + ac_c_werror_flag=yes
22734 + ac_cv_prog_cc_g=no
22736 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22737 +/* end confdefs.h. */
22740 -if test $ac_cv_header_stdarg_h = yes; then
22745 -cat >>confdefs.h <<\_ACEOF
22746 -#define HAVE_STDARG_H 1
22752 +if ac_fn_c_try_compile "$LINENO"; then :
22753 + ac_cv_prog_cc_g=yes
22755 - { { echo "$as_me:$LINENO: error: *** stdarg.h is missing on your system ***" >&5
22756 -echo "$as_me: error: *** stdarg.h is missing on your system ***" >&2;}
22757 - { (exit 1); exit 1; }; }
22760 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22761 +/* end confdefs.h. */
22771 +if ac_fn_c_try_compile "$LINENO"; then :
22773 -echo "$as_me:$LINENO: checking for working strcoll" >&5
22774 -echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
22775 -if test "${ac_cv_func_strcoll_works+set}" = set; then
22776 - echo $ECHO_N "(cached) $ECHO_C" >&6
22778 - if test "$cross_compiling" = yes; then
22779 - ac_cv_func_strcoll_works=no
22781 - cat >conftest.$ac_ext <<_ACEOF
22784 -cat confdefs.h >>conftest.$ac_ext
22785 -cat >>conftest.$ac_ext <<_ACEOF
22786 + ac_c_werror_flag=$ac_save_c_werror_flag
22788 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22789 /* end confdefs.h. */
22790 -$ac_includes_default
22795 -exit (strcoll ("abc", "def") >= 0 ||
22796 - strcoll ("ABC", "DEF") >= 0 ||
22797 - strcoll ("123", "456") >= 0)
22803 -rm -f conftest$ac_exeext
22804 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
22805 - (eval $ac_link) 2>&5
22807 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22808 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
22809 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
22810 - (eval $ac_try) 2>&5
22812 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
22813 - (exit $ac_status); }; }; then
22814 - ac_cv_func_strcoll_works=yes
22816 - echo "$as_me: program exited with status $ac_status" >&5
22817 -echo "$as_me: failed program was:" >&5
22818 -sed 's/^/| /' conftest.$ac_ext >&5
22820 -( exit $ac_status )
22821 -ac_cv_func_strcoll_works=no
22822 +if ac_fn_c_try_compile "$LINENO"; then :
22823 + ac_cv_prog_cc_g=yes
22825 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
22826 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22828 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22830 -echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
22831 -echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
22832 -if test $ac_cv_func_strcoll_works = yes; then
22833 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22834 + ac_c_werror_flag=$ac_save_c_werror_flag
22836 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
22837 +$as_echo "$ac_cv_prog_cc_g" >&6; }
22838 +if test "$ac_test_CFLAGS" = set; then
22839 + CFLAGS=$ac_save_CFLAGS
22840 +elif test $ac_cv_prog_cc_g = yes; then
22841 + if test "$GCC" = yes; then
22847 + if test "$GCC" = yes; then
22853 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
22854 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
22855 +if ${ac_cv_prog_cc_c89+:} false; then :
22856 + $as_echo_n "(cached) " >&6
22858 + ac_cv_prog_cc_c89=no
22860 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22861 +/* end confdefs.h. */
22862 +#include <stdarg.h>
22863 +#include <stdio.h>
22865 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
22866 +struct buf { int x; };
22867 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
22868 +static char *e (p, i)
22874 +static char *f (char * (*g) (char **, int), char **p, ...)
22879 + s = g (p, va_arg (v,int));
22884 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
22885 + function prototypes and stuff, but not '\xHH' hex character constants.
22886 + These don't provoke an error unfortunately, instead are silently treated
22887 + as 'x'. The following induces an error, until -std is added to get
22888 + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
22889 + array size at least. It's necessary to write '\x00'==0 to get something
22890 + that's true only with -std. */
22891 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
22893 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
22894 + inside strings and character constants. */
22895 +#define FOO(x) 'x'
22896 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
22898 -cat >>confdefs.h <<\_ACEOF
22899 -#define HAVE_STRCOLL 1
22900 +int test (int i, double x);
22901 +struct s1 {int (*f) (int a);};
22902 +struct s2 {int (*f) (double a);};
22903 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
22909 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
22914 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
22915 + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
22917 + CC="$ac_save_CC $ac_arg"
22918 + if ac_fn_c_try_compile "$LINENO"; then :
22919 + ac_cv_prog_cc_c89=$ac_arg
22921 +rm -f core conftest.err conftest.$ac_objext
22922 + test "x$ac_cv_prog_cc_c89" != "xno" && break
22924 +rm -f conftest.$ac_ext
22929 +case "x$ac_cv_prog_cc_c89" in
22931 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
22932 +$as_echo "none needed" >&6; } ;;
22934 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
22935 +$as_echo "unsupported" >&6; } ;;
22937 + CC="$CC $ac_cv_prog_cc_c89"
22938 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
22939 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
22941 +if test "x$ac_cv_prog_cc_c89" != xno; then :
22945 -for ac_func in setlocale
22947 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
22948 -echo "$as_me:$LINENO: checking for $ac_func" >&5
22949 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
22950 -if eval "test \"\${$as_ac_var+set}\" = set"; then
22951 - echo $ECHO_N "(cached) $ECHO_C" >&6
22953 +ac_cpp='$CPP $CPPFLAGS'
22954 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
22955 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
22956 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
22958 +depcc="$CC" am_compiler_list=
22960 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
22961 +$as_echo_n "checking dependency style of $depcc... " >&6; }
22962 +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
22963 + $as_echo_n "(cached) " >&6
22965 - cat >conftest.$ac_ext <<_ACEOF
22968 -cat confdefs.h >>conftest.$ac_ext
22969 -cat >>conftest.$ac_ext <<_ACEOF
22970 -/* end confdefs.h. */
22971 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
22972 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
22973 -#define $ac_func innocuous_$ac_func
22974 + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
22975 + # We make a subdir and do the tests there. Otherwise we can end up
22976 + # making bogus files that we don't know about and never remove. For
22977 + # instance it was reported that on HP-UX the gcc test will end up
22978 + # making a dummy file named `D' -- because `-MD' means `put the output
22980 + rm -rf conftest.dir
22981 + mkdir conftest.dir
22982 + # Copy depcomp to subdir because otherwise we won't find it if we're
22983 + # using a relative directory.
22984 + cp "$am_depcomp" conftest.dir
22986 + # We will build objects and dependencies in a subdirectory because
22987 + # it helps to detect inapplicable dependency modes. For instance
22988 + # both Tru64's cc and ICC support -MD to output dependencies as a
22989 + # side effect of compilation, but ICC will put the dependencies in
22990 + # the current directory while Tru64 will put them in the object
22994 -/* System header to define __stub macros and hopefully few prototypes,
22995 - which can conflict with char $ac_func (); below.
22996 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
22997 - <limits.h> exists even on freestanding compilers. */
22998 + am_cv_CC_dependencies_compiler_type=none
22999 + if test "$am_compiler_list" = ""; then
23000 + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
23002 + am__universal=false
23003 + case " $depcc " in #(
23004 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
23008 -# include <limits.h>
23010 -# include <assert.h>
23012 + for depmode in $am_compiler_list; do
23013 + # Setup a source with many dependencies, because some compilers
23014 + # like to wrap large dependency lists on column 80 (with \), and
23015 + # we should not choose a depcomp mode which is confused by this.
23017 + # We need to recreate these files for each test, as the compiler may
23018 + # overwrite some of them when testing with obscure command lines.
23019 + # This happens at least with the AIX C compiler.
23020 + : > sub/conftest.c
23021 + for i in 1 2 3 4 5 6; do
23022 + echo '#include "conftst'$i'.h"' >> sub/conftest.c
23023 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
23024 + # Solaris 8's {/usr,}/bin/sh.
23025 + touch sub/conftst$i.h
23027 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
23029 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
23030 + # mode. It turns out that the SunPro C++ compiler does not properly
23031 + # handle `-M -o', and we need to detect this. Also, some Intel
23032 + # versions had trouble with output in subdirs
23033 + am__obj=sub/conftest.${OBJEXT-o}
23034 + am__minus_obj="-o $am__obj"
23037 + # This depmode causes a compiler race in universal mode.
23038 + test "$am__universal" = false || continue
23041 + # after this tag, mechanisms are not by side-effect, so they'll
23042 + # only be used when explicitly requested
23043 + if test "x$enable_dependency_tracking" = xyes; then
23049 + msvc7 | msvc7msys | msvisualcpp | msvcmsys)
23050 + # This compiler won't grok `-c -o', but also, the minuso test has
23051 + # not run yet. These depmodes are late enough in the game, and
23052 + # so weak that their functioning should not be impacted.
23053 + am__obj=conftest.${OBJEXT-o}
23058 + if depmode=$depmode \
23059 + source=sub/conftest.c object=$am__obj \
23060 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
23061 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
23062 + >/dev/null 2>conftest.err &&
23063 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
23064 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
23065 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
23066 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
23067 + # icc doesn't choke on unknown options, it will just issue warnings
23068 + # or remarks (even with -Werror). So we grep stderr for any message
23069 + # that says an option was ignored or not supported.
23070 + # When given -MP, icc 7.0 and 7.1 complain thusly:
23071 + # icc: Command line warning: ignoring option '-M'; no argument required
23072 + # The diagnosis changed in icc 8.0:
23073 + # icc: Command line remark: option '-MP' not supported
23074 + if (grep 'ignoring option' conftest.err ||
23075 + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
23076 + am_cv_CC_dependencies_compiler_type=$depmode
23083 + rm -rf conftest.dir
23085 + am_cv_CC_dependencies_compiler_type=none
23090 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
23091 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
23092 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
23094 -/* Override any gcc2 internal prototype to avoid an error. */
23095 -#ifdef __cplusplus
23099 -/* We use char because int might match the return type of a gcc2
23101 + test "x$enable_dependency_tracking" != xno \
23102 + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
23103 + am__fastdepCC_TRUE=
23104 + am__fastdepCC_FALSE='#'
23106 + am__fastdepCC_TRUE='#'
23107 + am__fastdepCC_FALSE=
23111 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
23112 +$as_echo_n "checking for library containing strerror... " >&6; }
23113 +if ${ac_cv_search_strerror+:} false; then :
23114 + $as_echo_n "(cached) " >&6
23116 + ac_func_search_save_LIBS=$LIBS
23117 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23118 +/* end confdefs.h. */
23120 +/* Override any GCC internal prototype to avoid an error.
23121 + Use char because int might match the return type of a GCC
23122 builtin and then its argument prototype would still apply. */
23124 -/* The GNU C library defines this for functions which it implements
23125 - to always fail with ENOSYS. Some functions are actually named
23126 - something starting with __ and the normal name is an alias. */
23127 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
23130 -char (*f) () = $ac_func;
23141 -return f != $ac_func;
23142 +return strerror ();
23147 -rm -f conftest.$ac_objext conftest$ac_exeext
23148 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
23149 - (eval $ac_link) 2>conftest.er1
23151 - grep -v '^ *+' conftest.er1 >conftest.err
23152 - rm -f conftest.er1
23153 - cat conftest.err >&5
23154 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23155 - (exit $ac_status); } &&
23156 - { ac_try='test -z "$ac_c_werror_flag"
23157 - || test ! -s conftest.err'
23158 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23159 - (eval $ac_try) 2>&5
23161 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23162 - (exit $ac_status); }; } &&
23163 - { ac_try='test -s conftest$ac_exeext'
23164 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23165 - (eval $ac_try) 2>&5
23167 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23168 - (exit $ac_status); }; }; then
23169 - eval "$as_ac_var=yes"
23170 +for ac_lib in '' cposix; do
23171 + if test -z "$ac_lib"; then
23172 + ac_res="none required"
23175 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
23177 + if ac_fn_c_try_link "$LINENO"; then :
23178 + ac_cv_search_strerror=$ac_res
23180 +rm -f core conftest.err conftest.$ac_objext \
23181 + conftest$ac_exeext
23182 + if ${ac_cv_search_strerror+:} false; then :
23186 +if ${ac_cv_search_strerror+:} false; then :
23189 - echo "$as_me: failed program was:" >&5
23190 -sed 's/^/| /' conftest.$ac_ext >&5
23191 + ac_cv_search_strerror=no
23193 +rm conftest.$ac_ext
23194 +LIBS=$ac_func_search_save_LIBS
23196 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
23197 +$as_echo "$ac_cv_search_strerror" >&6; }
23198 +ac_res=$ac_cv_search_strerror
23199 +if test "$ac_res" != no; then :
23200 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
23204 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5
23205 +$as_echo_n "checking for function prototypes... " >&6; }
23206 +if test "$ac_cv_prog_cc_c89" != no; then
23207 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
23208 +$as_echo "yes" >&6; }
23210 +$as_echo "#define PROTOTYPES 1" >>confdefs.h
23213 -eval "$as_ac_var=no"
23214 +$as_echo "#define __PROTOTYPES 1" >>confdefs.h
23217 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23218 +$as_echo "no" >&6; }
23220 -rm -f conftest.err conftest.$ac_objext \
23221 - conftest$ac_exeext conftest.$ac_ext
23225 +if test "$ac_cv_prog_cc_stdc" != no; then
23228 + U=_ ANSI2KNR=./ansi2knr
23230 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
23231 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
23232 -if test `eval echo '${'$as_ac_var'}'` = yes; then
23233 +# Ensure some checks needed by ansi2knr itself.
23235 +for ac_header in string.h
23237 + ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
23238 +if test "x$ac_cv_header_string_h" = xyes; then :
23239 cat >>confdefs.h <<_ACEOF
23240 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
23241 +#define HAVE_STRING_H 1
23249 -ac_widec_funcs=yes
23250 -if test "${ac_cv_header_wchar_h+set}" = set; then
23251 - echo "$as_me:$LINENO: checking for wchar.h" >&5
23252 -echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6
23253 -if test "${ac_cv_header_wchar_h+set}" = set; then
23254 - echo $ECHO_N "(cached) $ECHO_C" >&6
23255 +if test "x$U" != "x"; then
23256 + as_fn_error $? "Compiler not ANSI compliant" "$LINENO" 5
23258 -echo "$as_me:$LINENO: result: $ac_cv_header_wchar_h" >&5
23259 -echo "${ECHO_T}$ac_cv_header_wchar_h" >&6
23260 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
23261 +$as_echo_n "checking for inline... " >&6; }
23262 +if ${ac_cv_c_inline+:} false; then :
23263 + $as_echo_n "(cached) " >&6
23265 - # Is the header compilable?
23266 -echo "$as_me:$LINENO: checking wchar.h usability" >&5
23267 -echo $ECHO_N "checking wchar.h usability... $ECHO_C" >&6
23268 -cat >conftest.$ac_ext <<_ACEOF
23271 -cat confdefs.h >>conftest.$ac_ext
23272 -cat >>conftest.$ac_ext <<_ACEOF
23273 + ac_cv_c_inline=no
23274 +for ac_kw in inline __inline__ __inline; do
23275 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23276 /* end confdefs.h. */
23277 -$ac_includes_default
23278 -#include <wchar.h>
23280 -rm -f conftest.$ac_objext
23281 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
23282 - (eval $ac_compile) 2>conftest.er1
23284 - grep -v '^ *+' conftest.er1 >conftest.err
23285 - rm -f conftest.er1
23286 - cat conftest.err >&5
23287 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23288 - (exit $ac_status); } &&
23289 - { ac_try='test -z "$ac_c_werror_flag"
23290 - || test ! -s conftest.err'
23291 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23292 - (eval $ac_try) 2>&5
23294 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23295 - (exit $ac_status); }; } &&
23296 - { ac_try='test -s conftest.$ac_objext'
23297 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23298 - (eval $ac_try) 2>&5
23300 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23301 - (exit $ac_status); }; }; then
23302 - ac_header_compiler=yes
23304 - echo "$as_me: failed program was:" >&5
23305 -sed 's/^/| /' conftest.$ac_ext >&5
23307 -ac_header_compiler=no
23309 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
23310 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
23311 -echo "${ECHO_T}$ac_header_compiler" >&6
23312 +#ifndef __cplusplus
23313 +typedef int foo_t;
23314 +static $ac_kw foo_t static_foo () {return 0; }
23315 +$ac_kw foo_t foo () {return 0; }
23318 -# Is the header present?
23319 -echo "$as_me:$LINENO: checking wchar.h presence" >&5
23320 -echo $ECHO_N "checking wchar.h presence... $ECHO_C" >&6
23321 -cat >conftest.$ac_ext <<_ACEOF
23324 -cat confdefs.h >>conftest.$ac_ext
23325 -cat >>conftest.$ac_ext <<_ACEOF
23326 -/* end confdefs.h. */
23327 -#include <wchar.h>
23329 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
23330 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
23332 - grep -v '^ *+' conftest.er1 >conftest.err
23333 - rm -f conftest.er1
23334 - cat conftest.err >&5
23335 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23336 - (exit $ac_status); } >/dev/null; then
23337 - if test -s conftest.err; then
23338 - ac_cpp_err=$ac_c_preproc_warn_flag
23339 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
23345 +if ac_fn_c_try_compile "$LINENO"; then :
23346 + ac_cv_c_inline=$ac_kw
23348 -if test -z "$ac_cpp_err"; then
23349 - ac_header_preproc=yes
23351 - echo "$as_me: failed program was:" >&5
23352 -sed 's/^/| /' conftest.$ac_ext >&5
23353 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
23354 + test "$ac_cv_c_inline" != no && break
23357 - ac_header_preproc=no
23359 -rm -f conftest.err conftest.$ac_ext
23360 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
23361 -echo "${ECHO_T}$ac_header_preproc" >&6
23362 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
23363 +$as_echo "$ac_cv_c_inline" >&6; }
23365 -# So? What about this header?
23366 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
23368 - { echo "$as_me:$LINENO: WARNING: wchar.h: accepted by the compiler, rejected by the preprocessor!" >&5
23369 -echo "$as_me: WARNING: wchar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
23370 - { echo "$as_me:$LINENO: WARNING: wchar.h: proceeding with the compiler's result" >&5
23371 -echo "$as_me: WARNING: wchar.h: proceeding with the compiler's result" >&2;}
23372 - ac_header_preproc=yes
23375 - { echo "$as_me:$LINENO: WARNING: wchar.h: present but cannot be compiled" >&5
23376 -echo "$as_me: WARNING: wchar.h: present but cannot be compiled" >&2;}
23377 - { echo "$as_me:$LINENO: WARNING: wchar.h: check for missing prerequisite headers?" >&5
23378 -echo "$as_me: WARNING: wchar.h: check for missing prerequisite headers?" >&2;}
23379 - { echo "$as_me:$LINENO: WARNING: wchar.h: see the Autoconf documentation" >&5
23380 -echo "$as_me: WARNING: wchar.h: see the Autoconf documentation" >&2;}
23381 - { echo "$as_me:$LINENO: WARNING: wchar.h: section \"Present But Cannot Be Compiled\"" >&5
23382 -echo "$as_me: WARNING: wchar.h: section \"Present But Cannot Be Compiled\"" >&2;}
23383 - { echo "$as_me:$LINENO: WARNING: wchar.h: proceeding with the preprocessor's result" >&5
23384 -echo "$as_me: WARNING: wchar.h: proceeding with the preprocessor's result" >&2;}
23385 - { echo "$as_me:$LINENO: WARNING: wchar.h: in the future, the compiler will take precedence" >&5
23386 -echo "$as_me: WARNING: wchar.h: in the future, the compiler will take precedence" >&2;}
23389 -## ------------------------------------------ ##
23390 -## Report this to the AC_PACKAGE_NAME lists. ##
23391 -## ------------------------------------------ ##
23394 - sed "s/^/$as_me: WARNING: /" >&2
23395 +case $ac_cv_c_inline in
23398 + case $ac_cv_c_inline in
23400 + *) ac_val=$ac_cv_c_inline;;
23402 + cat >>confdefs.h <<_ACEOF
23403 +#ifndef __cplusplus
23404 +#define inline $ac_val
23409 -echo "$as_me:$LINENO: checking for wchar.h" >&5
23410 -echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6
23411 -if test "${ac_cv_header_wchar_h+set}" = set; then
23412 - echo $ECHO_N "(cached) $ECHO_C" >&6
23415 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
23416 +$as_echo_n "checking for ANSI C header files... " >&6; }
23417 +if ${ac_cv_header_stdc+:} false; then :
23418 + $as_echo_n "(cached) " >&6
23420 - ac_cv_header_wchar_h=$ac_header_preproc
23422 -echo "$as_me:$LINENO: result: $ac_cv_header_wchar_h" >&5
23423 -echo "${ECHO_T}$ac_cv_header_wchar_h" >&6
23424 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23425 +/* end confdefs.h. */
23426 +#include <stdlib.h>
23427 +#include <stdarg.h>
23428 +#include <string.h>
23429 +#include <float.h>
23439 +if ac_fn_c_try_compile "$LINENO"; then :
23440 + ac_cv_header_stdc=yes
23442 + ac_cv_header_stdc=no
23444 -if test $ac_cv_header_wchar_h = yes; then
23445 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
23447 - ac_have_wchar_h=yes
23448 +if test $ac_cv_header_stdc = yes; then
23449 + # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
23450 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23451 +/* end confdefs.h. */
23452 +#include <string.h>
23454 -cat >>confdefs.h <<\_ACEOF
23455 -#define HAVE_WCHAR_H 1
23457 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
23458 + $EGREP "memchr" >/dev/null 2>&1; then :
23461 - ac_have_wchar_h=no
23462 + ac_cv_header_stdc=no
23468 +if test $ac_cv_header_stdc = yes; then
23469 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
23470 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23471 +/* end confdefs.h. */
23472 +#include <stdlib.h>
23475 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
23476 + $EGREP "free" >/dev/null 2>&1; then :
23479 + ac_cv_header_stdc=no
23485 -for ac_func in mbtowc wcwidth mbrtowc mbsinit
23487 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
23488 -echo "$as_me:$LINENO: checking for $ac_func" >&5
23489 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
23490 -if eval "test \"\${$as_ac_var+set}\" = set"; then
23491 - echo $ECHO_N "(cached) $ECHO_C" >&6
23492 +if test $ac_cv_header_stdc = yes; then
23493 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
23494 + if test "$cross_compiling" = yes; then :
23497 - cat >conftest.$ac_ext <<_ACEOF
23500 -cat confdefs.h >>conftest.$ac_ext
23501 -cat >>conftest.$ac_ext <<_ACEOF
23502 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23503 /* end confdefs.h. */
23504 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
23505 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
23506 -#define $ac_func innocuous_$ac_func
23508 -/* System header to define __stub macros and hopefully few prototypes,
23509 - which can conflict with char $ac_func (); below.
23510 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
23511 - <limits.h> exists even on freestanding compilers. */
23514 -# include <limits.h>
23516 -# include <assert.h>
23521 -/* Override any gcc2 internal prototype to avoid an error. */
23522 -#ifdef __cplusplus
23526 -/* We use char because int might match the return type of a gcc2
23527 - builtin and then its argument prototype would still apply. */
23529 -/* The GNU C library defines this for functions which it implements
23530 - to always fail with ENOSYS. Some functions are actually named
23531 - something starting with __ and the normal name is an alias. */
23532 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
23534 +#include <ctype.h>
23535 +#include <stdlib.h>
23536 +#if ((' ' & 0x0FF) == 0x020)
23537 +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
23538 +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
23540 -char (*f) () = $ac_func;
23542 -#ifdef __cplusplus
23544 +# define ISLOWER(c) \
23545 + (('a' <= (c) && (c) <= 'i') \
23546 + || ('j' <= (c) && (c) <= 'r') \
23547 + || ('s' <= (c) && (c) <= 'z'))
23548 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
23551 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
23555 -return f != $ac_func;
23558 + for (i = 0; i < 256; i++)
23559 + if (XOR (islower (i), ISLOWER (i))
23560 + || toupper (i) != TOUPPER (i))
23565 -rm -f conftest.$ac_objext conftest$ac_exeext
23566 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
23567 - (eval $ac_link) 2>conftest.er1
23569 - grep -v '^ *+' conftest.er1 >conftest.err
23570 - rm -f conftest.er1
23571 - cat conftest.err >&5
23572 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23573 - (exit $ac_status); } &&
23574 - { ac_try='test -z "$ac_c_werror_flag"
23575 - || test ! -s conftest.err'
23576 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23577 - (eval $ac_try) 2>&5
23579 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23580 - (exit $ac_status); }; } &&
23581 - { ac_try='test -s conftest$ac_exeext'
23582 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23583 - (eval $ac_try) 2>&5
23585 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23586 - (exit $ac_status); }; }; then
23587 - eval "$as_ac_var=yes"
23588 +if ac_fn_c_try_run "$LINENO"; then :
23591 - echo "$as_me: failed program was:" >&5
23592 -sed 's/^/| /' conftest.$ac_ext >&5
23593 + ac_cv_header_stdc=no
23595 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
23596 + conftest.$ac_objext conftest.beam conftest.$ac_ext
23599 -eval "$as_ac_var=no"
23601 -rm -f conftest.err conftest.$ac_objext \
23602 - conftest$ac_exeext conftest.$ac_ext
23604 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
23605 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
23606 -if test `eval echo '${'$as_ac_var'}'` = yes; then
23607 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
23608 +$as_echo "$ac_cv_header_stdc" >&6; }
23609 +if test $ac_cv_header_stdc = yes; then
23611 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
23615 +for ac_header in unistd.h locale.h sys/ioctl.h iconv.h
23617 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
23618 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
23619 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
23620 cat >>confdefs.h <<_ACEOF
23621 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
23622 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
23626 - ac_widec_funcs=no
23631 -echo "$as_me:$LINENO: checking whether wcwidth is declared" >&5
23632 -echo $ECHO_N "checking whether wcwidth is declared... $ECHO_C" >&6
23633 -if test "${ac_cv_have_decl_wcwidth+set}" = set; then
23634 - echo $ECHO_N "(cached) $ECHO_C" >&6
23635 +ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
23636 +if test "x$ac_cv_header_stdarg_h" = xyes; then :
23638 +$as_echo "#define HAVE_STDARG_H 1" >>confdefs.h
23641 - cat >conftest.$ac_ext <<_ACEOF
23644 -cat confdefs.h >>conftest.$ac_ext
23645 -cat >>conftest.$ac_ext <<_ACEOF
23646 + as_fn_error $? "*** stdarg.h is missing on your system ***" "$LINENO" 5
23650 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
23651 +$as_echo_n "checking for working strcoll... " >&6; }
23652 +if ${ac_cv_func_strcoll_works+:} false; then :
23653 + $as_echo_n "(cached) " >&6
23655 + if test "$cross_compiling" = yes; then :
23656 + ac_cv_func_strcoll_works=no
23658 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23659 /* end confdefs.h. */
23660 $ac_includes_default
23665 - char *p = (char *) wcwidth;
23668 +return (strcoll ("abc", "def") >= 0 ||
23669 + strcoll ("ABC", "DEF") >= 0 ||
23670 + strcoll ("123", "456") >= 0)
23675 -rm -f conftest.$ac_objext
23676 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
23677 - (eval $ac_compile) 2>conftest.er1
23679 - grep -v '^ *+' conftest.er1 >conftest.err
23680 - rm -f conftest.er1
23681 - cat conftest.err >&5
23682 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23683 - (exit $ac_status); } &&
23684 - { ac_try='test -z "$ac_c_werror_flag"
23685 - || test ! -s conftest.err'
23686 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23687 - (eval $ac_try) 2>&5
23689 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23690 - (exit $ac_status); }; } &&
23691 - { ac_try='test -s conftest.$ac_objext'
23692 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23693 - (eval $ac_try) 2>&5
23695 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23696 - (exit $ac_status); }; }; then
23697 - ac_cv_have_decl_wcwidth=yes
23698 +if ac_fn_c_try_run "$LINENO"; then :
23699 + ac_cv_func_strcoll_works=yes
23701 - echo "$as_me: failed program was:" >&5
23702 -sed 's/^/| /' conftest.$ac_ext >&5
23704 -ac_cv_have_decl_wcwidth=no
23705 + ac_cv_func_strcoll_works=no
23707 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
23708 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
23709 + conftest.$ac_objext conftest.beam conftest.$ac_ext
23711 -echo "$as_me:$LINENO: result: $ac_cv_have_decl_wcwidth" >&5
23712 -echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6
23713 -if test $ac_cv_have_decl_wcwidth = yes; then
23715 -cat >>confdefs.h <<_ACEOF
23716 -#define HAVE_DECL_WCWIDTH 1
23719 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
23720 +$as_echo "$ac_cv_func_strcoll_works" >&6; }
23721 +if test $ac_cv_func_strcoll_works = yes; then
23723 +$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
23728 +for ac_func in setlocale
23730 + ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
23731 +if test "x$ac_cv_func_setlocale" = xyes; then :
23732 cat >>confdefs.h <<_ACEOF
23733 -#define HAVE_DECL_WCWIDTH 0
23734 +#define HAVE_SETLOCALE 1
23742 +ac_widec_funcs=yes
23743 +ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
23744 +if test "x$ac_cv_header_wchar_h" = xyes; then :
23746 + ac_have_wchar_h=yes
23748 +$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
23750 -echo "$as_me:$LINENO: checking for wchar_t" >&5
23751 -echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
23752 -if test "${ac_cv_type_wchar_t+set}" = set; then
23753 - echo $ECHO_N "(cached) $ECHO_C" >&6
23755 - cat >conftest.$ac_ext <<_ACEOF
23758 -cat confdefs.h >>conftest.$ac_ext
23759 -cat >>conftest.$ac_ext <<_ACEOF
23760 -/* end confdefs.h. */
23761 -$ac_includes_default
23765 -if ((wchar_t *) 0)
23767 -if (sizeof (wchar_t))
23772 + ac_have_wchar_h=no
23776 +for ac_func in mbtowc wcwidth mbrtowc mbsinit
23778 + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
23779 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
23780 +if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
23781 + cat >>confdefs.h <<_ACEOF
23782 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
23784 -rm -f conftest.$ac_objext
23785 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
23786 - (eval $ac_compile) 2>conftest.er1
23788 - grep -v '^ *+' conftest.er1 >conftest.err
23789 - rm -f conftest.er1
23790 - cat conftest.err >&5
23791 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23792 - (exit $ac_status); } &&
23793 - { ac_try='test -z "$ac_c_werror_flag"
23794 - || test ! -s conftest.err'
23795 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23796 - (eval $ac_try) 2>&5
23798 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23799 - (exit $ac_status); }; } &&
23800 - { ac_try='test -s conftest.$ac_objext'
23801 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23802 - (eval $ac_try) 2>&5
23804 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23805 - (exit $ac_status); }; }; then
23806 - ac_cv_type_wchar_t=yes
23808 - echo "$as_me: failed program was:" >&5
23809 -sed 's/^/| /' conftest.$ac_ext >&5
23811 -ac_cv_type_wchar_t=no
23813 + ac_widec_funcs=no
23815 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
23818 +ac_fn_c_check_decl "$LINENO" "wcwidth" "ac_cv_have_decl_wcwidth" "$ac_includes_default"
23819 +if test "x$ac_cv_have_decl_wcwidth" = xyes; then :
23824 -echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
23825 -echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
23826 -if test $ac_cv_type_wchar_t = yes; then
23829 +cat >>confdefs.h <<_ACEOF
23830 +#define HAVE_DECL_WCWIDTH $ac_have_decl
23833 +ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
23834 +if test "x$ac_cv_type_wchar_t" = xyes; then :
23839 @@ -12560,231 +7415,65 @@
23841 abook_cv_curses=/usr
23843 -# Check whether --with-curses or --without-curses was given.
23844 -if test "${with_curses+set}" = set; then
23845 - withval="$with_curses"
23846 - if test $withval != yes; then
23847 +# Check whether --with-curses was given.
23848 +if test "${with_curses+set}" = set; then :
23849 + withval=$with_curses; if test $withval != yes; then
23850 abook_cv_curses=$withval
23852 if test x$abook_cv_curses != x/usr; then
23853 LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
23854 CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
23860 -echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
23861 -echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
23862 -if test "${ac_cv_lib_ncursesw_initscr+set}" = set; then
23863 - echo $ECHO_N "(cached) $ECHO_C" >&6
23864 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
23865 +$as_echo_n "checking for initscr in -lncursesw... " >&6; }
23866 +if ${ac_cv_lib_ncursesw_initscr+:} false; then :
23867 + $as_echo_n "(cached) " >&6
23869 ac_check_lib_save_LIBS=$LIBS
23870 LIBS="-lncursesw $LIBS"
23871 -cat >conftest.$ac_ext <<_ACEOF
23874 -cat confdefs.h >>conftest.$ac_ext
23875 -cat >>conftest.$ac_ext <<_ACEOF
23876 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23877 /* end confdefs.h. */
23879 -/* Override any gcc2 internal prototype to avoid an error. */
23880 +/* Override any GCC internal prototype to avoid an error.
23881 + Use char because int might match the return type of a GCC
23882 + builtin and then its argument prototype would still apply. */
23886 -/* We use char because int might match the return type of a gcc2
23887 - builtin and then its argument prototype would still apply. */
23893 +return initscr ();
23898 -rm -f conftest.$ac_objext conftest$ac_exeext
23899 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
23900 - (eval $ac_link) 2>conftest.er1
23902 - grep -v '^ *+' conftest.er1 >conftest.err
23903 - rm -f conftest.er1
23904 - cat conftest.err >&5
23905 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23906 - (exit $ac_status); } &&
23907 - { ac_try='test -z "$ac_c_werror_flag"
23908 - || test ! -s conftest.err'
23909 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23910 - (eval $ac_try) 2>&5
23912 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23913 - (exit $ac_status); }; } &&
23914 - { ac_try='test -s conftest$ac_exeext'
23915 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23916 - (eval $ac_try) 2>&5
23918 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23919 - (exit $ac_status); }; }; then
23920 +if ac_fn_c_try_link "$LINENO"; then :
23921 ac_cv_lib_ncursesw_initscr=yes
23923 - echo "$as_me: failed program was:" >&5
23924 -sed 's/^/| /' conftest.$ac_ext >&5
23926 -ac_cv_lib_ncursesw_initscr=no
23927 + ac_cv_lib_ncursesw_initscr=no
23929 -rm -f conftest.err conftest.$ac_objext \
23930 - conftest$ac_exeext conftest.$ac_ext
23931 +rm -f core conftest.err conftest.$ac_objext \
23932 + conftest$ac_exeext conftest.$ac_ext
23933 LIBS=$ac_check_lib_save_LIBS
23935 -echo "$as_me:$LINENO: result: $ac_cv_lib_ncursesw_initscr" >&5
23936 -echo "${ECHO_T}$ac_cv_lib_ncursesw_initscr" >&6
23937 -if test $ac_cv_lib_ncursesw_initscr = yes; then
23938 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
23939 +$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
23940 +if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
23941 LIBS="$LIBS -lncursesw"
23942 if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
23943 CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
23946 -for ac_header in ncurses.h
23948 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
23949 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
23950 - echo "$as_me:$LINENO: checking for $ac_header" >&5
23951 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
23952 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
23953 - echo $ECHO_N "(cached) $ECHO_C" >&6
23955 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
23956 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
23958 - # Is the header compilable?
23959 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
23960 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
23961 -cat >conftest.$ac_ext <<_ACEOF
23964 -cat confdefs.h >>conftest.$ac_ext
23965 -cat >>conftest.$ac_ext <<_ACEOF
23966 -/* end confdefs.h. */
23967 -$ac_includes_default
23968 -#include <$ac_header>
23970 -rm -f conftest.$ac_objext
23971 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
23972 - (eval $ac_compile) 2>conftest.er1
23974 - grep -v '^ *+' conftest.er1 >conftest.err
23975 - rm -f conftest.er1
23976 - cat conftest.err >&5
23977 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23978 - (exit $ac_status); } &&
23979 - { ac_try='test -z "$ac_c_werror_flag"
23980 - || test ! -s conftest.err'
23981 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23982 - (eval $ac_try) 2>&5
23984 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23985 - (exit $ac_status); }; } &&
23986 - { ac_try='test -s conftest.$ac_objext'
23987 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
23988 - (eval $ac_try) 2>&5
23990 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
23991 - (exit $ac_status); }; }; then
23992 - ac_header_compiler=yes
23994 - echo "$as_me: failed program was:" >&5
23995 -sed 's/^/| /' conftest.$ac_ext >&5
23997 -ac_header_compiler=no
23999 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
24000 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
24001 -echo "${ECHO_T}$ac_header_compiler" >&6
24003 -# Is the header present?
24004 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
24005 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
24006 -cat >conftest.$ac_ext <<_ACEOF
24009 -cat confdefs.h >>conftest.$ac_ext
24010 -cat >>conftest.$ac_ext <<_ACEOF
24011 -/* end confdefs.h. */
24012 -#include <$ac_header>
24014 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
24015 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
24017 - grep -v '^ *+' conftest.er1 >conftest.err
24018 - rm -f conftest.er1
24019 - cat conftest.err >&5
24020 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24021 - (exit $ac_status); } >/dev/null; then
24022 - if test -s conftest.err; then
24023 - ac_cpp_err=$ac_c_preproc_warn_flag
24024 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
24031 -if test -z "$ac_cpp_err"; then
24032 - ac_header_preproc=yes
24034 - echo "$as_me: failed program was:" >&5
24035 -sed 's/^/| /' conftest.$ac_ext >&5
24037 - ac_header_preproc=no
24039 -rm -f conftest.err conftest.$ac_ext
24040 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
24041 -echo "${ECHO_T}$ac_header_preproc" >&6
24043 -# So? What about this header?
24044 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
24046 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
24047 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
24048 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
24049 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
24050 - ac_header_preproc=yes
24053 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
24054 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
24055 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
24056 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
24057 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
24058 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
24059 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
24060 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
24061 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
24062 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
24063 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
24064 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
24067 -## ------------------------------------------ ##
24068 -## Report this to the AC_PACKAGE_NAME lists. ##
24069 -## ------------------------------------------ ##
24072 - sed "s/^/$as_me: WARNING: /" >&2
24075 -echo "$as_me:$LINENO: checking for $ac_header" >&5
24076 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
24077 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
24078 - echo $ECHO_N "(cached) $ECHO_C" >&6
24080 - eval "$as_ac_Header=\$ac_header_preproc"
24082 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
24083 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
24086 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
24087 + for ac_header in ncurses.h
24089 + ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
24090 +if test "x$ac_cv_header_ncurses_h" = xyes; then :
24091 cat >>confdefs.h <<_ACEOF
24092 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
24093 +#define HAVE_NCURSES_H 1
24097 @@ -12794,219 +7483,53 @@
24100 ac_widec_possible=no
24101 - echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
24102 -echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
24103 -if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
24104 - echo $ECHO_N "(cached) $ECHO_C" >&6
24105 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
24106 +$as_echo_n "checking for initscr in -lncurses... " >&6; }
24107 +if ${ac_cv_lib_ncurses_initscr+:} false; then :
24108 + $as_echo_n "(cached) " >&6
24110 ac_check_lib_save_LIBS=$LIBS
24111 LIBS="-lncurses $LIBS"
24112 -cat >conftest.$ac_ext <<_ACEOF
24115 -cat confdefs.h >>conftest.$ac_ext
24116 -cat >>conftest.$ac_ext <<_ACEOF
24117 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24118 /* end confdefs.h. */
24120 -/* Override any gcc2 internal prototype to avoid an error. */
24121 +/* Override any GCC internal prototype to avoid an error.
24122 + Use char because int might match the return type of a GCC
24123 + builtin and then its argument prototype would still apply. */
24127 -/* We use char because int might match the return type of a gcc2
24128 - builtin and then its argument prototype would still apply. */
24134 +return initscr ();
24139 -rm -f conftest.$ac_objext conftest$ac_exeext
24140 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24141 - (eval $ac_link) 2>conftest.er1
24143 - grep -v '^ *+' conftest.er1 >conftest.err
24144 - rm -f conftest.er1
24145 - cat conftest.err >&5
24146 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24147 - (exit $ac_status); } &&
24148 - { ac_try='test -z "$ac_c_werror_flag"
24149 - || test ! -s conftest.err'
24150 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24151 - (eval $ac_try) 2>&5
24153 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24154 - (exit $ac_status); }; } &&
24155 - { ac_try='test -s conftest$ac_exeext'
24156 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24157 - (eval $ac_try) 2>&5
24159 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24160 - (exit $ac_status); }; }; then
24161 +if ac_fn_c_try_link "$LINENO"; then :
24162 ac_cv_lib_ncurses_initscr=yes
24164 - echo "$as_me: failed program was:" >&5
24165 -sed 's/^/| /' conftest.$ac_ext >&5
24167 -ac_cv_lib_ncurses_initscr=no
24168 + ac_cv_lib_ncurses_initscr=no
24170 -rm -f conftest.err conftest.$ac_objext \
24171 - conftest$ac_exeext conftest.$ac_ext
24172 +rm -f core conftest.err conftest.$ac_objext \
24173 + conftest$ac_exeext conftest.$ac_ext
24174 LIBS=$ac_check_lib_save_LIBS
24176 -echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
24177 -echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6
24178 -if test $ac_cv_lib_ncurses_initscr = yes; then
24179 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
24180 +$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
24181 +if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
24182 LIBS="$LIBS -lncurses"
24183 if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
24184 CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
24187 -for ac_header in ncurses.h
24189 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
24190 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
24191 - echo "$as_me:$LINENO: checking for $ac_header" >&5
24192 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
24193 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
24194 - echo $ECHO_N "(cached) $ECHO_C" >&6
24196 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
24197 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
24199 - # Is the header compilable?
24200 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
24201 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
24202 -cat >conftest.$ac_ext <<_ACEOF
24205 -cat confdefs.h >>conftest.$ac_ext
24206 -cat >>conftest.$ac_ext <<_ACEOF
24207 -/* end confdefs.h. */
24208 -$ac_includes_default
24209 -#include <$ac_header>
24211 -rm -f conftest.$ac_objext
24212 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
24213 - (eval $ac_compile) 2>conftest.er1
24215 - grep -v '^ *+' conftest.er1 >conftest.err
24216 - rm -f conftest.er1
24217 - cat conftest.err >&5
24218 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24219 - (exit $ac_status); } &&
24220 - { ac_try='test -z "$ac_c_werror_flag"
24221 - || test ! -s conftest.err'
24222 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24223 - (eval $ac_try) 2>&5
24225 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24226 - (exit $ac_status); }; } &&
24227 - { ac_try='test -s conftest.$ac_objext'
24228 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24229 - (eval $ac_try) 2>&5
24231 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24232 - (exit $ac_status); }; }; then
24233 - ac_header_compiler=yes
24235 - echo "$as_me: failed program was:" >&5
24236 -sed 's/^/| /' conftest.$ac_ext >&5
24238 -ac_header_compiler=no
24240 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
24241 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
24242 -echo "${ECHO_T}$ac_header_compiler" >&6
24244 -# Is the header present?
24245 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
24246 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
24247 -cat >conftest.$ac_ext <<_ACEOF
24250 -cat confdefs.h >>conftest.$ac_ext
24251 -cat >>conftest.$ac_ext <<_ACEOF
24252 -/* end confdefs.h. */
24253 -#include <$ac_header>
24255 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
24256 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
24258 - grep -v '^ *+' conftest.er1 >conftest.err
24259 - rm -f conftest.er1
24260 - cat conftest.err >&5
24261 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24262 - (exit $ac_status); } >/dev/null; then
24263 - if test -s conftest.err; then
24264 - ac_cpp_err=$ac_c_preproc_warn_flag
24265 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
24272 -if test -z "$ac_cpp_err"; then
24273 - ac_header_preproc=yes
24275 - echo "$as_me: failed program was:" >&5
24276 -sed 's/^/| /' conftest.$ac_ext >&5
24278 - ac_header_preproc=no
24280 -rm -f conftest.err conftest.$ac_ext
24281 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
24282 -echo "${ECHO_T}$ac_header_preproc" >&6
24284 -# So? What about this header?
24285 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
24287 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
24288 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
24289 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
24290 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
24291 - ac_header_preproc=yes
24294 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
24295 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
24296 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
24297 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
24298 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
24299 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
24300 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
24301 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
24302 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
24303 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
24304 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
24305 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
24308 -## ------------------------------------------ ##
24309 -## Report this to the AC_PACKAGE_NAME lists. ##
24310 -## ------------------------------------------ ##
24313 - sed "s/^/$as_me: WARNING: /" >&2
24316 -echo "$as_me:$LINENO: checking for $ac_header" >&5
24317 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
24318 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
24319 - echo $ECHO_N "(cached) $ECHO_C" >&6
24321 - eval "$as_ac_Header=\$ac_header_preproc"
24323 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
24324 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
24327 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
24328 + for ac_header in ncurses.h
24330 + ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
24331 +if test "x$ac_cv_header_ncurses_h" = xyes; then :
24332 cat >>confdefs.h <<_ACEOF
24333 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
24334 +#define HAVE_NCURSES_H 1
24338 @@ -13015,237 +7538,92 @@
24342 -echo "$as_me:$LINENO: checking for initscr" >&5
24343 -echo $ECHO_N "checking for initscr... $ECHO_C" >&6
24344 -if test "${ac_cv_func_initscr+set}" = set; then
24345 - echo $ECHO_N "(cached) $ECHO_C" >&6
24347 - cat >conftest.$ac_ext <<_ACEOF
24350 -cat confdefs.h >>conftest.$ac_ext
24351 -cat >>conftest.$ac_ext <<_ACEOF
24352 -/* end confdefs.h. */
24353 -/* Define initscr to an innocuous variant, in case <limits.h> declares initscr.
24354 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
24355 -#define initscr innocuous_initscr
24357 -/* System header to define __stub macros and hopefully few prototypes,
24358 - which can conflict with char initscr (); below.
24359 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
24360 - <limits.h> exists even on freestanding compilers. */
24363 -# include <limits.h>
24365 -# include <assert.h>
24370 -/* Override any gcc2 internal prototype to avoid an error. */
24371 -#ifdef __cplusplus
24375 -/* We use char because int might match the return type of a gcc2
24376 - builtin and then its argument prototype would still apply. */
24378 -/* The GNU C library defines this for functions which it implements
24379 - to always fail with ENOSYS. Some functions are actually named
24380 - something starting with __ and the normal name is an alias. */
24381 -#if defined (__stub_initscr) || defined (__stub___initscr)
24384 -char (*f) () = initscr;
24386 -#ifdef __cplusplus
24393 -return f != initscr;
24398 -rm -f conftest.$ac_objext conftest$ac_exeext
24399 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24400 - (eval $ac_link) 2>conftest.er1
24402 - grep -v '^ *+' conftest.er1 >conftest.err
24403 - rm -f conftest.er1
24404 - cat conftest.err >&5
24405 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24406 - (exit $ac_status); } &&
24407 - { ac_try='test -z "$ac_c_werror_flag"
24408 - || test ! -s conftest.err'
24409 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24410 - (eval $ac_try) 2>&5
24412 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24413 - (exit $ac_status); }; } &&
24414 - { ac_try='test -s conftest$ac_exeext'
24415 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24416 - (eval $ac_try) 2>&5
24418 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24419 - (exit $ac_status); }; }; then
24420 - ac_cv_func_initscr=yes
24422 - echo "$as_me: failed program was:" >&5
24423 -sed 's/^/| /' conftest.$ac_ext >&5
24424 +ac_fn_c_check_func "$LINENO" "initscr" "ac_cv_func_initscr"
24425 +if test "x$ac_cv_func_initscr" = xyes; then :
24427 -ac_cv_func_initscr=no
24429 -rm -f conftest.err conftest.$ac_objext \
24430 - conftest$ac_exeext conftest.$ac_ext
24432 -echo "$as_me:$LINENO: result: $ac_cv_func_initscr" >&5
24433 -echo "${ECHO_T}$ac_cv_func_initscr" >&6
24434 -if test $ac_cv_func_initscr = yes; then
24438 case $host_os in #(vi
24440 - echo "$as_me:$LINENO: checking for tgoto in -lmytinfo" >&5
24441 -echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
24442 -if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
24443 - echo $ECHO_N "(cached) $ECHO_C" >&6
24444 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -lmytinfo" >&5
24445 +$as_echo_n "checking for tgoto in -lmytinfo... " >&6; }
24446 +if ${ac_cv_lib_mytinfo_tgoto+:} false; then :
24447 + $as_echo_n "(cached) " >&6
24449 ac_check_lib_save_LIBS=$LIBS
24450 LIBS="-lmytinfo $LIBS"
24451 -cat >conftest.$ac_ext <<_ACEOF
24454 -cat confdefs.h >>conftest.$ac_ext
24455 -cat >>conftest.$ac_ext <<_ACEOF
24456 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24457 /* end confdefs.h. */
24459 -/* Override any gcc2 internal prototype to avoid an error. */
24460 +/* Override any GCC internal prototype to avoid an error.
24461 + Use char because int might match the return type of a GCC
24462 + builtin and then its argument prototype would still apply. */
24466 -/* We use char because int might match the return type of a gcc2
24467 - builtin and then its argument prototype would still apply. */
24478 -rm -f conftest.$ac_objext conftest$ac_exeext
24479 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24480 - (eval $ac_link) 2>conftest.er1
24482 - grep -v '^ *+' conftest.er1 >conftest.err
24483 - rm -f conftest.er1
24484 - cat conftest.err >&5
24485 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24486 - (exit $ac_status); } &&
24487 - { ac_try='test -z "$ac_c_werror_flag"
24488 - || test ! -s conftest.err'
24489 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24490 - (eval $ac_try) 2>&5
24492 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24493 - (exit $ac_status); }; } &&
24494 - { ac_try='test -s conftest$ac_exeext'
24495 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24496 - (eval $ac_try) 2>&5
24498 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24499 - (exit $ac_status); }; }; then
24500 +if ac_fn_c_try_link "$LINENO"; then :
24501 ac_cv_lib_mytinfo_tgoto=yes
24503 - echo "$as_me: failed program was:" >&5
24504 -sed 's/^/| /' conftest.$ac_ext >&5
24506 -ac_cv_lib_mytinfo_tgoto=no
24507 + ac_cv_lib_mytinfo_tgoto=no
24509 -rm -f conftest.err conftest.$ac_objext \
24510 - conftest$ac_exeext conftest.$ac_ext
24511 +rm -f core conftest.err conftest.$ac_objext \
24512 + conftest$ac_exeext conftest.$ac_ext
24513 LIBS=$ac_check_lib_save_LIBS
24515 -echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_tgoto" >&5
24516 -echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
24517 -if test $ac_cv_lib_mytinfo_tgoto = yes; then
24518 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mytinfo_tgoto" >&5
24519 +$as_echo "$ac_cv_lib_mytinfo_tgoto" >&6; }
24520 +if test "x$ac_cv_lib_mytinfo_tgoto" = xyes; then :
24521 LIBS="-lmytinfo $LIBS"
24526 - echo "$as_me:$LINENO: checking for initscr in -lcur_colr" >&5
24527 -echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
24528 -if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
24529 - echo $ECHO_N "(cached) $ECHO_C" >&6
24530 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcur_colr" >&5
24531 +$as_echo_n "checking for initscr in -lcur_colr... " >&6; }
24532 +if ${ac_cv_lib_cur_colr_initscr+:} false; then :
24533 + $as_echo_n "(cached) " >&6
24535 ac_check_lib_save_LIBS=$LIBS
24536 LIBS="-lcur_colr $LIBS"
24537 -cat >conftest.$ac_ext <<_ACEOF
24540 -cat confdefs.h >>conftest.$ac_ext
24541 -cat >>conftest.$ac_ext <<_ACEOF
24542 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24543 /* end confdefs.h. */
24545 -/* Override any gcc2 internal prototype to avoid an error. */
24546 +/* Override any GCC internal prototype to avoid an error.
24547 + Use char because int might match the return type of a GCC
24548 + builtin and then its argument prototype would still apply. */
24552 -/* We use char because int might match the return type of a gcc2
24553 - builtin and then its argument prototype would still apply. */
24559 +return initscr ();
24564 -rm -f conftest.$ac_objext conftest$ac_exeext
24565 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24566 - (eval $ac_link) 2>conftest.er1
24568 - grep -v '^ *+' conftest.er1 >conftest.err
24569 - rm -f conftest.er1
24570 - cat conftest.err >&5
24571 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24572 - (exit $ac_status); } &&
24573 - { ac_try='test -z "$ac_c_werror_flag"
24574 - || test ! -s conftest.err'
24575 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24576 - (eval $ac_try) 2>&5
24578 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24579 - (exit $ac_status); }; } &&
24580 - { ac_try='test -s conftest$ac_exeext'
24581 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24582 - (eval $ac_try) 2>&5
24584 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24585 - (exit $ac_status); }; }; then
24586 +if ac_fn_c_try_link "$LINENO"; then :
24587 ac_cv_lib_cur_colr_initscr=yes
24589 - echo "$as_me: failed program was:" >&5
24590 -sed 's/^/| /' conftest.$ac_ext >&5
24592 -ac_cv_lib_cur_colr_initscr=no
24593 + ac_cv_lib_cur_colr_initscr=no
24595 -rm -f conftest.err conftest.$ac_objext \
24596 - conftest$ac_exeext conftest.$ac_ext
24597 +rm -f core conftest.err conftest.$ac_objext \
24598 + conftest$ac_exeext conftest.$ac_ext
24599 LIBS=$ac_check_lib_save_LIBS
24601 -echo "$as_me:$LINENO: result: $ac_cv_lib_cur_colr_initscr" >&5
24602 -echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
24603 -if test $ac_cv_lib_cur_colr_initscr = yes; then
24604 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cur_colr_initscr" >&5
24605 +$as_echo "$ac_cv_lib_cur_colr_initscr" >&6; }
24606 +if test "x$ac_cv_lib_cur_colr_initscr" = xyes; then :
24608 LIBS="-lcur_colr $LIBS"
24609 CFLAGS="-I/usr/include/curses_colr $CFLAGS"
24610 @@ -13253,264 +7631,120 @@
24614 - echo "$as_me:$LINENO: checking for initscr in -lHcurses" >&5
24615 -echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
24616 -if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
24617 - echo $ECHO_N "(cached) $ECHO_C" >&6
24618 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lHcurses" >&5
24619 +$as_echo_n "checking for initscr in -lHcurses... " >&6; }
24620 +if ${ac_cv_lib_Hcurses_initscr+:} false; then :
24621 + $as_echo_n "(cached) " >&6
24623 ac_check_lib_save_LIBS=$LIBS
24624 LIBS="-lHcurses $LIBS"
24625 -cat >conftest.$ac_ext <<_ACEOF
24628 -cat confdefs.h >>conftest.$ac_ext
24629 -cat >>conftest.$ac_ext <<_ACEOF
24630 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24631 /* end confdefs.h. */
24633 -/* Override any gcc2 internal prototype to avoid an error. */
24634 -#ifdef __cplusplus
24637 -/* We use char because int might match the return type of a gcc2
24638 +/* Override any GCC internal prototype to avoid an error.
24639 + Use char because int might match the return type of a GCC
24640 builtin and then its argument prototype would still apply. */
24650 -rm -f conftest.$ac_objext conftest$ac_exeext
24651 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24652 - (eval $ac_link) 2>conftest.er1
24654 - grep -v '^ *+' conftest.er1 >conftest.err
24655 - rm -f conftest.er1
24656 - cat conftest.err >&5
24657 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24658 - (exit $ac_status); } &&
24659 - { ac_try='test -z "$ac_c_werror_flag"
24660 - || test ! -s conftest.err'
24661 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24662 - (eval $ac_try) 2>&5
24664 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24665 - (exit $ac_status); }; } &&
24666 - { ac_try='test -s conftest$ac_exeext'
24667 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24668 - (eval $ac_try) 2>&5
24670 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24671 - (exit $ac_status); }; }; then
24672 - ac_cv_lib_Hcurses_initscr=yes
24674 - echo "$as_me: failed program was:" >&5
24675 -sed 's/^/| /' conftest.$ac_ext >&5
24677 -ac_cv_lib_Hcurses_initscr=no
24679 -rm -f conftest.err conftest.$ac_objext \
24680 - conftest$ac_exeext conftest.$ac_ext
24681 -LIBS=$ac_check_lib_save_LIBS
24683 -echo "$as_me:$LINENO: result: $ac_cv_lib_Hcurses_initscr" >&5
24684 -echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
24685 -if test $ac_cv_lib_Hcurses_initscr = yes; then
24687 - # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
24688 - LIBS="-lHcurses $LIBS"
24689 - CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS"
24690 - ac_cv_func_initscr=yes
24697 -linux*) # Suse Linux does not follow /usr/lib convention
24698 - LIBS="$LIBS -L/lib"
24702 -if test ".$With5lib" != ".no" ; then
24703 -if test -d /usr/5lib ; then
24704 - # SunOS 3.x or 4.x
24705 - CPPFLAGS="$CPPFLAGS -I/usr/5include"
24706 - LIBS="$LIBS -L/usr/5lib"
24710 -if test ".$ac_cv_func_initscr" != .yes ; then
24711 - cf_save_LIBS="$LIBS"
24715 - # Check for library containing tgoto. Do this before curses library
24716 - # because it may be needed to link the test-case for initscr.
24717 - echo "$as_me:$LINENO: checking for tgoto" >&5
24718 -echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
24719 -if test "${ac_cv_func_tgoto+set}" = set; then
24720 - echo $ECHO_N "(cached) $ECHO_C" >&6
24722 - cat >conftest.$ac_ext <<_ACEOF
24725 -cat confdefs.h >>conftest.$ac_ext
24726 -cat >>conftest.$ac_ext <<_ACEOF
24727 -/* end confdefs.h. */
24728 -/* Define tgoto to an innocuous variant, in case <limits.h> declares tgoto.
24729 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
24730 -#define tgoto innocuous_tgoto
24732 -/* System header to define __stub macros and hopefully few prototypes,
24733 - which can conflict with char tgoto (); below.
24734 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
24735 - <limits.h> exists even on freestanding compilers. */
24738 -# include <limits.h>
24740 -# include <assert.h>
24745 -/* Override any gcc2 internal prototype to avoid an error. */
24750 -/* We use char because int might match the return type of a gcc2
24751 - builtin and then its argument prototype would still apply. */
24753 -/* The GNU C library defines this for functions which it implements
24754 - to always fail with ENOSYS. Some functions are actually named
24755 - something starting with __ and the normal name is an alias. */
24756 -#if defined (__stub_tgoto) || defined (__stub___tgoto)
24759 -char (*f) () = tgoto;
24761 -#ifdef __cplusplus
24769 -return f != tgoto;
24770 +return initscr ();
24775 -rm -f conftest.$ac_objext conftest$ac_exeext
24776 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24777 - (eval $ac_link) 2>conftest.er1
24779 - grep -v '^ *+' conftest.er1 >conftest.err
24780 - rm -f conftest.er1
24781 - cat conftest.err >&5
24782 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24783 - (exit $ac_status); } &&
24784 - { ac_try='test -z "$ac_c_werror_flag"
24785 - || test ! -s conftest.err'
24786 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24787 - (eval $ac_try) 2>&5
24789 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24790 - (exit $ac_status); }; } &&
24791 - { ac_try='test -s conftest$ac_exeext'
24792 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24793 - (eval $ac_try) 2>&5
24795 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24796 - (exit $ac_status); }; }; then
24797 - ac_cv_func_tgoto=yes
24798 +if ac_fn_c_try_link "$LINENO"; then :
24799 + ac_cv_lib_Hcurses_initscr=yes
24801 - echo "$as_me: failed program was:" >&5
24802 -sed 's/^/| /' conftest.$ac_ext >&5
24803 + ac_cv_lib_Hcurses_initscr=no
24805 +rm -f core conftest.err conftest.$ac_objext \
24806 + conftest$ac_exeext conftest.$ac_ext
24807 +LIBS=$ac_check_lib_save_LIBS
24809 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Hcurses_initscr" >&5
24810 +$as_echo "$ac_cv_lib_Hcurses_initscr" >&6; }
24811 +if test "x$ac_cv_lib_Hcurses_initscr" = xyes; then :
24813 + # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
24814 + LIBS="-lHcurses $LIBS"
24815 + CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS"
24816 + ac_cv_func_initscr=yes
24823 +linux*) # Suse Linux does not follow /usr/lib convention
24824 + LIBS="$LIBS -L/lib"
24828 -ac_cv_func_tgoto=no
24829 +if test ".$With5lib" != ".no" ; then
24830 +if test -d /usr/5lib ; then
24831 + # SunOS 3.x or 4.x
24832 + CPPFLAGS="$CPPFLAGS -I/usr/5include"
24833 + LIBS="$LIBS -L/usr/5lib"
24835 -rm -f conftest.err conftest.$ac_objext \
24836 - conftest$ac_exeext conftest.$ac_ext
24838 -echo "$as_me:$LINENO: result: $ac_cv_func_tgoto" >&5
24839 -echo "${ECHO_T}$ac_cv_func_tgoto" >&6
24840 -if test $ac_cv_func_tgoto = yes; then
24842 +if test ".$ac_cv_func_initscr" != .yes ; then
24843 + cf_save_LIBS="$LIBS"
24847 + # Check for library containing tgoto. Do this before curses library
24848 + # because it may be needed to link the test-case for initscr.
24849 + ac_fn_c_check_func "$LINENO" "tgoto" "ac_cv_func_tgoto"
24850 +if test "x$ac_cv_func_tgoto" = xyes; then :
24851 cf_term_lib=predefined
24854 for cf_term_lib in termcap termlib unknown
24856 - as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
24857 -echo "$as_me:$LINENO: checking for tgoto in -l$cf_term_lib" >&5
24858 -echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
24859 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then
24860 - echo $ECHO_N "(cached) $ECHO_C" >&6
24861 + as_ac_Lib=`$as_echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
24862 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -l$cf_term_lib" >&5
24863 +$as_echo_n "checking for tgoto in -l$cf_term_lib... " >&6; }
24864 +if eval \${$as_ac_Lib+:} false; then :
24865 + $as_echo_n "(cached) " >&6
24867 ac_check_lib_save_LIBS=$LIBS
24868 LIBS="-l$cf_term_lib $LIBS"
24869 -cat >conftest.$ac_ext <<_ACEOF
24872 -cat confdefs.h >>conftest.$ac_ext
24873 -cat >>conftest.$ac_ext <<_ACEOF
24874 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24875 /* end confdefs.h. */
24877 -/* Override any gcc2 internal prototype to avoid an error. */
24878 +/* Override any GCC internal prototype to avoid an error.
24879 + Use char because int might match the return type of a GCC
24880 + builtin and then its argument prototype would still apply. */
24884 -/* We use char because int might match the return type of a gcc2
24885 - builtin and then its argument prototype would still apply. */
24896 -rm -f conftest.$ac_objext conftest$ac_exeext
24897 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24898 - (eval $ac_link) 2>conftest.er1
24900 - grep -v '^ *+' conftest.er1 >conftest.err
24901 - rm -f conftest.er1
24902 - cat conftest.err >&5
24903 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24904 - (exit $ac_status); } &&
24905 - { ac_try='test -z "$ac_c_werror_flag"
24906 - || test ! -s conftest.err'
24907 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24908 - (eval $ac_try) 2>&5
24910 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24911 - (exit $ac_status); }; } &&
24912 - { ac_try='test -s conftest$ac_exeext'
24913 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24914 - (eval $ac_try) 2>&5
24916 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24917 - (exit $ac_status); }; }; then
24918 +if ac_fn_c_try_link "$LINENO"; then :
24919 eval "$as_ac_Lib=yes"
24921 - echo "$as_me: failed program was:" >&5
24922 -sed 's/^/| /' conftest.$ac_ext >&5
24924 -eval "$as_ac_Lib=no"
24925 + eval "$as_ac_Lib=no"
24927 -rm -f conftest.err conftest.$ac_objext \
24928 - conftest$ac_exeext conftest.$ac_ext
24929 +rm -f core conftest.err conftest.$ac_objext \
24930 + conftest$ac_exeext conftest.$ac_ext
24931 LIBS=$ac_check_lib_save_LIBS
24933 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
24934 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
24935 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then
24936 +eval ac_res=\$$as_ac_Lib
24937 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
24938 +$as_echo "$ac_res" >&6; }
24939 +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
24943 @@ -13523,89 +7757,56 @@
24944 test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
24945 for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown
24947 - as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
24948 -echo "$as_me:$LINENO: checking for initscr in -l$cf_curs_lib" >&5
24949 -echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
24950 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then
24951 - echo $ECHO_N "(cached) $ECHO_C" >&6
24952 + as_ac_Lib=`$as_echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
24953 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -l$cf_curs_lib" >&5
24954 +$as_echo_n "checking for initscr in -l$cf_curs_lib... " >&6; }
24955 +if eval \${$as_ac_Lib+:} false; then :
24956 + $as_echo_n "(cached) " >&6
24958 ac_check_lib_save_LIBS=$LIBS
24959 LIBS="-l$cf_curs_lib $LIBS"
24960 -cat >conftest.$ac_ext <<_ACEOF
24963 -cat confdefs.h >>conftest.$ac_ext
24964 -cat >>conftest.$ac_ext <<_ACEOF
24965 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24966 /* end confdefs.h. */
24968 -/* Override any gcc2 internal prototype to avoid an error. */
24969 +/* Override any GCC internal prototype to avoid an error.
24970 + Use char because int might match the return type of a GCC
24971 + builtin and then its argument prototype would still apply. */
24975 -/* We use char because int might match the return type of a gcc2
24976 - builtin and then its argument prototype would still apply. */
24982 +return initscr ();
24987 -rm -f conftest.$ac_objext conftest$ac_exeext
24988 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
24989 - (eval $ac_link) 2>conftest.er1
24991 - grep -v '^ *+' conftest.er1 >conftest.err
24992 - rm -f conftest.er1
24993 - cat conftest.err >&5
24994 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
24995 - (exit $ac_status); } &&
24996 - { ac_try='test -z "$ac_c_werror_flag"
24997 - || test ! -s conftest.err'
24998 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
24999 - (eval $ac_try) 2>&5
25001 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25002 - (exit $ac_status); }; } &&
25003 - { ac_try='test -s conftest$ac_exeext'
25004 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25005 - (eval $ac_try) 2>&5
25007 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25008 - (exit $ac_status); }; }; then
25009 +if ac_fn_c_try_link "$LINENO"; then :
25010 eval "$as_ac_Lib=yes"
25012 - echo "$as_me: failed program was:" >&5
25013 -sed 's/^/| /' conftest.$ac_ext >&5
25015 -eval "$as_ac_Lib=no"
25016 + eval "$as_ac_Lib=no"
25018 -rm -f conftest.err conftest.$ac_objext \
25019 - conftest$ac_exeext conftest.$ac_ext
25020 +rm -f core conftest.err conftest.$ac_objext \
25021 + conftest$ac_exeext conftest.$ac_ext
25022 LIBS=$ac_check_lib_save_LIBS
25024 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
25025 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
25026 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then
25027 +eval ac_res=\$$as_ac_Lib
25028 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
25029 +$as_echo "$ac_res" >&6; }
25030 +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
25035 - test $cf_curs_lib = unknown && { { echo "$as_me:$LINENO: error: no curses library found" >&5
25036 -echo "$as_me: error: no curses library found" >&2;}
25037 - { (exit 1); exit 1; }; }
25038 + test $cf_curs_lib = unknown && as_fn_error $? "no curses library found" "$LINENO" 5
25040 LIBS="-l$cf_curs_lib $cf_save_LIBS"
25041 if test "$cf_term_lib" = unknown ; then
25042 - echo "$as_me:$LINENO: checking if we can link with $cf_curs_lib library" >&5
25043 -echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
25044 - cat >conftest.$ac_ext <<_ACEOF
25047 -cat confdefs.h >>conftest.$ac_ext
25048 -cat >>conftest.$ac_ext <<_ACEOF
25049 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link with $cf_curs_lib library" >&5
25050 +$as_echo_n "checking if we can link with $cf_curs_lib library... " >&6; }
25051 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25052 /* end confdefs.h. */
25053 #include <${cf_cv_ncurses_header-curses.h}>
25055 @@ -13616,50 +7817,20 @@
25059 -rm -f conftest.$ac_objext conftest$ac_exeext
25060 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25061 - (eval $ac_link) 2>conftest.er1
25063 - grep -v '^ *+' conftest.er1 >conftest.err
25064 - rm -f conftest.er1
25065 - cat conftest.err >&5
25066 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25067 - (exit $ac_status); } &&
25068 - { ac_try='test -z "$ac_c_werror_flag"
25069 - || test ! -s conftest.err'
25070 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25071 - (eval $ac_try) 2>&5
25073 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25074 - (exit $ac_status); }; } &&
25075 - { ac_try='test -s conftest$ac_exeext'
25076 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25077 - (eval $ac_try) 2>&5
25079 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25080 - (exit $ac_status); }; }; then
25081 +if ac_fn_c_try_link "$LINENO"; then :
25084 - echo "$as_me: failed program was:" >&5
25085 -sed 's/^/| /' conftest.$ac_ext >&5
25090 -rm -f conftest.err conftest.$ac_objext \
25091 - conftest$ac_exeext conftest.$ac_ext
25092 - echo "$as_me:$LINENO: result: $cf_result" >&5
25093 -echo "${ECHO_T}$cf_result" >&6
25094 - test $cf_result = no && { { echo "$as_me:$LINENO: error: Cannot link curses library" >&5
25095 -echo "$as_me: error: Cannot link curses library" >&2;}
25096 - { (exit 1); exit 1; }; }
25097 +rm -f core conftest.err conftest.$ac_objext \
25098 + conftest$ac_exeext conftest.$ac_ext
25099 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_result" >&5
25100 +$as_echo "$cf_result" >&6; }
25101 + test $cf_result = no && as_fn_error $? "Cannot link curses library" "$LINENO" 5
25102 elif test "$cf_term_lib" != predefined ; then
25103 - echo "$as_me:$LINENO: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
25104 -echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
25105 - cat >conftest.$ac_ext <<_ACEOF
25108 -cat confdefs.h >>conftest.$ac_ext
25109 -cat >>conftest.$ac_ext <<_ACEOF
25110 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
25111 +$as_echo_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries... " >&6; }
25112 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25113 /* end confdefs.h. */
25114 #include <${cf_cv_ncurses_header-curses.h}>
25116 @@ -13670,40 +7841,12 @@
25120 -rm -f conftest.$ac_objext conftest$ac_exeext
25121 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25122 - (eval $ac_link) 2>conftest.er1
25124 - grep -v '^ *+' conftest.er1 >conftest.err
25125 - rm -f conftest.er1
25126 - cat conftest.err >&5
25127 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25128 - (exit $ac_status); } &&
25129 - { ac_try='test -z "$ac_c_werror_flag"
25130 - || test ! -s conftest.err'
25131 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25132 - (eval $ac_try) 2>&5
25134 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25135 - (exit $ac_status); }; } &&
25136 - { ac_try='test -s conftest$ac_exeext'
25137 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25138 - (eval $ac_try) 2>&5
25140 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25141 - (exit $ac_status); }; }; then
25142 +if ac_fn_c_try_link "$LINENO"; then :
25145 - echo "$as_me: failed program was:" >&5
25146 -sed 's/^/| /' conftest.$ac_ext >&5
25149 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
25150 - cat >conftest.$ac_ext <<_ACEOF
25153 -cat confdefs.h >>conftest.$ac_ext
25154 -cat >>conftest.$ac_ext <<_ACEOF
25155 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25156 /* end confdefs.h. */
25157 #include <${cf_cv_ncurses_header-curses.h}>
25159 @@ -13714,43 +7857,19 @@
25163 -rm -f conftest.$ac_objext conftest$ac_exeext
25164 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25165 - (eval $ac_link) 2>conftest.er1
25167 - grep -v '^ *+' conftest.er1 >conftest.err
25168 - rm -f conftest.er1
25169 - cat conftest.err >&5
25170 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25171 - (exit $ac_status); } &&
25172 - { ac_try='test -z "$ac_c_werror_flag"
25173 - || test ! -s conftest.err'
25174 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25175 - (eval $ac_try) 2>&5
25177 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25178 - (exit $ac_status); }; } &&
25179 - { ac_try='test -s conftest$ac_exeext'
25180 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25181 - (eval $ac_try) 2>&5
25183 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25184 - (exit $ac_status); }; }; then
25185 +if ac_fn_c_try_link "$LINENO"; then :
25188 - echo "$as_me: failed program was:" >&5
25189 -sed 's/^/| /' conftest.$ac_ext >&5
25194 -rm -f conftest.err conftest.$ac_objext \
25195 - conftest$ac_exeext conftest.$ac_ext
25196 +rm -f core conftest.err conftest.$ac_objext \
25197 + conftest$ac_exeext conftest.$ac_ext
25200 -rm -f conftest.err conftest.$ac_objext \
25201 - conftest$ac_exeext conftest.$ac_ext
25202 - echo "$as_me:$LINENO: result: $cf_result" >&5
25203 -echo "${ECHO_T}$cf_result" >&6
25204 +rm -f core conftest.err conftest.$ac_objext \
25205 + conftest$ac_exeext conftest.$ac_ext
25206 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_result" >&5
25207 +$as_echo "$cf_result" >&6; }
25211 @@ -13767,23 +7886,23 @@
25213 abook_cv_readline=/usr
25215 -# Check whether --with-readline or --without-readline was given.
25216 -if test "${with_readline+set}" = set; then
25217 - withval="$with_readline"
25218 - if test $withval != yes; then
25219 +# Check whether --with-readline was given.
25220 +if test "${with_readline+set}" = set; then :
25221 + withval=$with_readline; if test $withval != yes; then
25222 abook_cv_readline=$withval
25224 if test x$abook_cv_readline != x/usr; then
25225 LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
25226 CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
25232 - echo "$as_me:$LINENO: checking for a readline compatible library" >&5
25233 -echo $ECHO_N "checking for a readline compatible library... $ECHO_C" >&6
25234 -if test "${ac_cv_lib_readline+set}" = set; then
25235 - echo $ECHO_N "(cached) $ECHO_C" >&6
25237 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
25238 +$as_echo_n "checking for a readline compatible library... " >&6; }
25239 +if ${ac_cv_lib_readline+:} false; then :
25240 + $as_echo_n "(cached) " >&6
25244 @@ -13795,58 +7914,29 @@
25245 TRY_LIB="-l$readline_lib -l$termcap_lib"
25247 LIBS="$ORIG_LIBS $TRY_LIB"
25248 - cat >conftest.$ac_ext <<_ACEOF
25251 -cat confdefs.h >>conftest.$ac_ext
25252 -cat >>conftest.$ac_ext <<_ACEOF
25253 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25254 /* end confdefs.h. */
25256 -/* Override any gcc2 internal prototype to avoid an error. */
25257 +/* Override any GCC internal prototype to avoid an error.
25258 + Use char because int might match the return type of a GCC
25259 + builtin and then its argument prototype would still apply. */
25263 -/* We use char because int might match the return type of a gcc2
25264 - builtin and then its argument prototype would still apply. */
25270 +return readline ();
25275 -rm -f conftest.$ac_objext conftest$ac_exeext
25276 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25277 - (eval $ac_link) 2>conftest.er1
25279 - grep -v '^ *+' conftest.er1 >conftest.err
25280 - rm -f conftest.er1
25281 - cat conftest.err >&5
25282 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25283 - (exit $ac_status); } &&
25284 - { ac_try='test -z "$ac_c_werror_flag"
25285 - || test ! -s conftest.err'
25286 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25287 - (eval $ac_try) 2>&5
25289 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25290 - (exit $ac_status); }; } &&
25291 - { ac_try='test -s conftest$ac_exeext'
25292 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25293 - (eval $ac_try) 2>&5
25295 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25296 - (exit $ac_status); }; }; then
25297 +if ac_fn_c_try_link "$LINENO"; then :
25298 ac_cv_lib_readline="$TRY_LIB"
25300 - echo "$as_me: failed program was:" >&5
25301 -sed 's/^/| /' conftest.$ac_ext >&5
25304 -rm -f conftest.err conftest.$ac_objext \
25305 - conftest$ac_exeext conftest.$ac_ext
25306 +rm -f core conftest.err conftest.$ac_objext \
25307 + conftest$ac_exeext conftest.$ac_ext
25308 if test -n "$ac_cv_lib_readline"; then
25311 @@ -13861,627 +7951,221 @@
25315 -echo "$as_me:$LINENO: result: $ac_cv_lib_readline" >&5
25316 -echo "${ECHO_T}$ac_cv_lib_readline" >&6
25317 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline" >&5
25318 +$as_echo "$ac_cv_lib_readline" >&6; }
25320 if test "$ac_cv_lib_readline" != "no"; then
25321 LIBS="$LIBS $ac_cv_lib_readline"
25323 -cat >>confdefs.h <<\_ACEOF
25324 -#define HAVE_LIBREADLINE 1
25329 -for ac_header in readline.h readline/readline.h
25331 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
25332 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
25333 - echo "$as_me:$LINENO: checking for $ac_header" >&5
25334 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
25335 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
25336 - echo $ECHO_N "(cached) $ECHO_C" >&6
25338 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
25339 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
25341 - # Is the header compilable?
25342 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
25343 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
25344 -cat >conftest.$ac_ext <<_ACEOF
25347 -cat confdefs.h >>conftest.$ac_ext
25348 -cat >>conftest.$ac_ext <<_ACEOF
25349 -/* end confdefs.h. */
25350 -$ac_includes_default
25351 -#include <$ac_header>
25353 -rm -f conftest.$ac_objext
25354 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
25355 - (eval $ac_compile) 2>conftest.er1
25357 - grep -v '^ *+' conftest.er1 >conftest.err
25358 - rm -f conftest.er1
25359 - cat conftest.err >&5
25360 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25361 - (exit $ac_status); } &&
25362 - { ac_try='test -z "$ac_c_werror_flag"
25363 - || test ! -s conftest.err'
25364 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25365 - (eval $ac_try) 2>&5
25367 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25368 - (exit $ac_status); }; } &&
25369 - { ac_try='test -s conftest.$ac_objext'
25370 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25371 - (eval $ac_try) 2>&5
25373 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25374 - (exit $ac_status); }; }; then
25375 - ac_header_compiler=yes
25377 - echo "$as_me: failed program was:" >&5
25378 -sed 's/^/| /' conftest.$ac_ext >&5
25380 -ac_header_compiler=no
25382 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
25383 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
25384 -echo "${ECHO_T}$ac_header_compiler" >&6
25386 -# Is the header present?
25387 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
25388 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
25389 -cat >conftest.$ac_ext <<_ACEOF
25392 -cat confdefs.h >>conftest.$ac_ext
25393 -cat >>conftest.$ac_ext <<_ACEOF
25394 -/* end confdefs.h. */
25395 -#include <$ac_header>
25397 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
25398 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
25400 - grep -v '^ *+' conftest.er1 >conftest.err
25401 - rm -f conftest.er1
25402 - cat conftest.err >&5
25403 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25404 - (exit $ac_status); } >/dev/null; then
25405 - if test -s conftest.err; then
25406 - ac_cpp_err=$ac_c_preproc_warn_flag
25407 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
25414 -if test -z "$ac_cpp_err"; then
25415 - ac_header_preproc=yes
25417 - echo "$as_me: failed program was:" >&5
25418 -sed 's/^/| /' conftest.$ac_ext >&5
25420 - ac_header_preproc=no
25422 -rm -f conftest.err conftest.$ac_ext
25423 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
25424 -echo "${ECHO_T}$ac_header_preproc" >&6
25426 -# So? What about this header?
25427 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
25429 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
25430 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
25431 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
25432 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
25433 - ac_header_preproc=yes
25436 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
25437 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
25438 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
25439 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
25440 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
25441 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
25442 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
25443 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
25444 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
25445 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
25446 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
25447 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
25450 -## ------------------------------------------ ##
25451 -## Report this to the AC_PACKAGE_NAME lists. ##
25452 -## ------------------------------------------ ##
25455 - sed "s/^/$as_me: WARNING: /" >&2
25458 -echo "$as_me:$LINENO: checking for $ac_header" >&5
25459 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
25460 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
25461 - echo $ECHO_N "(cached) $ECHO_C" >&6
25463 - eval "$as_ac_Header=\$ac_header_preproc"
25465 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
25466 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
25467 +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
25470 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
25471 + for ac_header in readline.h readline/readline.h
25473 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
25474 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
25475 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
25476 cat >>confdefs.h <<_ACEOF
25477 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
25478 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
25485 - echo "$as_me:$LINENO: checking whether readline supports history" >&5
25486 -echo $ECHO_N "checking whether readline supports history... $ECHO_C" >&6
25487 -if test "${ac_cv_lib_readline_history+set}" = set; then
25488 - echo $ECHO_N "(cached) $ECHO_C" >&6
25489 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5
25490 +$as_echo_n "checking whether readline supports history... " >&6; }
25491 +if ${ac_cv_lib_readline_history+:} false; then :
25492 + $as_echo_n "(cached) " >&6
25495 ac_cv_lib_readline_history="no"
25496 - cat >conftest.$ac_ext <<_ACEOF
25499 -cat confdefs.h >>conftest.$ac_ext
25500 -cat >>conftest.$ac_ext <<_ACEOF
25501 -/* end confdefs.h. */
25503 -/* Override any gcc2 internal prototype to avoid an error. */
25504 -#ifdef __cplusplus
25507 -/* We use char because int might match the return type of a gcc2
25508 - builtin and then its argument prototype would still apply. */
25509 -char add_history ();
25518 -rm -f conftest.$ac_objext conftest$ac_exeext
25519 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25520 - (eval $ac_link) 2>conftest.er1
25522 - grep -v '^ *+' conftest.er1 >conftest.err
25523 - rm -f conftest.er1
25524 - cat conftest.err >&5
25525 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25526 - (exit $ac_status); } &&
25527 - { ac_try='test -z "$ac_c_werror_flag"
25528 - || test ! -s conftest.err'
25529 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25530 - (eval $ac_try) 2>&5
25532 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25533 - (exit $ac_status); }; } &&
25534 - { ac_try='test -s conftest$ac_exeext'
25535 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25536 - (eval $ac_try) 2>&5
25538 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25539 - (exit $ac_status); }; }; then
25540 - ac_cv_lib_readline_history="yes"
25542 - echo "$as_me: failed program was:" >&5
25543 -sed 's/^/| /' conftest.$ac_ext >&5
25546 -rm -f conftest.err conftest.$ac_objext \
25547 - conftest$ac_exeext conftest.$ac_ext
25550 -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history" >&5
25551 -echo "${ECHO_T}$ac_cv_lib_readline_history" >&6
25552 - if test "$ac_cv_lib_readline_history" = "yes"; then
25554 -cat >>confdefs.h <<\_ACEOF
25555 -#define HAVE_READLINE_HISTORY 1
25560 -for ac_header in history.h readline/history.h
25562 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
25563 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
25564 - echo "$as_me:$LINENO: checking for $ac_header" >&5
25565 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
25566 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
25567 - echo $ECHO_N "(cached) $ECHO_C" >&6
25569 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
25570 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
25572 - # Is the header compilable?
25573 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
25574 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
25575 -cat >conftest.$ac_ext <<_ACEOF
25578 -cat confdefs.h >>conftest.$ac_ext
25579 -cat >>conftest.$ac_ext <<_ACEOF
25580 -/* end confdefs.h. */
25581 -$ac_includes_default
25582 -#include <$ac_header>
25584 -rm -f conftest.$ac_objext
25585 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
25586 - (eval $ac_compile) 2>conftest.er1
25588 - grep -v '^ *+' conftest.er1 >conftest.err
25589 - rm -f conftest.er1
25590 - cat conftest.err >&5
25591 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25592 - (exit $ac_status); } &&
25593 - { ac_try='test -z "$ac_c_werror_flag"
25594 - || test ! -s conftest.err'
25595 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25596 - (eval $ac_try) 2>&5
25598 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25599 - (exit $ac_status); }; } &&
25600 - { ac_try='test -s conftest.$ac_objext'
25601 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25602 - (eval $ac_try) 2>&5
25604 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25605 - (exit $ac_status); }; }; then
25606 - ac_header_compiler=yes
25608 - echo "$as_me: failed program was:" >&5
25609 -sed 's/^/| /' conftest.$ac_ext >&5
25611 -ac_header_compiler=no
25613 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
25614 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
25615 -echo "${ECHO_T}$ac_header_compiler" >&6
25617 -# Is the header present?
25618 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
25619 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
25620 -cat >conftest.$ac_ext <<_ACEOF
25623 -cat confdefs.h >>conftest.$ac_ext
25624 -cat >>conftest.$ac_ext <<_ACEOF
25625 -/* end confdefs.h. */
25626 -#include <$ac_header>
25628 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
25629 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
25631 - grep -v '^ *+' conftest.er1 >conftest.err
25632 - rm -f conftest.er1
25633 - cat conftest.err >&5
25634 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25635 - (exit $ac_status); } >/dev/null; then
25636 - if test -s conftest.err; then
25637 - ac_cpp_err=$ac_c_preproc_warn_flag
25638 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
25645 -if test -z "$ac_cpp_err"; then
25646 - ac_header_preproc=yes
25648 - echo "$as_me: failed program was:" >&5
25649 -sed 's/^/| /' conftest.$ac_ext >&5
25651 - ac_header_preproc=no
25653 -rm -f conftest.err conftest.$ac_ext
25654 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
25655 -echo "${ECHO_T}$ac_header_preproc" >&6
25657 -# So? What about this header?
25658 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
25660 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
25661 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
25662 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
25663 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
25664 - ac_header_preproc=yes
25667 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
25668 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
25669 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
25670 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
25671 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
25672 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
25673 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
25674 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
25675 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
25676 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
25677 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
25678 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
25681 -## ------------------------------------------ ##
25682 -## Report this to the AC_PACKAGE_NAME lists. ##
25683 -## ------------------------------------------ ##
25686 - sed "s/^/$as_me: WARNING: /" >&2
25689 -echo "$as_me:$LINENO: checking for $ac_header" >&5
25690 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
25691 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
25692 - echo $ECHO_N "(cached) $ECHO_C" >&6
25694 - eval "$as_ac_Header=\$ac_header_preproc"
25696 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
25697 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
25700 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
25701 - cat >>confdefs.h <<_ACEOF
25702 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
25714 -if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
25715 - { { echo "$as_me:$LINENO: error: *** readline library not found or it doesn't support history ***" >&5
25716 -echo "$as_me: error: *** readline library not found or it doesn't support history ***" >&2;}
25717 - { (exit 1); exit 1; }; }
25721 -if test x$ac_widec_possible = xyes; then
25723 -cat >>confdefs.h <<\_ACEOF
25724 -#define HANDLE_MULTIBYTE 1
25730 -for ac_func in resizeterm
25732 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
25733 -echo "$as_me:$LINENO: checking for $ac_func" >&5
25734 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
25735 -if eval "test \"\${$as_ac_var+set}\" = set"; then
25736 - echo $ECHO_N "(cached) $ECHO_C" >&6
25738 - cat >conftest.$ac_ext <<_ACEOF
25741 -cat confdefs.h >>conftest.$ac_ext
25742 -cat >>conftest.$ac_ext <<_ACEOF
25743 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25744 /* end confdefs.h. */
25745 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
25746 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
25747 -#define $ac_func innocuous_$ac_func
25749 -/* System header to define __stub macros and hopefully few prototypes,
25750 - which can conflict with char $ac_func (); below.
25751 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
25752 - <limits.h> exists even on freestanding compilers. */
25755 -# include <limits.h>
25757 -# include <assert.h>
25762 -/* Override any gcc2 internal prototype to avoid an error. */
25763 -#ifdef __cplusplus
25767 -/* We use char because int might match the return type of a gcc2
25768 - builtin and then its argument prototype would still apply. */
25770 -/* The GNU C library defines this for functions which it implements
25771 - to always fail with ENOSYS. Some functions are actually named
25772 - something starting with __ and the normal name is an alias. */
25773 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
25776 -char (*f) () = $ac_func;
25778 +/* Override any GCC internal prototype to avoid an error.
25779 + Use char because int might match the return type of a GCC
25780 + builtin and then its argument prototype would still apply. */
25786 +char add_history ();
25790 -return f != $ac_func;
25791 +return add_history ();
25796 -rm -f conftest.$ac_objext conftest$ac_exeext
25797 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25798 - (eval $ac_link) 2>conftest.er1
25800 - grep -v '^ *+' conftest.er1 >conftest.err
25801 - rm -f conftest.er1
25802 - cat conftest.err >&5
25803 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25804 - (exit $ac_status); } &&
25805 - { ac_try='test -z "$ac_c_werror_flag"
25806 - || test ! -s conftest.err'
25807 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25808 - (eval $ac_try) 2>&5
25810 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25811 - (exit $ac_status); }; } &&
25812 - { ac_try='test -s conftest$ac_exeext'
25813 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25814 - (eval $ac_try) 2>&5
25816 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25817 - (exit $ac_status); }; }; then
25818 - eval "$as_ac_var=yes"
25820 - echo "$as_me: failed program was:" >&5
25821 -sed 's/^/| /' conftest.$ac_ext >&5
25823 -eval "$as_ac_var=no"
25824 +if ac_fn_c_try_link "$LINENO"; then :
25825 + ac_cv_lib_readline_history="yes"
25827 -rm -f conftest.err conftest.$ac_objext \
25828 - conftest$ac_exeext conftest.$ac_ext
25829 +rm -f core conftest.err conftest.$ac_objext \
25830 + conftest$ac_exeext conftest.$ac_ext
25833 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
25834 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
25835 -if test `eval echo '${'$as_ac_var'}'` = yes; then
25836 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history" >&5
25837 +$as_echo "$ac_cv_lib_readline_history" >&6; }
25838 + if test "$ac_cv_lib_readline_history" = "yes"; then
25840 +$as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h
25842 + for ac_header in history.h readline/history.h
25844 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
25845 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
25846 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
25847 cat >>confdefs.h <<_ACEOF
25848 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
25849 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
25861 -for ac_func in snprintf vsnprintf
25863 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
25864 -echo "$as_me:$LINENO: checking for $ac_func" >&5
25865 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
25866 -if eval "test \"\${$as_ac_var+set}\" = set"; then
25867 - echo $ECHO_N "(cached) $ECHO_C" >&6
25869 - cat >conftest.$ac_ext <<_ACEOF
25872 -cat confdefs.h >>conftest.$ac_ext
25873 -cat >>conftest.$ac_ext <<_ACEOF
25874 -/* end confdefs.h. */
25875 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
25876 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
25877 -#define $ac_func innocuous_$ac_func
25878 +if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
25879 + as_fn_error $? "*** readline library not found or it doesn't support history ***" "$LINENO" 5
25882 -/* System header to define __stub macros and hopefully few prototypes,
25883 - which can conflict with char $ac_func (); below.
25884 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
25885 - <limits.h> exists even on freestanding compilers. */
25888 -# include <limits.h>
25890 -# include <assert.h>
25894 +# Check whether --enable-vformat was given.
25895 +if test "${enable_vformat+set}" = set; then :
25896 + enableval=$enable_vformat; case "${enableval}" in
25897 + yes) vformat=true ;;
25898 + no) vformat=false ;;
25899 + *) as_fn_error $? "bad value ${enableval} for --enable-vformat" "$LINENO" 5 ;;
25905 -/* Override any gcc2 internal prototype to avoid an error. */
25906 -#ifdef __cplusplus
25910 -/* We use char because int might match the return type of a gcc2
25911 +if test x$vformat = xtrue; then
25912 + ac_fn_c_check_header_mongrel "$LINENO" "vf_iface.h" "ac_cv_header_vf_iface_h" "$ac_includes_default"
25913 +if test "x$ac_cv_header_vf_iface_h" = xyes; then :
25915 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vf_read_file in -lvformat" >&5
25916 +$as_echo_n "checking for vf_read_file in -lvformat... " >&6; }
25917 +if ${ac_cv_lib_vformat_vf_read_file+:} false; then :
25918 + $as_echo_n "(cached) " >&6
25920 + ac_check_lib_save_LIBS=$LIBS
25921 +LIBS="-lvformat $LIBS"
25922 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25923 +/* end confdefs.h. */
25925 +/* Override any GCC internal prototype to avoid an error.
25926 + Use char because int might match the return type of a GCC
25927 builtin and then its argument prototype would still apply. */
25929 -/* The GNU C library defines this for functions which it implements
25930 - to always fail with ENOSYS. Some functions are actually named
25931 - something starting with __ and the normal name is an alias. */
25932 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
25935 -char (*f) () = $ac_func;
25942 +char vf_read_file ();
25946 -return f != $ac_func;
25947 +return vf_read_file ();
25952 -rm -f conftest.$ac_objext conftest$ac_exeext
25953 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
25954 - (eval $ac_link) 2>conftest.er1
25956 - grep -v '^ *+' conftest.er1 >conftest.err
25957 - rm -f conftest.er1
25958 - cat conftest.err >&5
25959 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25960 - (exit $ac_status); } &&
25961 - { ac_try='test -z "$ac_c_werror_flag"
25962 - || test ! -s conftest.err'
25963 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25964 - (eval $ac_try) 2>&5
25966 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25967 - (exit $ac_status); }; } &&
25968 - { ac_try='test -s conftest$ac_exeext'
25969 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
25970 - (eval $ac_try) 2>&5
25972 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
25973 - (exit $ac_status); }; }; then
25974 - eval "$as_ac_var=yes"
25975 +if ac_fn_c_try_link "$LINENO"; then :
25976 + ac_cv_lib_vformat_vf_read_file=yes
25978 - echo "$as_me: failed program was:" >&5
25979 -sed 's/^/| /' conftest.$ac_ext >&5
25980 + ac_cv_lib_vformat_vf_read_file=no
25982 +rm -f core conftest.err conftest.$ac_objext \
25983 + conftest$ac_exeext conftest.$ac_ext
25984 +LIBS=$ac_check_lib_save_LIBS
25986 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vformat_vf_read_file" >&5
25987 +$as_echo "$ac_cv_lib_vformat_vf_read_file" >&6; }
25988 +if test "x$ac_cv_lib_vformat_vf_read_file" = xyes; then :
25990 + MODULES="$MODULES m_vcf"
25992 +$as_echo "#define HAVE_VFORMAT 1" >>confdefs.h
26003 + if test x"$have_vformat" = "xyes"; then
26004 + ENABLE_VFORMAT_SUPPORT_TRUE=
26005 + ENABLE_VFORMAT_SUPPORT_FALSE='#'
26007 + ENABLE_VFORMAT_SUPPORT_TRUE='#'
26008 + ENABLE_VFORMAT_SUPPORT_FALSE=
26014 +if test x$ac_widec_possible = xyes; then
26016 +$as_echo "#define HANDLE_MULTIBYTE 1" >>confdefs.h
26020 +for ac_func in resizeterm
26022 + ac_fn_c_check_func "$LINENO" "resizeterm" "ac_cv_func_resizeterm"
26023 +if test "x$ac_cv_func_resizeterm" = xyes; then :
26024 + cat >>confdefs.h <<_ACEOF
26025 +#define HAVE_RESIZETERM 1
26028 -eval "$as_ac_var=no"
26030 -rm -f conftest.err conftest.$ac_objext \
26031 - conftest$ac_exeext conftest.$ac_ext
26035 +for ac_func in snprintf vsnprintf
26037 + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
26038 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
26039 +if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
26040 + cat >>confdefs.h <<_ACEOF
26041 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
26045 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
26046 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
26047 -if test `eval echo '${'$as_ac_var'}'` = yes; then
26051 +for ac_func in strcasestr
26053 + ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
26054 +if test "x$ac_cv_func_strcasestr" = xyes; then :
26055 cat >>confdefs.h <<_ACEOF
26056 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
26057 +#define HAVE_STRCASESTR 1
26059 + $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
26065 -# Check whether --enable-debug or --disable-debug was given.
26066 -if test "${enable_debug+set}" = set; then
26067 - enableval="$enable_debug"
26068 - case "${enableval}" in
26069 +# Check whether --enable-debug was given.
26070 +if test "${enable_debug+set}" = set; then :
26071 + enableval=$enable_debug; case "${enableval}" in
26074 - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
26075 -echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
26076 - { (exit 1); exit 1; }; } ;;
26077 + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
26085 if test x$debug = xtrue; then
26086 CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
26087 @@ -14492,7 +8176,8 @@
26088 CFLAGS="-Wall $CFLAGS"
26091 - ac_config_files="$ac_config_files Makefile abook.spec intl/Makefile po/Makefile.in"
26092 +ac_config_files="$ac_config_files Makefile abook.spec po/Makefile.in"
26094 cat >confcache <<\_ACEOF
26095 # This file is a shell script that caches the results of configure
26096 # tests run on this system so they can be shared between configure
26097 @@ -14511,39 +8196,70 @@
26099 # The following way of writing the cache mishandles newlines in values,
26100 # but we know of no workaround that is simple, portable, and efficient.
26101 -# So, don't put newlines in cache variables' values.
26102 +# So, we kill variables containing newlines.
26103 # Ultrix sh set writes to stderr and can't be redirected directly,
26104 # and sets the high bit in the cache file unless we assign to the vars.
26107 + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
26108 + eval ac_val=\$$ac_var
26109 + case $ac_val in #(
26111 + case $ac_var in #(
26112 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
26113 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
26115 + case $ac_var in #(
26116 + _ | IFS | as_nl) ;; #(
26117 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
26118 + *) { eval $ac_var=; unset $ac_var;} ;;
26124 - case `(ac_space=' '; set | grep ac_space) 2>&1` in
26126 - # `set' does not quote correctly, so add quotes (double-quote
26127 - # substitution turns \\\\ into \\, and sed turns \\ into \).
26128 + case $as_nl`(ac_space=' '; set) 2>&1` in #(
26129 + *${as_nl}ac_space=\ *)
26130 + # `set' does not quote correctly, so add quotes: double-quote
26131 + # substitution turns \\\\ into \\, and sed turns \\ into \.
26134 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
26138 # `set' quotes correctly as required by POSIX, so do not add quotes.
26140 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
26141 + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
26149 + /^ac_cv_env_/b end
26153 s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
26155 - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
26156 - : end' >>confcache
26157 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
26158 - if test -w $cache_file; then
26159 - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
26160 - cat confcache >$cache_file
26161 + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
26162 + :end' >>confcache
26163 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
26164 + if test -w "$cache_file"; then
26165 + if test "x$cache_file" != "x/dev/null"; then
26166 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
26167 +$as_echo "$as_me: updating cache $cache_file" >&6;}
26168 + if test ! -f "$cache_file" || test -h "$cache_file"; then
26169 + cat confcache >"$cache_file"
26171 + case $cache_file in #(
26173 + mv -f confcache "$cache_file"$$ &&
26174 + mv -f "$cache_file"$$ "$cache_file" ;; #(
26176 + mv -f confcache "$cache_file" ;;
26181 - echo "not updating unwritable cache $cache_file"
26182 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
26183 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
26187 @@ -14552,73 +8268,61 @@
26188 # Let make expand exec_prefix.
26189 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
26191 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
26192 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
26193 -# trailing colons and then remove the whole line if VPATH becomes empty
26194 -# (actually we leave an empty line to preserve line numbers).
26195 -if test "x$srcdir" = x.; then
26196 - ac_vpsub='/^[ ]*VPATH[ ]*=/{
26197 -s/:*\$(srcdir):*/:/;
26198 -s/:*\${srcdir}:*/:/;
26199 -s/:*@srcdir@:*/:/;
26200 -s/^\([^=]*=[ ]*\):*/\1/;
26206 DEFS=-DHAVE_CONFIG_H
26210 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
26211 # 1. Remove the extension, and $U if already installed.
26212 - ac_i=`echo "$ac_i" |
26213 - sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
26215 - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
26216 - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
26217 + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
26218 + ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
26219 + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
26220 + # will be set to the directory where LIBOBJS objects are built.
26221 + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
26222 + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
26224 LIBOBJS=$ac_libobjs
26226 LTLIBOBJS=$ac_ltlibobjs
26229 + if test -n "$EXEEXT"; then
26231 + am__EXEEXT_FALSE='#'
26233 + am__EXEEXT_TRUE='#'
26234 + am__EXEEXT_FALSE=
26237 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
26238 - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
26239 -Usually this means the macro was only invoked conditionally." >&5
26240 -echo "$as_me: error: conditional \"AMDEP\" was never defined.
26241 -Usually this means the macro was only invoked conditionally." >&2;}
26242 - { (exit 1); exit 1; }; }
26243 + as_fn_error $? "conditional \"AMDEP\" was never defined.
26244 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
26246 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
26247 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
26248 -Usually this means the macro was only invoked conditionally." >&5
26249 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
26250 -Usually this means the macro was only invoked conditionally." >&2;}
26251 - { (exit 1); exit 1; }; }
26252 + as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
26253 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
26255 if test -z "${USE_INCLUDED_INTL_H_TRUE}" && test -z "${USE_INCLUDED_INTL_H_FALSE}"; then
26256 - { { echo "$as_me:$LINENO: error: conditional \"USE_INCLUDED_INTL_H\" was never defined.
26257 -Usually this means the macro was only invoked conditionally." >&5
26258 -echo "$as_me: error: conditional \"USE_INCLUDED_INTL_H\" was never defined.
26259 -Usually this means the macro was only invoked conditionally." >&2;}
26260 - { (exit 1); exit 1; }; }
26261 + as_fn_error $? "conditional \"USE_INCLUDED_INTL_H\" was never defined.
26262 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
26264 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
26265 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
26266 -Usually this means the macro was only invoked conditionally." >&5
26267 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
26268 -Usually this means the macro was only invoked conditionally." >&2;}
26269 - { (exit 1); exit 1; }; }
26270 + as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
26271 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
26273 +if test -z "${ENABLE_VFORMAT_SUPPORT_TRUE}" && test -z "${ENABLE_VFORMAT_SUPPORT_FALSE}"; then
26274 + as_fn_error $? "conditional \"ENABLE_VFORMAT_SUPPORT\" was never defined.
26275 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
26278 -: ${CONFIG_STATUS=./config.status}
26279 +: "${CONFIG_STATUS=./config.status}"
26281 ac_clean_files_save=$ac_clean_files
26282 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
26283 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
26284 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
26285 -cat >$CONFIG_STATUS <<_ACEOF
26286 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
26287 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
26289 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
26291 # Generated by $as_me.
26292 # Run this file to recreate the current configuration.
26293 @@ -14628,81 +8332,253 @@
26295 ac_cs_recheck=false
26297 -SHELL=\${CONFIG_SHELL-$SHELL}
26300 -cat >>$CONFIG_STATUS <<\_ACEOF
26301 -## --------------------- ##
26302 -## M4sh Initialization. ##
26303 -## --------------------- ##
26304 +SHELL=\${CONFIG_SHELL-$SHELL}
26307 +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
26308 +## -------------------- ##
26309 +## M4sh Initialization. ##
26310 +## -------------------- ##
26312 -# Be Bourne compatible
26313 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
26314 +# Be more Bourne compatible
26315 +DUALCASE=1; export DUALCASE # for MKS sh
26316 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
26319 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
26320 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
26321 # is contrary to our usage. Disable this feature.
26322 alias -g '${1+"$@"}'='"$@"'
26323 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
26325 + setopt NO_GLOB_SUBST
26327 + case `(set -o) 2>/dev/null` in #(
26329 + set -o posix ;; #(
26334 -DUALCASE=1; export DUALCASE # for MKS sh
26336 -# Support unset when possible.
26337 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
26345 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
26346 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
26347 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
26348 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
26349 +# Prefer a ksh shell builtin over an external printf program on Solaris,
26350 +# but without wasting forks for bash or zsh.
26351 +if test -z "$BASH_VERSION$ZSH_VERSION" \
26352 + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
26353 + as_echo='print -r --'
26354 + as_echo_n='print -rn --'
26355 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
26356 + as_echo='printf %s\n'
26357 + as_echo_n='printf %s'
26359 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
26360 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
26361 + as_echo_n='/usr/ucb/echo -n'
26363 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
26364 + as_echo_n_body='eval
26368 + expr "X$arg" : "X\\(.*\\)$as_nl";
26369 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
26371 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
26373 + export as_echo_n_body
26374 + as_echo_n='sh -c $as_echo_n_body as_echo'
26376 + export as_echo_body
26377 + as_echo='sh -c $as_echo_body as_echo'
26380 +# The user is always right.
26381 +if test "${PATH_SEPARATOR+set}" != set; then
26383 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
26384 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
26385 + PATH_SEPARATOR=';'
26390 -# Work around bugs in pre-3.0 UWIN ksh.
26391 -$as_unset ENV MAIL MAILPATH
26393 +# We need space, tab and new line, in precisely that order. Quoting is
26394 +# there to prevent editors from complaining about space-tab.
26395 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
26396 +# splitting by setting IFS to empty value.)
26399 +# Find who we are. Look in the path if we contain no directory separator.
26402 + *[\\/]* ) as_myself=$0 ;;
26403 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
26404 +for as_dir in $PATH
26407 + test -z "$as_dir" && as_dir=.
26408 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
26414 +# We did not find ourselves, most probably we were run as `sh COMMAND'
26415 +# in which case we are not to be found in the path.
26416 +if test "x$as_myself" = x; then
26419 +if test ! -f "$as_myself"; then
26420 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
26424 +# Unset variables that we do not need and which cause bugs (e.g. in
26425 +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
26426 +# suppresses any "Segmentation fault" message there. '((' could
26427 +# trigger a bug in pdksh 5.2.14.
26428 +for as_var in BASH_ENV ENV MAIL MAILPATH
26429 +do eval test x\${$as_var+set} = xset \
26430 + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
26438 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
26439 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
26440 - LC_TELEPHONE LC_TIME
26442 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
26443 - eval $as_var=C; export $as_var
26445 - $as_unset $as_var
26454 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
26457 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
26458 +# ----------------------------------------
26459 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
26460 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
26461 +# script with STATUS, using 1 if that was 0.
26464 + as_status=$1; test $as_status -eq 0 && as_status=1
26465 + if test "$4"; then
26466 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
26467 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
26469 + $as_echo "$as_me: error: $2" >&2
26470 + as_fn_exit $as_status
26474 +# as_fn_set_status STATUS
26475 +# -----------------------
26476 +# Set $? to STATUS, without forking.
26477 +as_fn_set_status ()
26480 +} # as_fn_set_status
26482 +# as_fn_exit STATUS
26483 +# -----------------
26484 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
26488 + as_fn_set_status $1
26494 +# Portably unset VAR.
26497 + { eval $1=; unset $1;}
26499 +as_unset=as_fn_unset
26500 +# as_fn_append VAR VALUE
26501 +# ----------------------
26502 +# Append the text in VALUE to the end of the definition contained in VAR. Take
26503 +# advantage of any shell optimizations that allow amortized linear growth over
26504 +# repeated appends, instead of the typical quadratic growth present in naive
26505 +# implementations.
26506 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
26507 + eval 'as_fn_append ()
26518 +# as_fn_arith ARG...
26519 +# ------------------
26520 +# Perform arithmetic evaluation on the ARGs, and store the result in the
26521 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
26522 +# must be portable across $(()) and expr.
26523 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
26524 + eval 'as_fn_arith ()
26531 + as_val=`expr "$@" || test $? -eq 1`
26535 -# Required to use basename.
26536 -if expr a : '\(a\)' >/dev/null 2>&1; then
26538 +if expr a : '\(a\)' >/dev/null 2>&1 &&
26539 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
26545 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
26546 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
26547 as_basename=basename
26552 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
26553 + as_dirname=dirname
26558 -# Name of the executable.
26559 -as_me=`$as_basename "$0" ||
26560 +as_me=`$as_basename -- "$0" ||
26561 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
26562 X"$0" : 'X\(//\)$' \| \
26563 - X"$0" : 'X\(/\)$' \| \
26564 - . : '\(.\)' 2>/dev/null ||
26566 - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
26567 - /^X\/\(\/\/\)$/{ s//\1/; q; }
26568 - /^X\/\(\/\).*/{ s//\1/; q; }
26571 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
26573 + sed '/^.*\/\([^/][^/]*\)\/*$/{
26587 -# PATH needs CR, and LINENO needs CR and PATH.
26588 # Avoid depending upon Character Ranges.
26589 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
26590 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
26591 @@ -14710,181 +8586,133 @@
26592 as_cr_digits='0123456789'
26593 as_cr_alnum=$as_cr_Letters$as_cr_digits
26595 -# The user is always right.
26596 -if test "${PATH_SEPARATOR+set}" != set; then
26597 - echo "#! /bin/sh" >conf$$.sh
26598 - echo "exit 0" >>conf$$.sh
26599 - chmod +x conf$$.sh
26600 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
26601 - PATH_SEPARATOR=';'
26609 - as_lineno_1=$LINENO
26610 - as_lineno_2=$LINENO
26611 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
26612 - test "x$as_lineno_1" != "x$as_lineno_2" &&
26613 - test "x$as_lineno_3" = "x$as_lineno_2" || {
26614 - # Find who we are. Look in the path if we contain no path at all
26615 - # relative or not.
26617 - *[\\/]* ) as_myself=$0 ;;
26618 - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
26619 -for as_dir in $PATH
26622 - test -z "$as_dir" && as_dir=.
26623 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
26628 - # We did not find ourselves, most probably we were run as `sh COMMAND'
26629 - # in which case we are not to be found in the path.
26630 - if test "x$as_myself" = x; then
26633 - if test ! -f "$as_myself"; then
26634 - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
26635 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
26636 - { (exit 1); exit 1; }; }
26638 - case $CONFIG_SHELL in
26640 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
26641 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
26644 - test -z "$as_dir" && as_dir=.
26645 - for as_base in sh bash ksh sh5; do
26648 - if ("$as_dir/$as_base" -c '
26649 - as_lineno_1=$LINENO
26650 - as_lineno_2=$LINENO
26651 - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
26652 - test "x$as_lineno_1" != "x$as_lineno_2" &&
26653 - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
26654 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
26655 - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
26656 - CONFIG_SHELL=$as_dir/$as_base
26657 - export CONFIG_SHELL
26658 - exec "$CONFIG_SHELL" "$0" ${1+"$@"}
26666 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
26667 - # uniformly replaced by the line number. The first 'sed' inserts a
26668 - # line-number line before each line; the second 'sed' does the real
26669 - # work. The second script uses 'N' to pair each line-number line
26670 - # with the numbered line, and appends trailing '-' during
26671 - # substitution so that $LINENO is not a special case at line end.
26672 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
26673 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
26674 - sed '=' <$as_myself |
26679 - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
26682 - s,^['$as_cr_digits']*\n,,
26683 - ' >$as_me.lineno &&
26684 - chmod +x $as_me.lineno ||
26685 - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
26686 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
26687 - { (exit 1); exit 1; }; }
26689 - # Don't try to exec as it changes $[0], causing all sort of problems
26690 - # (the dirname of $[0] is not the place where we might find the
26691 - # original and so on. Autoconf is especially sensible to this).
26692 - . ./$as_me.lineno
26693 - # Exit status is that of the last command.
26698 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
26699 - *c*,-n*) ECHO_N= ECHO_C='
26701 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
26702 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
26703 +ECHO_C= ECHO_N= ECHO_T=
26704 +case `echo -n x` in #(((((
26706 + case `echo 'xy\c'` in
26707 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
26708 + xy) ECHO_C='\c';;
26709 + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
26716 -if expr a : '\(a\)' >/dev/null 2>&1; then
26718 +rm -f conf$$ conf$$.exe conf$$.file
26719 +if test -d conf$$.dir; then
26720 + rm -f conf$$.dir/conf$$.file
26724 + mkdir conf$$.dir 2>/dev/null
26727 -rm -f conf$$ conf$$.exe conf$$.file
26729 -if ln -s conf$$.file conf$$ 2>/dev/null; then
26730 - # We could just check for DJGPP; but this test a) works b) is more generic
26731 - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
26732 - if test -f conf$$.exe; then
26733 - # Don't use ln at all; we don't have any links
26736 +if (echo >conf$$.file) 2>/dev/null; then
26737 + if ln -s conf$$.file conf$$ 2>/dev/null; then
26739 + # ... but there are two gotchas:
26740 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
26741 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
26742 + # In both cases, we have to default to `cp -pR'.
26743 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
26745 + elif ln conf$$.file conf$$ 2>/dev/null; then
26750 -elif ln conf$$.file conf$$ 2>/dev/null; then
26756 -rm -f conf$$ conf$$.exe conf$$.file
26757 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
26758 +rmdir conf$$.dir 2>/dev/null
26763 +# Create "$as_dir" as a directory, including parents if necessary.
26767 + case $as_dir in #(
26768 + -*) as_dir=./$as_dir;;
26770 + test -d "$as_dir" || eval $as_mkdir_p || {
26773 + case $as_dir in #(
26774 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
26775 + *) as_qdir=$as_dir;;
26777 + as_dirs="'$as_qdir' $as_dirs"
26778 + as_dir=`$as_dirname -- "$as_dir" ||
26779 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
26780 + X"$as_dir" : 'X\(//\)[^/]' \| \
26781 + X"$as_dir" : 'X\(//\)$' \| \
26782 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
26783 +$as_echo X"$as_dir" |
26784 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
26788 + /^X\(\/\/\)[^/].*/{
26801 + test -d "$as_dir" && break
26803 + test -z "$as_dirs" || eval "mkdir $as_dirs"
26804 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
26808 if mkdir -p . 2>/dev/null; then
26810 + as_mkdir_p='mkdir -p "$as_dir"'
26812 test -d ./-p && rmdir ./-p
26816 -as_executable_p="test -f"
26818 +# as_fn_executable_p FILE
26819 +# -----------------------
26820 +# Test if FILE is an executable regular file.
26821 +as_fn_executable_p ()
26823 + test -f "$1" && test -x "$1"
26824 +} # as_fn_executable_p
26825 +as_test_x='test -x'
26826 +as_executable_p=as_fn_executable_p
26828 # Sed expression to map a string onto a valid CPP name.
26829 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
26831 # Sed expression to map a string onto a valid variable name.
26832 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
26836 -# We need space, tab and new line, in precisely that order.
26846 -# Open the log real soon, to keep \$[0] and so on meaningful, and to
26847 -# report actual input values of CONFIG_FILES etc. instead of their
26848 -# values after options handling. Logging --version etc. is OK.
26849 -exec 5>>config.log
26852 - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
26853 -## Running $as_me. ##
26857 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
26861 +## ----------------------------------- ##
26862 +## Main body of $CONFIG_STATUS script. ##
26863 +## ----------------------------------- ##
26865 +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
26867 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26868 +# Save the log message, to keep $0 and so on meaningful, and to
26869 +# report actual input values of CONFIG_FILES etc. instead of their
26870 +# values after options handling.
26872 This file was extended by $as_me, which was
26873 -generated by GNU Autoconf 2.59. Invocation command line was
26874 +generated by GNU Autoconf 2.69. Invocation command line was
26876 CONFIG_FILES = $CONFIG_FILES
26877 CONFIG_HEADERS = $CONFIG_HEADERS
26878 @@ -14892,45 +8720,47 @@
26879 CONFIG_COMMANDS = $CONFIG_COMMANDS
26883 -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
26885 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
26890 -# Files that config.status was made for.
26891 -if test -n "$ac_config_files"; then
26892 - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
26894 +case $ac_config_files in *"
26895 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
26898 -if test -n "$ac_config_headers"; then
26899 - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
26901 +case $ac_config_headers in *"
26902 +"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
26905 -if test -n "$ac_config_links"; then
26906 - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
26909 -if test -n "$ac_config_commands"; then
26910 - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
26912 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26913 +# Files that config.status was made for.
26914 +config_files="$ac_config_files"
26915 +config_headers="$ac_config_headers"
26916 +config_commands="$ac_config_commands"
26918 -cat >>$CONFIG_STATUS <<\_ACEOF
26921 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26923 -\`$as_me' instantiates files from templates according to the
26924 -current configuration.
26925 +\`$as_me' instantiates files and other configuration actions
26926 +from templates according to the current configuration. Unless the files
26927 +and actions are specified as TAGs, all are instantiated by default.
26929 -Usage: $0 [OPTIONS] [FILE]...
26930 +Usage: $0 [OPTION]... [TAG]...
26932 -h, --help print this help, then exit
26933 - -V, --version print version number, then exit
26934 - -q, --quiet do not print progress messages
26935 + -V, --version print version number and configuration settings, then exit
26936 + --config print configuration, then exit
26937 + -q, --quiet, --silent
26938 + do not print progress messages
26939 -d, --debug don't remove temporary files
26940 --recheck update $as_me by reconfiguring in the same conditions
26941 - --file=FILE[:TEMPLATE]
26942 - instantiate the configuration file FILE
26943 - --header=FILE[:TEMPLATE]
26944 - instantiate the configuration header FILE
26945 + --file=FILE[:TEMPLATE]
26946 + instantiate the configuration file FILE
26947 + --header=FILE[:TEMPLATE]
26948 + instantiate the configuration header FILE
26950 Configuration files:
26952 @@ -14941,84 +8771,92 @@
26953 Configuration commands:
26956 -Report bugs to <bug-autoconf@gnu.org>."
26958 +Report bugs to the package provider."
26960 -cat >>$CONFIG_STATUS <<_ACEOF
26962 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26963 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
26966 -configured by $0, generated by GNU Autoconf 2.59,
26967 - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
26968 +configured by $0, generated by GNU Autoconf 2.69,
26969 + with options \\"\$ac_cs_config\\"
26971 -Copyright (C) 2003 Free Software Foundation, Inc.
26972 +Copyright (C) 2012 Free Software Foundation, Inc.
26973 This config.status script is free software; the Free Software Foundation
26974 gives unlimited permission to copy, distribute and modify it."
26976 -INSTALL="$INSTALL"
26980 +INSTALL='$INSTALL'
26981 +MKDIR_P='$MKDIR_P'
26983 +test -n "\$AWK" || AWK=awk
26986 -cat >>$CONFIG_STATUS <<\_ACEOF
26987 -# If no file are specified by the user, then we need to provide default
26988 -# value. By we need to know if files were specified by the user.
26989 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26990 +# The default lists apply if the user does not specify any file.
26996 - ac_option=`expr "x$1" : 'x\([^=]*\)='`
26997 - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
26999 + ac_option=`expr "X$1" : 'X\([^=]*\)='`
27000 + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
27004 + ac_option=`expr "X$1" : 'X\([^=]*\)='`
27014 - *) # This is not an option, so the user has probably given explicit
27017 - ac_need_defaults=false;;
27021 # Handling of the options.
27023 -cat >>$CONFIG_STATUS <<\_ACEOF
27024 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
27026 - --version | --vers* | -V )
27027 - echo "$ac_cs_version"; exit 0 ;;
27029 - # Conflict between --help and --header
27030 - { { echo "$as_me:$LINENO: error: ambiguous option: $1
27031 -Try \`$0 --help' for more information." >&5
27032 -echo "$as_me: error: ambiguous option: $1
27033 -Try \`$0 --help' for more information." >&2;}
27034 - { (exit 1); exit 1; }; };;
27035 - --help | --hel | -h )
27036 - echo "$ac_cs_usage"; exit 0 ;;
27037 - --debug | --d* | -d )
27038 + --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
27039 + $as_echo "$ac_cs_version"; exit ;;
27040 + --config | --confi | --conf | --con | --co | --c )
27041 + $as_echo "$ac_cs_config"; exit ;;
27042 + --debug | --debu | --deb | --de | --d | -d )
27044 --file | --fil | --fi | --f )
27046 - CONFIG_FILES="$CONFIG_FILES $ac_optarg"
27047 + case $ac_optarg in
27048 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
27049 + '') as_fn_error $? "missing file argument" ;;
27051 + as_fn_append CONFIG_FILES " '$ac_optarg'"
27052 ac_need_defaults=false;;
27053 --header | --heade | --head | --hea )
27055 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
27056 + case $ac_optarg in
27057 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
27059 + as_fn_append CONFIG_HEADERS " '$ac_optarg'"
27060 ac_need_defaults=false;;
27062 + # Conflict between --help and --header
27063 + as_fn_error $? "ambiguous option: \`$1'
27064 +Try \`$0 --help' for more information.";;
27065 + --help | --hel | -h )
27066 + $as_echo "$ac_cs_usage"; exit ;;
27067 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
27068 | -silent | --silent | --silen | --sile | --sil | --si | --s)
27071 # This is an error.
27072 - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
27073 -Try \`$0 --help' for more information." >&5
27074 -echo "$as_me: error: unrecognized option: $1
27075 -Try \`$0 --help' for more information." >&2;}
27076 - { (exit 1); exit 1; }; } ;;
27077 + -*) as_fn_error $? "unrecognized option: \`$1'
27078 +Try \`$0 --help' for more information." ;;
27080 - *) ac_config_targets="$ac_config_targets $1" ;;
27081 + *) as_fn_append ac_config_targets " $1"
27082 + ac_need_defaults=false ;;
27086 @@ -15032,50 +8870,61 @@
27090 -cat >>$CONFIG_STATUS <<_ACEOF
27091 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27092 if \$ac_cs_recheck; then
27093 - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
27094 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
27095 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
27097 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
27098 + CONFIG_SHELL='$SHELL'
27099 + export CONFIG_SHELL
27104 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27105 +exec 5>>config.log
27108 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
27109 +## Running $as_me. ##
27111 + $as_echo "$ac_log"
27114 -cat >>$CONFIG_STATUS <<_ACEOF
27116 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27118 -# INIT-COMMANDS section.
27122 +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
27123 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
27124 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
27126 + # from automake < 1.5.
27127 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
27128 # Capture the value of LINGUAS because we need it to compute CATALOGS.
27129 LINGUAS="${LINGUAS-%UNSET%}"
27131 -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
27135 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27138 -cat >>$CONFIG_STATUS <<\_ACEOF
27139 +# Handling of arguments.
27140 for ac_config_target in $ac_config_targets
27142 - case "$ac_config_target" in
27143 - # Handling of arguments.
27144 - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
27145 - "abook.spec" ) CONFIG_FILES="$CONFIG_FILES abook.spec" ;;
27146 - "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
27147 - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
27148 - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
27149 - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
27150 - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
27151 - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
27152 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
27153 - { (exit 1); exit 1; }; };;
27154 + case $ac_config_target in
27155 + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
27156 + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
27157 + "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
27158 + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
27159 + "abook.spec") CONFIG_FILES="$CONFIG_FILES abook.spec" ;;
27160 + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
27162 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
27167 # If the user did not use the arguments to specify the items to instantiate,
27168 # then the envvar interface is used. Set only those that are not.
27169 # We use the long form for the default assignment because of an extremely
27170 @@ -15087,758 +8936,680 @@
27173 # Have a temporary directory for convenience. Make it in the build tree
27174 -# simply because there is no reason to put it here, and in addition,
27175 +# simply because there is no reason against having it here, and in addition,
27176 # creating and moving files from /tmp can sometimes cause problems.
27177 -# Create a temporary directory, and hook for its removal unless debugging.
27178 +# Hook for its removal unless debugging.
27179 +# Note that there is a small window in which the directory will not be cleaned:
27180 +# after its creation but before its name has been assigned to `$tmp'.
27183 - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
27184 - trap '{ (exit 1); exit 1; }' 1 2 13 15
27186 + trap 'exit_status=$?
27187 + : "${ac_tmp:=$tmp}"
27188 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
27190 + trap 'as_fn_exit 1' 1 2 13 15
27193 # Create a (secure) tmp directory for tmp files.
27196 - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
27197 - test -n "$tmp" && test -d "$tmp"
27198 + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
27202 - tmp=./confstat$$-$RANDOM
27203 - (umask 077 && mkdir $tmp)
27205 + tmp=./conf$$-$RANDOM
27206 + (umask 077 && mkdir "$tmp")
27207 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
27210 +# Set up the scripts for CONFIG_FILES section.
27211 +# No need to generate them if there are no CONFIG_FILES.
27212 +# This happens for instance with `./config.status config.h'.
27213 +if test -n "$CONFIG_FILES"; then
27216 +ac_cr=`echo X | tr X '\015'`
27217 +# On cygwin, bash can eat \r inside `` if the user requested igncr.
27218 +# But we know of no other shell where ac_cr would be empty at this
27219 +# point, so we can use a bashism as a fallback.
27220 +if test "x$ac_cr" = x; then
27221 + eval ac_cr=\$\'\\r\'
27223 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
27224 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
27225 + ac_cs_awk_cr='\\r'
27227 + ac_cs_awk_cr=$ac_cr
27230 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
27235 - echo "$me: cannot create a temporary directory in ." >&2
27236 - { (exit 1); exit 1; }
27237 + echo "cat >conf$$subs.awk <<_ACEOF" &&
27238 + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
27240 +} >conf$$subs.sh ||
27241 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
27242 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
27244 +for ac_last_try in false false false false false :; do
27245 + . ./conf$$subs.sh ||
27246 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
27248 + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
27249 + if test $ac_delim_n = $ac_delim_num; then
27251 + elif $ac_last_try; then
27252 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
27254 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
27257 +rm -f conf$$subs.sh
27259 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27260 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
27264 +s/^/S["/; s/!.*/"]=/
27270 +s/'"$ac_delim"'$//
27274 +s/\(.\{148\}\)..*/\1/
27276 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
27281 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
27288 +s/\(.\{148\}\)..*/\1/
27290 +s/["\\]/\\&/g; s/^/"/; s/$/"/
27294 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
27299 +' <conf$$subs.awk | sed '
27304 +' >>$CONFIG_STATUS || ac_write_fail=1
27305 +rm -f conf$$subs.awk
27306 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27308 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
27309 + for (key in S) S_is_set[key] = 1
27315 + nfields = split(line, field, "@")
27317 + len = length(field[1])
27318 + for (i = 2; i < nfields; i++) {
27320 + keylen = length(key)
27321 + if (S_is_set[key]) {
27323 + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
27324 + len += length(value) + length(field[++i])
27327 + len += 1 + keylen
27335 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27336 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
27337 + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
27340 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
27341 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
27344 -cat >>$CONFIG_STATUS <<_ACEOF
27345 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
27346 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
27347 +# trailing colons and then remove the whole line if VPATH becomes empty
27348 +# (actually we leave an empty line to preserve line numbers).
27349 +if test "x$srcdir" = x.; then
27350 + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
27355 +s/:\$(srcdir):/:/g
27356 +s/:\${srcdir}:/:/g
27369 -# CONFIG_FILES section.
27371 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27372 +fi # test -n "$CONFIG_FILES"
27374 -# No need to generate the scripts if there are no CONFIG_FILES.
27375 -# This happens for instance when ./config.status config.h
27376 -if test -n "\$CONFIG_FILES"; then
27377 - # Protect against being on the right side of a sed subst in config.status.
27378 - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
27379 - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
27380 -s,@SHELL@,$SHELL,;t t
27381 -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
27382 -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
27383 -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
27384 -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
27385 -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
27386 -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
27387 -s,@exec_prefix@,$exec_prefix,;t t
27388 -s,@prefix@,$prefix,;t t
27389 -s,@program_transform_name@,$program_transform_name,;t t
27390 -s,@bindir@,$bindir,;t t
27391 -s,@sbindir@,$sbindir,;t t
27392 -s,@libexecdir@,$libexecdir,;t t
27393 -s,@datadir@,$datadir,;t t
27394 -s,@sysconfdir@,$sysconfdir,;t t
27395 -s,@sharedstatedir@,$sharedstatedir,;t t
27396 -s,@localstatedir@,$localstatedir,;t t
27397 -s,@libdir@,$libdir,;t t
27398 -s,@includedir@,$includedir,;t t
27399 -s,@oldincludedir@,$oldincludedir,;t t
27400 -s,@infodir@,$infodir,;t t
27401 -s,@mandir@,$mandir,;t t
27402 -s,@build_alias@,$build_alias,;t t
27403 -s,@host_alias@,$host_alias,;t t
27404 -s,@target_alias@,$target_alias,;t t
27405 -s,@DEFS@,$DEFS,;t t
27406 -s,@ECHO_C@,$ECHO_C,;t t
27407 -s,@ECHO_N@,$ECHO_N,;t t
27408 -s,@ECHO_T@,$ECHO_T,;t t
27409 -s,@LIBS@,$LIBS,;t t
27410 -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
27411 -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
27412 -s,@INSTALL_DATA@,$INSTALL_DATA,;t t
27413 -s,@CYGPATH_W@,$CYGPATH_W,;t t
27414 -s,@PACKAGE@,$PACKAGE,;t t
27415 -s,@VERSION@,$VERSION,;t t
27416 -s,@ACLOCAL@,$ACLOCAL,;t t
27417 -s,@AUTOCONF@,$AUTOCONF,;t t
27418 -s,@AUTOMAKE@,$AUTOMAKE,;t t
27419 -s,@AUTOHEADER@,$AUTOHEADER,;t t
27420 -s,@MAKEINFO@,$MAKEINFO,;t t
27421 -s,@install_sh@,$install_sh,;t t
27422 -s,@STRIP@,$STRIP,;t t
27423 -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
27424 -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
27425 -s,@mkdir_p@,$mkdir_p,;t t
27427 -s,@SET_MAKE@,$SET_MAKE,;t t
27428 -s,@am__leading_dot@,$am__leading_dot,;t t
27429 -s,@AMTAR@,$AMTAR,;t t
27430 -s,@am__tar@,$am__tar,;t t
27431 -s,@am__untar@,$am__untar,;t t
27432 -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
27433 -s,@USE_NLS@,$USE_NLS,;t t
27434 -s,@MSGFMT@,$MSGFMT,;t t
27435 -s,@GMSGFMT@,$GMSGFMT,;t t
27436 -s,@XGETTEXT@,$XGETTEXT,;t t
27437 -s,@MSGMERGE@,$MSGMERGE,;t t
27439 -s,@CFLAGS@,$CFLAGS,;t t
27440 -s,@LDFLAGS@,$LDFLAGS,;t t
27441 -s,@CPPFLAGS@,$CPPFLAGS,;t t
27442 -s,@ac_ct_CC@,$ac_ct_CC,;t t
27443 -s,@EXEEXT@,$EXEEXT,;t t
27444 -s,@OBJEXT@,$OBJEXT,;t t
27445 -s,@DEPDIR@,$DEPDIR,;t t
27446 -s,@am__include@,$am__include,;t t
27447 -s,@am__quote@,$am__quote,;t t
27448 -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
27449 -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
27450 -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
27451 -s,@CCDEPMODE@,$CCDEPMODE,;t t
27452 -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
27453 -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
27454 -s,@build@,$build,;t t
27455 -s,@build_cpu@,$build_cpu,;t t
27456 -s,@build_vendor@,$build_vendor,;t t
27457 -s,@build_os@,$build_os,;t t
27458 -s,@host@,$host,;t t
27459 -s,@host_cpu@,$host_cpu,;t t
27460 -s,@host_vendor@,$host_vendor,;t t
27461 -s,@host_os@,$host_os,;t t
27463 -s,@EGREP@,$EGREP,;t t
27464 -s,@GLIBC2@,$GLIBC2,;t t
27465 -s,@RANLIB@,$RANLIB,;t t
27466 -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
27467 -s,@ALLOCA@,$ALLOCA,;t t
27468 -s,@GLIBC21@,$GLIBC21,;t t
27469 -s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
27470 -s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
27471 -s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
27472 -s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
27473 -s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
27474 -s,@LIBICONV@,$LIBICONV,;t t
27475 -s,@LTLIBICONV@,$LTLIBICONV,;t t
27476 -s,@INTLBISON@,$INTLBISON,;t t
27477 -s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
27478 -s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
27479 -s,@CATOBJEXT@,$CATOBJEXT,;t t
27480 -s,@DATADIRNAME@,$DATADIRNAME,;t t
27481 -s,@INSTOBJEXT@,$INSTOBJEXT,;t t
27482 -s,@GENCAT@,$GENCAT,;t t
27483 -s,@INTLOBJS@,$INTLOBJS,;t t
27484 -s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
27485 -s,@INTLLIBS@,$INTLLIBS,;t t
27486 -s,@LIBINTL@,$LIBINTL,;t t
27487 -s,@LTLIBINTL@,$LTLIBINTL,;t t
27488 -s,@POSUB@,$POSUB,;t t
27489 -s,@localedir@,$localedir,;t t
27490 -s,@USE_INCLUDED_INTL_H_TRUE@,$USE_INCLUDED_INTL_H_TRUE,;t t
27491 -s,@USE_INCLUDED_INTL_H_FALSE@,$USE_INCLUDED_INTL_H_FALSE,;t t
27493 -s,@ANSI2KNR@,$ANSI2KNR,;t t
27494 -s,@LIBOBJS@,$LIBOBJS,;t t
27495 -s,@LTLIBOBJS@,$LTLIBOBJS,;t t
27500 - cat >>$CONFIG_STATUS <<\_ACEOF
27501 - # Split the substitutions into bite-sized pieces for seds with
27502 - # small command number limits, like on Digital OSF/1 and HP-UX.
27503 - ac_max_sed_lines=48
27504 - ac_sed_frag=1 # Number of current file.
27505 - ac_beg=1 # First line for current file.
27506 - ac_end=$ac_max_sed_lines # Line after last line for current file.
27509 - while $ac_more_lines; do
27510 - if test $ac_beg -gt 1; then
27511 - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
27513 - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
27515 - if test ! -s $tmp/subs.frag; then
27516 - ac_more_lines=false
27518 - # The purpose of the label and of the branching condition is to
27519 - # speed up the sed processing (if there are no `@' at all, there
27520 - # is no need to browse any of the substitutions).
27521 - # These are the two extra sed commands mentioned above.
27523 - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
27524 - if test -z "$ac_sed_cmds"; then
27525 - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
27527 - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
27529 - ac_sed_frag=`expr $ac_sed_frag + 1`
27531 - ac_end=`expr $ac_end + $ac_max_sed_lines`
27534 - if test -z "$ac_sed_cmds"; then
27536 +# Set up the scripts for CONFIG_HEADERS section.
27537 +# No need to generate them if there are no CONFIG_HEADERS.
27538 +# This happens for instance with `./config.status Makefile'.
27539 +if test -n "$CONFIG_HEADERS"; then
27540 +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
27544 +# Transform confdefs.h into an awk script `defines.awk', embedded as
27545 +# here-document in config.status, that substitutes the proper values into
27546 +# config.h.in to produce config.h.
27548 +# Create a delimiter string that does not exist in confdefs.h, to ease
27549 +# handling of long lines.
27551 +for ac_last_try in false false :; do
27552 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
27553 + if test -z "$ac_tt"; then
27555 + elif $ac_last_try; then
27556 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
27558 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
27560 -fi # test -n "$CONFIG_FILES"
27563 +# For the awk script, D is an array of macro values keyed by name,
27564 +# likewise P contains macro parameters if any. Preserve backslash
27565 +# newline sequences.
27567 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
27569 +s/.\{148\}/&'"$ac_delim"'/g
27572 +s/^[ ]*#[ ]*define[ ][ ]*/ /
27579 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
27581 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
27585 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
27586 +D["\1"]=" \3\\\\\\n"\\/p
27588 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
27593 +s/.\{148\}/&'"$ac_delim"'/g
27598 +s/["\\]/\\&/g; s/^/"/; s/$/"/p
27601 +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
27603 +' <confdefs.h | sed '
27604 +s/'"$ac_delim"'/"\\\
27605 +"/g' >>$CONFIG_STATUS || ac_write_fail=1
27607 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27608 + for (key in D) D_is_set[key] = 1
27611 +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
27613 + split(line, arg, " ")
27614 + if (arg[1] == "#") {
27615 + defundef = arg[2]
27618 + defundef = substr(arg[1], 2)
27621 + split(mac1, mac2, "(") #)
27623 + prefix = substr(line, 1, index(line, defundef) - 1)
27624 + if (D_is_set[macro]) {
27625 + # Preserve the white space surrounding the "#".
27626 + print prefix "define", macro P[macro] D[macro]
27629 + # Replace #undef with comments. This is necessary, for example,
27630 + # in the case of _POSIX_SOURCE, which is predefined and required
27631 + # on some systems where configure will not decide to define it.
27632 + if (defundef == "undef") {
27633 + print "/*", prefix defundef, macro, "*/"
27641 -cat >>$CONFIG_STATUS <<\_ACEOF
27642 -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
27643 - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
27645 - - | *:- | *:-:* ) # input from stdin
27647 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
27648 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
27649 - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
27650 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
27651 - * ) ac_file_in=$ac_file.in ;;
27652 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27653 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
27654 +fi # test -n "$CONFIG_HEADERS"
27657 +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
27662 + :[FHLC]) ac_mode=$ac_tag; continue;;
27664 + case $ac_mode$ac_tag in
27666 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
27667 + :[FH]-) ac_tag=-:-;;
27668 + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
27679 + :L) ac_source=$1;;
27685 + -) ac_f="$ac_tmp/stdin";;
27686 + *) # Look for the file first in the build tree, then in the source tree
27687 + # (if the path is not absolute). The absolute path cannot be DOS-style,
27688 + # because $ac_f cannot contain `:'.
27689 + test -f "$ac_f" ||
27692 + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
27694 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
27696 + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
27697 + as_fn_append ac_file_inputs " '$ac_f'"
27700 + # Let's still pretend it is `configure' which instantiates (i.e., don't
27701 + # use $as_me), people would be surprised to read:
27702 + # /* config.h. Generated by config.status. */
27703 + configure_input='Generated from '`
27704 + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
27705 + `' by configure.'
27706 + if test x"$ac_file" != x-; then
27707 + configure_input="$ac_file. $configure_input"
27708 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
27709 +$as_echo "$as_me: creating $ac_file" >&6;}
27711 + # Neutralize special characters interpreted by sed in replacement strings.
27712 + case $configure_input in #(
27713 + *\&* | *\|* | *\\* )
27714 + ac_sed_conf_input=`$as_echo "$configure_input" |
27715 + sed 's/[\\\\&|]/\\\\&/g'`;; #(
27716 + *) ac_sed_conf_input=$configure_input;;
27720 + *:-:* | *:-) cat >"$ac_tmp/stdin" \
27721 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
27726 - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
27727 - ac_dir=`(dirname "$ac_file") 2>/dev/null ||
27728 + ac_dir=`$as_dirname -- "$ac_file" ||
27729 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
27730 X"$ac_file" : 'X\(//\)[^/]' \| \
27731 X"$ac_file" : 'X\(//\)$' \| \
27732 - X"$ac_file" : 'X\(/\)' \| \
27733 - . : '\(.\)' 2>/dev/null ||
27734 -echo X"$ac_file" |
27735 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
27736 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
27737 - /^X\(\/\/\)$/{ s//\1/; q; }
27738 - /^X\(\/\).*/{ s//\1/; q; }
27740 - { if $as_mkdir_p; then
27741 - mkdir -p "$ac_dir"
27745 - while test ! -d "$as_dir"; do
27746 - as_dirs="$as_dir $as_dirs"
27747 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
27748 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
27749 - X"$as_dir" : 'X\(//\)[^/]' \| \
27750 - X"$as_dir" : 'X\(//\)$' \| \
27751 - X"$as_dir" : 'X\(/\)' \| \
27752 - . : '\(.\)' 2>/dev/null ||
27754 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
27755 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
27756 - /^X\(\/\/\)$/{ s//\1/; q; }
27757 - /^X\(\/\).*/{ s//\1/; q; }
27760 - test ! -n "$as_dirs" || mkdir $as_dirs
27761 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
27762 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
27763 - { (exit 1); exit 1; }; }; }
27765 + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
27766 +$as_echo X"$ac_file" |
27767 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
27771 + /^X\(\/\/\)[^/].*/{
27784 + as_dir="$ac_dir"; as_fn_mkdir_p
27787 -if test "$ac_dir" != .; then
27788 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
27789 - # A "../" for each directory in $ac_dir_suffix.
27790 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
27792 - ac_dir_suffix= ac_top_builddir=
27795 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
27797 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
27798 + # A ".." for each directory in $ac_dir_suffix.
27799 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
27800 + case $ac_top_builddir_sub in
27801 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
27802 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
27805 +ac_abs_top_builddir=$ac_pwd
27806 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
27807 +# for backward compatibility:
27808 +ac_top_builddir=$ac_top_build_prefix
27811 - .) # No --srcdir option. We are building in place.
27812 + .) # We are building in place.
27814 - if test -z "$ac_top_builddir"; then
27817 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
27819 - [\\/]* | ?:[\\/]* ) # Absolute path.
27820 + ac_top_srcdir=$ac_top_builddir_sub
27821 + ac_abs_top_srcdir=$ac_pwd ;;
27822 + [\\/]* | ?:[\\/]* ) # Absolute name.
27823 ac_srcdir=$srcdir$ac_dir_suffix;
27824 - ac_top_srcdir=$srcdir ;;
27825 - *) # Relative path.
27826 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
27827 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
27829 + ac_top_srcdir=$srcdir
27830 + ac_abs_top_srcdir=$srcdir ;;
27831 + *) # Relative name.
27832 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
27833 + ac_top_srcdir=$ac_top_build_prefix$srcdir
27834 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
27836 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
27838 -# Do not use `cd foo && pwd` to compute absolute paths, because
27839 -# the directories may not exist.
27841 -.) ac_abs_builddir="$ac_dir";;
27843 - case "$ac_dir" in
27844 - .) ac_abs_builddir=`pwd`;;
27845 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
27846 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
27849 -case $ac_abs_builddir in
27850 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
27852 - case ${ac_top_builddir}. in
27853 - .) ac_abs_top_builddir=$ac_abs_builddir;;
27854 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
27855 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
27858 -case $ac_abs_builddir in
27859 -.) ac_abs_srcdir=$ac_srcdir;;
27861 - case $ac_srcdir in
27862 - .) ac_abs_srcdir=$ac_abs_builddir;;
27863 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
27864 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
27867 -case $ac_abs_builddir in
27868 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
27870 - case $ac_top_srcdir in
27871 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
27872 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
27873 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
27884 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
27885 - *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
27886 + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
27888 + ac_MKDIR_P=$MKDIR_P
27890 + [\\/$]* | ?:[\\/]* ) ;;
27891 + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
27895 - if test x"$ac_file" != x-; then
27896 - { echo "$as_me:$LINENO: creating $ac_file" >&5
27897 -echo "$as_me: creating $ac_file" >&6;}
27900 - # Let's still pretend it is `configure' which instantiates (i.e., don't
27901 - # use $as_me), people would be surprised to read:
27902 - # /* config.h. Generated by config.status. */
27903 - if test x"$ac_file" = x-; then
27906 - configure_input="$ac_file. "
27908 - configure_input=$configure_input"Generated from `echo $ac_file_in |
27909 - sed 's,.*/,,'` by configure."
27911 - # First look for the input files in the build tree, otherwise in the
27913 - ac_file_inputs=`IFS=:
27914 - for f in $ac_file_in; do
27916 - -) echo $tmp/stdin ;;
27918 - # Absolute (can't be DOS-style, as IFS=:)
27919 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
27920 -echo "$as_me: error: cannot find input file: $f" >&2;}
27921 - { (exit 1); exit 1; }; }
27924 - if test -f "$f"; then
27927 - elif test -f "$srcdir/$f"; then
27929 - echo "$srcdir/$f"
27932 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
27933 -echo "$as_me: error: cannot find input file: $f" >&2;}
27934 - { (exit 1); exit 1; }; }
27937 - done` || { (exit 1); exit 1; }
27938 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27939 +# If the template does not know about datarootdir, expand it.
27940 +# FIXME: This hack should be removed a few years after 2.60.
27941 +ac_datarootdir_hack=; ac_datarootdir_seen=
27952 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
27953 +*datarootdir*) ac_datarootdir_seen=yes;;
27954 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
27955 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
27956 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
27958 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27959 + ac_datarootdir_hack='
27960 + s&@datadir@&$datadir&g
27961 + s&@docdir@&$docdir&g
27962 + s&@infodir@&$infodir&g
27963 + s&@localedir@&$localedir&g
27964 + s&@mandir@&$mandir&g
27965 + s&\\\${datarootdir}&$datarootdir&g' ;;
27968 -cat >>$CONFIG_STATUS <<_ACEOF
27971 +# Neutralize VPATH when `$srcdir' = `.'.
27972 +# Shell code in configure.ac might set extrasub.
27973 +# FIXME: do we really want to maintain this feature?
27974 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
27975 +ac_sed_extra="$ac_vpsub
27978 -cat >>$CONFIG_STATUS <<\_ACEOF
27979 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
27981 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
27982 -s,@configure_input@,$configure_input,;t t
27983 -s,@srcdir@,$ac_srcdir,;t t
27984 -s,@abs_srcdir@,$ac_abs_srcdir,;t t
27985 -s,@top_srcdir@,$ac_top_srcdir,;t t
27986 -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
27987 -s,@builddir@,$ac_builddir,;t t
27988 -s,@abs_builddir@,$ac_abs_builddir,;t t
27989 -s,@top_builddir@,$ac_top_builddir,;t t
27990 -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
27991 -s,@INSTALL@,$ac_INSTALL,;t t
27992 -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
27994 - if test x"$ac_file" != x-; then
27995 - mv $tmp/out $ac_file
28003 -cat >>$CONFIG_STATUS <<\_ACEOF
28006 -# CONFIG_HEADER section.
28008 +s|@configure_input@|$ac_sed_conf_input|;t t
28009 +s&@top_builddir@&$ac_top_builddir_sub&;t t
28010 +s&@top_build_prefix@&$ac_top_build_prefix&;t t
28011 +s&@srcdir@&$ac_srcdir&;t t
28012 +s&@abs_srcdir@&$ac_abs_srcdir&;t t
28013 +s&@top_srcdir@&$ac_top_srcdir&;t t
28014 +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
28015 +s&@builddir@&$ac_builddir&;t t
28016 +s&@abs_builddir@&$ac_abs_builddir&;t t
28017 +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
28018 +s&@INSTALL@&$ac_INSTALL&;t t
28019 +s&@MKDIR_P@&$ac_MKDIR_P&;t t
28020 +$ac_datarootdir_hack
28022 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
28023 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
28025 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
28026 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
28027 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
28028 + "$ac_tmp/out"`; test -z "$ac_out"; } &&
28029 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
28030 +which seems to be undefined. Please make sure it is defined" >&5
28031 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
28032 +which seems to be undefined. Please make sure it is defined" >&2;}
28034 -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
28035 -# NAME is the cpp macro being defined and VALUE is the value it is being given.
28037 -# ac_d sets the value in "#define NAME VALUE" lines.
28038 -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
28039 -ac_dB='[ ].*$,\1#\2'
28042 -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
28043 -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
28044 -ac_uB='$,\1#\2define\3'
28048 -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
28049 - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
28050 + rm -f "$ac_tmp/stdin"
28052 - - | *:- | *:-:* ) # input from stdin
28054 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
28055 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
28056 - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
28057 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
28058 - * ) ac_file_in=$ac_file.in ;;
28061 - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
28062 -echo "$as_me: creating $ac_file" >&6;}
28064 - # First look for the input files in the build tree, otherwise in the
28066 - ac_file_inputs=`IFS=:
28067 - for f in $ac_file_in; do
28069 - -) echo $tmp/stdin ;;
28071 - # Absolute (can't be DOS-style, as IFS=:)
28072 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
28073 -echo "$as_me: error: cannot find input file: $f" >&2;}
28074 - { (exit 1); exit 1; }; }
28075 - # Do quote $f, to prevent DOS paths from being IFS'd.
28078 - if test -f "$f"; then
28081 - elif test -f "$srcdir/$f"; then
28083 - echo "$srcdir/$f"
28086 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
28087 -echo "$as_me: error: cannot find input file: $f" >&2;}
28088 - { (exit 1); exit 1; }; }
28091 - done` || { (exit 1); exit 1; }
28092 - # Remove the trailing spaces.
28093 - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
28097 -# Transform confdefs.h into two sed scripts, `conftest.defines' and
28098 -# `conftest.undefs', that substitutes the proper values into
28099 -# config.h.in to produce config.h. The first handles `#define'
28100 -# templates, and the second `#undef' templates.
28101 -# And first: Protect against being on the right side of a sed subst in
28102 -# config.status. Protect against being in an unquoted here document
28103 -# in config.status.
28104 -rm -f conftest.defines conftest.undefs
28105 -# Using a here document instead of a string reduces the quoting nightmare.
28106 -# Putting comments in sed scripts is not portable.
28108 -# `end' is used to avoid that the second main sed command (meant for
28109 -# 0-ary CPP macros) applies to n-ary macro definitions.
28110 -# See the Autoconf documentation for `clear'.
28111 -cat >confdef2sed.sed <<\_ACEOF
28116 -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
28118 -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
28121 -# If some macros were called several times there might be several times
28122 -# the same #defines, which is useless. Nevertheless, we may not want to
28123 -# sort them, since we want the *last* AC-DEFINE to be honored.
28124 -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
28125 -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
28126 -rm -f confdef2sed.sed
28128 -# This sed command replaces #undef with comments. This is necessary, for
28129 -# example, in the case of _POSIX_SOURCE, which is predefined and required
28130 -# on some systems where configure will not decide to define it.
28131 -cat >>conftest.undefs <<\_ACEOF
28132 -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
28135 -# Break up conftest.defines because some shells have a limit on the size
28136 -# of here documents, and old seds have small limits too (100 cmds).
28137 -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
28138 -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
28139 -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
28140 -echo ' :' >>$CONFIG_STATUS
28141 -rm -f conftest.tail
28142 -while grep . conftest.defines >/dev/null
28144 - # Write a limited-size here document to $tmp/defines.sed.
28145 - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
28146 - # Speed up: don't consider the non `#define' lines.
28147 - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
28148 - # Work around the forget-to-reset-the-flag bug.
28149 - echo 't clr' >>$CONFIG_STATUS
28150 - echo ': clr' >>$CONFIG_STATUS
28151 - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
28153 - sed -f $tmp/defines.sed $tmp/in >$tmp/out
28155 - mv $tmp/out $tmp/in
28156 -' >>$CONFIG_STATUS
28157 - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
28158 - rm -f conftest.defines
28159 - mv conftest.tail conftest.defines
28161 -rm -f conftest.defines
28162 -echo ' fi # grep' >>$CONFIG_STATUS
28163 -echo >>$CONFIG_STATUS
28165 -# Break up conftest.undefs because some shells have a limit on the size
28166 -# of here documents, and old seds have small limits too (100 cmds).
28167 -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
28168 -rm -f conftest.tail
28169 -while grep . conftest.undefs >/dev/null
28171 - # Write a limited-size here document to $tmp/undefs.sed.
28172 - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
28173 - # Speed up: don't consider the non `#undef'
28174 - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
28175 - # Work around the forget-to-reset-the-flag bug.
28176 - echo 't clr' >>$CONFIG_STATUS
28177 - echo ': clr' >>$CONFIG_STATUS
28178 - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
28180 - sed -f $tmp/undefs.sed $tmp/in >$tmp/out
28182 - mv $tmp/out $tmp/in
28183 -' >>$CONFIG_STATUS
28184 - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
28185 - rm -f conftest.undefs
28186 - mv conftest.tail conftest.undefs
28188 -rm -f conftest.undefs
28190 -cat >>$CONFIG_STATUS <<\_ACEOF
28191 - # Let's still pretend it is `configure' which instantiates (i.e., don't
28192 - # use $as_me), people would be surprised to read:
28193 - # /* config.h. Generated by config.status. */
28194 - if test x"$ac_file" = x-; then
28195 - echo "/* Generated by configure. */" >$tmp/config.h
28197 - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
28199 - cat $tmp/in >>$tmp/config.h
28201 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
28202 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
28204 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
28210 if test x"$ac_file" != x-; then
28211 - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
28212 - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
28213 -echo "$as_me: $ac_file is unchanged" >&6;}
28215 + $as_echo "/* $configure_input */" \
28216 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
28217 + } >"$ac_tmp/config.h" \
28218 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
28219 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
28220 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
28221 +$as_echo "$as_me: $ac_file is unchanged" >&6;}
28223 - ac_dir=`(dirname "$ac_file") 2>/dev/null ||
28224 -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28225 - X"$ac_file" : 'X\(//\)[^/]' \| \
28226 - X"$ac_file" : 'X\(//\)$' \| \
28227 - X"$ac_file" : 'X\(/\)' \| \
28228 - . : '\(.\)' 2>/dev/null ||
28229 -echo X"$ac_file" |
28230 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28231 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28232 - /^X\(\/\/\)$/{ s//\1/; q; }
28233 - /^X\(\/\).*/{ s//\1/; q; }
28235 - { if $as_mkdir_p; then
28236 - mkdir -p "$ac_dir"
28240 - while test ! -d "$as_dir"; do
28241 - as_dirs="$as_dir $as_dirs"
28242 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
28243 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28244 - X"$as_dir" : 'X\(//\)[^/]' \| \
28245 - X"$as_dir" : 'X\(//\)$' \| \
28246 - X"$as_dir" : 'X\(/\)' \| \
28247 - . : '\(.\)' 2>/dev/null ||
28249 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28250 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28251 - /^X\(\/\/\)$/{ s//\1/; q; }
28252 - /^X\(\/\).*/{ s//\1/; q; }
28255 - test ! -n "$as_dirs" || mkdir $as_dirs
28256 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
28257 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
28258 - { (exit 1); exit 1; }; }; }
28261 - mv $tmp/config.h $ac_file
28263 + mv "$ac_tmp/config.h" "$ac_file" \
28264 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
28267 - cat $tmp/config.h
28268 - rm -f $tmp/config.h
28269 + $as_echo "/* $configure_input */" \
28270 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
28271 + || as_fn_error $? "could not create -" "$LINENO" 5
28273 -# Compute $ac_file's index in $config_headers.
28274 +# Compute "$ac_file"'s index in $config_headers.
28275 +_am_arg="$ac_file"
28277 for _am_header in $config_headers :; do
28278 case $_am_header in
28279 - $ac_file | $ac_file:* )
28280 + $_am_arg | $_am_arg:* )
28283 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
28286 -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
28287 -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28288 - X$ac_file : 'X\(//\)[^/]' \| \
28289 - X$ac_file : 'X\(//\)$' \| \
28290 - X$ac_file : 'X\(/\)' \| \
28291 - . : '\(.\)' 2>/dev/null ||
28293 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28294 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28295 - /^X\(\/\/\)$/{ s//\1/; q; }
28296 - /^X\(\/\).*/{ s//\1/; q; }
28297 - s/.*/./; q'`/stamp-h$_am_stamp_count
28300 -cat >>$CONFIG_STATUS <<\_ACEOF
28303 -# CONFIG_COMMANDS section.
28305 -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
28306 - ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
28307 - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
28308 - ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
28309 -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28310 - X"$ac_dest" : 'X\(//\)[^/]' \| \
28311 - X"$ac_dest" : 'X\(//\)$' \| \
28312 - X"$ac_dest" : 'X\(/\)' \| \
28313 - . : '\(.\)' 2>/dev/null ||
28314 -echo X"$ac_dest" |
28315 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28316 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28317 - /^X\(\/\/\)$/{ s//\1/; q; }
28318 - /^X\(\/\).*/{ s//\1/; q; }
28320 - { if $as_mkdir_p; then
28321 - mkdir -p "$ac_dir"
28325 - while test ! -d "$as_dir"; do
28326 - as_dirs="$as_dir $as_dirs"
28327 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
28328 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28329 - X"$as_dir" : 'X\(//\)[^/]' \| \
28330 - X"$as_dir" : 'X\(//\)$' \| \
28331 - X"$as_dir" : 'X\(/\)' \| \
28332 - . : '\(.\)' 2>/dev/null ||
28334 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28335 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28336 - /^X\(\/\/\)$/{ s//\1/; q; }
28337 - /^X\(\/\).*/{ s//\1/; q; }
28340 - test ! -n "$as_dirs" || mkdir $as_dirs
28341 - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
28342 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
28343 - { (exit 1); exit 1; }; }; }
28344 +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
28345 +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28346 + X"$_am_arg" : 'X\(//\)[^/]' \| \
28347 + X"$_am_arg" : 'X\(//\)$' \| \
28348 + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
28349 +$as_echo X"$_am_arg" |
28350 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
28354 + /^X\(\/\/\)[^/].*/{
28366 + s/.*/./; q'`/stamp-h$_am_stamp_count
28370 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
28371 +$as_echo "$as_me: executing $ac_file commands" >&6;}
28375 -if test "$ac_dir" != .; then
28376 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
28377 - # A "../" for each directory in $ac_dir_suffix.
28378 - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
28380 - ac_dir_suffix= ac_top_builddir=
28384 - .) # No --srcdir option. We are building in place.
28386 - if test -z "$ac_top_builddir"; then
28388 + case $ac_file$ac_mode in
28389 + "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
28390 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
28391 + # are listed without --file. Let's play safe and only enable the eval
28392 + # if we detect the quoting.
28393 + case $CONFIG_FILES in
28394 + *\'*) eval set x "$CONFIG_FILES" ;;
28395 + *) set x $CONFIG_FILES ;;
28400 + # Strip MF so we end up with the name of the file.
28401 + mf=`echo "$mf" | sed -e 's/:.*$//'`
28402 + # Check whether this is an Automake generated Makefile or not.
28403 + # We used to match only the files named `Makefile.in', but
28404 + # some people rename them; so instead we look at the file content.
28405 + # Grep'ing the first line is not enough: some people post-process
28406 + # each Makefile.in and add a new line on top of each file to say so.
28407 + # Grep'ing the whole file is not good either: AIX grep has a line
28408 + # limit of 2048, but all sed's we know have understand at least 4000.
28409 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
28410 + dirpart=`$as_dirname -- "$mf" ||
28411 +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28412 + X"$mf" : 'X\(//\)[^/]' \| \
28413 + X"$mf" : 'X\(//\)$' \| \
28414 + X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
28416 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
28420 + /^X\(\/\/\)[^/].*/{
28434 - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
28436 - [\\/]* | ?:[\\/]* ) # Absolute path.
28437 - ac_srcdir=$srcdir$ac_dir_suffix;
28438 - ac_top_srcdir=$srcdir ;;
28439 - *) # Relative path.
28440 - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
28441 - ac_top_srcdir=$ac_top_builddir$srcdir ;;
28444 -# Do not use `cd foo && pwd` to compute absolute paths, because
28445 -# the directories may not exist.
28447 -.) ac_abs_builddir="$ac_dir";;
28449 - case "$ac_dir" in
28450 - .) ac_abs_builddir=`pwd`;;
28451 - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
28452 - *) ac_abs_builddir=`pwd`/"$ac_dir";;
28455 -case $ac_abs_builddir in
28456 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
28458 - case ${ac_top_builddir}. in
28459 - .) ac_abs_top_builddir=$ac_abs_builddir;;
28460 - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
28461 - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
28464 -case $ac_abs_builddir in
28465 -.) ac_abs_srcdir=$ac_srcdir;;
28467 - case $ac_srcdir in
28468 - .) ac_abs_srcdir=$ac_abs_builddir;;
28469 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
28470 - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
28473 -case $ac_abs_builddir in
28474 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
28476 - case $ac_top_srcdir in
28477 - .) ac_abs_top_srcdir=$ac_abs_builddir;;
28478 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
28479 - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
28484 - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
28485 -echo "$as_me: executing $ac_dest commands" >&6;}
28490 + # Extract the definition of DEPDIR, am__include, and am__quote
28491 + # from the Makefile without running `make'.
28492 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
28493 + test -z "$DEPDIR" && continue
28494 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
28495 + test -z "am__include" && continue
28496 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
28497 + # When using ansi2knr, U may be empty or an underscore; expand it
28498 + U=`sed -n 's/^U = //p' < "$mf"`
28499 + # Find all dependency output files, they are included files with
28500 + # $(DEPDIR) in their names. We invoke sed twice because it is the
28501 + # simplest approach to changing $(DEPDIR) to its actual value in the
28503 + for file in `sed -n "
28504 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
28505 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
28506 + # Make sure the directory exists.
28507 + test -f "$dirpart/$file" && continue
28508 + fdir=`$as_dirname -- "$file" ||
28509 +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28510 + X"$file" : 'X\(//\)[^/]' \| \
28511 + X"$file" : 'X\(//\)$' \| \
28512 + X"$file" : 'X\(/\)' \| . 2>/dev/null ||
28513 +$as_echo X"$file" |
28514 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
28518 + /^X\(\/\/\)[^/].*/{
28531 + as_dir=$dirpart/$fdir; as_fn_mkdir_p
28532 + # echo "creating $dirpart/$file"
28533 + echo '# dummy' > "$dirpart/$file"
28538 + "po-directories":C)
28539 for ac_file in $CONFIG_FILES; do
28540 # Support "outfile[:infile[:infile...]]"
28542 @@ -15875,11 +9646,12 @@
28543 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
28545 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
28546 - # Hide the ALL_LINGUAS assigment from automake.
28547 + # Hide the ALL_LINGUAS assigment from automake < 1.5.
28548 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
28549 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
28551 # The set of available languages was given in configure.in.
28552 + # Hide the ALL_LINGUAS assigment from automake < 1.5.
28553 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
28556 @@ -15938,106 +9710,30 @@
28558 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
28559 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"
28560 + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
28561 + if test -f "$f"; then
28563 + *.orig | *.bak | *~) ;;
28564 + *) cat "$f" >> "$ac_dir/Makefile" ;;
28572 - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
28573 - # Strip MF so we end up with the name of the file.
28574 - mf=`echo "$mf" | sed -e 's/:.*$//'`
28575 - # Check whether this is an Automake generated Makefile or not.
28576 - # We used to match only the files named `Makefile.in', but
28577 - # some people rename them; so instead we look at the file content.
28578 - # Grep'ing the first line is not enough: some people post-process
28579 - # each Makefile.in and add a new line on top of each file to say so.
28580 - # So let's grep whole file.
28581 - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
28582 - dirpart=`(dirname "$mf") 2>/dev/null ||
28583 -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28584 - X"$mf" : 'X\(//\)[^/]' \| \
28585 - X"$mf" : 'X\(//\)$' \| \
28586 - X"$mf" : 'X\(/\)' \| \
28587 - . : '\(.\)' 2>/dev/null ||
28589 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28590 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28591 - /^X\(\/\/\)$/{ s//\1/; q; }
28592 - /^X\(\/\).*/{ s//\1/; q; }
28597 - # Extract the definition of DEPDIR, am__include, and am__quote
28598 - # from the Makefile without running `make'.
28599 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
28600 - test -z "$DEPDIR" && continue
28601 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
28602 - test -z "am__include" && continue
28603 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
28604 - # When using ansi2knr, U may be empty or an underscore; expand it
28605 - U=`sed -n 's/^U = //p' < "$mf"`
28606 - # Find all dependency output files, they are included files with
28607 - # $(DEPDIR) in their names. We invoke sed twice because it is the
28608 - # simplest approach to changing $(DEPDIR) to its actual value in the
28610 - for file in `sed -n "
28611 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
28612 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
28613 - # Make sure the directory exists.
28614 - test -f "$dirpart/$file" && continue
28615 - fdir=`(dirname "$file") 2>/dev/null ||
28616 -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28617 - X"$file" : 'X\(//\)[^/]' \| \
28618 - X"$file" : 'X\(//\)$' \| \
28619 - X"$file" : 'X\(/\)' \| \
28620 - . : '\(.\)' 2>/dev/null ||
28622 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28623 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28624 - /^X\(\/\/\)$/{ s//\1/; q; }
28625 - /^X\(\/\).*/{ s//\1/; q; }
28627 - { if $as_mkdir_p; then
28628 - mkdir -p $dirpart/$fdir
28630 - as_dir=$dirpart/$fdir
28632 - while test ! -d "$as_dir"; do
28633 - as_dirs="$as_dir $as_dirs"
28634 - as_dir=`(dirname "$as_dir") 2>/dev/null ||
28635 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
28636 - X"$as_dir" : 'X\(//\)[^/]' \| \
28637 - X"$as_dir" : 'X\(//\)$' \| \
28638 - X"$as_dir" : 'X\(/\)' \| \
28639 - . : '\(.\)' 2>/dev/null ||
28641 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
28642 - /^X\(\/\/\)[^/].*/{ s//\1/; q; }
28643 - /^X\(\/\/\)$/{ s//\1/; q; }
28644 - /^X\(\/\).*/{ s//\1/; q; }
28647 - test ! -n "$as_dirs" || mkdir $as_dirs
28648 - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
28649 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
28650 - { (exit 1); exit 1; }; }; }
28652 - # echo "creating $dirpart/$file"
28653 - echo '# dummy' > "$dirpart/$file"
28662 -cat >>$CONFIG_STATUS <<\_ACEOF
28664 -{ (exit 0); exit 0; }
28667 -chmod +x $CONFIG_STATUS
28668 ac_clean_files=$ac_clean_files_save
28670 +test $ac_write_fail = 0 ||
28671 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
28674 # configure is writing to config.log, and then calls config.status.
28675 # config.status does its own redirection, appending to config.log.
28676 @@ -16057,7 +9753,10 @@
28678 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
28679 # would make configure fail if this is the last instruction.
28680 - $ac_cs_success || { (exit 1); exit 1; }
28681 + $ac_cs_success || as_fn_exit 1
28683 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
28684 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
28685 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
28689 diff -urN BUILD/abook-0.6.0pre2/configure.ac abook/configure.ac
28690 --- BUILD/abook-0.6.0pre2/configure.ac 1970-01-01 01:00:00.000000000 +0100
28691 +++ abook/configure.ac 2013-03-13 15:07:45.000000000 +0100
28693 +dnl abook configure.in
28696 +AC_CONFIG_SRCDIR([abook.c])
28697 +AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
28698 +AC_CONFIG_HEADER(config.h)
28700 +dnl ---------------
28701 +dnl gettext support
28702 +dnl ---------------
28704 +AC_USE_SYSTEM_EXTENSIONS
28705 +AM_GNU_GETTEXT([external])
28706 +AM_GNU_GETTEXT_VERSION([0.18.1])
28708 +AC_DEFUN([ABOOK_EXPAND_PREFIX], [
28710 + dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
28711 + dnl $datarootdir which in turn refers to $prefix
28712 + $1=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
28713 + eval tmp_abook_prefix=\""[$]$1"\"
28714 + eval echo $tmp_abook_prefix
28718 +ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
28719 +localedir="\$(datadir)/locale"
28721 +AC_ARG_WITH(localedir,
28722 + [ --with-localedir=PATH Where the locale files are installed ])
28723 +if test "x$with_localedir" != "x"; then
28724 + abook_localedir="$with_localedir"
28725 + localedir="$with_localedir"
28728 +AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
28729 +AC_SUBST(localedir)
28731 +AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
28733 +dnl ----------------------
28734 +dnl end of gettext support
28735 +dnl ----------------------
28738 +AC_SEARCH_LIBS([strerror],[cposix])
28740 +if test "x$U" != "x"; then
28741 + AC_MSG_ERROR(Compiler not ANSI compliant)
28746 +AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h iconv.h)
28747 +AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H, 1, [Define if you have the <stdarg.h> header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
28749 +AC_CHECK_FUNCS(setlocale)
28751 +ac_widec_funcs=yes
28752 +AC_CHECK_HEADER(wchar.h,[
28753 + ac_have_wchar_h=yes
28754 + AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
28755 + [ac_have_wchar_h=no])
28756 +AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
28757 +AC_CHECK_DECLS(wcwidth)
28758 +AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
28760 +if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then
28761 + ac_widec_possible=yes
28763 + ac_widec_possible=no
28766 +dnl -------------------
28767 +dnl (n)curses detection
28768 +dnl -------------------
28770 +abook_cv_curses=/usr
28771 +AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
28772 + [if test $withval != yes; then
28773 + abook_cv_curses=$withval
28775 + if test x$abook_cv_curses != x/usr; then
28776 + LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
28777 + CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
28780 +AC_CHECK_LIB(ncursesw, initscr,
28781 + [LIBS="$LIBS -lncursesw"
28782 + if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
28783 + CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
28785 + AC_CHECK_HEADERS(ncurses.h)],[
28786 + ac_widec_possible=no
28787 + AC_CHECK_LIB(ncurses, initscr,
28788 + [LIBS="$LIBS -lncurses"
28789 + if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
28790 + CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
28792 + AC_CHECK_HEADERS(ncurses.h)],
28793 + [CF_CURSES_LIBS])
28796 +dnl --------------------------
28797 +dnl end of (n)curses detection
28798 +dnl --------------------------
28800 +dnl ------------------
28801 +dnl readline detection
28802 +dnl ------------------
28804 +abook_cv_readline=/usr
28805 +AC_ARG_WITH(readline, [ --with-readline=DIR Where readline is installed ],
28806 + [if test $withval != yes; then
28807 + abook_cv_readline=$withval
28809 + if test x$abook_cv_readline != x/usr; then
28810 + LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
28811 + CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
28816 +if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
28817 + AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
28820 +dnl -------------------------
28821 +dnl end of readline detection
28822 +dnl -------------------------
28824 +dnl ------------------
28825 +dnl vformat detection
28826 +dnl ------------------
28828 +AC_ARG_ENABLE(vformat, [ --enable-vformat Use libvformat is available ], [case "${enableval}" in
28829 + yes) vformat=true ;;
28830 + no) vformat=false ;;
28831 + *) AC_MSG_ERROR(bad value ${enableval} for --enable-vformat) ;;
28832 + esac], [vformat=false])
28833 +if test x$vformat = xtrue; then
28834 + AC_CHECK_HEADER([vf_iface.h], [
28835 + AC_CHECK_LIB([vformat], [vf_read_file], [
28836 + MODULES="$MODULES m_vcf"
28837 + AC_DEFINE(HAVE_VFORMAT,1,[Defined if the vformat library is available])
28842 +AM_CONDITIONAL(ENABLE_VFORMAT_SUPPORT,test x"$have_vformat" = "xyes")
28844 +dnl -------------------------
28845 +dnl end of vformat detection
28846 +dnl -------------------------
28849 +if test x$ac_widec_possible = xyes; then
28850 + AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
28853 +AC_CHECK_FUNCS(resizeterm)
28855 +AC_CHECK_FUNCS(snprintf vsnprintf)
28857 +AC_CHECK_FUNCS(strcasestr, AC_DEFINE(HAVE_STRCASESTR))
28859 +AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in
28860 + yes) debug=true ;;
28861 + no) debug=false ;;
28862 + *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
28863 + esac], [debug=false])
28865 +if test x$debug = xtrue; then
28866 + CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
28867 + CFLAGS="-g $CFLAGS"
28870 +if test x$GCC = xyes; then
28871 + CFLAGS="-Wall $CFLAGS"
28874 +AC_CONFIG_FILES([Makefile abook.spec po/Makefile.in])
28876 diff -urN BUILD/abook-0.6.0pre2/configure.in abook/configure.in
28877 --- BUILD/abook-0.6.0pre2/configure.in 2013-03-14 10:42:00.097531458 +0100
28878 +++ abook/configure.in 1970-01-01 01:00:00.000000000 +0100
28880 -dnl abook configure.in
28883 -AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
28884 -AM_CONFIG_HEADER(config.h)
28886 -dnl ---------------
28887 -dnl gettext support
28888 -dnl ---------------
28891 -AM_GNU_GETTEXT_VERSION(0.14.1)
28893 -AC_DEFUN([ABOOK_EXPAND_PREFIX], [
28895 - dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
28896 - dnl $datarootdir which in turn refers to $prefix
28897 - $1=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
28898 - eval tmp_abook_prefix=\""[$]$1"\"
28899 - eval echo $tmp_abook_prefix
28903 -ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
28904 -localedir="\$(datadir)/locale"
28906 -AC_ARG_WITH(localedir,
28907 - [ --with-localedir=PATH Where the locale files are installed ])
28908 -if test "x$with_localedir" != "x"; then
28909 - abook_localedir="$with_localedir"
28910 - localedir="$with_localedir"
28913 -AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
28914 -AC_SUBST(localedir)
28916 -AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
28918 -dnl ----------------------
28919 -dnl end of gettext support
28920 -dnl ----------------------
28925 -if test "x$U" != "x"; then
28926 - AC_MSG_ERROR(Compiler not ANSI compliant)
28931 -AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h iconv.h)
28932 -AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H, 1, [Define if you have the <stdarg.h> header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
28934 -AC_CHECK_FUNCS(setlocale)
28936 -ac_widec_funcs=yes
28937 -AC_CHECK_HEADER(wchar.h,[
28938 - ac_have_wchar_h=yes
28939 - AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
28940 - [ac_have_wchar_h=no])
28941 -AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
28942 -AC_CHECK_DECLS(wcwidth)
28943 -AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
28945 -if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then
28946 - ac_widec_possible=yes
28948 - ac_widec_possible=no
28951 -dnl -------------------
28952 -dnl (n)curses detection
28953 -dnl -------------------
28955 -abook_cv_curses=/usr
28956 -AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
28957 - [if test $withval != yes; then
28958 - abook_cv_curses=$withval
28960 - if test x$abook_cv_curses != x/usr; then
28961 - LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
28962 - CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
28965 -AC_CHECK_LIB(ncursesw, initscr,
28966 - [LIBS="$LIBS -lncursesw -ltinfow"
28967 - if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
28968 - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
28970 - AC_CHECK_HEADERS(ncurses.h)],[
28971 - ac_widec_possible=no
28972 - AC_CHECK_LIB(ncurses, initscr,
28973 - [LIBS="$LIBS -lncurses -ltinfo"
28974 - if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
28975 - CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
28977 - AC_CHECK_HEADERS(ncurses.h)],
28978 - [CF_CURSES_LIBS])
28981 -dnl --------------------------
28982 -dnl end of (n)curses detection
28983 -dnl --------------------------
28985 -dnl ------------------
28986 -dnl readline detection
28987 -dnl ------------------
28989 -abook_cv_readline=/usr
28990 -AC_ARG_WITH(readline, [ --with-readline=DIR Where readline is installed ],
28991 - [if test $withval != yes; then
28992 - abook_cv_readline=$withval
28994 - if test x$abook_cv_readline != x/usr; then
28995 - LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
28996 - CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
29001 -if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
29002 - AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
29005 -dnl -------------------------
29006 -dnl end of readline detection
29007 -dnl -------------------------
29009 -if test x$ac_widec_possible = xyes; then
29010 - AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
29013 -AC_CHECK_FUNCS(resizeterm)
29015 -AC_CHECK_FUNCS(snprintf vsnprintf)
29017 -AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in
29018 - yes) debug=true ;;
29019 - no) debug=false ;;
29020 - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
29021 - esac], [debug=false])
29023 -if test x$debug = xtrue; then
29024 - CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
29025 - CFLAGS="-g $CFLAGS"
29028 -if test x$GCC = xyes; then
29029 - CFLAGS="-Wall $CFLAGS"
29032 -AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)
29034 diff -urN BUILD/abook-0.6.0pre2/contrib/abook+vim/mail.vim abook/contrib/abook+vim/mail.vim
29035 --- BUILD/abook-0.6.0pre2/contrib/abook+vim/mail.vim 2005-10-26 13:58:45.000000000 +0200
29036 +++ abook/contrib/abook+vim/mail.vim 1970-01-01 01:00:00.000000000 +0100
29040 -" Requires vim 6.x.
29041 -" To install place in ~/.vim/after/ftplugin/mail.vim
29043 -" Author: Brian Medley
29044 -" Email: freesoftware@4321.tv
29046 -" This file was modified from Cedric Duval's version.
29047 -" http://cedricduval.free.fr/download/vimrc/mail
29049 -" Only do this when not done yet for this buffer
29050 -if exists("b:did_mail_after_ftplugin")
29053 -let b:did_mail_after_ftplugin = 1
29055 -if !exists ("mail_alias_program")
29056 - let mail_alias_program="Abook"
29059 -" ====================================================================
29061 -" ====================================================================
29063 -if !exists ("mail_quote_chars")
29064 - let s:quote_chars = ':!|>'
29066 - let s:quote_chars = mail_quote_chars
29069 -" This re defines a 'quote'
29070 -let s:quote_re = '\(\s\?\w*[' . s:quote_chars . ']\)'
29071 -" \s\? => 0 or one whitespace char
29072 -" (b/c some ppl put
29073 -" spaces in the quote,
29074 -" and others don't)
29076 -" \w* => maybe word chars (b/c
29077 -" some ppl put initals in
29079 -" the rest => actual quote chars
29080 -" \( \) => this is a quote "level"
29082 -" This re defines the quoting level at the *beginning* of a line
29083 -let s:quote_start = '^' . s:quote_re . s:quote_re . '*'
29084 -" ^s:quote_re => quote at beginning of
29086 -" s:quote_re* => perhaps followed by
29090 -" let b:quote_chars = s:quote_chars
29091 -" let b:quote_re = s:quote_re
29092 -" let b:quote_start = s:quote_start
29094 -" ====================================================================
29096 -" ====================================================================
29098 -if !exists("no_plugin_maps") && !exists("no_mail_maps")
29101 - " get alias list mappings
29103 - if !hasmapto('<Plug>MailAliasList', 'n')
29104 - nmap <buffer> <unique> <LocalLeader>al <Plug>MailAliasList
29106 - if !hasmapto('<Plug>MailAliasList', 'i')
29107 - imap <buffer> <unique> <LocalLeader>al <Plug>MailAliasList
29110 - nnoremap <buffer> <unique> <script> <Plug>MailAliasList <SID>AliasList
29111 - inoremap <buffer> <unique> <script> <Plug>MailAliasList <SID>AliasList
29113 - " Redraw is there b/c my screen was messed up after abook finished.
29114 - " The 'set paste' is in the function b/c I couldn't figure out how to put it in
29116 - " The 'set nopaste' is in the mapping b/c it didn't work for me in the script.
29117 - nnoremap <buffer> <SID>AliasList A<c-r>=<SID>AliasList{mail_alias_program}()<cr><c-o>:set nopaste<cr><c-o>:redraw!<cr><c-o>:echo b:AliasListMsg<cr><esc>
29118 - inoremap <buffer> <SID>AliasList <c-r>=<SID>AliasList{mail_alias_program}()<cr><c-o>:set nopaste<cr><c-o>:redraw!<cr><c-o>:echo b:AliasListMsg<cr>
29121 - " get alias query mappings
29123 - if !hasmapto('<Plug>MailAliasQuery', 'n')
29124 - nmap <buffer> <unique> <LocalLeader>aq <Plug>MailAliasQuery
29126 - if !hasmapto('<Plug>MailAliasQuery', 'i')
29127 - imap <buffer> <unique> <LocalLeader>aq <Plug>MailAliasQuery
29130 - nnoremap <buffer> <unique> <script> <Plug>MailAliasQuery <SID>AliasQuery
29131 - inoremap <buffer> <unique> <script> <Plug>MailAliasQuery <SID>AliasQuery
29133 - nnoremap <buffer> <SID>AliasQuery :call <SID>AliasQuery{mail_alias_program}()<cr>:echo b:AliasQueryMsg<cr>
29134 - inoremap <buffer> <SID>AliasQuery <c-o>:call <SID>AliasQuery{mail_alias_program}()<cr><c-o>:echo b:AliasQueryMsg<cr><right>
29137 - " mail formatting mappings
29140 - " * <F1> to re-format a quotelvl
29141 - " * <F2> to format a line which is too long, and go to the next line
29142 - " * <F3> to merge the previous line with the current one, with a correct
29143 - " formatting (sometimes useful associated with <F2>)
29144 - " * <F4> to re-format the current paragraph correctly
29146 - if !hasmapto('<Plug>MailFormatQuoteLvl', 'n')
29147 - nmap <buffer> <unique> <F1> <Plug>MailFormatQuoteLvl
29149 - if !hasmapto('<Plug>MailFormatLine', 'n')
29150 - nmap <buffer> <unique> <F2> <Plug>MailFormatLine
29152 - if !hasmapto('<Plug>MailFormatMerge', 'n')
29153 - nmap <buffer> <unique> <F3> <Plug>MailFormatMerge
29155 - if !hasmapto('<Plug>MailFormatParagraph', 'n')
29156 - nmap <buffer> <unique> <F4> <Plug>MailFormatParagraph
29159 - if !hasmapto('<Plug>MailFormatQuoteLvl', 'i')
29160 - imap <buffer> <unique> <F1> <Plug>MailFormatQuoteLvl
29162 - if !hasmapto('<Plug>MailFormatLine', 'i')
29163 - imap <buffer> <unique> <F2> <Plug>MailFormatLine
29165 - if !hasmapto('<Plug>MailFormatMerge', 'i')
29166 - imap <buffer> <unique> <F3> <Plug>MailFormatMerge
29168 - if !hasmapto('<Plug>MailFormatParagraph', 'i')
29169 - imap <buffer> <unique> <F4> <Plug>MailFormatParagraph
29172 - nnoremap <buffer> <unique> <script> <Plug>MailFormatQuoteLvl <SID>FormatQuoteLvl
29173 - nnoremap <buffer> <unique> <script> <Plug>MailFormatLine <SID>FormatLine
29174 - nnoremap <buffer> <unique> <script> <Plug>MailFormatMerge <SID>FormatMerge
29175 - nnoremap <buffer> <unique> <script> <Plug>MailFormatParagraph <SID>FormatParagraph
29176 - inoremap <buffer> <unique> <script> <Plug>MailFormatQuoteLvl <SID>FormatQuoteLvl
29177 - inoremap <buffer> <unique> <script> <Plug>MailFormatLine <SID>FormatLine
29178 - inoremap <buffer> <unique> <script> <Plug>MailFormatMerge <SID>FormatMerge
29179 - inoremap <buffer> <unique> <script> <Plug>MailFormatParagraph <SID>FormatParagraph
29181 - nnoremap <buffer> <script> <SID>FormatQuoteLvl gq<SID>QuoteLvlMotion
29182 - nnoremap <buffer> <SID>FormatLine gqqj
29183 - nnoremap <buffer> <SID>FormatMerge kgqj
29184 - nnoremap <buffer> <SID>FormatParagraph gqap
29185 - inoremap <buffer> <script> <SID>FormatQuoteLvl <ESC>gq<SID>QuoteLvlMotioni
29186 - inoremap <buffer> <SID>FormatLine <ESC>gqqji
29187 - inoremap <buffer> <SID>FormatMerge <ESC>kgqji
29188 - inoremap <buffer> <SID>FormatParagraph <ESC>gqapi
29191 - " sig removal mappings
29193 - if !hasmapto('<Plug>MailEraseQuotedSig', 'n')
29194 - nmap <silent> <buffer> <unique> <LocalLeader>eqs <Plug>MailEraseQuotedSig
29196 - nnoremap <buffer> <unique> <script> <Plug>MailEraseQuotedSig <SID>EraseQuotedSig
29197 - nnoremap <buffer> <SID>EraseQuotedSig :call<SID>EraseQuotedSig()<CR>
29200 - " Provide a motion operator for commands (so you can delete a quote
29201 - " segment, or format quoted segment)
29203 - if !hasmapto('<Plug>MailQuoteLvlMotion', 'o')
29204 - omap <silent> <buffer> <unique> q <Plug>MailQuoteLvlMotion
29206 - onoremap <buffer> <unique> <script> <Plug>MailQuoteLvlMotion <SID>QuoteLvlMotion
29207 - onoremap <buffer> <script> <SID>QuoteLvlMotion :execute "normal!" . <SID>QuoteLvlMotion(line("."))<cr>
29211 -" ====================================================================
29212 -" Mail Manipulation Functions
29213 -" ====================================================================
29215 -" --------------------------------------------------------------------
29216 -" Manipulate Quotes
29217 -" --------------------------------------------------------------------
29221 -" This function will try and remove 'quoted' signatures.
29223 -" If someone responds with an email that doesn't use '>' as the
29224 -" quote character this will try and take care of that:
29225 -" | Yeah, I agree vim is cool.
29228 -" | Some power user
29230 -" If there is a signature inside a 'multi-quoted' email this will try and get
29232 -" > | No, I don't agree with you.
29234 -" > Nonsense. You are wrong. Grow up.
29236 -" > | I can't believe I'm even replying to this.
29238 -" > | Some power user
29240 -" > Yeah, believe it, brother.
29242 -if !exists("*s:EraseQuotedSig")
29243 -function s:EraseQuotedSig()
29244 - while 0 != search((s:quote_start . '\s*--\s*$'), 'w')
29245 - let motion = s:QuoteLvlMotion(line("."))
29246 - exe "normal! d" . motion
29253 -" Replacing empty quoted lines (i.e. "> $") with empty lines
29254 -" (convenient to automatically reformat one paragraph)
29256 -if !exists("*s:DelEmptyQuoted")
29257 -function s:DelEmptyQuoted()
29258 - let empty_quote = s:quote_start . '\s*$'
29260 - " goto start of email and jump passed headers
29262 - if 0 == search('^$', 'W')
29266 - while 0 != search (empty_quote, 'W')
29267 - let newline = substitute(getline("."), empty_quote, '', '')
29268 - call setline(line("."), newline)
29275 -" This function will output a motion command that operatates over a "quote
29276 -" level" segment. This makes it possible to perform vi commands on quotes.
29278 -" dq => delete an entire quote section
29279 -" gqq => format an entire quote section
29281 -if !exists("*s:QuoteLvlMotion")
29282 -function s:QuoteLvlMotion(line)
29283 - let quote = matchstr(getline(a:line), s:quote_start)
29284 - " abort command if no quote
29289 - let len = s:LenQuoteLvl(a:line, quote)
29291 - " the 'V' makes the motion linewise
29293 - return "V" . line(".") . "G"
29295 - return "V" . (len - 1) . "j"
29302 -" This tries to figure out when the quoting level changes
29304 -if !exists("s:LenQuoteLvl")
29305 -function s:LenQuoteLvl(start, quote)
29306 - let i = a:start + 1
29308 - let quote = '^' . a:quote
29310 - " find end of quote
29311 - while i <= line('$')
29312 - " check if quote level decreased
29313 - if -1 == match(getline(i), quote)
29317 - " check if quote level increased
29318 - if -1 != match(getline(i), (quote . s:quote_re))
29323 - let len = len + 1
29330 -" --------------------------------------------------------------------
29331 -" Location Manipulator Functions
29332 -" --------------------------------------------------------------------
29336 -" Moves the cursor to a 'sensible' position.
29338 -if !exists("*s:CursorStart")
29339 -function s:CursorStart()
29340 - " put cursor in known position
29343 - if search('^From: $', 'W')
29344 - silent startinsert!
29345 - elseif search('^To: $', 'W')
29346 - silent startinsert!
29347 - elseif search('^Subject: $', 'W')
29348 - silent startinsert!
29350 - " check if we are editing a reply
29351 - elseif search('^On.*wrote:', 'W')
29354 - elseif search('^$', 'W')
29356 - silent startinsert!
29361 -" ================================================
29362 -" Process Mutt Aliases
29363 -" ================================================
29365 -" ------------------------------------------------
29367 -" ------------------------------------------------
29371 -" This function will launch abook and spit out what the user selected from the
29372 -" application (by pressing 'Q'). It's always called from 'insert' mode, so
29373 -" the text will be inserted like it was typed.
29375 -" That's why 'paste' is set and reset. So that the text that we insert won't
29376 -" be 'mangled' by the user's settings.
29378 -if !exists("*s:AliasListAbook")
29379 -function s:AliasListAbook()
29380 - let b:AliasListMsg = ""
29381 - let f = tempname()
29384 - silent exe '!abook 2> ' . f
29385 - exe 'let addresses=system("cat ' . f . '")'
29386 - if "" == addresses
29387 - let b:AliasListMsg = "Nothing found to lookup"
29391 - " - parses the output from abook
29392 - let addresses=s:ParseMuttQuery(addresses)
29393 - if "" == addresses
29394 - let b:AliasListMsg = b:ParseMuttQueryErr
29398 - " so that they will be aligned under the 'to' or 'cc' line
29399 - let addresses=substitute(addresses, "\n", ",\n ", "g")
29405 -" ------------------------------------------------
29407 -" ------------------------------------------------
29411 -" This function assumes that user has the cursor on an alias to lookup. Based
29413 -" - retrieves the alias(es) from abook
29414 -" - parses the output from abook
29415 -" - actually replaces the alias with the parsed output
29417 -if !exists("*s:AliasQueryAbook")
29418 -function s:AliasQueryAbook()
29419 - let b:AliasQueryMsg = ""
29421 - " - retrieves the alias(es) from abook
29422 - let lookup=expand("<cword>")
29424 - let b:AliasQueryMsg = "Nothing found to lookup"
29428 - silent exe 'let output=system("abook --mutt-query ' . lookup . '")'
29430 - let b:AliasQueryMsg = output
29434 - " - parses the output from abook
29435 - let replacement=s:ParseMuttQuery(output)
29436 - if "" == replacement
29437 - let b:AliasQueryMsg = b:ParseMuttQueryErr
29441 - " so that they will be aligned under the 'to' or 'cc' line
29442 - let replacement=substitute(replacement, "\n", ",\n ", "g")
29444 - " - actually replaces the alias with the parsed output
29445 - " paste is set/unset so that the email addresses aren't "mangled" by the
29446 - " user's formating options
29448 - exe "normal! ciw" . replacement . "\<Esc>"
29453 -" --------------------------------------------------------------------
29454 -" Utility Functions
29455 -" --------------------------------------------------------------------
29459 -" This function will take the output of a "mutt query" (as defined by the mutt
29460 -" documenation) and parses it.
29462 -" It returns the email addresses formatted as follows:
29463 -" - each address is on a line
29465 -if !exists("*s:ParseMuttQuery")
29466 -function s:ParseMuttQuery(aliases)
29467 - " remove first informational line
29468 - let aliases = substitute (a:aliases, "\n", "", "")
29469 - let expansion = ""
29472 - " whip off the name and address
29473 - let line = matchstr(aliases, ".\\{-}\n")
29474 - let address = matchstr(line, ".\\{-}\t")
29475 - let address = substitute(address, "\t", "", "g")
29477 - let b:ParseMuttQueryErr = "Unable to parse address from ouput"
29481 - let name = matchstr(line, "\t.*\t")
29482 - let name = substitute(name, "\t", "", "g")
29484 - let b:ParseMuttQueryErr = "Unable to parse name from ouput"
29489 - " echo "line: " . line . "|"
29490 - " echo "address: " . address . "|"
29491 - " echo "name: " . name . "|"
29492 - " let a=input("hit enter")
29494 - " make into valid email address
29495 - let needquote = match (name, '"')
29496 - if (-1 == needquote)
29497 - let name = '"' . name . '" '
29500 - let needquote = match (address, '<')
29501 - if (-1 == needquote)
29502 - let address = '<' . address . '>'
29505 - " add email address to list
29506 - let expansion = expansion . name
29507 - let expansion = expansion . address
29510 - " echo "address: " . address . "|"
29511 - " echo "name: " . name . "|"
29512 - " let a=input("hit enter")
29514 - " process next line (if there is one)
29515 - let aliases = substitute(aliases, ".\\{-}\n", "", "")
29517 - let b:ParseMuttQueryErr = ""
29521 - let expansion = expansion . "\n"
29526 -" ====================================================================
29527 -" Abbreviation Manipulation
29528 -" ====================================================================
29532 -" This will generate vi abbreviations from your mutt alias file.
29535 -" However, remember that the abbreviation will be replaced *everywhere*. For
29536 -" example, if you have the alias 'Mary', then if you try and type "Hi, Mary
29537 -" vim is cool", then it won't work. This is because the 'Mary' will be
29538 -" expanded as an alias.
29540 -if !exists("*s:MakeAliasAbbrev")
29541 -function s:MakeAliasAbbrev()
29542 - let aliasfile = tempname()
29543 - silent exe "!sed -e 's/alias/iab/' ~/.mutt/aliases > " . aliasfile
29544 - exe "source " . aliasfile
29549 -" ====================================================================
29551 -" ====================================================================
29553 -if exists ("mail_erase_quoted_sig")
29554 - call s:EraseQuotedSig()
29557 -if exists ("mail_delete_empty_quoted")
29558 - call s:DelEmptyQuoted()
29561 -if exists ("mail_generate_abbrev")
29562 - call s:MakeAliasAbbrev()
29565 -if exists ("mail_cursor_start")
29566 - call s:CursorStart()
29568 diff -urN BUILD/abook-0.6.0pre2/contrib/abook+vim/README abook/contrib/abook+vim/README
29569 --- BUILD/abook-0.6.0pre2/contrib/abook+vim/README 2005-10-26 13:58:45.000000000 +0200
29570 +++ abook/contrib/abook+vim/README 1970-01-01 01:00:00.000000000 +0100
29572 -NOTE: There's no need to patch abook version 0.4.14 or later.
29573 -NOTE2: The command in abook is 'Q' not 'P'.
29575 ---- Original message from Brian Medley <brian.medley@verizon.net> ---
29578 -I am trying to make abook work better (for me) within vim. I am doing
29579 -this because I have 'autoedit' and 'edit_headers' set in mutt. This
29580 -means I would like to have easy access to my abook addressbook (from
29581 -within the editor).
29583 -To accomplish this I have written a vim plugin (it will need vim 6.0)
29584 -and have patched abook. Both are included. The patch is against abook
29587 -Amongst other things, they allow me to obtain an address listing from
29588 -abook and perform a mutt query using abook. Below is an example.
29590 -Suppose I have the following line (the cursor is at the caret):
29593 -I can now hit '\al' to lauch abook. Once inside, I can highlight the
29594 -people I want to email. Then I hit 'P'. Their email addresses now
29595 -appear. Next, suppose I have:
29598 -My plugin allows the command '\aq' to perform an alias mutt query using
29599 -abook. It uses the word under the cursor, so "john" will be looked up
29600 -inside of abook. Next, his email address will appear.
29603 - \aq => alias query
29604 - \al => alias list
29607 - - \ is actually LocalLeader
29608 - - I am aware that abook can do these things from within *mutt*, but
29609 - I want to do them from within vim.
29610 - - This plugin does other stuff, as well (like deleting signatures,
29611 - and positioning the cursor when you start) because I stole code
29612 - from Cedric Duval's mail vimrc.
29613 - - Improvements / comments are welcome.
29616 - - Documentation :)
29617 - - I tried to write this so that another alias query program could be
29618 - used (e.g. ldap), but I have not implemented this.
29621 - - I had trouble getting this to work in gvim. I used vim in a
29624 -Basic Installation:
29625 - - patch and install abook
29626 - - place the mail.vim plugin in ~/.vim/after/ftplugin
29629 diff -urN BUILD/abook-0.6.0pre2/contrib/bbdb2xx.cc abook/contrib/bbdb2xx.cc
29630 --- BUILD/abook-0.6.0pre2/contrib/bbdb2xx.cc 2005-10-26 13:58:45.000000000 +0200
29631 +++ abook/contrib/bbdb2xx.cc 1970-01-01 01:00:00.000000000 +0100
29633 -// ---------------------------------------------------------- -*- c++ -*-
29634 -// bbdb parser and converter
29635 -// supported output format: vcards abook gnokii csv
29637 -// Copyright (C) 1994-2003: Pierre Aubert pierre.aubert@free.fr
29638 -// Code below is dirty. Don't take model on it.
29640 -// V1.21 add abook format
29641 -// V1.20 adapt for g++-3
29642 -// ----------------------------------------------------------------------
29644 -// This library is free software; you can redistribute it and/or
29645 -// modify it under the terms of the GNU Library General Public
29646 -// License as published by the Free Software Foundation; either
29647 -// version 2 of the License, or (at your option) any later version.
29649 -// This library is distributed in the hope that it will be useful,
29650 -// but WITHOUT ANY WARRANTY; without even the implied warranty of
29651 -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29652 -// Library General Public License for more details.
29654 -// You should have received a copy of the GNU Library General Public
29655 -// License along with this library; if not, write to the
29656 -// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
29657 -// Boston, MA 02111-1307, USA.
29659 -// ----------------------------------------------------------------------
29661 -#include <iostream>
29663 -#include <algorithm>
29664 -#include <fstream>
29668 -// horrible global variable
29669 -size_t counter = 0;
29671 -// hold datas from a bbdb record
29673 - enum { NAME, FORNAME, AKA, COMPANY, PHONES, ADRESSES, NET, NOTES };
29675 - typedef std::vector<std::string> storage_t;
29689 - print( std::string const& l, int jb, int je ) {
29690 - char wl[5] = { 27, '[' , '5' , 'm', 0 };
29691 - char wr[5] = { 27, '[' , '0' , 'm', 0 };
29693 - for( i=0 ; i<jb ; ++i )
29694 - std::cerr << l[i];
29696 - for( i=jb ; i<je ; ++i )
29697 - std::cerr << l[i];
29699 - for( i=je ; i<l.size() ; ++i )
29700 - std::cerr << l[i];
29702 - std::cerr << std::endl;
29706 -// used for translation between format
29707 -struct two_strings {
29708 - const char * const my_val;
29709 - const char * const my_trans;
29712 -// parse 1 line of bbdb format, of course it is easier in elisp :)
29714 -parse( int const debug, int const tokmax, char const first_char, std::string const& line ) {
29716 - Id * id = new Id;
29720 - int l=line.size();
29724 - if( line[jb] == first_char )
29727 - // loop over line
29729 - // jb pointe sur le premier caractere du token
29730 - // je pointe sur le premier caractere apres la fin du token
29731 - while( jb < l ) {
29732 - // look for beginning of token
29733 - char c = line[jb];
29734 - while( jb < l && c != '(' && c != '[' && c != '"' && c != ' ' && !isalpha(c) )
29739 - char state = line[jb];
29740 - // look for end of token
29741 - switch( state ) {
29744 - int cnt_lpar = 1;
29746 - for( ; je < l ; ++je ) {
29748 - trace::print(line,jb,je);
29749 - if( line[je] == ')' ) {
29751 - if( cnt_lpar == 0 ) {
29756 - if( line[je] == '(' )
29763 - int cnt_lbra = 1;
29765 - for( ; je < l ; ++je ) {
29767 - trace::print(line,jb,je);
29768 - if( line[je] == ']' ) {
29770 - if( cnt_lbra == 0 ) {
29775 - if( line[je] == '[' )
29783 - while( je < l && line[je] != state )
29791 - while( je < l && line[je] != state )
29796 - case 'n': // nil && notes
29800 - if( line[je] == 'i' )
29801 - while( je < l && line[je] != ' ' )
29804 - while( je < l && line[je] != '.' )
29810 - case 'c': // creation-date
29811 - case 't': // timestamp
29812 - case 'h': // http
29816 - while( je < l && line[je] != '.' )
29823 - trace::print(line,jb,je);
29824 - // fill structure
29825 - if( line[jb] == '"' )
29826 - id->my_d.push_back( line.substr(jb+1,je-jb-2) );
29828 - id->my_d.push_back( line.substr(jb,je-jb) );
29834 - if( toknb < tokmax )
29843 -// ----------------------------------------------------------------------
29845 -// ----------------------------------------------------------------------
29846 -void tognokii( std::string const& l )
29848 - Id * id = parse( trace::NONE, 9, '[', l);
29849 - if( id == NULL ) {
29850 - if( l.size() > 2 )
29851 - std::cerr << "Broken line ==>" << l << "<==" << std::endl;
29855 - Id::storage_t const& s = id->my_d;
29857 - // check phone(s)
29858 - if( s[Id::PHONES].compare( "nil" ) != 0 ) {
29859 - Id * phones = new Id;
29860 - phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
29861 - if( phones == NULL ) {
29862 - std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
29867 - std::cout << s[Id::NAME] << '\t' << s[Id::FORNAME] << '\t';
29869 - Id * phone = new Id;
29870 - for( int cur_phone = 0 ; cur_phone < phones->my_d.size() ; ++cur_phone ) {
29871 - phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
29873 - if( phone != NULL ) {
29874 - std::cout << phone->my_d[1];
29875 - std::cout << '\t';
29878 - std::cout << std::endl;
29888 -// ----------------------------------------------------------------------
29890 -// ----------------------------------------------------------------------
29891 -static two_strings VCARDPhoneTypes [] =
29893 - // PERSONAL VCARD
29894 - { "home", "home" },
29895 - { "tel", "home" },
29896 - { "perso", "home" },
29897 - { "personnel", "home" },
29898 - { "personel", "home" },
29899 - { "monchat", "home" },
29900 - { "msg", "msg" },
29901 - { "mesg", "msg" },
29902 - { "work", "work" },
29903 - { "travail", "work" },
29904 - { "paris", "work" },
29905 - { "lyon", "work" },
29906 - { "issy", "work" },
29907 - { "insa", "work" },
29908 - { "woo", "work" },
29909 - { "fac", "work" },
29910 - { "voice", "voice" },
29911 - { "voie", "voice" },
29912 - { "fax", "fax" },
29913 - { "cell", "cell" },
29914 - { "portable", "cell" },
29915 - { "gsm", "cell" },
29916 - { "video", "video" },
29917 - { "pager", "pager" },
29918 - { "tatoo", "pager" },
29919 - { "voiture", "car" },
29920 - { "modem", "modem" },
29921 - { "isdn", "isdn" },
29922 - { "pcs", "pcs" },
29926 -struct VCARDPhoneTypesMap {
29927 - static two_strings const my_default [];
29930 - operator()(const char* s1, const char* s2) const {
29931 - return strcmp(s1, s2) < 0;
29935 - VCARDPhoneTypesMap() {
29936 - unsigned short i = 0;
29937 - while( VCARDPhoneTypes[i].my_val != 0 ) {
29938 - my_h[ VCARDPhoneTypes[i].my_val ] = VCARDPhoneTypes[i].my_trans;
29943 - typedef std::map<const char*,const char*,ltstr> hash_t;
29947 -two_strings const VCARDPhoneTypesMap::my_default [] =
29949 - { "work", "work" },
29950 - { "fax", "fax" },
29951 - { "cell", "cell" },
29955 -static VCARDPhoneTypesMap vcard_phone_types_map;
29957 -void tovcard( std::string const& l )
29959 - Id * id = parse( trace::NONE, 9,'[',l);
29960 - if( id == NULL ) {
29961 - if( l.size() > 2 )
29962 - std::cerr << "Broken line ==>" << l << "<==" << std::endl;
29966 - Id::storage_t const& s = id->my_d;
29968 - // std::string filename( s[Id::FORNAME] + "_" + s[Id::NAME] + ".vcf" );
29969 - // std::ofstream os( filename.c_str() );
29971 - std::cout << "BEGIN:VCARD" << std::endl;
29973 - std::cout << "FN:" << s[Id::NAME] << ' ' << s[Id::FORNAME] << std::endl;
29974 - std::cout << "N:" << s[Id::FORNAME] << ';' << s[Id::NAME] << std::endl;
29976 - if( s[Id::PHONES].compare( "nil" ) != 0 ) {
29977 - Id * phones = new Id;
29978 - phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
29979 - if( phones == NULL ) {
29980 - std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
29985 - Id * phone = new Id;
29986 - for( int cur_phone = 0 ; cur_phone < phones->my_d.size() ; ++cur_phone ) {
29987 - phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
29988 - if( phone != NULL ) {
29989 - std::cout << "TEL";
29990 - if( phone->my_d[0].find_first_of( "0123456789 _-:;," ) == phone->my_d[0].npos ) {
29991 - VCARDPhoneTypesMap::hash_t::iterator it;
29992 - if( (it=vcard_phone_types_map.my_h.find( const_cast<char*>(phone->my_d[0].c_str()))) != vcard_phone_types_map.my_h.end() ) {
29993 - std::cout << ";" << it->second;
29995 - std::cout << ";" << vcard_phone_types_map.my_default[0].my_trans;
29998 - if( phone->my_d.size() > 1 )
29999 - std::cout << ':' << phone->my_d[1] << std::endl;
30001 - std::cerr << "phone size is less than 2" << std::endl;
30008 - if( s[Id::ADRESSES].compare( "nil" ) != 0 ) {
30009 - Id * adresses = new Id;
30010 - adresses = parse( trace::NONE, 1, '(', s[Id::ADRESSES] );
30011 - if( adresses == NULL ) {
30012 - std::cerr << "can't parse adresses ==>" << s[Id::ADRESSES] << "<==" << std::endl;
30017 - Id * adresse = new Id;
30018 - for( int cur_adresse = 0 ; cur_adresse < adresses->my_d.size() ; ++cur_adresse ) {
30019 - adresse = parse( trace::NONE, 1, '[', adresses->my_d[cur_adresse] );
30020 - if( adresse != NULL ) {
30022 - Id * fields = new Id;
30023 - fields = parse( trace::NONE, 1, '(' , adresse->my_d[1] );
30024 - if( fields != NULL ) {
30025 - std::string const& town = adresse->my_d[2];
30026 - std::string const& state = adresse->my_d[3];
30027 - std::string const& postal = adresse->my_d[4];
30028 - std::string const& country = adresse->my_d[5];
30029 - std::cout << "ADR";
30030 - if( adresse->my_d[0].size() > 0 )
30031 - if( adresse->my_d[0].find_first_of( "0123456789 _-:;," ) == adresse->my_d[0].npos )
30032 - std::cout << ";TYPE=" << adresse->my_d[0];
30033 - std::cout << ':' << ';' << ';' << fields->my_d[0];
30034 - for( int i=1 ; i<fields->my_d.size() ; ++i )
30035 - std::cout << ',' << fields->my_d[i] ;
30036 - std::cout << ';' << town << ';' << state << ';' << postal << ';' << country << ';' << std::endl;
30039 - std::cerr << "unknown adresse format for ==>" << adresse->my_d[1] << "<<=" << std::endl;
30048 - if( s[Id::NET].compare("nil") != 0 ) {
30049 - Id * nets = new Id;
30050 - nets = parse( trace::NONE, 1, '(', s[Id::NET] );
30051 - if( nets == NULL ) {
30052 - std::cerr << "can't parse nets ==>" << s[Id::NET] << "<==" << std::endl;
30057 - std::cout << "EMAIL;INTERNET;PREF:" << nets->my_d[0] << std::endl;
30058 - for( int cur_net = 1 ; cur_net < nets->my_d.size() ; ++cur_net )
30059 - std::cout << "EMAIL;INTERNET:" << nets->my_d[cur_net] << std::endl;
30064 - if( s[Id::COMPANY].compare("nil") != 0 )
30065 - std::cout << "ORG:" << s[Id::COMPANY] << std::endl;
30067 - if( s[Id::AKA].compare("nil") != 0 ) {
30068 - Id * akas = new Id;
30069 - if( s[Id::AKA].find('(') == s[Id::AKA].npos )
30070 - std::cout << "NICKNAME:" << s[Id::AKA] << std::endl;
30073 - akas = parse( trace::NONE, 1, '(', s[Id::AKA] );
30074 - if( akas == NULL ) {
30075 - std::cerr << "can't parse akas ==>" << s[Id::AKA] << "<==" << std::endl;
30080 - Id * aka = new Id;
30081 - for( int cur_aka = 0 ; cur_aka < akas->my_d.size() ; ++cur_aka ) {
30082 - aka = parse( trace::NONE, 1, '(', akas->my_d[cur_aka] );
30083 - if( aka != NULL )
30084 - std::cout << "NICKNAME:" << aka->my_d[0] << std::endl;
30091 - if( s[Id::NOTES].compare("nil") != 0 ) {
30092 - Id * notes = new Id;
30093 - if( s[Id::NOTES].find('(') == s[Id::NOTES].npos )
30094 - std::cout << "NOTE:" << s[Id::NOTES] << std::endl;
30096 - notes = parse( trace::NONE, 1, '(', s[Id::NOTES] );
30097 - if( notes == NULL ) {
30098 - std::cerr << "can't parse notes ==>" << s[Id::NOTES] << "<==" << std::endl;
30103 - Id * note = new Id;
30104 - for( int cur_note = 0 ; cur_note < notes->my_d.size() ; ++cur_note ) {
30105 - note = parse( trace::NONE, 1, '(', notes->my_d[cur_note] );
30106 - if( note != NULL ) {
30107 - std::string const& t = note->my_d[0];
30108 - std::string const& r = note->my_d[1];
30110 - if( t.find("creation-date") != t.npos || t.find("timestamp") != t.npos ) {
30112 - } else if( t.find("www") != t.npos || t.find("http") != t.npos ) {
30113 - std::cout << "URL:" << r << std::endl;
30114 - } else if( t.find("notes") != t.npos ) {
30115 - std::cout << "NOTE:" << r << std::endl;
30116 - } else if( t.find("icq") != t.npos ) {
30117 - std::cout << "NOTE: ICQ #" << r << std::endl;
30118 - } else if( t.find("msn") != t.npos ) {
30119 - std::cout << "NOTE: MSN " << r << std::endl;
30121 - std::cerr << "drop notes: " << t << " for " << s[Id::NAME] << std::endl;
30130 - std::cout << "END:VCARD" << std::endl << std::endl;
30136 -// ----------------------------------------------------------------------
30138 -// ----------------------------------------------------------------------
30140 -static two_strings ABOOKPhoneTypes [] =
30142 - { "home", "phone" },
30143 - { "tel", "phone" },
30144 - { "perso", "phone" },
30145 - { "personnel", "phone" },
30146 - { "personel", "phone" },
30147 - { "monchat", "phone" },
30148 - { "msg", "phone" },
30149 - { "mesg", "phone" },
30150 - { "work", "workphone" },
30151 - { "travail", "workphone" },
30152 - { "paris", "workphone" },
30153 - { "lyon", "workphone" },
30154 - { "issy", "workphone" },
30155 - { "insa", "workphone" },
30156 - { "woo", "workphone" },
30157 - { "fac", "workphone" },
30158 - { "voice", "phone" },
30159 - { "voie", "phone" },
30160 - { "fax", "fax" },
30161 - { "cell", "mobile" },
30162 - { "portable", "mobile" },
30163 - { "gsm", "mobile" },
30164 - { "video", "phone" },
30165 - { "pager", "phone" },
30166 - { "tatoo", "phone" },
30167 - { "voiture", "phone" },
30168 - { "modem", "phone" },
30169 - { "isdn", "phone" },
30170 - { "pcs", "phone" },
30174 -struct ABOOKPhoneTypesMap {
30175 - static two_strings const my_default [];
30178 - operator()(const char* s1, const char* s2) const {
30179 - return strcmp(s1, s2) < 0;
30183 - ABOOKPhoneTypesMap() {
30184 - unsigned short i = 0;
30185 - while( ABOOKPhoneTypes[i].my_val != 0 ) {
30186 - my_h[ ABOOKPhoneTypes[i].my_val ] = ABOOKPhoneTypes[i].my_trans;
30191 - typedef std::map<const char*,const char*,ltstr> hash_t;
30195 -two_strings const ABOOKPhoneTypesMap::my_default [] = {
30197 - { "*", "phone" },
30201 -static ABOOKPhoneTypesMap abook_phone_types_map;
30203 -void toabook( std::string const& l ) {
30204 - Id * id = parse( trace::NONE, 9,'[',l);
30205 - if( id == NULL ) {
30206 - if( l.size() > 2 )
30207 - std::cerr << "Broken line ==>" << l << "<==" << std::endl;
30211 - Id::storage_t const& s = id->my_d;
30213 - std::cout << '[' << counter << ']' << std::endl;
30216 - std::cout << "name=" << s[Id::FORNAME] << ' ' << s[Id::NAME] << std::endl;
30218 - if( s[Id::NET].compare("nil") != 0 ) {
30219 - Id * nets = new Id;
30220 - nets = parse( trace::NONE, 1, '(', s[Id::NET] );
30221 - if( nets == NULL ) {
30222 - std::cerr << "can't parse nets ==>" << s[Id::NET] << "<==" << std::endl;
30227 - std::cout << "email=" << nets->my_d[0];
30228 - for( int cur_net = 1 ; cur_net < nets->my_d.size() ; ++cur_net ) {
30229 - std::cout << "," << nets->my_d[cur_net];
30231 - std::cout << std::endl;
30236 - if( s[Id::PHONES].compare( "nil" ) != 0 ) {
30237 - Id * phones = new Id;
30238 - phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
30239 - if( phones == NULL ) {
30240 - std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
30245 - Id * phone = new Id;
30246 - for( int cur_phone = 0 ; cur_phone < phones->my_d.size() ; ++cur_phone ) {
30247 - phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
30248 - if( phone != NULL ) {
30249 - if( phone->my_d[0].find_first_of( "0123456789 _-:;," ) == phone->my_d[0].npos ) {
30250 - ABOOKPhoneTypesMap::hash_t::iterator it;
30251 - if( (it=abook_phone_types_map.my_h.find( const_cast<char*>(phone->my_d[0].c_str())))
30252 - != abook_phone_types_map.my_h.end() ) {
30253 - std::cout << it->second;
30255 - std::cout << abook_phone_types_map.my_default[0].my_trans;
30258 - if( phone->my_d.size() > 1 )
30259 - std::cout << '=' << phone->my_d[1] << std::endl;
30261 - std::cerr << "phone size is less than 2" << std::endl;
30268 - if( s[Id::ADRESSES].compare( "nil" ) != 0 ) {
30269 - Id * adresses = new Id;
30270 - adresses = parse( trace::NONE, 1, '(', s[Id::ADRESSES] );
30271 - if( adresses == NULL ) {
30272 - std::cerr << "can't parse adresses ==>" << s[Id::ADRESSES] << "<==" << std::endl;
30277 - Id * adresse = new Id;
30278 - for( int cur_adresse = 0 ; cur_adresse < adresses->my_d.size() ; ++cur_adresse ) {
30279 - adresse = parse( trace::NONE, 1, '[', adresses->my_d[cur_adresse] );
30280 - if( adresse != NULL ) {
30282 - Id * fields = new Id;
30283 - fields = parse( trace::NONE, 1, '(' , adresse->my_d[1] );
30284 - if( fields != NULL ) {
30285 - std::string const& town = adresse->my_d[2];
30286 - std::string const& state = adresse->my_d[3];
30287 - std::string const& postal = adresse->my_d[4];
30288 - std::string const& country = adresse->my_d[5];
30290 - std::cout << "address=";
30291 - for( int i=0 ; i<fields->my_d.size() ; ++i )
30292 - std::cout << fields->my_d[i] << ' ';
30293 - std::cout << std::endl;
30295 - std::cout << "city=" << town << std::endl;
30296 - std::cout << "state=" << state << std::endl;
30297 - std::cout << "zip=" << postal << std::endl;
30298 - std::cout << "country=" << country << std::endl;
30300 - std::cerr << "unknown adresse format for ==>" << adresse->my_d[1] << "<<=" << std::endl;
30309 - if( s[Id::AKA].compare("nil") != 0 )
30311 - Id * akas = new Id;
30312 - if( s[Id::AKA].find('(') == s[Id::AKA].npos )
30314 - std::cout << "nick=" << s[Id::AKA] << std::endl;
30319 - if( s[Id::NOTES].compare("nil") != 0 ) {
30320 - Id * notes = new Id;
30321 - if( s[Id::NOTES].find('(') == s[Id::NOTES].npos ) {
30322 - std::cout << "notes=" << s[Id::NOTES] << std::endl;
30324 - notes = parse( trace::NONE, 1, '(', s[Id::NOTES] );
30325 - if( notes == NULL ) {
30326 - std::cerr << "can't parse notes ==>" << s[Id::NOTES] << "<==" << std::endl;
30331 - Id * note = new Id;
30332 - for( int cur_note = 0 ; cur_note < notes->my_d.size() ; ++cur_note ) {
30333 - note = parse( trace::NONE, 1, '(', notes->my_d[cur_note] );
30335 - if( note != NULL ) {
30336 - std::string const& t = note->my_d[0];
30337 - std::string const& r = note->my_d[1];
30339 - if( t.find("creation-date") != t.npos || t.find("timestamp") != t.npos ) {
30341 - } else if( t.find("www") != t.npos || t.find("http") != t.npos ) {
30342 - std::cout << "url=" << r << std::endl;
30343 - } else if( t.find("notes") != t.npos ) {
30344 - std::cout << "note=" << r << std::endl;
30345 - } else if( t.find("icq") != t.npos ) {
30346 - std::cout << "note=icq #" << r << std::endl;
30347 - } else if( t.find("msn") != t.npos ) {
30348 - std::cout << "note=msn" << r << std::endl;
30350 - std::cerr << "drop notes: " << t << " for " << s[Id::NAME] << std::endl;
30359 - std::cout << std::endl;
30363 -// ----------------------------------------------------------------------
30365 -// ----------------------------------------------------------------------
30366 -void tocsv( std::string const& l )
30368 - char const sep = ',';
30369 - char const quo = '"';
30371 - Id * id = parse( trace::NONE, 9,'[',l);
30374 - if( l.size() > 2 )
30375 - std::cerr << "Broken line ==>" << l << "<==" << std::endl;
30379 - Id::storage_t const& s = id->my_d;
30381 - // "First Name","Last Name","Display Name"
30382 - std::cout << quo << s[Id::NAME] << quo << sep;
30383 - std::cout << quo << s[Id::FORNAME] << quo << sep;
30384 - std::cout << quo << s[Id::FORNAME] << ' ' << s[Id::NAME] << quo << sep;
30386 - // "Nickname Name"
30387 - std::string s_aka;
30388 - if( s[Id::AKA].compare("nil") != 0 )
30390 - Id * akas = new Id;
30391 - if( s[Id::AKA].find('(') == s[Id::AKA].npos )
30393 - std::cout << quo << s[Id::AKA] << quo << sep ;
30397 - akas = parse( trace::NONE, 1, '(', s[Id::AKA] );
30398 - if( akas == NULL )
30400 - std::cerr << "can't parse akas ==>" << s[Id::AKA] << "<==" << std::endl;
30405 - Id * aka = new Id;
30406 - aka = parse( trace::NONE, 1, '(', akas->my_d[0] );
30407 - if( aka != NULL )
30409 - s_aka = quo + aka->my_d[0] + quo;
30415 - std::cout << s_aka << sep;
30417 - // "E-mail","Secondary E-mail"
30418 - std::string s_email1;
30419 - std::string s_email2;
30420 - if( s[Id::NET].compare("nil") != 0 )
30422 - Id * nets = new Id;
30423 - nets = parse( trace::NONE, 1, '(', s[Id::NET] );
30424 - if( nets == NULL )
30426 - std::cerr << "can't parse nets ==>" << s[Id::NET] << "<==" << std::endl;
30431 - s_email1 = quo + nets->my_d[0] + quo;
30432 - if( nets->my_d.size() > 1 )
30434 - s_email2 = quo + nets->my_d[1] + quo;
30438 - std::cout << s_email1 << sep << s_email2 << sep;
30440 - // "Business Phone","Home Phone","Fax Phone","Pager","Mobile Phone"
30441 - std::string p_business;
30442 - std::string p_home;
30443 - std::string p_fax;
30444 - std::string p_pager;
30445 - std::string p_mobile;
30447 - if( s[Id::PHONES].compare( "nil" ) != 0 )
30449 - Id * phones = new Id;
30450 - phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
30451 - if( phones == NULL )
30453 - std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
30458 - Id * phone = new Id;
30460 - for( cur_phone = 0 ; cur_phone < std::min(size_t(5),phones->my_d.size()) ; ++cur_phone )
30462 - phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
30464 - if( phone != NULL )
30466 - std::string trans;
30467 - if( phone->my_d[0].find_first_of( "0123456789 _-:;," ) == phone->my_d[0].npos )
30469 - ABOOKPhoneTypesMap::hash_t::iterator it;
30470 - if( (it=abook_phone_types_map.my_h.find( const_cast<char*>(phone->my_d[0].c_str())))
30471 - != abook_phone_types_map.my_h.end() )
30473 - trans = it->second;
30477 - trans = abook_phone_types_map.my_default[0].my_trans;
30480 - if( trans.find("home") != trans.npos )
30482 - p_home = quo + phone->my_d[1] + quo ;
30484 - else if( trans.find("work") != trans.npos )
30486 - p_business = quo + phone->my_d[1] + quo ;
30488 - else if( trans.find("cell") != trans.npos )
30490 - p_mobile = quo + phone->my_d[1] + quo ;
30492 - else if( trans.find("fax") != trans.npos )
30494 - p_fax = quo + phone->my_d[1] + quo ;
30496 - else if( trans.find("pager") != trans.npos )
30498 - p_pager = quo + phone->my_d[1] + quo ;
30502 - if( p_home.size() == 0 )
30504 - p_home = quo + phone->my_d[1] + quo ;
30512 - std::cout << p_business << sep
30515 - << p_pager << sep
30516 - << p_mobile << sep;
30518 - // "Home Street 1","Home Street 2","Home City","Home State","Home Postal Code","Home Country",
30519 - // "Business Street 1","Business Street 2","Business City","Business State","Business Postal Code","Business Country"
30520 - if( s[Id::ADRESSES].compare( "nil" ) != 0 )
30522 - Id * adresses = new Id;
30523 - adresses = parse( trace::NONE, 1, '(', s[Id::ADRESSES] );
30524 - if( adresses == NULL )
30526 - std::cerr << "can't parse adresses ==>" << s[Id::ADRESSES] << "<==" << std::endl;
30531 - Id * adresse = new Id;
30533 - for( cur_adresse = 0 ; cur_adresse < std::min(size_t(2),adresses->my_d.size()) ; ++cur_adresse )
30535 - adresse = parse( trace::NONE, 1, '[', adresses->my_d[cur_adresse] );
30537 - if( adresse != NULL )
30540 - Id * fields = new Id;
30541 - fields = parse( trace::NONE, 1, '(' , adresse->my_d[1] );
30542 - if( fields != NULL )
30544 - std::string const& town = adresse->my_d[2];
30545 - std::string const& state = adresse->my_d[3];
30546 - std::string const& postal = adresse->my_d[4];
30547 - std::string const& country = adresse->my_d[5];
30549 -// if( adresse->my_d[0].size() > 0 )
30551 -// if( adresse->my_d[0].find_first_of( "0123456789 _-:;," ) ==
30552 -// adresse->my_d[0].npos )
30554 -// std::cout << ";TYPE=" << adresse->my_d[0];
30558 - for( i=0 ; i<std::min(size_t(2),fields->my_d.size()) ; ++i )
30559 - std::cout << quo << fields->my_d[i] << quo << sep;
30560 - for( i=std::min(size_t(2),fields->my_d.size()) ; i<2; ++i )
30561 - std::cout << sep;
30562 - std::cout << quo << town << quo << sep
30563 - << quo << state << quo << sep
30564 - << quo << postal << quo << sep
30565 - << quo << country << quo << sep;
30569 - std::cerr << "unknown adresse format for ==>" << adresse->my_d[1]
30570 - << "<<=" << std::endl;
30575 - for( cur_adresse = std::min(size_t(2),adresses->my_d.size()) ; cur_adresse<2; ++cur_adresse )
30577 - std::cout << sep << sep << sep << sep << sep << sep;
30584 - std::cout << sep << sep << sep << sep << sep << sep
30585 - << sep << sep << sep << sep << sep << sep;
30588 - // "Job Title","Department","Company"
30589 - std::string s_title;
30590 - std::string s_departement;
30591 - std::string s_company;
30592 - if( s[Id::COMPANY].compare("nil") != 0 )
30594 - s_company = quo + s[Id::COMPANY] + quo;
30596 - std::cout << s_title << sep
30597 - << s_departement << sep
30598 - << s_company << sep;
30600 - // "Web Page 1","Web Page 2","Birth Year","Birth Month","Birth Day","User Field 1","User Field 2","User Field 3","User Field 4","Notes"
30601 - std::string n_web1;
30602 - std::string n_web2;
30603 - std::string n_byear;
30604 - std::string n_bmonth;
30605 - std::string n_bday;
30606 - std::string n_user1; // icq
30607 - std::string n_user2; // im
30608 - std::string n_user3;
30609 - std::string n_user4;
30610 - std::string n_note;
30612 - if( s[Id::NOTES].compare("nil") != 0 )
30614 - Id * notes = new Id;
30615 - if( s[Id::NOTES].find('(') == s[Id::NOTES].npos )
30617 - n_note = quo + s[Id::NOTES] + quo;
30621 - notes = parse( trace::NONE, 1, '(', s[Id::NOTES] );
30622 - if( notes == NULL )
30624 - std::cerr << "can't parse notes ==>" << s[Id::NOTES] << "<==" ;
30629 - Id * note = new Id;
30631 - for( cur_note = 0 ; cur_note < std::min(size_t(10),notes->my_d.size()) ; ++cur_note )
30633 - note = parse( trace::NONE, 1, '(', notes->my_d[cur_note] );
30635 - if( note != NULL )
30637 - std::string const& t = note->my_d[0];
30638 - std::string const& r = note->my_d[1];
30640 - if( t.find("www") != t.npos || t.find("http") != t.npos )
30642 - if( n_web1.size() == 0 )
30644 - n_web1 = quo + r + quo;
30648 - n_web2 = quo + r + quo;
30651 - else if( t.find("icq") != t.npos )
30653 - n_user1 = quo + r + quo;
30655 - else if( t.find("notes") != t.npos )
30657 - n_note = quo + r + quo;
30666 - std::cout << n_web1 << sep << n_web2 << sep
30667 - << n_byear << sep << n_bmonth << sep << n_bday << sep
30668 - << n_user1 << sep << n_user2 << sep << n_user3 << sep << n_user4 << sep
30671 - std::cout << std::endl;
30676 -// ----------------------------------------------------------------------
30678 -// ----------------------------------------------------------------------
30680 -usage(int argc, char * argv[] )
30682 - std::cerr << argv[0] << " -t (vcard|gnokii|csv|abook) -l (fr|en) bbdb.txt" << std::endl;
30683 - std::cerr << "argc=" << argc << std::endl;
30689 -// ----------------------------------------------------------------------
30691 -// ----------------------------------------------------------------------
30693 -main( int argc, char * argv[] )
30697 - return usage(argc,argv);
30701 - char * lg = "en";
30702 - if( argc == 4 && !strcmp(argv[1],"-t") )
30704 - if( !strcmp(argv[2],"vcard") )
30708 - else if( !strcmp(argv[2],"csv") )
30712 - else if( !strcmp(argv[2],"gnokii") )
30716 - else if( !strcmp(argv[2],"abook") )
30722 - return usage(argc,argv);
30725 - else if( argc == 6 && !strcmp(argv[3],"-l") )
30728 - if( strcmp(lg,"fr") && strcmp(argv[4],"en") )
30730 - return usage(argc,argv);
30735 - return usage(argc,argv);
30738 - std::vector<std::string> v;
30741 - std::ifstream fs;
30742 - fs.open( argv[argc-1], std::ios::in );
30743 - if( ! fs.is_open() )
30745 - std::cerr << "can't open " << argv[argc-1] << std::endl;
30748 - while( ! fs.eof() )
30751 - fs.getline(data,1024);
30752 - if( data[0] != ';' )
30754 - v.push_back( data );
30763 - std::for_each( v.begin(), v.end(), tognokii );
30766 - std::for_each( v.begin(), v.end(), tovcard );
30769 - std::for_each( v.begin(), v.end(), toabook );
30772 - if( !strcmp( lg, "en" ))
30774 - std::cout << "\"First Name\",\"Last Name\",\"Display Name\",\"Nickname Name\",\"E-mail\",\"Secondary E-mail\",\"Business Phone\",\"Home Phone\",\"Fax Phone\",\"Pager\",\"Mobile Phone\",\"Home Street 1\",\"Home Street 2\",\"Home City\",\"Home State\",\"Home Postal Code\",\"Home Country\",\"Business Street 1\",\"Business Street 2\",\"Business City\",\"Business State\",\"Business Postal Code\",\"Business Country\",\"Job Title\",\"Department\",\"Company\",\"Web Page 1\",\"Web Page 2\",\"Birth Year\",\"Birth Month\",\"Birth Day\",\"User Field 1\",\"User Field 2\",\"User Field 3\",\"User Field 4\",\"Notes\"" << std::endl;
30778 - std::cout << "\"PrƩnom\",\"Nom\",\"Display Name\",\"Nickname Name\",\"E-mail\",\"Secondary E-mail\",\"Business Phone\",\"TƩlƩphone\",\"Fax Phone\",\"Pager\",\"Mobile Phone\",\"Home Street 1\",\"Home Street 2\",\"Home City\",\"Home State\",\"Home Postal Code\",\"Home Country\",\"Business Street 1\",\"Business Street 2\",\"Business City\",\"Business State\",\"Business Postal Code\",\"Business Country\",\"Job Title\",\"Department\",\"Company\",\"Web Page 1\",\"Web Page 2\",\"Birth Year\",\"Birth Month\",\"Birth Day\",\"User Field 1\",\"User Field 2\",\"User Field 3\",\"User Field 4\",\"Notes\"" << std::endl;
30781 - std::for_each( v.begin(), v.end(), tocsv );
30786 - // open output file
30791 diff -urN BUILD/abook-0.6.0pre2/contrib/CVS/Entries abook/contrib/CVS/Entries
30792 --- BUILD/abook-0.6.0pre2/contrib/CVS/Entries 2006-09-06 13:55:29.000000000 +0200
30793 +++ abook/contrib/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
30796 diff -urN BUILD/abook-0.6.0pre2/contrib/CVS/Repository abook/contrib/CVS/Repository
30797 --- BUILD/abook-0.6.0pre2/contrib/CVS/Repository 2006-09-06 13:55:29.000000000 +0200
30798 +++ abook/contrib/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
30801 diff -urN BUILD/abook-0.6.0pre2/contrib/CVS/Root abook/contrib/CVS/Root
30802 --- BUILD/abook-0.6.0pre2/contrib/CVS/Root 2006-09-06 13:55:29.000000000 +0200
30803 +++ abook/contrib/CVS/Root 1970-01-01 01:00:00.000000000 +0100
30805 -:ext:jheinonen@abook.cvs.sourceforge.net:/cvsroot/abook
30806 diff -urN BUILD/abook-0.6.0pre2/contrib/epm/abook.list.in abook/contrib/epm/abook.list.in
30807 --- BUILD/abook-0.6.0pre2/contrib/epm/abook.list.in 2005-10-26 13:58:45.000000000 +0200
30808 +++ abook/contrib/epm/abook.list.in 1970-01-01 01:00:00.000000000 +0100
30811 -# tested with epm 3.1.0 and abook @MAJOR@.@MINOR@.@PATCHLEVEL@
30815 -$bindir=@prefix@/bin
30816 -$confdir=@sysconfdir@
30818 -$srcdir=@top_srcdir@
30819 -$docdir=@datadir@/abook-@MAJOR@.@MINOR@.@PATCHLEVEL@
30821 -# Product information
30824 -%vendor Jaakko Heinonen <jheinonen@users.sourceforge.net>
30825 -%license ${srcdir}/COPYING
30826 -%readme ${srcdir}/README
30827 -%description Abook is an addressbook program with mutt mail client support.
30828 -%version @MAJOR@.@MINOR@.@PATCHLEVEL@
30829 -%packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it>
30831 -d 0755 root sys $bindir/ -
30832 -f 0755 root sys $bindir/abook $srcdir/abook
30833 -d 0755 root sys $mandir -
30834 -d 0755 root sys $mandir/man1 -
30835 -f 0644 root sys $mandir/man1/abook.1 $srcdir/abook.1
30836 -d 0755 root sys $mandir/man5 -
30837 -f 0644 root sys $mandir/man5/abookrc.5 $srcdir/abookrc.5
30838 -d 0755 root sys $docdir -
30839 -f 0644 root sys $docdir/AUTHORS $srcdir/AUTHORS
30840 -f 0644 root sys $docdir/BUGS $srcdir/BUGS
30841 -f 0644 root sys $docdir/ChangeLog $srcdir/ChangeLog
30842 -f 0644 root sys $docdir/FAQ $srcdir/FAQ
30843 -f 0644 root sys $docdir/NEWS $srcdir/NEWS
30844 -f 0644 root sys $docdir/README $srcdir/README
30845 -f 0644 root sys $docdir/THANKS $srcdir/THANKS
30846 -f 0644 root sys $docdir/TODO $srcdir/TODO
30847 -f 0644 root sys $docdir/sample.abookrc $srcdir/sample.abookrc
30848 -d 0755 root sys $docdir/contrib -
30849 -f 0755 root sys $docdir/contrib/mail2abook.py contrib/mail2abook.py
30850 -f 0755 root sys $docdir/contrib/vcard2abook.pl contrib/vcard2abook.pl
30851 -d 0755 root sys $docdir/contrib/abook+vim -
30852 -f 0644 root sys $docdir/contrib/abook+vim/README contrib/abook+vim/README
30853 -f 0644 root sys $docdir/contrib/abook+vim/mail.vim contrib/abook+vim/mail.vim
30854 -d 0755 root sys $docdir/contrib/whitelist -
30855 -f 0644 root sys $docdir/contrib/whitelist/README contrib/whitelist/README
30856 -f 0755 root sys $docdir/contrib/whitelist/abook2whitelist.sh contrib/whitelist/abook2whitelist.sh
30857 -f 0644 root sys $docdir/contrib/whitelist/mutt.whitelist contrib/whitelist/mutt.whitelist
30858 -f 0644 root sys $docdir/contrib/whitelist/patch.orig.obsolete contrib/whitelist/patch.orig.obsolete
30859 -f 0744 root sys $docdir/contrib/whitelist/whitelist.rc contrib/whitelist/whitelist.rc
30861 diff -urN BUILD/abook-0.6.0pre2/contrib/epm/configure.in abook/contrib/epm/configure.in
30862 --- BUILD/abook-0.6.0pre2/contrib/epm/configure.in 2005-10-26 13:58:45.000000000 +0200
30863 +++ abook/contrib/epm/configure.in 1970-01-01 01:00:00.000000000 +0100
30865 -dnl abook configure.in
30868 -AM_INIT_AUTOMAKE(abook, 0.4.14)
30869 -AM_CONFIG_HEADER(config.h)
30878 -AC_SUBST(PATCHLEVEL)
30883 -if test "x$U" != "x"; then
30884 - AC_MSG_ERROR(Compiler not ANSI compliant)
30889 -AC_CHECK_HEADERS(unistd.h locale.h termios.h linux/termios.h sys/ioctl.h)
30890 -AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
30891 -AC_CHECK_FUNCS(setlocale)
30893 -dnl -------------------
30894 -dnl (n)curses detection
30895 -dnl -------------------
30897 -abook_cv_curses=/usr
30898 -AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
30899 - [if test $withval != yes; then
30900 - abook_cv_curses=$withval
30902 - if test x$abook_cv_curses != x/usr; then
30903 - LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
30904 - CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
30907 -AC_CHECK_LIB(ncurses, initscr,
30908 - [LIBS="$LIBS -lncurses"
30909 - if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
30910 - CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
30912 - AC_CHECK_HEADERS(ncurses.h)],
30913 - [CF_CURSES_LIBS])
30915 -dnl --------------------------
30916 -dnl end of (n)curses detection
30917 -dnl --------------------------
30919 -AC_CHECK_FUNCS(resizeterm)
30921 -AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],)
30922 -AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF)],)
30924 -AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in
30925 - yes) debug=true ;;
30926 - no) debug=false ;;
30927 - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
30928 - esac], [debug=false])
30930 -if test x$debug = xtrue; then
30931 - CPPFLAGS="-DDEBUG $CPPFLAGS"
30932 - CFLAGS="-g $CFLAGS"
30935 -if test x$GCC = xyes; then
30936 - CFLAGS="-Wall $CFLAGS"
30939 -AC_OUTPUT(Makefile abook.list)
30941 diff -urN BUILD/abook-0.6.0pre2/contrib/epm/configure.in.patch abook/contrib/epm/configure.in.patch
30942 --- BUILD/abook-0.6.0pre2/contrib/epm/configure.in.patch 2005-10-26 13:58:45.000000000 +0200
30943 +++ abook/contrib/epm/configure.in.patch 1970-01-01 01:00:00.000000000 +0100
30945 ---- ../../configure.in Wed Oct 10 21:35:54 2001
30946 -+++ configure.in Wed Oct 10 04:52:33 2001
30948 - dnl abook configure.in
30951 --AM_INIT_AUTOMAKE(abook, 0.4.15pre2)
30952 -+AM_INIT_AUTOMAKE(abook, 0.4.14)
30953 - AM_CONFIG_HEADER(config.h)
30955 - AC_CANONICAL_HOST
30962 -+AC_SUBST(PATCHLEVEL)
30968 - CFLAGS="-Wall $CFLAGS"
30971 --AC_OUTPUT(Makefile)
30972 -+AC_OUTPUT(Makefile abook.list)
30974 diff -urN BUILD/abook-0.6.0pre2/contrib/epm/README abook/contrib/epm/README
30975 --- BUILD/abook-0.6.0pre2/contrib/epm/README 2005-10-26 13:58:45.000000000 +0200
30976 +++ abook/contrib/epm/README 1970-01-01 01:00:00.000000000 +0100
30979 -I've written a list file (+ configure.in small mods) that can be used with
30980 -epm (www.easysw.com) to generate packages for almost all unixes. I find it
30981 -useful when switching between solaris, freebsd and linux. Hope it can be of
30985 - Giuseppe "Cowo" Corbelli ~\/~ My software: http://cowo.mascanc.net
30986 - -<! windoze: no need of an hammer to crash it! !>-
30991 -NOTE: Please adjust version numbers in configure.in manually
30992 diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl abook/contrib/ldap-abook/comms.pl
30993 --- BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl 2005-10-26 13:58:45.000000000 +0200
30994 +++ abook/contrib/ldap-abook/comms.pl 1970-01-01 01:00:00.000000000 +0100
30996 -$TMPERR="Cannot open temporary file";
30997 -$DESTFILEERR="Cannot open file $DESTFILE";
30998 -$REPORT="entries created";
31000 diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-en abook/contrib/ldap-abook/comms.pl-en
31001 --- BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-en 2005-10-26 13:58:45.000000000 +0200
31002 +++ abook/contrib/ldap-abook/comms.pl-en 1970-01-01 01:00:00.000000000 +0100
31004 -$TMPERR="Cannot open temporary file";
31005 -$DESTFILEERR="Cannot open file $DESTFILE";
31006 -$REPORT="entries created";
31008 diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-pl abook/contrib/ldap-abook/comms.pl-pl
31009 --- BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-pl 2005-10-26 13:58:45.000000000 +0200
31010 +++ abook/contrib/ldap-abook/comms.pl-pl 1970-01-01 01:00:00.000000000 +0100
31012 -$TMPERR="Nie moglem otworzyc pliku /tmp/ldap2abook/tmp";
31013 -$DESTFILEERR="Nie moglem otworzyc pliku $DESTFILE";
31014 -$REPORT="wpisow utworzonych";
31016 diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/ldap2abook abook/contrib/ldap-abook/ldap2abook
31017 --- BUILD/abook-0.6.0pre2/contrib/ldap-abook/ldap2abook 2005-10-26 13:58:45.000000000 +0200
31018 +++ abook/contrib/ldap-abook/ldap2abook 1970-01-01 01:00:00.000000000 +0100
31022 -# This is very simple method to get data from LDAP and
31023 -# converts it to abook readable format.
31024 -# Script get only first email of any person. This is, probably,
31025 -# primary address.
31026 -# If you have better/simpler method - send me, please.
31028 -# You MUST have ldap-utils installed on your system to
31029 -# use this script. Without ldapsearch script does not work!
31031 -# Author: Mariusz Balewski <M.Balewski@wp.pl>
31033 -# 29.08.2005 Tried to fix insecure tempfile handling (untested)
31036 -# Feel free to send me your comments
31038 -# I'm not programmer, so REMEMBER:
31039 -# YOU USE THIS SCRIPT ON YOUR OWN RISK!!!
31042 -# Change this section to your local settings
31044 - $HOST="ldaphost.com";
31046 - # Base dn to search
31047 - $BASEDN="\"-b ou=example,dc=com\"";
31049 - # dn which contains email addresses
31052 - # for example "-D \"cn=admin,dc=com\"" (if needed)
31055 - # ldap password (if needed), or -w to force script
31056 - # to password prompting
31059 - # use -x if your ldaphost accept simple authentication
31063 - # Where you want to put results?
31064 - # In this example results will be putted to
31065 - # your home directory, to abookFromLDAP file.
31066 - # If you wish to use abook with this file, simply run:
31067 - # abook --datafile $HOME/abookFromLDAP
31068 - $DESTFILE="$ENV{'HOME'}/abookFromLDAP";
31070 - # If you wish to see communiats in english or polish
31071 - # link comms.pl-en to comms.pl to english or
31072 - # comms.pl-pl to polish
31074 -# End of configuration
31075 -###############################
31076 -###############################
31078 -use File::Temp qw/ :mktemp /;
31079 -$file = mktemp("/tmp/tmpfileXXXXXXX");
31082 -require 'comms.pl';
31084 -system("ldapsearch -h $HOST $SIMPLEAUTH $AUTHDN $PASS \"$FINDDN=*\" $BASEDN -LLL > $file");
31087 -open(F1,"<$file") || die "$TMPERR";
31088 -open(F2,">$DESTFILE") || die "$DESTFILEERR";
31092 - if ($_ =~ m/^gecos/g){
31094 - s/^gecos: /name=/g;
31095 - print F2 "[$i]\n";
31099 - elsif ($_ =~ m/^mail/g){
31100 - s/^mail: /email=/g;
31112 -print "$REPORT\n\n";
31115 diff -urN BUILD/abook-0.6.0pre2/contrib/mail2abook.py abook/contrib/mail2abook.py
31116 --- BUILD/abook-0.6.0pre2/contrib/mail2abook.py 2005-10-26 13:58:45.000000000 +0200
31117 +++ abook/contrib/mail2abook.py 1970-01-01 01:00:00.000000000 +0100
31119 -#!/usr/bin/env python
31121 -# NOTE: starting from abook version 0.4.15 it is often more convenient
31122 -# to use command line option "--add-email" instead of this script
31124 -# mail2abook.py version 0.1
31125 -# by Jaakko Heinonen <jheinonen@users.sourceforge.net>
31126 -# based on Moritz Moeller-Herrmann's mail2muttalias.py
31129 -# this script reads all mail adresses from a piped mailfile and
31130 -# offers to write them to the ABOOKFILE specified in the script
31131 -# Append the following lines or similiar to your muttrc:
31132 -# macro pager A |'path to script'/mail2abook.py\n
31134 -# Then press A in pager mode to add an address to your abook addressbook
31136 -# Here's the original copyright information:
31140 -# Needs python 1.5 and cursesmodule 1.4 by andrich@fga.de (Oliver Andrich)
31141 -# available somewhere on http://www.python.org or directly from
31142 -# http://andrich.net/python/selfmade.html
31144 -# Copyright by Moritz Moeller-Herrmann <mmh@gmnx.net>
31146 -# Homepage (check for changes before reporting a bug)
31147 -# http://webrum.uni-mannheim.de/jura/moritz/mail2muttalias.html
31149 -# Use this any way you want. Please inform me of any error/improvement
31150 -# and leave the copyright notice untouched.
31151 -# No warranties, as this is my first program :-)
31152 -# Works for me on Linux with Python 1.5+
31154 -# Thanks to Josh Hildebrand for some improvements
31158 -# If name containing @ is quoted("") before a mail adress,
31159 -# the program will not catch the whole name,
31160 -# but who would alias such an idiot?
31161 -# If you get a problem with "unknown variable / keyword error"
31162 -# with KEYUP and KEYDOWN, either get a newer pythoncurses module
31163 -# or change them to lowercase.
31165 -# Probably some more, mail me if you find one!
31168 -import string, sys, os
31169 -import curses, traceback
31172 -locale.setlocale(locale.LC_ALL,os.environ["LANG"])
31174 -ABOOKFILE=os.environ["HOME"] + "/.abook/addressbook"
31177 - testcurses = curses.KEY_UP
31179 - print "Your pythoncurses module is old. Please upgrade to 1.4 or higher."
31180 - print "Alternative: Modify the script. Change all 6 occurences of curses.KEY_UP"
31181 - print "and similiar to lowercase."
31183 -try : testAF = ABOOKFILE #test if ALIASFILE was configured in script
31185 - try: ALIASFILE=os.environ["ABOOKFILE"] #test is environment MUTTALIASFILE was set
31187 - print "Please specify ABOOKFILE at beginning of script \nor set environment variable ABOOKFILE"
31188 - print "Aborting ..."
31193 -###Thanks for the following go to Michael P. Reilly
31194 -if not sys.stdin.isatty(): # is it not attached to a terminal?
31195 - file = sys.stdin.read()
31196 - sys.stdin = _dev_tty = open('/dev/tty', 'w+')
31197 - # close the file descriptor for stdin thru the posix module
31199 - # now we duplicate the opened _dev_tty file at file descriptor 0 (fd0)
31200 - # really, dup creates the duplicate at the lowest numbered, closed file
31201 - # descriptor, but since we just closed fd0, we know we will dup to fd0
31202 - os.dup(_dev_tty.fileno()) # on UNIX, the fileno() method returns the
31203 - # file object's file descriptor
31204 -else: # is a terminal
31205 - print "Please use as a pipe!"
31206 - print "Aborting..."
31208 -# now standard input points to the terminal again, at the C level, not just
31209 -# at the Python level.
31212 -print "Looking for mail adresses, this may take a while..."
31215 -#### define functions
31219 - "Class to create a simple to use menu using curses"
31220 - def __init__(self):
31221 - import curses, traceback
31224 - # Initialize curses
31225 - self.stdscr=curses.initscr()
31226 - # Turn off echoing of keys, and enter cbreak mode,
31227 - # where no buffering is performed on keyboard input
31231 - # In keypad mode, escape sequences for special keys
31232 - # (like the cursor keys) will be interpreted and
31233 - # a special value like curses.KEY_LEFT will be returned
31234 - self.stdscr.keypad(1)
31236 - def titel(self,TITEL="Title - test",HELP="Use up and down arrows + Return"):
31237 - "Draws Title and Instructions"
31238 - self.stdscr.addstr(0,0,TITEL,curses.A_UNDERLINE) # Title + Help
31239 - self.stdscr.addstr(self.Y -2 ,0,HELP,curses.A_REVERSE)
31241 - def refresh(self):
31242 - self.stdscr.refresh()
31245 - "Returns screen size and cursor position"
31247 - self.Y, self.X = self.stdscr.getmaxyx()
31248 - #self.y, self.x = 0, 0
31249 - self.y, self.x = self.stdscr.getyx()
31251 - return self.Y, self.X, self.y, self.x
31254 - def showlist(self,LISTE,LSECT=1):
31255 - "Analyzes list, calculates screen, draws current part of list on screen "
31256 - s = self.Y -3 #space on screen
31258 - while len(LISTE) > self.MAXSECT * s : # how many times do we need the screen?
31259 - self.MAXSECT = self.MAXSECT +1
31261 - if self.LSECT > self.MAXSECT: #check for end of list
31262 - self.LSECT = LSECT -1
31264 - if self.LSECT <= 0: #
31267 - if len(LISTE) <= s:
31268 - self.LISTPART=LISTE
31271 - self.LISTPART=LISTE[s * ( self.LSECT -1 ) : s * self.LSECT ] # part of the List is shown
31273 - self.stdscr.addstr(self.Y -2, self.X -len(`self.LSECT`+`self.MAXSECT`) -5, "(" + `self.LSECT` + "/" + `self.MAXSECT` + ")")
31274 - #if len(LISTE) > self.Y - 3:
31276 - for i in range (1, self.Y -2): # clear screen between title and help text
31277 - self.stdscr.move(i , 0)
31278 - self.stdscr.clrtoeol()
31279 - for i in range (0,len(self.LISTPART)): # print out current part of list
31280 - Item = self.LISTPART[i]
31281 - self.stdscr.addstr(i +1, 0, Item[:self.X])
31283 - def getresult(self,HOEHE):
31284 - "Get Result from cursor position"
31285 - RESULT= self.LISTPART[(HOEHE -1)]
31288 - def showresult(self, HOEHE, DICT={}):
31289 - "Look up result to show in dictionary if provided, return list member otherwise"
31291 - return self.getresult(HOEHE)
31293 - return string.join(DICT[self.getresult(HOEHE)], " || ")
31297 - def menucall(self, LISTE, DICT={}, TITEL="",HELP="Use up and down arrows, Return to select"):
31298 - "Takes a list and offers a menu where you can choose one item, optionally, look up result in dictionary if provided"
31302 - self.titel(TITEL,HELP)
31303 - self.showlist(LISTE)
31305 - self.stdscr.move(1,0)
31306 - while 1: # read Key events
31307 - c = self.stdscr.getch()
31310 - #if c == curses.KEY_LEFT and self.x > 0:
31311 - # self.stdscr.move(self.y, self.x -1); REFY = 1 # REFY == refresh: yes
31313 - #if c == curses.KEY_RIGHT and self.x < self.X -1:
31314 - # #if x < 4 and LENGTH - ZAHLY > y - 1:
31315 - # self.stdscr.move(self.y, self.x + 1); REFY = 1
31317 - if c == curses.KEY_UP or c == 107: #up arrow or k
31319 - self.stdscr.move(self.y -1, self.x); REFY = 1
31321 - self.LSECT=self.LSECT-1
31322 - self.showlist(LISTE,self.LSECT)
31323 - self.stdscr.move(len(self.LISTPART), 0)
31326 - if c == curses.KEY_DOWN or c == 106: #down arrow or j
31328 - if self.y < len(self.LISTPART) :
31329 - self.stdscr.move(self.y +1, self.x); REFY = 1
31332 - self.LSECT=self.LSECT+1
31333 - self.showlist(LISTE,self.LSECT)
31334 - self.stdscr.move(1,0)
31337 - if c == curses.KEY_PPAGE:
31338 - self.LSECT=self.LSECT-1
31339 - self.showlist(LISTE,self.LSECT)
31340 - self.stdscr.move(1, 0)
31343 - if c == curses.KEY_NPAGE:
31344 - self.LSECT=self.LSECT+1
31345 - self.showlist(LISTE,self.LSECT)
31346 - self.stdscr.move(1,0)
31349 - if c == curses.KEY_END:
31350 - self.LSECT=self.MAXSECT
31351 - self.showlist(LISTE,self.LSECT)
31352 - self.stdscr.move(1,0)
31355 - if c == curses.KEY_HOME:
31357 - self.showlist(LISTE,self.LSECT)
31358 - self.stdscr.move(1,0)
31362 - if c == 10 : # \n (new line)
31363 - ERG = self.getresult(self.y )
31367 - if c == 113 or c == 81: # "q or Q"
31368 - self.printoutnwait("Aborted by user!")
31376 - self.stdscr.move(self.Y -1, 0)
31377 - self.stdscr.clrtoeol()
31378 - self.stdscr.addstr(self.Y -1, 0, self.showresult(self.y,DICT)[:self.X -1 ], curses.A_BOLD)
31379 - self.stdscr.move(self.y, self.x)
31383 - "Return terminal"
31384 - # In the event of an error, restore the terminal
31385 - # to a sane state.
31386 - self.Y, self.X, self.y, self.x = 0, 0, 0, 0
31388 - self.stdscr.keypad(0)
31390 - curses.nocbreak()
31392 - #traceback.print_exc()
31394 - def input(self, promptstr):
31395 - "raw_input equivalent in curses, asks for Input and returns it"
31398 - self.stdscr.move(0,0)
31399 - self.stdscr.clear()
31400 - self.stdscr.addstr(promptstr)
31402 - INPUT=self.stdscr.getstr()
31407 - def printoutnwait(self, promptstr):
31408 - "Print out Text, wait for key"
31410 - self.stdscr.move(0,0)
31411 - self.stdscr.clear()
31412 -# The new Mutt client pauses after running the script already. No reason
31413 -# to pause twice. -Josh
31414 -# self.stdscr.addstr(promptstr+"\n\n(press key)")
31416 -# c = self.stdscr.getch()# read Key events
31420 -def listrex (str, rgx): # Return a list of all regexes matched in string
31421 - "Search string for all occurences of regex and return a list of them."
31423 - start = 0 # set counter to zero
31424 - ende =len (str) #set end position
31425 - suchadress = re.compile(rgx,re.LOCALE)#compile regular expression, with LOCALE
31427 - einzelerg = suchadress.search(str, start,ende) #create Match Object einzelerg
31428 - if einzelerg == None:#until none is found
31430 - result.append(einzelerg.group()) #add to result
31431 - start = einzelerg.end()
31434 -def strrex (str): # Return first occurence of regular exp as string
31435 - "Search string for first occurence of regular expression and return it"
31436 - muster = re.compile(r"<?[\w\b.ĆĆ¼Ć¶Ć¤-]+\@[\w.-]+>?", re.LOCALE) #compile re
31437 - matobj = muster.search(str) #get Match Objekt from string
31438 - if muster.search(str) == None: #if none found
31440 - return matobj.group() #return string
31442 -def stripempty (str):#Looks for all empty charcters and replaces them with a space
31443 - "Looks for all empty charcters and replaces them with a space,kills trailing"
31444 - p = re.compile( "\s+") #shorten
31445 - shrt = p.sub(" ", str)
31446 - q = re.compile("^\s+|\s+$") #strip
31447 - strp = q.sub("", shrt)
31450 -def getmailadressfromstring(str):
31451 - "Takes str and gets the first word containing @ == mail adress"
31452 - StringSplit=string.split(str)
31453 - for i in range(len(StringSplit)):
31454 - if "@" in StringSplit[i]:
31455 - return StringSplit[i]
31460 -OCCLIST = listrex(file, '"?[\s\w\ƶ\Ƥ\Ć¼\-\Ć\_.]*"?\s*<?[\w.-]+\@[\w.-]+>?')#get list, RE gets all Email adresses + prepending words
31463 - print len(OCCLIST),"possible adresses found!."
31465 - print"ERROR, no mails found"
31469 -for i in range(len(OCCLIST)): #strip all whitespaces + trailing from each list member
31470 - OCCLIST[i] = string.strip(OCCLIST [i])
31473 -OCCDIC={} # Dictionary created to avoid duplicates
31474 -for i in range(len(OCCLIST)): # iterate over
31476 - Mail = getmailadressfromstring(OCCLIST[i])
31477 - #strrex(OCCLIST[i]) #Mailadresse
31478 - Schnitt = - len(Mail) #cut off mail adress
31479 - Mail = string.replace(Mail, "<", "")#remove <>
31480 - Mail = string.replace(Mail, ">", "")
31481 - Name = string.replace (stripempty (d[:Schnitt]), '"', '') #leaves name
31482 - if not OCCDIC.get(Mail): # if new Emailadress
31483 - Liste = [] # create list for names
31484 - Liste.append(Name) # append name
31485 - OCCDIC[Mail] = Liste # assign list to adress
31487 - Liste = OCCDIC[Mail] # otherwise get list
31488 - Liste.append(Name) # append name to list of names
31489 - OCCDIC[Mail] = Liste # and assign
31492 -KEYS = OCCDIC.keys() #iterate over dictionary, sort names
31493 - #KEYS are all the adresses
31495 -for z in range( len(KEYS) ):
31496 - NAMLIST = OCCDIC[KEYS[z]] # Get list of possible names
31497 - d = {} # sort out duplicates and
31498 - # remove bad names + empty strings from adresses
31499 - for x in NAMLIST:
31500 - if x in ["", "<"]: continue
31502 - NAMLIST = d.values()
31503 - NAMLIST.sort() # sort namelist alphabetically
31504 - print z, KEYS[z], "had possible names:", NAMLIST # Debugging output
31505 - OCCDIC[KEYS[z]] = NAMLIST #
31511 -def Comparelength(x, y):
31512 - "Compare number of names in OCCDIC, if equal sort alphabetically."
31513 - if len(OCCDIC[y]) == len(OCCDIC[x]):
31515 - if len(OCCDIC[y]) < len(OCCDIC[x]):
31520 -KEYS.sort(Comparelength) # Keys sort
31524 -ScreenObject=screenC() # initialize curses menu
31526 - ZIELADRESS = ScreenObject.menucall(KEYS, OCCDIC, "Choose adress to alias")
31527 - if OCCDIC[ZIELADRESS]:
31528 - LISTNAM=["***ENTER own NAME"] #add option to edit name
31529 - LISTNAM= LISTNAM + OCCDIC[ZIELADRESS]
31530 - ZIELNAME = ScreenObject.menucall(LISTNAM, {}, ZIELADRESS + " has which of the possible names?")
31531 - # empty Dictionary {} means show list member itself, not looked up result
31532 - else : ZIELNAME=""
31534 - T=ScreenObject.size()
31535 - ScreenObject.end()
31536 -# traceback.print_exc() # Uncomment for curses debugging info
31540 -### enter new names/aliases
31542 -if ZIELNAME == "***ENTER own NAME" or ZIELNAME == "":
31543 - ZIELNAME = ScreenObject.input(`ZIELADRESS` + " = " + `OCCDIC[ZIELADRESS]` + "\n" + `ZIELADRESS` + " gets which name? ")
31545 -if ZIELNAME == "":
31546 - ZIELNAME = "No name"
31548 -WRITEALIAS = "\n[]\nname=" + ZIELNAME + "\nemail=" + ZIELADRESS + "\n\n"
31550 -f = open(ABOOKFILE, "a")
31551 -f.write(WRITEALIAS)
31554 -ScreenObject.printoutnwait("Item was added to "+ ABOOKFILE + "\nProgam terminated")
31555 -ScreenObject.end()
31557 diff -urN BUILD/abook-0.6.0pre2/contrib/vcard2abook.pl abook/contrib/vcard2abook.pl
31558 --- BUILD/abook-0.6.0pre2/contrib/vcard2abook.pl 2005-10-26 13:58:45.000000000 +0200
31559 +++ abook/contrib/vcard2abook.pl 1970-01-01 01:00:00.000000000 +0100
31561 -#!/usr/bin/perl -w
31562 -my $timestamp= "Time-stamp: \"vcard2abook.pl was last updated on Sun, 17 Dec 2000 10:34am\"";
31564 -#==============================================================================*
31565 -# vcard2abook.pl by jeff covey <jeff.covey@pobox.com> *
31567 -# this script has two main features: *
31569 -# 1. it converts a file containing addressbook entries in vcard format to *
31570 -# one containing entries in abook format. *
31571 -# 2. it almost has more comments than code. *
31573 -# This program is free software; you can redistribute it and/or modify *
31574 -# it under the terms of the GNU General Public License as published by *
31575 -# the Free Software Foundation; either version 2 of the License, or *
31576 -# (at your option) any later version. *
31578 -# This program is distributed in the hope that it will be useful, *
31579 -# but WITHOUT ANY WARRANTY; without even the implied warranty of *
31580 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
31581 -# GNU General Public License for more details. *
31583 -# You should have received a copy of the GNU General Public License *
31584 -# along with this program; if not, write to the Free Software *
31585 -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
31586 -#==============================================================================*
31590 -($#ARGV >= 1) or die
31591 - "usage: vcard2abook.pl <vcard input file> <abook output file>\noutput file will be overwritten!\n";
31593 -my $vcards="$ARGV[0]";
31594 -my $abook ="$ARGV[1]";
31597 -my %conversions = (
31599 - "NICKNAME" => "nick=",
31600 - "EMAIL" => "email=",
31601 - "ORG" => "notes=",
31602 - "NOTE" => "notes=",
31605 - "TEL;HOME" => "phone=",
31606 - "TEL;PREF" => "phone=",
31607 - "TEL;VOICE" => "phone=",
31608 - "TEL;MSG" => "phone=",
31609 - "TEL;VIDEO" => "phone=",
31610 - "TEL;MODEM" => "phone=",
31611 - "TEL;ISDN" => "phone=",
31612 - "TEL;WORK" => "workphone=",
31613 - "TEL;CELL" => "mobile=",
31614 - "TEL;PAGER" => "mobile=",
31615 - "TEL;CAR" => "mobile=",
31616 - "TEL;FAX" => "fax=",
31619 -open (VCARDS,"$vcards") or quit("couldn't open $vcards");
31620 -open (ABOOK,">$abook") or quit("couldn't open $abook for writing");
31622 -while (<VCARDS>) {
31624 - elsif (/^BEGIN:VCARD/i) { print ABOOK "[]\n"; }
31625 - elsif (/^END:VCARD/i) { print ABOOK "\n"; }
31627 - chomp; my @sections=split /:/, $_, 2;
31628 - if ($sections[0] =~ /^ADR/i) {
31629 - my @fields=split /;/, $sections[1];
31630 - if ($fields[2]) {print ABOOK "address=$fields[2]\n";}
31631 - if ($fields[3]) {print ABOOK "city=$fields[3]\n"; }
31632 - if ($fields[4]) {print ABOOK "state=$fields[4]\n"; }
31633 - if ($fields[5]) {print ABOOK "zip=$fields[5]\n"; }
31634 - if ($fields[6]) {print ABOOK "country=$fields[6]\n";}
31637 - foreach $key (keys %conversions) {
31638 - if ($sections[0] =~ /^$key/i) {
31639 - print ABOOK "$conversions{$key}$sections[1]\n";
31646 -close (VCARDS) or quit("couldn't close $vcards");
31647 -close (ABOOK) or quit("couldn't close $abook");
31650 - print "whoops! $_[0]:\n $!\n"; die;
31652 diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/abook2whitelist.sh abook/contrib/whitelist/abook2whitelist.sh
31653 --- BUILD/abook-0.6.0pre2/contrib/whitelist/abook2whitelist.sh 2005-10-26 13:58:45.000000000 +0200
31654 +++ abook/contrib/whitelist/abook2whitelist.sh 1970-01-01 01:00:00.000000000 +0100
31657 -abook --mutt-query all | tail +2 | cut -f 1 > ~/.procmail/white.lst
31659 diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/mutt.whitelist abook/contrib/whitelist/mutt.whitelist
31660 --- BUILD/abook-0.6.0pre2/contrib/whitelist/mutt.whitelist 2005-10-26 13:58:45.000000000 +0200
31661 +++ abook/contrib/whitelist/mutt.whitelist 1970-01-01 01:00:00.000000000 +0100
31663 -color index white black '! ~p'
31664 -color index green black '~h whitelist'
31665 diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/patch.orig.obsolete abook/contrib/whitelist/patch.orig.obsolete
31666 --- BUILD/abook-0.6.0pre2/contrib/whitelist/patch.orig.obsolete 2005-10-26 13:58:45.000000000 +0200
31667 +++ abook/contrib/whitelist/patch.orig.obsolete 1970-01-01 01:00:00.000000000 +0100
31670 -> static void procmail_query(char *str);
31671 -> static void procmail_print_email(int item);
31673 -> if( !strcmp(argv[i], "--procmail-query") )
31674 -> procmail_query(argv[i + 1]);
31679 -> procmail_print_email(int item)
31681 -> char emails[MAX_EMAILS][MAX_EMAIL_LEN];
31683 -> split_emailstr(item, emails);
31685 -> if( options_get_int("mutt", "return_all_emails") ) {
31687 -> for(i=0; i<MAX_EMAILS; i++)
31688 -> if( *emails[i] )
31689 -> printf("%s\n", emails[i]);
31691 -> printf("%s\n", emails[0]);
31695 -< printf("All items\n");
31697 -> /*printf("All items\n");*/
31704 -> printf("Not found\n");
31707 -> quit_mutt_query();
31712 -> procmail_query(char *str)
31717 -> init_mutt_query();
31719 -> if( str == NULL || !strcasecmp(str, "all") ) {
31720 -> /*printf("All items\n");*/
31721 -> for(i = 0; i < items; i++)
31722 -> procmail_print_email(i);
31724 -> for(i = 0, j = 0 ; i < items; i++) {
31725 -> tmp = strdup(database[i][NAME]);
31726 -> if( strstr( strupper(tmp), strupper(str) ) != NULL ) {
31729 -> procmail_print_email(i);
31730 diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/README abook/contrib/whitelist/README
31731 --- BUILD/abook-0.6.0pre2/contrib/whitelist/README 2005-10-26 13:58:45.000000000 +0200
31732 +++ abook/contrib/whitelist/README 1970-01-01 01:00:00.000000000 +0100
31736 -There's no need to patch abook now. -JH
31739 -Taken from message sent by "R. Shohn Trojacek" <snazzle@galvani.tamu.edu>
31745 -Here are some patches and things for abook 0.4.8
31747 -[patching instructions removed (not needed anymore) -JH]
31749 -anyway it allows the use of a "whitelist" which is to
31750 -say people that are in the address book show up with
31751 -a higher precedence by changing the mail to a different color.
31753 -this is accomplished using a simple procmail filter
31754 -and a couple of mutt commands.
31758 -INCLUDERC=/path/whitelist.rc
31760 -inside of your .procmailrc
31765 -source /path/mutt.whitelist
31766 -to the top of your muttrc
31771 -abook2whitelist.sh
31775 diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/whitelist.rc abook/contrib/whitelist/whitelist.rc
31776 --- BUILD/abook-0.6.0pre2/contrib/whitelist/whitelist.rc 2005-10-26 13:58:45.000000000 +0200
31777 +++ abook/contrib/whitelist/whitelist.rc 1970-01-01 01:00:00.000000000 +0100
31779 -# Test if the email's sender is in the whitelist
31781 - * ? formail -x"From" -x"From:" -x"Sender:" \
31782 - -x"Reply-To:" -x"Return-Path:" -x"To:" \
31783 - | egrep -is -f ~/.procmail/white.lst
31786 - | formail -a"X-Match: whitelist"
31788 diff -urN BUILD/abook-0.6.0pre2/database.c abook/database.c
31789 --- BUILD/abook-0.6.0pre2/database.c 2006-09-04 21:24:18.000000000 +0200
31790 +++ abook/database.c 2013-03-13 15:07:45.000000000 +0100
31794 - * $Id: database.c,v 1.39 2006/09/04 18:29:25 cduval Exp $
31797 * by JH <jheinonen@users.sourceforge.net>
31800 {"url", N_("URL"), FIELD_STRING}, /* URL */
31801 {"notes", N_("Notes"), FIELD_STRING}, /* NOTES */
31802 {"anniversary", N_("Anniversary day"), FIELD_DATE}, /* ANNIVERSARY */
31803 + {"groups", N_("Groups"), FIELD_LIST}, /* GROUPS */
31804 {0} /* ITEM_FIELDS */
31807 @@ -521,6 +522,68 @@
31811 +void merge_selected_items()
31814 + int destitem = -1;
31816 + if((list_is_empty()) || (selected_items() < 2))
31819 + /* Find the top item */
31820 + for(j=0; destitem < 0; j++)
31824 + /* Merge pairwise */
31825 + for(j = LAST_ITEM; j > destitem; j--) {
31826 + if(selected[j]) {
31827 + item_merge(database[destitem],database[j]);
31828 + for(i = j; i < LAST_ITEM; i++) {
31829 + /* TODO: this can be done by moving pointers */
31830 + item_copy(database[i], database[i + 1]);
31831 + selected[i] = selected[i + 1];
31833 + item_free(&database[LAST_ITEM]);
31838 + if(curitem > LAST_ITEM && items > 0)
31839 + curitem = LAST_ITEM;
31841 + adjust_list_capacity();
31846 +void remove_duplicates()
31850 + if(list_is_empty())
31853 + /* Scan from the last one */
31854 + for(j = LAST_ITEM - 1; j >= 0; j--) {
31855 + tmpj = db_name_get(j);
31856 + for(i = LAST_ITEM; i > j; i--)
31857 + /* Check name and merge if dups */
31858 + if (0 == strcmp(tmpj,db_name_get(i))) {
31859 + item_merge(database[j],database[i]);
31860 + if (curitem == i) curitem--;
31861 + for(k = i; k < LAST_ITEM; k++) {
31862 + item_copy(database[k], database[k + 1]);
31864 + item_free(&database[LAST_ITEM]);
31869 + adjust_list_capacity();
31874 get_surname(char *s)
31876 @@ -752,6 +815,40 @@
31877 for(i = 0; i < fields_count; i++)
31878 dest[i] = src[i] ? xstrdup(src[i]) : NULL;
31882 + * Merging works as follows:
31883 + * - fields present only in source are copied over to dest
31884 + * - multi-fields (email, groups) are checked for dupes ad merged
31887 +item_merge(list_item dest, list_item src)
31889 + int i, found = 0;
31890 + abook_list *dfield, *sfield, *ed, *es;
31892 + for(i = 0; i < fields_count; i++)
31895 + dest[i] = xstrdup(src[i]);
31896 + else if((i == field_id(EMAIL)) || (i == field_id(GROUPS))) {
31897 + dfield = csv_to_abook_list(dest[i]);
31898 + sfield = csv_to_abook_list(src[i]);
31899 + for(es = sfield; es; es = es->next) {
31900 + for(found=0, ed = dfield; (!found) && ed; ed = ed->next)
31901 + found = (0 == strcmp(es->data,ed->data));
31903 + abook_list_append(&dfield, es->data);
31906 + dest[i] = abook_list_to_csv(dfield);
31907 + abook_list_free(&dfield);
31908 + abook_list_free(&sfield);
31916 * Things like item[field_id(NICK)] should never be used, since besides NAME
31917 diff -urN BUILD/abook-0.6.0pre2/database.h abook/database.h
31918 --- BUILD/abook-0.6.0pre2/database.h 2006-09-04 21:24:18.000000000 +0200
31919 +++ abook/database.h 2013-03-13 15:07:45.000000000 +0100
31921 #define MAX_EMAILSTR_LEN (MAX_LIST_ITEMS * (MAX_EMAIL_LEN + 1) + 1)
31922 #define MAX_FIELD_LEN 81
31925 +enum field_types {
31926 NAME = 0, /* important */
31934 ITEM_FIELDS /* this is the last */
31938 int write_database(FILE *out, struct db_enumerator e);
31939 int save_database();
31940 void remove_selected_items();
31941 +void merge_selected_items();
31942 +void remove_duplicates();
31943 void sort_surname();
31944 void sort_by_field(char *field);
31945 void close_database();
31946 @@ -104,6 +107,7 @@
31947 void item_free(list_item *item);
31948 void item_copy(list_item dest, list_item src);
31949 void item_duplicate(list_item dest, list_item src);
31950 +void item_merge(list_item dest, list_item src);
31952 int item_fput(list_item item, int i, char *val);
31953 char *item_fget(list_item item, int i);
31954 diff -urN BUILD/abook-0.6.0pre2/depcomp abook/depcomp
31955 --- BUILD/abook-0.6.0pre2/depcomp 2001-10-02 20:14:10.000000000 +0200
31956 +++ abook/depcomp 2013-03-13 15:07:45.000000000 +0100
31960 # depcomp - compile a program generating dependencies as side-effects
31961 -# Copyright 1999, 2000 Free Software Foundation, Inc.
31963 +scriptversion=2012-03-27.16; # UTC
31965 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
31966 +# 2011, 2012 Free Software Foundation, Inc.
31968 # This program is free software; you can redistribute it and/or modify
31969 # it under the terms of the GNU General Public License as published by
31971 # GNU General Public License for more details.
31973 # You should have received a copy of the GNU General Public License
31974 -# along with this program; if not, write to the Free Software
31975 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
31976 -# 02111-1307, USA.
31977 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
31979 # As a special exception to the GNU General Public License, if you
31980 # distribute this file as part of a program that contains a
31981 @@ -25,13 +26,51 @@
31983 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
31987 + echo "$0: No command. Try '$0 --help' for more information." 1>&2
31992 +Usage: depcomp [--help] [--version] PROGRAM [ARGS]
31994 +Run PROGRAMS ARGS to compile a file, generating dependencies
31997 +Environment variables:
31998 + depmode Dependency tracking mode.
31999 + source Source file read by 'PROGRAMS ARGS'.
32000 + object Object file output by 'PROGRAMS ARGS'.
32001 + DEPDIR directory where to store dependencies.
32002 + depfile Dependency file to output.
32003 + tmpdepfile Temporary file to use when outputting dependencies.
32004 + libtool Whether libtool is used (yes/no).
32006 +Report bugs to <bug-automake@gnu.org>.
32011 + echo "depcomp $scriptversion"
32016 +# A tabulation character.
32018 +# A newline character.
32022 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
32023 echo "depcomp: Variables source, object and depmode must be set" 1>&2
32026 -# `libtool' can also be set to `yes' or `no'.
32028 -depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
32029 +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
32030 +depfile=${depfile-`echo "$object" |
32031 + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
32032 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
32034 rm -f "$tmpdepfile"
32035 @@ -52,12 +91,48 @@
32036 depmode=dashmstdout
32039 +cygpath_u="cygpath -u -f -"
32040 +if test "$depmode" = msvcmsys; then
32041 + # This is just like msvisualcpp but w/o cygpath translation.
32042 + # Just convert the backslash-escaped backslashes to single forward
32043 + # slashes to satisfy depend.m4
32044 + cygpath_u='sed s,\\\\,/,g'
32045 + depmode=msvisualcpp
32048 +if test "$depmode" = msvc7msys; then
32049 + # This is just like msvc7 but w/o cygpath translation.
32050 + # Just convert the backslash-escaped backslashes to single forward
32051 + # slashes to satisfy depend.m4
32052 + cygpath_u='sed s,\\\\,/,g'
32056 +if test "$depmode" = xlc; then
32057 + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
32058 + gccflag=-qmakedep=gcc,-MF
32064 ## gcc 3 implements dependency tracking that does exactly what
32065 ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
32066 ## it if -MD -MP comes after the -MF stuff. Hmm.
32067 - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
32068 +## Unfortunately, FreeBSD c89 acceptance of flags depends upon
32069 +## the command line argument order; so add the flags where they
32070 +## appear in depend2.am. Note that the slowdown incurred here
32071 +## affects only configure: in makefiles, %FASTDEP% shortcuts this.
32075 + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
32076 + *) set fnord "$@" "$arg" ;;
32083 if test $stat -eq 0; then :
32085 @@ -93,20 +168,21 @@
32086 ## The second -e expression handles DOS-style file names with drive letters.
32087 sed -e 's/^[^:]*: / /' \
32088 -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
32089 -## This next piece of magic avoids the `deleted header file' problem.
32090 +## This next piece of magic avoids the "deleted header file" problem.
32091 ## The problem is that when a header file which appears in a .P file
32092 ## is deleted, the dependency causes make to die (because there is
32093 ## typically no way to rebuild the header). We avoid this by adding
32094 ## dummy dependencies for each header file. Too bad gcc doesn't do
32095 ## this for us directly.
32097 -' < "$tmpdepfile" |
32098 -## Some versions of gcc put a space before the `:'. On the theory
32099 + tr ' ' "$nl" < "$tmpdepfile" |
32100 +## Some versions of gcc put a space before the ':'. On the theory
32101 ## that the space means something, we add a space to the output as
32103 +## well. hp depmode also adds that space, but also prefixes the VPATH
32104 +## to the object. Take care to not repeat it in the output.
32105 ## Some versions of the HPUX 10.20 sed can't process this invocation
32106 ## correctly. Breaking it into two sed invocations is a workaround.
32107 - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
32108 + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
32109 + | sed -e 's/$/ :/' >> "$depfile"
32110 rm -f "$tmpdepfile"
32113 @@ -138,20 +214,17 @@
32114 # clever and replace this with sed code, as IRIX sed won't handle
32115 # lines with more than a fixed number of characters (4096 in
32116 # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
32117 - # the IRIX cc adds comments like `#:fec' to the end of the
32118 + # the IRIX cc adds comments like '#:fec' to the end of the
32121 -' < "$tmpdepfile" \
32122 + tr ' ' "$nl" < "$tmpdepfile" \
32123 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
32127 + tr "$nl" ' ' >> "$depfile"
32128 + echo >> "$depfile"
32130 # The second pass generates a dummy entry for each header file.
32132 -' < "$tmpdepfile" \
32133 + tr ' ' "$nl" < "$tmpdepfile" \
32134 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
32138 # The sourcefile does not contain any dependencies, so just
32139 # store a dummy comment line, to avoid errors with the Makefile
32140 @@ -161,33 +234,51 @@
32141 rm -f "$tmpdepfile"
32145 + # This case exists only to let depend.m4 do its work. It works by
32146 + # looking at the text of this script. This case will never be run,
32147 + # since it is checked for above.
32152 # The C for AIX Compiler uses -M and outputs the dependencies
32153 - # in a .u file. This file always lives in the current directory.
32154 - # Also, the AIX compiler puts `$object:' at the start of each line;
32155 - # $object doesn't have directory information.
32156 - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
32157 - tmpdepfile="$stripped.u"
32158 - outname="$stripped.o"
32159 + # in a .u file. In older versions, this file always lives in the
32160 + # current directory. Also, the AIX compiler puts '$object:' at the
32161 + # start of each line; $object doesn't have directory information.
32162 + # Version 6 uses the directory in both cases.
32163 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
32164 + test "x$dir" = "x$object" && dir=
32165 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
32166 if test "$libtool" = yes; then
32167 + tmpdepfile1=$dir$base.u
32168 + tmpdepfile2=$base.u
32169 + tmpdepfile3=$dir.libs/$base.u
32172 + tmpdepfile1=$dir$base.u
32173 + tmpdepfile2=$dir$base.u
32174 + tmpdepfile3=$dir$base.u
32180 if test $stat -eq 0; then :
32182 - rm -f "$tmpdepfile"
32183 + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
32187 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
32189 + test -f "$tmpdepfile" && break
32191 if test -f "$tmpdepfile"; then
32192 - # Each line is of the form `foo.o: dependent.h'.
32193 + # Each line is of the form 'foo.o: dependent.h'.
32194 # Do two passes, one to just change these to
32195 - # `$object: dependent.h' and one to simply `dependent.h:'.
32196 - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
32197 - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
32198 + # '$object: dependent.h' and one to simply 'dependent.h:'.
32199 + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
32200 + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
32202 # The sourcefile does not contain any dependencies, so just
32203 # store a dummy comment line, to avoid errors with the Makefile
32204 @@ -197,81 +288,246 @@
32205 rm -f "$tmpdepfile"
32209 + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
32211 + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
32212 + # ICC 7.0 will fill foo.d with something like
32213 + # foo.o: sub/foo.c
32214 + # foo.o: sub/foo.h
32215 + # which is wrong. We want
32216 + # sub/foo.o: sub/foo.c
32217 + # sub/foo.o: sub/foo.h
32220 + # ICC 7.1 will output
32221 + # foo.o: sub/foo.c sub/foo.h
32222 + # and will wrap long lines using '\':
32223 + # foo.o: sub/foo.c ... \
32224 + # sub/foo.h ... \
32226 + # tcc 0.9.26 (FIXME still under development at the moment of writing)
32227 + # will emit a similar output, but also prepend the continuation lines
32228 + # with horizontal tabulation characters.
32229 + "$@" -MD -MF "$tmpdepfile"
32231 + if test $stat -eq 0; then :
32233 + rm -f "$tmpdepfile"
32237 + # Each line is of the form 'foo.o: dependent.h',
32238 + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
32239 + # Do two passes, one to just change these to
32240 + # '$object: dependent.h' and one to simply 'dependent.h:'.
32241 + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
32242 + < "$tmpdepfile" > "$depfile"
32244 + s/[ '"$tab"'][ '"$tab"']*/ /g
32251 + ' < "$tmpdepfile" >> "$depfile"
32252 + rm -f "$tmpdepfile"
32256 + # The "hp" stanza above does not work with aCC (C++) and HP's ia64
32257 + # compilers, which have integrated preprocessors. The correct option
32258 + # to use with these is +Maked; it writes dependencies to a file named
32259 + # 'foo.d', which lands next to the object file, wherever that
32261 + # Much of this is similar to the tru64 case; see comments there.
32262 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
32263 + test "x$dir" = "x$object" && dir=
32264 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
32265 + if test "$libtool" = yes; then
32266 + tmpdepfile1=$dir$base.d
32267 + tmpdepfile2=$dir.libs/$base.d
32270 + tmpdepfile1=$dir$base.d
32271 + tmpdepfile2=$dir$base.d
32275 + if test $stat -eq 0; then :
32277 + rm -f "$tmpdepfile1" "$tmpdepfile2"
32281 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
32283 + test -f "$tmpdepfile" && break
32285 + if test -f "$tmpdepfile"; then
32286 + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
32287 + # Add 'dependent.h:' lines.
32293 + }' "$tmpdepfile" >> "$depfile"
32295 + echo "#dummy" > "$depfile"
32297 + rm -f "$tmpdepfile" "$tmpdepfile2"
32301 - # The Tru64 AIX compiler uses -MD to generate dependencies as a side
32302 - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
32303 - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
32304 - # dependencies in `foo.d' instead, so we check for that too.
32305 + # The Tru64 compiler uses -MD to generate dependencies as a side
32306 + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
32307 + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
32308 + # dependencies in 'foo.d' instead, so we check for that too.
32309 # Subdirectories are respected.
32310 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
32311 + test "x$dir" = "x$object" && dir=
32312 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
32314 - tmpdepfile1="$object.d"
32315 - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
32316 if test "$libtool" = yes; then
32317 + # With Tru64 cc, shared objects can also be used to make a
32318 + # static library. This mechanism is used in libtool 1.4 series to
32319 + # handle both shared and static libraries in a single compilation.
32320 + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
32322 + # With libtool 1.5 this exception was removed, and libtool now
32323 + # generates 2 separate objects for the 2 libraries. These two
32324 + # compilations output dependencies in $dir.libs/$base.o.d and
32325 + # in $dir$base.o.d. We have to check for both files, because
32326 + # one of the two compilations can be disabled. We should prefer
32327 + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
32328 + # automatically cleaned when .libs/ is deleted, while ignoring
32329 + # the former would cause a distcleancheck panic.
32330 + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
32331 + tmpdepfile2=$dir$base.o.d # libtool 1.5
32332 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
32333 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
32336 + tmpdepfile1=$dir$base.o.d
32337 + tmpdepfile2=$dir$base.d
32338 + tmpdepfile3=$dir$base.d
32339 + tmpdepfile4=$dir$base.d
32344 if test $stat -eq 0; then :
32346 - rm -f "$tmpdepfile1" "$tmpdepfile2"
32347 + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
32351 - if test -f "$tmpdepfile1"; then
32352 - tmpdepfile="$tmpdepfile1"
32354 - tmpdepfile="$tmpdepfile2"
32356 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
32358 + test -f "$tmpdepfile" && break
32360 if test -f "$tmpdepfile"; then
32361 sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
32362 - # That's a space and a tab in the [].
32363 - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
32364 + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
32366 echo "#dummy" > "$depfile"
32368 rm -f "$tmpdepfile"
32372 + if test "$libtool" = yes; then
32373 + showIncludes=-Wc,-showIncludes
32375 + showIncludes=-showIncludes
32377 + "$@" $showIncludes > "$tmpdepfile"
32379 + grep -v '^Note: including file: ' "$tmpdepfile"
32380 + if test "$stat" = 0; then :
32382 + rm -f "$tmpdepfile"
32386 + echo "$object : \\" > "$depfile"
32387 + # The first sed program below extracts the file names and escapes
32388 + # backslashes for cygpath. The second sed program outputs the file
32389 + # name when reading, but also accumulates all include files in the
32390 + # hold buffer in order to output them again at the end. This only
32391 + # works with sed implementations that can handle large buffers.
32392 + sed < "$tmpdepfile" -n '
32393 +/^Note: including file: *\(.*\)/ {
32397 +}' | $cygpath_u | sort -u | sed -n '
32399 +s/\(.*\)/'"$tab"'\1 \\/p
32407 + rm -f "$tmpdepfile"
32411 + # This case exists only to let depend.m4 do its work. It works by
32412 + # looking at the text of this script. This case will never be run,
32413 + # since it is checked for above.
32418 # This comment above is used by automake to tell side-effect
32419 # dependency tracking mechanisms from slower ones.
32422 # Important note: in order to support this mode, a compiler *must*
32423 - # always write the proprocessed file to stdout, regardless of -o,
32424 - # because we must use -o when running libtool.
32425 - test -z "$dashmflag" && dashmflag=-M
32428 - *" --mode=compile "*) # this is libtool, let us make it quiet
32430 - do # cycle over the arguments
32432 - "--mode=compile")
32433 - # insert --quiet before "--mode=compile"
32434 - set fnord "$@" --quiet
32438 - set fnord "$@" "$arg"
32442 + # always write the preprocessed file to stdout, regardless of -o.
32445 + # Remove the call to Libtool.
32446 + if test "$libtool" = yes; then
32447 + while test "X$1" != 'X--mode=compile'; do
32453 + # Remove '-o $object'.
32465 + set fnord "$@" "$arg"
32470 - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
32476 - if test "$stat" != 0; then exit $stat; fi
32479 + test -z "$dashmflag" && dashmflag=-M
32480 + # Require at least two characters before searching for ':'
32481 + # in the target name. This is to cope with DOS-style filenames:
32482 + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
32483 + "$@" $dashmflag |
32484 + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
32486 cat < "$tmpdepfile" > "$depfile"
32488 -' < "$tmpdepfile" | \
32489 + tr ' ' "$nl" < "$tmpdepfile" | \
32490 ## Some versions of the HPUX 10.20 sed can't process this invocation
32491 ## correctly. Breaking it into two sed invocations is a workaround.
32492 sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
32493 @@ -285,37 +541,49 @@
32501 - for arg in "$@"; do
32502 - case $cleared in no)
32508 - set fnord "$@" "$arg"; shift;;
32512 - set fnord "$@" "$arg"; shift;;
32515 + # Remove any Libtool call
32516 + if test "$libtool" = yes; then
32517 + while test "X$1" != 'X--mode=compile'; do
32520 - obj_suffix="`echo $object | sed 's/^.*\././'`"
32521 - touch "$tmpdepfile"
32522 - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
32528 - if test "$stat" != 0; then exit $stat; fi
32533 + cleared=no eat=no
32541 + if test $eat = yes; then
32547 + set fnord "$@" "$arg"; shift ;;
32548 + # Strip any option that makedepend may not understand. Remove
32549 + # the object too, otherwise makedepend will parse it as a source file.
32555 + set fnord "$@" "$arg"; shift ;;
32558 + obj_suffix=`echo "$object" | sed 's/^.*\././'`
32559 + touch "$tmpdepfile"
32560 + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
32562 - cat < "$tmpdepfile" > "$depfile"
32563 - tail +3 "$tmpdepfile" | tr ' ' '
32565 + # makedepend may prepend the VPATH from the source file name to the object.
32566 + # No need to regex-escape $object, excess matching of '.' is harmless.
32567 + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
32568 + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
32569 ## Some versions of the HPUX 10.20 sed can't process this invocation
32570 ## correctly. Breaking it into two sed invocations is a workaround.
32571 sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
32572 @@ -324,35 +592,40 @@
32575 # Important note: in order to support this mode, a compiler *must*
32576 - # always write the proprocessed file to stdout, regardless of -o,
32577 - # because we must use -o when running libtool.
32580 - *" --mode=compile "*)
32582 - do # cycle over the arguments
32584 - "--mode=compile")
32585 - # insert --quiet before "--mode=compile"
32586 - set fnord "$@" --quiet
32590 - set fnord "$@" "$arg"
32594 + # always write the preprocessed file to stdout.
32597 + # Remove the call to Libtool.
32598 + if test "$libtool" = yes; then
32599 + while test "X$1" != 'X--mode=compile'; do
32605 + # Remove '-o $object'.
32617 + set fnord "$@" "$arg"
32623 - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
32627 + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
32628 + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
32629 sed '$ s: \\$::' > "$tmpdepfile"
32635 - if test "$stat" != 0; then exit $stat; fi
32637 echo "$object : \\" > "$depfile"
32638 cat < "$tmpdepfile" >> "$depfile"
32639 @@ -362,42 +635,56 @@
32642 # Important note: in order to support this mode, a compiler *must*
32643 - # always write the proprocessed file to stdout, regardless of -o,
32644 - # because we must use -o when running libtool.
32647 - *" --mode=compile "*)
32649 - do # cycle over the arguments
32651 - "--mode=compile")
32652 - # insert --quiet before "--mode=compile"
32653 - set fnord "$@" --quiet
32657 - set fnord "$@" "$arg"
32661 + # always write the preprocessed file to stdout.
32664 + # Remove the call to Libtool.
32665 + if test "$libtool" = yes; then
32666 + while test "X$1" != 'X--mode=compile'; do
32682 + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
32688 + set fnord "$@" "$arg"
32694 - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
32700 - if test "$stat" != 0; then exit $stat; fi
32702 + "$@" -E 2>/dev/null |
32703 + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
32705 echo "$object : \\" > "$depfile"
32706 - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
32707 - echo " " >> "$depfile"
32708 - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
32709 + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
32710 + echo "$tab" >> "$depfile"
32711 + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
32712 rm -f "$tmpdepfile"
32716 + # This case exists only to let depend.m4 do its work. It works by
32717 + # looking at the text of this script. This case will never be run,
32718 + # since it is checked for above.
32725 @@ -409,3 +696,13 @@
32730 +# Local Variables:
32731 +# mode: shell-script
32732 +# sh-indentation: 2
32733 +# eval: (add-hook 'write-file-hooks 'time-stamp)
32734 +# time-stamp-start: "scriptversion="
32735 +# time-stamp-format: "%:y-%02m-%02d.%02H"
32736 +# time-stamp-time-zone: "UTC"
32737 +# time-stamp-end: "; # UTC"
32739 diff -urN BUILD/abook-0.6.0pre2/doc/HOWTO.translating_abook abook/doc/HOWTO.translating_abook
32740 --- BUILD/abook-0.6.0pre2/doc/HOWTO.translating_abook 2005-09-30 18:27:09.000000000 +0200
32741 +++ abook/doc/HOWTO.translating_abook 2013-03-13 15:07:45.000000000 +0100
32742 @@ -193,7 +193,7 @@
32743 contributors can contact you if they want to join you in the
32744 translation team, or have remarks/typo fixes to give about the
32745 translations. You can either just give your name/nick, or add an email
32746 - address, f ex "Last-Translator: CĆ©dric Duval <cedricduval+abook@free.fr>\n".
32747 + address, f ex "Last-Translator: CĆ©dric Duval <cedricduval+abook@free.fr>\n".
32750 Adding comments (lines begining with the '#' character) can be a good
32751 @@ -207,6 +207,12 @@
32752 (standard length is 80 characters). Don't translate blindly, try to
32753 look where your string will be displayed to adapt your translation.
32755 +* Testing translations
32756 + To give a look at the live translations without really installing abook
32757 + you can install abook and its mo files in a subdirectory:
32758 + ./configure --prefix $(pwd)/fakeinstall/usr ; make install
32759 + Then, eg: LANGUAGE=sv ./fakeinstall/usr/bin/abook
32761 * A few useful tools
32762 The po-file format is very simple, and the file can be edited with a
32763 standard text editor.
32764 @@ -214,8 +220,8 @@
32765 But if you prefer, there are few specialized tools you may find
32766 convenient for translating:
32767 * poEdit (http://www.poedit.org/)
32768 - * KBabel (http://i18n.kde.org/tools/kbabel/)
32769 - * GTranslator (http://gtranslator.sourceforge.net/)
32770 + * Lokalize (http://userbase.kde.org/Lokalize/)
32771 + * GTranslator (http://projects.gnome.org/gtranslator/)
32774 (http://vim.sourceforge.net/scripts/script.php?script_id=695
32775 @@ -229,6 +235,6 @@
32776 I hope you'll have fun contributing to a more internationalized world. :)
32778 If you have any more questions, don't hesitate to contact me
32779 -(CĆ©dric Duval <cedricduval+abook@free.fr>) or the abook development
32780 +(CĆ©dric Duval <cedricduval+abook@free.fr>) or the abook development
32781 mailing list (http://lists.sourceforge.net/lists/listinfo/abook-devel).
32783 diff -urN BUILD/abook-0.6.0pre2/edit.c abook/edit.c
32784 --- BUILD/abook-0.6.0pre2/edit.c 2006-09-06 07:26:10.000000000 +0200
32785 +++ abook/edit.c 2013-03-13 15:07:45.000000000 +0100
32789 - * $Id: edit.c,v 1.55 2006/09/06 02:46:44 cduval Exp $
32792 * by JH <jheinonen@users.sourceforge.net>
32797 #include "xmalloc.h"
32798 +#include "color.h"
32799 #ifdef HAVE_CONFIG_H
32800 # include "config.h"
32802 +#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
32803 +# include <locale.h>
32807 +static void locale_date(char *str, size_t str_len, int year, int month, int day);
32810 * some extern variables
32812 int x_pos = 2; /* current x pos */
32815 + wattrset(editw, COLOR_PAIR(CP_TAB_BORDER));
32816 mvwhline(editw, TABLINE + 1, 0, UI_HLINE_CHAR, EDITW_COLS);
32818 for(i = 0; i < views_count; i++) {
32821 mvwaddch(editw, TABLINE, x_pos, UI_ULCORNER_CHAR);
32822 mvwaddch(editw, TABLINE, x_pos + 1, UI_LBOXLINE_CHAR);
32823 + wattrset(editw, COLOR_PAIR(CP_TAB_LABEL));
32824 mvwaddstr(editw, TABLINE, x_pos + 2, tab_name);
32825 + wattrset(editw, COLOR_PAIR(CP_TAB_BORDER));
32826 mvwaddch(editw, TABLINE, x_pos + width - 3, UI_RBOXLINE_CHAR);
32827 mvwaddch(editw, TABLINE, x_pos + width - 2, UI_URCORNER_CHAR);
32830 /* This only rolls emails from the 'email' field, not emails from any
32831 * field of type FIELD_EMAILS.
32832 * TODO: expand to ask for which field to roll if several are present? */
32835 roll_emails(int item, enum rotate_dir dir)
32837 abook_list *emails = csv_to_abook_list(db_fget(item, EMAIL));
32838 @@ -186,6 +196,7 @@
32840 snprintf(header, EDITW_COLS, "%s", db_name_get(item));
32842 + wattrset(editw, COLOR_PAIR(CP_TAB_LABEL));
32843 mvwaddstr(editw, 0, (EDITW_COLS - strwidth(header)) / 2, header);
32846 @@ -209,6 +220,7 @@
32848 y = FIELDS_START_Y;
32850 + wattrset(editw, COLOR_PAIR(CP_FIELD_NAME));
32851 mvwprintw(editw, y, FIELDS_START_X, "%c - ",
32852 (j < 10) ? '0' + j : 'A' + j - 10);
32853 mvwaddnstr(editw, y, FIELDS_START_X + 4, cur->field->name,
32854 @@ -216,6 +228,7 @@
32855 FIELDNAME_MAX_WIDTH));
32856 mvwaddch(editw, y, TAB_COLON_POS, ':');
32858 + wattrset(editw, COLOR_PAIR(CP_FIELD_VALUE));
32859 if((cur->field->type == FIELD_EMAILS) ||
32860 (cur->field->type == FIELD_LIST)) {
32861 abook_list *emails, *e;
32862 @@ -242,22 +255,16 @@
32863 abook_list_free(&emails);
32864 } else if(cur->field->type == FIELD_DATE) {
32865 int day, month, year;
32869 find_field_number(cur->field->key, &nb);
32870 - if((str = db_fget_byid(item, nb)) != NULL)
32871 - strncpy(buf, str, sizeof(buf));
32873 - if(str && parse_date_string(buf, &day, &month, &year)) {
32875 - str = strdup_printf("%04d-%02d-%02d",
32876 - year, month, day);
32878 - str = strdup_printf("--%02d-%02d",
32880 - mvwaddnstr(editw, y, TAB_COLON_POS + 2, str,
32881 - bytes2width(str, FIELD_MAX_WIDTH));
32883 + str = db_fget_byid(item, nb);
32885 + if(parse_date_string(str, &day, &month, &year)) {
32886 + /* put locale representation of date in buf */
32887 + locale_date(buf, sizeof(buf), year, month, day);
32888 + mvwaddnstr(editw, y, TAB_COLON_POS + 2, buf,
32889 + bytes2width(buf, FIELD_MAX_WIDTH));
32892 find_field_number(cur->field->key, &nb);
32893 @@ -397,6 +404,67 @@
32894 abook_list_free(&list);
32898 + * available %-sequences:
32899 + * - %y, %Y, %m, %M, %d, %D represent year, month, and day
32900 + * (the uppercase version telling to fill with leading zeros
32902 + * - %I for ISO 8601 representation
32905 +format_date(char *str, size_t str_len, char *fmt, int year, int month, int day)
32910 + while(*fmt && (s - str + 1 < str_len)) {
32911 + if(*fmt != '%') {
32916 + len = str_len - (str - s);
32918 + case 'y': s += snprintf(s, len, "%d", year); break;
32919 + case 'Y': s += snprintf(s, len, "%04d", year); break;
32920 + case 'm': s += snprintf(s, len, "%d", month); break;
32921 + case 'M': s += snprintf(s, len, "%02d", month); break;
32922 + case 'd': s += snprintf(s, len, "%d", day); break;
32923 + case 'D': s += snprintf(s, len, "%02d", day); break;
32924 + case 'I': s += format_date(s, len,
32925 + year ? "%Y-%M-%D" : "--%M-%D",
32926 + year, month, day);
32928 + case '%': *s++ = '%'; break;
32929 + default: *s++ = '%'; *s++ = *fmt; break;
32938 + * str is a buffer of max length str_len, which, after calling, will
32939 + * contain a representation of the given [y, m, d] date using the
32940 + * current locale (as defined by LC_TIME).
32942 + * In the absence of any localization, use an ISO 8601 representation.
32945 +locale_date(char *str, size_t str_len, int year, int month, int day)
32949 +#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
32950 + fmt = year ? dcgettext(PACKAGE, "%Y-%M-%D", LC_TIME) :
32951 + dcgettext(PACKAGE, "--%M-%D", LC_TIME);
32955 + format_date(str, str_len, fmt, year, month, day);
32958 static int is_valid_date(const int day, const int month, const int year)
32961 @@ -420,11 +488,17 @@
32965 -parse_date_string(char *s, int *day, int *month, int *year)
32966 +parse_date_string(char *str, int *day, int *month, int *year)
32970 - assert(s && day && month && year);
32971 + char buf[12], *s, *p;
32973 + assert(day && month && year);
32975 + if(!str || !*str)
32978 + p = s = strncpy(buf, str, sizeof(buf));
32980 if(*s == '-' && *s++ == '-') { /* omitted year */
32982 @@ -446,7 +520,7 @@
32991 @@ -460,14 +534,11 @@
32993 edit_date(int item, int nb)
32995 - int i, date[3], old = FALSE;
32996 - char buf[12], *s = db_fget_byid(item, nb);
32997 + int i, date[3], old;
32998 + char *s = db_fget_byid(item, nb);
32999 char *field[] = { N_("Day: "), N_("Month: "), N_("Year (optional): ") };
33002 - strncpy(buf, s, sizeof(buf));
33003 - old = parse_date_string(buf, &date[0], &date[1], &date[2]);
33005 + old = parse_date_string(s, &date[0], &date[1], &date[2]);
33007 for(i = 0; i < 3; i++) {
33008 s = (old && date[i]) ? strdup_printf("%d", date[i]) : NULL;
33009 @@ -517,13 +588,14 @@
33011 edit_field(int tab, char c, int item_number)
33013 + ui_enable_mouse(FALSE);
33014 int i = 0, number, idx;
33016 abook_field_list *f;
33019 if((number = key_to_field_number(c)) < 0)
33021 + goto detachfield;
33023 edit_undo(item_number, BACKUP_ITEM);
33025 @@ -531,7 +603,7 @@
33030 + goto detachfield;
33034 @@ -560,10 +632,14 @@
33037 edit_date(item_number, idx);
33039 + goto detachfield;
33045 + if(opt_get_bool(BOOL_USE_MOUSE))
33046 + ui_enable_mouse(TRUE);
33050 @@ -597,6 +673,53 @@
33054 + if(c == KEY_MOUSE) {
33056 + if(getmouse(&event) == OK) {
33057 + if(event.bstate & BUTTON1_CLICKED
33058 + || event.bstate & BUTTON1_DOUBLE_CLICKED) {
33059 + int window_y, window_x;
33060 + getbegyx(editw, window_y, window_x);
33061 + if(event.y == 0) {
33062 + /* if first row is selected, then go back to list */
33064 + } else if(event.y == window_y + TABLINE
33065 + || event.y == window_y + TABLINE + 1) {
33067 + int mouse_x = event.x;
33068 + int xpos = 2 + 1; /* look at editor_tab() and try out */
33069 + int clicked_tab = 0;
33070 + while(clicked_tab < views_count) {
33071 + view_info(clicked_tab, &tab_name, NULL);
33072 + xpos += strwidth(tab_name) + 5;
33073 + /* fprintf(stderr, "trying tab %d\n", clicked_tab); */
33074 + if(xpos >= mouse_x) {
33075 + break; /* clicked tab was found */
33077 + /* try next tab */
33081 + if(clicked_tab < views_count) {
33082 + tab = clicked_tab;
33084 + } else if(event.y >= window_y + FIELDS_START_Y) {
33085 + /* is mouse in field area? */
33086 + int j = 1 + event.y - window_y - FIELDS_START_Y;
33087 + /* field numbers start with 1, but if j='0', then char='0' */
33088 + /* so fix this, by adding 1 to j */
33089 + int field_char = (j < 10) ? '0' + j : 'A' + j - 10;
33090 + edit_field(tab, field_char, item);
33092 + } else if(event.bstate & BUTTON4_PRESSED) {
33093 + tab = tab == 0 ? views_count - 1 : tab - 1;
33095 + else if(event.bstate & BUTTON5_PRESSED) {
33096 + tab = tab == views_count - 1 ? 0 : tab + 1;
33102 /* No uppercase nor numeric key should be used in this menu,
33103 * as they are reserved for field selection */
33104 diff -urN BUILD/abook-0.6.0pre2/edit.h abook/edit.h
33105 --- BUILD/abook-0.6.0pre2/edit.h 2006-09-06 07:26:10.000000000 +0200
33106 +++ abook/edit.h 2013-03-13 15:07:45.000000000 +0100
33111 +#include "misc.h" /* for rotate_dir enum definition */
33114 void edit_item(int item);
33115 void get_first_email(char *str, int item);
33116 +void roll_emails(int item, enum rotate_dir dir);
33118 int parse_date_string(char *s, int *day, int *month, int *year);
33120 diff -urN BUILD/abook-0.6.0pre2/FAQ abook/FAQ
33121 --- BUILD/abook-0.6.0pre2/FAQ 2005-02-28 10:21:31.000000000 +0100
33122 +++ abook/FAQ 2013-03-13 15:07:45.000000000 +0100
33124 you use UTF-8 charset the input is expected to be UTF-8 encoded.
33127 -last update: $Date: 2005/02/28 09:21:31 $
33128 +last update: $Date$
33129 diff -urN BUILD/abook-0.6.0pre2/filter.c abook/filter.c
33130 --- BUILD/abook-0.6.0pre2/filter.c 2013-03-14 10:42:00.100864946 +0100
33131 +++ abook/filter.c 2013-03-13 15:07:45.000000000 +0100
33135 - * $Id: filter.c,v 1.55 2006/09/06 02:46:44 cduval Exp $
33138 * by JH <jheinonen@users.sourceforge.net>
33140 * Copyright (C) Jaakko Heinonen
33143 +#define _GNU_SOURCE
33146 #include <stdlib.h>
33147 #include <string.h>
33149 #include "xmalloc.h"
33150 #include <assert.h>
33152 +#ifdef HAVE_VFORMAT
33153 +#include "vcard.h"
33156 extern abook_field_list *fields_list;
33157 extern int fields_count;
33159 @@ -56,13 +62,23 @@
33160 static int csv_export_database(FILE *out, struct db_enumerator e);
33161 static int allcsv_export_database(FILE *out, struct db_enumerator e);
33162 static int palm_export_database(FILE *out, struct db_enumerator e);
33163 -static int gcrd_export_database(FILE *out, struct db_enumerator e);
33164 +static int vcard_export_database(FILE *out, struct db_enumerator e);
33165 static int mutt_alias_export(FILE *out, struct db_enumerator e);
33166 +static int mutt_query_export_database(FILE *out, struct db_enumerator e);
33167 static int elm_alias_export(FILE *out, struct db_enumerator e);
33168 static int text_export_database(FILE *out, struct db_enumerator e);
33169 static int spruce_export_database(FILE *out, struct db_enumerator e);
33170 static int wl_export_database(FILE *out, struct db_enumerator e);
33171 static int bsdcal_export_database(FILE *out, struct db_enumerator e);
33172 +static int custom_export_database(FILE *out, struct db_enumerator e);
33175 + * export filter item prototypes
33178 +void vcard_export_item(FILE *out, int item);
33179 +void muttq_print_item(FILE *file, int item);
33180 +void custom_print_item(FILE *out, int item);
33183 * end of function declarations
33184 @@ -83,10 +99,11 @@
33185 struct abook_output_filter e_filters[] = {
33186 { "abook", N_("abook native format"), write_database },
33187 { "ldif", N_("ldif / Netscape addressbook (.4ld)"), ldif_export_database },
33188 + { "vcard", N_("vCard 2 file"), vcard_export_database },
33189 { "mutt", N_("mutt alias"), mutt_alias_export },
33190 + { "muttq", N_("mutt query format (internal use)"), mutt_query_export_database },
33191 { "html", N_("html document"), html_export_database },
33192 { "pine", N_("pine addressbook"), pine_export_database },
33193 - { "gcrd", N_("GnomeCard (VCard) addressbook"), gcrd_export_database },
33194 { "csv", N_("comma separated values"), csv_export_database },
33195 { "allcsv", N_("comma separated values (all fields)"), allcsv_export_database },
33196 { "palmcsv", N_("Palm comma separated values"), palm_export_database},
33197 @@ -95,9 +112,17 @@
33198 { "wl", N_("Wanderlust address book"), wl_export_database },
33199 { "spruce", N_("Spruce address book"), spruce_export_database },
33200 { "bsdcal", N_("BSD calendar"), bsdcal_export_database },
33201 + { "custom", N_("Custom format"), custom_export_database },
33202 { "\0", NULL, NULL }
33205 +struct abook_output_item_filter u_filters[] = {
33206 + { "vcard", N_("vCard 2 file"), vcard_export_item },
33207 + { "muttq", N_("mutt alias"), muttq_print_item },
33208 + { "custom", N_("Custom format"), custom_print_item },
33215 @@ -107,19 +132,26 @@
33219 - puts(_("input:"));
33220 + puts(_("input formats:"));
33221 for(i=0; *i_filters[i].filtname ; i++)
33222 printf("\t%s\t%s\n", i_filters[i].filtname,
33223 gettext(i_filters[i].desc));
33227 - puts(_("output:"));
33228 + puts(_("output formats:"));
33229 for(i=0; *e_filters[i].filtname ; i++)
33230 printf("\t%s\t%s\n", e_filters[i].filtname,
33231 gettext(e_filters[i].desc));
33235 + puts(_("query-compatible output formats:"));
33236 + for(i=0; *u_filters[i].filtname ; i++)
33237 + printf("\t%s\t%s\n", u_filters[i].filtname,
33238 + gettext(u_filters[i].desc));
33244 @@ -265,6 +297,18 @@
33248 +#ifdef HAVE_VFORMAT
33249 + // this is a special case for
33250 + // libvformat whose API expects a filename
33251 + if(!strcmp(filtname, "vcard")) {
33252 + if(!strcmp(filename, "-"))
33253 + ret = vcard_parse_file_libvformat("/dev/stdin");
33255 + ret = vcard_parse_file_libvformat(filename);
33260 if(!strcmp(filename, "-")) {
33262 if((fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode))
33263 @@ -359,6 +403,25 @@
33267 +struct abook_output_item_filter select_output_item_filter(char filtname[FILTNAME_LEN]) {
33270 + if(!strncasecmp(u_filters[i].filtname, filtname, FILTNAME_LEN))
33272 + if(!*u_filters[i].filtname) {
33277 + return u_filters[i];
33281 +e_write_item(FILE *out, int item, void (*func) (FILE *in, int item))
33283 + (*func) (out, item);
33287 e_write_file(char *filename, int (*func) (FILE *in, struct db_enumerator e),
33289 @@ -440,79 +503,151 @@
33293 -static void ldif_fix_string(char *str);
33294 +/* During LDIF import we need more fields than the
33295 + ITEM_FIELDS of a *list_item. Eg: "objectclass"
33296 + to test valid records, ...
33297 + Here we extends the existing field_types enum
33298 + to define new fields indexes usable during processing.
33299 + Newly created LDIF attr names could be associated to
33300 + them using ldif_conv_table[]. */
33302 + LDIF_OBJECTCLASS = ITEM_FIELDS + 1
33303 +} ldif_field_types;
33305 -#define LDIF_ITEM_FIELDS 16
33306 +#define LDIF_ITEM_FIELDS LDIF_OBJECTCLASS
33308 typedef char *ldif_item[LDIF_ITEM_FIELDS];
33310 +/* LDIF field's names *must* respect the ordering
33311 + defined by the field_types enum from database.h
33312 + This is only used to define (for export only)
33313 + abook standard field to LDIF attr name mappings */
33314 static ldif_item ldif_field_names = {
33318 - "streetaddress2",
33326 - "facsimiletelephonenumber",
33328 - "xmozillaanyphone",
33329 - "xmozillanickname",
33330 - "objectclass", /* this must be the last entry */
33333 + "streetaddress", // ADDRESS
33334 + "streetaddress2", // ADDRESS2
33335 + "locality", // CITY
33337 + "postalcode", // ZIP
33338 + "countryname", // COUNTRY
33339 + "homephone", // PHONE
33340 + "telephonenumber", // WORKPHONE
33341 + "facsimiletelephonenumber", // FAX
33342 + "cellphone", // MOBILEPHONE
33343 + "xmozillanickname", // NICK
33344 + "homeurl", // URL
33345 + "description", // NOTES
33346 + "anniversary", // ANNIVERSARY
33350 -static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
33352 - EMAIL, /* "mail" */
33353 - ADDRESS, /* "streetaddress" */
33354 - ADDRESS2, /* "streetaddress2" */
33355 - CITY, /* "locality" */
33356 - STATE, /* "st" */
33357 - ZIP, /* "postalcode" */
33358 - COUNTRY, /* "countryname" */
33359 - PHONE, /* "homephone" */
33360 - NOTES, /* "description" */
33361 - URL, /* "homeurl" */
33362 - FAX, /* "facsimiletelephonenumber" */
33363 - MOBILEPHONE, /* "cellphone" */
33364 - WORKPHONE, /* "xmozillaanyphone" */
33365 - NICK, /* "xmozillanickname" */
33366 - -1, /* "objectclass" */ /* this must be the last entry */
33368 +/* Used to map LDIF attr names from input to
33369 + the abook restricted set of standard fields. */
33373 +} ldif_available_items;
33375 +static ldif_available_items ldif_conv_table[] = {
33376 + /* initial field names respect the field_types enum
33377 + from database.h but this is only for readability.
33378 + This ldif_item struct allow use to define multiple
33379 + LDIF field names ("attribute names") for one abook field */
33381 + {"cn", NAME}, // 0
33383 + {"streetaddress", ADDRESS},
33384 + {"streetaddress2", ADDRESS2},
33385 + {"locality", CITY},
33387 + {"postalcode", ZIP},
33388 + {"countryname", COUNTRY},
33389 + {"homephone", PHONE},
33390 + {"telephonenumber", WORKPHONE}, // workphone, according to Mozilla
33391 + {"facsimiletelephonenumber", FAX},
33392 + {"cellphone", MOBILEPHONE},
33393 + {"mozillanickname", NICK},
33394 + {"homeurl", URL},
33395 + {"description", NOTES},
33396 + {"anniversary", ANNIVERSARY},
33397 + {"ou", GROUPS}, // 16
33399 + // here comes a couple of aliases
33400 + {"mozillasecondemail", EMAIL},
33401 + {"homecity", CITY},
33404 + {"xmozillaanyphone", WORKPHONE}, // ever used ?
33405 + {"workphone", WORKPHONE},
33407 + {"telexnumber", FAX},
33408 + {"mobilephone", MOBILEPHONE},
33409 + {"mobile", MOBILEPHONE},
33410 + {"xmozillanickname", NICK},
33411 + {"labeledURI", URL},
33412 + {"notes", NOTES},
33413 + {"birthday", ANNIVERSARY},
33414 + {"category", GROUPS},
33417 + "sn": append to lastname ?
33418 + "surname": append to lastname ?
33419 + "givenname": prepend to firstname ? */
33421 + /* here starts dummy fields:
33423 + As long as additional indexes are created
33424 + (using the above ldif_field_types),
33425 + any other LDIF attr name can be added and
33426 + used during ldif entry processing.
33427 + But obviously fields > ITEM_FIELDS (database.h) won't be
33428 + copied into the final *list_item. */
33430 + /* - to avoid mistake, don't use the special ITEM_FIELDS value.
33431 + - see also: http://mxr.mozilla.org/comm-central/source/mailnews/addrbook/src/nsAbLDIFService.cpp */
33433 + // used to check valid LDIF records:
33434 + {"objectclass", LDIF_OBJECTCLASS}
33436 +const int LDIF_IMPORTABLE_ITEM_FIELDS = (int)sizeof(ldif_conv_table)/sizeof(*ldif_conv_table);
33439 + Handles multi-line strings.
33440 + If a string starts with a space, it's the continuation
33441 + of the previous line. Thus we need to always read ahead.
33442 + But for this to work with stdin, we need to stores the next
33443 + line for later use in case it's not a continuation of the
33447 -ldif_read_line(FILE *in)
33448 +ldif_read_line(FILE *in, char **next_line)
33456 - for(i = 1;;i++) {
33458 + // buf filled with the first line
33460 + buf = getaline(in);
33462 + buf = xstrdup(*next_line);
33463 + xfree(*next_line);
33467 + while(!feof(in)) {
33468 + // if no line already read-ahead.
33469 line = getaline(in);
33472 - if(feof(in) || !line)
33480 + // this is not a continuation of what is already in buf
33481 + // store it for the next round
33483 - fseek(in, pos, SEEK_SET); /* fixme ! */
33485 + *next_line = line;
33489 + // starts with ' ': this is the continuation of buf
33491 while( *ptr == ' ')
33493 @@ -537,46 +672,90 @@
33497 - item = item_create();
33499 - if(!li[LDIF_ITEM_FIELDS -1])
33500 + /* if there's no value for "objectclass"
33501 + it's probably a buggy record */
33502 + if(!li[LDIF_OBJECTCLASS])
33506 - for(i=0; i < LDIF_ITEM_FIELDS; i++) {
33507 - if(ldif_conv_table[i] >= 0 && li[i] && *li[i])
33508 - item_fput(item,ldif_conv_table[i],xstrdup(li[i]));
33509 + /* just copy from our extended ldif_item to a regular
33511 + TODO: API could be changed so db_fput_byid() is usable */
33512 + item = item_create();
33513 + for(i=0; i < ITEM_FIELDS; i++) {
33514 + if(li[i] && *li[i])
33515 + item[i] = xstrdup(li[i]);
33518 add_item2database(item);
33519 + item_free(&item);
33522 for(i=0; i < LDIF_ITEM_FIELDS; i++)
33524 - item_free(&item);
33529 ldif_convert(ldif_item item, char *type, char *value)
33533 + /* this is the first (mandatory) attribute to expected
33534 + from a new valid LDIF record.
33535 + The previous record must be added to the database before
33536 + we can go further with the new one */
33537 if(!strcmp(type, "dn")) {
33538 ldif_add_item(item);
33542 - for(i=0; i < LDIF_ITEM_FIELDS; i++) {
33543 - if(!safe_strcmp(ldif_field_names[i], type) && *value) {
33544 - if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */
33545 - if(safe_strcmp("person", value))
33549 - if(item_fget(item, i))
33550 - free(item_fget(item, i));
33551 + for( i=0; i < LDIF_IMPORTABLE_ITEM_FIELDS; i++ ) {
33553 - item_fput(item, i, xstrdup(value));
33554 + if( *value && // there's a value for the attr provided
33555 + ldif_conv_table[i].key && // there exists an ldif attr name...
33556 + !strcasecmp(ldif_conv_table[i].key, type)) { // ...matching that provided at input
33558 + assert((i >= 0) && (i < LDIF_ITEM_FIELDS));
33559 + // which abook field this attribute's name maps to ?
33560 + index = ldif_conv_table[i].index;
33561 + assert((index >= 0) && (index < LDIF_ITEM_FIELDS));
33563 + /* TODO: here must be handled multi-valued cases
33564 + (first or latest win, append or prepend values, ...)
33565 + Currently: emails are appended, for other fields the
33566 + first attribute found wins.
33567 + Eg: the value of "mobile" will be taken into
33568 + account if such a line comes before "cellphone". */
33570 + /* Remember: LDIF_ITEM_FIELDS > ITEM_FIELDS,
33571 + lower (common) indexes of *ldif_item map well to *list_item.
33572 + We can use item_fput()... */
33573 + if(index < ITEM_FIELDS) {
33574 + // multiple email support, but two only will stay
33575 + // in the final *list_item
33576 + if(index == EMAIL && item_fget(item, EMAIL)) {
33579 + strconcat(item_fget(item, EMAIL), ",", value, 0));
33582 + /* Don't override already initialized fields:
33583 + This is the rule of the "first win" */
33584 + if(! item_fget(item, index))
33585 + item_fput(item, index, xstrdup(value));
33589 + /* ... but if the ldif field's name index is higher
33590 + than what standards abook fields struct can hold,
33591 + these extra indexes must be managed manually.
33592 + This is the case of LDIF_OBJECTCLASS ("objectclass" attr) */
33594 + item[index] = xstrdup(value);
33597 + // matching attr found and field filled:
33598 + // no further attr search is needed for `type`
33603 @@ -585,46 +764,40 @@
33604 ldif_parse_file(FILE *handle)
33607 + char *next_line = NULL;
33608 char *type, *value;
33611 + /* This is our extended fields holder to put the values from
33612 + successfully parsed LDIF attributes.
33613 + ldif_item item is temporary. When the end of an entry is reached,
33614 + values are copied into a regular *list_item struct, see ldif_add_item() */
33617 memset(item, 0, sizeof(item));
33620 - if( !(line = ldif_read_line(handle)) )
33622 + line = ldif_read_line(handle, &next_line);
33624 + // EOF or empty lines: continue;
33625 + if(!line || *line == '\0') continue;
33627 if(-1 == (str_parse_line(line, &type, &value, &vlen))) {
33629 continue; /* just skip the errors */
33632 - ldif_fix_string(value);
33634 ldif_convert(item, type, value);
33637 } while ( !feof(handle) );
33639 + // force registration (= ldif_add_item()) of the last LDIF entry
33640 ldif_convert(item, "dn", "");
33646 -ldif_fix_string(char *str)
33650 - for(i = 0, j = 0; j < (int)strlen(str); i++, j++)
33651 - str[i] = ( str[j] == (char)0xc3 ?
33652 - (char) str[++j] + (char) 0x40 :
33659 * end of ldif import
33661 @@ -636,10 +809,11 @@
33662 #include "getname.h"
33665 -mutt_read_line(FILE *in, char **alias, char **rest)
33666 +mutt_read_line(FILE *in, char **groups, char **alias, char **rest)
33668 - char *line, *ptr, *tmp;
33669 - size_t alias_len;
33670 + char *line, *ptr;
33671 + char *start, *end;
33672 + abook_list *glist = NULL;
33674 if( !(line = ptr = getaline(in)) )
33675 return 1; /* error / EOF */
33676 @@ -652,27 +826,39 @@
33685 - while( ! ISSPACE(*ptr) )
33688 - alias_len = (size_t)(ptr - tmp);
33691 - *alias = xmalloc_inc(alias_len, 1);
33693 - strncpy(*alias, tmp, alias_len);
33694 - *(*alias + alias_len) = 0;
33696 + /* If the group option is used, save the groups */
33700 + for(n_groups = 0; 0 == strncmp("-group", ptr, 6); n_groups++) {
33706 + abook_list_append(&glist,xstrndup(start, end - start));
33710 + if(n_groups && groups)
33711 + *groups = abook_list_to_csv(glist);
33713 + abook_list_free(&glist);
33721 + *alias = xstrndup(start, end - start);
33723 + /* rest (email) */
33724 *rest = xstrdup(ptr);
33731 @@ -753,9 +939,9 @@
33732 memset(item, 0, fields_count * sizeof(char *));
33734 if(!mutt_read_line(in,
33735 - (field_id(NICK) != -1) ?
33736 - &item[field_id(NICK)] : NULL,
33737 - &item[field_id(NAME)]))
33738 + (field_id(GROUPS) != -1) ? &item[field_id(GROUPS)] : NULL,
33739 + (field_id(NICK) != -1) ? &item[field_id(NICK)] : NULL,
33740 + &item[field_id(NAME)]) )
33741 mutt_parse_email(item);
33744 @@ -795,6 +981,7 @@
33745 ldif_export_database(FILE *out, struct db_enumerator e)
33747 char email[MAX_EMAILSTR_LEN];
33748 + abook_list *emails, *em;
33750 fprintf(out, "version: 1\n");
33752 @@ -803,21 +990,32 @@
33754 get_first_email(email, e.item);
33756 - tmp = strdup_printf("cn=%s,mail=%s",db_name_get(e.item),email);
33758 + tmp = strdup_printf("cn=%s,mail=%s",db_name_get(e.item),email);
33759 + /* TODO: this may not be enough for a trully "Distinguished" name
33760 + needed by LDAP. Appending a random uuid could do the trick */
33762 + tmp = strdup_printf("cn=%s",db_name_get(e.item));
33764 ldif_fput_type_and_value(out, "dn", tmp);
33767 - for(j = 0; j < LDIF_ITEM_FIELDS; j++) {
33768 - if(ldif_conv_table[j] >= 0) {
33769 - if(ldif_conv_table[j] == EMAIL)
33770 - ldif_fput_type_and_value(out,
33771 - ldif_field_names[j], email);
33772 - else if(db_fget(e.item,ldif_conv_table[j]))
33773 - ldif_fput_type_and_value(out,
33774 - ldif_field_names[j],
33776 - ldif_conv_table[j]));
33777 + for(j = 0; j < ITEM_FIELDS; j++) {
33780 + tmp = db_email_get(e.item);
33781 + emails = csv_to_abook_list(tmp);
33783 + for(em = emails; em; em = em->next)
33784 + ldif_fput_type_and_value(out,
33785 + ldif_field_names[EMAIL],
33789 + else if(db_fget(e.item,j)) {
33790 + ldif_fput_type_and_value(out,
33791 + ldif_field_names[j],
33792 + db_fget(e.item, j));
33796 @@ -1337,10 +1535,10 @@
33799 static char *vcard_fields[] = {
33801 + "FN", /* FORMATTED NAME */
33802 "EMAIL", /* EMAIL */
33803 "ADR", /* ADDRESS */
33804 - "ADR", /* ADDRESS2 - not used */
33805 + "ADR", /* ADDRESS2 */
33809 @@ -1352,23 +1550,10 @@
33810 "NICKNAME", /* NICK */
33812 "NOTE", /* NOTES */
33813 + "N", /* NAME: special case/mapping in vcard_parse_line() */
33814 NULL /* not implemented: ANNIVERSARY, ITEM_FIELDS */
33818 - * mappings between vCard ADR field and abook's ADDRESS
33819 - * see rfc2426 section 3.2.1
33821 -static int vcard_address_fields[] = {
33822 - -1, /* vCard(post office box) - not used */
33823 - -1, /* vCard(the extended address) - not used */
33824 - 2, /* vCard(the street address) - ADDRESS */
33825 - 4, /* vCard(the locality) - CITY */
33826 - 5, /* vCard(the region) - STATE */
33827 - 6, /* vCard(the postal code) - ZIP */
33828 - 7 /* vCard(the country name) - COUNTRY */
33833 VCARD_KEY_ATTRIBUTE,
33834 @@ -1387,7 +1572,7 @@
33836 line_copy = xstrdup(line);
33838 - /* make newline characters if exist end of string */
33839 + /* change newline characters, if present, to end of string */
33840 for(i=0; line_copy[i]; i++) {
33841 if(line_copy[i] == '\r' || line_copy[i] == '\n') {
33842 line_copy[i] = '\0';
33843 @@ -1406,6 +1591,7 @@
33846 /* separate key from key attributes */
33847 + /* works for vCard 2 as well (automagically) */
33849 for(i=0; key[i]; i++) {
33850 if(key[i] == ';') {
33851 @@ -1451,63 +1637,82 @@
33857 + * mappings between vCard ADR field and abook's ADDRESS
33858 + * see rfc2426 section 3.2.1
33861 vcard_parse_address(list_item item, char *line)
33866 - char *address_field;
33868 value = vcard_get_line_element(line, VCARD_VALUE);
33872 - address_field = value;
33873 - for(i=k=0; value[i]; i++) {
33874 - if(value[i] == ';') {
33876 - if(vcard_address_fields[k] >= 0) {
33877 - item[vcard_address_fields[k]] = xstrdup(address_field);
33879 - address_field = &value[i+1];
33881 - if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields)))
33885 - item[vcard_address_fields[k]] = xstrdup(address_field);
33887 + // vCard(post office box) - not used
33888 + strsep(&value, ";");
33889 + // vCard(the extended address)
33890 + item_fput(item, ADDRESS2, xstrdup(strsep(&value, ";")));
33891 + // vCard(the street address)
33892 + item_fput(item, ADDRESS, xstrdup(strsep(&value, ";")));
33893 + // vCard(the locality)
33894 + item_fput(item, CITY, xstrdup(strsep(&value, ";")));
33895 + // vCard(the region)
33896 + item_fput(item, STATE, xstrdup(strsep(&value, ";")));
33897 + // vCard(the postal code)
33898 + item_fput(item, ZIP, xstrdup(strsep(&value, ";")));
33899 + // vCard(the country name)
33900 + item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
33902 + if(*value) xfree(value);
33906 +vcard_parse_name(list_item item, char *line)
33908 + // store the "N" field into "NAME" *if* no "FN:"
33909 + // value has already been stored here
33910 + if(item[0]) return;
33913 + item[0] = vcard_get_line_element(line, VCARD_VALUE);
33914 + // "N:" can be multivalued => replace ';' separators by ' '
33915 + while(item[0][++i]) if(item[0][i] == ';') item[0][i] = ' ';
33917 + // http://www.daniweb.com/software-development/c/code/216919
33918 + char *original = item[0], *p = original;
33921 + if (*original != ' ' || trimmed) {
33922 + trimmed = 1; *p++ = *original;
33924 + } while(*original++);
33928 vcard_parse_phone(list_item item, char *line)
33931 char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE);
33932 char *value = vcard_get_line_element(line, VCARD_VALUE);
33934 /* set the standard number */
33936 - item[index] = value;
33938 + if (!type) item_fput(item, PHONE, value);
33941 * see rfc2426 section 3.3.1
33942 + * Note: we probably support both vCard 2 and 3
33944 - else if (strstr(type, "TYPE=") == type){
33945 - if (strcasestr(type, "home")) {
33946 - item[index] = xstrdup(value);
33948 - if (strcasestr(type, "work")) {
33949 - item[index+1] = xstrdup(value);
33951 - if (strcasestr(type, "fax")) {
33952 - item[index+2] = xstrdup(value);
33954 - if (strcasestr(type, "cell")) {
33955 - item[index+3] = xstrdup(value);
33958 + if (strcasestr(type, "home") != NULL)
33959 + item_fput(item, PHONE, xstrdup(value));
33960 + else if (strcasestr(type, "work") != NULL)
33961 + item_fput(item, WORKPHONE, xstrdup(value));
33962 + else if (strcasestr(type, "fax") != NULL)
33963 + item_fput(item, FAX, xstrdup(value));
33964 + else if (strcasestr(type, "cell") != NULL)
33965 + item_fput(item, MOBILEPHONE, xstrdup(value));
33969 @@ -1523,20 +1728,18 @@
33970 for(i=0; vcard_fields[i]; i++) {
33971 key = vcard_fields[i];
33973 - if(!strncmp(key, line, strlen(key))) {
33975 + if(0 == strncmp(key, line, strlen(key))) {
33976 + if(0 == strcmp(key, "EMAIL"))
33977 vcard_parse_email(item, line);
33979 - else if(i == 2) {
33981 vcard_parse_address(item, line);
33983 - else if(i == 8) {
33984 + else if(0 == strcmp(key, "TEL"))
33985 vcard_parse_phone(item, line);
33988 + else if(0 == strcmp(key, "N"))
33989 + vcard_parse_name(item, line);
33991 item[i] = vcard_get_line_element(line, VCARD_VALUE);
33998 @@ -1670,6 +1873,7 @@
34006 @@ -1689,7 +1893,8 @@
34007 fprintf(out, "\"NICK\",");
34008 fprintf(out, "\"URL\",");
34009 fprintf(out, "\"NOTES\",");
34010 - fprintf(out, "\"ANNIVERSARY\"\n");
34011 + fprintf(out, "\"ANNIVERSARY\",");
34012 + fprintf(out, "\"GROUPS\"\n");
34014 csv_export_common(out, e, allcsv_export_fields, NULL);
34016 @@ -1778,83 +1983,90 @@
34020 - * GnomeCard (VCard) addressbook export filter
34021 + * vCard 2 addressbook export filter
34025 -gcrd_export_database(FILE *out, struct db_enumerator e)
34026 +vcard_export_database(FILE *out, struct db_enumerator e)
34029 + db_enumerate_items(e)
34030 + vcard_export_item(out, e.item);
34035 +vcard_export_item(FILE *out, int item)
34039 abook_list *emails, *em;
34040 + fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
34041 + safe_str(db_name_get(item)));
34043 - db_enumerate_items(e) {
34044 - fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
34045 - safe_str(db_name_get(e.item)));
34047 - name = get_surname(db_name_get(e.item));
34048 - for( j = strlen(db_name_get(e.item)) - 1; j >= 0; j-- ) {
34049 - if((db_name_get(e.item))[j] == ' ')
34052 - fprintf(out, "N:%s;%.*s\r\n",
34055 - safe_str(db_name_get(e.item))
34060 - if(db_fget(e.item, ADDRESS))
34061 - fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
34062 - safe_str(db_fget(e.item, ADDRESS)),
34063 - safe_str(db_fget(e.item, ADDRESS2)),
34064 - safe_str(db_fget(e.item, CITY)),
34065 - safe_str(db_fget(e.item, STATE)),
34066 - safe_str(db_fget(e.item, ZIP)),
34067 - safe_str(db_fget(e.item, COUNTRY))
34070 - if(db_fget(e.item, PHONE))
34071 - fprintf(out, "TEL;HOME:%s\r\n",
34072 - db_fget(e.item, PHONE));
34073 - if(db_fget(e.item, WORKPHONE))
34074 - fprintf(out, "TEL;WORK:%s\r\n",
34075 - db_fget(e.item, WORKPHONE));
34076 - if(db_fget(e.item, FAX))
34077 - fprintf(out, "TEL;FAX:%s\r\n",
34078 - db_fget(e.item, FAX));
34079 - if(db_fget(e.item, MOBILEPHONE))
34080 - fprintf(out, "TEL;CELL:%s\r\n",
34081 - db_fget(e.item, MOBILEPHONE));
34083 - tmp = db_email_get(e.item);
34085 - emails = csv_to_abook_list(tmp);
34087 - for(em = emails; em; em = em->next)
34088 - fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
34089 + name = get_surname(db_name_get(item));
34090 + for( j = strlen(db_name_get(item)) - 1; j >= 0; j-- ) {
34091 + if((db_name_get(item))[j] == ' ')
34094 + fprintf(out, "N:%s;%.*s\r\n",
34097 + safe_str(db_name_get(item))
34102 + // see rfc6350 section 6.3.1
34103 + if(db_fget(item, ADDRESS)) {
34104 + fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
34105 + // pobox (unsupported)
34106 + safe_str(db_fget(item, ADDRESS2)), // ext (nĀ°, ...)
34107 + safe_str(db_fget(item, ADDRESS)), // street
34108 + safe_str(db_fget(item, CITY)), // locality
34109 + safe_str(db_fget(item, STATE)), // region
34110 + safe_str(db_fget(item, ZIP)), // code (postal)
34111 + safe_str(db_fget(item, COUNTRY)) // country
34115 + if(db_fget(item, PHONE))
34116 + fprintf(out, "TEL;HOME:%s\r\n",
34117 + db_fget(item, PHONE));
34118 + if(db_fget(item, WORKPHONE))
34119 + fprintf(out, "TEL;WORK:%s\r\n",
34120 + db_fget(item, WORKPHONE));
34121 + if(db_fget(item, FAX))
34122 + fprintf(out, "TEL;FAX:%s\r\n",
34123 + db_fget(item, FAX));
34124 + if(db_fget(item, MOBILEPHONE))
34125 + fprintf(out, "TEL;CELL:%s\r\n",
34126 + db_fget(item, MOBILEPHONE));
34128 + tmp = db_email_get(item);
34130 + emails = csv_to_abook_list(tmp);
34131 + fprintf(out, "EMAIL;PREF;INTERNET:%s\r\n", emails->data);
34133 + for(em = emails->next; em; em = em->next, email_no++ )
34134 + fprintf(out, "EMAIL;%d;INTERNET:%s\r\n", email_no, em->data);
34136 - abook_list_free(&emails);
34140 - if(db_fget(e.item, NOTES))
34141 - fprintf(out, "NOTE:%s\r\n",
34142 - db_fget(e.item, NOTES));
34143 - if(db_fget(e.item, URL))
34144 - fprintf(out, "URL:%s\r\n",
34145 - db_fget(e.item, URL));
34146 + abook_list_free(&emails);
34150 - fprintf(out, "END:VCARD\r\n\r\n");
34151 + if(db_fget(item, NOTES))
34152 + fprintf(out, "NOTE:%s\r\n",
34153 + db_fget(item, NOTES));
34154 + if(db_fget(item, URL))
34155 + fprintf(out, "URL:%s\r\n",
34156 + db_fget(item, URL));
34159 + fprintf(out, "END:VCARD\r\n\r\n");
34165 - * end of GnomeCard export filter
34166 + * end of vCard export filter
34170 @@ -1880,25 +2092,128 @@
34175 + * This function is a variant of abook_list_to_csv
34178 +mutt_alias_gengroups(int i)
34180 + char *groups, *res = NULL;
34181 + char groupstr[7] = "-group ";
34182 + abook_list *list, *tmp;
34184 + groups = db_fget(i, GROUPS);
34189 + list = csv_to_abook_list(groups);
34190 + for(tmp = list; tmp; tmp = tmp->next) {
34191 + if(tmp == list) {
34192 + res = xmalloc(strlen(groupstr)+strlen(tmp->data)+1);
34193 + res = strcpy(res, groupstr);
34195 + res = xrealloc(res, strlen(res)+1+strlen(groupstr)+strlen(tmp->data)+1);
34196 + strcat(res, " ");
34197 + strcat(res, groupstr);
34199 + strcat(res, tmp->data);
34201 + abook_list_free(&list);
34208 mutt_alias_export(FILE *out, struct db_enumerator e)
34210 char email[MAX_EMAIL_LEN];
34211 char *alias = NULL;
34212 + char *groups = NULL;
34213 + int email_addresses;
34216 db_enumerate_items(e) {
34217 - alias = mutt_alias_genalias(e.item);
34218 + alias = (field_id(NICK) != -1) ? mutt_alias_genalias(e.item) : NULL;
34219 + groups = (field_id(GROUPS) != -1) ? mutt_alias_gengroups(e.item) : NULL;
34220 get_first_email(email, e.item);
34221 - fprintf(out, *email ? "alias %s %s <%s>\n": "alias %s %s%s\n",
34223 - db_name_get(e.item),
34227 + /* do not output contacts without email address */
34228 + /* cause this does not make sense in mutt aliases */
34231 + /* output first email address */
34232 + fprintf(out,"alias ");
34234 + fprintf(out, "%s ", groups);
34236 + fprintf(out, "%s ", alias);
34237 + fprintf(out, "%s <%s>\n",
34238 + db_name_get(e.item),
34241 + /* number of email addresses */
34242 + email_addresses = 1;
34243 + ptr = db_email_get(e.item);
34244 + while (*ptr != '\0') {
34245 + if (*ptr == ',') {
34246 + email_addresses++;
34251 + /* output other email addresses */
34252 + while (email_addresses-- > 1) {
34253 + roll_emails(e.item, ROTATE_RIGHT);
34254 + get_first_email(email, e.item);
34255 + fprintf(out,"alias ");
34257 + fprintf(out, "%s ", groups);
34259 + fprintf(out, "%s__%s ", alias, email);
34261 + fprintf(out, "%s__%s ", db_name_get(e.item), email);
34262 + fprintf(out, "%s <%s>\n",
34263 + db_name_get(e.item),
34266 + roll_emails(e.item, ROTATE_RIGHT);
34275 +void muttq_print_item(FILE *file, int item)
34277 + abook_list *emails, *e;
34278 + char *tmp = db_email_get(item);
34280 + emails = csv_to_abook_list(tmp);
34283 + for(e = emails; e; e = e->next) {
34284 + fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
34285 + !db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
34287 + if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
34290 + abook_list_free(&emails);
34294 +mutt_query_export_database(FILE *out, struct db_enumerator e)
34296 + fprintf(out, "All items\n");
34297 + db_enumerate_items(e)
34298 + muttq_print_item(out, e.item);
34303 * end of mutt alias export filter
34305 @@ -2148,7 +2463,8 @@
34306 char *anniversary = db_fget(e.item, ANNIVERSARY);
34309 - parse_date_string(anniversary, &day, &month, &year);
34310 + if(!parse_date_string(anniversary, &day, &month, &year))
34314 _("%02d/%02d\tAnniversary of %s\n"),
34315 @@ -2162,6 +2478,184 @@
34319 +// see also enum field_types @database.h
34320 +extern abook_field standard_fields[];
34322 +find_field_enum(char *s) {
34324 + while(standard_fields[++i].key)
34325 + if(!strcmp(standard_fields[i].key, s))
34330 +/* Convert a string with named placeholders to
34331 + a *printf() compatible string.
34332 + Stores the abook field values into ft. */
34334 +parse_custom_format(char *s, char *fmt_string, enum field_types *ft)
34336 + if(! fmt_string || ! ft) {
34337 + fprintf(stderr, _("parse_custom_format: fmt_string or ft not allocated\n"));
34338 + exit(EXIT_FAILURE);
34341 + char tmp[1] = { 0 };
34342 + char *p, *start, *field_name = NULL;
34349 + if(! *start) goto cannotparse;
34350 + p = strchr(start, '}');
34351 + if(! p) goto cannotparse;
34352 + strcat(fmt_string, "%s");
34353 + field_name = strndup(start, (size_t)(p-start));
34354 + *ft = find_field_enum(field_name);
34356 + fprintf(stderr, _("parse_custom_format: invalid placeholder: {%s}\n"), field_name);
34357 + exit(EXIT_FAILURE);
34364 + else if(*p == '\\') {
34366 + if(! *p) tmp[0] = '\\'; // last char is a '\' ?
34367 + else if(*p == 'n') *tmp = '\n';
34368 + else if(*p == 't') *tmp = '\t';
34369 + else if(*p == 'r') *tmp = '\r';
34370 + else if(*p == 'v') *tmp = '\v';
34371 + else if(*p == 'b') *tmp = '\b';
34372 + else if(*p == 'a') *tmp = '\a';
34374 + strncat(fmt_string, tmp, 1);
34378 + // if no '\' following: quick mode using strchr/strncat
34379 + else if(! strchr(start, '\\')) {
34380 + p = strchr(start, '{');
34381 + if(p) { // copy until the next placeholder
34382 + strncat(fmt_string, start, (size_t)(p-start));
34385 + else { // copy till the end
34386 + strncat( fmt_string,
34388 + FORMAT_STRING_LEN - strlen(fmt_string) - 1 );
34393 + // otherwise character by character
34395 + strncat(fmt_string, p, 1);
34400 + *ft = ITEM_FIELDS;
34404 + fprintf(stderr, _("%s: invalid format, index %ld\n"), __FUNCTION__, (start - s));
34405 + free(fmt_string);
34406 + while(*ft) free(ft--);
34407 + exit(EXIT_FAILURE);
34411 +custom_export_item(FILE *out, int item, char *s, enum field_types *ft);
34414 +// used to store the format string from --outformatstr when "custom" format is used
34415 +// default value overriden in export_file()
34416 +extern char *parsed_custom_format;
34417 +extern enum field_types *custom_format_fields;
34419 +/* wrapper for custom_export_item:
34420 + 1) avoid messing with extern pointer
34422 + 3) follow the prototype needed for an abook_output_item_filter entry */
34424 +custom_print_item(FILE *out, int item)
34427 + if(custom_export_item(out, item, parsed_custom_format, custom_format_fields) == 0)
34428 + fprintf(out, "\n");
34432 +custom_export_item(FILE *out, int item, char *fmt, enum field_types *ft)
34436 + // if the first character is '!':
34437 + // we first check that all fields exist before continuing
34438 + if(*fmt == '!') {
34439 + enum field_types *ftp = ft;
34440 + while(*ft != ITEM_FIELDS) {
34441 + if(! db_fget(item, *ft) )
34450 + if(!strncmp(fmt, "%s", 2)) {
34451 + fprintf(out, "%s", safe_str(db_fget(item, *ft)));
34454 + } else if (*ft == ITEM_FIELDS) {
34455 + fprintf(out, "%s", fmt);
34458 + p = strchr(fmt, '%');
34460 + q = strndup(fmt, (size_t)(p-fmt));
34461 + fprintf(out, "%s", q);
34466 + fprintf(out, "%s", fmt);
34475 +// used to store the format string from --outformatstr when "custom" format is used
34476 +// default value overriden from abook.c
34477 +extern char custom_format[FORMAT_STRING_LEN];
34480 +custom_export_database(FILE *out, struct db_enumerator e)
34482 + char *format_string =
34483 + (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
34485 + enum field_types *ft =
34486 + (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
34488 + parse_custom_format(custom_format, format_string, ft);
34490 + db_enumerate_items(e) {
34491 + if(custom_export_item(out, e.item, format_string, ft) == 0)
34492 + fprintf(out, "\n");
34498 * end of BSD calendar export filter
34500 diff -urN BUILD/abook-0.6.0pre2/filter.h abook/filter.h
34501 --- BUILD/abook-0.6.0pre2/filter.h 2002-03-20 10:17:24.000000000 +0100
34502 +++ abook/filter.h 2013-03-13 15:07:45.000000000 +0100
34504 #include "database.h"
34506 #define FILTNAME_LEN 8
34507 +#define FORMAT_STRING_LEN 128
34508 +#define FORMAT_STRING_MAX_FIELDS 16
34511 struct abook_output_filter {
34513 int (*func) (FILE *handle, struct db_enumerator e);
34516 +struct abook_output_item_filter {
34517 + char filtname[FILTNAME_LEN];
34519 + void (*func) (FILE *handle, int item);
34522 struct abook_input_filter {
34523 char filtname[FILTNAME_LEN];
34527 int export_database();
34528 int export_file(char filtname[FILTNAME_LEN], char *filename);
34530 +struct abook_output_item_filter
34531 + select_output_item_filter(char filtname[FILTNAME_LEN]);
34533 +void e_write_item(FILE *out, int item, void (*func) (FILE *in, int item));
34534 +void muttq_print_item(FILE *file, int item);
34536 +void parse_custom_format(char *s, char *fmt_string, enum field_types *ft);
34537 +void custom_print_item(FILE *out, int item);
34539 int fexport(char filtname[FILTNAME_LEN], FILE *handle,
34542 diff -urN BUILD/abook-0.6.0pre2/gettext.h abook/gettext.h
34543 --- BUILD/abook-0.6.0pre2/gettext.h 2006-04-10 10:15:46.000000000 +0200
34544 +++ abook/gettext.h 2013-03-13 15:07:45.000000000 +0100
34546 # include <libintl.h>
34548 # define gettext(Msgid) ((const char *) (Msgid))
34549 +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
34550 # define textdomain(Domainname) do {} while(0)
34551 # define bindtextdomain(Domainname, Dirname) do {} while(0)
34552 # endif /* ENABLE_NLS */
34553 diff -urN BUILD/abook-0.6.0pre2/.gitignore abook/.gitignore
34554 --- BUILD/abook-0.6.0pre2/.gitignore 1970-01-01 01:00:00.000000000 +0100
34555 +++ abook/.gitignore 2013-03-13 15:07:45.000000000 +0100
34574 diff -urN BUILD/abook-0.6.0pre2/help.h abook/help.h
34575 --- BUILD/abook-0.6.0pre2/help.h 2006-08-31 07:07:59.000000000 +0200
34576 +++ abook/help.h 2013-03-13 15:07:45.000000000 +0100
34578 N_(" enter view/edit item\n"),
34579 N_(" a add item\n"),
34580 N_(" r / del remove selected items\n"),
34581 +N_(" M merge selected items (into top one)\n"),
34582 N_(" D duplicate item\n"),
34583 +N_(" U remove duplicates\n"),
34585 N_(" space select item\n"),
34586 N_(" + select all\n"),
34587 diff -urN BUILD/abook-0.6.0pre2/INSTALL abook/INSTALL
34588 --- BUILD/abook-0.6.0pre2/INSTALL 2001-03-12 11:12:54.000000000 +0100
34589 +++ abook/INSTALL 2013-03-13 15:07:45.000000000 +0100
34591 +Installation Instructions
34592 +*************************
34594 +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
34597 + Copying and distribution of this file, with or without modification,
34598 +are permitted in any medium without royalty provided the copyright
34599 +notice and this notice are preserved. This file is offered as-is,
34600 +without warranty of any kind.
34605 - These are generic installation instructions.
34606 + Briefly, the shell commands `./configure; make; make install' should
34607 +configure, build, and install this package. The following
34608 +more-detailed instructions are generic; see the `README' file for
34609 +instructions specific to this package. Some packages provide this
34610 +`INSTALL' file but do not implement all of the features documented
34611 +below. The lack of an optional feature in a given package is not
34612 +necessarily a bug. More recommendations for GNU packages can be found
34613 +in *note Makefile Conventions: (standards)Makefile Conventions.
34615 The `configure' shell script attempts to guess correct values for
34616 various system-dependent variables used during compilation. It uses
34617 those values to create a `Makefile' in each directory of the package.
34618 It may also create one or more `.h' files containing system-dependent
34619 definitions. Finally, it creates a shell script `config.status' that
34620 -you can run in the future to recreate the current configuration, a file
34621 -`config.cache' that saves the results of its tests to speed up
34622 -reconfiguring, and a file `config.log' containing compiler output
34623 -(useful mainly for debugging `configure').
34624 +you can run in the future to recreate the current configuration, and a
34625 +file `config.log' containing compiler output (useful mainly for
34626 +debugging `configure').
34628 + It can also use an optional file (typically called `config.cache'
34629 +and enabled with `--cache-file=config.cache' or simply `-C') that saves
34630 +the results of its tests to speed up reconfiguring. Caching is
34631 +disabled by default to prevent problems with accidental use of stale
34634 If you need to do unusual things to compile the package, please try
34635 to figure out how `configure' could check whether to do them, and mail
34636 diffs or instructions to the address given in the `README' so they can
34637 -be considered for the next release. If at some point `config.cache'
34638 -contains results you don't want to keep, you may remove or edit it.
34640 - The file `configure.in' is used to create `configure' by a program
34641 -called `autoconf'. You only need `configure.in' if you want to change
34642 -it or regenerate `configure' using a newer version of `autoconf'.
34643 +be considered for the next release. If you are using the cache, and at
34644 +some point `config.cache' contains results you don't want to keep, you
34645 +may remove or edit it.
34647 + The file `configure.ac' (or `configure.in') is used to create
34648 +`configure' by a program called `autoconf'. You need `configure.ac' if
34649 +you want to change it or regenerate `configure' using a newer version
34652 -The simplest way to compile this package is:
34653 + The simplest way to compile this package is:
34655 1. `cd' to the directory containing the package's source code and type
34656 - `./configure' to configure the package for your system. If you're
34657 - using `csh' on an old version of System V, you might need to type
34658 - `sh ./configure' instead to prevent `csh' from trying to execute
34659 - `configure' itself.
34660 + `./configure' to configure the package for your system.
34662 - Running `configure' takes awhile. While running, it prints some
34663 - messages telling which features it is checking for.
34664 + Running `configure' might take a while. While running, it prints
34665 + some messages telling which features it is checking for.
34667 2. Type `make' to compile the package.
34669 3. Optionally, type `make check' to run any self-tests that come with
34671 + the package, generally using the just-built uninstalled binaries.
34673 4. Type `make install' to install the programs and any data files and
34675 + documentation. When installing into a prefix owned by root, it is
34676 + recommended that the package be configured and built as a regular
34677 + user, and only the `make install' phase executed with root
34680 + 5. Optionally, type `make installcheck' to repeat any self-tests, but
34681 + this time using the binaries in their final installed location.
34682 + This target does not install anything. Running this target as a
34683 + regular user, particularly if the prior `make install' required
34684 + root privileges, verifies that the installation completed
34687 - 5. You can remove the program binaries and object files from the
34688 + 6. You can remove the program binaries and object files from the
34689 source code directory by typing `make clean'. To also remove the
34690 files that `configure' created (so you can compile the package for
34691 a different kind of computer), type `make distclean'. There is
34692 @@ -51,62 +83,119 @@
34693 all sorts of other programs in order to regenerate files that came
34694 with the distribution.
34696 + 7. Often, you can also type `make uninstall' to remove the installed
34697 + files again. In practice, not all packages have tested that
34698 + uninstallation works correctly, even though it is required by the
34699 + GNU Coding Standards.
34701 + 8. Some packages, particularly those that use Automake, provide `make
34702 + distcheck', which can by used by developers to test that all other
34703 + targets like `make install' and `make uninstall' work correctly.
34704 + This target is generally not run by end users.
34706 Compilers and Options
34707 =====================
34709 Some systems require unusual options for compilation or linking that
34710 -the `configure' script does not know about. You can give `configure'
34711 -initial values for variables by setting them in the environment. Using
34712 -a Bourne-compatible shell, you can do that on the command line like
34714 - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
34715 +the `configure' script does not know about. Run `./configure --help'
34716 +for details on some of the pertinent environment variables.
34718 + You can give `configure' initial values for configuration parameters
34719 +by setting variables in the command line or in the environment. Here
34722 -Or on systems that have the `env' program, you can do it like this:
34723 - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
34724 + ./configure CC=c99 CFLAGS=-g LIBS=-lposix
34726 + *Note Defining Variables::, for more details.
34728 Compiling For Multiple Architectures
34729 ====================================
34731 You can compile the package for more than one kind of computer at the
34732 same time, by placing the object files for each architecture in their
34733 -own directory. To do this, you must use a version of `make' that
34734 -supports the `VPATH' variable, such as GNU `make'. `cd' to the
34735 +own directory. To do this, you can use GNU `make'. `cd' to the
34736 directory where you want the object files and executables to go and run
34737 the `configure' script. `configure' automatically checks for the
34738 -source code in the directory that `configure' is in and in `..'.
34739 +source code in the directory that `configure' is in and in `..'. This
34740 +is known as a "VPATH" build.
34742 + With a non-GNU `make', it is safer to compile the package for one
34743 +architecture at a time in the source code directory. After you have
34744 +installed the package for one architecture, use `make distclean' before
34745 +reconfiguring for another architecture.
34747 + On MacOS X 10.5 and later systems, you can create libraries and
34748 +executables that work on multiple system types--known as "fat" or
34749 +"universal" binaries--by specifying multiple `-arch' options to the
34750 +compiler but only a single `-arch' option to the preprocessor. Like
34753 - If you have to use a `make' that does not supports the `VPATH'
34754 -variable, you have to compile the package for one architecture at a time
34755 -in the source code directory. After you have installed the package for
34756 -one architecture, use `make distclean' before reconfiguring for another
34758 + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
34759 + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
34760 + CPP="gcc -E" CXXCPP="g++ -E"
34762 + This is not guaranteed to produce working output in all cases, you
34763 +may have to build one architecture at a time and combine the results
34764 +using the `lipo' tool if you have problems.
34769 - By default, `make install' will install the package's files in
34770 -`/usr/local/bin', `/usr/local/man', etc. You can specify an
34771 -installation prefix other than `/usr/local' by giving `configure' the
34772 -option `--prefix=PATH'.
34773 + By default, `make install' installs the package's commands under
34774 +`/usr/local/bin', include files under `/usr/local/include', etc. You
34775 +can specify an installation prefix other than `/usr/local' by giving
34776 +`configure' the option `--prefix=PREFIX', where PREFIX must be an
34777 +absolute file name.
34779 You can specify separate installation prefixes for
34780 architecture-specific files and architecture-independent files. If you
34781 -give `configure' the option `--exec-prefix=PATH', the package will use
34782 -PATH as the prefix for installing programs and libraries.
34783 -Documentation and other data files will still use the regular prefix.
34784 +pass the option `--exec-prefix=PREFIX' to `configure', the package uses
34785 +PREFIX as the prefix for installing programs and libraries.
34786 +Documentation and other data files still use the regular prefix.
34788 In addition, if you use an unusual directory layout you can give
34789 -options like `--bindir=PATH' to specify different values for particular
34790 +options like `--bindir=DIR' to specify different values for particular
34791 kinds of files. Run `configure --help' for a list of the directories
34792 -you can set and what kinds of files go in them.
34793 +you can set and what kinds of files go in them. In general, the
34794 +default for these options is expressed in terms of `${prefix}', so that
34795 +specifying just `--prefix' will affect all of the other directory
34796 +specifications that were not explicitly provided.
34798 + The most portable way to affect installation locations is to pass the
34799 +correct locations to `configure'; however, many packages provide one or
34800 +both of the following shortcuts of passing variable assignments to the
34801 +`make install' command line to change installation locations without
34802 +having to reconfigure or recompile.
34804 + The first method involves providing an override variable for each
34805 +affected directory. For example, `make install
34806 +prefix=/alternate/directory' will choose an alternate location for all
34807 +directory configuration variables that were expressed in terms of
34808 +`${prefix}'. Any directories that were specified during `configure',
34809 +but not in terms of `${prefix}', must each be overridden at install
34810 +time for the entire installation to be relocated. The approach of
34811 +makefile variable overrides for each directory variable is required by
34812 +the GNU Coding Standards, and ideally causes no recompilation.
34813 +However, some platforms have known limitations with the semantics of
34814 +shared libraries that end up requiring recompilation when using this
34815 +method, particularly noticeable in packages that use GNU Libtool.
34817 + The second method involves providing the `DESTDIR' variable. For
34818 +example, `make install DESTDIR=/alternate/directory' will prepend
34819 +`/alternate/directory' before all installation names. The approach of
34820 +`DESTDIR' overrides is not required by the GNU Coding Standards, and
34821 +does not work on platforms that have drive letters. On the other hand,
34822 +it does better at avoiding recompilation issues, and works well even
34823 +when some directory options were not specified in terms of `${prefix}'
34824 +at `configure' time.
34829 If the package supports it, you can cause programs to be installed
34830 with an extra prefix or suffix on their names by giving `configure' the
34831 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
34836 Some packages pay attention to `--enable-FEATURE' options to
34837 `configure', where FEATURE indicates an optional part of the package.
34838 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
34839 @@ -119,25 +208,80 @@
34840 you can use the `configure' options `--x-includes=DIR' and
34841 `--x-libraries=DIR' to specify their locations.
34843 + Some packages offer the ability to configure how verbose the
34844 +execution of `make' will be. For these packages, running `./configure
34845 +--enable-silent-rules' sets the default to minimal output, which can be
34846 +overridden with `make V=1'; while running `./configure
34847 +--disable-silent-rules' sets the default to verbose, which can be
34848 +overridden with `make V=0'.
34850 +Particular systems
34851 +==================
34853 + On HP-UX, the default C compiler is not ANSI C compatible. If GNU
34854 +CC is not installed, it is recommended to use the following options in
34855 +order to use an ANSI C compiler:
34857 + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
34859 +and if that doesn't work, install pre-built binaries of GCC for HP-UX.
34861 + HP-UX `make' updates targets which have the same time stamps as
34862 +their prerequisites, which makes it generally unusable when shipped
34863 +generated files such as `configure' are involved. Use GNU `make'
34866 + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
34867 +parse its `<wchar.h>' header file. The option `-nodtk' can be used as
34868 +a workaround. If GNU CC is not installed, it is therefore recommended
34871 + ./configure CC="cc"
34873 +and if that doesn't work, try
34875 + ./configure CC="cc -nodtk"
34877 + On Solaris, don't put `/usr/ucb' early in your `PATH'. This
34878 +directory contains several dysfunctional programs; working variants of
34879 +these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
34880 +in your `PATH', put it _after_ `/usr/bin'.
34882 + On Haiku, software installed for all users goes in `/boot/common',
34883 +not `/usr/local'. It is recommended to use the following options:
34885 + ./configure --prefix=/boot/common
34887 Specifying the System Type
34888 ==========================
34890 - There may be some features `configure' can not figure out
34891 -automatically, but needs to determine by the type of host the package
34892 -will run on. Usually `configure' can figure that out, but if it prints
34893 -a message saying it can not guess the host type, give it the
34894 -`--host=TYPE' option. TYPE can either be a short name for the system
34895 -type, such as `sun4', or a canonical name with three fields:
34896 + There may be some features `configure' cannot figure out
34897 +automatically, but needs to determine by the type of machine the package
34898 +will run on. Usually, assuming the package is built to be run on the
34899 +_same_ architectures, `configure' can figure that out, but if it prints
34900 +a message saying it cannot guess the machine type, give it the
34901 +`--build=TYPE' option. TYPE can either be a short name for the system
34902 +type, such as `sun4', or a canonical name which has the form:
34906 -See the file `config.sub' for the possible values of each field. If
34907 +where SYSTEM can have one of these forms:
34912 + See the file `config.sub' for the possible values of each field. If
34913 `config.sub' isn't included in this package, then this package doesn't
34914 -need to know the host type.
34915 +need to know the machine type.
34917 - If you are building compiler tools for cross-compiling, you can also
34918 -use the `--target=TYPE' option to select the type of system they will
34919 -produce code for and the `--build=TYPE' option to select the type of
34920 -system on which you are compiling the package.
34921 + If you are _building_ compiler tools for cross-compiling, you should
34922 +use the option `--target=TYPE' to select the type of system they will
34925 + If you want to _use_ a cross compiler, that generates code for a
34926 +platform different from the build platform, you should specify the
34927 +"host" platform (i.e., that on which the generated programs will
34928 +eventually be run) with `--host=TYPE'.
34932 @@ -150,19 +294,55 @@
34933 `CONFIG_SITE' environment variable to the location of the site script.
34934 A warning: not all `configure' scripts look for a site script.
34936 -Operation Controls
34937 +Defining Variables
34940 + Variables not defined in a site shell script can be set in the
34941 +environment passed to `configure'. However, some packages may run
34942 +configure again during the build, and the customized values of these
34943 +variables may be lost. In order to avoid this problem, you should set
34944 +them in the `configure' command line, using `VAR=value'. For example:
34946 + ./configure CC=/usr/local2/bin/gcc
34948 +causes the specified `gcc' to be used as the C compiler (unless it is
34949 +overridden in the site shell script).
34951 +Unfortunately, this technique does not work for `CONFIG_SHELL' due to
34952 +an Autoconf bug. Until the bug is fixed you can use this workaround:
34954 + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
34956 +`configure' Invocation
34957 +======================
34959 `configure' recognizes the following options to control how it
34962 -`--cache-file=FILE'
34963 - Use and save the results of the tests in FILE instead of
34964 - `./config.cache'. Set FILE to `/dev/null' to disable caching, for
34965 - debugging `configure'.
34968 - Print a summary of the options to `configure', and exit.
34970 + Print a summary of all of the options to `configure', and exit.
34973 +`--help=recursive'
34974 + Print a summary of the options unique to this package's
34975 + `configure', and exit. The `short' variant lists options used
34976 + only in the top level, while the `recursive' variant lists options
34977 + also present in any nested packages.
34981 + Print the version of Autoconf used to generate the `configure'
34982 + script, and exit.
34984 +`--cache-file=FILE'
34985 + Enable the cache: use and save the results of the tests in FILE,
34986 + traditionally `config.cache'. FILE defaults to `/dev/null' to
34991 + Alias for `--cache-file=config.cache'.
34995 @@ -175,8 +355,16 @@
34996 Look for the package's source code in directory DIR. Usually
34997 `configure' can determine that directory automatically.
35000 - Print the version of Autoconf used to generate the `configure'
35001 - script, and exit.
35003 + Use DIR as the installation prefix. *note Installation Names::
35004 + for more details, including other options available for fine-tuning
35005 + the installation locations.
35009 + Run the configure checks, but stop before creating any output
35012 +`configure' also accepts some other, not widely useful, options. Run
35013 +`configure --help' for more details.
35015 -`configure' also accepts some other, not widely useful, options.
35016 diff -urN BUILD/abook-0.6.0pre2/install-sh abook/install-sh
35017 --- BUILD/abook-0.6.0pre2/install-sh 2001-03-12 11:13:18.000000000 +0100
35018 +++ abook/install-sh 2013-03-13 15:07:45.000000000 +0100
35019 @@ -1,250 +1,527 @@
35022 # install - install a program, script, or datafile
35023 -# This comes from X11R5 (mit/util/scripts/install.sh).
35025 +scriptversion=2011-01-19.21; # UTC
35027 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
35028 +# later released in X11R6 (xc/config/util/install.sh) with the
35029 +# following copyright and license.
35031 +# Copyright (C) 1994 X Consortium
35033 +# Permission is hereby granted, free of charge, to any person obtaining a copy
35034 +# of this software and associated documentation files (the "Software"), to
35035 +# deal in the Software without restriction, including without limitation the
35036 +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
35037 +# sell copies of the Software, and to permit persons to whom the Software is
35038 +# furnished to do so, subject to the following conditions:
35040 +# The above copyright notice and this permission notice shall be included in
35041 +# all copies or substantial portions of the Software.
35043 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
35044 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35045 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
35046 +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
35047 +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
35048 +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35050 +# Except as contained in this notice, the name of the X Consortium shall not
35051 +# be used in advertising or otherwise to promote the sale, use or other deal-
35052 +# ings in this Software without prior written authorization from the X Consor-
35055 -# Copyright 1991 by the Massachusetts Institute of Technology
35057 -# Permission to use, copy, modify, distribute, and sell this software and its
35058 -# documentation for any purpose is hereby granted without fee, provided that
35059 -# the above copyright notice appear in all copies and that both that
35060 -# copyright notice and this permission notice appear in supporting
35061 -# documentation, and that the name of M.I.T. not be used in advertising or
35062 -# publicity pertaining to distribution of the software without specific,
35063 -# written prior permission. M.I.T. makes no representations about the
35064 -# suitability of this software for any purpose. It is provided "as is"
35065 -# without express or implied warranty.
35066 +# FSF changes to this file are in the public domain.
35068 # Calling this script install-sh is preferred over install.sh, to prevent
35069 # `make' implicit rules from creating a file called install from it
35070 # when there is no Makefile.
35072 # This script is compatible with the BSD install script, but was written
35073 -# from scratch. It can only install one file at a time, a restriction
35074 -# shared with many OS's install programs.
35081 # set DOITPROG to echo to test this script
35083 # Don't use :- since 4.3BSD and earlier shells don't like it.
35084 -doit="${DOITPROG-}"
35087 -# put in absolute paths if you don't have them in your path; or use env. vars.
35089 -mvprog="${MVPROG-mv}"
35090 -cpprog="${CPPROG-cp}"
35091 -chmodprog="${CHMODPROG-chmod}"
35092 -chownprog="${CHOWNPROG-chown}"
35093 -chgrpprog="${CHGRPPROG-chgrp}"
35094 -stripprog="${STRIPPROG-strip}"
35095 -rmprog="${RMPROG-rm}"
35096 -mkdirprog="${MKDIRPROG-mkdir}"
35098 -transformbasename=""
35101 -chmodcmd="$chmodprog 0755"
35105 -rmcmd="$rmprog -f"
35111 -while [ x"$1" != x ]; do
35113 - -c) instcmd="$cpprog"
35121 - -m) chmodcmd="$chmodprog $2"
35126 - -o) chowncmd="$chownprog $2"
35131 - -g) chgrpcmd="$chgrpprog $2"
35136 - -s) stripcmd="$stripprog"
35140 - -t=*) transformarg=`echo $1 | sed 's/-t=//'`
35144 - -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
35148 - *) if [ x"$src" = x ]
35152 - # this colon is to work around a 386BSD /bin/sh bug
35161 -if [ x"$src" = x ]
35163 - echo "install: no input file specified"
35166 +if test -z "$doit"; then
35173 -if [ x"$dir_arg" != x ]; then
35177 - if [ -d $dst ]; then
35183 +# Put in absolute file names if you don't have them in your path;
35184 +# or use environment vars.
35186 -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
35187 -# might cause directories to be created, which would be especially bad
35188 -# if $src (and thus $dsttmp) contains '*'.
35190 - if [ -f $src -o -d $src ]
35194 - echo "install: $src does not exist"
35198 - if [ x"$dst" = x ]
35200 - echo "install: no destination specified"
35206 -# If destination is a directory, append the input filename; if your system
35207 -# does not like double slashes in filenames, you may need to add some logic
35211 - dst="$dst"/`basename $src`
35217 -## this sed command emulates the dirname command
35218 -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
35219 +chgrpprog=${CHGRPPROG-chgrp}
35220 +chmodprog=${CHMODPROG-chmod}
35221 +chownprog=${CHOWNPROG-chown}
35222 +cmpprog=${CMPPROG-cmp}
35223 +cpprog=${CPPROG-cp}
35224 +mkdirprog=${MKDIRPROG-mkdir}
35225 +mvprog=${MVPROG-mv}
35226 +rmprog=${RMPROG-rm}
35227 +stripprog=${STRIPPROG-strip}
35230 +initialize_posix_glob='
35231 + test "$posix_glob" != "?" || {
35232 + if (set -f) 2>/dev/null; then
35240 -# Make sure that the destination directory exists.
35241 -# this part is taken from Noah Friedman's mkinstalldirs script
35244 -# Skip lots of stat calls in the usual case.
35245 -if [ ! -d "$dstdir" ]; then
35248 -IFS="${IFS-${defaultIFS}}"
35249 +# Desired mode of installed file.
35253 -# Some sh's can't handle IFS=/ for some reason.
35255 -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
35260 -while [ $# -ne 0 ] ; do
35261 - pathcomp="${pathcomp}${1}"
35264 - if [ ! -d "${pathcomp}" ] ;
35266 - $mkdirprog "${pathcomp}"
35271 +chmodcmd=$chmodprog
35274 +rmcmd="$rmprog -f"
35277 - pathcomp="${pathcomp}/"
35283 +copy_on_change=false
35284 +no_target_directory=
35287 +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
35288 + or: $0 [OPTION]... SRCFILES... DIRECTORY
35289 + or: $0 [OPTION]... -t DIRECTORY SRCFILES...
35290 + or: $0 [OPTION]... -d DIRECTORIES...
35292 +In the 1st form, copy SRCFILE to DSTFILE.
35293 +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
35294 +In the 4th, create DIRECTORIES.
35297 + --help display this help and exit.
35298 + --version display version info and exit.
35301 + -C install only if different (preserve the last data modification time)
35302 + -d create directories instead of installing files.
35303 + -g GROUP $chgrpprog installed files to GROUP.
35304 + -m MODE $chmodprog installed files to MODE.
35305 + -o USER $chownprog installed files to USER.
35306 + -s $stripprog installed files.
35307 + -t DIRECTORY install into DIRECTORY.
35308 + -T report an error if DSTFILE is a directory.
35310 +Environment variables override the default commands:
35311 + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
35315 +while test $# -ne 0; do
35319 + -C) copy_on_change=true;;
35321 + -d) dir_arg=true;;
35323 + -g) chgrpcmd="$chgrpprog $2"
35326 + --help) echo "$usage"; exit $?;;
35330 + *' '* | *' '* | *'
35331 +'* | *'*'* | *'?'* | *'['*)
35332 + echo "$0: invalid mode: $mode" >&2
35337 + -o) chowncmd="$chownprog $2"
35340 + -s) stripcmd=$stripprog;;
35343 + # Protect names problematic for `test' and other utilities.
35345 + -* | [=\(\)!]) dst_arg=./$dst_arg;;
35349 + -T) no_target_directory=true;;
35351 + --version) echo "$0 $scriptversion"; exit $?;;
35356 + -*) echo "$0: invalid option: $1" >&2
35364 +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
35365 + # When -d is used, all remaining arguments are directories to create.
35366 + # When -t is used, the destination is already specified.
35367 + # Otherwise, the last argument is the destination. Remove it from $@.
35370 + if test -n "$dst_arg"; then
35371 + # $@ is not empty: it contains at least $arg.
35372 + set fnord "$@" "$dst_arg"
35377 + # Protect names problematic for `test' and other utilities.
35379 + -* | [=\(\)!]) dst_arg=./$dst_arg;;
35384 -if [ x"$dir_arg" != x ]
35386 - $doit $instcmd $dst &&
35388 - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
35389 - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
35390 - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
35391 - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
35393 +if test $# -eq 0; then
35394 + if test -z "$dir_arg"; then
35395 + echo "$0: no input file specified." >&2
35398 + # It's OK to call `install-sh -d' without argument.
35399 + # This can happen when creating conditional directories.
35403 -# If we're going to rename the final executable, determine the name now.
35404 +if test -z "$dir_arg"; then
35405 + do_exit='(exit $ret); exit $ret'
35406 + trap "ret=129; $do_exit" 1
35407 + trap "ret=130; $do_exit" 2
35408 + trap "ret=141; $do_exit" 13
35409 + trap "ret=143; $do_exit" 15
35411 + # Set umask so as not to create temps with too-generous modes.
35412 + # However, 'strip' requires both read and write access to temps.
35414 + # Optimize common cases.
35415 + *644) cp_umask=133;;
35416 + *755) cp_umask=22;;
35419 + if test -z "$stripcmd"; then
35422 + u_plus_rw='% 200'
35424 + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
35426 + if test -z "$stripcmd"; then
35431 + cp_umask=$mode$u_plus_rw;;
35435 - if [ x"$transformarg" = x ]
35437 - dstfile=`basename $dst`
35440 + # Protect names problematic for `test' and other utilities.
35442 + -* | [=\(\)!]) src=./$src;;
35445 + if test -n "$dir_arg"; then
35448 + test -d "$dstdir"
35452 + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
35453 + # might cause directories to be created, which would be especially bad
35454 + # if $src (and thus $dsttmp) contains '*'.
35455 + if test ! -f "$src" && test ! -d "$src"; then
35456 + echo "$0: $src does not exist." >&2
35460 + if test -z "$dst_arg"; then
35461 + echo "$0: no destination specified." >&2
35466 + # If destination is a directory, append the input filename; won't work
35467 + # if double slashes aren't ignored.
35468 + if test -d "$dst"; then
35469 + if test -n "$no_target_directory"; then
35470 + echo "$0: $dst_arg: Is a directory" >&2
35474 + dst=$dstdir/`basename "$src"`
35477 + # Prefer dirname, but fall back on a substitute if dirname fails.
35479 + (dirname "$dst") 2>/dev/null ||
35480 + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
35481 + X"$dst" : 'X\(//\)[^/]' \| \
35482 + X"$dst" : 'X\(//\)$' \| \
35483 + X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
35485 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
35489 + /^X\(\/\/\)[^/].*/{
35504 + test -d "$dstdir"
35509 + obsolete_mkdir_used=false
35511 + if test $dstdir_status != 0; then
35512 + case $posix_mkdir in
35514 + # Create intermediate dirs using mode 755 as modified by the umask.
35515 + # This is like FreeBSD 'install' as of 1997-10-28.
35517 + case $stripcmd.$umask in
35518 + # Optimize common cases.
35519 + *[2367][2367]) mkdir_umask=$umask;;
35520 + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
35523 + mkdir_umask=`expr $umask + 22 \
35524 + - $umask % 100 % 40 + $umask % 20 \
35525 + - $umask % 10 % 4 + $umask % 2
35527 + *) mkdir_umask=$umask,go-w;;
35530 + # With -d, create the new directory with the user-specified mode.
35531 + # Otherwise, rely on $mkdir_umask.
35532 + if test -n "$dir_arg"; then
35533 + mkdir_mode=-m$mode
35535 - dstfile=`basename $dst $transformbasename |
35536 - sed $transformarg`$transformbasename
35540 -# don't allow the sed command to completely eliminate the filename
35541 + posix_mkdir=false
35543 + *[123567][0-7][0-7])
35544 + # POSIX mkdir -p sets u+wx bits regardless of umask, which
35545 + # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
35548 + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
35549 + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
35551 + if (umask $mkdir_umask &&
35552 + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
35554 + if test -z "$dir_arg" || {
35555 + # Check for POSIX incompatibilities with -m.
35556 + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
35557 + # other-writeable bit of parent directory when it shouldn't.
35558 + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
35559 + ls_ld_tmpdir=`ls -ld "$tmpdir"`
35560 + case $ls_ld_tmpdir in
35561 + d????-?r-*) different_mode=700;;
35562 + d????-?--*) different_mode=755;;
35565 + $mkdirprog -m$different_mode -p -- "$tmpdir" && {
35566 + ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
35567 + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
35570 + then posix_mkdir=:
35572 + rmdir "$tmpdir/d" "$tmpdir"
35574 + # Remove any dirs left behind by ancient mkdir implementations.
35575 + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
35581 - if [ x"$dstfile" = x ]
35583 - dstfile=`basename $dst`
35585 + $posix_mkdir && (
35586 + umask $mkdir_umask &&
35587 + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
35592 + # The umask is ridiculous, or mkdir does not conform to POSIX,
35593 + # or it failed possibly due to a race condition. Create the
35594 + # directory the slow way, step by step, checking for races as we go.
35598 + [-=\(\)!]*) prefix='./';;
35602 + eval "$initialize_posix_glob"
35606 + $posix_glob set -f
35607 + set fnord $dstdir
35609 + $posix_glob set +f
35616 + test X"$d" = X && continue
35619 + if test -d "$prefix"; then
35623 + if $posix_mkdir; then
35624 + (umask=$mkdir_umask &&
35625 + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
35626 + # Don't fail if two instances are running concurrently.
35627 + test -d "$prefix" || exit 1
35630 + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
35631 + *) qprefix=$prefix;;
35633 + prefixes="$prefixes '$qprefix'"
35639 -# Make a temp file name in the proper directory.
35641 - dsttmp=$dstdir/#inst.$$#
35643 -# Move or copy the file name to the temp name
35645 - $doit $instcmd $src $dsttmp &&
35647 - trap "rm -f ${dsttmp}" 0 &&
35649 -# and set any options; do chmod last to preserve setuid bits
35651 -# If any of these fail, we abort the whole thing. If we want to
35652 -# ignore errors from any of these, just make sure not to ignore
35653 -# errors from the above "$doit $instcmd $src $dsttmp" command.
35655 - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
35656 - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
35657 - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
35658 - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
35660 -# Now rename the file to the real destination.
35662 - $doit $rmcmd -f $dstdir/$dstfile &&
35663 - $doit $mvcmd $dsttmp $dstdir/$dstfile
35666 + if test -n "$prefixes"; then
35667 + # Don't fail if two instances are running concurrently.
35668 + (umask $mkdir_umask &&
35669 + eval "\$doit_exec \$mkdirprog $prefixes") ||
35670 + test -d "$dstdir" || exit 1
35671 + obsolete_mkdir_used=true
35676 + if test -n "$dir_arg"; then
35677 + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
35678 + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
35679 + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
35680 + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
35683 + # Make a couple of temp file names in the proper directory.
35684 + dsttmp=$dstdir/_inst.$$_
35685 + rmtmp=$dstdir/_rm.$$_
35687 + # Trap to clean up those temp files at exit.
35688 + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
35690 + # Copy the file name to the temp name.
35691 + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
35693 + # and set any options; do chmod last to preserve setuid bits.
35695 + # If any of these fail, we abort the whole thing. If we want to
35696 + # ignore errors from any of these, just make sure not to ignore
35697 + # errors from the above "$doit $cpprog $src $dsttmp" command.
35699 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
35700 + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
35701 + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
35702 + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
35704 + # If -C, don't bother to copy if it wouldn't change the file.
35705 + if $copy_on_change &&
35706 + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
35707 + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
35709 + eval "$initialize_posix_glob" &&
35710 + $posix_glob set -f &&
35711 + set X $old && old=:$2:$4:$5:$6 &&
35712 + set X $new && new=:$2:$4:$5:$6 &&
35713 + $posix_glob set +f &&
35715 + test "$old" = "$new" &&
35716 + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
35720 + # Rename the file to the real destination.
35721 + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
35723 + # The rename failed, perhaps because mv can't rename something else
35724 + # to itself, or perhaps because mv is so ancient that it does not
35727 + # Now remove or move aside any old file at destination location.
35728 + # We try this two ways since rm can't unlink itself on some
35729 + # systems and the destination file might be busy for other
35730 + # reasons. In this case, the final cleanup might fail but the new
35731 + # file should still install successfully.
35733 + test ! -f "$dst" ||
35734 + $doit $rmcmd -f "$dst" 2>/dev/null ||
35735 + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
35736 + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
35738 + { echo "$0: cannot unlink or rename $dst" >&2
35743 + # Now rename the file to the real destination.
35744 + $doit $mvcmd "$dsttmp" "$dst"
35753 +# Local variables:
35754 +# eval: (add-hook 'write-file-hooks 'time-stamp)
35755 +# time-stamp-start: "scriptversion="
35756 +# time-stamp-format: "%:y-%02m-%02d.%02H"
35757 +# time-stamp-time-zone: "UTC"
35758 +# time-stamp-end: "; # UTC"
35760 diff -urN BUILD/abook-0.6.0pre2/intl/bindtextdom.c abook/intl/bindtextdom.c
35761 --- BUILD/abook-0.6.0pre2/intl/bindtextdom.c 2005-09-17 12:10:26.000000000 +0200
35762 +++ abook/intl/bindtextdom.c 1970-01-01 01:00:00.000000000 +0100
35764 -/* Implementation of the bindtextdomain(3) function
35765 - Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
35767 - This program is free software; you can redistribute it and/or modify it
35768 - under the terms of the GNU Library General Public License as published
35769 - by the Free Software Foundation; either version 2, or (at your option)
35770 - any later version.
35772 - This program is distributed in the hope that it will be useful,
35773 - but WITHOUT ANY WARRANTY; without even the implied warranty of
35774 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
35775 - Library General Public License for more details.
35777 - You should have received a copy of the GNU Library General Public
35778 - License along with this program; if not, write to the Free Software
35779 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
35782 -#ifdef HAVE_CONFIG_H
35783 -# include <config.h>
35786 -#include <stddef.h>
35787 -#include <stdlib.h>
35788 -#include <string.h>
35791 -# include <libintl.h>
35793 -# include "libgnuintl.h"
35795 -#include "gettextP.h"
35798 -/* We have to handle multi-threaded applications. */
35799 -# include <bits/libc-lock.h>
35801 -/* Provide dummy implementation if this is outside glibc. */
35802 -# define __libc_rwlock_define(CLASS, NAME)
35803 -# define __libc_rwlock_wrlock(NAME)
35804 -# define __libc_rwlock_unlock(NAME)
35807 -/* The internal variables in the standalone libintl.a must have different
35808 - names than the internal variables in GNU libc, otherwise programs
35809 - using libintl.a cannot be linked statically. */
35810 -#if !defined _LIBC
35811 -# define _nl_default_dirname libintl_nl_default_dirname
35812 -# define _nl_domain_bindings libintl_nl_domain_bindings
35815 -/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
35817 -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
35820 -/* @@ end of prolog @@ */
35822 -/* Contains the default location of the message catalogs. */
35823 -extern const char _nl_default_dirname[];
35825 -extern const char _nl_default_dirname_internal[] attribute_hidden;
35827 -# define INTUSE(name) name
35830 -/* List with bindings of specific domains. */
35831 -extern struct binding *_nl_domain_bindings;
35833 -/* Lock variable to protect the global data in the gettext implementation. */
35834 -__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
35837 -/* Names for the libintl functions are a problem. They must not clash
35838 - with existing names and they should follow ANSI C. But this source
35839 - code is also used in GNU C Library where the names have a __
35840 - prefix. So we have to make a difference here. */
35842 -# define BINDTEXTDOMAIN __bindtextdomain
35843 -# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
35845 -# define strdup(str) __strdup (str)
35848 -# define BINDTEXTDOMAIN libintl_bindtextdomain
35849 -# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
35852 -/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
35853 - to be used for the DOMAINNAME message catalog.
35854 - If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
35855 - modified, only the current value is returned.
35856 - If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
35857 - modified nor returned. */
35859 -set_binding_values (const char *domainname,
35860 - const char **dirnamep, const char **codesetp)
35862 - struct binding *binding;
35865 - /* Some sanity checks. */
35866 - if (domainname == NULL || domainname[0] == '\0')
35869 - *dirnamep = NULL;
35871 - *codesetp = NULL;
35875 - __libc_rwlock_wrlock (_nl_state_lock);
35879 - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
35881 - int compare = strcmp (domainname, binding->domainname);
35882 - if (compare == 0)
35883 - /* We found it! */
35887 - /* It is not in the list. */
35893 - if (binding != NULL)
35897 - const char *dirname = *dirnamep;
35899 - if (dirname == NULL)
35900 - /* The current binding has be to returned. */
35901 - *dirnamep = binding->dirname;
35904 - /* The domain is already bound. If the new value and the old
35905 - one are equal we simply do nothing. Otherwise replace the
35907 - char *result = binding->dirname;
35908 - if (strcmp (dirname, result) != 0)
35910 - if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
35911 - result = (char *) INTUSE(_nl_default_dirname);
35914 -#if defined _LIBC || defined HAVE_STRDUP
35915 - result = strdup (dirname);
35917 - size_t len = strlen (dirname) + 1;
35918 - result = (char *) malloc (len);
35919 - if (__builtin_expect (result != NULL, 1))
35920 - memcpy (result, dirname, len);
35924 - if (__builtin_expect (result != NULL, 1))
35926 - if (binding->dirname != INTUSE(_nl_default_dirname))
35927 - free (binding->dirname);
35929 - binding->dirname = result;
35933 - *dirnamep = result;
35939 - const char *codeset = *codesetp;
35941 - if (codeset == NULL)
35942 - /* The current binding has be to returned. */
35943 - *codesetp = binding->codeset;
35946 - /* The domain is already bound. If the new value and the old
35947 - one are equal we simply do nothing. Otherwise replace the
35949 - char *result = binding->codeset;
35950 - if (result == NULL || strcmp (codeset, result) != 0)
35952 -#if defined _LIBC || defined HAVE_STRDUP
35953 - result = strdup (codeset);
35955 - size_t len = strlen (codeset) + 1;
35956 - result = (char *) malloc (len);
35957 - if (__builtin_expect (result != NULL, 1))
35958 - memcpy (result, codeset, len);
35961 - if (__builtin_expect (result != NULL, 1))
35963 - if (binding->codeset != NULL)
35964 - free (binding->codeset);
35966 - binding->codeset = result;
35967 - binding->codeset_cntr++;
35971 - *codesetp = result;
35975 - else if ((dirnamep == NULL || *dirnamep == NULL)
35976 - && (codesetp == NULL || *codesetp == NULL))
35978 - /* Simply return the default values. */
35980 - *dirnamep = INTUSE(_nl_default_dirname);
35982 - *codesetp = NULL;
35986 - /* We have to create a new binding. */
35987 - size_t len = strlen (domainname) + 1;
35988 - struct binding *new_binding =
35989 - (struct binding *) malloc (offsetof (struct binding, domainname) + len);
35991 - if (__builtin_expect (new_binding == NULL, 0))
35994 - memcpy (new_binding->domainname, domainname, len);
35998 - const char *dirname = *dirnamep;
36000 - if (dirname == NULL)
36001 - /* The default value. */
36002 - dirname = INTUSE(_nl_default_dirname);
36005 - if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
36006 - dirname = INTUSE(_nl_default_dirname);
36010 -#if defined _LIBC || defined HAVE_STRDUP
36011 - result = strdup (dirname);
36012 - if (__builtin_expect (result == NULL, 0))
36013 - goto failed_dirname;
36015 - size_t len = strlen (dirname) + 1;
36016 - result = (char *) malloc (len);
36017 - if (__builtin_expect (result == NULL, 0))
36018 - goto failed_dirname;
36019 - memcpy (result, dirname, len);
36021 - dirname = result;
36024 - *dirnamep = dirname;
36025 - new_binding->dirname = (char *) dirname;
36028 - /* The default value. */
36029 - new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
36031 - new_binding->codeset_cntr = 0;
36035 - const char *codeset = *codesetp;
36037 - if (codeset != NULL)
36041 -#if defined _LIBC || defined HAVE_STRDUP
36042 - result = strdup (codeset);
36043 - if (__builtin_expect (result == NULL, 0))
36044 - goto failed_codeset;
36046 - size_t len = strlen (codeset) + 1;
36047 - result = (char *) malloc (len);
36048 - if (__builtin_expect (result == NULL, 0))
36049 - goto failed_codeset;
36050 - memcpy (result, codeset, len);
36052 - codeset = result;
36053 - new_binding->codeset_cntr++;
36055 - *codesetp = codeset;
36056 - new_binding->codeset = (char *) codeset;
36059 - new_binding->codeset = NULL;
36061 - /* Now enqueue it. */
36062 - if (_nl_domain_bindings == NULL
36063 - || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
36065 - new_binding->next = _nl_domain_bindings;
36066 - _nl_domain_bindings = new_binding;
36070 - binding = _nl_domain_bindings;
36071 - while (binding->next != NULL
36072 - && strcmp (domainname, binding->next->domainname) > 0)
36073 - binding = binding->next;
36075 - new_binding->next = binding->next;
36076 - binding->next = new_binding;
36081 - /* Here we deal with memory allocation failures. */
36085 - if (new_binding->dirname != INTUSE(_nl_default_dirname))
36086 - free (new_binding->dirname);
36088 - free (new_binding);
36091 - *dirnamep = NULL;
36093 - *codesetp = NULL;
36097 - /* If we modified any binding, we flush the caches. */
36099 - ++_nl_msg_cat_cntr;
36101 - __libc_rwlock_unlock (_nl_state_lock);
36104 -/* Specify that the DOMAINNAME message catalog will be found
36105 - in DIRNAME rather than in the system locale data base. */
36107 -BINDTEXTDOMAIN (const char *domainname, const char *dirname)
36109 - set_binding_values (domainname, &dirname, NULL);
36110 - return (char *) dirname;
36113 -/* Specify the character encoding in which the messages from the
36114 - DOMAINNAME message catalog will be returned. */
36116 -BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
36118 - set_binding_values (domainname, NULL, &codeset);
36119 - return (char *) codeset;
36123 -/* Aliases for function names in GNU C Library. */
36124 -weak_alias (__bindtextdomain, bindtextdomain);
36125 -weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
36127 diff -urN BUILD/abook-0.6.0pre2/intl/ChangeLog abook/intl/ChangeLog
36128 --- BUILD/abook-0.6.0pre2/intl/ChangeLog 2005-09-17 12:10:26.000000000 +0200
36129 +++ abook/intl/ChangeLog 1970-01-01 01:00:00.000000000 +0100
36131 -2005-04-11 GNU <bug-gnu-gettext@gnu.org>
36133 - * Version 0.14.4 released.
36135 diff -urN BUILD/abook-0.6.0pre2/intl/config.charset abook/intl/config.charset
36136 --- BUILD/abook-0.6.0pre2/intl/config.charset 2005-09-17 12:10:26.000000000 +0200
36137 +++ abook/intl/config.charset 1970-01-01 01:00:00.000000000 +0100
36140 -# Output a system dependent table of character encoding aliases.
36142 -# Copyright (C) 2000-2004 Free Software Foundation, Inc.
36144 -# This program is free software; you can redistribute it and/or modify it
36145 -# under the terms of the GNU Library General Public License as published
36146 -# by the Free Software Foundation; either version 2, or (at your option)
36147 -# any later version.
36149 -# This program is distributed in the hope that it will be useful,
36150 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
36151 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
36152 -# Library General Public License for more details.
36154 -# You should have received a copy of the GNU Library General Public
36155 -# License along with this program; if not, write to the Free Software
36156 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
36159 -# The table consists of lines of the form
36162 -# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
36163 -# ALIAS is compared in a case sensitive way.
36165 -# CANONICAL is the GNU canonical name for this character encoding.
36166 -# It must be an encoding supported by libiconv. Support by GNU libc is
36167 -# also desirable. CANONICAL is case insensitive. Usually an upper case
36168 -# MIME charset name is preferred.
36169 -# The current list of GNU canonical charset names is as follows.
36171 -# name MIME? used by which systems
36172 -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
36173 -# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
36174 -# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
36175 -# ISO-8859-3 Y glibc solaris
36176 -# ISO-8859-4 Y osf solaris freebsd darwin
36177 -# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
36178 -# ISO-8859-6 Y glibc aix hpux solaris
36179 -# ISO-8859-7 Y glibc aix hpux irix osf solaris darwin
36180 -# ISO-8859-8 Y glibc aix hpux osf solaris
36181 -# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin
36182 -# ISO-8859-13 glibc darwin
36183 -# ISO-8859-14 glibc
36184 -# ISO-8859-15 glibc aix osf solaris freebsd darwin
36185 -# KOI8-R Y glibc solaris freebsd darwin
36186 -# KOI8-U Y glibc freebsd darwin
36190 -# CP850 aix osf dos
36199 -# CP866 freebsd darwin dos
36203 -# CP932 aix woe32 dos
36205 -# CP949 osf woe32 dos
36212 -# CP1251 glibc solaris darwin woe32
36213 -# CP1252 aix woe32
36216 -# CP1255 glibc woe32
36219 -# GB2312 Y glibc aix hpux irix solaris freebsd darwin
36220 -# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
36221 -# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
36222 -# EUC-TW glibc aix hpux irix osf solaris
36223 -# BIG5 Y glibc aix hpux osf solaris freebsd darwin
36224 -# BIG5-HKSCS glibc solaris
36225 -# GBK glibc aix osf solaris woe32 dos
36226 -# GB18030 glibc solaris
36227 -# SHIFT_JIS Y hpux osf solaris freebsd darwin
36228 -# JOHAB glibc solaris woe32
36229 -# TIS-620 glibc aix hpux osf solaris
36231 -# TCVN5712-1 glibc
36232 -# GEORGIAN-PS glibc
36237 -# HP-TURKISH8 hpux
36241 -# UTF-8 Y glibc aix hpux osf solaris darwin
36243 -# Note: Names which are not marked as being a MIME name should not be used in
36244 -# Internet protocols for information interchange (mail, news, etc.).
36246 -# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
36247 -# must understand both names and treat them as equivalent.
36249 -# The first argument passed to this file is the canonical host specification,
36250 -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
36252 -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
36255 -os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
36256 -echo "# This file contains a table of character encoding aliases,"
36257 -echo "# suitable for operating system '${os}'."
36258 -echo "# It was automatically generated from config.charset."
36259 -# List of references, updated during installation:
36260 -echo "# Packages using this file: "
36263 - # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
36264 - # localcharset.c falls back to using the full locale name
36265 - # from the environment variables.
36267 - echo "POSIX ASCII"
36268 - for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
36269 - en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
36270 - en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
36271 - es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
36272 - et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
36273 - fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
36274 - it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
36276 - echo "$l ISO-8859-1"
36277 - echo "$l.iso-8859-1 ISO-8859-1"
36278 - echo "$l.iso-8859-15 ISO-8859-15"
36279 - echo "$l.iso-8859-15@euro ISO-8859-15"
36280 - echo "$l@euro ISO-8859-15"
36281 - echo "$l.cp-437 CP437"
36282 - echo "$l.cp-850 CP850"
36283 - echo "$l.cp-1252 CP1252"
36284 - echo "$l.cp-1252@euro CP1252"
36285 - #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
36286 - echo "$l.utf-8 UTF-8"
36287 - echo "$l.utf-8@euro UTF-8"
36289 - for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
36290 - sl_SI sr sr_CS sr_YU; do
36291 - echo "$l ISO-8859-2"
36292 - echo "$l.iso-8859-2 ISO-8859-2"
36293 - echo "$l.cp-852 CP852"
36294 - echo "$l.cp-1250 CP1250"
36295 - echo "$l.utf-8 UTF-8"
36297 - for l in mk mk_MK ru ru_RU; do
36298 - echo "$l ISO-8859-5"
36299 - echo "$l.iso-8859-5 ISO-8859-5"
36300 - echo "$l.koi8-r KOI8-R"
36301 - echo "$l.cp-866 CP866"
36302 - echo "$l.cp-1251 CP1251"
36303 - echo "$l.utf-8 UTF-8"
36305 - for l in ar ar_SA; do
36306 - echo "$l ISO-8859-6"
36307 - echo "$l.iso-8859-6 ISO-8859-6"
36308 - echo "$l.cp-864 CP864"
36309 - #echo "$l.cp-868 CP868" # not a commonly used encoding
36310 - echo "$l.cp-1256 CP1256"
36311 - echo "$l.utf-8 UTF-8"
36313 - for l in el el_GR gr gr_GR; do
36314 - echo "$l ISO-8859-7"
36315 - echo "$l.iso-8859-7 ISO-8859-7"
36316 - echo "$l.cp-869 CP869"
36317 - echo "$l.cp-1253 CP1253"
36318 - echo "$l.cp-1253@euro CP1253"
36319 - echo "$l.utf-8 UTF-8"
36320 - echo "$l.utf-8@euro UTF-8"
36322 - for l in he he_IL iw iw_IL; do
36323 - echo "$l ISO-8859-8"
36324 - echo "$l.iso-8859-8 ISO-8859-8"
36325 - echo "$l.cp-862 CP862"
36326 - echo "$l.cp-1255 CP1255"
36327 - echo "$l.utf-8 UTF-8"
36329 - for l in tr tr_TR; do
36330 - echo "$l ISO-8859-9"
36331 - echo "$l.iso-8859-9 ISO-8859-9"
36332 - echo "$l.cp-857 CP857"
36333 - echo "$l.cp-1254 CP1254"
36334 - echo "$l.utf-8 UTF-8"
36336 - for l in lt lt_LT lv lv_LV; do
36337 - #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
36338 - echo "$l ISO-8859-13"
36340 - for l in ru_UA uk uk_UA; do
36343 - for l in zh zh_CN; do
36344 - #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
36347 - for l in ja ja_JP ja_JP.EUC; do
36350 - for l in ko ko_KR; do
36353 - for l in th th_TH; do
36354 - echo "$l TIS-620"
36356 - for l in fa fa_IR; do
36357 - #echo "$l ISIRI-3342" # a broken encoding
36358 - echo "$l.utf-8 UTF-8"
36362 - # With glibc-2.1 or newer, we don't need any canonicalization,
36363 - # because glibc has iconv and both glibc and libiconv support all
36364 - # GNU canonical names directly. Therefore, the Makefile does not
36365 - # need to install the alias file at all.
36366 - # The following applies only to glibc-2.0.x and older libcs.
36367 - echo "ISO_646.IRV:1983 ASCII"
36370 - echo "ISO8859-1 ISO-8859-1"
36371 - echo "ISO8859-2 ISO-8859-2"
36372 - echo "ISO8859-5 ISO-8859-5"
36373 - echo "ISO8859-6 ISO-8859-6"
36374 - echo "ISO8859-7 ISO-8859-7"
36375 - echo "ISO8859-8 ISO-8859-8"
36376 - echo "ISO8859-9 ISO-8859-9"
36377 - echo "ISO8859-15 ISO-8859-15"
36378 - echo "IBM-850 CP850"
36379 - echo "IBM-856 CP856"
36380 - echo "IBM-921 ISO-8859-13"
36381 - echo "IBM-922 CP922"
36382 - echo "IBM-932 CP932"
36383 - echo "IBM-943 CP943"
36384 - echo "IBM-1046 CP1046"
36385 - echo "IBM-1124 CP1124"
36386 - echo "IBM-1129 CP1129"
36387 - echo "IBM-1252 CP1252"
36388 - echo "IBM-eucCN GB2312"
36389 - echo "IBM-eucJP EUC-JP"
36390 - echo "IBM-eucKR EUC-KR"
36391 - echo "IBM-eucTW EUC-TW"
36394 - echo "TIS-620 TIS-620"
36395 - echo "UTF-8 UTF-8"
36398 - echo "iso88591 ISO-8859-1"
36399 - echo "iso88592 ISO-8859-2"
36400 - echo "iso88595 ISO-8859-5"
36401 - echo "iso88596 ISO-8859-6"
36402 - echo "iso88597 ISO-8859-7"
36403 - echo "iso88598 ISO-8859-8"
36404 - echo "iso88599 ISO-8859-9"
36405 - echo "iso885915 ISO-8859-15"
36406 - echo "roman8 HP-ROMAN8"
36407 - echo "arabic8 HP-ARABIC8"
36408 - echo "greek8 HP-GREEK8"
36409 - echo "hebrew8 HP-HEBREW8"
36410 - echo "turkish8 HP-TURKISH8"
36411 - echo "kana8 HP-KANA8"
36412 - echo "tis620 TIS-620"
36414 - echo "eucJP EUC-JP"
36415 - echo "eucKR EUC-KR"
36416 - echo "eucTW EUC-TW"
36417 - echo "hp15CN GB2312"
36418 - #echo "ccdc ?" # what is this?
36419 - echo "SJIS SHIFT_JIS"
36420 - echo "utf8 UTF-8"
36423 - echo "ISO8859-1 ISO-8859-1"
36424 - echo "ISO8859-2 ISO-8859-2"
36425 - echo "ISO8859-5 ISO-8859-5"
36426 - echo "ISO8859-7 ISO-8859-7"
36427 - echo "ISO8859-9 ISO-8859-9"
36428 - echo "eucCN GB2312"
36429 - echo "eucJP EUC-JP"
36430 - echo "eucKR EUC-KR"
36431 - echo "eucTW EUC-TW"
36434 - echo "ISO8859-1 ISO-8859-1"
36435 - echo "ISO8859-2 ISO-8859-2"
36436 - echo "ISO8859-4 ISO-8859-4"
36437 - echo "ISO8859-5 ISO-8859-5"
36438 - echo "ISO8859-7 ISO-8859-7"
36439 - echo "ISO8859-8 ISO-8859-8"
36440 - echo "ISO8859-9 ISO-8859-9"
36441 - echo "ISO8859-15 ISO-8859-15"
36442 - echo "cp850 CP850"
36444 - echo "dechanyu DEC-HANYU"
36445 - echo "dechanzi GB2312"
36446 - echo "deckanji DEC-KANJI"
36447 - echo "deckorean EUC-KR"
36448 - echo "eucJP EUC-JP"
36449 - echo "eucKR EUC-KR"
36450 - echo "eucTW EUC-TW"
36452 - echo "KSC5601 CP949"
36453 - echo "sdeckanji EUC-JP"
36454 - echo "SJIS SHIFT_JIS"
36455 - echo "TACTIS TIS-620"
36456 - echo "UTF-8 UTF-8"
36460 - echo "ISO8859-1 ISO-8859-1"
36461 - echo "ISO8859-2 ISO-8859-2"
36462 - echo "ISO8859-3 ISO-8859-3"
36463 - echo "ISO8859-4 ISO-8859-4"
36464 - echo "ISO8859-5 ISO-8859-5"
36465 - echo "ISO8859-6 ISO-8859-6"
36466 - echo "ISO8859-7 ISO-8859-7"
36467 - echo "ISO8859-8 ISO-8859-8"
36468 - echo "ISO8859-9 ISO-8859-9"
36469 - echo "ISO8859-15 ISO-8859-15"
36470 - echo "koi8-r KOI8-R"
36471 - echo "ansi-1251 CP1251"
36473 - echo "Big5-HKSCS BIG5-HKSCS"
36474 - echo "gb2312 GB2312"
36476 - echo "GB18030 GB18030"
36477 - echo "cns11643 EUC-TW"
36478 - echo "5601 EUC-KR"
36479 - echo "ko_KR.johap92 JOHAB"
36480 - echo "eucJP EUC-JP"
36481 - echo "PCK SHIFT_JIS"
36482 - echo "TIS620.2533 TIS-620"
36483 - #echo "sun_eu_greek ?" # what is this?
36484 - echo "UTF-8 UTF-8"
36487 - # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
36488 - # localcharset.c falls back to using the full locale name
36489 - # from the environment variables.
36490 - # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
36491 - # reuse FreeBSD's locale data for OS/2.
36493 - echo "US-ASCII ASCII"
36494 - for l in la_LN lt_LN; do
36495 - echo "$l.ASCII ASCII"
36497 - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
36498 - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
36499 - lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
36500 - echo "$l.ISO_8859-1 ISO-8859-1"
36501 - echo "$l.DIS_8859-15 ISO-8859-15"
36503 - for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
36504 - echo "$l.ISO_8859-2 ISO-8859-2"
36506 - for l in la_LN lt_LT; do
36507 - echo "$l.ISO_8859-4 ISO-8859-4"
36509 - for l in ru_RU ru_SU; do
36510 - echo "$l.KOI8-R KOI8-R"
36511 - echo "$l.ISO_8859-5 ISO-8859-5"
36512 - echo "$l.CP866 CP866"
36514 - echo "uk_UA.KOI8-U KOI8-U"
36515 - echo "zh_TW.BIG5 BIG5"
36516 - echo "zh_TW.Big5 BIG5"
36517 - echo "zh_CN.EUC GB2312"
36518 - echo "ja_JP.EUC EUC-JP"
36519 - echo "ja_JP.SJIS SHIFT_JIS"
36520 - echo "ja_JP.Shift_JIS SHIFT_JIS"
36521 - echo "ko_KR.EUC EUC-KR"
36525 - echo "ISO8859-1 ISO-8859-1"
36526 - echo "ISO8859-2 ISO-8859-2"
36527 - echo "ISO8859-4 ISO-8859-4"
36528 - echo "ISO8859-5 ISO-8859-5"
36529 - echo "ISO8859-15 ISO-8859-15"
36530 - echo "eucCN GB2312"
36531 - echo "eucJP EUC-JP"
36532 - echo "eucKR EUC-KR"
36533 - echo "eucTW EUC-TW"
36535 - echo "SJIS SHIFT_JIS"
36538 - # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
36539 - # localcharset.c falls back to using the full locale name
36540 - # from the environment variables.
36542 - for l in en_AU en_CA en_GB en_US la_LN; do
36543 - echo "$l.US-ASCII ASCII"
36545 - for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
36546 - fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
36547 - nl_NL no_NO pt_PT sv_SE; do
36548 - echo "$l ISO-8859-1"
36549 - echo "$l.ISO8859-1 ISO-8859-1"
36550 - echo "$l.ISO8859-15 ISO-8859-15"
36552 - for l in la_LN; do
36553 - echo "$l.ISO8859-1 ISO-8859-1"
36554 - echo "$l.ISO8859-15 ISO-8859-15"
36556 - for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
36557 - echo "$l.ISO8859-2 ISO-8859-2"
36559 - for l in la_LN lt_LT; do
36560 - echo "$l.ISO8859-4 ISO-8859-4"
36562 - for l in ru_RU; do
36563 - echo "$l.KOI8-R KOI8-R"
36564 - echo "$l.ISO8859-5 ISO-8859-5"
36565 - echo "$l.CP866 CP866"
36567 - for l in bg_BG; do
36568 - echo "$l.CP1251 CP1251"
36570 - echo "uk_UA.KOI8-U KOI8-U"
36571 - echo "zh_TW.BIG5 BIG5"
36572 - echo "zh_TW.Big5 BIG5"
36573 - echo "zh_CN.EUC GB2312"
36574 - echo "ja_JP.EUC EUC-JP"
36575 - echo "ja_JP.SJIS SHIFT_JIS"
36576 - echo "ko_KR.EUC EUC-KR"
36579 - # Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
36580 - # - It returns the empty string when LANG is set to a locale of the
36581 - # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
36583 - # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
36584 - # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
36585 - # - The documentation says:
36586 - # "... all code that calls BSD system routines should ensure
36587 - # that the const *char parameters of these routines are in UTF-8
36588 - # encoding. All BSD system functions expect their string
36589 - # parameters to be in UTF-8 encoding and nothing else."
36591 - # "An additional caveat is that string parameters for files,
36592 - # paths, and other file-system entities must be in canonical
36593 - # UTF-8. In a canonical UTF-8 Unicode string, all decomposable
36594 - # characters are decomposed ..."
36595 - # but this is not true: You can pass non-decomposed UTF-8 strings
36596 - # to file system functions, and it is the OS which will convert
36597 - # them to decomposed UTF-8 before accessing the file system.
36598 - # - The Apple Terminal application displays UTF-8 by default.
36599 - # - However, other applications are free to use different encodings:
36600 - # - xterm uses ISO-8859-1 by default.
36601 - # - TextEdit uses MacRoman by default.
36602 - # We prefer UTF-8 over decomposed UTF-8-MAC because one should
36603 - # minimize the use of decomposed Unicode. Unfortunately, through the
36604 - # Darwin file system, decomposed UTF-8 strings are leaked into user
36605 - # space nevertheless.
36609 - # BeOS has a single locale, and it has UTF-8 encoding.
36613 - # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
36614 - # localcharset.c falls back to using the full locale name
36615 - # from the environment variables.
36617 - echo "# The encodings given here may not all be correct."
36618 - echo "# If you find that the encoding given for your language and"
36619 - echo "# country is not the one your DOS machine actually uses, just"
36620 - echo "# correct it in this file, and send a mail to"
36621 - echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
36622 - echo "# and Bruno Haible <bruno@clisp.org>."
36625 - # ISO-8859-1 languages
36627 - echo "ca_ES CP850"
36628 - echo "da CP865" # not CP850 ??
36629 - echo "da_DK CP865" # not CP850 ??
36631 - echo "de_AT CP850"
36632 - echo "de_CH CP850"
36633 - echo "de_DE CP850"
36635 - echo "en_AU CP850" # not CP437 ??
36636 - echo "en_CA CP850"
36637 - echo "en_GB CP850"
36638 - echo "en_NZ CP437"
36639 - echo "en_US CP437"
36640 - echo "en_ZA CP850" # not CP437 ??
36642 - echo "es_AR CP850"
36643 - echo "es_BO CP850"
36644 - echo "es_CL CP850"
36645 - echo "es_CO CP850"
36646 - echo "es_CR CP850"
36647 - echo "es_CU CP850"
36648 - echo "es_DO CP850"
36649 - echo "es_EC CP850"
36650 - echo "es_ES CP850"
36651 - echo "es_GT CP850"
36652 - echo "es_HN CP850"
36653 - echo "es_MX CP850"
36654 - echo "es_NI CP850"
36655 - echo "es_PA CP850"
36656 - echo "es_PY CP850"
36657 - echo "es_PE CP850"
36658 - echo "es_SV CP850"
36659 - echo "es_UY CP850"
36660 - echo "es_VE CP850"
36662 - echo "et_EE CP850"
36664 - echo "eu_ES CP850"
36666 - echo "fi_FI CP850"
36668 - echo "fr_BE CP850"
36669 - echo "fr_CA CP850"
36670 - echo "fr_CH CP850"
36671 - echo "fr_FR CP850"
36673 - echo "ga_IE CP850"
36675 - echo "gd_GB CP850"
36677 - echo "gl_ES CP850"
36678 - echo "id CP850" # not CP437 ??
36679 - echo "id_ID CP850" # not CP437 ??
36680 - echo "is CP861" # not CP850 ??
36681 - echo "is_IS CP861" # not CP850 ??
36683 - echo "it_CH CP850"
36684 - echo "it_IT CP850"
36686 - echo "lt_LT CP775"
36688 - echo "lv_LV CP775"
36689 - echo "nb CP865" # not CP850 ??
36690 - echo "nb_NO CP865" # not CP850 ??
36692 - echo "nl_BE CP850"
36693 - echo "nl_NL CP850"
36694 - echo "nn CP865" # not CP850 ??
36695 - echo "nn_NO CP865" # not CP850 ??
36696 - echo "no CP865" # not CP850 ??
36697 - echo "no_NO CP865" # not CP850 ??
36699 - echo "pt_BR CP850"
36700 - echo "pt_PT CP850"
36702 - echo "sv_SE CP850"
36703 - # ISO-8859-2 languages
36705 - echo "cs_CZ CP852"
36707 - echo "hr_HR CP852"
36709 - echo "hu_HU CP852"
36711 - echo "pl_PL CP852"
36713 - echo "ro_RO CP852"
36715 - echo "sk_SK CP852"
36717 - echo "sl_SI CP852"
36719 - echo "sq_AL CP852"
36720 - echo "sr CP852" # CP852 or CP866 or CP855 ??
36721 - echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
36722 - echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
36723 - # ISO-8859-3 languages
36725 - echo "mt_MT CP850"
36726 - # ISO-8859-5 languages
36728 - echo "be_BE CP866"
36729 - echo "bg CP866" # not CP855 ??
36730 - echo "bg_BG CP866" # not CP855 ??
36731 - echo "mk CP866" # not CP855 ??
36732 - echo "mk_MK CP866" # not CP855 ??
36734 - echo "ru_RU CP866"
36736 - echo "uk_UA CP1125"
36737 - # ISO-8859-6 languages
36739 - echo "ar_AE CP864"
36740 - echo "ar_DZ CP864"
36741 - echo "ar_EG CP864"
36742 - echo "ar_IQ CP864"
36743 - echo "ar_IR CP864"
36744 - echo "ar_JO CP864"
36745 - echo "ar_KW CP864"
36746 - echo "ar_MA CP864"
36747 - echo "ar_OM CP864"
36748 - echo "ar_QA CP864"
36749 - echo "ar_SA CP864"
36750 - echo "ar_SY CP864"
36751 - # ISO-8859-7 languages
36753 - echo "el_GR CP869"
36754 - # ISO-8859-8 languages
36756 - echo "he_IL CP862"
36757 - # ISO-8859-9 languages
36759 - echo "tr_TR CP857"
36762 - echo "ja_JP CP932"
36765 - echo "zh_TW CP950" # not CP938 ??
36767 - echo "kr CP949" # not CP934 ??
36768 - echo "kr_KR CP949" # not CP934 ??
36771 - echo "th_TH CP874"
36774 - echo "eo_EO CP850"
36777 diff -urN BUILD/abook-0.6.0pre2/intl/dcgettext.c abook/intl/dcgettext.c
36778 --- BUILD/abook-0.6.0pre2/intl/dcgettext.c 2005-09-17 12:10:26.000000000 +0200
36779 +++ abook/intl/dcgettext.c 1970-01-01 01:00:00.000000000 +0100
36781 -/* Implementation of the dcgettext(3) function.
36782 - Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
36784 - This program is free software; you can redistribute it and/or modify it
36785 - under the terms of the GNU Library General Public License as published
36786 - by the Free Software Foundation; either version 2, or (at your option)
36787 - any later version.
36789 - This program is distributed in the hope that it will be useful,
36790 - but WITHOUT ANY WARRANTY; without even the implied warranty of
36791 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
36792 - Library General Public License for more details.
36794 - You should have received a copy of the GNU Library General Public
36795 - License along with this program; if not, write to the Free Software
36796 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
36799 -#ifdef HAVE_CONFIG_H
36800 -# include <config.h>
36803 -#include "gettextP.h"
36805 -# include <libintl.h>
36807 -# include "libgnuintl.h"
36810 -/* @@ end of prolog @@ */
36812 -/* Names for the libintl functions are a problem. They must not clash
36813 - with existing names and they should follow ANSI C. But this source
36814 - code is also used in GNU C Library where the names have a __
36815 - prefix. So we have to make a difference here. */
36817 -# define DCGETTEXT __dcgettext
36818 -# define DCIGETTEXT __dcigettext
36820 -# define DCGETTEXT libintl_dcgettext
36821 -# define DCIGETTEXT libintl_dcigettext
36824 -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
36827 -DCGETTEXT (const char *domainname, const char *msgid, int category)
36829 - return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
36833 -/* Alias for function name in GNU C Library. */
36834 -INTDEF(__dcgettext)
36835 -weak_alias (__dcgettext, dcgettext);
36837 diff -urN BUILD/abook-0.6.0pre2/intl/dcigettext.c abook/intl/dcigettext.c
36838 --- BUILD/abook-0.6.0pre2/intl/dcigettext.c 2005-09-17 12:10:26.000000000 +0200
36839 +++ abook/intl/dcigettext.c 1970-01-01 01:00:00.000000000 +0100
36841 -/* Implementation of the internal dcigettext function.
36842 - Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
36844 - This program is free software; you can redistribute it and/or modify it
36845 - under the terms of the GNU Library General Public License as published
36846 - by the Free Software Foundation; either version 2, or (at your option)
36847 - any later version.
36849 - This program is distributed in the hope that it will be useful,
36850 - but WITHOUT ANY WARRANTY; without even the implied warranty of
36851 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
36852 - Library General Public License for more details.
36854 - You should have received a copy of the GNU Library General Public
36855 - License along with this program; if not, write to the Free Software
36856 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
36859 -/* Tell glibc's <string.h> to provide a prototype for mempcpy().
36860 - This must come before <config.h> because <config.h> may include
36861 - <features.h>, and once <features.h> has been included, it's too late. */
36862 -#ifndef _GNU_SOURCE
36863 -# define _GNU_SOURCE 1
36866 -#ifdef HAVE_CONFIG_H
36867 -# include <config.h>
36870 -#include <sys/types.h>
36873 -# define alloca __builtin_alloca
36874 -# define HAVE_ALLOCA 1
36877 -# include <malloc.h>
36878 -# define alloca _alloca
36880 -# if defined HAVE_ALLOCA_H || defined _LIBC
36881 -# include <alloca.h>
36894 -#include <errno.h>
36898 -#ifndef __set_errno
36899 -# define __set_errno(val) errno = (val)
36902 -#include <stddef.h>
36903 -#include <stdlib.h>
36904 -#include <string.h>
36906 -#if defined HAVE_UNISTD_H || defined _LIBC
36907 -# include <unistd.h>
36910 -#include <locale.h>
36913 - /* Guess whether integer division by zero raises signal SIGFPE.
36914 - Set to 1 only if you know for sure. In case of doubt, set to 0. */
36915 -# if defined __alpha__ || defined __arm__ || defined __i386__ \
36916 - || defined __m68k__ || defined __s390__
36917 -# define INTDIV0_RAISES_SIGFPE 1
36919 -# define INTDIV0_RAISES_SIGFPE 0
36922 -#if !INTDIV0_RAISES_SIGFPE
36923 -# include <signal.h>
36926 -#if defined HAVE_SYS_PARAM_H || defined _LIBC
36927 -# include <sys/param.h>
36930 -#include "gettextP.h"
36931 -#include "plural-exp.h"
36933 -# include <libintl.h>
36935 -# include "libgnuintl.h"
36937 -#include "hash-string.h"
36939 -/* Thread safetyness. */
36941 -# include <bits/libc-lock.h>
36943 -/* Provide dummy implementation if this is outside glibc. */
36944 -# define __libc_lock_define_initialized(CLASS, NAME)
36945 -# define __libc_lock_lock(NAME)
36946 -# define __libc_lock_unlock(NAME)
36947 -# define __libc_rwlock_define_initialized(CLASS, NAME)
36948 -# define __libc_rwlock_rdlock(NAME)
36949 -# define __libc_rwlock_unlock(NAME)
36952 -/* Alignment of types. */
36953 -#if defined __GNUC__ && __GNUC__ >= 2
36954 -# define alignof(TYPE) __alignof__ (TYPE)
36956 -# define alignof(TYPE) \
36957 - ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
36960 -/* The internal variables in the standalone libintl.a must have different
36961 - names than the internal variables in GNU libc, otherwise programs
36962 - using libintl.a cannot be linked statically. */
36963 -#if !defined _LIBC
36964 -# define _nl_default_default_domain libintl_nl_default_default_domain
36965 -# define _nl_current_default_domain libintl_nl_current_default_domain
36966 -# define _nl_default_dirname libintl_nl_default_dirname
36967 -# define _nl_domain_bindings libintl_nl_domain_bindings
36970 -/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
36972 -# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
36975 -/* @@ end of prolog @@ */
36978 -/* Rename the non ANSI C functions. This is required by the standard
36979 - because some ANSI C functions will require linking with this object
36980 - file and the name space must not be polluted. */
36981 -# define getcwd __getcwd
36983 -# define stpcpy __stpcpy
36985 -# define tfind __tfind
36987 -# if !defined HAVE_GETCWD
36989 -# define getcwd(buf, max) getwd (buf)
36992 -# define getcwd(buf, max) (getcwd) (buf, max, 0)
36997 -# ifndef HAVE_STPCPY
36998 -static char *stpcpy (char *dest, const char *src);
37000 -# ifndef HAVE_MEMPCPY
37001 -static void *mempcpy (void *dest, const void *src, size_t n);
37005 -/* Amount to increase buffer size by in each try. */
37006 -#define PATH_INCR 32
37008 -/* The following is from pathmax.h. */
37009 -/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
37010 - PATH_MAX but might cause redefinition warnings when sys/param.h is
37011 - later included (as on MORE/BSD 4.3). */
37012 -#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
37013 -# include <limits.h>
37016 -#ifndef _POSIX_PATH_MAX
37017 -# define _POSIX_PATH_MAX 255
37020 -#if !defined PATH_MAX && defined _PC_PATH_MAX
37021 -# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
37024 -/* Don't include sys/param.h if it already has been. */
37025 -#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
37026 -# include <sys/param.h>
37029 -#if !defined PATH_MAX && defined MAXPATHLEN
37030 -# define PATH_MAX MAXPATHLEN
37034 -# define PATH_MAX _POSIX_PATH_MAX
37037 -/* Pathname support.
37038 - ISSLASH(C) tests whether C is a directory separator character.
37039 - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
37040 - it may be concatenated to a directory pathname.
37041 - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
37043 -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
37044 - /* Win32, Cygwin, OS/2, DOS */
37045 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
37046 -# define HAS_DEVICE(P) \
37047 - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
37048 - && (P)[1] == ':')
37049 -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
37050 -# define IS_PATH_WITH_DIR(P) \
37051 - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
37054 -# define ISSLASH(C) ((C) == '/')
37055 -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
37056 -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
37059 -/* This is the type used for the search tree where known translations
37061 -struct known_translation_t
37063 - /* Domain in which to search. */
37064 - char *domainname;
37066 - /* The category. */
37069 - /* State of the catalog counter at the point the string was found. */
37072 - /* Catalog where the string was found. */
37073 - struct loaded_l10nfile *domain;
37075 - /* And finally the translation. */
37076 - const char *translation;
37077 - size_t translation_length;
37079 - /* Pointer to the string in question. */
37080 - char msgid[ZERO];
37083 -/* Root of the search tree with known translations. We can use this
37084 - only if the system provides the `tsearch' function family. */
37085 -#if defined HAVE_TSEARCH || defined _LIBC
37086 -# include <search.h>
37088 -static void *root;
37091 -# define tsearch __tsearch
37094 -/* Function to compare two entries in the table of known translations. */
37096 -transcmp (const void *p1, const void *p2)
37098 - const struct known_translation_t *s1;
37099 - const struct known_translation_t *s2;
37102 - s1 = (const struct known_translation_t *) p1;
37103 - s2 = (const struct known_translation_t *) p2;
37105 - result = strcmp (s1->msgid, s2->msgid);
37108 - result = strcmp (s1->domainname, s2->domainname);
37110 - /* We compare the category last (though this is the cheapest
37111 - operation) since it is hopefully always the same (namely
37113 - result = s1->category - s2->category;
37121 -# define INTVARDEF(name)
37124 -# define INTUSE(name) name
37127 -/* Name of the default domain used for gettext(3) prior any call to
37128 - textdomain(3). The default value for this is "messages". */
37129 -const char _nl_default_default_domain[] attribute_hidden = "messages";
37131 -/* Value used as the default domain for gettext(3). */
37132 -const char *_nl_current_default_domain attribute_hidden
37133 - = _nl_default_default_domain;
37135 -/* Contains the default location of the message catalogs. */
37136 -#if defined __EMX__
37137 -extern const char _nl_default_dirname[];
37139 -const char _nl_default_dirname[] = LOCALEDIR;
37140 -INTVARDEF (_nl_default_dirname)
37143 -/* List with bindings of specific domains created by bindtextdomain()
37145 -struct binding *_nl_domain_bindings;
37147 -/* Prototypes for local functions. */
37148 -static char *plural_lookup (struct loaded_l10nfile *domain,
37149 - unsigned long int n,
37150 - const char *translation, size_t translation_len)
37151 - internal_function;
37152 -static const char *guess_category_value (int category,
37153 - const char *categoryname)
37154 - internal_function;
37156 -# include "../locale/localeinfo.h"
37157 -# define category_to_name(category) _nl_category_names[category]
37159 -static const char *category_to_name (int category) internal_function;
37163 -/* For those loosing systems which don't have `alloca' we have to add
37164 - some additional code emulating it. */
37165 -#ifdef HAVE_ALLOCA
37166 -/* Nothing has to be done. */
37167 -# define freea(p) /* nothing */
37168 -# define ADD_BLOCK(list, address) /* nothing */
37169 -# define FREE_BLOCKS(list) /* nothing */
37174 - struct block_list *next;
37176 -# define ADD_BLOCK(list, addr) \
37178 - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
37179 - /* If we cannot get a free block we cannot add the new element to \
37181 - if (newp != NULL) { \
37182 - newp->address = (addr); \
37183 - newp->next = (list); \
37187 -# define FREE_BLOCKS(list) \
37189 - while (list != NULL) { \
37190 - struct block_list *old = list; \
37191 - list = list->next; \
37192 - free (old->address); \
37197 -# define alloca(size) (malloc (size))
37198 -# define freea(p) free (p)
37199 -#endif /* have alloca */
37203 -/* List of blocks allocated for translations. */
37204 -typedef struct transmem_list
37206 - struct transmem_list *next;
37208 -} transmem_block_t;
37209 -static struct transmem_list *transmem_list;
37211 -typedef unsigned char transmem_block_t;
37215 -/* Names for the libintl functions are a problem. They must not clash
37216 - with existing names and they should follow ANSI C. But this source
37217 - code is also used in GNU C Library where the names have a __
37218 - prefix. So we have to make a difference here. */
37220 -# define DCIGETTEXT __dcigettext
37222 -# define DCIGETTEXT libintl_dcigettext
37225 -/* Lock variable to protect the global data in the gettext implementation. */
37227 -__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
37230 -/* Checking whether the binaries runs SUID must be done and glibc provides
37231 - easier methods therefore we make a difference here. */
37233 -# define ENABLE_SECURE __libc_enable_secure
37234 -# define DETERMINE_SECURE
37236 -# ifndef HAVE_GETUID
37237 -# define getuid() 0
37239 -# ifndef HAVE_GETGID
37240 -# define getgid() 0
37242 -# ifndef HAVE_GETEUID
37243 -# define geteuid() getuid()
37245 -# ifndef HAVE_GETEGID
37246 -# define getegid() getgid()
37248 -static int enable_secure;
37249 -# define ENABLE_SECURE (enable_secure == 1)
37250 -# define DETERMINE_SECURE \
37251 - if (enable_secure == 0) \
37253 - if (getuid () != geteuid () || getgid () != getegid ()) \
37254 - enable_secure = 1; \
37256 - enable_secure = -1; \
37260 -/* Get the function to evaluate the plural expression. */
37261 -#include "eval-plural.h"
37263 -/* Look up MSGID in the DOMAINNAME message catalog for the current
37264 - CATEGORY locale and, if PLURAL is nonzero, search over string
37265 - depending on the plural form determined by N. */
37267 -DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
37268 - int plural, unsigned long int n, int category)
37270 -#ifndef HAVE_ALLOCA
37271 - struct block_list *block_list = NULL;
37273 - struct loaded_l10nfile *domain;
37274 - struct binding *binding;
37275 - const char *categoryname;
37276 - const char *categoryvalue;
37277 - char *dirname, *xdomainname;
37278 - char *single_locale;
37282 -#if defined HAVE_TSEARCH || defined _LIBC
37283 - struct known_translation_t *search;
37284 - struct known_translation_t **foundp = NULL;
37285 - size_t msgid_len;
37287 - size_t domainname_len;
37289 - /* If no real MSGID is given return NULL. */
37290 - if (msgid1 == NULL)
37294 - if (category < 0 || category >= __LC_LAST || category == LC_ALL)
37296 - return (plural == 0
37297 - ? (char *) msgid1
37298 - /* Use the Germanic plural rule. */
37299 - : n == 1 ? (char *) msgid1 : (char *) msgid2);
37302 - __libc_rwlock_rdlock (_nl_state_lock);
37304 - /* If DOMAINNAME is NULL, we are interested in the default domain. If
37305 - CATEGORY is not LC_MESSAGES this might not make much sense but the
37306 - definition left this undefined. */
37307 - if (domainname == NULL)
37308 - domainname = _nl_current_default_domain;
37310 - /* OS/2 specific: backward compatibility with older libintl versions */
37311 -#ifdef LC_MESSAGES_COMPAT
37312 - if (category == LC_MESSAGES_COMPAT)
37313 - category = LC_MESSAGES;
37316 -#if defined HAVE_TSEARCH || defined _LIBC
37317 - msgid_len = strlen (msgid1) + 1;
37319 - /* Try to find the translation among those which we found at
37321 - search = (struct known_translation_t *)
37322 - alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
37323 - memcpy (search->msgid, msgid1, msgid_len);
37324 - search->domainname = (char *) domainname;
37325 - search->category = category;
37327 - foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
37329 - if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
37331 - /* Now deal with plural. */
37333 - retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
37334 - (*foundp)->translation_length);
37336 - retval = (char *) (*foundp)->translation;
37338 - __libc_rwlock_unlock (_nl_state_lock);
37343 - /* Preserve the `errno' value. */
37344 - saved_errno = errno;
37346 - /* See whether this is a SUID binary or not. */
37347 - DETERMINE_SECURE;
37349 - /* First find matching binding. */
37350 - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
37352 - int compare = strcmp (domainname, binding->domainname);
37353 - if (compare == 0)
37354 - /* We found it! */
37358 - /* It is not in the list. */
37364 - if (binding == NULL)
37365 - dirname = (char *) INTUSE(_nl_default_dirname);
37366 - else if (IS_ABSOLUTE_PATH (binding->dirname))
37367 - dirname = binding->dirname;
37370 - /* We have a relative path. Make it absolute now. */
37371 - size_t dirname_len = strlen (binding->dirname) + 1;
37375 - path_max = (unsigned int) PATH_MAX;
37376 - path_max += 2; /* The getcwd docs say to do this. */
37380 - dirname = (char *) alloca (path_max + dirname_len);
37381 - ADD_BLOCK (block_list, dirname);
37384 - ret = getcwd (dirname, path_max);
37385 - if (ret != NULL || errno != ERANGE)
37388 - path_max += path_max / 2;
37389 - path_max += PATH_INCR;
37393 - /* We cannot get the current working directory. Don't signal an
37394 - error but simply return the default string. */
37395 - goto return_untranslated;
37397 - stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
37400 - /* Now determine the symbolic name of CATEGORY and its value. */
37401 - categoryname = category_to_name (category);
37402 - categoryvalue = guess_category_value (category, categoryname);
37404 - domainname_len = strlen (domainname);
37405 - xdomainname = (char *) alloca (strlen (categoryname)
37406 - + domainname_len + 5);
37407 - ADD_BLOCK (block_list, xdomainname);
37409 - stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
37410 - domainname, domainname_len),
37413 - /* Creating working area. */
37414 - single_locale = (char *) alloca (strlen (categoryvalue) + 1);
37415 - ADD_BLOCK (block_list, single_locale);
37418 - /* Search for the given string. This is a loop because we perhaps
37419 - got an ordered list of languages to consider for the translation. */
37422 - /* Make CATEGORYVALUE point to the next element of the list. */
37423 - while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
37425 - if (categoryvalue[0] == '\0')
37427 - /* The whole contents of CATEGORYVALUE has been searched but
37428 - no valid entry has been found. We solve this situation
37429 - by implicitly appending a "C" entry, i.e. no translation
37430 - will take place. */
37431 - single_locale[0] = 'C';
37432 - single_locale[1] = '\0';
37436 - char *cp = single_locale;
37437 - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
37438 - *cp++ = *categoryvalue++;
37441 - /* When this is a SUID binary we must not allow accessing files
37442 - outside the dedicated directories. */
37443 - if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
37444 - /* Ingore this entry. */
37448 - /* If the current locale value is C (or POSIX) we don't load a
37449 - domain. Return the MSGID. */
37450 - if (strcmp (single_locale, "C") == 0
37451 - || strcmp (single_locale, "POSIX") == 0)
37454 - /* Find structure describing the message catalog matching the
37455 - DOMAINNAME and CATEGORY. */
37456 - domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
37458 - if (domain != NULL)
37460 - retval = _nl_find_msg (domain, binding, msgid1, &retlen);
37462 - if (retval == NULL)
37466 - for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
37468 - retval = _nl_find_msg (domain->successor[cnt], binding,
37469 - msgid1, &retlen);
37471 - if (retval != NULL)
37473 - domain = domain->successor[cnt];
37479 - if (retval != NULL)
37481 - /* Found the translation of MSGID1 in domain DOMAIN:
37482 - starting at RETVAL, RETLEN bytes. */
37483 - FREE_BLOCKS (block_list);
37484 -#if defined HAVE_TSEARCH || defined _LIBC
37485 - if (foundp == NULL)
37487 - /* Create a new entry and add it to the search tree. */
37488 - struct known_translation_t *newp;
37490 - newp = (struct known_translation_t *)
37491 - malloc (offsetof (struct known_translation_t, msgid)
37492 - + msgid_len + domainname_len + 1);
37493 - if (newp != NULL)
37495 - newp->domainname =
37496 - mempcpy (newp->msgid, msgid1, msgid_len);
37497 - memcpy (newp->domainname, domainname, domainname_len + 1);
37498 - newp->category = category;
37499 - newp->counter = _nl_msg_cat_cntr;
37500 - newp->domain = domain;
37501 - newp->translation = retval;
37502 - newp->translation_length = retlen;
37504 - /* Insert the entry in the search tree. */
37505 - foundp = (struct known_translation_t **)
37506 - tsearch (newp, &root, transcmp);
37507 - if (foundp == NULL
37508 - || __builtin_expect (*foundp != newp, 0))
37509 - /* The insert failed. */
37515 - /* We can update the existing entry. */
37516 - (*foundp)->counter = _nl_msg_cat_cntr;
37517 - (*foundp)->domain = domain;
37518 - (*foundp)->translation = retval;
37519 - (*foundp)->translation_length = retlen;
37522 - __set_errno (saved_errno);
37524 - /* Now deal with plural. */
37526 - retval = plural_lookup (domain, n, retval, retlen);
37528 - __libc_rwlock_unlock (_nl_state_lock);
37534 - return_untranslated:
37535 - /* Return the untranslated MSGID. */
37536 - FREE_BLOCKS (block_list);
37537 - __libc_rwlock_unlock (_nl_state_lock);
37539 - if (!ENABLE_SECURE)
37541 - extern void _nl_log_untranslated (const char *logfilename,
37542 - const char *domainname,
37543 - const char *msgid1, const char *msgid2,
37545 - const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
37547 - if (logfilename != NULL && logfilename[0] != '\0')
37548 - _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
37551 - __set_errno (saved_errno);
37552 - return (plural == 0
37553 - ? (char *) msgid1
37554 - /* Use the Germanic plural rule. */
37555 - : n == 1 ? (char *) msgid1 : (char *) msgid2);
37561 -_nl_find_msg (struct loaded_l10nfile *domain_file,
37562 - struct binding *domainbinding, const char *msgid,
37565 - struct loaded_domain *domain;
37566 - nls_uint32 nstrings;
37569 - size_t resultlen;
37571 - if (domain_file->decided == 0)
37572 - _nl_load_domain (domain_file, domainbinding);
37574 - if (domain_file->data == NULL)
37577 - domain = (struct loaded_domain *) domain_file->data;
37579 - nstrings = domain->nstrings;
37581 - /* Locate the MSGID and its translation. */
37582 - if (domain->hash_tab != NULL)
37584 - /* Use the hashing table. */
37585 - nls_uint32 len = strlen (msgid);
37586 - nls_uint32 hash_val = hash_string (msgid);
37587 - nls_uint32 idx = hash_val % domain->hash_size;
37588 - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
37592 - nls_uint32 nstr =
37593 - W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
37596 - /* Hash table entry is empty. */
37601 - /* Compare msgid with the original string at index nstr.
37602 - We compare the lengths with >=, not ==, because plural entries
37603 - are represented by strings with an embedded NUL. */
37604 - if (nstr < nstrings
37605 - ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
37606 - && (strcmp (msgid,
37607 - domain->data + W (domain->must_swap,
37608 - domain->orig_tab[nstr].offset))
37610 - : domain->orig_sysdep_tab[nstr - nstrings].length > len
37611 - && (strcmp (msgid,
37612 - domain->orig_sysdep_tab[nstr - nstrings].pointer)
37619 - if (idx >= domain->hash_size - incr)
37620 - idx -= domain->hash_size - incr;
37628 - /* Try the default method: binary search in the sorted array of
37630 - size_t top, bottom;
37634 - while (bottom < top)
37638 - act = (bottom + top) / 2;
37639 - cmp_val = strcmp (msgid, (domain->data
37640 - + W (domain->must_swap,
37641 - domain->orig_tab[act].offset)));
37644 - else if (cmp_val > 0)
37645 - bottom = act + 1;
37649 - /* No translation was found. */
37654 - /* The translation was found at index ACT. If we have to convert the
37655 - string to use a different character set, this is the time. */
37656 - if (act < nstrings)
37658 - result = (char *)
37659 - (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
37660 - resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
37664 - result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
37665 - resultlen = domain->trans_sysdep_tab[act - nstrings].length;
37668 -#if defined _LIBC || HAVE_ICONV
37669 - if (domain->codeset_cntr
37670 - != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
37672 - /* The domain's codeset has changed through bind_textdomain_codeset()
37673 - since the message catalog was initialized or last accessed. We
37674 - have to reinitialize the converter. */
37675 - _nl_free_domain_conv (domain);
37676 - _nl_init_domain_conv (domain_file, domain, domainbinding);
37681 - domain->conv != (__gconv_t) -1
37684 - domain->conv != (iconv_t) -1
37689 - /* We are supposed to do a conversion. First allocate an
37690 - appropriate table with the same structure as the table
37691 - of translations in the file, where we can put the pointers
37692 - to the converted strings in.
37693 - There is a slight complication with plural entries. They
37694 - are represented by consecutive NUL terminated strings. We
37695 - handle this case by converting RESULTLEN bytes, including
37698 - if (domain->conv_tab == NULL
37699 - && ((domain->conv_tab =
37700 - (char **) calloc (nstrings + domain->n_sysdep_strings,
37701 - sizeof (char *)))
37703 - /* Mark that we didn't succeed allocating a table. */
37704 - domain->conv_tab = (char **) -1;
37706 - if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
37707 - /* Nothing we can do, no more memory. */
37710 - if (domain->conv_tab[act] == NULL)
37712 - /* We haven't used this string so far, so it is not
37713 - translated yet. Do this now. */
37714 - /* We use a bit more efficient memory handling.
37715 - We allocate always larger blocks which get used over
37716 - time. This is faster than many small allocations. */
37717 - __libc_lock_define_initialized (static, lock)
37718 -# define INITIAL_BLOCK_SIZE 4080
37719 - static unsigned char *freemem;
37720 - static size_t freemem_size;
37722 - const unsigned char *inbuf;
37723 - unsigned char *outbuf;
37724 - int malloc_count;
37726 - transmem_block_t *transmem_list = NULL;
37729 - __libc_lock_lock (lock);
37731 - inbuf = (const unsigned char *) result;
37732 - outbuf = freemem + sizeof (size_t);
37734 - malloc_count = 0;
37737 - transmem_block_t *newmem;
37739 - size_t non_reversible;
37742 - if (freemem_size < sizeof (size_t))
37743 - goto resize_freemem;
37745 - res = __gconv (domain->conv,
37746 - &inbuf, inbuf + resultlen,
37748 - outbuf + freemem_size - sizeof (size_t),
37749 - &non_reversible);
37751 - if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
37754 - if (res != __GCONV_FULL_OUTPUT)
37756 - __libc_lock_unlock (lock);
37763 - const char *inptr = (const char *) inbuf;
37764 - size_t inleft = resultlen;
37765 - char *outptr = (char *) outbuf;
37768 - if (freemem_size < sizeof (size_t))
37769 - goto resize_freemem;
37771 - outleft = freemem_size - sizeof (size_t);
37772 - if (iconv (domain->conv,
37773 - (ICONV_CONST char **) &inptr, &inleft,
37774 - &outptr, &outleft)
37775 - != (size_t) (-1))
37777 - outbuf = (unsigned char *) outptr;
37780 - if (errno != E2BIG)
37782 - __libc_lock_unlock (lock);
37789 - /* We must allocate a new buffer or resize the old one. */
37790 - if (malloc_count > 0)
37793 - freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
37794 - newmem = (transmem_block_t *) realloc (transmem_list,
37797 - if (newmem != NULL)
37798 - transmem_list = transmem_list->next;
37801 - struct transmem_list *old = transmem_list;
37803 - transmem_list = transmem_list->next;
37810 - malloc_count = 1;
37811 - freemem_size = INITIAL_BLOCK_SIZE;
37812 - newmem = (transmem_block_t *) malloc (freemem_size);
37814 - if (__builtin_expect (newmem == NULL, 0))
37817 - freemem_size = 0;
37818 - __libc_lock_unlock (lock);
37823 - /* Add the block to the list of blocks we have to free
37824 - at some point. */
37825 - newmem->next = transmem_list;
37826 - transmem_list = newmem;
37828 - freemem = newmem->data;
37829 - freemem_size -= offsetof (struct transmem_list, data);
37831 - transmem_list = newmem;
37832 - freemem = newmem;
37835 - outbuf = freemem + sizeof (size_t);
37838 - /* We have now in our buffer a converted string. Put this
37839 - into the table of conversions. */
37840 - *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
37841 - domain->conv_tab[act] = (char *) freemem;
37842 - /* Shrink freemem, but keep it aligned. */
37843 - freemem_size -= outbuf - freemem;
37844 - freemem = outbuf;
37845 - freemem += freemem_size & (alignof (size_t) - 1);
37846 - freemem_size = freemem_size & ~ (alignof (size_t) - 1);
37848 - __libc_lock_unlock (lock);
37851 - /* Now domain->conv_tab[act] contains the translation of all
37852 - the plural variants. */
37853 - result = domain->conv_tab[act] + sizeof (size_t);
37854 - resultlen = *(size_t *) domain->conv_tab[act];
37858 - /* The result string is converted. */
37860 -#endif /* _LIBC || HAVE_ICONV */
37862 - *lengthp = resultlen;
37867 -/* Look up a plural variant. */
37870 -plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
37871 - const char *translation, size_t translation_len)
37873 - struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
37874 - unsigned long int index;
37877 - index = plural_eval (domaindata->plural, n);
37878 - if (index >= domaindata->nplurals)
37879 - /* This should never happen. It means the plural expression and the
37880 - given maximum value do not match. */
37883 - /* Skip INDEX strings at TRANSLATION. */
37885 - while (index-- > 0)
37888 - p = __rawmemchr (p, '\0');
37890 - p = strchr (p, '\0');
37892 - /* And skip over the NUL byte. */
37895 - if (p >= translation + translation_len)
37896 - /* This should never happen. It means the plural expression
37897 - evaluated to a value larger than the number of variants
37898 - available for MSGID1. */
37899 - return (char *) translation;
37901 - return (char *) p;
37905 -/* Return string representation of locale CATEGORY. */
37906 -static const char *
37908 -category_to_name (int category)
37910 - const char *retval;
37912 - switch (category)
37916 - retval = "LC_COLLATE";
37921 - retval = "LC_CTYPE";
37924 -#ifdef LC_MONETARY
37925 - case LC_MONETARY:
37926 - retval = "LC_MONETARY";
37931 - retval = "LC_NUMERIC";
37936 - retval = "LC_TIME";
37939 -#ifdef LC_MESSAGES
37940 - case LC_MESSAGES:
37941 - retval = "LC_MESSAGES";
37944 -#ifdef LC_RESPONSE
37945 - case LC_RESPONSE:
37946 - retval = "LC_RESPONSE";
37951 - /* This might not make sense but is perhaps better than any other
37953 - retval = "LC_ALL";
37957 - /* If you have a better idea for a default value let me know. */
37958 - retval = "LC_XXX";
37965 -/* Guess value of current locale from value of the environment variables
37966 - or system-dependent defaults. */
37967 -static const char *
37969 -guess_category_value (int category, const char *categoryname)
37971 - const char *language;
37972 - const char *locale;
37974 - const char *language_default;
37975 - int locale_defaulted;
37978 - /* We use the settings in the following order:
37979 - 1. The value of the environment variable 'LANGUAGE'. This is a GNU
37980 - extension. Its value can be a colon-separated list of locale names.
37981 - 2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
37982 - More precisely, the first among these that is set to a non-empty value.
37983 - This is how POSIX specifies it. The value is a single locale name.
37984 - 3. A system-dependent preference list of languages. Its value can be a
37985 - colon-separated list of locale names.
37986 - 4. A system-dependent default locale name.
37988 - - System-dependent settings can be overridden by environment variables.
37989 - - If the system provides both a list of languages and a default locale,
37990 - the former is used. */
37992 - /* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
37993 - `LC_xxx', and `LANG'. On some systems this can be done by the
37994 - `setlocale' function itself. */
37996 - locale = __current_locale_name (category);
37998 - locale = _nl_locale_name_posix (category, categoryname);
37999 - locale_defaulted = 0;
38000 - if (locale == NULL)
38002 - locale = _nl_locale_name_default ();
38003 - locale_defaulted = 1;
38007 - /* Ignore LANGUAGE and its system-dependent analogon if the locale is set
38009 - 1. "C" locale usually uses the ASCII encoding, and most international
38010 - messages use non-ASCII characters. These characters get displayed
38011 - as question marks (if using glibc's iconv()) or as invalid 8-bit
38012 - characters (because other iconv()s refuse to convert most non-ASCII
38013 - characters to ASCII). In any case, the output is ugly.
38014 - 2. The precise output of some programs in the "C" locale is specified
38015 - by POSIX and should not depend on environment variables like
38016 - "LANGUAGE" or system-dependent information. We allow such programs
38017 - to use gettext(). */
38018 - if (strcmp (locale, "C") == 0)
38021 - /* The highest priority value is the value of the 'LANGUAGE' environment
38023 - language = getenv ("LANGUAGE");
38024 - if (language != NULL && language[0] != '\0')
38027 - /* The next priority value is the locale name, if not defaulted. */
38028 - if (locale_defaulted)
38030 - /* The next priority value is the default language preferences list. */
38031 - language_default = _nl_language_preferences_default ();
38032 - if (language_default != NULL)
38033 - return language_default;
38035 - /* The least priority value is the locale name, if defaulted. */
38040 -/* @@ begin of epilog @@ */
38042 -/* We don't want libintl.a to depend on any other library. So we
38043 - avoid the non-standard function stpcpy. In GNU C Library this
38044 - function is available, though. Also allow the symbol HAVE_STPCPY
38045 - to be defined. */
38046 -#if !_LIBC && !HAVE_STPCPY
38048 -stpcpy (char *dest, const char *src)
38050 - while ((*dest++ = *src++) != '\0')
38051 - /* Do nothing. */ ;
38056 -#if !_LIBC && !HAVE_MEMPCPY
38058 -mempcpy (void *dest, const void *src, size_t n)
38060 - return (void *) ((char *) memcpy (dest, src, n) + n);
38066 -/* If we want to free all resources we have to do some work at
38067 - program's end. */
38068 -libc_freeres_fn (free_mem)
38072 - while (_nl_domain_bindings != NULL)
38074 - struct binding *oldp = _nl_domain_bindings;
38075 - _nl_domain_bindings = _nl_domain_bindings->next;
38076 - if (oldp->dirname != INTUSE(_nl_default_dirname))
38077 - /* Yes, this is a pointer comparison. */
38078 - free (oldp->dirname);
38079 - free (oldp->codeset);
38083 - if (_nl_current_default_domain != _nl_default_default_domain)
38084 - /* Yes, again a pointer comparison. */
38085 - free ((char *) _nl_current_default_domain);
38087 - /* Remove the search tree with the known translations. */
38088 - __tdestroy (root, free);
38091 - while (transmem_list != NULL)
38093 - old = transmem_list;
38094 - transmem_list = transmem_list->next;
38099 diff -urN BUILD/abook-0.6.0pre2/intl/dcngettext.c abook/intl/dcngettext.c
38100 --- BUILD/abook-0.6.0pre2/intl/dcngettext.c 2005-09-17 12:10:26.000000000 +0200
38101 +++ abook/intl/dcngettext.c 1970-01-01 01:00:00.000000000 +0100
38103 -/* Implementation of the dcngettext(3) function.
38104 - Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
38106 - This program is free software; you can redistribute it and/or modify it
38107 - under the terms of the GNU Library General Public License as published
38108 - by the Free Software Foundation; either version 2, or (at your option)
38109 - any later version.
38111 - This program is distributed in the hope that it will be useful,
38112 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38113 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38114 - Library General Public License for more details.
38116 - You should have received a copy of the GNU Library General Public
38117 - License along with this program; if not, write to the Free Software
38118 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38121 -#ifdef HAVE_CONFIG_H
38122 -# include <config.h>
38125 -#include "gettextP.h"
38127 -# include <libintl.h>
38129 -# include "libgnuintl.h"
38132 -/* @@ end of prolog @@ */
38134 -/* Names for the libintl functions are a problem. They must not clash
38135 - with existing names and they should follow ANSI C. But this source
38136 - code is also used in GNU C Library where the names have a __
38137 - prefix. So we have to make a difference here. */
38139 -# define DCNGETTEXT __dcngettext
38140 -# define DCIGETTEXT __dcigettext
38142 -# define DCNGETTEXT libintl_dcngettext
38143 -# define DCIGETTEXT libintl_dcigettext
38146 -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
38149 -DCNGETTEXT (const char *domainname,
38150 - const char *msgid1, const char *msgid2, unsigned long int n,
38153 - return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
38157 -/* Alias for function name in GNU C Library. */
38158 -weak_alias (__dcngettext, dcngettext);
38160 diff -urN BUILD/abook-0.6.0pre2/intl/dgettext.c abook/intl/dgettext.c
38161 --- BUILD/abook-0.6.0pre2/intl/dgettext.c 2005-09-17 12:10:26.000000000 +0200
38162 +++ abook/intl/dgettext.c 1970-01-01 01:00:00.000000000 +0100
38164 -/* Implementation of the dgettext(3) function.
38165 - Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
38167 - This program is free software; you can redistribute it and/or modify it
38168 - under the terms of the GNU Library General Public License as published
38169 - by the Free Software Foundation; either version 2, or (at your option)
38170 - any later version.
38172 - This program is distributed in the hope that it will be useful,
38173 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38174 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38175 - Library General Public License for more details.
38177 - You should have received a copy of the GNU Library General Public
38178 - License along with this program; if not, write to the Free Software
38179 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38182 -#ifdef HAVE_CONFIG_H
38183 -# include <config.h>
38186 -#include "gettextP.h"
38188 -#include <locale.h>
38191 -# include <libintl.h>
38193 -# include "libgnuintl.h"
38196 -/* @@ end of prolog @@ */
38198 -/* Names for the libintl functions are a problem. They must not clash
38199 - with existing names and they should follow ANSI C. But this source
38200 - code is also used in GNU C Library where the names have a __
38201 - prefix. So we have to make a difference here. */
38203 -# define DGETTEXT __dgettext
38204 -# define DCGETTEXT INTUSE(__dcgettext)
38206 -# define DGETTEXT libintl_dgettext
38207 -# define DCGETTEXT libintl_dcgettext
38210 -/* Look up MSGID in the DOMAINNAME message catalog of the current
38211 - LC_MESSAGES locale. */
38213 -DGETTEXT (const char *domainname, const char *msgid)
38215 - return DCGETTEXT (domainname, msgid, LC_MESSAGES);
38219 -/* Alias for function name in GNU C Library. */
38220 -weak_alias (__dgettext, dgettext);
38222 diff -urN BUILD/abook-0.6.0pre2/intl/dngettext.c abook/intl/dngettext.c
38223 --- BUILD/abook-0.6.0pre2/intl/dngettext.c 2005-09-17 12:10:26.000000000 +0200
38224 +++ abook/intl/dngettext.c 1970-01-01 01:00:00.000000000 +0100
38226 -/* Implementation of the dngettext(3) function.
38227 - Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
38229 - This program is free software; you can redistribute it and/or modify it
38230 - under the terms of the GNU Library General Public License as published
38231 - by the Free Software Foundation; either version 2, or (at your option)
38232 - any later version.
38234 - This program is distributed in the hope that it will be useful,
38235 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38236 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38237 - Library General Public License for more details.
38239 - You should have received a copy of the GNU Library General Public
38240 - License along with this program; if not, write to the Free Software
38241 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38244 -#ifdef HAVE_CONFIG_H
38245 -# include <config.h>
38248 -#include "gettextP.h"
38250 -#include <locale.h>
38253 -# include <libintl.h>
38255 -# include "libgnuintl.h"
38258 -/* @@ end of prolog @@ */
38260 -/* Names for the libintl functions are a problem. They must not clash
38261 - with existing names and they should follow ANSI C. But this source
38262 - code is also used in GNU C Library where the names have a __
38263 - prefix. So we have to make a difference here. */
38265 -# define DNGETTEXT __dngettext
38266 -# define DCNGETTEXT __dcngettext
38268 -# define DNGETTEXT libintl_dngettext
38269 -# define DCNGETTEXT libintl_dcngettext
38272 -/* Look up MSGID in the DOMAINNAME message catalog of the current
38273 - LC_MESSAGES locale and skip message according to the plural form. */
38275 -DNGETTEXT (const char *domainname,
38276 - const char *msgid1, const char *msgid2, unsigned long int n)
38278 - return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
38282 -/* Alias for function name in GNU C Library. */
38283 -weak_alias (__dngettext, dngettext);
38285 diff -urN BUILD/abook-0.6.0pre2/intl/eval-plural.h abook/intl/eval-plural.h
38286 --- BUILD/abook-0.6.0pre2/intl/eval-plural.h 2005-09-17 12:10:26.000000000 +0200
38287 +++ abook/intl/eval-plural.h 1970-01-01 01:00:00.000000000 +0100
38289 -/* Plural expression evaluation.
38290 - Copyright (C) 2000-2003 Free Software Foundation, Inc.
38292 - This program is free software; you can redistribute it and/or modify it
38293 - under the terms of the GNU Library General Public License as published
38294 - by the Free Software Foundation; either version 2, or (at your option)
38295 - any later version.
38297 - This program is distributed in the hope that it will be useful,
38298 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38299 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38300 - Library General Public License for more details.
38302 - You should have received a copy of the GNU Library General Public
38303 - License along with this program; if not, write to the Free Software
38304 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38308 -#define STATIC static
38311 -/* Evaluate the plural expression and return an index value. */
38315 -plural_eval (struct expression *pexp, unsigned long int n)
38317 - switch (pexp->nargs)
38320 - switch (pexp->operation)
38325 - return pexp->val.num;
38333 - /* pexp->operation must be lnot. */
38334 - unsigned long int arg = plural_eval (pexp->val.args[0], n);
38339 - unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
38340 - if (pexp->operation == lor)
38341 - return leftarg || plural_eval (pexp->val.args[1], n);
38342 - else if (pexp->operation == land)
38343 - return leftarg && plural_eval (pexp->val.args[1], n);
38346 - unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
38348 - switch (pexp->operation)
38351 - return leftarg * rightarg;
38353 -#if !INTDIV0_RAISES_SIGFPE
38354 - if (rightarg == 0)
38357 - return leftarg / rightarg;
38359 -#if !INTDIV0_RAISES_SIGFPE
38360 - if (rightarg == 0)
38363 - return leftarg % rightarg;
38365 - return leftarg + rightarg;
38367 - return leftarg - rightarg;
38369 - return leftarg < rightarg;
38370 - case greater_than:
38371 - return leftarg > rightarg;
38372 - case less_or_equal:
38373 - return leftarg <= rightarg;
38374 - case greater_or_equal:
38375 - return leftarg >= rightarg;
38377 - return leftarg == rightarg;
38379 - return leftarg != rightarg;
38389 - /* pexp->operation must be qmop. */
38390 - unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
38391 - return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
38397 diff -urN BUILD/abook-0.6.0pre2/intl/explodename.c abook/intl/explodename.c
38398 --- BUILD/abook-0.6.0pre2/intl/explodename.c 2005-09-17 12:10:26.000000000 +0200
38399 +++ abook/intl/explodename.c 1970-01-01 01:00:00.000000000 +0100
38401 -/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
38402 - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
38404 - This program is free software; you can redistribute it and/or modify it
38405 - under the terms of the GNU Library General Public License as published
38406 - by the Free Software Foundation; either version 2, or (at your option)
38407 - any later version.
38409 - This program is distributed in the hope that it will be useful,
38410 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38411 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38412 - Library General Public License for more details.
38414 - You should have received a copy of the GNU Library General Public
38415 - License along with this program; if not, write to the Free Software
38416 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38419 -#ifdef HAVE_CONFIG_H
38420 -# include <config.h>
38423 -#include <stdlib.h>
38424 -#include <string.h>
38425 -#include <sys/types.h>
38427 -#include "loadinfo.h"
38429 -/* On some strange systems still no definition of NULL is found. Sigh! */
38431 -# if defined __STDC__ && __STDC__
38432 -# define NULL ((void *) 0)
38438 -/* @@ end of prolog @@ */
38441 -_nl_find_language (const char *name)
38443 - while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
38444 - && name[0] != '+' && name[0] != ',')
38447 - return (char *) name;
38452 -_nl_explode_name (char *name,
38453 - const char **language, const char **modifier,
38454 - const char **territory, const char **codeset,
38455 - const char **normalized_codeset, const char **special,
38456 - const char **sponsor, const char **revision)
38458 - enum { undecided, xpg, cen } syntax;
38462 - *modifier = NULL;
38463 - *territory = NULL;
38465 - *normalized_codeset = NULL;
38468 - *revision = NULL;
38470 - /* Now we determine the single parts of the locale name. First
38471 - look for the language. Termination symbols are `_' and `@' if
38472 - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
38474 - syntax = undecided;
38475 - *language = cp = name;
38476 - cp = _nl_find_language (*language);
38478 - if (*language == cp)
38479 - /* This does not make sense: language has to be specified. Use
38480 - this entry as it is without exploding. Perhaps it is an alias. */
38481 - cp = strchr (*language, '\0');
38482 - else if (cp[0] == '_')
38484 - /* Next is the territory. */
38486 - *territory = ++cp;
38488 - while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
38489 - && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
38492 - mask |= TERRITORY;
38494 - if (cp[0] == '.')
38496 - /* Next is the codeset. */
38501 - while (cp[0] != '\0' && cp[0] != '@')
38504 - mask |= XPG_CODESET;
38506 - if (*codeset != cp && (*codeset)[0] != '\0')
38508 - *normalized_codeset = _nl_normalize_codeset (*codeset,
38510 - if (strcmp (*codeset, *normalized_codeset) == 0)
38511 - free ((char *) *normalized_codeset);
38513 - mask |= XPG_NORM_CODESET;
38518 - if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
38520 - /* Next is the modifier. */
38521 - syntax = cp[0] == '@' ? xpg : cen;
38523 - *modifier = ++cp;
38525 - while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
38526 - && cp[0] != ',' && cp[0] != '_')
38529 - mask |= XPG_MODIFIER | CEN_AUDIENCE;
38532 - if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
38536 - if (cp[0] == '+')
38538 - /* Next is special application (CEN syntax). */
38542 - while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
38545 - mask |= CEN_SPECIAL;
38548 - if (cp[0] == ',')
38550 - /* Next is sponsor (CEN syntax). */
38554 - while (cp[0] != '\0' && cp[0] != '_')
38557 - mask |= CEN_SPONSOR;
38560 - if (cp[0] == '_')
38562 - /* Next is revision (CEN syntax). */
38564 - *revision = ++cp;
38566 - mask |= CEN_REVISION;
38570 - /* For CEN syntax values it might be important to have the
38571 - separator character in the file name, not for XPG syntax. */
38572 - if (syntax == xpg)
38574 - if (*territory != NULL && (*territory)[0] == '\0')
38575 - mask &= ~TERRITORY;
38577 - if (*codeset != NULL && (*codeset)[0] == '\0')
38578 - mask &= ~XPG_CODESET;
38580 - if (*modifier != NULL && (*modifier)[0] == '\0')
38581 - mask &= ~XPG_MODIFIER;
38586 diff -urN BUILD/abook-0.6.0pre2/intl/finddomain.c abook/intl/finddomain.c
38587 --- BUILD/abook-0.6.0pre2/intl/finddomain.c 2005-09-17 12:10:26.000000000 +0200
38588 +++ abook/intl/finddomain.c 1970-01-01 01:00:00.000000000 +0100
38590 -/* Handle list of needed message catalogs
38591 - Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
38592 - Written by Ulrich Drepper <drepper@gnu.org>, 1995.
38594 - This program is free software; you can redistribute it and/or modify it
38595 - under the terms of the GNU Library General Public License as published
38596 - by the Free Software Foundation; either version 2, or (at your option)
38597 - any later version.
38599 - This program is distributed in the hope that it will be useful,
38600 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38601 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38602 - Library General Public License for more details.
38604 - You should have received a copy of the GNU Library General Public
38605 - License along with this program; if not, write to the Free Software
38606 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38609 -#ifdef HAVE_CONFIG_H
38610 -# include <config.h>
38613 -#include <stdio.h>
38614 -#include <sys/types.h>
38615 -#include <stdlib.h>
38616 -#include <string.h>
38618 -#if defined HAVE_UNISTD_H || defined _LIBC
38619 -# include <unistd.h>
38622 -#include "gettextP.h"
38624 -# include <libintl.h>
38626 -# include "libgnuintl.h"
38629 -/* @@ end of prolog @@ */
38630 -/* List of already loaded domains. */
38631 -static struct loaded_l10nfile *_nl_loaded_domains;
38634 -/* Return a data structure describing the message catalog described by
38635 - the DOMAINNAME and CATEGORY parameters with respect to the currently
38636 - established bindings. */
38637 -struct loaded_l10nfile *
38639 -_nl_find_domain (const char *dirname, char *locale,
38640 - const char *domainname, struct binding *domainbinding)
38642 - struct loaded_l10nfile *retval;
38643 - const char *language;
38644 - const char *modifier;
38645 - const char *territory;
38646 - const char *codeset;
38647 - const char *normalized_codeset;
38648 - const char *special;
38649 - const char *sponsor;
38650 - const char *revision;
38651 - const char *alias_value;
38654 - /* LOCALE can consist of up to four recognized parts for the XPG syntax:
38656 - language[_territory[.codeset]][@modifier]
38658 - and six parts for the CEN syntax:
38660 - language[_territory][+audience][+special][,[sponsor][_revision]]
38662 - Beside the first part all of them are allowed to be missing. If
38663 - the full specified locale is not found, the less specific one are
38664 - looked for. The various parts will be stripped off according to
38665 - the following order:
38670 - (5) normalized codeset
38672 - (7) audience/modifier
38675 - /* If we have already tested for this locale entry there has to
38676 - be one data set in the list of loaded domains. */
38677 - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
38678 - strlen (dirname) + 1, 0, locale, NULL, NULL,
38679 - NULL, NULL, NULL, NULL, NULL, domainname, 0);
38680 - if (retval != NULL)
38682 - /* We know something about this locale. */
38685 - if (retval->decided == 0)
38686 - _nl_load_domain (retval, domainbinding);
38688 - if (retval->data != NULL)
38691 - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
38693 - if (retval->successor[cnt]->decided == 0)
38694 - _nl_load_domain (retval->successor[cnt], domainbinding);
38696 - if (retval->successor[cnt]->data != NULL)
38699 - return cnt >= 0 ? retval : NULL;
38703 - /* See whether the locale value is an alias. If yes its value
38704 - *overwrites* the alias name. No test for the original value is
38706 - alias_value = _nl_expand_alias (locale);
38707 - if (alias_value != NULL)
38709 -#if defined _LIBC || defined HAVE_STRDUP
38710 - locale = strdup (alias_value);
38711 - if (locale == NULL)
38714 - size_t len = strlen (alias_value) + 1;
38715 - locale = (char *) malloc (len);
38716 - if (locale == NULL)
38719 - memcpy (locale, alias_value, len);
38723 - /* Now we determine the single parts of the locale name. First
38724 - look for the language. Termination symbols are `_' and `@' if
38725 - we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
38726 - mask = _nl_explode_name (locale, &language, &modifier, &territory,
38727 - &codeset, &normalized_codeset, &special,
38728 - &sponsor, &revision);
38730 - /* Create all possible locale entries which might be interested in
38731 - generalization. */
38732 - retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
38733 - strlen (dirname) + 1, mask, language, territory,
38734 - codeset, normalized_codeset, modifier, special,
38735 - sponsor, revision, domainname, 1);
38736 - if (retval == NULL)
38737 - /* This means we are out of core. */
38740 - if (retval->decided == 0)
38741 - _nl_load_domain (retval, domainbinding);
38742 - if (retval->data == NULL)
38745 - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
38747 - if (retval->successor[cnt]->decided == 0)
38748 - _nl_load_domain (retval->successor[cnt], domainbinding);
38749 - if (retval->successor[cnt]->data != NULL)
38754 - /* The room for an alias was dynamically allocated. Free it now. */
38755 - if (alias_value != NULL)
38758 - /* The space for normalized_codeset is dynamically allocated. Free it. */
38759 - if (mask & XPG_NORM_CODESET)
38760 - free ((void *) normalized_codeset);
38767 -libc_freeres_fn (free_mem)
38769 - struct loaded_l10nfile *runp = _nl_loaded_domains;
38771 - while (runp != NULL)
38773 - struct loaded_l10nfile *here = runp;
38774 - if (runp->data != NULL)
38775 - _nl_unload_domain ((struct loaded_domain *) runp->data);
38776 - runp = runp->next;
38777 - free ((char *) here->filename);
38782 diff -urN BUILD/abook-0.6.0pre2/intl/gettext.c abook/intl/gettext.c
38783 --- BUILD/abook-0.6.0pre2/intl/gettext.c 2005-09-17 12:10:26.000000000 +0200
38784 +++ abook/intl/gettext.c 1970-01-01 01:00:00.000000000 +0100
38786 -/* Implementation of gettext(3) function.
38787 - Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
38789 - This program is free software; you can redistribute it and/or modify it
38790 - under the terms of the GNU Library General Public License as published
38791 - by the Free Software Foundation; either version 2, or (at your option)
38792 - any later version.
38794 - This program is distributed in the hope that it will be useful,
38795 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38796 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38797 - Library General Public License for more details.
38799 - You should have received a copy of the GNU Library General Public
38800 - License along with this program; if not, write to the Free Software
38801 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38804 -#ifdef HAVE_CONFIG_H
38805 -# include <config.h>
38809 -# define __need_NULL
38810 -# include <stddef.h>
38812 -# include <stdlib.h> /* Just for NULL. */
38815 -#include "gettextP.h"
38817 -# include <libintl.h>
38819 -# include "libgnuintl.h"
38822 -/* @@ end of prolog @@ */
38824 -/* Names for the libintl functions are a problem. They must not clash
38825 - with existing names and they should follow ANSI C. But this source
38826 - code is also used in GNU C Library where the names have a __
38827 - prefix. So we have to make a difference here. */
38829 -# define GETTEXT __gettext
38830 -# define DCGETTEXT INTUSE(__dcgettext)
38832 -# define GETTEXT libintl_gettext
38833 -# define DCGETTEXT libintl_dcgettext
38836 -/* Look up MSGID in the current default message catalog for the current
38837 - LC_MESSAGES locale. If not found, returns MSGID itself (the default
38840 -GETTEXT (const char *msgid)
38842 - return DCGETTEXT (NULL, msgid, LC_MESSAGES);
38846 -/* Alias for function name in GNU C Library. */
38847 -weak_alias (__gettext, gettext);
38849 diff -urN BUILD/abook-0.6.0pre2/intl/gettextP.h abook/intl/gettextP.h
38850 --- BUILD/abook-0.6.0pre2/intl/gettextP.h 2005-09-17 12:10:26.000000000 +0200
38851 +++ abook/intl/gettextP.h 1970-01-01 01:00:00.000000000 +0100
38853 -/* Header describing internals of libintl library.
38854 - Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
38855 - Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
38857 - This program is free software; you can redistribute it and/or modify it
38858 - under the terms of the GNU Library General Public License as published
38859 - by the Free Software Foundation; either version 2, or (at your option)
38860 - any later version.
38862 - This program is distributed in the hope that it will be useful,
38863 - but WITHOUT ANY WARRANTY; without even the implied warranty of
38864 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
38865 - Library General Public License for more details.
38867 - You should have received a copy of the GNU Library General Public
38868 - License along with this program; if not, write to the Free Software
38869 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
38872 -#ifndef _GETTEXTP_H
38873 -#define _GETTEXTP_H
38875 -#include <stddef.h> /* Get size_t. */
38878 -# include "../iconv/gconv_int.h"
38881 -# include <iconv.h>
38885 -#include "loadinfo.h"
38887 -#include "gmo.h" /* Get nls_uint32. */
38889 -/* @@ end of prolog @@ */
38891 -#ifndef internal_function
38892 -# define internal_function
38895 -#ifndef attribute_hidden
38896 -# define attribute_hidden
38899 -/* Tell the compiler when a conditional or integer expression is
38900 - almost always true or almost always false. */
38901 -#ifndef HAVE_BUILTIN_EXPECT
38902 -# define __builtin_expect(expr, val) (expr)
38906 -# define W(flag, data) ((flag) ? SWAP (data) : (data))
38911 -# include <byteswap.h>
38912 -# define SWAP(i) bswap_32 (i)
38914 -static inline nls_uint32
38918 - return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
38923 -/* In-memory representation of system dependent string. */
38924 -struct sysdep_string_desc
38926 - /* Length of addressed string, including the trailing NUL. */
38928 - /* Pointer to addressed string. */
38929 - const char *pointer;
38932 -/* The representation of an opened message catalog. */
38933 -struct loaded_domain
38935 - /* Pointer to memory containing the .mo file. */
38936 - const char *data;
38937 - /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
38939 - /* Size of mmap()ed memory. */
38940 - size_t mmap_size;
38941 - /* 1 if the .mo file uses a different endianness than this machine. */
38943 - /* Pointer to additional malloc()ed memory. */
38946 - /* Number of static strings pairs. */
38947 - nls_uint32 nstrings;
38948 - /* Pointer to descriptors of original strings in the file. */
38949 - const struct string_desc *orig_tab;
38950 - /* Pointer to descriptors of translated strings in the file. */
38951 - const struct string_desc *trans_tab;
38953 - /* Number of system dependent strings pairs. */
38954 - nls_uint32 n_sysdep_strings;
38955 - /* Pointer to descriptors of original sysdep strings. */
38956 - const struct sysdep_string_desc *orig_sysdep_tab;
38957 - /* Pointer to descriptors of translated sysdep strings. */
38958 - const struct sysdep_string_desc *trans_sysdep_tab;
38960 - /* Size of hash table. */
38961 - nls_uint32 hash_size;
38962 - /* Pointer to hash table. */
38963 - const nls_uint32 *hash_tab;
38964 - /* 1 if the hash table uses a different endianness than this machine. */
38965 - int must_swap_hash_tab;
38967 - int codeset_cntr;
38977 - struct expression *plural;
38978 - unsigned long int nplurals;
38981 -/* We want to allocate a string at the end of the struct. But ISO C
38982 - doesn't allow zero sized arrays. */
38989 -/* A set of settings bound to a message domain. Used to store settings
38990 - from bindtextdomain() and bind_textdomain_codeset(). */
38993 - struct binding *next;
38995 - int codeset_cntr; /* Incremented each time codeset changes. */
38997 - char domainname[ZERO];
39000 -/* A counter which is incremented each time some previous translations
39002 - This variable is part of the external ABI of the GNU libintl. */
39003 -extern int _nl_msg_cat_cntr;
39006 -const char *_nl_language_preferences_default (void);
39007 -const char *_nl_locale_name_posix (int category, const char *categoryname);
39008 -const char *_nl_locale_name_default (void);
39009 -const char *_nl_locale_name (int category, const char *categoryname);
39012 -struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
39013 - const char *__domainname,
39014 - struct binding *__domainbinding)
39015 - internal_function;
39016 -void _nl_load_domain (struct loaded_l10nfile *__domain,
39017 - struct binding *__domainbinding)
39018 - internal_function;
39019 -void _nl_unload_domain (struct loaded_domain *__domain)
39020 - internal_function;
39021 -const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
39022 - struct loaded_domain *__domain,
39023 - struct binding *__domainbinding)
39024 - internal_function;
39025 -void _nl_free_domain_conv (struct loaded_domain *__domain)
39026 - internal_function;
39028 -char *_nl_find_msg (struct loaded_l10nfile *domain_file,
39029 - struct binding *domainbinding, const char *msgid,
39031 - internal_function;
39034 -extern char *__gettext (const char *__msgid);
39035 -extern char *__dgettext (const char *__domainname, const char *__msgid);
39036 -extern char *__dcgettext (const char *__domainname, const char *__msgid,
39038 -extern char *__ngettext (const char *__msgid1, const char *__msgid2,
39039 - unsigned long int __n);
39040 -extern char *__dngettext (const char *__domainname,
39041 - const char *__msgid1, const char *__msgid2,
39042 - unsigned long int n);
39043 -extern char *__dcngettext (const char *__domainname,
39044 - const char *__msgid1, const char *__msgid2,
39045 - unsigned long int __n, int __category);
39046 -extern char *__dcigettext (const char *__domainname,
39047 - const char *__msgid1, const char *__msgid2,
39048 - int __plural, unsigned long int __n,
39050 -extern char *__textdomain (const char *__domainname);
39051 -extern char *__bindtextdomain (const char *__domainname,
39052 - const char *__dirname);
39053 -extern char *__bind_textdomain_codeset (const char *__domainname,
39054 - const char *__codeset);
39056 -/* Declare the exported libintl_* functions, in a way that allows us to
39057 - call them under their real name. */
39058 -# undef _INTL_REDIRECT_INLINE
39059 -# undef _INTL_REDIRECT_MACROS
39060 -# define _INTL_REDIRECT_MACROS
39061 -# include "libgnuintl.h"
39062 -extern char *libintl_dcigettext (const char *__domainname,
39063 - const char *__msgid1, const char *__msgid2,
39064 - int __plural, unsigned long int __n,
39068 -/* @@ begin of epilog @@ */
39070 -#endif /* gettextP.h */
39071 diff -urN BUILD/abook-0.6.0pre2/intl/gmo.h abook/intl/gmo.h
39072 --- BUILD/abook-0.6.0pre2/intl/gmo.h 2005-09-17 12:10:26.000000000 +0200
39073 +++ abook/intl/gmo.h 1970-01-01 01:00:00.000000000 +0100
39075 -/* Description of GNU message catalog format: general file layout.
39076 - Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
39078 - This program is free software; you can redistribute it and/or modify it
39079 - under the terms of the GNU Library General Public License as published
39080 - by the Free Software Foundation; either version 2, or (at your option)
39081 - any later version.
39083 - This program is distributed in the hope that it will be useful,
39084 - but WITHOUT ANY WARRANTY; without even the implied warranty of
39085 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39086 - Library General Public License for more details.
39088 - You should have received a copy of the GNU Library General Public
39089 - License along with this program; if not, write to the Free Software
39090 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
39093 -#ifndef _GETTEXT_H
39094 -#define _GETTEXT_H 1
39096 -#include <limits.h>
39098 -/* @@ end of prolog @@ */
39100 -/* The magic number of the GNU message catalog format. */
39101 -#define _MAGIC 0x950412de
39102 -#define _MAGIC_SWAPPED 0xde120495
39104 -/* Revision number of the currently used .mo (binary) file format. */
39105 -#define MO_REVISION_NUMBER 0
39106 -#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
39108 -/* The following contortions are an attempt to use the C preprocessor
39109 - to determine an unsigned integral type that is 32 bits wide. An
39110 - alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
39111 - as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
39112 - when cross-compiling. */
39115 -# define UINT_MAX_32_BITS 4294967295U
39117 -# define UINT_MAX_32_BITS 0xFFFFFFFF
39120 -/* If UINT_MAX isn't defined, assume it's a 32-bit type.
39121 - This should be valid for all systems GNU cares about because
39122 - that doesn't include 16-bit systems, and only modern systems
39123 - (that certainly have <limits.h>) have 64+-bit integral types. */
39126 -# define UINT_MAX UINT_MAX_32_BITS
39129 -#if UINT_MAX == UINT_MAX_32_BITS
39130 -typedef unsigned nls_uint32;
39132 -# if USHRT_MAX == UINT_MAX_32_BITS
39133 -typedef unsigned short nls_uint32;
39135 -# if ULONG_MAX == UINT_MAX_32_BITS
39136 -typedef unsigned long nls_uint32;
39138 - /* The following line is intended to throw an error. Using #error is
39139 - not portable enough. */
39140 - "Cannot determine unsigned 32-bit data type."
39146 -/* Header for binary .mo file format. */
39147 -struct mo_file_header
39149 - /* The magic number. */
39150 - nls_uint32 magic;
39151 - /* The revision number of the file format. */
39152 - nls_uint32 revision;
39154 - /* The following are only used in .mo files with major revision 0 or 1. */
39156 - /* The number of strings pairs. */
39157 - nls_uint32 nstrings;
39158 - /* Offset of table with start offsets of original strings. */
39159 - nls_uint32 orig_tab_offset;
39160 - /* Offset of table with start offsets of translated strings. */
39161 - nls_uint32 trans_tab_offset;
39162 - /* Size of hash table. */
39163 - nls_uint32 hash_tab_size;
39164 - /* Offset of first hash table entry. */
39165 - nls_uint32 hash_tab_offset;
39167 - /* The following are only used in .mo files with minor revision >= 1. */
39169 - /* The number of system dependent segments. */
39170 - nls_uint32 n_sysdep_segments;
39171 - /* Offset of table describing system dependent segments. */
39172 - nls_uint32 sysdep_segments_offset;
39173 - /* The number of system dependent strings pairs. */
39174 - nls_uint32 n_sysdep_strings;
39175 - /* Offset of table with start offsets of original sysdep strings. */
39176 - nls_uint32 orig_sysdep_tab_offset;
39177 - /* Offset of table with start offsets of translated sysdep strings. */
39178 - nls_uint32 trans_sysdep_tab_offset;
39181 -/* Descriptor for static string contained in the binary .mo file. */
39182 -struct string_desc
39184 - /* Length of addressed string, not including the trailing NUL. */
39185 - nls_uint32 length;
39186 - /* Offset of string in file. */
39187 - nls_uint32 offset;
39190 -/* The following are only used in .mo files with minor revision >= 1. */
39192 -/* Descriptor for system dependent string segment. */
39193 -struct sysdep_segment
39195 - /* Length of addressed string, including the trailing NUL. */
39196 - nls_uint32 length;
39197 - /* Offset of string in file. */
39198 - nls_uint32 offset;
39201 -/* Descriptor for system dependent string. */
39202 -struct sysdep_string
39204 - /* Offset of static string segments in file. */
39205 - nls_uint32 offset;
39206 - /* Alternating sequence of static and system dependent segments.
39207 - The last segment is a static segment, including the trailing NUL. */
39208 - struct segment_pair
39210 - /* Size of static segment. */
39211 - nls_uint32 segsize;
39212 - /* Reference to system dependent string segment, or ~0 at the end. */
39213 - nls_uint32 sysdepref;
39217 -/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
39218 - regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
39219 -#define SEGMENTS_END ((nls_uint32) ~0)
39221 -/* @@ begin of epilog @@ */
39223 -#endif /* gettext.h */
39224 diff -urN BUILD/abook-0.6.0pre2/intl/hash-string.h abook/intl/hash-string.h
39225 --- BUILD/abook-0.6.0pre2/intl/hash-string.h 2005-09-17 12:10:26.000000000 +0200
39226 +++ abook/intl/hash-string.h 1970-01-01 01:00:00.000000000 +0100
39228 -/* Description of GNU message catalog format: string hashing function.
39229 - Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
39231 - This program is free software; you can redistribute it and/or modify it
39232 - under the terms of the GNU Library General Public License as published
39233 - by the Free Software Foundation; either version 2, or (at your option)
39234 - any later version.
39236 - This program is distributed in the hope that it will be useful,
39237 - but WITHOUT ANY WARRANTY; without even the implied warranty of
39238 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39239 - Library General Public License for more details.
39241 - You should have received a copy of the GNU Library General Public
39242 - License along with this program; if not, write to the Free Software
39243 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
39246 -/* @@ end of prolog @@ */
39248 -/* We assume to have `unsigned long int' value with at least 32 bits. */
39249 -#define HASHWORDBITS 32
39252 -/* Defines the so called `hashpjw' function by P.J. Weinberger
39253 - [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
39254 - 1986, 1987 Bell Telephone Laboratories, Inc.] */
39255 -static inline unsigned long int
39256 -hash_string (const char *str_param)
39258 - unsigned long int hval, g;
39259 - const char *str = str_param;
39261 - /* Compute the hash value for the given string. */
39263 - while (*str != '\0')
39266 - hval += (unsigned char) *str++;
39267 - g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
39270 - hval ^= g >> (HASHWORDBITS - 8);
39276 diff -urN BUILD/abook-0.6.0pre2/intl/intl-compat.c abook/intl/intl-compat.c
39277 --- BUILD/abook-0.6.0pre2/intl/intl-compat.c 2005-09-17 12:10:26.000000000 +0200
39278 +++ abook/intl/intl-compat.c 1970-01-01 01:00:00.000000000 +0100
39280 -/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
39282 - Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
39284 - This program is free software; you can redistribute it and/or modify it
39285 - under the terms of the GNU Library General Public License as published
39286 - by the Free Software Foundation; either version 2, or (at your option)
39287 - any later version.
39289 - This program is distributed in the hope that it will be useful,
39290 - but WITHOUT ANY WARRANTY; without even the implied warranty of
39291 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39292 - Library General Public License for more details.
39294 - You should have received a copy of the GNU Library General Public
39295 - License along with this program; if not, write to the Free Software
39296 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
39299 -#ifdef HAVE_CONFIG_H
39300 -# include <config.h>
39303 -#include "gettextP.h"
39305 -/* @@ end of prolog @@ */
39307 -/* This file redirects the gettext functions (without prefix) to those
39308 - defined in the included GNU libintl library (with "libintl_" prefix).
39309 - It is compiled into libintl in order to make the AM_GNU_GETTEXT test
39310 - of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
39311 - has the redirections primarily in the <libintl.h> include file.
39312 - It is also compiled into libgnuintl so that libgnuintl.so can be used
39313 - as LD_PRELOADable library on glibc systems, to provide the extra
39314 - features that the functions in the libc don't have (namely, logging). */
39324 -#undef bindtextdomain
39325 -#undef bind_textdomain_codeset
39328 -/* When building a DLL, we must export some functions. Note that because
39329 - the functions are only defined for binary backward compatibility, we
39330 - don't need to use __declspec(dllimport) in any case. */
39331 -#if defined _MSC_VER && BUILDING_DLL
39332 -# define DLL_EXPORTED __declspec(dllexport)
39334 -# define DLL_EXPORTED
39340 -gettext (const char *msgid)
39342 - return libintl_gettext (msgid);
39348 -dgettext (const char *domainname, const char *msgid)
39350 - return libintl_dgettext (domainname, msgid);
39356 -dcgettext (const char *domainname, const char *msgid, int category)
39358 - return libintl_dcgettext (domainname, msgid, category);
39364 -ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
39366 - return libintl_ngettext (msgid1, msgid2, n);
39372 -dngettext (const char *domainname,
39373 - const char *msgid1, const char *msgid2, unsigned long int n)
39375 - return libintl_dngettext (domainname, msgid1, msgid2, n);
39381 -dcngettext (const char *domainname,
39382 - const char *msgid1, const char *msgid2, unsigned long int n,
39385 - return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
39391 -textdomain (const char *domainname)
39393 - return libintl_textdomain (domainname);
39399 -bindtextdomain (const char *domainname, const char *dirname)
39401 - return libintl_bindtextdomain (domainname, dirname);
39407 -bind_textdomain_codeset (const char *domainname, const char *codeset)
39409 - return libintl_bind_textdomain_codeset (domainname, codeset);
39411 diff -urN BUILD/abook-0.6.0pre2/intl/l10nflist.c abook/intl/l10nflist.c
39412 --- BUILD/abook-0.6.0pre2/intl/l10nflist.c 2005-09-17 12:10:26.000000000 +0200
39413 +++ abook/intl/l10nflist.c 1970-01-01 01:00:00.000000000 +0100
39415 -/* Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
39416 - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
39418 - This program is free software; you can redistribute it and/or modify it
39419 - under the terms of the GNU Library General Public License as published
39420 - by the Free Software Foundation; either version 2, or (at your option)
39421 - any later version.
39423 - This program is distributed in the hope that it will be useful,
39424 - but WITHOUT ANY WARRANTY; without even the implied warranty of
39425 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39426 - Library General Public License for more details.
39428 - You should have received a copy of the GNU Library General Public
39429 - License along with this program; if not, write to the Free Software
39430 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
39433 -/* Tell glibc's <string.h> to provide a prototype for stpcpy().
39434 - This must come before <config.h> because <config.h> may include
39435 - <features.h>, and once <features.h> has been included, it's too late. */
39436 -#ifndef _GNU_SOURCE
39437 -# define _GNU_SOURCE 1
39440 -#ifdef HAVE_CONFIG_H
39441 -# include <config.h>
39444 -#include <string.h>
39446 -#if defined _LIBC || defined HAVE_ARGZ_H
39447 -# include <argz.h>
39449 -#include <ctype.h>
39450 -#include <sys/types.h>
39451 -#include <stdlib.h>
39453 -#include "loadinfo.h"
39455 -/* On some strange systems still no definition of NULL is found. Sigh! */
39457 -# if defined __STDC__ && __STDC__
39458 -# define NULL ((void *) 0)
39464 -/* @@ end of prolog @@ */
39467 -/* Rename the non ANSI C functions. This is required by the standard
39468 - because some ANSI C functions will require linking with this object
39469 - file and the name space must not be polluted. */
39471 -# define stpcpy(dest, src) __stpcpy(dest, src)
39474 -# ifndef HAVE_STPCPY
39475 -static char *stpcpy (char *dest, const char *src);
39479 -/* Pathname support.
39480 - ISSLASH(C) tests whether C is a directory separator character.
39481 - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
39482 - it may be concatenated to a directory pathname.
39484 -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
39485 - /* Win32, Cygwin, OS/2, DOS */
39486 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
39487 -# define HAS_DEVICE(P) \
39488 - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
39489 - && (P)[1] == ':')
39490 -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
39493 -# define ISSLASH(C) ((C) == '/')
39494 -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
39497 -/* Define function which are usually not available. */
39499 -#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
39500 -/* Returns the number of strings in ARGZ. */
39502 -argz_count__ (const char *argz, size_t len)
39504 - size_t count = 0;
39507 - size_t part_len = strlen (argz);
39508 - argz += part_len + 1;
39509 - len -= part_len + 1;
39514 -# undef __argz_count
39515 -# define __argz_count(argz, len) argz_count__ (argz, len)
39518 -# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
39520 -#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
39522 -#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
39523 -/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
39524 - except the last into the character SEP. */
39526 -argz_stringify__ (char *argz, size_t len, int sep)
39530 - size_t part_len = strlen (argz);
39531 - argz += part_len;
39532 - len -= part_len + 1;
39537 -# undef __argz_stringify
39538 -# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
39541 -# define __argz_stringify(argz, len, sep) \
39542 - INTUSE(__argz_stringify) (argz, len, sep)
39544 -#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
39546 -#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
39548 -argz_next__ (char *argz, size_t argz_len, const char *entry)
39552 - if (entry < argz + argz_len)
39553 - entry = strchr (entry, '\0') + 1;
39555 - return entry >= argz + argz_len ? NULL : (char *) entry;
39558 - if (argz_len > 0)
39563 -# undef __argz_next
39564 -# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
39565 -#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
39568 -/* Return number of bits set in X. */
39572 - /* We assume that no more than 16 bits are used. */
39573 - x = ((x & ~0x5555) >> 1) + (x & 0x5555);
39574 - x = ((x & ~0x3333) >> 2) + (x & 0x3333);
39575 - x = ((x >> 4) + x) & 0x0f0f;
39576 - x = ((x >> 8) + x) & 0xff;
39582 -struct loaded_l10nfile *
39583 -_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
39584 - const char *dirlist, size_t dirlist_len,
39585 - int mask, const char *language, const char *territory,
39586 - const char *codeset, const char *normalized_codeset,
39587 - const char *modifier, const char *special,
39588 - const char *sponsor, const char *revision,
39589 - const char *filename, int do_allocate)
39591 - char *abs_filename;
39592 - struct loaded_l10nfile **lastp;
39593 - struct loaded_l10nfile *retval;
39595 - size_t dirlist_count;
39599 - /* If LANGUAGE contains an absolute directory specification, we ignore
39601 - if (IS_ABSOLUTE_PATH (language))
39604 - /* Allocate room for the full file name. */
39605 - abs_filename = (char *) malloc (dirlist_len
39606 - + strlen (language)
39607 - + ((mask & TERRITORY) != 0
39608 - ? strlen (territory) + 1 : 0)
39609 - + ((mask & XPG_CODESET) != 0
39610 - ? strlen (codeset) + 1 : 0)
39611 - + ((mask & XPG_NORM_CODESET) != 0
39612 - ? strlen (normalized_codeset) + 1 : 0)
39613 - + (((mask & XPG_MODIFIER) != 0
39614 - || (mask & CEN_AUDIENCE) != 0)
39615 - ? strlen (modifier) + 1 : 0)
39616 - + ((mask & CEN_SPECIAL) != 0
39617 - ? strlen (special) + 1 : 0)
39618 - + (((mask & CEN_SPONSOR) != 0
39619 - || (mask & CEN_REVISION) != 0)
39620 - ? (1 + ((mask & CEN_SPONSOR) != 0
39621 - ? strlen (sponsor) : 0)
39622 - + ((mask & CEN_REVISION) != 0
39623 - ? strlen (revision) + 1 : 0)) : 0)
39624 - + 1 + strlen (filename) + 1);
39626 - if (abs_filename == NULL)
39629 - /* Construct file name. */
39630 - cp = abs_filename;
39631 - if (dirlist_len > 0)
39633 - memcpy (cp, dirlist, dirlist_len);
39634 - __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
39635 - cp += dirlist_len;
39639 - cp = stpcpy (cp, language);
39641 - if ((mask & TERRITORY) != 0)
39644 - cp = stpcpy (cp, territory);
39646 - if ((mask & XPG_CODESET) != 0)
39649 - cp = stpcpy (cp, codeset);
39651 - if ((mask & XPG_NORM_CODESET) != 0)
39654 - cp = stpcpy (cp, normalized_codeset);
39656 - if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
39658 - /* This component can be part of both syntaces but has different
39659 - leading characters. For CEN we use `+', else `@'. */
39660 - *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
39661 - cp = stpcpy (cp, modifier);
39663 - if ((mask & CEN_SPECIAL) != 0)
39666 - cp = stpcpy (cp, special);
39668 - if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
39671 - if ((mask & CEN_SPONSOR) != 0)
39672 - cp = stpcpy (cp, sponsor);
39673 - if ((mask & CEN_REVISION) != 0)
39676 - cp = stpcpy (cp, revision);
39681 - stpcpy (cp, filename);
39683 - /* Look in list of already loaded domains whether it is already
39685 - lastp = l10nfile_list;
39686 - for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
39687 - if (retval->filename != NULL)
39689 - int compare = strcmp (retval->filename, abs_filename);
39690 - if (compare == 0)
39691 - /* We found it! */
39695 - /* It's not in the list. */
39700 - lastp = &retval->next;
39703 - if (retval != NULL || do_allocate == 0)
39705 - free (abs_filename);
39709 - dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
39711 - /* Allocate a new loaded_l10nfile. */
39713 - (struct loaded_l10nfile *)
39714 - malloc (sizeof (*retval)
39715 - + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
39716 - * sizeof (struct loaded_l10nfile *)));
39717 - if (retval == NULL)
39720 - retval->filename = abs_filename;
39722 - /* We set retval->data to NULL here; it is filled in later.
39723 - Setting retval->decided to 1 here means that retval does not
39724 - correspond to a real file (dirlist_count > 1) or is not worth
39725 - looking up (if an unnormalized codeset was specified). */
39726 - retval->decided = (dirlist_count > 1
39727 - || ((mask & XPG_CODESET) != 0
39728 - && (mask & XPG_NORM_CODESET) != 0));
39729 - retval->data = NULL;
39731 - retval->next = *lastp;
39735 - /* Recurse to fill the inheritance list of RETVAL.
39736 - If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
39737 - entry does not correspond to a real file; retval->filename contains
39738 - colons. In this case we loop across all elements of DIRLIST and
39739 - across all bit patterns dominated by MASK.
39740 - If the DIRLIST is a single directory or entirely redundant (i.e.
39741 - DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
39742 - MASK, excluding MASK itself.
39743 - In either case, we loop down from MASK to 0. This has the effect
39744 - that the extra bits in the locale name are dropped in this order:
39745 - first the modifier, then the territory, then the codeset, then the
39746 - normalized_codeset. */
39747 - for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
39748 - if ((cnt & ~mask) == 0
39749 - && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
39750 - && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
39752 - if (dirlist_count > 1)
39754 - /* Iterate over all elements of the DIRLIST. */
39755 - char *dir = NULL;
39757 - while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
39759 - retval->successor[entries++]
39760 - = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
39761 - cnt, language, territory, codeset,
39762 - normalized_codeset, modifier, special,
39763 - sponsor, revision, filename, 1);
39766 - retval->successor[entries++]
39767 - = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
39768 - cnt, language, territory, codeset,
39769 - normalized_codeset, modifier, special,
39770 - sponsor, revision, filename, 1);
39772 - retval->successor[entries] = NULL;
39777 -/* Normalize codeset name. There is no standard for the codeset
39778 - names. Normalization allows the user to use any of the common
39779 - names. The return value is dynamically allocated and has to be
39780 - freed by the caller. */
39782 -_nl_normalize_codeset (const char *codeset, size_t name_len)
39785 - int only_digit = 1;
39790 - for (cnt = 0; cnt < name_len; ++cnt)
39791 - if (isalnum ((unsigned char) codeset[cnt]))
39795 - if (isalpha ((unsigned char) codeset[cnt]))
39799 - retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
39801 - if (retval != NULL)
39804 - wp = stpcpy (retval, "iso");
39808 - for (cnt = 0; cnt < name_len; ++cnt)
39809 - if (isalpha ((unsigned char) codeset[cnt]))
39810 - *wp++ = tolower ((unsigned char) codeset[cnt]);
39811 - else if (isdigit ((unsigned char) codeset[cnt]))
39812 - *wp++ = codeset[cnt];
39817 - return (const char *) retval;
39821 -/* @@ begin of epilog @@ */
39823 -/* We don't want libintl.a to depend on any other library. So we
39824 - avoid the non-standard function stpcpy. In GNU C Library this
39825 - function is available, though. Also allow the symbol HAVE_STPCPY
39826 - to be defined. */
39827 -#if !_LIBC && !HAVE_STPCPY
39829 -stpcpy (char *dest, const char *src)
39831 - while ((*dest++ = *src++) != '\0')
39832 - /* Do nothing. */ ;
39836 diff -urN BUILD/abook-0.6.0pre2/intl/langprefs.c abook/intl/langprefs.c
39837 --- BUILD/abook-0.6.0pre2/intl/langprefs.c 2005-09-17 12:10:26.000000000 +0200
39838 +++ abook/intl/langprefs.c 1970-01-01 01:00:00.000000000 +0100
39840 -/* Determine the user's language preferences.
39841 - Copyright (C) 2004-2005 Free Software Foundation, Inc.
39843 - This program is free software; you can redistribute it and/or modify it
39844 - under the terms of the GNU Library General Public License as published
39845 - by the Free Software Foundation; either version 2, or (at your option)
39846 - any later version.
39848 - This program is distributed in the hope that it will be useful,
39849 - but WITHOUT ANY WARRANTY; without even the implied warranty of
39850 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39851 - Library General Public License for more details.
39853 - You should have received a copy of the GNU Library General Public
39854 - License along with this program; if not, write to the Free Software
39855 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
39858 -/* Written by Bruno Haible <bruno@clisp.org>. */
39860 -#ifdef HAVE_CONFIG_H
39861 -# include <config.h>
39864 -#include <stdlib.h>
39866 -#if HAVE_CFPREFERENCESCOPYAPPVALUE
39867 -# include <string.h>
39868 -# include <CFPreferences.h>
39869 -# include <CFPropertyList.h>
39870 -# include <CFArray.h>
39871 -# include <CFString.h>
39872 -extern void _nl_locale_name_canonicalize (char *name);
39875 -/* Determine the user's language preferences, as a colon separated list of
39876 - locale names in XPG syntax
39877 - language[_territory[.codeset]][@modifier]
39878 - The result must not be freed; it is statically allocated.
39879 - The LANGUAGE environment variable does not need to be considered; it is
39880 - already taken into account by the caller. */
39883 -_nl_language_preferences_default (void)
39885 -#if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
39887 - /* Cache the preferences list, since CoreFoundation calls are expensive. */
39888 - static const char *cached_languages;
39889 - static int cache_initialized;
39891 - if (!cache_initialized)
39893 - CFTypeRef preferences =
39894 - CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"),
39895 - kCFPreferencesCurrentApplication);
39896 - if (preferences != NULL
39897 - && CFGetTypeID (preferences) == CFArrayGetTypeID ())
39899 - CFArrayRef prefArray = (CFArrayRef)preferences;
39900 - int n = CFArrayGetCount (prefArray);
39905 - for (i = 0; i < n; i++)
39907 - CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i);
39908 - if (element != NULL
39909 - && CFGetTypeID (element) == CFStringGetTypeID ()
39910 - && CFStringGetCString ((CFStringRef)element,
39911 - buf, sizeof (buf),
39912 - kCFStringEncodingASCII))
39914 - _nl_locale_name_canonicalize (buf);
39915 - size += strlen (buf) + 1;
39916 - /* Most GNU programs use msgids in English and don't ship
39917 - an en.mo message catalog. Therefore when we see "en"
39918 - in the preferences list, arrange for gettext() to
39919 - return the msgid, and ignore all further elements of
39920 - the preferences list. */
39921 - if (strcmp (buf, "en") == 0)
39929 - char *languages = (char *) malloc (size);
39931 - if (languages != NULL)
39933 - char *p = languages;
39935 - for (i = 0; i < n; i++)
39937 - CFTypeRef element =
39938 - CFArrayGetValueAtIndex (prefArray, i);
39939 - if (element != NULL
39940 - && CFGetTypeID (element) == CFStringGetTypeID ()
39941 - && CFStringGetCString ((CFStringRef)element,
39942 - buf, sizeof (buf),
39943 - kCFStringEncodingASCII))
39945 - _nl_locale_name_canonicalize (buf);
39947 - p += strlen (buf);
39949 - if (strcmp (buf, "en") == 0)
39957 - cached_languages = languages;
39961 - cache_initialized = 1;
39963 - if (cached_languages != NULL)
39964 - return cached_languages;
39970 diff -urN BUILD/abook-0.6.0pre2/intl/libgnuintl.h.in abook/intl/libgnuintl.h.in
39971 --- BUILD/abook-0.6.0pre2/intl/libgnuintl.h.in 2005-09-17 12:10:26.000000000 +0200
39972 +++ abook/intl/libgnuintl.h.in 1970-01-01 01:00:00.000000000 +0100
39974 -/* Message catalogs for internationalization.
39975 - Copyright (C) 1995-1997, 2000-2004 Free Software Foundation, Inc.
39977 - This program is free software; you can redistribute it and/or modify it
39978 - under the terms of the GNU Library General Public License as published
39979 - by the Free Software Foundation; either version 2, or (at your option)
39980 - any later version.
39982 - This program is distributed in the hope that it will be useful,
39983 - but WITHOUT ANY WARRANTY; without even the implied warranty of
39984 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39985 - Library General Public License for more details.
39987 - You should have received a copy of the GNU Library General Public
39988 - License along with this program; if not, write to the Free Software
39989 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
39992 -#ifndef _LIBINTL_H
39993 -#define _LIBINTL_H 1
39995 -#include <locale.h>
39997 -/* The LC_MESSAGES locale category is the category used by the functions
39998 - gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
39999 - On systems that don't define it, use an arbitrary value instead.
40000 - On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
40001 - then includes <libintl.h> (i.e. this file!) and then only defines
40002 - LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
40004 -#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
40005 -# define LC_MESSAGES 1729
40008 -/* We define an additional symbol to signal that we use the GNU
40009 - implementation of gettext. */
40010 -#define __USE_GNU_GETTEXT 1
40012 -/* Provide information about the supported file formats. Returns the
40013 - maximum minor revision number supported for a given major revision. */
40014 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
40015 - ((major) == 0 || (major) == 1 ? 1 : -1)
40017 -/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
40018 - precedence over _conio_gettext. */
40023 -#ifdef __cplusplus
40028 -/* We redirect the functions to those prefixed with "libintl_". This is
40029 - necessary, because some systems define gettext/textdomain/... in the C
40030 - library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
40031 - If we used the unprefixed names, there would be cases where the
40032 - definition in the C library would override the one in the libintl.so
40033 - shared library. Recall that on ELF systems, the symbols are looked
40034 - up in the following order:
40035 - 1. in the executable,
40036 - 2. in the shared libraries specified on the link command line, in order,
40037 - 3. in the dependencies of the shared libraries specified on the link
40039 - 4. in the dlopen()ed shared libraries, in the order in which they were
40041 - The definition in the C library would override the one in libintl.so if
40043 - * -lc is given on the link command line and -lintl isn't, or
40044 - * -lc is given on the link command line before -lintl, or
40045 - * libintl.so is a dependency of a dlopen()ed shared library but not
40046 - linked to the executable at link time.
40047 - Since Solaris gettext() behaves differently than GNU gettext(), this
40048 - would be unacceptable.
40050 - The redirection happens by default through macros in C, so that &gettext
40051 - is independent of the compilation unit, but through inline functions in
40052 - C++, in order not to interfere with the name mangling of class fields or
40053 - class methods called 'gettext'. */
40055 -/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
40056 - If he doesn't, we choose the method. A third possible method is
40057 - _INTL_REDIRECT_ASM, supported only by GCC. */
40058 -#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
40059 -# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
40060 -# define _INTL_REDIRECT_ASM
40062 -# ifdef __cplusplus
40063 -# define _INTL_REDIRECT_INLINE
40065 -# define _INTL_REDIRECT_MACROS
40069 -/* Auxiliary macros. */
40070 -#ifdef _INTL_REDIRECT_ASM
40071 -# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
40072 -# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
40073 -# define _INTL_STRINGIFY(prefix) #prefix
40075 -# define _INTL_ASM(cname)
40078 -/* Look up MSGID in the current default message catalog for the current
40079 - LC_MESSAGES locale. If not found, returns MSGID itself (the default
40081 -#ifdef _INTL_REDIRECT_INLINE
40082 -extern char *libintl_gettext (const char *__msgid);
40083 -static inline char *gettext (const char *__msgid)
40085 - return libintl_gettext (__msgid);
40088 -#ifdef _INTL_REDIRECT_MACROS
40089 -# define gettext libintl_gettext
40091 -extern char *gettext (const char *__msgid)
40092 - _INTL_ASM (libintl_gettext);
40095 -/* Look up MSGID in the DOMAINNAME message catalog for the current
40096 - LC_MESSAGES locale. */
40097 -#ifdef _INTL_REDIRECT_INLINE
40098 -extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
40099 -static inline char *dgettext (const char *__domainname, const char *__msgid)
40101 - return libintl_dgettext (__domainname, __msgid);
40104 -#ifdef _INTL_REDIRECT_MACROS
40105 -# define dgettext libintl_dgettext
40107 -extern char *dgettext (const char *__domainname, const char *__msgid)
40108 - _INTL_ASM (libintl_dgettext);
40111 -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
40113 -#ifdef _INTL_REDIRECT_INLINE
40114 -extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
40116 -static inline char *dcgettext (const char *__domainname, const char *__msgid,
40119 - return libintl_dcgettext (__domainname, __msgid, __category);
40122 -#ifdef _INTL_REDIRECT_MACROS
40123 -# define dcgettext libintl_dcgettext
40125 -extern char *dcgettext (const char *__domainname, const char *__msgid,
40127 - _INTL_ASM (libintl_dcgettext);
40131 -/* Similar to `gettext' but select the plural form corresponding to the
40133 -#ifdef _INTL_REDIRECT_INLINE
40134 -extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
40135 - unsigned long int __n);
40136 -static inline char *ngettext (const char *__msgid1, const char *__msgid2,
40137 - unsigned long int __n)
40139 - return libintl_ngettext (__msgid1, __msgid2, __n);
40142 -#ifdef _INTL_REDIRECT_MACROS
40143 -# define ngettext libintl_ngettext
40145 -extern char *ngettext (const char *__msgid1, const char *__msgid2,
40146 - unsigned long int __n)
40147 - _INTL_ASM (libintl_ngettext);
40150 -/* Similar to `dgettext' but select the plural form corresponding to the
40152 -#ifdef _INTL_REDIRECT_INLINE
40153 -extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
40154 - const char *__msgid2, unsigned long int __n);
40155 -static inline char *dngettext (const char *__domainname, const char *__msgid1,
40156 - const char *__msgid2, unsigned long int __n)
40158 - return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
40161 -#ifdef _INTL_REDIRECT_MACROS
40162 -# define dngettext libintl_dngettext
40164 -extern char *dngettext (const char *__domainname,
40165 - const char *__msgid1, const char *__msgid2,
40166 - unsigned long int __n)
40167 - _INTL_ASM (libintl_dngettext);
40170 -/* Similar to `dcgettext' but select the plural form corresponding to the
40172 -#ifdef _INTL_REDIRECT_INLINE
40173 -extern char *libintl_dcngettext (const char *__domainname,
40174 - const char *__msgid1, const char *__msgid2,
40175 - unsigned long int __n, int __category);
40176 -static inline char *dcngettext (const char *__domainname,
40177 - const char *__msgid1, const char *__msgid2,
40178 - unsigned long int __n, int __category)
40180 - return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
40183 -#ifdef _INTL_REDIRECT_MACROS
40184 -# define dcngettext libintl_dcngettext
40186 -extern char *dcngettext (const char *__domainname,
40187 - const char *__msgid1, const char *__msgid2,
40188 - unsigned long int __n, int __category)
40189 - _INTL_ASM (libintl_dcngettext);
40193 -/* Set the current default message catalog to DOMAINNAME.
40194 - If DOMAINNAME is null, return the current default.
40195 - If DOMAINNAME is "", reset to the default of "messages". */
40196 -#ifdef _INTL_REDIRECT_INLINE
40197 -extern char *libintl_textdomain (const char *__domainname);
40198 -static inline char *textdomain (const char *__domainname)
40200 - return libintl_textdomain (__domainname);
40203 -#ifdef _INTL_REDIRECT_MACROS
40204 -# define textdomain libintl_textdomain
40206 -extern char *textdomain (const char *__domainname)
40207 - _INTL_ASM (libintl_textdomain);
40210 -/* Specify that the DOMAINNAME message catalog will be found
40211 - in DIRNAME rather than in the system locale data base. */
40212 -#ifdef _INTL_REDIRECT_INLINE
40213 -extern char *libintl_bindtextdomain (const char *__domainname,
40214 - const char *__dirname);
40215 -static inline char *bindtextdomain (const char *__domainname,
40216 - const char *__dirname)
40218 - return libintl_bindtextdomain (__domainname, __dirname);
40221 -#ifdef _INTL_REDIRECT_MACROS
40222 -# define bindtextdomain libintl_bindtextdomain
40224 -extern char *bindtextdomain (const char *__domainname, const char *__dirname)
40225 - _INTL_ASM (libintl_bindtextdomain);
40228 -/* Specify the character encoding in which the messages from the
40229 - DOMAINNAME message catalog will be returned. */
40230 -#ifdef _INTL_REDIRECT_INLINE
40231 -extern char *libintl_bind_textdomain_codeset (const char *__domainname,
40232 - const char *__codeset);
40233 -static inline char *bind_textdomain_codeset (const char *__domainname,
40234 - const char *__codeset)
40236 - return libintl_bind_textdomain_codeset (__domainname, __codeset);
40239 -#ifdef _INTL_REDIRECT_MACROS
40240 -# define bind_textdomain_codeset libintl_bind_textdomain_codeset
40242 -extern char *bind_textdomain_codeset (const char *__domainname,
40243 - const char *__codeset)
40244 - _INTL_ASM (libintl_bind_textdomain_codeset);
40248 -/* Support for format strings with positions in *printf(), following the
40249 - POSIX/XSI specification.
40250 - Note: These replacements for the *printf() functions are visible only
40251 - in source files that #include <libintl.h> or #include "gettext.h".
40252 - Packages that use *printf() in source files that don't refer to _()
40253 - or gettext() but for which the format string could be the return value
40254 - of _() or gettext() need to add this #include. Oh well. */
40256 -#if !@HAVE_POSIX_PRINTF@
40258 -#include <stdio.h>
40259 -#include <stddef.h>
40261 -/* Get va_list. */
40262 -#if __STDC__ || defined __cplusplus || defined _MSC_VER
40263 -# include <stdarg.h>
40265 -# include <varargs.h>
40269 -#define fprintf libintl_fprintf
40270 -extern int fprintf (FILE *, const char *, ...);
40272 -#define vfprintf libintl_vfprintf
40273 -extern int vfprintf (FILE *, const char *, va_list);
40276 -#define printf libintl_printf
40277 -extern int printf (const char *, ...);
40279 -#define vprintf libintl_vprintf
40280 -extern int vprintf (const char *, va_list);
40283 -#define sprintf libintl_sprintf
40284 -extern int sprintf (char *, const char *, ...);
40286 -#define vsprintf libintl_vsprintf
40287 -extern int vsprintf (char *, const char *, va_list);
40289 -#if @HAVE_SNPRINTF@
40292 -#define snprintf libintl_snprintf
40293 -extern int snprintf (char *, size_t, const char *, ...);
40295 -#define vsnprintf libintl_vsnprintf
40296 -extern int vsnprintf (char *, size_t, const char *, va_list);
40300 -#if @HAVE_ASPRINTF@
40303 -#define asprintf libintl_asprintf
40304 -extern int asprintf (char **, const char *, ...);
40306 -#define vasprintf libintl_vasprintf
40307 -extern int vasprintf (char **, const char *, va_list);
40311 -#if @HAVE_WPRINTF@
40314 -#define fwprintf libintl_fwprintf
40315 -extern int fwprintf (FILE *, const wchar_t *, ...);
40317 -#define vfwprintf libintl_vfwprintf
40318 -extern int vfwprintf (FILE *, const wchar_t *, va_list);
40321 -#define wprintf libintl_wprintf
40322 -extern int wprintf (const wchar_t *, ...);
40324 -#define vwprintf libintl_vwprintf
40325 -extern int vwprintf (const wchar_t *, va_list);
40328 -#define swprintf libintl_swprintf
40329 -extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
40331 -#define vswprintf libintl_vswprintf
40332 -extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
40339 -/* Support for relocatable packages. */
40341 -/* Sets the original and the current installation prefix of the package.
40342 - Relocation simply replaces a pathname starting with the original prefix
40343 - by the corresponding pathname with the current prefix instead. Both
40344 - prefixes should be directory names without trailing slash (i.e. use ""
40345 - instead of "/"). */
40346 -#define libintl_set_relocation_prefix libintl_set_relocation_prefix
40348 - libintl_set_relocation_prefix (const char *orig_prefix,
40349 - const char *curr_prefix);
40352 -#ifdef __cplusplus
40356 -#endif /* libintl.h */
40357 diff -urN BUILD/abook-0.6.0pre2/intl/loadinfo.h abook/intl/loadinfo.h
40358 --- BUILD/abook-0.6.0pre2/intl/loadinfo.h 2005-09-17 12:10:26.000000000 +0200
40359 +++ abook/intl/loadinfo.h 1970-01-01 01:00:00.000000000 +0100
40361 -/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
40362 - This file is part of the GNU C Library.
40363 - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
40365 - This program is free software; you can redistribute it and/or modify it
40366 - under the terms of the GNU Library General Public License as published
40367 - by the Free Software Foundation; either version 2, or (at your option)
40368 - any later version.
40370 - This program is distributed in the hope that it will be useful,
40371 - but WITHOUT ANY WARRANTY; without even the implied warranty of
40372 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
40373 - Library General Public License for more details.
40375 - You should have received a copy of the GNU Library General Public
40376 - License along with this program; if not, write to the Free Software
40377 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
40380 -#ifndef _LOADINFO_H
40381 -#define _LOADINFO_H 1
40383 -/* Declarations of locale dependent catalog lookup functions.
40386 - localealias.c Possibly replace a locale name by another.
40387 - explodename.c Split a locale name into its various fields.
40388 - l10nflist.c Generate a list of filenames of possible message catalogs.
40389 - finddomain.c Find and open the relevant message catalogs.
40391 - The main function _nl_find_domain() in finddomain.c is declared
40395 -#ifndef internal_function
40396 -# define internal_function
40399 -/* Tell the compiler when a conditional or integer expression is
40400 - almost always true or almost always false. */
40401 -#ifndef HAVE_BUILTIN_EXPECT
40402 -# define __builtin_expect(expr, val) (expr)
40405 -/* Separator in PATH like lists of pathnames. */
40406 -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
40407 - /* Win32, OS/2, DOS */
40408 -# define PATH_SEPARATOR ';'
40411 -# define PATH_SEPARATOR ':'
40414 -/* Encoding of locale name parts. */
40415 -#define CEN_REVISION 1
40416 -#define CEN_SPONSOR 2
40417 -#define CEN_SPECIAL 4
40418 -#define XPG_NORM_CODESET 8
40419 -#define XPG_CODESET 16
40420 -#define TERRITORY 32
40421 -#define CEN_AUDIENCE 64
40422 -#define XPG_MODIFIER 128
40424 -#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
40425 -#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
40428 -struct loaded_l10nfile
40430 - const char *filename;
40433 - const void *data;
40435 - struct loaded_l10nfile *next;
40436 - struct loaded_l10nfile *successor[1];
40440 -/* Normalize codeset name. There is no standard for the codeset
40441 - names. Normalization allows the user to use any of the common
40442 - names. The return value is dynamically allocated and has to be
40443 - freed by the caller. */
40444 -extern const char *_nl_normalize_codeset (const char *codeset,
40445 - size_t name_len);
40447 -/* Lookup a locale dependent file.
40448 - *L10NFILE_LIST denotes a pool of lookup results of locale dependent
40449 - files of the same kind, sorted in decreasing order of ->filename.
40450 - DIRLIST and DIRLIST_LEN are an argz list of directories in which to
40451 - look, containing at least one directory (i.e. DIRLIST_LEN > 0).
40452 - MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
40453 - SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
40454 - produced by _nl_explode_name(). FILENAME is the filename suffix.
40455 - The return value is the lookup result, either found in *L10NFILE_LIST,
40456 - or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
40457 - If the return value is non-NULL, it is added to *L10NFILE_LIST, and
40458 - its ->next field denotes the chaining inside *L10NFILE_LIST, and
40459 - furthermore its ->successor[] field contains a list of other lookup
40460 - results from which this lookup result inherits. */
40461 -extern struct loaded_l10nfile *
40462 -_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
40463 - const char *dirlist, size_t dirlist_len, int mask,
40464 - const char *language, const char *territory,
40465 - const char *codeset, const char *normalized_codeset,
40466 - const char *modifier, const char *special,
40467 - const char *sponsor, const char *revision,
40468 - const char *filename, int do_allocate);
40470 -/* Lookup the real locale name for a locale alias NAME, or NULL if
40471 - NAME is not a locale alias (but possibly a real locale name).
40472 - The return value is statically allocated and must not be freed. */
40473 -extern const char *_nl_expand_alias (const char *name);
40475 -/* Split a locale name NAME into its pieces: language, modifier,
40476 - territory, codeset, special, sponsor, revision.
40477 - NAME gets destructively modified: NUL bytes are inserted here and
40478 - there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
40479 - *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
40480 - pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
40481 - gets assigned the expanded *CODESET, if it is different from *CODESET;
40482 - this one is dynamically allocated and has to be freed by the caller.
40483 - The return value is a bitmask, where each bit corresponds to one
40485 - XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
40486 - TERRITORY for *TERRITORY,
40487 - XPG_CODESET for *CODESET,
40488 - XPG_NORM_CODESET for *NORMALIZED_CODESET,
40489 - CEN_SPECIAL for *SPECIAL,
40490 - CEN_SPONSOR for *SPONSOR,
40491 - CEN_REVISION for *REVISION.
40493 -extern int _nl_explode_name (char *name, const char **language,
40494 - const char **modifier, const char **territory,
40495 - const char **codeset,
40496 - const char **normalized_codeset,
40497 - const char **special, const char **sponsor,
40498 - const char **revision);
40500 -/* Split a locale name NAME into a leading language part and all the
40501 - rest. Return a pointer to the first character after the language,
40502 - i.e. to the first byte of the rest. */
40503 -extern char *_nl_find_language (const char *name);
40505 -#endif /* loadinfo.h */
40506 diff -urN BUILD/abook-0.6.0pre2/intl/loadmsgcat.c abook/intl/loadmsgcat.c
40507 --- BUILD/abook-0.6.0pre2/intl/loadmsgcat.c 2005-09-17 12:10:26.000000000 +0200
40508 +++ abook/intl/loadmsgcat.c 1970-01-01 01:00:00.000000000 +0100
40510 -/* Load needed message catalogs.
40511 - Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
40513 - This program is free software; you can redistribute it and/or modify it
40514 - under the terms of the GNU Library General Public License as published
40515 - by the Free Software Foundation; either version 2, or (at your option)
40516 - any later version.
40518 - This program is distributed in the hope that it will be useful,
40519 - but WITHOUT ANY WARRANTY; without even the implied warranty of
40520 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
40521 - Library General Public License for more details.
40523 - You should have received a copy of the GNU Library General Public
40524 - License along with this program; if not, write to the Free Software
40525 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
40528 -/* Tell glibc's <string.h> to provide a prototype for mempcpy().
40529 - This must come before <config.h> because <config.h> may include
40530 - <features.h>, and once <features.h> has been included, it's too late. */
40531 -#ifndef _GNU_SOURCE
40532 -# define _GNU_SOURCE 1
40535 -#ifdef HAVE_CONFIG_H
40536 -# include <config.h>
40539 -#include <ctype.h>
40540 -#include <errno.h>
40541 -#include <fcntl.h>
40542 -#include <sys/types.h>
40543 -#include <sys/stat.h>
40547 -# define alloca __builtin_alloca
40548 -# define HAVE_ALLOCA 1
40551 -# include <malloc.h>
40552 -# define alloca _alloca
40554 -# if defined HAVE_ALLOCA_H || defined _LIBC
40555 -# include <alloca.h>
40568 -#include <stdlib.h>
40569 -#include <string.h>
40571 -#if defined HAVE_UNISTD_H || defined _LIBC
40572 -# include <unistd.h>
40576 -# include <langinfo.h>
40577 -# include <locale.h>
40580 -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
40581 - || (defined _LIBC && defined _POSIX_MAPPED_FILES)
40582 -# include <sys/mman.h>
40584 -# define HAVE_MMAP 1
40589 -#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
40590 -# include <stdint.h>
40592 -#if defined HAVE_INTTYPES_H || defined _LIBC
40593 -# include <inttypes.h>
40597 -#include "gettextP.h"
40598 -#include "hash-string.h"
40599 -#include "plural-exp.h"
40602 -# include "../locale/localeinfo.h"
40605 -/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
40606 - Note that our fallback values need not be literal strings, because we don't
40607 - use them with preprocessor string concatenation. */
40608 -#if !defined PRId8 || PRI_MACROS_BROKEN
40610 -# define PRId8 "d"
40612 -#if !defined PRIi8 || PRI_MACROS_BROKEN
40614 -# define PRIi8 "i"
40616 -#if !defined PRIo8 || PRI_MACROS_BROKEN
40618 -# define PRIo8 "o"
40620 -#if !defined PRIu8 || PRI_MACROS_BROKEN
40622 -# define PRIu8 "u"
40624 -#if !defined PRIx8 || PRI_MACROS_BROKEN
40626 -# define PRIx8 "x"
40628 -#if !defined PRIX8 || PRI_MACROS_BROKEN
40630 -# define PRIX8 "X"
40632 -#if !defined PRId16 || PRI_MACROS_BROKEN
40634 -# define PRId16 "d"
40636 -#if !defined PRIi16 || PRI_MACROS_BROKEN
40638 -# define PRIi16 "i"
40640 -#if !defined PRIo16 || PRI_MACROS_BROKEN
40642 -# define PRIo16 "o"
40644 -#if !defined PRIu16 || PRI_MACROS_BROKEN
40646 -# define PRIu16 "u"
40648 -#if !defined PRIx16 || PRI_MACROS_BROKEN
40650 -# define PRIx16 "x"
40652 -#if !defined PRIX16 || PRI_MACROS_BROKEN
40654 -# define PRIX16 "X"
40656 -#if !defined PRId32 || PRI_MACROS_BROKEN
40658 -# define PRId32 "d"
40660 -#if !defined PRIi32 || PRI_MACROS_BROKEN
40662 -# define PRIi32 "i"
40664 -#if !defined PRIo32 || PRI_MACROS_BROKEN
40666 -# define PRIo32 "o"
40668 -#if !defined PRIu32 || PRI_MACROS_BROKEN
40670 -# define PRIu32 "u"
40672 -#if !defined PRIx32 || PRI_MACROS_BROKEN
40674 -# define PRIx32 "x"
40676 -#if !defined PRIX32 || PRI_MACROS_BROKEN
40678 -# define PRIX32 "X"
40680 -#if !defined PRId64 || PRI_MACROS_BROKEN
40682 -# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
40684 -#if !defined PRIi64 || PRI_MACROS_BROKEN
40686 -# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
40688 -#if !defined PRIo64 || PRI_MACROS_BROKEN
40690 -# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
40692 -#if !defined PRIu64 || PRI_MACROS_BROKEN
40694 -# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
40696 -#if !defined PRIx64 || PRI_MACROS_BROKEN
40698 -# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
40700 -#if !defined PRIX64 || PRI_MACROS_BROKEN
40702 -# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
40704 -#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
40705 -# undef PRIdLEAST8
40706 -# define PRIdLEAST8 "d"
40708 -#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
40709 -# undef PRIiLEAST8
40710 -# define PRIiLEAST8 "i"
40712 -#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
40713 -# undef PRIoLEAST8
40714 -# define PRIoLEAST8 "o"
40716 -#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
40717 -# undef PRIuLEAST8
40718 -# define PRIuLEAST8 "u"
40720 -#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
40721 -# undef PRIxLEAST8
40722 -# define PRIxLEAST8 "x"
40724 -#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
40725 -# undef PRIXLEAST8
40726 -# define PRIXLEAST8 "X"
40728 -#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
40729 -# undef PRIdLEAST16
40730 -# define PRIdLEAST16 "d"
40732 -#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
40733 -# undef PRIiLEAST16
40734 -# define PRIiLEAST16 "i"
40736 -#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
40737 -# undef PRIoLEAST16
40738 -# define PRIoLEAST16 "o"
40740 -#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
40741 -# undef PRIuLEAST16
40742 -# define PRIuLEAST16 "u"
40744 -#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
40745 -# undef PRIxLEAST16
40746 -# define PRIxLEAST16 "x"
40748 -#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
40749 -# undef PRIXLEAST16
40750 -# define PRIXLEAST16 "X"
40752 -#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
40753 -# undef PRIdLEAST32
40754 -# define PRIdLEAST32 "d"
40756 -#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
40757 -# undef PRIiLEAST32
40758 -# define PRIiLEAST32 "i"
40760 -#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
40761 -# undef PRIoLEAST32
40762 -# define PRIoLEAST32 "o"
40764 -#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
40765 -# undef PRIuLEAST32
40766 -# define PRIuLEAST32 "u"
40768 -#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
40769 -# undef PRIxLEAST32
40770 -# define PRIxLEAST32 "x"
40772 -#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
40773 -# undef PRIXLEAST32
40774 -# define PRIXLEAST32 "X"
40776 -#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
40777 -# undef PRIdLEAST64
40778 -# define PRIdLEAST64 PRId64
40780 -#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
40781 -# undef PRIiLEAST64
40782 -# define PRIiLEAST64 PRIi64
40784 -#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
40785 -# undef PRIoLEAST64
40786 -# define PRIoLEAST64 PRIo64
40788 -#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
40789 -# undef PRIuLEAST64
40790 -# define PRIuLEAST64 PRIu64
40792 -#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
40793 -# undef PRIxLEAST64
40794 -# define PRIxLEAST64 PRIx64
40796 -#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
40797 -# undef PRIXLEAST64
40798 -# define PRIXLEAST64 PRIX64
40800 -#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
40802 -# define PRIdFAST8 "d"
40804 -#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
40806 -# define PRIiFAST8 "i"
40808 -#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
40810 -# define PRIoFAST8 "o"
40812 -#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
40814 -# define PRIuFAST8 "u"
40816 -#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
40818 -# define PRIxFAST8 "x"
40820 -#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
40822 -# define PRIXFAST8 "X"
40824 -#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
40825 -# undef PRIdFAST16
40826 -# define PRIdFAST16 "d"
40828 -#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
40829 -# undef PRIiFAST16
40830 -# define PRIiFAST16 "i"
40832 -#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
40833 -# undef PRIoFAST16
40834 -# define PRIoFAST16 "o"
40836 -#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
40837 -# undef PRIuFAST16
40838 -# define PRIuFAST16 "u"
40840 -#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
40841 -# undef PRIxFAST16
40842 -# define PRIxFAST16 "x"
40844 -#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
40845 -# undef PRIXFAST16
40846 -# define PRIXFAST16 "X"
40848 -#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
40849 -# undef PRIdFAST32
40850 -# define PRIdFAST32 "d"
40852 -#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
40853 -# undef PRIiFAST32
40854 -# define PRIiFAST32 "i"
40856 -#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
40857 -# undef PRIoFAST32
40858 -# define PRIoFAST32 "o"
40860 -#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
40861 -# undef PRIuFAST32
40862 -# define PRIuFAST32 "u"
40864 -#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
40865 -# undef PRIxFAST32
40866 -# define PRIxFAST32 "x"
40868 -#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
40869 -# undef PRIXFAST32
40870 -# define PRIXFAST32 "X"
40872 -#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
40873 -# undef PRIdFAST64
40874 -# define PRIdFAST64 PRId64
40876 -#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
40877 -# undef PRIiFAST64
40878 -# define PRIiFAST64 PRIi64
40880 -#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
40881 -# undef PRIoFAST64
40882 -# define PRIoFAST64 PRIo64
40884 -#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
40885 -# undef PRIuFAST64
40886 -# define PRIuFAST64 PRIu64
40888 -#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
40889 -# undef PRIxFAST64
40890 -# define PRIxFAST64 PRIx64
40892 -#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
40893 -# undef PRIXFAST64
40894 -# define PRIXFAST64 PRIX64
40896 -#if !defined PRIdMAX || PRI_MACROS_BROKEN
40898 -# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
40900 -#if !defined PRIiMAX || PRI_MACROS_BROKEN
40902 -# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
40904 -#if !defined PRIoMAX || PRI_MACROS_BROKEN
40906 -# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
40908 -#if !defined PRIuMAX || PRI_MACROS_BROKEN
40910 -# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
40912 -#if !defined PRIxMAX || PRI_MACROS_BROKEN
40914 -# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
40916 -#if !defined PRIXMAX || PRI_MACROS_BROKEN
40918 -# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
40920 -#if !defined PRIdPTR || PRI_MACROS_BROKEN
40922 -# define PRIdPTR \
40923 - (sizeof (void *) == sizeof (long) ? "ld" : \
40924 - sizeof (void *) == sizeof (int) ? "d" : \
40927 -#if !defined PRIiPTR || PRI_MACROS_BROKEN
40929 -# define PRIiPTR \
40930 - (sizeof (void *) == sizeof (long) ? "li" : \
40931 - sizeof (void *) == sizeof (int) ? "i" : \
40934 -#if !defined PRIoPTR || PRI_MACROS_BROKEN
40936 -# define PRIoPTR \
40937 - (sizeof (void *) == sizeof (long) ? "lo" : \
40938 - sizeof (void *) == sizeof (int) ? "o" : \
40941 -#if !defined PRIuPTR || PRI_MACROS_BROKEN
40943 -# define PRIuPTR \
40944 - (sizeof (void *) == sizeof (long) ? "lu" : \
40945 - sizeof (void *) == sizeof (int) ? "u" : \
40948 -#if !defined PRIxPTR || PRI_MACROS_BROKEN
40950 -# define PRIxPTR \
40951 - (sizeof (void *) == sizeof (long) ? "lx" : \
40952 - sizeof (void *) == sizeof (int) ? "x" : \
40955 -#if !defined PRIXPTR || PRI_MACROS_BROKEN
40957 -# define PRIXPTR \
40958 - (sizeof (void *) == sizeof (long) ? "lX" : \
40959 - sizeof (void *) == sizeof (int) ? "X" : \
40963 -/* @@ end of prolog @@ */
40966 -/* Rename the non ISO C functions. This is required by the standard
40967 - because some ISO C functions will require linking with this object
40968 - file and the name space must not be polluted. */
40969 -# define open __open
40970 -# define close __close
40971 -# define read __read
40972 -# define mmap __mmap
40973 -# define munmap __munmap
40976 -/* For those losing systems which don't have `alloca' we have to add
40977 - some additional code emulating it. */
40978 -#ifdef HAVE_ALLOCA
40979 -# define freea(p) /* nothing */
40981 -# define alloca(n) malloc (n)
40982 -# define freea(p) free (p)
40985 -/* For systems that distinguish between text and binary I/O.
40986 - O_BINARY is usually declared in <fcntl.h>. */
40987 -#if !defined O_BINARY && defined _O_BINARY
40988 - /* For MSC-compatible compilers. */
40989 -# define O_BINARY _O_BINARY
40990 -# define O_TEXT _O_TEXT
40993 - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
40997 -/* On reasonable systems, binary I/O is the default. */
40999 -# define O_BINARY 0
41003 -/* We need a sign, whether a new catalog was loaded, which can be associated
41004 - with all translations. This is important if the translations are
41005 - cached by one of GCC's features. */
41006 -int _nl_msg_cat_cntr;
41009 -/* Expand a system dependent string segment. Return NULL if unsupported. */
41010 -static const char *
41011 -get_sysdep_segment_value (const char *name)
41013 - /* Test for an ISO C 99 section 7.8.1 format string directive.
41015 - P R I { d | i | o | u | x | X }
41016 - { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
41017 - /* We don't use a table of 14 times 6 'const char *' strings here, because
41018 - data relocations cost startup time. */
41019 - if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
41021 - if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
41022 - || name[3] == 'x' || name[3] == 'X')
41024 - if (name[4] == '8' && name[5] == '\0')
41026 - if (name[3] == 'd')
41028 - if (name[3] == 'i')
41030 - if (name[3] == 'o')
41032 - if (name[3] == 'u')
41034 - if (name[3] == 'x')
41036 - if (name[3] == 'X')
41040 - if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
41042 - if (name[3] == 'd')
41044 - if (name[3] == 'i')
41046 - if (name[3] == 'o')
41048 - if (name[3] == 'u')
41050 - if (name[3] == 'x')
41052 - if (name[3] == 'X')
41056 - if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
41058 - if (name[3] == 'd')
41060 - if (name[3] == 'i')
41062 - if (name[3] == 'o')
41064 - if (name[3] == 'u')
41066 - if (name[3] == 'x')
41068 - if (name[3] == 'X')
41072 - if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
41074 - if (name[3] == 'd')
41076 - if (name[3] == 'i')
41078 - if (name[3] == 'o')
41080 - if (name[3] == 'u')
41082 - if (name[3] == 'x')
41084 - if (name[3] == 'X')
41088 - if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
41089 - && name[7] == 'S' && name[8] == 'T')
41091 - if (name[9] == '8' && name[10] == '\0')
41093 - if (name[3] == 'd')
41094 - return PRIdLEAST8;
41095 - if (name[3] == 'i')
41096 - return PRIiLEAST8;
41097 - if (name[3] == 'o')
41098 - return PRIoLEAST8;
41099 - if (name[3] == 'u')
41100 - return PRIuLEAST8;
41101 - if (name[3] == 'x')
41102 - return PRIxLEAST8;
41103 - if (name[3] == 'X')
41104 - return PRIXLEAST8;
41107 - if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
41109 - if (name[3] == 'd')
41110 - return PRIdLEAST16;
41111 - if (name[3] == 'i')
41112 - return PRIiLEAST16;
41113 - if (name[3] == 'o')
41114 - return PRIoLEAST16;
41115 - if (name[3] == 'u')
41116 - return PRIuLEAST16;
41117 - if (name[3] == 'x')
41118 - return PRIxLEAST16;
41119 - if (name[3] == 'X')
41120 - return PRIXLEAST16;
41123 - if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
41125 - if (name[3] == 'd')
41126 - return PRIdLEAST32;
41127 - if (name[3] == 'i')
41128 - return PRIiLEAST32;
41129 - if (name[3] == 'o')
41130 - return PRIoLEAST32;
41131 - if (name[3] == 'u')
41132 - return PRIuLEAST32;
41133 - if (name[3] == 'x')
41134 - return PRIxLEAST32;
41135 - if (name[3] == 'X')
41136 - return PRIXLEAST32;
41139 - if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
41141 - if (name[3] == 'd')
41142 - return PRIdLEAST64;
41143 - if (name[3] == 'i')
41144 - return PRIiLEAST64;
41145 - if (name[3] == 'o')
41146 - return PRIoLEAST64;
41147 - if (name[3] == 'u')
41148 - return PRIuLEAST64;
41149 - if (name[3] == 'x')
41150 - return PRIxLEAST64;
41151 - if (name[3] == 'X')
41152 - return PRIXLEAST64;
41156 - if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
41157 - && name[7] == 'T')
41159 - if (name[8] == '8' && name[9] == '\0')
41161 - if (name[3] == 'd')
41162 - return PRIdFAST8;
41163 - if (name[3] == 'i')
41164 - return PRIiFAST8;
41165 - if (name[3] == 'o')
41166 - return PRIoFAST8;
41167 - if (name[3] == 'u')
41168 - return PRIuFAST8;
41169 - if (name[3] == 'x')
41170 - return PRIxFAST8;
41171 - if (name[3] == 'X')
41172 - return PRIXFAST8;
41175 - if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
41177 - if (name[3] == 'd')
41178 - return PRIdFAST16;
41179 - if (name[3] == 'i')
41180 - return PRIiFAST16;
41181 - if (name[3] == 'o')
41182 - return PRIoFAST16;
41183 - if (name[3] == 'u')
41184 - return PRIuFAST16;
41185 - if (name[3] == 'x')
41186 - return PRIxFAST16;
41187 - if (name[3] == 'X')
41188 - return PRIXFAST16;
41191 - if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
41193 - if (name[3] == 'd')
41194 - return PRIdFAST32;
41195 - if (name[3] == 'i')
41196 - return PRIiFAST32;
41197 - if (name[3] == 'o')
41198 - return PRIoFAST32;
41199 - if (name[3] == 'u')
41200 - return PRIuFAST32;
41201 - if (name[3] == 'x')
41202 - return PRIxFAST32;
41203 - if (name[3] == 'X')
41204 - return PRIXFAST32;
41207 - if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
41209 - if (name[3] == 'd')
41210 - return PRIdFAST64;
41211 - if (name[3] == 'i')
41212 - return PRIiFAST64;
41213 - if (name[3] == 'o')
41214 - return PRIoFAST64;
41215 - if (name[3] == 'u')
41216 - return PRIuFAST64;
41217 - if (name[3] == 'x')
41218 - return PRIxFAST64;
41219 - if (name[3] == 'X')
41220 - return PRIXFAST64;
41224 - if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
41225 - && name[7] == '\0')
41227 - if (name[3] == 'd')
41229 - if (name[3] == 'i')
41231 - if (name[3] == 'o')
41233 - if (name[3] == 'u')
41235 - if (name[3] == 'x')
41237 - if (name[3] == 'X')
41241 - if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
41242 - && name[7] == '\0')
41244 - if (name[3] == 'd')
41246 - if (name[3] == 'i')
41248 - if (name[3] == 'o')
41250 - if (name[3] == 'u')
41252 - if (name[3] == 'x')
41254 - if (name[3] == 'X')
41260 - /* Test for a glibc specific printf() format directive flag. */
41261 - if (name[0] == 'I' && name[1] == '\0')
41263 -#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
41264 - /* The 'I' flag, in numeric format directives, replaces ASCII digits
41265 - with the 'outdigits' defined in the LC_CTYPE locale facet. This is
41266 - used for Farsi (Persian) and maybe Arabic. */
41272 - /* Other system dependent strings are not valid. */
41276 -/* Initialize the codeset dependent parts of an opened message catalog.
41277 - Return the header entry. */
41280 -_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
41281 - struct loaded_domain *domain,
41282 - struct binding *domainbinding)
41284 - /* Find out about the character set the file is encoded with.
41285 - This can be found (in textual form) in the entry "". If this
41286 - entry does not exist or if this does not contain the `charset='
41287 - information, we will assume the charset matches the one the
41288 - current locale and we don't have to perform any conversion. */
41290 - size_t nullentrylen;
41292 - /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
41293 - domain->codeset_cntr =
41294 - (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
41296 - domain->conv = (__gconv_t) -1;
41299 - domain->conv = (iconv_t) -1;
41302 - domain->conv_tab = NULL;
41304 - /* Get the header entry. */
41305 - nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
41307 - if (nullentry != NULL)
41309 -#if defined _LIBC || HAVE_ICONV
41310 - const char *charsetstr;
41312 - charsetstr = strstr (nullentry, "charset=");
41313 - if (charsetstr != NULL)
41317 - const char *outcharset;
41319 - charsetstr += strlen ("charset=");
41320 - len = strcspn (charsetstr, " \t\n");
41322 - charset = (char *) alloca (len + 1);
41323 -# if defined _LIBC || HAVE_MEMPCPY
41324 - *((char *) mempcpy (charset, charsetstr, len)) = '\0';
41326 - memcpy (charset, charsetstr, len);
41327 - charset[len] = '\0';
41330 - /* The output charset should normally be determined by the
41331 - locale. But sometimes the locale is not used or not correctly
41332 - set up, so we provide a possibility for the user to override
41333 - this. Moreover, the value specified through
41334 - bind_textdomain_codeset overrides both. */
41335 - if (domainbinding != NULL && domainbinding->codeset != NULL)
41336 - outcharset = domainbinding->codeset;
41339 - outcharset = getenv ("OUTPUT_CHARSET");
41340 - if (outcharset == NULL || outcharset[0] == '\0')
41343 - outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
41346 - extern const char *locale_charset (void);
41347 - outcharset = locale_charset ();
41354 - /* We always want to use transliteration. */
41355 - outcharset = norm_add_slashes (outcharset, "TRANSLIT");
41356 - charset = norm_add_slashes (charset, NULL);
41357 - if (__gconv_open (outcharset, charset, &domain->conv,
41358 - GCONV_AVOID_NOCONV)
41360 - domain->conv = (__gconv_t) -1;
41363 - /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
41364 - we want to use transliteration. */
41365 -# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
41366 - || _LIBICONV_VERSION >= 0x0105
41367 - if (strchr (outcharset, '/') == NULL)
41371 - len = strlen (outcharset);
41372 - tmp = (char *) alloca (len + 10 + 1);
41373 - memcpy (tmp, outcharset, len);
41374 - memcpy (tmp + len, "//TRANSLIT", 10 + 1);
41375 - outcharset = tmp;
41377 - domain->conv = iconv_open (outcharset, charset);
41379 - freea (outcharset);
41383 - domain->conv = iconv_open (outcharset, charset);
41389 -#endif /* _LIBC || HAVE_ICONV */
41392 - return nullentry;
41395 -/* Frees the codeset dependent parts of an opened message catalog. */
41398 -_nl_free_domain_conv (struct loaded_domain *domain)
41400 - if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
41401 - free (domain->conv_tab);
41404 - if (domain->conv != (__gconv_t) -1)
41405 - __gconv_close (domain->conv);
41408 - if (domain->conv != (iconv_t) -1)
41409 - iconv_close (domain->conv);
41414 -/* Load the message catalogs specified by FILENAME. If it is no valid
41415 - message catalog do nothing. */
41418 -_nl_load_domain (struct loaded_l10nfile *domain_file,
41419 - struct binding *domainbinding)
41424 - struct stat64 st;
41428 - struct mo_file_header *data = (struct mo_file_header *) -1;
41429 - int use_mmap = 0;
41430 - struct loaded_domain *domain;
41432 - const char *nullentry;
41434 - domain_file->decided = 1;
41435 - domain_file->data = NULL;
41437 - /* Note that it would be useless to store domainbinding in domain_file
41438 - because domainbinding might be == NULL now but != NULL later (after
41439 - a call to bind_textdomain_codeset). */
41441 - /* If the record does not represent a valid locale the FILENAME
41442 - might be NULL. This can happen when according to the given
41443 - specification the locale file name is different for XPG and CEN
41445 - if (domain_file->filename == NULL)
41448 - /* Try to open the addressed file. */
41449 - fd = open (domain_file->filename, O_RDONLY | O_BINARY);
41453 - /* We must know about the size of the file. */
41456 - __builtin_expect (fstat64 (fd, &st) != 0, 0)
41458 - __builtin_expect (fstat (fd, &st) != 0, 0)
41460 - || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
41461 - || __builtin_expect (size < sizeof (struct mo_file_header), 0))
41463 - /* Something went wrong. */
41469 - /* Now we are ready to load the file. If mmap() is available we try
41470 - this first. If not available or it failed we try to load it. */
41471 - data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
41472 - MAP_PRIVATE, fd, 0);
41474 - if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
41476 - /* mmap() call was successful. */
41482 - /* If the data is not yet available (i.e. mmap'ed) we try to load
41484 - if (data == (struct mo_file_header *) -1)
41489 - data = (struct mo_file_header *) malloc (size);
41490 - if (data == NULL)
41494 - read_ptr = (char *) data;
41497 - long int nb = (long int) read (fd, read_ptr, to_read);
41501 - if (nb == -1 && errno == EINTR)
41510 - while (to_read > 0);
41515 - /* Using the magic number we can test whether it really is a message
41517 - if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
41520 - /* The magic number is wrong: not a message catalog file. */
41523 - munmap ((caddr_t) data, size);
41530 - domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
41531 - if (domain == NULL)
41533 - domain_file->data = domain;
41535 - domain->data = (char *) data;
41536 - domain->use_mmap = use_mmap;
41537 - domain->mmap_size = size;
41538 - domain->must_swap = data->magic != _MAGIC;
41539 - domain->malloced = NULL;
41541 - /* Fill in the information about the available tables. */
41542 - revision = W (domain->must_swap, data->revision);
41543 - /* We support only the major revisions 0 and 1. */
41544 - switch (revision >> 16)
41548 - domain->nstrings = W (domain->must_swap, data->nstrings);
41549 - domain->orig_tab = (const struct string_desc *)
41550 - ((char *) data + W (domain->must_swap, data->orig_tab_offset));
41551 - domain->trans_tab = (const struct string_desc *)
41552 - ((char *) data + W (domain->must_swap, data->trans_tab_offset));
41553 - domain->hash_size = W (domain->must_swap, data->hash_tab_size);
41554 - domain->hash_tab =
41555 - (domain->hash_size > 2
41556 - ? (const nls_uint32 *)
41557 - ((char *) data + W (domain->must_swap, data->hash_tab_offset))
41559 - domain->must_swap_hash_tab = domain->must_swap;
41561 - /* Now dispatch on the minor revision. */
41562 - switch (revision & 0xffff)
41565 - domain->n_sysdep_strings = 0;
41566 - domain->orig_sysdep_tab = NULL;
41567 - domain->trans_sysdep_tab = NULL;
41572 - nls_uint32 n_sysdep_strings;
41574 - if (domain->hash_tab == NULL)
41575 - /* This is invalid. These minor revisions need a hash table. */
41578 - n_sysdep_strings =
41579 - W (domain->must_swap, data->n_sysdep_strings);
41580 - if (n_sysdep_strings > 0)
41582 - nls_uint32 n_sysdep_segments;
41583 - const struct sysdep_segment *sysdep_segments;
41584 - const char **sysdep_segment_values;
41585 - const nls_uint32 *orig_sysdep_tab;
41586 - const nls_uint32 *trans_sysdep_tab;
41587 - nls_uint32 n_inmem_sysdep_strings;
41590 - struct sysdep_string_desc *inmem_orig_sysdep_tab;
41591 - struct sysdep_string_desc *inmem_trans_sysdep_tab;
41592 - nls_uint32 *inmem_hash_tab;
41593 - unsigned int i, j;
41595 - /* Get the values of the system dependent segments. */
41596 - n_sysdep_segments =
41597 - W (domain->must_swap, data->n_sysdep_segments);
41598 - sysdep_segments = (const struct sysdep_segment *)
41600 - + W (domain->must_swap, data->sysdep_segments_offset));
41601 - sysdep_segment_values =
41602 - alloca (n_sysdep_segments * sizeof (const char *));
41603 - for (i = 0; i < n_sysdep_segments; i++)
41605 - const char *name =
41607 - + W (domain->must_swap, sysdep_segments[i].offset);
41608 - nls_uint32 namelen =
41609 - W (domain->must_swap, sysdep_segments[i].length);
41611 - if (!(namelen > 0 && name[namelen - 1] == '\0'))
41613 - freea (sysdep_segment_values);
41617 - sysdep_segment_values[i] = get_sysdep_segment_value (name);
41620 - orig_sysdep_tab = (const nls_uint32 *)
41622 - + W (domain->must_swap, data->orig_sysdep_tab_offset));
41623 - trans_sysdep_tab = (const nls_uint32 *)
41625 - + W (domain->must_swap, data->trans_sysdep_tab_offset));
41627 - /* Compute the amount of additional memory needed for the
41628 - system dependent strings and the augmented hash table.
41629 - At the same time, also drop string pairs which refer to
41630 - an undefined system dependent segment. */
41631 - n_inmem_sysdep_strings = 0;
41632 - memneed = domain->hash_size * sizeof (nls_uint32);
41633 - for (i = 0; i < n_sysdep_strings; i++)
41638 - for (j = 0; j < 2; j++)
41640 - const struct sysdep_string *sysdep_string =
41641 - (const struct sysdep_string *)
41643 - + W (domain->must_swap,
41645 - ? orig_sysdep_tab[i]
41646 - : trans_sysdep_tab[i]));
41648 - const struct segment_pair *p = sysdep_string->segments;
41650 - if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
41651 - for (p = sysdep_string->segments;; p++)
41653 - nls_uint32 sysdepref;
41655 - need += W (domain->must_swap, p->segsize);
41657 - sysdepref = W (domain->must_swap, p->sysdepref);
41658 - if (sysdepref == SEGMENTS_END)
41661 - if (sysdepref >= n_sysdep_segments)
41664 - freea (sysdep_segment_values);
41668 - if (sysdep_segment_values[sysdepref] == NULL)
41670 - /* This particular string pair is invalid. */
41675 - need += strlen (sysdep_segment_values[sysdepref]);
41685 - n_inmem_sysdep_strings++;
41686 - memneed += needs[0] + needs[1];
41689 - memneed += 2 * n_inmem_sysdep_strings
41690 - * sizeof (struct sysdep_string_desc);
41692 - if (n_inmem_sysdep_strings > 0)
41696 - /* Allocate additional memory. */
41697 - mem = (char *) malloc (memneed);
41701 - domain->malloced = mem;
41702 - inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
41703 - mem += n_inmem_sysdep_strings
41704 - * sizeof (struct sysdep_string_desc);
41705 - inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
41706 - mem += n_inmem_sysdep_strings
41707 - * sizeof (struct sysdep_string_desc);
41708 - inmem_hash_tab = (nls_uint32 *) mem;
41709 - mem += domain->hash_size * sizeof (nls_uint32);
41711 - /* Compute the system dependent strings. */
41713 - for (i = 0; i < n_sysdep_strings; i++)
41717 - for (j = 0; j < 2; j++)
41719 - const struct sysdep_string *sysdep_string =
41720 - (const struct sysdep_string *)
41722 - + W (domain->must_swap,
41724 - ? orig_sysdep_tab[i]
41725 - : trans_sysdep_tab[i]));
41726 - const struct segment_pair *p =
41727 - sysdep_string->segments;
41729 - if (W (domain->must_swap, p->sysdepref)
41731 - for (p = sysdep_string->segments;; p++)
41733 - nls_uint32 sysdepref;
41736 - W (domain->must_swap, p->sysdepref);
41737 - if (sysdepref == SEGMENTS_END)
41740 - if (sysdep_segment_values[sysdepref] == NULL)
41742 - /* This particular string pair is
41755 - for (j = 0; j < 2; j++)
41757 - const struct sysdep_string *sysdep_string =
41758 - (const struct sysdep_string *)
41760 - + W (domain->must_swap,
41762 - ? orig_sysdep_tab[i]
41763 - : trans_sysdep_tab[i]));
41764 - const char *static_segments =
41766 - + W (domain->must_swap, sysdep_string->offset);
41767 - const struct segment_pair *p =
41768 - sysdep_string->segments;
41770 - /* Concatenate the segments, and fill
41771 - inmem_orig_sysdep_tab[k] (for j == 0) and
41772 - inmem_trans_sysdep_tab[k] (for j == 1). */
41774 - struct sysdep_string_desc *inmem_tab_entry =
41776 - ? inmem_orig_sysdep_tab
41777 - : inmem_trans_sysdep_tab)
41780 - if (W (domain->must_swap, p->sysdepref)
41783 - /* Only one static segment. */
41784 - inmem_tab_entry->length =
41785 - W (domain->must_swap, p->segsize);
41786 - inmem_tab_entry->pointer = static_segments;
41790 - inmem_tab_entry->pointer = mem;
41792 - for (p = sysdep_string->segments;; p++)
41794 - nls_uint32 segsize =
41795 - W (domain->must_swap, p->segsize);
41796 - nls_uint32 sysdepref =
41797 - W (domain->must_swap, p->sysdepref);
41802 - memcpy (mem, static_segments, segsize);
41804 - static_segments += segsize;
41807 - if (sysdepref == SEGMENTS_END)
41810 - n = strlen (sysdep_segment_values[sysdepref]);
41811 - memcpy (mem, sysdep_segment_values[sysdepref], n);
41815 - inmem_tab_entry->length =
41816 - mem - inmem_tab_entry->pointer;
41823 - if (k != n_inmem_sysdep_strings)
41826 - /* Compute the augmented hash table. */
41827 - for (i = 0; i < domain->hash_size; i++)
41828 - inmem_hash_tab[i] =
41829 - W (domain->must_swap_hash_tab, domain->hash_tab[i]);
41830 - for (i = 0; i < n_inmem_sysdep_strings; i++)
41832 - const char *msgid = inmem_orig_sysdep_tab[i].pointer;
41833 - nls_uint32 hash_val = hash_string (msgid);
41834 - nls_uint32 idx = hash_val % domain->hash_size;
41835 - nls_uint32 incr =
41836 - 1 + (hash_val % (domain->hash_size - 2));
41840 - if (inmem_hash_tab[idx] == 0)
41842 - /* Hash table entry is empty. Use it. */
41843 - inmem_hash_tab[idx] = 1 + domain->nstrings + i;
41847 - if (idx >= domain->hash_size - incr)
41848 - idx -= domain->hash_size - incr;
41854 - domain->n_sysdep_strings = n_inmem_sysdep_strings;
41855 - domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
41856 - domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
41858 - domain->hash_tab = inmem_hash_tab;
41859 - domain->must_swap_hash_tab = 0;
41863 - domain->n_sysdep_strings = 0;
41864 - domain->orig_sysdep_tab = NULL;
41865 - domain->trans_sysdep_tab = NULL;
41868 - freea (sysdep_segment_values);
41872 - domain->n_sysdep_strings = 0;
41873 - domain->orig_sysdep_tab = NULL;
41874 - domain->trans_sysdep_tab = NULL;
41881 - /* This is an invalid revision. */
41883 - /* This is an invalid .mo file. */
41884 - if (domain->malloced)
41885 - free (domain->malloced);
41888 - munmap ((caddr_t) data, size);
41893 - domain_file->data = NULL;
41897 - /* Now initialize the character set converter from the character set
41898 - the file is encoded with (found in the header entry) to the domain's
41899 - specified character set or the locale's character set. */
41900 - nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
41902 - /* Also look for a plural specification. */
41903 - EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
41910 -_nl_unload_domain (struct loaded_domain *domain)
41912 - if (domain->plural != &__gettext_germanic_plural)
41913 - __gettext_free_exp (domain->plural);
41915 - _nl_free_domain_conv (domain);
41917 - if (domain->malloced)
41918 - free (domain->malloced);
41920 -# ifdef _POSIX_MAPPED_FILES
41921 - if (domain->use_mmap)
41922 - munmap ((caddr_t) domain->data, domain->mmap_size);
41924 -# endif /* _POSIX_MAPPED_FILES */
41925 - free ((void *) domain->data);
41930 diff -urN BUILD/abook-0.6.0pre2/intl/localcharset.c abook/intl/localcharset.c
41931 --- BUILD/abook-0.6.0pre2/intl/localcharset.c 2005-09-17 12:10:26.000000000 +0200
41932 +++ abook/intl/localcharset.c 1970-01-01 01:00:00.000000000 +0100
41934 -/* Determine a canonical name for the current locale's character encoding.
41936 - Copyright (C) 2000-2004 Free Software Foundation, Inc.
41938 - This program is free software; you can redistribute it and/or modify it
41939 - under the terms of the GNU Library General Public License as published
41940 - by the Free Software Foundation; either version 2, or (at your option)
41941 - any later version.
41943 - This program is distributed in the hope that it will be useful,
41944 - but WITHOUT ANY WARRANTY; without even the implied warranty of
41945 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41946 - Library General Public License for more details.
41948 - You should have received a copy of the GNU Library General Public
41949 - License along with this program; if not, write to the Free Software
41950 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
41953 -/* Written by Bruno Haible <bruno@clisp.org>. */
41955 -#ifdef HAVE_CONFIG_H
41956 -# include <config.h>
41959 -/* Specification. */
41960 -#include "localcharset.h"
41963 -# include <stddef.h>
41966 -#include <stdio.h>
41968 -# include <string.h>
41970 -# include <strings.h>
41973 -# include <stdlib.h>
41976 -#if defined _WIN32 || defined __WIN32__
41977 -# undef WIN32 /* avoid warning on mingw32 */
41981 -#if defined __EMX__
41982 -/* Assume EMX program runs on OS/2, even if compiled under DOS. */
41986 -#if !defined WIN32
41987 -# if HAVE_LANGINFO_CODESET
41988 -# include <langinfo.h>
41990 -# if HAVE_SETLOCALE
41991 -# include <locale.h>
41994 -#elif defined WIN32
41995 -# define WIN32_LEAN_AND_MEAN
41996 -# include <windows.h>
42003 -#if ENABLE_RELOCATABLE
42004 -# include "relocatable.h"
42006 -# define relocate(pathname) (pathname)
42009 -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
42010 - /* Win32, Cygwin, OS/2, DOS */
42011 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
42014 -#ifndef DIRECTORY_SEPARATOR
42015 -# define DIRECTORY_SEPARATOR '/'
42019 -# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
42022 -#if HAVE_DECL_GETC_UNLOCKED
42024 -# define getc getc_unlocked
42027 -/* The following static variable is declared 'volatile' to avoid a
42028 - possible multithread problem in the function get_charset_aliases. If we
42029 - are running in a threaded environment, and if two threads initialize
42030 - 'charset_aliases' simultaneously, both will produce the same value,
42031 - and everything will be ok if the two assignments to 'charset_aliases'
42032 - are atomic. But I don't know what will happen if the two assignments mix. */
42034 -# define volatile /* empty */
42036 -/* Pointer to the contents of the charset.alias file, if it has already been
42037 - read, else NULL. Its format is:
42038 - ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
42039 -static const char * volatile charset_aliases;
42041 -/* Return a pointer to the contents of the charset.alias file. */
42042 -static const char *
42043 -get_charset_aliases ()
42047 - cp = charset_aliases;
42050 -#if !(defined VMS || defined WIN32)
42053 - const char *base = "charset.alias";
42056 - /* Make it possible to override the charset.alias location. This is
42057 - necessary for running the testsuite before "make install". */
42058 - dir = getenv ("CHARSETALIASDIR");
42059 - if (dir == NULL || dir[0] == '\0')
42060 - dir = relocate (LIBDIR);
42062 - /* Concatenate dir and base into freshly allocated file_name. */
42064 - size_t dir_len = strlen (dir);
42065 - size_t base_len = strlen (base);
42066 - int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
42067 - file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
42068 - if (file_name != NULL)
42070 - memcpy (file_name, dir, dir_len);
42072 - file_name[dir_len] = DIRECTORY_SEPARATOR;
42073 - memcpy (file_name + dir_len + add_slash, base, base_len + 1);
42077 - if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
42078 - /* Out of memory or file not found, treat it as empty. */
42082 - /* Parse the file's contents. */
42083 - char *res_ptr = NULL;
42084 - size_t res_size = 0;
42092 - char *old_res_ptr;
42097 - if (c == '\n' || c == ' ' || c == '\t')
42101 - /* Skip comment, to end of line. */
42104 - while (!(c == EOF || c == '\n'));
42110 - if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
42112 - l1 = strlen (buf1);
42113 - l2 = strlen (buf2);
42114 - old_res_ptr = res_ptr;
42115 - if (res_size == 0)
42117 - res_size = l1 + 1 + l2 + 1;
42118 - res_ptr = (char *) malloc (res_size + 1);
42122 - res_size += l1 + 1 + l2 + 1;
42123 - res_ptr = (char *) realloc (res_ptr, res_size + 1);
42125 - if (res_ptr == NULL)
42127 - /* Out of memory. */
42129 - if (old_res_ptr != NULL)
42130 - free (old_res_ptr);
42133 - strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
42134 - strcpy (res_ptr + res_size - (l2 + 1), buf2);
42137 - if (res_size == 0)
42141 - *(res_ptr + res_size) = '\0';
42146 - if (file_name != NULL)
42147 - free (file_name);
42152 - /* To avoid the troubles of an extra file charset.alias_vms in the
42153 - sources of many GNU packages, simply inline the aliases here. */
42154 - /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
42155 - "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
42156 - section 10.7 "Handling Different Character Sets". */
42157 - cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
42158 - "ISO8859-2" "\0" "ISO-8859-2" "\0"
42159 - "ISO8859-5" "\0" "ISO-8859-5" "\0"
42160 - "ISO8859-7" "\0" "ISO-8859-7" "\0"
42161 - "ISO8859-8" "\0" "ISO-8859-8" "\0"
42162 - "ISO8859-9" "\0" "ISO-8859-9" "\0"
42164 - "eucJP" "\0" "EUC-JP" "\0"
42165 - "SJIS" "\0" "SHIFT_JIS" "\0"
42166 - "DECKANJI" "\0" "DEC-KANJI" "\0"
42167 - "SDECKANJI" "\0" "EUC-JP" "\0"
42169 - "eucTW" "\0" "EUC-TW" "\0"
42170 - "DECHANYU" "\0" "DEC-HANYU" "\0"
42171 - "DECHANZI" "\0" "GB2312" "\0"
42173 - "DECKOREAN" "\0" "EUC-KR" "\0";
42176 -# if defined WIN32
42177 - /* To avoid the troubles of installing a separate file in the same
42178 - directory as the DLL and of retrieving the DLL's directory at
42179 - runtime, simply inline the aliases here. */
42181 - cp = "CP936" "\0" "GBK" "\0"
42182 - "CP1361" "\0" "JOHAB" "\0"
42183 - "CP20127" "\0" "ASCII" "\0"
42184 - "CP20866" "\0" "KOI8-R" "\0"
42185 - "CP21866" "\0" "KOI8-RU" "\0"
42186 - "CP28591" "\0" "ISO-8859-1" "\0"
42187 - "CP28592" "\0" "ISO-8859-2" "\0"
42188 - "CP28593" "\0" "ISO-8859-3" "\0"
42189 - "CP28594" "\0" "ISO-8859-4" "\0"
42190 - "CP28595" "\0" "ISO-8859-5" "\0"
42191 - "CP28596" "\0" "ISO-8859-6" "\0"
42192 - "CP28597" "\0" "ISO-8859-7" "\0"
42193 - "CP28598" "\0" "ISO-8859-8" "\0"
42194 - "CP28599" "\0" "ISO-8859-9" "\0"
42195 - "CP28605" "\0" "ISO-8859-15" "\0";
42199 - charset_aliases = cp;
42205 -/* Determine the current locale's character encoding, and canonicalize it
42206 - into one of the canonical names listed in config.charset.
42207 - The result must not be freed; it is statically allocated.
42208 - If the canonical name cannot be determined, the result is a non-canonical
42217 - const char *codeset;
42218 - const char *aliases;
42220 -#if !(defined WIN32 || defined OS2)
42222 -# if HAVE_LANGINFO_CODESET
42224 - /* Most systems support nl_langinfo (CODESET) nowadays. */
42225 - codeset = nl_langinfo (CODESET);
42229 - /* On old systems which lack it, use setlocale or getenv. */
42230 - const char *locale = NULL;
42232 - /* But most old systems don't have a complete set of locales. Some
42233 - (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
42234 - use setlocale here; it would return "C" when it doesn't support the
42235 - locale name the user has set. */
42236 -# if HAVE_SETLOCALE && 0
42237 - locale = setlocale (LC_CTYPE, NULL);
42239 - if (locale == NULL || locale[0] == '\0')
42241 - locale = getenv ("LC_ALL");
42242 - if (locale == NULL || locale[0] == '\0')
42244 - locale = getenv ("LC_CTYPE");
42245 - if (locale == NULL || locale[0] == '\0')
42246 - locale = getenv ("LANG");
42250 - /* On some old systems, one used to set locale = "iso8859_1". On others,
42251 - you set it to "language_COUNTRY.charset". In any case, we resolve it
42252 - through the charset.alias file. */
42253 - codeset = locale;
42257 -#elif defined WIN32
42259 - static char buf[2 + 10 + 1];
42261 - /* Woe32 has a function returning the locale's codepage as a number. */
42262 - sprintf (buf, "CP%u", GetACP ());
42267 - const char *locale;
42268 - static char buf[2 + 10 + 1];
42272 - /* Allow user to override the codeset, as set in the operating system,
42273 - with standard language environment variables. */
42274 - locale = getenv ("LC_ALL");
42275 - if (locale == NULL || locale[0] == '\0')
42277 - locale = getenv ("LC_CTYPE");
42278 - if (locale == NULL || locale[0] == '\0')
42279 - locale = getenv ("LANG");
42281 - if (locale != NULL && locale[0] != '\0')
42283 - /* If the locale name contains an encoding after the dot, return it. */
42284 - const char *dot = strchr (locale, '.');
42288 - const char *modifier;
42291 - /* Look for the possible @... trailer and remove it, if any. */
42292 - modifier = strchr (dot, '@');
42293 - if (modifier == NULL)
42295 - if (modifier - dot < sizeof (buf))
42297 - memcpy (buf, dot, modifier - dot);
42298 - buf [modifier - dot] = '\0';
42303 - /* Resolve through the charset.alias file. */
42304 - codeset = locale;
42308 - /* OS/2 has a function returning the locale's codepage as a number. */
42309 - if (DosQueryCp (sizeof (cp), cp, &cplen))
42313 - sprintf (buf, "CP%u", cp[0]);
42320 - if (codeset == NULL)
42321 - /* The canonical name cannot be determined. */
42324 - /* Resolve alias. */
42325 - for (aliases = get_charset_aliases ();
42326 - *aliases != '\0';
42327 - aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
42328 - if (strcmp (codeset, aliases) == 0
42329 - || (aliases[0] == '*' && aliases[1] == '\0'))
42331 - codeset = aliases + strlen (aliases) + 1;
42335 - /* Don't return an empty string. GNU libc and GNU libiconv interpret
42336 - the empty string as denoting "the locale's character encoding",
42337 - thus GNU libiconv would call this function a second time. */
42338 - if (codeset[0] == '\0')
42339 - codeset = "ASCII";
42343 diff -urN BUILD/abook-0.6.0pre2/intl/localcharset.h abook/intl/localcharset.h
42344 --- BUILD/abook-0.6.0pre2/intl/localcharset.h 2005-09-17 12:10:26.000000000 +0200
42345 +++ abook/intl/localcharset.h 1970-01-01 01:00:00.000000000 +0100
42347 -/* Determine a canonical name for the current locale's character encoding.
42348 - Copyright (C) 2000-2003 Free Software Foundation, Inc.
42349 - This file is part of the GNU CHARSET Library.
42351 - This program is free software; you can redistribute it and/or modify it
42352 - under the terms of the GNU Library General Public License as published
42353 - by the Free Software Foundation; either version 2, or (at your option)
42354 - any later version.
42356 - This program is distributed in the hope that it will be useful,
42357 - but WITHOUT ANY WARRANTY; without even the implied warranty of
42358 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
42359 - Library General Public License for more details.
42361 - You should have received a copy of the GNU Library General Public
42362 - License along with this program; if not, write to the Free Software
42363 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
42366 -#ifndef _LOCALCHARSET_H
42367 -#define _LOCALCHARSET_H
42370 -#ifdef __cplusplus
42375 -/* Determine the current locale's character encoding, and canonicalize it
42376 - into one of the canonical names listed in config.charset.
42377 - The result must not be freed; it is statically allocated.
42378 - If the canonical name cannot be determined, the result is a non-canonical
42380 -extern const char * locale_charset (void);
42383 -#ifdef __cplusplus
42388 -#endif /* _LOCALCHARSET_H */
42389 diff -urN BUILD/abook-0.6.0pre2/intl/locale.alias abook/intl/locale.alias
42390 --- BUILD/abook-0.6.0pre2/intl/locale.alias 2005-09-17 12:10:26.000000000 +0200
42391 +++ abook/intl/locale.alias 1970-01-01 01:00:00.000000000 +0100
42393 -# Locale name alias data base.
42394 -# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
42396 -# This program is free software; you can redistribute it and/or modify it
42397 -# under the terms of the GNU Library General Public License as published
42398 -# by the Free Software Foundation; either version 2, or (at your option)
42399 -# any later version.
42401 -# This program is distributed in the hope that it will be useful,
42402 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
42403 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
42404 -# Library General Public License for more details.
42406 -# You should have received a copy of the GNU Library General Public
42407 -# License along with this program; if not, write to the Free Software
42408 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
42411 -# The format of this file is the same as for the corresponding file of
42412 -# the X Window System, which normally can be found in
42413 -# /usr/lib/X11/locale/locale.alias
42414 -# A single line contains two fields: an alias and a substitution value.
42415 -# All entries are case independent.
42417 -# Note: This file is far from being complete. If you have a value for
42418 -# your own site which you think might be useful for others too, share
42419 -# it with the rest of us. Send it using the `glibcbug' script to
42422 -# Packages using this file:
42424 -bokmal nb_NO.ISO-8859-1
42425 -bokmƄl nb_NO.ISO-8859-1
42426 -catalan ca_ES.ISO-8859-1
42427 -croatian hr_HR.ISO-8859-2
42428 -czech cs_CZ.ISO-8859-2
42429 -danish da_DK.ISO-8859-1
42430 -dansk da_DK.ISO-8859-1
42431 -deutsch de_DE.ISO-8859-1
42432 -dutch nl_NL.ISO-8859-1
42433 -eesti et_EE.ISO-8859-1
42434 -estonian et_EE.ISO-8859-1
42435 -finnish fi_FI.ISO-8859-1
42436 -franƧais fr_FR.ISO-8859-1
42437 -french fr_FR.ISO-8859-1
42438 -galego gl_ES.ISO-8859-1
42439 -galician gl_ES.ISO-8859-1
42440 -german de_DE.ISO-8859-1
42441 -greek el_GR.ISO-8859-7
42442 -hebrew he_IL.ISO-8859-8
42443 -hrvatski hr_HR.ISO-8859-2
42444 -hungarian hu_HU.ISO-8859-2
42445 -icelandic is_IS.ISO-8859-1
42446 -italian it_IT.ISO-8859-1
42447 -japanese ja_JP.eucJP
42448 -japanese.euc ja_JP.eucJP
42450 -ja_JP.ujis ja_JP.eucJP
42451 -japanese.sjis ja_JP.SJIS
42452 -korean ko_KR.eucKR
42453 -korean.euc ko_KR.eucKR
42455 -lithuanian lt_LT.ISO-8859-13
42456 -no_NO nb_NO.ISO-8859-1
42457 -no_NO.ISO-8859-1 nb_NO.ISO-8859-1
42458 -norwegian nb_NO.ISO-8859-1
42459 -nynorsk nn_NO.ISO-8859-1
42460 -polish pl_PL.ISO-8859-2
42461 -portuguese pt_PT.ISO-8859-1
42462 -romanian ro_RO.ISO-8859-2
42463 -russian ru_RU.ISO-8859-5
42464 -slovak sk_SK.ISO-8859-2
42465 -slovene sl_SI.ISO-8859-2
42466 -slovenian sl_SI.ISO-8859-2
42467 -spanish es_ES.ISO-8859-1
42468 -swedish sv_SE.ISO-8859-1
42469 -thai th_TH.TIS-620
42470 -turkish tr_TR.ISO-8859-9
42471 diff -urN BUILD/abook-0.6.0pre2/intl/localealias.c abook/intl/localealias.c
42472 --- BUILD/abook-0.6.0pre2/intl/localealias.c 2005-09-17 12:10:26.000000000 +0200
42473 +++ abook/intl/localealias.c 1970-01-01 01:00:00.000000000 +0100
42475 -/* Handle aliases for locale names.
42476 - Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
42478 - This program is free software; you can redistribute it and/or modify it
42479 - under the terms of the GNU Library General Public License as published
42480 - by the Free Software Foundation; either version 2, or (at your option)
42481 - any later version.
42483 - This program is distributed in the hope that it will be useful,
42484 - but WITHOUT ANY WARRANTY; without even the implied warranty of
42485 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
42486 - Library General Public License for more details.
42488 - You should have received a copy of the GNU Library General Public
42489 - License along with this program; if not, write to the Free Software
42490 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
42493 -/* Tell glibc's <string.h> to provide a prototype for mempcpy().
42494 - This must come before <config.h> because <config.h> may include
42495 - <features.h>, and once <features.h> has been included, it's too late. */
42496 -#ifndef _GNU_SOURCE
42497 -# define _GNU_SOURCE 1
42500 -#ifdef HAVE_CONFIG_H
42501 -# include <config.h>
42504 -#include <ctype.h>
42505 -#include <stdio.h>
42506 -#if defined _LIBC || defined HAVE___FSETLOCKING
42507 -# include <stdio_ext.h>
42509 -#include <sys/types.h>
42513 -# define alloca __builtin_alloca
42514 -# define HAVE_ALLOCA 1
42517 -# include <malloc.h>
42518 -# define alloca _alloca
42520 -# if defined HAVE_ALLOCA_H || defined _LIBC
42521 -# include <alloca.h>
42534 -#include <stdlib.h>
42535 -#include <string.h>
42537 -#include "gettextP.h"
42539 -#if ENABLE_RELOCATABLE
42540 -# include "relocatable.h"
42542 -# define relocate(pathname) (pathname)
42545 -/* @@ end of prolog @@ */
42548 -/* Rename the non ANSI C functions. This is required by the standard
42549 - because some ANSI C functions will require linking with this object
42550 - file and the name space must not be polluted. */
42551 -# define strcasecmp __strcasecmp
42554 -# define mempcpy __mempcpy
42556 -# define HAVE_MEMPCPY 1
42557 -# define HAVE___FSETLOCKING 1
42559 -/* We need locking here since we can be called from different places. */
42560 -# include <bits/libc-lock.h>
42562 -__libc_lock_define_initialized (static, lock);
42565 -#ifndef internal_function
42566 -# define internal_function
42569 -/* Some optimizations for glibc. */
42571 -# define FEOF(fp) feof_unlocked (fp)
42572 -# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
42574 -# define FEOF(fp) feof (fp)
42575 -# define FGETS(buf, n, fp) fgets (buf, n, fp)
42578 -/* For those losing systems which don't have `alloca' we have to add
42579 - some additional code emulating it. */
42580 -#ifdef HAVE_ALLOCA
42581 -# define freea(p) /* nothing */
42583 -# define alloca(n) malloc (n)
42584 -# define freea(p) free (p)
42587 -#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
42589 -# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
42591 -#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
42593 -# define feof(s) feof_unlocked (s)
42599 - const char *alias;
42600 - const char *value;
42605 -# define libc_freeres_ptr(decl) decl
42608 -libc_freeres_ptr (static char *string_space);
42609 -static size_t string_space_act;
42610 -static size_t string_space_max;
42611 -libc_freeres_ptr (static struct alias_map *map);
42612 -static size_t nmap;
42613 -static size_t maxmap;
42616 -/* Prototypes for local functions. */
42617 -static size_t read_alias_file (const char *fname, int fname_len)
42618 - internal_function;
42619 -static int extend_alias_table (void);
42620 -static int alias_compare (const struct alias_map *map1,
42621 - const struct alias_map *map2);
42625 -_nl_expand_alias (const char *name)
42627 - static const char *locale_alias_path;
42628 - struct alias_map *retval;
42629 - const char *result = NULL;
42633 - __libc_lock_lock (lock);
42636 - if (locale_alias_path == NULL)
42637 - locale_alias_path = LOCALE_ALIAS_PATH;
42641 - struct alias_map item;
42643 - item.alias = name;
42646 - retval = (struct alias_map *) bsearch (&item, map, nmap,
42647 - sizeof (struct alias_map),
42648 - (int (*) (const void *,
42650 - ) alias_compare);
42654 - /* We really found an alias. Return the value. */
42655 - if (retval != NULL)
42657 - result = retval->value;
42661 - /* Perhaps we can find another alias file. */
42663 - while (added == 0 && locale_alias_path[0] != '\0')
42665 - const char *start;
42667 - while (locale_alias_path[0] == PATH_SEPARATOR)
42668 - ++locale_alias_path;
42669 - start = locale_alias_path;
42671 - while (locale_alias_path[0] != '\0'
42672 - && locale_alias_path[0] != PATH_SEPARATOR)
42673 - ++locale_alias_path;
42675 - if (start < locale_alias_path)
42676 - added = read_alias_file (start, locale_alias_path - start);
42679 - while (added != 0);
42682 - __libc_lock_unlock (lock);
42691 -read_alias_file (const char *fname, int fname_len)
42694 - char *full_fname;
42696 - static const char aliasfile[] = "/locale.alias";
42698 - full_fname = (char *) alloca (fname_len + sizeof aliasfile);
42699 -#ifdef HAVE_MEMPCPY
42700 - mempcpy (mempcpy (full_fname, fname, fname_len),
42701 - aliasfile, sizeof aliasfile);
42703 - memcpy (full_fname, fname, fname_len);
42704 - memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
42707 - fp = fopen (relocate (full_fname), "r");
42708 - freea (full_fname);
42712 -#ifdef HAVE___FSETLOCKING
42713 - /* No threads present. */
42714 - __fsetlocking (fp, FSETLOCKING_BYCALLER);
42718 - while (!FEOF (fp))
42720 - /* It is a reasonable approach to use a fix buffer here because
42721 - a) we are only interested in the first two fields
42722 - b) these fields must be usable as file names and so must not
42724 - We avoid a multi-kilobyte buffer here since this would use up
42725 - stack space which we might not have if the program ran out of
42732 - if (FGETS (buf, sizeof buf, fp) == NULL)
42733 - /* EOF reached. */
42737 - /* Ignore leading white space. */
42738 - while (isspace ((unsigned char) cp[0]))
42741 - /* A leading '#' signals a comment line. */
42742 - if (cp[0] != '\0' && cp[0] != '#')
42745 - while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
42747 - /* Terminate alias name. */
42748 - if (cp[0] != '\0')
42751 - /* Now look for the beginning of the value. */
42752 - while (isspace ((unsigned char) cp[0]))
42755 - if (cp[0] != '\0')
42757 - size_t alias_len;
42758 - size_t value_len;
42761 - while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
42763 - /* Terminate value. */
42764 - if (cp[0] == '\n')
42766 - /* This has to be done to make the following test
42767 - for the end of line possible. We are looking for
42768 - the terminating '\n' which do not overwrite here. */
42772 - else if (cp[0] != '\0')
42775 - if (nmap >= maxmap)
42776 - if (__builtin_expect (extend_alias_table (), 0))
42779 - alias_len = strlen (alias) + 1;
42780 - value_len = strlen (value) + 1;
42782 - if (string_space_act + alias_len + value_len > string_space_max)
42784 - /* Increase size of memory pool. */
42785 - size_t new_size = (string_space_max
42786 - + (alias_len + value_len > 1024
42787 - ? alias_len + value_len : 1024));
42788 - char *new_pool = (char *) realloc (string_space, new_size);
42789 - if (new_pool == NULL)
42792 - if (__builtin_expect (string_space != new_pool, 0))
42796 - for (i = 0; i < nmap; i++)
42798 - map[i].alias += new_pool - string_space;
42799 - map[i].value += new_pool - string_space;
42803 - string_space = new_pool;
42804 - string_space_max = new_size;
42807 - map[nmap].alias = memcpy (&string_space[string_space_act],
42808 - alias, alias_len);
42809 - string_space_act += alias_len;
42811 - map[nmap].value = memcpy (&string_space[string_space_act],
42812 - value, value_len);
42813 - string_space_act += value_len;
42820 - /* Possibly not the whole line fits into the buffer. Ignore
42821 - the rest of the line. */
42822 - while (strchr (buf, '\n') == NULL)
42823 - if (FGETS (buf, sizeof buf, fp) == NULL)
42824 - /* Make sure the inner loop will be left. The outer loop
42825 - will exit at the `feof' test. */
42829 - /* Should we test for ferror()? I think we have to silently ignore
42830 - errors. --drepper */
42834 - qsort (map, nmap, sizeof (struct alias_map),
42835 - (int (*) (const void *, const void *)) alias_compare);
42842 -extend_alias_table ()
42845 - struct alias_map *new_map;
42847 - new_size = maxmap == 0 ? 100 : 2 * maxmap;
42848 - new_map = (struct alias_map *) realloc (map, (new_size
42849 - * sizeof (struct alias_map)));
42850 - if (new_map == NULL)
42851 - /* Simply don't extend: we don't have any more core. */
42855 - maxmap = new_size;
42861 -alias_compare (const struct alias_map *map1, const struct alias_map *map2)
42863 -#if defined _LIBC || defined HAVE_STRCASECMP
42864 - return strcasecmp (map1->alias, map2->alias);
42866 - const unsigned char *p1 = (const unsigned char *) map1->alias;
42867 - const unsigned char *p2 = (const unsigned char *) map2->alias;
42868 - unsigned char c1, c2;
42875 - /* I know this seems to be odd but the tolower() function in
42876 - some systems libc cannot handle nonalpha characters. */
42877 - c1 = isupper (*p1) ? tolower (*p1) : *p1;
42878 - c2 = isupper (*p2) ? tolower (*p2) : *p2;
42884 - while (c1 == c2);
42889 diff -urN BUILD/abook-0.6.0pre2/intl/localename.c abook/intl/localename.c
42890 --- BUILD/abook-0.6.0pre2/intl/localename.c 2005-09-17 12:10:26.000000000 +0200
42891 +++ abook/intl/localename.c 1970-01-01 01:00:00.000000000 +0100
42893 -/* Determine the current selected locale.
42894 - Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
42896 - This program is free software; you can redistribute it and/or modify it
42897 - under the terms of the GNU Library General Public License as published
42898 - by the Free Software Foundation; either version 2, or (at your option)
42899 - any later version.
42901 - This program is distributed in the hope that it will be useful,
42902 - but WITHOUT ANY WARRANTY; without even the implied warranty of
42903 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
42904 - Library General Public License for more details.
42906 - You should have received a copy of the GNU Library General Public
42907 - License along with this program; if not, write to the Free Software
42908 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
42911 -/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
42912 -/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
42913 -/* MacOS X code written by Bruno Haible <bruno@clisp.org>. */
42915 -#ifdef HAVE_CONFIG_H
42916 -# include <config.h>
42919 -#include <stdlib.h>
42920 -#include <locale.h>
42922 -#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
42923 -# include <string.h>
42924 -# include <CFString.h>
42925 -# if HAVE_CFLOCALECOPYCURRENT
42926 -# include <CFLocale.h>
42927 -# elif HAVE_CFPREFERENCESCOPYAPPVALUE
42928 -# include <CFPreferences.h>
42932 -#if defined _WIN32 || defined __WIN32__
42933 -# undef WIN32 /* avoid warning on mingw32 */
42938 -# define WIN32_LEAN_AND_MEAN
42939 -# include <windows.h>
42940 -/* List of language codes, sorted by value:
42942 - 0x02 LANG_BULGARIAN
42943 - 0x03 LANG_CATALAN
42944 - 0x04 LANG_CHINESE
42949 - 0x09 LANG_ENGLISH
42950 - 0x0a LANG_SPANISH
42951 - 0x0b LANG_FINNISH
42954 - 0x0e LANG_HUNGARIAN
42955 - 0x0f LANG_ICELANDIC
42956 - 0x10 LANG_ITALIAN
42957 - 0x11 LANG_JAPANESE
42960 - 0x14 LANG_NORWEGIAN
42962 - 0x16 LANG_PORTUGUESE
42963 - 0x17 LANG_RHAETO_ROMANCE
42964 - 0x18 LANG_ROMANIAN
42965 - 0x19 LANG_RUSSIAN
42966 - 0x1a LANG_CROATIAN == LANG_SERBIAN
42968 - 0x1c LANG_ALBANIAN
42969 - 0x1d LANG_SWEDISH
42971 - 0x1f LANG_TURKISH
42973 - 0x21 LANG_INDONESIAN
42974 - 0x22 LANG_UKRAINIAN
42975 - 0x23 LANG_BELARUSIAN
42976 - 0x24 LANG_SLOVENIAN
42977 - 0x25 LANG_ESTONIAN
42978 - 0x26 LANG_LATVIAN
42979 - 0x27 LANG_LITHUANIAN
42982 - 0x2a LANG_VIETNAMESE
42983 - 0x2b LANG_ARMENIAN
42986 - 0x2e LANG_SORBIAN
42987 - 0x2f LANG_MACEDONIAN
42994 - 0x36 LANG_AFRIKAANS
42995 - 0x37 LANG_GEORGIAN
42996 - 0x38 LANG_FAEROESE
42998 - 0x3a LANG_MALTESE
43001 - 0x3d LANG_YIDDISH
43005 - 0x41 LANG_SWAHILI
43006 - 0x42 LANG_TURKMEN
43009 - 0x45 LANG_BENGALI
43010 - 0x46 LANG_PUNJABI
43011 - 0x47 LANG_GUJARATI
43015 - 0x4b LANG_KANNADA
43016 - 0x4c LANG_MALAYALAM
43017 - 0x4d LANG_ASSAMESE
43018 - 0x4e LANG_MARATHI
43019 - 0x4f LANG_SANSKRIT
43020 - 0x50 LANG_MONGOLIAN
43021 - 0x51 LANG_TIBETAN
43023 - 0x53 LANG_CAMBODIAN
43025 - 0x55 LANG_BURMESE
43026 - 0x56 LANG_GALICIAN
43027 - 0x57 LANG_KONKANI
43028 - 0x58 LANG_MANIPURI
43031 - 0x5b LANG_SINHALESE
43032 - 0x5c LANG_CHEROKEE
43033 - 0x5d LANG_INUKTITUT
43034 - 0x5e LANG_AMHARIC
43035 - 0x5f LANG_TAMAZIGHT
43036 - 0x60 LANG_KASHMIRI
43038 - 0x62 LANG_FRISIAN
43040 - 0x64 LANG_TAGALOG
43043 - 0x67 LANG_FULFULDE
43050 - 0x73 LANG_TIGRINYA
43051 - 0x74 LANG_GUARANI
43052 - 0x75 LANG_HAWAIIAN
43056 - 0x79 LANG_PAPIAMENTU
43058 -/* Mingw headers don't have latest language and sublanguage codes. */
43059 -# ifndef LANG_AFRIKAANS
43060 -# define LANG_AFRIKAANS 0x36
43062 -# ifndef LANG_ALBANIAN
43063 -# define LANG_ALBANIAN 0x1c
43065 -# ifndef LANG_AMHARIC
43066 -# define LANG_AMHARIC 0x5e
43068 -# ifndef LANG_ARABIC
43069 -# define LANG_ARABIC 0x01
43071 -# ifndef LANG_ARMENIAN
43072 -# define LANG_ARMENIAN 0x2b
43074 -# ifndef LANG_ASSAMESE
43075 -# define LANG_ASSAMESE 0x4d
43077 -# ifndef LANG_AZERI
43078 -# define LANG_AZERI 0x2c
43080 -# ifndef LANG_BASQUE
43081 -# define LANG_BASQUE 0x2d
43083 -# ifndef LANG_BELARUSIAN
43084 -# define LANG_BELARUSIAN 0x23
43086 -# ifndef LANG_BENGALI
43087 -# define LANG_BENGALI 0x45
43089 -# ifndef LANG_BURMESE
43090 -# define LANG_BURMESE 0x55
43092 -# ifndef LANG_CAMBODIAN
43093 -# define LANG_CAMBODIAN 0x53
43095 -# ifndef LANG_CATALAN
43096 -# define LANG_CATALAN 0x03
43098 -# ifndef LANG_CHEROKEE
43099 -# define LANG_CHEROKEE 0x5c
43101 -# ifndef LANG_DIVEHI
43102 -# define LANG_DIVEHI 0x65
43105 -# define LANG_EDO 0x66
43107 -# ifndef LANG_ESTONIAN
43108 -# define LANG_ESTONIAN 0x25
43110 -# ifndef LANG_FAEROESE
43111 -# define LANG_FAEROESE 0x38
43113 -# ifndef LANG_FARSI
43114 -# define LANG_FARSI 0x29
43116 -# ifndef LANG_FRISIAN
43117 -# define LANG_FRISIAN 0x62
43119 -# ifndef LANG_FULFULDE
43120 -# define LANG_FULFULDE 0x67
43122 -# ifndef LANG_GAELIC
43123 -# define LANG_GAELIC 0x3c
43125 -# ifndef LANG_GALICIAN
43126 -# define LANG_GALICIAN 0x56
43128 -# ifndef LANG_GEORGIAN
43129 -# define LANG_GEORGIAN 0x37
43131 -# ifndef LANG_GUARANI
43132 -# define LANG_GUARANI 0x74
43134 -# ifndef LANG_GUJARATI
43135 -# define LANG_GUJARATI 0x47
43137 -# ifndef LANG_HAUSA
43138 -# define LANG_HAUSA 0x68
43140 -# ifndef LANG_HAWAIIAN
43141 -# define LANG_HAWAIIAN 0x75
43143 -# ifndef LANG_HEBREW
43144 -# define LANG_HEBREW 0x0d
43146 -# ifndef LANG_HINDI
43147 -# define LANG_HINDI 0x39
43149 -# ifndef LANG_IBIBIO
43150 -# define LANG_IBIBIO 0x69
43152 -# ifndef LANG_IGBO
43153 -# define LANG_IGBO 0x70
43155 -# ifndef LANG_INDONESIAN
43156 -# define LANG_INDONESIAN 0x21
43158 -# ifndef LANG_INUKTITUT
43159 -# define LANG_INUKTITUT 0x5d
43161 -# ifndef LANG_KANNADA
43162 -# define LANG_KANNADA 0x4b
43164 -# ifndef LANG_KANURI
43165 -# define LANG_KANURI 0x71
43167 -# ifndef LANG_KASHMIRI
43168 -# define LANG_KASHMIRI 0x60
43170 -# ifndef LANG_KAZAK
43171 -# define LANG_KAZAK 0x3f
43173 -# ifndef LANG_KONKANI
43174 -# define LANG_KONKANI 0x57
43176 -# ifndef LANG_KYRGYZ
43177 -# define LANG_KYRGYZ 0x40
43180 -# define LANG_LAO 0x54
43182 -# ifndef LANG_LATIN
43183 -# define LANG_LATIN 0x76
43185 -# ifndef LANG_LATVIAN
43186 -# define LANG_LATVIAN 0x26
43188 -# ifndef LANG_LITHUANIAN
43189 -# define LANG_LITHUANIAN 0x27
43191 -# ifndef LANG_MACEDONIAN
43192 -# define LANG_MACEDONIAN 0x2f
43194 -# ifndef LANG_MALAY
43195 -# define LANG_MALAY 0x3e
43197 -# ifndef LANG_MALAYALAM
43198 -# define LANG_MALAYALAM 0x4c
43200 -# ifndef LANG_MALTESE
43201 -# define LANG_MALTESE 0x3a
43203 -# ifndef LANG_MANIPURI
43204 -# define LANG_MANIPURI 0x58
43206 -# ifndef LANG_MARATHI
43207 -# define LANG_MARATHI 0x4e
43209 -# ifndef LANG_MONGOLIAN
43210 -# define LANG_MONGOLIAN 0x50
43212 -# ifndef LANG_NEPALI
43213 -# define LANG_NEPALI 0x61
43215 -# ifndef LANG_ORIYA
43216 -# define LANG_ORIYA 0x48
43218 -# ifndef LANG_OROMO
43219 -# define LANG_OROMO 0x72
43221 -# ifndef LANG_PAPIAMENTU
43222 -# define LANG_PAPIAMENTU 0x79
43224 -# ifndef LANG_PASHTO
43225 -# define LANG_PASHTO 0x63
43227 -# ifndef LANG_PUNJABI
43228 -# define LANG_PUNJABI 0x46
43230 -# ifndef LANG_RHAETO_ROMANCE
43231 -# define LANG_RHAETO_ROMANCE 0x17
43233 -# ifndef LANG_SAAMI
43234 -# define LANG_SAAMI 0x3b
43236 -# ifndef LANG_SANSKRIT
43237 -# define LANG_SANSKRIT 0x4f
43239 -# ifndef LANG_SERBIAN
43240 -# define LANG_SERBIAN 0x1a
43242 -# ifndef LANG_SINDHI
43243 -# define LANG_SINDHI 0x59
43245 -# ifndef LANG_SINHALESE
43246 -# define LANG_SINHALESE 0x5b
43248 -# ifndef LANG_SLOVAK
43249 -# define LANG_SLOVAK 0x1b
43251 -# ifndef LANG_SOMALI
43252 -# define LANG_SOMALI 0x77
43254 -# ifndef LANG_SORBIAN
43255 -# define LANG_SORBIAN 0x2e
43257 -# ifndef LANG_SUTU
43258 -# define LANG_SUTU 0x30
43260 -# ifndef LANG_SWAHILI
43261 -# define LANG_SWAHILI 0x41
43263 -# ifndef LANG_SYRIAC
43264 -# define LANG_SYRIAC 0x5a
43266 -# ifndef LANG_TAGALOG
43267 -# define LANG_TAGALOG 0x64
43269 -# ifndef LANG_TAJIK
43270 -# define LANG_TAJIK 0x28
43272 -# ifndef LANG_TAMAZIGHT
43273 -# define LANG_TAMAZIGHT 0x5f
43275 -# ifndef LANG_TAMIL
43276 -# define LANG_TAMIL 0x49
43278 -# ifndef LANG_TATAR
43279 -# define LANG_TATAR 0x44
43281 -# ifndef LANG_TELUGU
43282 -# define LANG_TELUGU 0x4a
43284 -# ifndef LANG_THAI
43285 -# define LANG_THAI 0x1e
43287 -# ifndef LANG_TIBETAN
43288 -# define LANG_TIBETAN 0x51
43290 -# ifndef LANG_TIGRINYA
43291 -# define LANG_TIGRINYA 0x73
43293 -# ifndef LANG_TSONGA
43294 -# define LANG_TSONGA 0x31
43296 -# ifndef LANG_TSWANA
43297 -# define LANG_TSWANA 0x32
43299 -# ifndef LANG_TURKMEN
43300 -# define LANG_TURKMEN 0x42
43302 -# ifndef LANG_UKRAINIAN
43303 -# define LANG_UKRAINIAN 0x22
43305 -# ifndef LANG_URDU
43306 -# define LANG_URDU 0x20
43308 -# ifndef LANG_UZBEK
43309 -# define LANG_UZBEK 0x43
43311 -# ifndef LANG_VENDA
43312 -# define LANG_VENDA 0x33
43314 -# ifndef LANG_VIETNAMESE
43315 -# define LANG_VIETNAMESE 0x2a
43317 -# ifndef LANG_WELSH
43318 -# define LANG_WELSH 0x52
43320 -# ifndef LANG_XHOSA
43321 -# define LANG_XHOSA 0x34
43324 -# define LANG_YI 0x78
43326 -# ifndef LANG_YIDDISH
43327 -# define LANG_YIDDISH 0x3d
43329 -# ifndef LANG_YORUBA
43330 -# define LANG_YORUBA 0x6a
43332 -# ifndef LANG_ZULU
43333 -# define LANG_ZULU 0x35
43335 -# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
43336 -# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
43338 -# ifndef SUBLANG_ARABIC_IRAQ
43339 -# define SUBLANG_ARABIC_IRAQ 0x02
43341 -# ifndef SUBLANG_ARABIC_EGYPT
43342 -# define SUBLANG_ARABIC_EGYPT 0x03
43344 -# ifndef SUBLANG_ARABIC_LIBYA
43345 -# define SUBLANG_ARABIC_LIBYA 0x04
43347 -# ifndef SUBLANG_ARABIC_ALGERIA
43348 -# define SUBLANG_ARABIC_ALGERIA 0x05
43350 -# ifndef SUBLANG_ARABIC_MOROCCO
43351 -# define SUBLANG_ARABIC_MOROCCO 0x06
43353 -# ifndef SUBLANG_ARABIC_TUNISIA
43354 -# define SUBLANG_ARABIC_TUNISIA 0x07
43356 -# ifndef SUBLANG_ARABIC_OMAN
43357 -# define SUBLANG_ARABIC_OMAN 0x08
43359 -# ifndef SUBLANG_ARABIC_YEMEN
43360 -# define SUBLANG_ARABIC_YEMEN 0x09
43362 -# ifndef SUBLANG_ARABIC_SYRIA
43363 -# define SUBLANG_ARABIC_SYRIA 0x0a
43365 -# ifndef SUBLANG_ARABIC_JORDAN
43366 -# define SUBLANG_ARABIC_JORDAN 0x0b
43368 -# ifndef SUBLANG_ARABIC_LEBANON
43369 -# define SUBLANG_ARABIC_LEBANON 0x0c
43371 -# ifndef SUBLANG_ARABIC_KUWAIT
43372 -# define SUBLANG_ARABIC_KUWAIT 0x0d
43374 -# ifndef SUBLANG_ARABIC_UAE
43375 -# define SUBLANG_ARABIC_UAE 0x0e
43377 -# ifndef SUBLANG_ARABIC_BAHRAIN
43378 -# define SUBLANG_ARABIC_BAHRAIN 0x0f
43380 -# ifndef SUBLANG_ARABIC_QATAR
43381 -# define SUBLANG_ARABIC_QATAR 0x10
43383 -# ifndef SUBLANG_AZERI_LATIN
43384 -# define SUBLANG_AZERI_LATIN 0x01
43386 -# ifndef SUBLANG_AZERI_CYRILLIC
43387 -# define SUBLANG_AZERI_CYRILLIC 0x02
43389 -# ifndef SUBLANG_BENGALI_INDIA
43390 -# define SUBLANG_BENGALI_INDIA 0x00
43392 -# ifndef SUBLANG_BENGALI_BANGLADESH
43393 -# define SUBLANG_BENGALI_BANGLADESH 0x01
43395 -# ifndef SUBLANG_CHINESE_MACAU
43396 -# define SUBLANG_CHINESE_MACAU 0x05
43398 -# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
43399 -# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
43401 -# ifndef SUBLANG_ENGLISH_JAMAICA
43402 -# define SUBLANG_ENGLISH_JAMAICA 0x08
43404 -# ifndef SUBLANG_ENGLISH_CARIBBEAN
43405 -# define SUBLANG_ENGLISH_CARIBBEAN 0x09
43407 -# ifndef SUBLANG_ENGLISH_BELIZE
43408 -# define SUBLANG_ENGLISH_BELIZE 0x0a
43410 -# ifndef SUBLANG_ENGLISH_TRINIDAD
43411 -# define SUBLANG_ENGLISH_TRINIDAD 0x0b
43413 -# ifndef SUBLANG_ENGLISH_ZIMBABWE
43414 -# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
43416 -# ifndef SUBLANG_ENGLISH_PHILIPPINES
43417 -# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
43419 -# ifndef SUBLANG_ENGLISH_INDONESIA
43420 -# define SUBLANG_ENGLISH_INDONESIA 0x0e
43422 -# ifndef SUBLANG_ENGLISH_HONGKONG
43423 -# define SUBLANG_ENGLISH_HONGKONG 0x0f
43425 -# ifndef SUBLANG_ENGLISH_INDIA
43426 -# define SUBLANG_ENGLISH_INDIA 0x10
43428 -# ifndef SUBLANG_ENGLISH_MALAYSIA
43429 -# define SUBLANG_ENGLISH_MALAYSIA 0x11
43431 -# ifndef SUBLANG_ENGLISH_SINGAPORE
43432 -# define SUBLANG_ENGLISH_SINGAPORE 0x12
43434 -# ifndef SUBLANG_FRENCH_LUXEMBOURG
43435 -# define SUBLANG_FRENCH_LUXEMBOURG 0x05
43437 -# ifndef SUBLANG_FRENCH_MONACO
43438 -# define SUBLANG_FRENCH_MONACO 0x06
43440 -# ifndef SUBLANG_FRENCH_WESTINDIES
43441 -# define SUBLANG_FRENCH_WESTINDIES 0x07
43443 -# ifndef SUBLANG_FRENCH_REUNION
43444 -# define SUBLANG_FRENCH_REUNION 0x08
43446 -# ifndef SUBLANG_FRENCH_CONGO
43447 -# define SUBLANG_FRENCH_CONGO 0x09
43449 -# ifndef SUBLANG_FRENCH_SENEGAL
43450 -# define SUBLANG_FRENCH_SENEGAL 0x0a
43452 -# ifndef SUBLANG_FRENCH_CAMEROON
43453 -# define SUBLANG_FRENCH_CAMEROON 0x0b
43455 -# ifndef SUBLANG_FRENCH_COTEDIVOIRE
43456 -# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
43458 -# ifndef SUBLANG_FRENCH_MALI
43459 -# define SUBLANG_FRENCH_MALI 0x0d
43461 -# ifndef SUBLANG_FRENCH_MOROCCO
43462 -# define SUBLANG_FRENCH_MOROCCO 0x0e
43464 -# ifndef SUBLANG_FRENCH_HAITI
43465 -# define SUBLANG_FRENCH_HAITI 0x0f
43467 -# ifndef SUBLANG_GERMAN_LUXEMBOURG
43468 -# define SUBLANG_GERMAN_LUXEMBOURG 0x04
43470 -# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
43471 -# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
43473 -# ifndef SUBLANG_KASHMIRI_INDIA
43474 -# define SUBLANG_KASHMIRI_INDIA 0x02
43476 -# ifndef SUBLANG_MALAY_MALAYSIA
43477 -# define SUBLANG_MALAY_MALAYSIA 0x01
43479 -# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
43480 -# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
43482 -# ifndef SUBLANG_NEPALI_INDIA
43483 -# define SUBLANG_NEPALI_INDIA 0x02
43485 -# ifndef SUBLANG_PUNJABI_INDIA
43486 -# define SUBLANG_PUNJABI_INDIA 0x00
43488 -# ifndef SUBLANG_PUNJABI_PAKISTAN
43489 -# define SUBLANG_PUNJABI_PAKISTAN 0x01
43491 -# ifndef SUBLANG_ROMANIAN_ROMANIA
43492 -# define SUBLANG_ROMANIAN_ROMANIA 0x00
43494 -# ifndef SUBLANG_ROMANIAN_MOLDOVA
43495 -# define SUBLANG_ROMANIAN_MOLDOVA 0x01
43497 -# ifndef SUBLANG_SERBIAN_LATIN
43498 -# define SUBLANG_SERBIAN_LATIN 0x02
43500 -# ifndef SUBLANG_SERBIAN_CYRILLIC
43501 -# define SUBLANG_SERBIAN_CYRILLIC 0x03
43503 -# ifndef SUBLANG_SINDHI_INDIA
43504 -# define SUBLANG_SINDHI_INDIA 0x00
43506 -# ifndef SUBLANG_SINDHI_PAKISTAN
43507 -# define SUBLANG_SINDHI_PAKISTAN 0x01
43509 -# ifndef SUBLANG_SPANISH_GUATEMALA
43510 -# define SUBLANG_SPANISH_GUATEMALA 0x04
43512 -# ifndef SUBLANG_SPANISH_COSTA_RICA
43513 -# define SUBLANG_SPANISH_COSTA_RICA 0x05
43515 -# ifndef SUBLANG_SPANISH_PANAMA
43516 -# define SUBLANG_SPANISH_PANAMA 0x06
43518 -# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
43519 -# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
43521 -# ifndef SUBLANG_SPANISH_VENEZUELA
43522 -# define SUBLANG_SPANISH_VENEZUELA 0x08
43524 -# ifndef SUBLANG_SPANISH_COLOMBIA
43525 -# define SUBLANG_SPANISH_COLOMBIA 0x09
43527 -# ifndef SUBLANG_SPANISH_PERU
43528 -# define SUBLANG_SPANISH_PERU 0x0a
43530 -# ifndef SUBLANG_SPANISH_ARGENTINA
43531 -# define SUBLANG_SPANISH_ARGENTINA 0x0b
43533 -# ifndef SUBLANG_SPANISH_ECUADOR
43534 -# define SUBLANG_SPANISH_ECUADOR 0x0c
43536 -# ifndef SUBLANG_SPANISH_CHILE
43537 -# define SUBLANG_SPANISH_CHILE 0x0d
43539 -# ifndef SUBLANG_SPANISH_URUGUAY
43540 -# define SUBLANG_SPANISH_URUGUAY 0x0e
43542 -# ifndef SUBLANG_SPANISH_PARAGUAY
43543 -# define SUBLANG_SPANISH_PARAGUAY 0x0f
43545 -# ifndef SUBLANG_SPANISH_BOLIVIA
43546 -# define SUBLANG_SPANISH_BOLIVIA 0x10
43548 -# ifndef SUBLANG_SPANISH_EL_SALVADOR
43549 -# define SUBLANG_SPANISH_EL_SALVADOR 0x11
43551 -# ifndef SUBLANG_SPANISH_HONDURAS
43552 -# define SUBLANG_SPANISH_HONDURAS 0x12
43554 -# ifndef SUBLANG_SPANISH_NICARAGUA
43555 -# define SUBLANG_SPANISH_NICARAGUA 0x13
43557 -# ifndef SUBLANG_SPANISH_PUERTO_RICO
43558 -# define SUBLANG_SPANISH_PUERTO_RICO 0x14
43560 -# ifndef SUBLANG_SWEDISH_FINLAND
43561 -# define SUBLANG_SWEDISH_FINLAND 0x02
43563 -# ifndef SUBLANG_TAMAZIGHT_ARABIC
43564 -# define SUBLANG_TAMAZIGHT_ARABIC 0x01
43566 -# ifndef SUBLANG_TAMAZIGHT_LATIN
43567 -# define SUBLANG_TAMAZIGHT_LATIN 0x02
43569 -# ifndef SUBLANG_TIGRINYA_ETHIOPIA
43570 -# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
43572 -# ifndef SUBLANG_TIGRINYA_ERITREA
43573 -# define SUBLANG_TIGRINYA_ERITREA 0x01
43575 -# ifndef SUBLANG_URDU_PAKISTAN
43576 -# define SUBLANG_URDU_PAKISTAN 0x01
43578 -# ifndef SUBLANG_URDU_INDIA
43579 -# define SUBLANG_URDU_INDIA 0x02
43581 -# ifndef SUBLANG_UZBEK_LATIN
43582 -# define SUBLANG_UZBEK_LATIN 0x01
43584 -# ifndef SUBLANG_UZBEK_CYRILLIC
43585 -# define SUBLANG_UZBEK_CYRILLIC 0x02
43589 -# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
43590 -/* MacOS X 10.2 or newer */
43592 -/* Canonicalize a MacOS X locale name to a Unix locale name.
43593 - NAME is a sufficiently large buffer.
43594 - On input, it contains the MacOS X locale name.
43595 - On output, it contains the Unix locale name. */
43597 -_nl_locale_name_canonicalize (char *name)
43599 - /* This conversion is based on a posting by
43600 - Deborah GoldSmith <goldsmit@apple.com> on 2005-03-08,
43601 - http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
43603 - /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
43604 - ISO 3166) names. Prior to MacOS X 10.3, there is no API for doing this.
43605 - Therefore we do it ourselves, using a table based on the results of the
43606 - MacOS X 10.3.8 function
43607 - CFLocaleCreateCanonicalLocaleIdentifierFromString(). */
43608 - typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
43610 - static const legacy_entry legacy_table[] = {
43611 - { "Afrikaans", "af" },
43612 - { "Albanian", "sq" },
43613 - { "Amharic", "am" },
43614 - { "Arabic", "ar" },
43615 - { "Armenian", "hy" },
43616 - { "Assamese", "as" },
43617 - { "Aymara", "ay" },
43618 - { "Azerbaijani", "az" },
43619 - { "Basque", "eu" },
43620 - { "Belarusian", "be" },
43621 - { "Belorussian", "be" },
43622 - { "Bengali", "bn" },
43623 - { "Brazilian Portugese", "pt_BR" },
43624 - { "Brazilian Portuguese", "pt_BR" },
43625 - { "Breton", "br" },
43626 - { "Bulgarian", "bg" },
43627 - { "Burmese", "my" },
43628 - { "Byelorussian", "be" },
43629 - { "Catalan", "ca" },
43630 - { "Chewa", "ny" },
43631 - { "Chichewa", "ny" },
43632 - { "Chinese", "zh" },
43633 - { "Chinese, Simplified", "zh_CN" },
43634 - { "Chinese, Traditional", "zh_TW" },
43635 - { "Chinese, Tradtional", "zh_TW" },
43636 - { "Croatian", "hr" },
43637 - { "Czech", "cs" },
43638 - { "Danish", "da" },
43639 - { "Dutch", "nl" },
43640 - { "Dzongkha", "dz" },
43641 - { "English", "en" },
43642 - { "Esperanto", "eo" },
43643 - { "Estonian", "et" },
43644 - { "Faroese", "fo" },
43645 - { "Farsi", "fa" },
43646 - { "Finnish", "fi" },
43647 - { "Flemish", "nl_BE" },
43648 - { "French", "fr" },
43649 - { "Galician", "gl" },
43650 - { "Gallegan", "gl" },
43651 - { "Georgian", "ka" },
43652 - { "German", "de" },
43653 - { "Greek", "el" },
43654 - { "Greenlandic", "kl" },
43655 - { "Guarani", "gn" },
43656 - { "Gujarati", "gu" },
43657 - { "Hawaiian", "haw" }, /* Yes, "haw", not "cpe". */
43658 - { "Hebrew", "he" },
43659 - { "Hindi", "hi" },
43660 - { "Hungarian", "hu" },
43661 - { "Icelandic", "is" },
43662 - { "Indonesian", "id" },
43663 - { "Inuktitut", "iu" },
43664 - { "Irish", "ga" },
43665 - { "Italian", "it" },
43666 - { "Japanese", "ja" },
43667 - { "Javanese", "jv" },
43668 - { "Kalaallisut", "kl" },
43669 - { "Kannada", "kn" },
43670 - { "Kashmiri", "ks" },
43671 - { "Kazakh", "kk" },
43672 - { "Khmer", "km" },
43673 - { "Kinyarwanda", "rw" },
43674 - { "Kirghiz", "ky" },
43675 - { "Korean", "ko" },
43676 - { "Kurdish", "ku" },
43677 - { "Latin", "la" },
43678 - { "Latvian", "lv" },
43679 - { "Lithuanian", "lt" },
43680 - { "Macedonian", "mk" },
43681 - { "Malagasy", "mg" },
43682 - { "Malay", "ms" },
43683 - { "Malayalam", "ml" },
43684 - { "Maltese", "mt" },
43685 - { "Manx", "gv" },
43686 - { "Marathi", "mr" },
43687 - { "Moldavian", "mo" },
43688 - { "Mongolian", "mn" },
43689 - { "Nepali", "ne" },
43690 - { "Norwegian", "nb" }, /* Yes, "nb", not the obsolete "no". */
43691 - { "Nyanja", "ny" },
43692 - { "Nynorsk", "nn" },
43693 - { "Oriya", "or" },
43694 - { "Oromo", "om" },
43695 - { "Panjabi", "pa" },
43696 - { "Pashto", "ps" },
43697 - { "Persian", "fa" },
43698 - { "Polish", "pl" },
43699 - { "Portuguese", "pt" },
43700 - { "Portuguese, Brazilian", "pt_BR" },
43701 - { "Punjabi", "pa" },
43702 - { "Pushto", "ps" },
43703 - { "Quechua", "qu" },
43704 - { "Romanian", "ro" },
43705 - { "Ruanda", "rw" },
43706 - { "Rundi", "rn" },
43707 - { "Russian", "ru" },
43708 - { "Sami", "se_NO" }, /* Not just "se". */
43709 - { "Sanskrit", "sa" },
43710 - { "Scottish", "gd" },
43711 - { "Serbian", "sr" },
43712 - { "Simplified Chinese", "zh_CN" },
43713 - { "Sindhi", "sd" },
43714 - { "Sinhalese", "si" },
43715 - { "Slovak", "sk" },
43716 - { "Slovenian", "sl" },
43717 - { "Somali", "so" },
43718 - { "Spanish", "es" },
43719 - { "Sundanese", "su" },
43720 - { "Swahili", "sw" },
43721 - { "Swedish", "sv" },
43722 - { "Tagalog", "tl" },
43723 - { "Tajik", "tg" },
43724 - { "Tajiki", "tg" },
43725 - { "Tamil", "ta" },
43726 - { "Tatar", "tt" },
43727 - { "Telugu", "te" },
43728 - { "Thai", "th" },
43729 - { "Tibetan", "bo" },
43730 - { "Tigrinya", "ti" },
43731 - { "Tongan", "to" },
43732 - { "Traditional Chinese", "zh_TW" },
43733 - { "Turkish", "tr" },
43734 - { "Turkmen", "tk" },
43735 - { "Uighur", "ug" },
43736 - { "Ukrainian", "uk" },
43737 - { "Urdu", "ur" },
43738 - { "Uzbek", "uz" },
43739 - { "Vietnamese", "vi" },
43740 - { "Welsh", "cy" },
43741 - { "Yiddish", "yi" }
43744 - /* Convert new-style locale names with language tags (ISO 639 and ISO 15924)
43745 - to Unix (ISO 639 and ISO 3166) names. */
43746 - typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
43748 - static const langtag_entry langtag_table[] = {
43749 - /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
43750 - The default script for az on Unix is Latin. */
43751 - { "az-Latn", "az" },
43752 - /* MacOS X has "ga-dots". Does not yet exist on Unix. */
43753 - { "ga-dots", "ga" },
43754 - /* MacOS X has "kk-Cyrl". Does not yet exist on Unix. */
43755 - /* MacOS X has "mn-Cyrl", "mn-Mong".
43756 - The default script for mn on Unix is Cyrillic. */
43757 - { "mn-Cyrl", "mn" },
43758 - /* MacOS X has "ms-Arab", "ms-Latn".
43759 - The default script for ms on Unix is Latin. */
43760 - { "ms-Latn", "ms" },
43761 - /* MacOS X has "tg-Cyrl".
43762 - The default script for tg on Unix is Cyrillic. */
43763 - { "tg-Cyrl", "tg" },
43764 - /* MacOS X has "tk-Cyrl". Does not yet exist on Unix. */
43765 - /* MacOS X has "tt-Cyrl".
43766 - The default script for tt on Unix is Cyrillic. */
43767 - { "tt-Cyrl", "tt" },
43768 - /* MacOS X has "zh-Hans", "zh-Hant".
43769 - Country codes are used to distinguish these on Unix. */
43770 - { "zh-Hans", "zh_CN" },
43771 - { "zh-Hant", "zh_TW" }
43774 - /* Convert script names (ISO 15924) to Unix conventions.
43775 - See http://www.unicode.org/iso15924/iso15924-codes.html */
43776 - typedef struct { const char script[4+1]; const char unixy[9+1]; }
43778 - static const script_entry script_table[] = {
43779 - { "Arab", "arabic" },
43780 - { "Cyrl", "cyrillic" },
43781 - { "Mong", "mongolian" }
43784 - /* Step 1: Convert using legacy_table. */
43785 - if (name[0] >= 'A' && name[0] <= 'Z')
43787 - unsigned int i1, i2;
43789 - i2 = sizeof (legacy_table) / sizeof (legacy_entry);
43790 - while (i2 - i1 > 1)
43792 - /* At this point we know that if name occurs in legacy_table,
43793 - its index must be >= i1 and < i2. */
43794 - unsigned int i = (i1 + i2) >> 1;
43795 - const legacy_entry *p = &legacy_table[i];
43796 - if (strcmp (name, p->legacy) < 0)
43801 - if (strcmp (name, legacy_table[i1].legacy) == 0)
43803 - strcpy (name, legacy_table[i1].unixy);
43808 - /* Step 2: Convert using langtag_table and script_table. */
43809 - if (strlen (name) == 7 && name[2] == '-')
43811 - unsigned int i1, i2;
43813 - i2 = sizeof (langtag_table) / sizeof (langtag_entry);
43814 - while (i2 - i1 > 1)
43816 - /* At this point we know that if name occurs in langtag_table,
43817 - its index must be >= i1 and < i2. */
43818 - unsigned int i = (i1 + i2) >> 1;
43819 - const langtag_entry *p = &langtag_table[i];
43820 - if (strcmp (name, p->langtag) < 0)
43825 - if (strcmp (name, langtag_table[i1].langtag) == 0)
43827 - strcpy (name, langtag_table[i1].unixy);
43832 - i2 = sizeof (script_table) / sizeof (script_entry);
43833 - while (i2 - i1 > 1)
43835 - /* At this point we know that if (name + 3) occurs in script_table,
43836 - its index must be >= i1 and < i2. */
43837 - unsigned int i = (i1 + i2) >> 1;
43838 - const script_entry *p = &script_table[i];
43839 - if (strcmp (name + 3, p->script) < 0)
43844 - if (strcmp (name + 3, script_table[i1].script) == 0)
43847 - strcpy (name + 3, script_table[i1].unixy);
43852 - /* Step 3: Convert new-style dash to Unix underscore. */
43855 - for (p = name; *p != '\0'; p++)
43863 -/* XPG3 defines the result of 'setlocale (category, NULL)' as:
43864 - "Directs 'setlocale()' to query 'category' and return the current
43865 - setting of 'local'."
43866 - However it does not specify the exact format. Neither do SUSV2 and
43867 - ISO C 99. So we can use this feature only on selected systems (e.g.
43868 - those using GNU C Library). */
43869 -#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
43870 -# define HAVE_LOCALE_NULL
43873 -/* Determine the current locale's name, and canonicalize it into XPG syntax
43874 - language[_territory[.codeset]][@modifier]
43875 - The codeset part in the result is not reliable; the locale_charset()
43876 - should be used for codeset information instead.
43877 - The result must not be freed; it is statically allocated. */
43880 -_nl_locale_name_posix (int category, const char *categoryname)
43882 - /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
43883 - On some systems this can be done by the 'setlocale' function itself. */
43884 -#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
43885 - return setlocale (category, NULL);
43887 - const char *retval;
43889 - /* Setting of LC_ALL overrides all other. */
43890 - retval = getenv ("LC_ALL");
43891 - if (retval != NULL && retval[0] != '\0')
43893 - /* Next comes the name of the desired category. */
43894 - retval = getenv (categoryname);
43895 - if (retval != NULL && retval[0] != '\0')
43897 - /* Last possibility is the LANG environment variable. */
43898 - retval = getenv ("LANG");
43899 - if (retval != NULL && retval[0] != '\0')
43907 -_nl_locale_name_default (void)
43909 - /* POSIX:2001 says:
43910 - "All implementations shall define a locale as the default locale, to be
43911 - invoked when no environment variables are set, or set to the empty
43912 - string. This default locale can be the POSIX locale or any other
43913 - implementation-defined locale. Some implementations may provide
43914 - facilities for local installation administrators to set the default
43915 - locale, customizing it for each location. POSIX:2001 does not require
43916 - such a facility. */
43918 -#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined(WIN32))
43920 - /* The system does not have a way of setting the locale, other than the
43921 - POSIX specified environment variables. We use C as default locale. */
43926 - /* Return an XPG style locale name language[_territory][@modifier].
43927 - Don't even bother determining the codeset; it's not useful in this
43928 - context, because message catalogs are not specific to a single
43931 -# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
43932 - /* MacOS X 10.2 or newer */
43934 - /* Cache the locale name, since CoreFoundation calls are expensive. */
43935 - static const char *cached_localename;
43937 - if (cached_localename == NULL)
43939 - char namebuf[256];
43940 -# if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
43941 - CFLocaleRef locale = CFLocaleCopyCurrent ();
43942 - CFStringRef name = CFLocaleGetIdentifier (locale);
43944 - if (CFStringGetCString (name, namebuf, sizeof(namebuf),
43945 - kCFStringEncodingASCII))
43947 - _nl_locale_name_canonicalize (namebuf);
43948 - cached_localename = strdup (namebuf);
43950 - CFRelease (locale);
43951 -# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
43952 - CFTypeRef value =
43953 - CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
43954 - kCFPreferencesCurrentApplication);
43955 - if (value != NULL
43956 - && CFGetTypeID (value) == CFStringGetTypeID ()
43957 - && CFStringGetCString ((CFStringRef)value, namebuf, sizeof(namebuf),
43958 - kCFStringEncodingASCII))
43960 - _nl_locale_name_canonicalize (namebuf);
43961 - cached_localename = strdup (namebuf);
43964 - if (cached_localename == NULL)
43965 - cached_localename = "C";
43967 - return cached_localename;
43972 -# if defined(WIN32) /* WIN32 */
43976 - int primary, sub;
43978 - /* Use native Win32 API locale ID. */
43979 - lcid = GetThreadLocale ();
43981 - /* Strip off the sorting rules, keep only the language part. */
43982 - langid = LANGIDFROMLCID (lcid);
43984 - /* Split into language and territory part. */
43985 - primary = PRIMARYLANGID (langid);
43986 - sub = SUBLANGID (langid);
43988 - /* Dispatch on language.
43989 - See also http://www.unicode.org/unicode/onlinedat/languages.html .
43990 - For details about languages, see http://www.ethnologue.com/ . */
43993 - case LANG_AFRIKAANS: return "af_ZA";
43994 - case LANG_ALBANIAN: return "sq_AL";
43995 - case LANG_AMHARIC: return "am_ET";
43996 - case LANG_ARABIC:
43999 - case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
44000 - case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
44001 - case SUBLANG_ARABIC_EGYPT: return "ar_EG";
44002 - case SUBLANG_ARABIC_LIBYA: return "ar_LY";
44003 - case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
44004 - case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
44005 - case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
44006 - case SUBLANG_ARABIC_OMAN: return "ar_OM";
44007 - case SUBLANG_ARABIC_YEMEN: return "ar_YE";
44008 - case SUBLANG_ARABIC_SYRIA: return "ar_SY";
44009 - case SUBLANG_ARABIC_JORDAN: return "ar_JO";
44010 - case SUBLANG_ARABIC_LEBANON: return "ar_LB";
44011 - case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
44012 - case SUBLANG_ARABIC_UAE: return "ar_AE";
44013 - case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
44014 - case SUBLANG_ARABIC_QATAR: return "ar_QA";
44017 - case LANG_ARMENIAN: return "hy_AM";
44018 - case LANG_ASSAMESE: return "as_IN";
44022 - /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
44023 - case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
44024 - case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
44027 - case LANG_BASQUE:
44030 - case SUBLANG_DEFAULT: return "eu_ES";
44032 - return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
44033 - case LANG_BELARUSIAN: return "be_BY";
44034 - case LANG_BENGALI:
44037 - case SUBLANG_BENGALI_INDIA: return "bn_IN";
44038 - case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
44041 - case LANG_BULGARIAN: return "bg_BG";
44042 - case LANG_BURMESE: return "my_MM";
44043 - case LANG_CAMBODIAN: return "km_KH";
44044 - case LANG_CATALAN: return "ca_ES";
44045 - case LANG_CHEROKEE: return "chr_US";
44046 - case LANG_CHINESE:
44049 - case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
44050 - case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
44051 - case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
44052 - case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
44053 - case SUBLANG_CHINESE_MACAU: return "zh_MO";
44056 - case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
44057 - * What used to be called Serbo-Croatian
44058 - * should really now be two separate
44059 - * languages because of political reasons.
44060 - * (Says tml, who knows nothing about Serbian
44062 - * (I can feel those flames coming already.)
44066 - case SUBLANG_DEFAULT: return "hr_HR";
44067 - case SUBLANG_SERBIAN_LATIN: return "sr_CS";
44068 - case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
44071 - case LANG_CZECH: return "cs_CZ";
44072 - case LANG_DANISH: return "da_DK";
44073 - case LANG_DIVEHI: return "dv_MV";
44077 - case SUBLANG_DUTCH: return "nl_NL";
44078 - case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
44081 - case LANG_EDO: return "bin_NG";
44082 - case LANG_ENGLISH:
44085 - /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
44086 - * English was the language spoken in England.
44089 - case SUBLANG_ENGLISH_US: return "en_US";
44090 - case SUBLANG_ENGLISH_UK: return "en_GB";
44091 - case SUBLANG_ENGLISH_AUS: return "en_AU";
44092 - case SUBLANG_ENGLISH_CAN: return "en_CA";
44093 - case SUBLANG_ENGLISH_NZ: return "en_NZ";
44094 - case SUBLANG_ENGLISH_EIRE: return "en_IE";
44095 - case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
44096 - case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
44097 - case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
44098 - case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
44099 - case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
44100 - case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
44101 - case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
44102 - case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
44103 - case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
44104 - case SUBLANG_ENGLISH_INDIA: return "en_IN";
44105 - case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
44106 - case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
44109 - case LANG_ESTONIAN: return "et_EE";
44110 - case LANG_FAEROESE: return "fo_FO";
44111 - case LANG_FARSI: return "fa_IR";
44112 - case LANG_FINNISH: return "fi_FI";
44113 - case LANG_FRENCH:
44116 - case SUBLANG_FRENCH: return "fr_FR";
44117 - case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
44118 - case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
44119 - case SUBLANG_FRENCH_SWISS: return "fr_CH";
44120 - case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
44121 - case SUBLANG_FRENCH_MONACO: return "fr_MC";
44122 - case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
44123 - case SUBLANG_FRENCH_REUNION: return "fr_RE";
44124 - case SUBLANG_FRENCH_CONGO: return "fr_CG";
44125 - case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
44126 - case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
44127 - case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
44128 - case SUBLANG_FRENCH_MALI: return "fr_ML";
44129 - case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
44130 - case SUBLANG_FRENCH_HAITI: return "fr_HT";
44133 - case LANG_FRISIAN: return "fy_NL";
44134 - case LANG_FULFULDE:
44135 - /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
44137 - case LANG_GAELIC:
44140 - case 0x01: /* SCOTTISH */ return "gd_GB";
44141 - case 0x02: /* IRISH */ return "ga_IE";
44144 - case LANG_GALICIAN: return "gl_ES";
44145 - case LANG_GEORGIAN: return "ka_GE";
44146 - case LANG_GERMAN:
44149 - case SUBLANG_GERMAN: return "de_DE";
44150 - case SUBLANG_GERMAN_SWISS: return "de_CH";
44151 - case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
44152 - case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
44153 - case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
44156 - case LANG_GREEK: return "el_GR";
44157 - case LANG_GUARANI: return "gn_PY";
44158 - case LANG_GUJARATI: return "gu_IN";
44159 - case LANG_HAUSA: return "ha_NG";
44160 - case LANG_HAWAIIAN:
44161 - /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
44162 - or Hawaii Creole English ("cpe_US", 600000 speakers)? */
44164 - case LANG_HEBREW: return "he_IL";
44165 - case LANG_HINDI: return "hi_IN";
44166 - case LANG_HUNGARIAN: return "hu_HU";
44167 - case LANG_IBIBIO: return "nic_NG";
44168 - case LANG_ICELANDIC: return "is_IS";
44169 - case LANG_IGBO: return "ig_NG";
44170 - case LANG_INDONESIAN: return "id_ID";
44171 - case LANG_INUKTITUT: return "iu_CA";
44172 - case LANG_ITALIAN:
44175 - case SUBLANG_ITALIAN: return "it_IT";
44176 - case SUBLANG_ITALIAN_SWISS: return "it_CH";
44179 - case LANG_JAPANESE: return "ja_JP";
44180 - case LANG_KANNADA: return "kn_IN";
44181 - case LANG_KANURI: return "kr_NG";
44182 - case LANG_KASHMIRI:
44185 - case SUBLANG_DEFAULT: return "ks_PK";
44186 - case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
44189 - case LANG_KAZAK: return "kk_KZ";
44190 - case LANG_KONKANI:
44191 - /* FIXME: Adjust this when such locales appear on Unix. */
44193 - case LANG_KOREAN: return "ko_KR";
44194 - case LANG_KYRGYZ: return "ky_KG";
44195 - case LANG_LAO: return "lo_LA";
44196 - case LANG_LATIN: return "la_VA";
44197 - case LANG_LATVIAN: return "lv_LV";
44198 - case LANG_LITHUANIAN: return "lt_LT";
44199 - case LANG_MACEDONIAN: return "mk_MK";
44203 - case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
44204 - case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
44207 - case LANG_MALAYALAM: return "ml_IN";
44208 - case LANG_MALTESE: return "mt_MT";
44209 - case LANG_MANIPURI:
44210 - /* FIXME: Adjust this when such locales appear on Unix. */
44212 - case LANG_MARATHI: return "mr_IN";
44213 - case LANG_MONGOLIAN:
44216 - case SUBLANG_DEFAULT: return "mn_MN";
44218 - return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
44219 - case LANG_NEPALI:
44222 - case SUBLANG_DEFAULT: return "ne_NP";
44223 - case SUBLANG_NEPALI_INDIA: return "ne_IN";
44226 - case LANG_NORWEGIAN:
44229 - case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
44230 - case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
44233 - case LANG_ORIYA: return "or_IN";
44234 - case LANG_OROMO: return "om_ET";
44235 - case LANG_PAPIAMENTU: return "pap_AN";
44236 - case LANG_PASHTO:
44237 - return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
44238 - case LANG_POLISH: return "pl_PL";
44239 - case LANG_PORTUGUESE:
44242 - case SUBLANG_PORTUGUESE: return "pt_PT";
44243 - /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
44244 - Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
44245 - case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
44248 - case LANG_PUNJABI:
44251 - case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
44252 - case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
44255 - case LANG_RHAETO_ROMANCE: return "rm_CH";
44256 - case LANG_ROMANIAN:
44259 - case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
44260 - case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
44263 - case LANG_RUSSIAN:
44266 - case SUBLANG_DEFAULT: return "ru_RU";
44268 - return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
44269 - case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
44270 - case LANG_SANSKRIT: return "sa_IN";
44271 - case LANG_SINDHI:
44274 - case SUBLANG_SINDHI_INDIA: return "sd_IN";
44275 - case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
44278 - case LANG_SINHALESE: return "si_LK";
44279 - case LANG_SLOVAK: return "sk_SK";
44280 - case LANG_SLOVENIAN: return "sl_SI";
44281 - case LANG_SOMALI: return "so_SO";
44282 - case LANG_SORBIAN:
44283 - /* FIXME: Adjust this when such locales appear on Unix. */
44285 - case LANG_SPANISH:
44288 - case SUBLANG_SPANISH: return "es_ES";
44289 - case SUBLANG_SPANISH_MEXICAN: return "es_MX";
44290 - case SUBLANG_SPANISH_MODERN:
44291 - return "es_ES@modern"; /* not seen on Unix */
44292 - case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
44293 - case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
44294 - case SUBLANG_SPANISH_PANAMA: return "es_PA";
44295 - case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
44296 - case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
44297 - case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
44298 - case SUBLANG_SPANISH_PERU: return "es_PE";
44299 - case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
44300 - case SUBLANG_SPANISH_ECUADOR: return "es_EC";
44301 - case SUBLANG_SPANISH_CHILE: return "es_CL";
44302 - case SUBLANG_SPANISH_URUGUAY: return "es_UY";
44303 - case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
44304 - case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
44305 - case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
44306 - case SUBLANG_SPANISH_HONDURAS: return "es_HN";
44307 - case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
44308 - case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
44311 - case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
44312 - case LANG_SWAHILI: return "sw_KE";
44313 - case LANG_SWEDISH:
44316 - case SUBLANG_DEFAULT: return "sv_SE";
44317 - case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
44320 - case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
44321 - case LANG_TAGALOG: return "tl_PH";
44322 - case LANG_TAJIK: return "tg_TJ";
44323 - case LANG_TAMAZIGHT:
44326 - /* FIXME: Adjust this when Tamazight locales appear on Unix. */
44327 - case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
44328 - case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
44334 - case SUBLANG_DEFAULT: return "ta_IN";
44336 - return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
44337 - case LANG_TATAR: return "tt_RU";
44338 - case LANG_TELUGU: return "te_IN";
44339 - case LANG_THAI: return "th_TH";
44340 - case LANG_TIBETAN: return "bo_CN";
44341 - case LANG_TIGRINYA:
44344 - case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
44345 - case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
44348 - case LANG_TSONGA: return "ts_ZA";
44349 - case LANG_TSWANA: return "tn_BW";
44350 - case LANG_TURKISH: return "tr_TR";
44351 - case LANG_TURKMEN: return "tk_TM";
44352 - case LANG_UKRAINIAN: return "uk_UA";
44356 - case SUBLANG_URDU_PAKISTAN: return "ur_PK";
44357 - case SUBLANG_URDU_INDIA: return "ur_IN";
44363 - case SUBLANG_UZBEK_LATIN: return "uz_UZ";
44364 - case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
44367 - case LANG_VENDA: return "ve_ZA";
44368 - case LANG_VIETNAMESE: return "vi_VN";
44369 - case LANG_WELSH: return "cy_GB";
44370 - case LANG_XHOSA: return "xh_ZA";
44371 - case LANG_YI: return "sit_CN";
44372 - case LANG_YIDDISH: return "yi_IL";
44373 - case LANG_YORUBA: return "yo_NG";
44374 - case LANG_ZULU: return "zu_ZA";
44375 - default: return "C";
44383 -_nl_locale_name (int category, const char *categoryname)
44385 - const char *retval;
44387 - retval = _nl_locale_name_posix (category, categoryname);
44388 - if (retval != NULL)
44391 - return _nl_locale_name_default ();
44393 diff -urN BUILD/abook-0.6.0pre2/intl/log.c abook/intl/log.c
44394 --- BUILD/abook-0.6.0pre2/intl/log.c 2005-09-17 12:10:26.000000000 +0200
44395 +++ abook/intl/log.c 1970-01-01 01:00:00.000000000 +0100
44397 -/* Log file output.
44398 - Copyright (C) 2003 Free Software Foundation, Inc.
44400 - This program is free software; you can redistribute it and/or modify it
44401 - under the terms of the GNU Library General Public License as published
44402 - by the Free Software Foundation; either version 2, or (at your option)
44403 - any later version.
44405 - This program is distributed in the hope that it will be useful,
44406 - but WITHOUT ANY WARRANTY; without even the implied warranty of
44407 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
44408 - Library General Public License for more details.
44410 - You should have received a copy of the GNU Library General Public
44411 - License along with this program; if not, write to the Free Software
44412 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
44415 -/* Written by Bruno Haible <bruno@clisp.org>. */
44417 -#ifdef HAVE_CONFIG_H
44418 -# include <config.h>
44421 -#include <stdio.h>
44422 -#include <stdlib.h>
44423 -#include <string.h>
44425 -/* Print an ASCII string with quotes and escape sequences where needed. */
44427 -print_escaped (FILE *stream, const char *str)
44429 - putc ('"', stream);
44430 - for (; *str != '\0'; str++)
44431 - if (*str == '\n')
44433 - fputs ("\\n\"", stream);
44434 - if (str[1] == '\0')
44436 - fputs ("\n\"", stream);
44440 - if (*str == '"' || *str == '\\')
44441 - putc ('\\', stream);
44442 - putc (*str, stream);
44444 - putc ('"', stream);
44447 -/* Add to the log file an entry denoting a failed translation. */
44449 -_nl_log_untranslated (const char *logfilename, const char *domainname,
44450 - const char *msgid1, const char *msgid2, int plural)
44452 - static char *last_logfilename = NULL;
44453 - static FILE *last_logfile = NULL;
44456 - /* Can we reuse the last opened logfile? */
44457 - if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
44459 - /* Close the last used logfile. */
44460 - if (last_logfilename != NULL)
44462 - if (last_logfile != NULL)
44464 - fclose (last_logfile);
44465 - last_logfile = NULL;
44467 - free (last_logfilename);
44468 - last_logfilename = NULL;
44470 - /* Open the logfile. */
44471 - last_logfilename = (char *) malloc (strlen (logfilename) + 1);
44472 - if (last_logfilename == NULL)
44474 - strcpy (last_logfilename, logfilename);
44475 - last_logfile = fopen (logfilename, "a");
44476 - if (last_logfile == NULL)
44479 - logfile = last_logfile;
44481 - fprintf (logfile, "domain ");
44482 - print_escaped (logfile, domainname);
44483 - fprintf (logfile, "\nmsgid ");
44484 - print_escaped (logfile, msgid1);
44487 - fprintf (logfile, "\nmsgid_plural ");
44488 - print_escaped (logfile, msgid2);
44489 - fprintf (logfile, "\nmsgstr[0] \"\"\n");
44492 - fprintf (logfile, "\nmsgstr \"\"\n");
44493 - putc ('\n', logfile);
44495 diff -urN BUILD/abook-0.6.0pre2/intl/Makefile.in abook/intl/Makefile.in
44496 --- BUILD/abook-0.6.0pre2/intl/Makefile.in 2006-08-04 22:30:07.000000000 +0200
44497 +++ abook/intl/Makefile.in 1970-01-01 01:00:00.000000000 +0100
44499 -# Makefile for directory with message catalog handling library of GNU gettext
44500 -# Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
44502 -# This program is free software; you can redistribute it and/or modify it
44503 -# under the terms of the GNU Library General Public License as published
44504 -# by the Free Software Foundation; either version 2, or (at your option)
44505 -# any later version.
44507 -# This program is distributed in the hope that it will be useful,
44508 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
44509 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
44510 -# Library General Public License for more details.
44512 -# You should have received a copy of the GNU Library General Public
44513 -# License along with this program; if not, write to the Free Software
44514 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
44517 -PACKAGE = @PACKAGE@
44518 -VERSION = @VERSION@
44523 -top_srcdir = @top_srcdir@
44528 -exec_prefix = @exec_prefix@
44529 -transform = @program_transform_name@
44531 -includedir = @includedir@
44532 -datadir = @datadir@
44533 -datarootdir = @datarootdir@
44534 -localedir = $(datadir)/locale
44535 -gettextsrcdir = $(datadir)/gettext/intl
44536 -aliaspath = $(localedir)
44539 -INSTALL = @INSTALL@
44540 -INSTALL_DATA = @INSTALL_DATA@
44541 -MKINSTALLDIRS = @MKINSTALLDIRS@
44542 -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
44544 -l = @INTL_LIBTOOL_SUFFIX_PREFIX@
44548 -LIBTOOL = @LIBTOOL@
44550 -YACC = @INTLBISON@ -y -d
44551 -YFLAGS = --name-prefix=__gettext
44553 -DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
44554 --DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
44555 --DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
44556 --Dset_relocation_prefix=libintl_set_relocation_prefix \
44557 --Drelocate=libintl_relocate \
44558 --DDEPENDS_ON_LIBICONV=1 @DEFS@
44559 -CPPFLAGS = @CPPFLAGS@
44561 -LDFLAGS = @LDFLAGS@
44564 -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
44576 - printf-args.h printf-args.c \
44577 - printf-parse.h wprintf-parse.h printf-parse.c \
44578 - vasnprintf.h vasnwprintf.h vasnprintf.c \
44608 - bindtextdom.$lo \
44614 - localealias.$lo \
44617 - explodename.$lo \
44624 - localcharset.$lo \
44625 - relocatable.$lo \
44632 -DISTFILES.common = Makefile.in \
44633 -config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
44634 -DISTFILES.generated = plural.c
44635 -DISTFILES.normal = VERSION
44636 -DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
44637 -libgnuintl.h_vms Makefile.vms \
44638 -libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
44639 -DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
44640 -COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
44642 -all: all-@USE_INCLUDED_LIBINTL@
44643 -all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
44644 -all-no: all-no-@BUILD_INCLUDED_LIBINTL@
44645 -all-no-yes: libgnuintl.$la
44648 -libintl.a libgnuintl.a: $(OBJECTS)
44650 - $(AR) cru $@ $(OBJECTS)
44653 -libintl.la libgnuintl.la: $(OBJECTS)
44654 - $(LIBTOOL) --mode=link \
44655 - $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
44656 - $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
44657 - -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
44658 - -rpath $(libdir) \
44661 -# Libtool's library version information for libintl.
44662 -# Before making a gettext release, the gettext maintainer must change this
44663 -# according to the libtool documentation, section "Library interface versions".
44664 -# Maintainers of other packages that include the intl directory must *not*
44665 -# change these values.
44671 -.SUFFIXES: .c .y .o .lo .sin .sed
44677 - $(YACC) $(YFLAGS) --output $@ $<
44680 -bindtextdom.lo: $(srcdir)/bindtextdom.c
44681 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
44682 -dcgettext.lo: $(srcdir)/dcgettext.c
44683 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
44684 -dgettext.lo: $(srcdir)/dgettext.c
44685 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
44686 -gettext.lo: $(srcdir)/gettext.c
44687 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
44688 -finddomain.lo: $(srcdir)/finddomain.c
44689 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
44690 -loadmsgcat.lo: $(srcdir)/loadmsgcat.c
44691 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
44692 -localealias.lo: $(srcdir)/localealias.c
44693 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
44694 -textdomain.lo: $(srcdir)/textdomain.c
44695 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
44696 -l10nflist.lo: $(srcdir)/l10nflist.c
44697 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
44698 -explodename.lo: $(srcdir)/explodename.c
44699 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
44700 -dcigettext.lo: $(srcdir)/dcigettext.c
44701 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
44702 -dcngettext.lo: $(srcdir)/dcngettext.c
44703 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
44704 -dngettext.lo: $(srcdir)/dngettext.c
44705 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
44706 -ngettext.lo: $(srcdir)/ngettext.c
44707 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
44708 -plural.lo: $(srcdir)/plural.c
44709 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
44710 -plural-exp.lo: $(srcdir)/plural-exp.c
44711 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
44712 -localcharset.lo: $(srcdir)/localcharset.c
44713 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
44714 -relocatable.lo: $(srcdir)/relocatable.c
44715 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
44716 -langprefs.lo: $(srcdir)/langprefs.c
44717 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
44718 -localename.lo: $(srcdir)/localename.c
44719 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
44720 -log.lo: $(srcdir)/log.c
44721 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
44722 -printf.lo: $(srcdir)/printf.c
44723 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
44724 -osdep.lo: $(srcdir)/osdep.c
44725 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
44726 -intl-compat.lo: $(srcdir)/intl-compat.c
44727 - $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
44729 -ref-add.sed: $(srcdir)/ref-add.sin
44730 - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
44731 - mv t-ref-add.sed ref-add.sed
44732 -ref-del.sed: $(srcdir)/ref-del.sin
44733 - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
44734 - mv t-ref-del.sed ref-del.sed
44736 -INCLUDES = -I. -I$(srcdir) -I..
44738 -libgnuintl.h: $(srcdir)/libgnuintl.h.in
44739 - sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
44740 - -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
44741 - -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
44742 - -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
44743 - < $(srcdir)/libgnuintl.h.in > libgnuintl.h
44745 -libintl.h: libgnuintl.h
44746 - cp libgnuintl.h libintl.h
44748 -charset.alias: $(srcdir)/config.charset
44749 - $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
44754 -# We must not install the libintl.h/libintl.a files if we are on a
44755 -# system which has the GNU gettext() function in its C library or in a
44756 -# separate library.
44757 -# If you want to use the one which comes with this version of the
44758 -# package, you have to use `configure --with-included-gettext'.
44759 -install: install-exec install-data
44761 - if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
44762 - && test '@USE_INCLUDED_LIBINTL@' = yes; then \
44763 - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
44764 - $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
44765 - $(LIBTOOL) --mode=install \
44766 - $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
44767 - if test "@RELOCATABLE@" = yes; then \
44768 - dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
44769 - if test -n "$$dependencies"; then \
44770 - rm -f $(DESTDIR)$(libdir)/libintl.la; \
44776 - if test "$(PACKAGE)" = "gettext-tools" \
44777 - && test '@USE_INCLUDED_LIBINTL@' = no \
44778 - && test @GLIBC2@ != no; then \
44779 - $(mkinstalldirs) $(DESTDIR)$(libdir); \
44780 - $(LIBTOOL) --mode=install \
44781 - $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
44782 - rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
44783 - $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
44784 - $(LIBTOOL) --mode=uninstall \
44785 - rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
44789 - if test '@USE_INCLUDED_LIBINTL@' = yes; then \
44790 - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
44791 - temp=$(DESTDIR)$(libdir)/t-charset.alias; \
44792 - dest=$(DESTDIR)$(libdir)/charset.alias; \
44793 - if test -f $(DESTDIR)$(libdir)/charset.alias; then \
44794 - orig=$(DESTDIR)$(libdir)/charset.alias; \
44795 - sed -f ref-add.sed $$orig > $$temp; \
44796 - $(INSTALL_DATA) $$temp $$dest; \
44799 - if test @GLIBC21@ = no; then \
44800 - orig=charset.alias; \
44801 - sed -f ref-add.sed $$orig > $$temp; \
44802 - $(INSTALL_DATA) $$temp $$dest; \
44806 - $(mkinstalldirs) $(DESTDIR)$(localedir); \
44807 - test -f $(DESTDIR)$(localedir)/locale.alias \
44808 - && orig=$(DESTDIR)$(localedir)/locale.alias \
44809 - || orig=$(srcdir)/locale.alias; \
44810 - temp=$(DESTDIR)$(localedir)/t-locale.alias; \
44811 - dest=$(DESTDIR)$(localedir)/locale.alias; \
44812 - sed -f ref-add.sed $$orig > $$temp; \
44813 - $(INSTALL_DATA) $$temp $$dest; \
44819 - if test "$(PACKAGE)" = "gettext-tools"; then \
44820 - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
44821 - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
44822 - $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
44823 - dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
44824 - for file in $$dists; do \
44825 - $(INSTALL_DATA) $(srcdir)/$$file \
44826 - $(DESTDIR)$(gettextsrcdir)/$$file; \
44828 - chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
44829 - dists="$(DISTFILES.generated)"; \
44830 - for file in $$dists; do \
44831 - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
44832 - $(INSTALL_DATA) $$dir/$$file \
44833 - $(DESTDIR)$(gettextsrcdir)/$$file; \
44835 - dists="$(DISTFILES.obsolete)"; \
44836 - for file in $$dists; do \
44837 - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
44843 -install-strip: install
44846 - if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
44847 - && test '@USE_INCLUDED_LIBINTL@' = yes; then \
44848 - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
44852 - if test "$(PACKAGE)" = "gettext-tools" \
44853 - && test '@USE_INCLUDED_LIBINTL@' = no \
44854 - && test @GLIBC2@ != no; then \
44855 - $(mkinstalldirs) $(DESTDIR)$(libdir); \
44859 - if test '@USE_INCLUDED_LIBINTL@' = yes; then \
44860 - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
44861 - $(mkinstalldirs) $(DESTDIR)$(localedir); \
44865 - if test "$(PACKAGE)" = "gettext-tools"; then \
44866 - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
44871 -# Define this as empty until I found a useful application.
44875 - if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
44876 - && test '@USE_INCLUDED_LIBINTL@' = yes; then \
44877 - rm -f $(DESTDIR)$(includedir)/libintl.h; \
44878 - $(LIBTOOL) --mode=uninstall \
44879 - rm -f $(DESTDIR)$(libdir)/libintl.$la; \
44883 - if test "$(PACKAGE)" = "gettext-tools" \
44884 - && test '@USE_INCLUDED_LIBINTL@' = no \
44885 - && test @GLIBC2@ != no; then \
44886 - rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
44890 - if test '@USE_INCLUDED_LIBINTL@' = yes; then \
44891 - if test -f $(DESTDIR)$(libdir)/charset.alias; then \
44892 - temp=$(DESTDIR)$(libdir)/t-charset.alias; \
44893 - dest=$(DESTDIR)$(libdir)/charset.alias; \
44894 - sed -f ref-del.sed $$dest > $$temp; \
44895 - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
44898 - $(INSTALL_DATA) $$temp $$dest; \
44902 - if test -f $(DESTDIR)$(localedir)/locale.alias; then \
44903 - temp=$(DESTDIR)$(localedir)/t-locale.alias; \
44904 - dest=$(DESTDIR)$(localedir)/locale.alias; \
44905 - sed -f ref-del.sed $$dest > $$temp; \
44906 - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
44909 - $(INSTALL_DATA) $$temp $$dest; \
44916 - if test "$(PACKAGE)" = "gettext-tools"; then \
44917 - for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
44918 - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
44924 -info dvi ps pdf html:
44926 -$(OBJECTS): ../config.h libgnuintl.h
44927 -bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
44928 -dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
44929 -explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
44930 -dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
44931 -dcigettext.$lo: $(srcdir)/eval-plural.h
44932 -localcharset.$lo: $(srcdir)/localcharset.h
44933 -localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
44934 -printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
44938 -TAGS: $(HEADERS) $(SOURCES)
44939 - here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
44943 -CTAGS: $(HEADERS) $(SOURCES)
44944 - here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
44948 -ID: $(HEADERS) $(SOURCES)
44949 - here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
44953 - rm -f *.a *.la *.o *.obj *.lo core core.*
44954 - rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
44955 - rm -f -r .libs _libs
44957 -clean: mostlyclean
44960 - rm -f Makefile ID TAGS
44961 - if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
44962 - rm -f ChangeLog.inst $(DISTFILES.normal); \
44967 -maintainer-clean: distclean
44968 - @echo "This command is intended for maintainers to use;"
44969 - @echo "it deletes files that may require special tools to rebuild."
44972 -# GNU gettext needs not contain the file `VERSION' but contains some
44973 -# other files which should not be distributed in other packages.
44974 -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
44975 -dist distdir: Makefile
44976 - if test "$(PACKAGE)" = "gettext-tools"; then \
44979 - if test "$(PACKAGE)" = "gettext-runtime"; then \
44980 - additional="$(DISTFILES.gettext)"; \
44982 - additional="$(DISTFILES.normal)"; \
44984 - $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
44985 - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
44986 - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
44987 - cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
44991 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
44992 - cd $(top_builddir) && $(SHELL) ./config.status
44993 -# This would be more efficient, but doesn't work any more with autoconf-2.57,
44994 -# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
44995 -# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
44997 -# Tell versions [3.59,3.63) of GNU make not to export all variables.
44998 -# Otherwise a system limit (for SysV at least) may be exceeded.
45000 diff -urN BUILD/abook-0.6.0pre2/intl/ngettext.c abook/intl/ngettext.c
45001 --- BUILD/abook-0.6.0pre2/intl/ngettext.c 2005-09-17 12:10:26.000000000 +0200
45002 +++ abook/intl/ngettext.c 1970-01-01 01:00:00.000000000 +0100
45004 -/* Implementation of ngettext(3) function.
45005 - Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
45007 - This program is free software; you can redistribute it and/or modify it
45008 - under the terms of the GNU Library General Public License as published
45009 - by the Free Software Foundation; either version 2, or (at your option)
45010 - any later version.
45012 - This program is distributed in the hope that it will be useful,
45013 - but WITHOUT ANY WARRANTY; without even the implied warranty of
45014 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45015 - Library General Public License for more details.
45017 - You should have received a copy of the GNU Library General Public
45018 - License along with this program; if not, write to the Free Software
45019 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
45022 -#ifdef HAVE_CONFIG_H
45023 -# include <config.h>
45027 -# define __need_NULL
45028 -# include <stddef.h>
45030 -# include <stdlib.h> /* Just for NULL. */
45033 -#include "gettextP.h"
45035 -# include <libintl.h>
45037 -# include "libgnuintl.h"
45040 -#include <locale.h>
45042 -/* @@ end of prolog @@ */
45044 -/* Names for the libintl functions are a problem. They must not clash
45045 - with existing names and they should follow ANSI C. But this source
45046 - code is also used in GNU C Library where the names have a __
45047 - prefix. So we have to make a difference here. */
45049 -# define NGETTEXT __ngettext
45050 -# define DCNGETTEXT __dcngettext
45052 -# define NGETTEXT libintl_ngettext
45053 -# define DCNGETTEXT libintl_dcngettext
45056 -/* Look up MSGID in the current default message catalog for the current
45057 - LC_MESSAGES locale. If not found, returns MSGID itself (the default
45060 -NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
45062 - return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
45066 -/* Alias for function name in GNU C Library. */
45067 -weak_alias (__ngettext, ngettext);
45069 diff -urN BUILD/abook-0.6.0pre2/intl/os2compat.c abook/intl/os2compat.c
45070 --- BUILD/abook-0.6.0pre2/intl/os2compat.c 2005-09-17 12:10:26.000000000 +0200
45071 +++ abook/intl/os2compat.c 1970-01-01 01:00:00.000000000 +0100
45073 -/* OS/2 compatibility functions.
45074 - Copyright (C) 2001-2002 Free Software Foundation, Inc.
45076 - This program is free software; you can redistribute it and/or modify it
45077 - under the terms of the GNU Library General Public License as published
45078 - by the Free Software Foundation; either version 2, or (at your option)
45079 - any later version.
45081 - This program is distributed in the hope that it will be useful,
45082 - but WITHOUT ANY WARRANTY; without even the implied warranty of
45083 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45084 - Library General Public License for more details.
45086 - You should have received a copy of the GNU Library General Public
45087 - License along with this program; if not, write to the Free Software
45088 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
45092 -#ifdef HAVE_CONFIG_H
45093 -#include <config.h>
45096 -#include <stdlib.h>
45097 -#include <string.h>
45098 -#include <sys/param.h>
45100 -/* A version of getenv() that works from DLLs */
45101 -extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
45104 -_nl_getenv (const char *name)
45106 - unsigned char *value;
45107 - if (DosScanEnv (name, &value))
45113 -/* A fixed size buffer. */
45114 -char libintl_nl_default_dirname[MAXPATHLEN+1];
45116 -char *_nlos2_libdir = NULL;
45117 -char *_nlos2_localealiaspath = NULL;
45118 -char *_nlos2_localedir = NULL;
45120 -static __attribute__((constructor)) void
45121 -nlos2_initialize ()
45123 - char *root = getenv ("UNIXROOT");
45124 - char *gnulocaledir = getenv ("GNULOCALEDIR");
45126 - _nlos2_libdir = gnulocaledir;
45127 - if (!_nlos2_libdir)
45131 - size_t sl = strlen (root);
45132 - _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
45133 - memcpy (_nlos2_libdir, root, sl);
45134 - memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
45137 - _nlos2_libdir = LIBDIR;
45140 - _nlos2_localealiaspath = gnulocaledir;
45141 - if (!_nlos2_localealiaspath)
45145 - size_t sl = strlen (root);
45146 - _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
45147 - memcpy (_nlos2_localealiaspath, root, sl);
45148 - memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
45151 - _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
45154 - _nlos2_localedir = gnulocaledir;
45155 - if (!_nlos2_localedir)
45159 - size_t sl = strlen (root);
45160 - _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
45161 - memcpy (_nlos2_localedir, root, sl);
45162 - memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
45165 - _nlos2_localedir = LOCALEDIR;
45168 - if (strlen (_nlos2_localedir) <= MAXPATHLEN)
45169 - strcpy (libintl_nl_default_dirname, _nlos2_localedir);
45171 diff -urN BUILD/abook-0.6.0pre2/intl/os2compat.h abook/intl/os2compat.h
45172 --- BUILD/abook-0.6.0pre2/intl/os2compat.h 2005-09-17 12:10:26.000000000 +0200
45173 +++ abook/intl/os2compat.h 1970-01-01 01:00:00.000000000 +0100
45175 -/* OS/2 compatibility defines.
45176 - This file is intended to be included from config.h
45177 - Copyright (C) 2001-2002 Free Software Foundation, Inc.
45179 - This program is free software; you can redistribute it and/or modify it
45180 - under the terms of the GNU Library General Public License as published
45181 - by the Free Software Foundation; either version 2, or (at your option)
45182 - any later version.
45184 - This program is distributed in the hope that it will be useful,
45185 - but WITHOUT ANY WARRANTY; without even the implied warranty of
45186 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45187 - Library General Public License for more details.
45189 - You should have received a copy of the GNU Library General Public
45190 - License along with this program; if not, write to the Free Software
45191 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
45194 -/* When included from os2compat.h we need all the original definitions */
45198 -#define LIBDIR _nlos2_libdir
45199 -extern char *_nlos2_libdir;
45202 -#define LOCALEDIR _nlos2_localedir
45203 -extern char *_nlos2_localedir;
45205 -#undef LOCALE_ALIAS_PATH
45206 -#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
45207 -extern char *_nlos2_localealiaspath;
45211 -#undef HAVE_STRCASECMP
45212 -#define HAVE_STRCASECMP 1
45213 -#define strcasecmp stricmp
45214 -#define strncasecmp strnicmp
45216 -/* We have our own getenv() which works even if library is compiled as DLL */
45217 -#define getenv _nl_getenv
45219 -/* Older versions of gettext used -1 as the value of LC_MESSAGES */
45220 -#define LC_MESSAGES_COMPAT (-1)
45221 diff -urN BUILD/abook-0.6.0pre2/intl/osdep.c abook/intl/osdep.c
45222 --- BUILD/abook-0.6.0pre2/intl/osdep.c 2005-09-17 12:10:26.000000000 +0200
45223 +++ abook/intl/osdep.c 1970-01-01 01:00:00.000000000 +0100
45225 -/* OS dependent parts of libintl.
45226 - Copyright (C) 2001-2002 Free Software Foundation, Inc.
45228 - This program is free software; you can redistribute it and/or modify it
45229 - under the terms of the GNU Library General Public License as published
45230 - by the Free Software Foundation; either version 2, or (at your option)
45231 - any later version.
45233 - This program is distributed in the hope that it will be useful,
45234 - but WITHOUT ANY WARRANTY; without even the implied warranty of
45235 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45236 - Library General Public License for more details.
45238 - You should have received a copy of the GNU Library General Public
45239 - License along with this program; if not, write to the Free Software
45240 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
45243 -#if defined __EMX__
45244 -# include "os2compat.c"
45246 -/* Avoid AIX compiler warning. */
45247 -typedef int dummy;
45249 diff -urN BUILD/abook-0.6.0pre2/intl/plural.c abook/intl/plural.c
45250 --- BUILD/abook-0.6.0pre2/intl/plural.c 2005-09-17 12:10:26.000000000 +0200
45251 +++ abook/intl/plural.c 1970-01-01 01:00:00.000000000 +0100
45253 -/* A Bison parser, made from plural.y
45254 - by GNU bison 1.35. */
45256 -#define YYBISON 1 /* Identify Bison output. */
45258 -#define yyparse __gettextparse
45259 -#define yylex __gettextlex
45260 -#define yyerror __gettexterror
45261 -#define yylval __gettextlval
45262 -#define yychar __gettextchar
45263 -#define yydebug __gettextdebug
45264 -#define yynerrs __gettextnerrs
45265 -# define EQUOP2 257
45266 -# define CMPOP2 258
45267 -# define ADDOP2 259
45268 -# define MULOP2 260
45269 -# define NUMBER 261
45271 -#line 1 "plural.y"
45273 -/* Expression parsing for plural form selection.
45274 - Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
45275 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
45277 - This program is free software; you can redistribute it and/or modify it
45278 - under the terms of the GNU Library General Public License as published
45279 - by the Free Software Foundation; either version 2, or (at your option)
45280 - any later version.
45282 - This program is distributed in the hope that it will be useful,
45283 - but WITHOUT ANY WARRANTY; without even the implied warranty of
45284 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45285 - Library General Public License for more details.
45287 - You should have received a copy of the GNU Library General Public
45288 - License along with this program; if not, write to the Free Software
45289 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
45292 -/* The bison generated parser uses alloca. AIX 3 forces us to put this
45293 - declaration at the beginning of the file. The declaration in bison's
45294 - skeleton file comes too late. This must come before <config.h>
45295 - because <config.h> may include arbitrary system headers. */
45296 -#if defined _AIX && !defined __GNUC__
45300 -#ifdef HAVE_CONFIG_H
45301 -# include <config.h>
45304 -#include <stddef.h>
45305 -#include <stdlib.h>
45306 -#include "plural-exp.h"
45308 -/* The main function generated by the parser is called __gettextparse,
45309 - but we want it to be called PLURAL_PARSE. */
45311 -# define __gettextparse PLURAL_PARSE
45314 -#define YYLEX_PARAM &((struct parse_args *) arg)->cp
45315 -#define YYPARSE_PARAM arg
45317 -#line 49 "plural.y"
45320 - unsigned long int num;
45321 - enum operator op;
45322 - struct expression *exp;
45324 -# define YYSTYPE yystype
45325 -# define YYSTYPE_IS_TRIVIAL 1
45327 -#line 55 "plural.y"
45329 -/* Prototypes for local functions. */
45330 -static int yylex (YYSTYPE *lval, const char **pexp);
45331 -static void yyerror (const char *str);
45333 -/* Allocation of expressions. */
45335 -static struct expression *
45336 -new_exp (int nargs, enum operator op, struct expression * const *args)
45339 - struct expression *newp;
45341 - /* If any of the argument could not be malloc'ed, just return NULL. */
45342 - for (i = nargs - 1; i >= 0; i--)
45343 - if (args[i] == NULL)
45346 - /* Allocate a new expression. */
45347 - newp = (struct expression *) malloc (sizeof (*newp));
45348 - if (newp != NULL)
45350 - newp->nargs = nargs;
45351 - newp->operation = op;
45352 - for (i = nargs - 1; i >= 0; i--)
45353 - newp->val.args[i] = args[i];
45358 - for (i = nargs - 1; i >= 0; i--)
45359 - FREE_EXPRESSION (args[i]);
45364 -static inline struct expression *
45365 -new_exp_0 (enum operator op)
45367 - return new_exp (0, op, NULL);
45370 -static inline struct expression *
45371 -new_exp_1 (enum operator op, struct expression *right)
45373 - struct expression *args[1];
45376 - return new_exp (1, op, args);
45379 -static struct expression *
45380 -new_exp_2 (enum operator op, struct expression *left, struct expression *right)
45382 - struct expression *args[2];
45386 - return new_exp (2, op, args);
45389 -static inline struct expression *
45390 -new_exp_3 (enum operator op, struct expression *bexp,
45391 - struct expression *tbranch, struct expression *fbranch)
45393 - struct expression *args[3];
45396 - args[1] = tbranch;
45397 - args[2] = fbranch;
45398 - return new_exp (3, op, args);
45402 -# define YYDEBUG 0
45407 -#define YYFINAL 27
45408 -#define YYFLAG -32768
45409 -#define YYNTBASE 16
45411 -/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
45412 -#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
45414 -/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
45415 -static const char yytranslate[] =
45417 - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45418 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45419 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45420 - 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
45421 - 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
45422 - 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
45423 - 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
45424 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45425 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45426 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45427 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45428 - 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45429 - 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
45430 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45431 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45432 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45433 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45434 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45435 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45436 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45437 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45438 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45439 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45440 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45441 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
45442 - 2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
45447 -static const short yyprhs[] =
45449 - 0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
45452 -static const short yyrhs[] =
45454 - 17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
45455 - 17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
45456 - 17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
45457 - 17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
45464 -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
45465 -static const short yyrline[] =
45467 - 0, 150, 158, 162, 166, 170, 174, 178, 182, 186,
45473 -#if (YYDEBUG) || defined YYERROR_VERBOSE
45475 -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
45476 -static const char *const yytname[] =
45478 - "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
45479 - "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
45480 - "start", "exp", 0
45484 -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
45485 -static const short yyr1[] =
45487 - 0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
45491 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
45492 -static const short yyr2[] =
45494 - 0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
45498 -/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
45499 - doesn't specify something else to do. Zero means the default is an
45501 -static const short yydefact[] =
45503 - 0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
45504 - 0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
45505 - 6, 7, 8, 0, 2, 0, 0, 0
45508 -static const short yydefgoto[] =
45513 -static const short yypact[] =
45515 - -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
45516 - -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
45517 - 26, -3,-32768, -9, 34, 21, 53,-32768
45520 -static const short yypgoto[] =
45529 -static const short yytable[] =
45531 - 6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
45532 - 19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
45533 - 14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
45534 - 11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
45535 - 11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
45539 -static const short yycheck[] =
45541 - 1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
45542 - 11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
45543 - 9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
45544 - 6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
45545 - 6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
45550 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
45551 -#line 3 "/usr/local/share/bison/bison.simple"
45553 -/* Skeleton output parser for bison,
45555 - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
45558 - This program is free software; you can redistribute it and/or modify
45559 - it under the terms of the GNU General Public License as published by
45560 - the Free Software Foundation; either version 2, or (at your option)
45561 - any later version.
45563 - This program is distributed in the hope that it will be useful,
45564 - but WITHOUT ANY WARRANTY; without even the implied warranty of
45565 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
45566 - GNU General Public License for more details.
45568 - You should have received a copy of the GNU General Public License
45569 - along with this program; if not, write to the Free Software
45570 - Foundation, Inc., 59 Temple Place - Suite 330,
45571 - Boston, MA 02111-1307, USA. */
45573 -/* As a special exception, when this file is copied by Bison into a
45574 - Bison output file, you may use that output file without restriction.
45575 - This special exception was added by the Free Software Foundation
45576 - in version 1.24 of Bison. */
45578 -/* This is the parser code that is written into each bison parser when
45579 - the %semantic_parser declaration is not specified in the grammar.
45580 - It was written by Richard Stallman by simplifying the hairy parser
45581 - used when %semantic_parser is specified. */
45583 -/* All symbols defined below should begin with yy or YY, to avoid
45584 - infringing on user name space. This should be done even for local
45585 - variables, as they might otherwise be expanded by user macros.
45586 - There are some unavoidable exceptions within include files to
45587 - define necessary library symbols; they are noted "INFRINGES ON
45588 - USER NAME SPACE" below. */
45590 -#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
45592 -/* The parser invokes alloca or malloc; define the necessary symbols. */
45594 -# if YYSTACK_USE_ALLOCA
45595 -# define YYSTACK_ALLOC alloca
45597 -# ifndef YYSTACK_USE_ALLOCA
45598 -# if defined (alloca) || defined (_ALLOCA_H)
45599 -# define YYSTACK_ALLOC alloca
45602 -# define YYSTACK_ALLOC __builtin_alloca
45608 -# ifdef YYSTACK_ALLOC
45609 - /* Pacify GCC's `empty if-body' warning. */
45610 -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
45612 -# if defined (__STDC__) || defined (__cplusplus)
45613 -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
45614 -# define YYSIZE_T size_t
45616 -# define YYSTACK_ALLOC malloc
45617 -# define YYSTACK_FREE free
45619 -#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
45622 -#if (! defined (yyoverflow) \
45623 - && (! defined (__cplusplus) \
45624 - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
45626 -/* A type that is properly aligned for any stack member. */
45636 -/* The size of the maximum gap between one aligned stack and the next. */
45637 -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
45639 -/* The size of an array large to enough to hold all stacks, each with
45642 -# define YYSTACK_BYTES(N) \
45643 - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
45644 - + 2 * YYSTACK_GAP_MAX)
45646 -# define YYSTACK_BYTES(N) \
45647 - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
45648 - + YYSTACK_GAP_MAX)
45651 -/* Copy COUNT objects from FROM to TO. The source and destination do
45655 -# define YYCOPY(To, From, Count) \
45656 - __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
45658 -# define YYCOPY(To, From, Count) \
45661 - register YYSIZE_T yyi; \
45662 - for (yyi = 0; yyi < (Count); yyi++) \
45663 - (To)[yyi] = (From)[yyi]; \
45669 -/* Relocate STACK from its old location to the new one. The
45670 - local variables YYSIZE and YYSTACKSIZE give the old and new number of
45671 - elements in the stack, and YYPTR gives the new location of the
45672 - stack. Advance YYPTR to a properly aligned location for the next
45674 -# define YYSTACK_RELOCATE(Stack) \
45677 - YYSIZE_T yynewbytes; \
45678 - YYCOPY (&yyptr->Stack, Stack, yysize); \
45679 - Stack = &yyptr->Stack; \
45680 - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
45681 - yyptr += yynewbytes / sizeof (*yyptr); \
45688 -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
45689 -# define YYSIZE_T __SIZE_TYPE__
45691 -#if ! defined (YYSIZE_T) && defined (size_t)
45692 -# define YYSIZE_T size_t
45694 -#if ! defined (YYSIZE_T)
45695 -# if defined (__STDC__) || defined (__cplusplus)
45696 -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
45697 -# define YYSIZE_T size_t
45700 -#if ! defined (YYSIZE_T)
45701 -# define YYSIZE_T unsigned int
45704 -#define yyerrok (yyerrstatus = 0)
45705 -#define yyclearin (yychar = YYEMPTY)
45706 -#define YYEMPTY -2
45708 -#define YYACCEPT goto yyacceptlab
45709 -#define YYABORT goto yyabortlab
45710 -#define YYERROR goto yyerrlab1
45711 -/* Like YYERROR except do call yyerror. This remains here temporarily
45712 - to ease the transition to the new meaning of YYERROR, for GCC.
45713 - Once GCC version 2 has supplanted version 1, this can go. */
45714 -#define YYFAIL goto yyerrlab
45715 -#define YYRECOVERING() (!!yyerrstatus)
45716 -#define YYBACKUP(Token, Value) \
45718 - if (yychar == YYEMPTY && yylen == 1) \
45720 - yychar = (Token); \
45721 - yylval = (Value); \
45722 - yychar1 = YYTRANSLATE (yychar); \
45728 - yyerror ("syntax error: cannot back up"); \
45733 -#define YYTERROR 1
45734 -#define YYERRCODE 256
45737 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions
45740 - When YYLLOC_DEFAULT is run, CURRENT is set the location of the
45741 - first token. By default, to implement support for ranges, extend
45742 - its range to the last symbol. */
45744 -#ifndef YYLLOC_DEFAULT
45745 -# define YYLLOC_DEFAULT(Current, Rhs, N) \
45746 - Current.last_line = Rhs[N].last_line; \
45747 - Current.last_column = Rhs[N].last_column;
45751 -/* YYLEX -- calling `yylex' with the right arguments. */
45755 -# ifdef YYLEX_PARAM
45756 -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
45758 -# define YYLEX yylex (&yylval, &yylloc)
45760 -# else /* !YYLSP_NEEDED */
45761 -# ifdef YYLEX_PARAM
45762 -# define YYLEX yylex (&yylval, YYLEX_PARAM)
45764 -# define YYLEX yylex (&yylval)
45766 -# endif /* !YYLSP_NEEDED */
45767 -#else /* !YYPURE */
45768 -# define YYLEX yylex ()
45769 -#endif /* !YYPURE */
45772 -/* Enable debugging if requested. */
45775 -# ifndef YYFPRINTF
45776 -# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
45777 -# define YYFPRINTF fprintf
45780 -# define YYDPRINTF(Args) \
45783 - YYFPRINTF Args; \
45785 -/* Nonzero means print parse trace. It is left uninitialized so that
45786 - multiple parsers can coexist. */
45788 -#else /* !YYDEBUG */
45789 -# define YYDPRINTF(Args)
45790 -#endif /* !YYDEBUG */
45792 -/* YYINITDEPTH -- initial size of the parser's stacks. */
45793 -#ifndef YYINITDEPTH
45794 -# define YYINITDEPTH 200
45797 -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
45798 - if the built-in stack extension method is used).
45800 - Do not make this value too large; the results are undefined if
45801 - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
45802 - evaluated with infinite-precision integer arithmetic. */
45804 -#if YYMAXDEPTH == 0
45805 -# undef YYMAXDEPTH
45808 -#ifndef YYMAXDEPTH
45809 -# define YYMAXDEPTH 10000
45812 -#ifdef YYERROR_VERBOSE
45815 -# if defined (__GLIBC__) && defined (_STRING_H)
45816 -# define yystrlen strlen
45818 -/* Return the length of YYSTR. */
45820 -# if defined (__STDC__) || defined (__cplusplus)
45821 -yystrlen (const char *yystr)
45824 - const char *yystr;
45827 - register const char *yys = yystr;
45829 - while (*yys++ != '\0')
45832 - return yys - yystr - 1;
45838 -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
45839 -# define yystpcpy stpcpy
45841 -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
45844 -# if defined (__STDC__) || defined (__cplusplus)
45845 -yystpcpy (char *yydest, const char *yysrc)
45847 -yystpcpy (yydest, yysrc)
45849 - const char *yysrc;
45852 - register char *yyd = yydest;
45853 - register const char *yys = yysrc;
45855 - while ((*yyd++ = *yys++) != '\0')
45864 -#line 315 "/usr/local/share/bison/bison.simple"
45867 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
45868 - into yyparse. The argument should have type void *.
45869 - It should actually point to an object.
45870 - Grammar actions can access the variable by casting it
45871 - to the proper pointer type. */
45873 -#ifdef YYPARSE_PARAM
45874 -# if defined (__STDC__) || defined (__cplusplus)
45875 -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
45876 -# define YYPARSE_PARAM_DECL
45878 -# define YYPARSE_PARAM_ARG YYPARSE_PARAM
45879 -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
45881 -#else /* !YYPARSE_PARAM */
45882 -# define YYPARSE_PARAM_ARG
45883 -# define YYPARSE_PARAM_DECL
45884 -#endif /* !YYPARSE_PARAM */
45886 -/* Prevent warning if -Wstrict-prototypes. */
45888 -# ifdef YYPARSE_PARAM
45889 -int yyparse (void *);
45891 -int yyparse (void);
45895 -/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
45896 - variables are global, or local to YYPARSE. */
45898 -#define YY_DECL_NON_LSP_VARIABLES \
45899 -/* The lookahead symbol. */ \
45902 -/* The semantic value of the lookahead symbol. */ \
45905 -/* Number of parse errors so far. */ \
45909 -# define YY_DECL_VARIABLES \
45910 -YY_DECL_NON_LSP_VARIABLES \
45912 -/* Location data for the lookahead symbol. */ \
45915 -# define YY_DECL_VARIABLES \
45916 -YY_DECL_NON_LSP_VARIABLES
45920 -/* If nonreentrant, generate the variables here. */
45924 -#endif /* !YYPURE */
45927 -yyparse (YYPARSE_PARAM_ARG)
45928 - YYPARSE_PARAM_DECL
45930 - /* If reentrant, generate the variables here. */
45932 - YY_DECL_VARIABLES
45933 -#endif /* !YYPURE */
45935 - register int yystate;
45936 - register int yyn;
45938 - /* Number of tokens to shift before error messages enabled. */
45940 - /* Lookahead token as an internal (translated) token number. */
45943 - /* Three stacks and their tools:
45944 - `yyss': related to states,
45945 - `yyvs': related to semantic values,
45946 - `yyls': related to locations.
45948 - Refer to the stacks thru separate pointers, to allow yyoverflow
45949 - to reallocate them elsewhere. */
45951 - /* The state stack. */
45952 - short yyssa[YYINITDEPTH];
45953 - short *yyss = yyssa;
45954 - register short *yyssp;
45956 - /* The semantic value stack. */
45957 - YYSTYPE yyvsa[YYINITDEPTH];
45958 - YYSTYPE *yyvs = yyvsa;
45959 - register YYSTYPE *yyvsp;
45962 - /* The location stack. */
45963 - YYLTYPE yylsa[YYINITDEPTH];
45964 - YYLTYPE *yyls = yylsa;
45969 -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
45971 -# define YYPOPSTACK (yyvsp--, yyssp--)
45974 - YYSIZE_T yystacksize = YYINITDEPTH;
45977 - /* The variables used to return semantic value and location from the
45978 - action routines. */
45984 - /* When reducing, the number of symbols on the RHS of the reduced
45988 - YYDPRINTF ((stderr, "Starting parse\n"));
45993 - yychar = YYEMPTY; /* Cause a token to be read. */
45995 - /* Initialize stack pointers.
45996 - Waste one element of value and location stack
45997 - so that they stay on the same level as the state stack.
45998 - The wasted elements are never initialized. */
46007 -/*------------------------------------------------------------.
46008 -| yynewstate -- Push a new state, which is found in yystate. |
46009 -`------------------------------------------------------------*/
46011 - /* In all cases, when you get here, the value and location stacks
46012 - have just been pushed. so pushing a state here evens the stacks.
46017 - *yyssp = yystate;
46019 - if (yyssp >= yyss + yystacksize - 1)
46021 - /* Get the current used size of the three stacks, in elements. */
46022 - YYSIZE_T yysize = yyssp - yyss + 1;
46026 - /* Give user a chance to reallocate the stack. Use copies of
46027 - these so that the &'s don't force the real ones into
46029 - YYSTYPE *yyvs1 = yyvs;
46030 - short *yyss1 = yyss;
46032 - /* Each stack pointer address is followed by the size of the
46033 - data in use in that stack, in bytes. */
46035 - YYLTYPE *yyls1 = yyls;
46036 - /* This used to be a conditional around just the two extra args,
46037 - but that might be undefined if yyoverflow is a macro. */
46038 - yyoverflow ("parser stack overflow",
46039 - &yyss1, yysize * sizeof (*yyssp),
46040 - &yyvs1, yysize * sizeof (*yyvsp),
46041 - &yyls1, yysize * sizeof (*yylsp),
46045 - yyoverflow ("parser stack overflow",
46046 - &yyss1, yysize * sizeof (*yyssp),
46047 - &yyvs1, yysize * sizeof (*yyvsp),
46053 -#else /* no yyoverflow */
46054 -# ifndef YYSTACK_RELOCATE
46055 - goto yyoverflowlab;
46057 - /* Extend the stack our own way. */
46058 - if (yystacksize >= YYMAXDEPTH)
46059 - goto yyoverflowlab;
46060 - yystacksize *= 2;
46061 - if (yystacksize > YYMAXDEPTH)
46062 - yystacksize = YYMAXDEPTH;
46065 - short *yyss1 = yyss;
46066 - union yyalloc *yyptr =
46067 - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
46069 - goto yyoverflowlab;
46070 - YYSTACK_RELOCATE (yyss);
46071 - YYSTACK_RELOCATE (yyvs);
46073 - YYSTACK_RELOCATE (yyls);
46075 -# undef YYSTACK_RELOCATE
46076 - if (yyss1 != yyssa)
46077 - YYSTACK_FREE (yyss1);
46080 -#endif /* no yyoverflow */
46082 - yyssp = yyss + yysize - 1;
46083 - yyvsp = yyvs + yysize - 1;
46085 - yylsp = yyls + yysize - 1;
46088 - YYDPRINTF ((stderr, "Stack size increased to %lu\n",
46089 - (unsigned long int) yystacksize));
46091 - if (yyssp >= yyss + yystacksize - 1)
46095 - YYDPRINTF ((stderr, "Entering state %d\n", yystate));
46105 -/* Do appropriate processing given the current state. */
46106 -/* Read a lookahead token if we need one and don't already have one. */
46109 - /* First try to decide what to do without reference to lookahead token. */
46111 - yyn = yypact[yystate];
46112 - if (yyn == YYFLAG)
46115 - /* Not known => get a lookahead token if don't already have one. */
46117 - /* yychar is either YYEMPTY or YYEOF
46118 - or a valid token in external form. */
46120 - if (yychar == YYEMPTY)
46122 - YYDPRINTF ((stderr, "Reading a token: "));
46126 - /* Convert token to internal form (in yychar1) for indexing tables with */
46128 - if (yychar <= 0) /* This means end of input. */
46131 - yychar = YYEOF; /* Don't call YYLEX any more */
46133 - YYDPRINTF ((stderr, "Now at end of input.\n"));
46137 - yychar1 = YYTRANSLATE (yychar);
46140 - /* We have to keep this `#if YYDEBUG', since we use variables
46141 - which are defined only if `YYDEBUG' is set. */
46144 - YYFPRINTF (stderr, "Next token is %d (%s",
46145 - yychar, yytname[yychar1]);
46146 - /* Give the individual parser a way to print the precise
46147 - meaning of a token, for further debugging info. */
46149 - YYPRINT (stderr, yychar, yylval);
46151 - YYFPRINTF (stderr, ")\n");
46157 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
46160 - yyn = yytable[yyn];
46162 - /* yyn is what to do for this token type in this state.
46163 - Negative => reduce, -yyn is rule number.
46164 - Positive => shift, yyn is new state.
46165 - New state is final state => don't bother to shift,
46166 - just return success.
46167 - 0, or most negative number => error. */
46171 - if (yyn == YYFLAG)
46176 - else if (yyn == 0)
46179 - if (yyn == YYFINAL)
46182 - /* Shift the lookahead token. */
46183 - YYDPRINTF ((stderr, "Shifting token %d (%s), ",
46184 - yychar, yytname[yychar1]));
46186 - /* Discard the token being shifted unless it is eof. */
46187 - if (yychar != YYEOF)
46188 - yychar = YYEMPTY;
46190 - *++yyvsp = yylval;
46192 - *++yylsp = yylloc;
46195 - /* Count tokens shifted since error; after three, turn off error
46204 -/*-----------------------------------------------------------.
46205 -| yydefault -- do the default action for the current state. |
46206 -`-----------------------------------------------------------*/
46208 - yyn = yydefact[yystate];
46214 -/*-----------------------------.
46215 -| yyreduce -- Do a reduction. |
46216 -`-----------------------------*/
46218 - /* yyn is the number of a rule to reduce with. */
46219 - yylen = yyr2[yyn];
46221 - /* If YYLEN is nonzero, implement the default value of the action:
46224 - Otherwise, the following line sets YYVAL to the semantic value of
46225 - the lookahead token. This behavior is undocumented and Bison
46226 - users should not rely upon it. Assigning to YYVAL
46227 - unconditionally makes the parser a bit smaller, and it avoids a
46228 - GCC warning that YYVAL may be used uninitialized. */
46229 - yyval = yyvsp[1-yylen];
46232 - /* Similarly for the default location. Let the user run additional
46233 - commands if for instance locations are ranges. */
46234 - yyloc = yylsp[1-yylen];
46235 - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
46239 - /* We have to keep this `#if YYDEBUG', since we use variables which
46240 - are defined only if `YYDEBUG' is set. */
46245 - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
46246 - yyn, yyrline[yyn]);
46248 - /* Print the symbols being reduced, and their result. */
46249 - for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
46250 - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
46251 - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
46258 -#line 151 "plural.y"
46260 - if (yyvsp[0].exp == NULL)
46262 - ((struct parse_args *) arg)->res = yyvsp[0].exp;
46266 -#line 159 "plural.y"
46268 - yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
46272 -#line 163 "plural.y"
46274 - yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
46278 -#line 167 "plural.y"
46280 - yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
46284 -#line 171 "plural.y"
46286 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
46290 -#line 175 "plural.y"
46292 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
46296 -#line 179 "plural.y"
46298 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
46302 -#line 183 "plural.y"
46304 - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
46308 -#line 187 "plural.y"
46310 - yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
46314 -#line 191 "plural.y"
46316 - yyval.exp = new_exp_0 (var);
46320 -#line 195 "plural.y"
46322 - if ((yyval.exp = new_exp_0 (num)) != NULL)
46323 - yyval.exp->val.num = yyvsp[0].num;
46327 -#line 200 "plural.y"
46329 - yyval.exp = yyvsp[-1].exp;
46334 -#line 705 "/usr/local/share/bison/bison.simple"
46346 - short *yyssp1 = yyss - 1;
46347 - YYFPRINTF (stderr, "state stack now");
46348 - while (yyssp1 != yyssp)
46349 - YYFPRINTF (stderr, " %d", *++yyssp1);
46350 - YYFPRINTF (stderr, "\n");
46354 - *++yyvsp = yyval;
46356 - *++yylsp = yyloc;
46359 - /* Now `shift' the result of the reduction. Determine what state
46360 - that goes to, based on the state we popped back to and the rule
46361 - number reduced by. */
46365 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
46366 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
46367 - yystate = yytable[yystate];
46369 - yystate = yydefgoto[yyn - YYNTBASE];
46374 -/*------------------------------------.
46375 -| yyerrlab -- here on detecting error |
46376 -`------------------------------------*/
46378 - /* If not already recovering from an error, report this error. */
46379 - if (!yyerrstatus)
46383 -#ifdef YYERROR_VERBOSE
46384 - yyn = yypact[yystate];
46386 - if (yyn > YYFLAG && yyn < YYLAST)
46388 - YYSIZE_T yysize = 0;
46390 - int yyx, yycount;
46393 - /* Start YYX at -YYN if negative to avoid negative indexes in
46395 - for (yyx = yyn < 0 ? -yyn : 0;
46396 - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
46397 - if (yycheck[yyx + yyn] == yyx)
46398 - yysize += yystrlen (yytname[yyx]) + 15, yycount++;
46399 - yysize += yystrlen ("parse error, unexpected ") + 1;
46400 - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
46401 - yymsg = (char *) YYSTACK_ALLOC (yysize);
46404 - char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
46405 - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
46410 - for (yyx = yyn < 0 ? -yyn : 0;
46411 - yyx < (int) (sizeof (yytname) / sizeof (char *));
46413 - if (yycheck[yyx + yyn] == yyx)
46415 - const char *yyq = ! yycount ? ", expecting " : " or ";
46416 - yyp = yystpcpy (yyp, yyq);
46417 - yyp = yystpcpy (yyp, yytname[yyx]);
46422 - YYSTACK_FREE (yymsg);
46425 - yyerror ("parse error; also virtual memory exhausted");
46428 -#endif /* defined (YYERROR_VERBOSE) */
46429 - yyerror ("parse error");
46434 -/*--------------------------------------------------.
46435 -| yyerrlab1 -- error raised explicitly by an action |
46436 -`--------------------------------------------------*/
46438 - if (yyerrstatus == 3)
46440 - /* If just tried and failed to reuse lookahead token after an
46441 - error, discard it. */
46443 - /* return failure if at end of input */
46444 - if (yychar == YYEOF)
46446 - YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
46447 - yychar, yytname[yychar1]));
46448 - yychar = YYEMPTY;
46451 - /* Else will try to reuse lookahead token after shifting the error
46454 - yyerrstatus = 3; /* Each real token shifted decrements this */
46456 - goto yyerrhandle;
46459 -/*-------------------------------------------------------------------.
46460 -| yyerrdefault -- current state does not do anything special for the |
46462 -`-------------------------------------------------------------------*/
46465 - /* This is wrong; only states that explicitly want error tokens
46466 - should shift them. */
46468 - /* If its default is to accept any token, ok. Otherwise pop it. */
46469 - yyn = yydefact[yystate];
46475 -/*---------------------------------------------------------------.
46476 -| yyerrpop -- pop the current state because it cannot handle the |
46478 -`---------------------------------------------------------------*/
46480 - if (yyssp == yyss)
46483 - yystate = *--yyssp;
46491 - short *yyssp1 = yyss - 1;
46492 - YYFPRINTF (stderr, "Error: state stack now");
46493 - while (yyssp1 != yyssp)
46494 - YYFPRINTF (stderr, " %d", *++yyssp1);
46495 - YYFPRINTF (stderr, "\n");
46503 - yyn = yypact[yystate];
46504 - if (yyn == YYFLAG)
46505 - goto yyerrdefault;
46508 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
46509 - goto yyerrdefault;
46511 - yyn = yytable[yyn];
46514 - if (yyn == YYFLAG)
46519 - else if (yyn == 0)
46522 - if (yyn == YYFINAL)
46525 - YYDPRINTF ((stderr, "Shifting error token, "));
46527 - *++yyvsp = yylval;
46529 - *++yylsp = yylloc;
46536 -/*-------------------------------------.
46537 -| yyacceptlab -- YYACCEPT comes here. |
46538 -`-------------------------------------*/
46543 -/*-----------------------------------.
46544 -| yyabortlab -- YYABORT comes here. |
46545 -`-----------------------------------*/
46550 -/*---------------------------------------------.
46551 -| yyoverflowab -- parser overflow comes here. |
46552 -`---------------------------------------------*/
46554 - yyerror ("parser stack overflow");
46556 - /* Fall through. */
46559 -#ifndef yyoverflow
46560 - if (yyss != yyssa)
46561 - YYSTACK_FREE (yyss);
46565 -#line 205 "plural.y"
46570 -FREE_EXPRESSION (struct expression *exp)
46575 - /* Handle the recursive case. */
46576 - switch (exp->nargs)
46579 - FREE_EXPRESSION (exp->val.args[2]);
46580 - /* FALLTHROUGH */
46582 - FREE_EXPRESSION (exp->val.args[1]);
46583 - /* FALLTHROUGH */
46585 - FREE_EXPRESSION (exp->val.args[0]);
46586 - /* FALLTHROUGH */
46596 -yylex (YYSTYPE *lval, const char **pexp)
46598 - const char *exp = *pexp;
46603 - if (exp[0] == '\0')
46609 - if (exp[0] != ' ' && exp[0] != '\t')
46618 - case '0': case '1': case '2': case '3': case '4':
46619 - case '5': case '6': case '7': case '8': case '9':
46621 - unsigned long int n = result - '0';
46622 - while (exp[0] >= '0' && exp[0] <= '9')
46625 - n += exp[0] - '0';
46634 - if (exp[0] == '=')
46637 - lval->op = equal;
46641 - result = YYERRCODE;
46645 - if (exp[0] == '=')
46648 - lval->op = not_equal;
46655 - if (exp[0] == result)
46658 - result = YYERRCODE;
46662 - if (exp[0] == '=')
46665 - lval->op = less_or_equal;
46668 - lval->op = less_than;
46673 - if (exp[0] == '=')
46676 - lval->op = greater_or_equal;
46679 - lval->op = greater_than;
46689 - lval->op = divide;
46694 - lval->op = module;
46704 - lval->op = minus;
46713 - /* Nothing, just return the character. */
46719 - /* Be safe and let the user call this function again. */
46725 - result = YYERRCODE;
46739 -yyerror (const char *str)
46741 - /* Do nothing. We don't print error messages here. */
46743 diff -urN BUILD/abook-0.6.0pre2/intl/plural-exp.c abook/intl/plural-exp.c
46744 --- BUILD/abook-0.6.0pre2/intl/plural-exp.c 2005-09-17 12:10:26.000000000 +0200
46745 +++ abook/intl/plural-exp.c 1970-01-01 01:00:00.000000000 +0100
46747 -/* Expression parsing for plural form selection.
46748 - Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
46749 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
46751 - This program is free software; you can redistribute it and/or modify it
46752 - under the terms of the GNU Library General Public License as published
46753 - by the Free Software Foundation; either version 2, or (at your option)
46754 - any later version.
46756 - This program is distributed in the hope that it will be useful,
46757 - but WITHOUT ANY WARRANTY; without even the implied warranty of
46758 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46759 - Library General Public License for more details.
46761 - You should have received a copy of the GNU Library General Public
46762 - License along with this program; if not, write to the Free Software
46763 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
46766 -#ifdef HAVE_CONFIG_H
46767 -# include <config.h>
46770 -#include <ctype.h>
46771 -#include <stdlib.h>
46772 -#include <string.h>
46774 -#include "plural-exp.h"
46776 -#if (defined __GNUC__ && !defined __APPLE_CC__) \
46777 - || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
46779 -/* These structs are the constant expression for the germanic plural
46780 - form determination. It represents the expression "n != 1". */
46781 -static const struct expression plvar =
46784 - .operation = var,
46786 -static const struct expression plone =
46789 - .operation = num,
46795 -struct expression GERMANIC_PLURAL =
46798 - .operation = not_equal,
46803 - [0] = (struct expression *) &plvar,
46804 - [1] = (struct expression *) &plone
46809 -# define INIT_GERMANIC_PLURAL()
46813 -/* For compilers without support for ISO C 99 struct/union initializers:
46814 - Initialization at run-time. */
46816 -static struct expression plvar;
46817 -static struct expression plone;
46818 -struct expression GERMANIC_PLURAL;
46821 -init_germanic_plural ()
46823 - if (plone.val.num == 0)
46826 - plvar.operation = var;
46829 - plone.operation = num;
46830 - plone.val.num = 1;
46832 - GERMANIC_PLURAL.nargs = 2;
46833 - GERMANIC_PLURAL.operation = not_equal;
46834 - GERMANIC_PLURAL.val.args[0] = &plvar;
46835 - GERMANIC_PLURAL.val.args[1] = &plone;
46839 -# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
46845 -EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
46846 - unsigned long int *npluralsp)
46848 - if (nullentry != NULL)
46850 - const char *plural;
46851 - const char *nplurals;
46853 - plural = strstr (nullentry, "plural=");
46854 - nplurals = strstr (nullentry, "nplurals=");
46855 - if (plural == NULL || nplurals == NULL)
46860 - unsigned long int n;
46861 - struct parse_args args;
46863 - /* First get the number. */
46865 - while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
46867 - if (!(*nplurals >= '0' && *nplurals <= '9'))
46869 -#if defined HAVE_STRTOUL || defined _LIBC
46870 - n = strtoul (nplurals, &endp, 10);
46872 - for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
46873 - n = n * 10 + (*endp - '0');
46875 - if (nplurals == endp)
46879 - /* Due to the restrictions bison imposes onto the interface of the
46880 - scanner function we have to put the input string and the result
46881 - passed up from the parser into the same structure which address
46882 - is passed down to the parser. */
46884 - args.cp = plural;
46885 - if (PLURAL_PARSE (&args) != 0)
46887 - *pluralp = args.res;
46892 - /* By default we are using the Germanic form: singular form only
46893 - for `one', the plural form otherwise. Yes, this is also what
46894 - English is using since English is a Germanic language. */
46896 - INIT_GERMANIC_PLURAL ();
46897 - *pluralp = &GERMANIC_PLURAL;
46901 diff -urN BUILD/abook-0.6.0pre2/intl/plural-exp.h abook/intl/plural-exp.h
46902 --- BUILD/abook-0.6.0pre2/intl/plural-exp.h 2005-09-17 12:10:26.000000000 +0200
46903 +++ abook/intl/plural-exp.h 1970-01-01 01:00:00.000000000 +0100
46905 -/* Expression parsing and evaluation for plural form selection.
46906 - Copyright (C) 2000-2003 Free Software Foundation, Inc.
46907 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
46909 - This program is free software; you can redistribute it and/or modify it
46910 - under the terms of the GNU Library General Public License as published
46911 - by the Free Software Foundation; either version 2, or (at your option)
46912 - any later version.
46914 - This program is distributed in the hope that it will be useful,
46915 - but WITHOUT ANY WARRANTY; without even the implied warranty of
46916 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
46917 - Library General Public License for more details.
46919 - You should have received a copy of the GNU Library General Public
46920 - License along with this program; if not, write to the Free Software
46921 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
46924 -#ifndef _PLURAL_EXP_H
46925 -#define _PLURAL_EXP_H
46927 -#ifndef internal_function
46928 -# define internal_function
46931 -#ifndef attribute_hidden
46932 -# define attribute_hidden
46936 -/* This is the representation of the expressions to determine the
46940 - int nargs; /* Number of arguments. */
46943 - /* Without arguments: */
46944 - var, /* The variable "n". */
46945 - num, /* Decimal number. */
46946 - /* Unary operators: */
46947 - lnot, /* Logical NOT. */
46948 - /* Binary operators: */
46949 - mult, /* Multiplication. */
46950 - divide, /* Division. */
46951 - module, /* Modulo operation. */
46952 - plus, /* Addition. */
46953 - minus, /* Subtraction. */
46954 - less_than, /* Comparison. */
46955 - greater_than, /* Comparison. */
46956 - less_or_equal, /* Comparison. */
46957 - greater_or_equal, /* Comparison. */
46958 - equal, /* Comparison for equality. */
46959 - not_equal, /* Comparison for inequality. */
46960 - land, /* Logical AND. */
46961 - lor, /* Logical OR. */
46962 - /* Ternary operators: */
46963 - qmop /* Question mark operator. */
46967 - unsigned long int num; /* Number value for `num'. */
46968 - struct expression *args[3]; /* Up to three arguments. */
46972 -/* This is the data structure to pass information to the parser and get
46973 - the result in a thread-safe way. */
46977 - struct expression *res;
46981 -/* Names for the libintl functions are a problem. This source code is used
46982 - 1. in the GNU C Library library,
46983 - 2. in the GNU libintl library,
46984 - 3. in the GNU gettext tools.
46985 - The function names in each situation must be different, to allow for
46986 - binary incompatible changes in 'struct expression'. Furthermore,
46987 - 1. in the GNU C Library library, the names have a __ prefix,
46988 - 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
46989 - must follow ANSI C and not start with __.
46990 - So we have to distinguish the three cases. */
46992 -# define FREE_EXPRESSION __gettext_free_exp
46993 -# define PLURAL_PARSE __gettextparse
46994 -# define GERMANIC_PLURAL __gettext_germanic_plural
46995 -# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
46996 -#elif defined (IN_LIBINTL)
46997 -# define FREE_EXPRESSION libintl_gettext_free_exp
46998 -# define PLURAL_PARSE libintl_gettextparse
46999 -# define GERMANIC_PLURAL libintl_gettext_germanic_plural
47000 -# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
47002 -# define FREE_EXPRESSION free_plural_expression
47003 -# define PLURAL_PARSE parse_plural_expression
47004 -# define GERMANIC_PLURAL germanic_plural
47005 -# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
47008 -extern void FREE_EXPRESSION (struct expression *exp)
47009 - internal_function;
47010 -extern int PLURAL_PARSE (void *arg);
47011 -extern struct expression GERMANIC_PLURAL attribute_hidden;
47012 -extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
47013 - struct expression **pluralp,
47014 - unsigned long int *npluralsp)
47015 - internal_function;
47017 -#if !defined (_LIBC) && !defined (IN_LIBINTL)
47018 -extern unsigned long int plural_eval (struct expression *pexp,
47019 - unsigned long int n);
47022 -#endif /* _PLURAL_EXP_H */
47023 diff -urN BUILD/abook-0.6.0pre2/intl/plural.y abook/intl/plural.y
47024 --- BUILD/abook-0.6.0pre2/intl/plural.y 2005-09-17 12:10:26.000000000 +0200
47025 +++ abook/intl/plural.y 1970-01-01 01:00:00.000000000 +0100
47028 -/* Expression parsing for plural form selection.
47029 - Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
47030 - Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
47032 - This program is free software; you can redistribute it and/or modify it
47033 - under the terms of the GNU Library General Public License as published
47034 - by the Free Software Foundation; either version 2, or (at your option)
47035 - any later version.
47037 - This program is distributed in the hope that it will be useful,
47038 - but WITHOUT ANY WARRANTY; without even the implied warranty of
47039 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
47040 - Library General Public License for more details.
47042 - You should have received a copy of the GNU Library General Public
47043 - License along with this program; if not, write to the Free Software
47044 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
47047 -/* The bison generated parser uses alloca. AIX 3 forces us to put this
47048 - declaration at the beginning of the file. The declaration in bison's
47049 - skeleton file comes too late. This must come before <config.h>
47050 - because <config.h> may include arbitrary system headers. */
47051 -#if defined _AIX && !defined __GNUC__
47055 -#ifdef HAVE_CONFIG_H
47056 -# include <config.h>
47059 -#include <stddef.h>
47060 -#include <stdlib.h>
47061 -#include "plural-exp.h"
47063 -/* The main function generated by the parser is called __gettextparse,
47064 - but we want it to be called PLURAL_PARSE. */
47066 -# define __gettextparse PLURAL_PARSE
47069 -#define YYLEX_PARAM &((struct parse_args *) arg)->cp
47070 -#define YYPARSE_PARAM arg
47076 - unsigned long int num;
47077 - enum operator op;
47078 - struct expression *exp;
47082 -/* Prototypes for local functions. */
47083 -static int yylex (YYSTYPE *lval, const char **pexp);
47084 -static void yyerror (const char *str);
47086 -/* Allocation of expressions. */
47088 -static struct expression *
47089 -new_exp (int nargs, enum operator op, struct expression * const *args)
47092 - struct expression *newp;
47094 - /* If any of the argument could not be malloc'ed, just return NULL. */
47095 - for (i = nargs - 1; i >= 0; i--)
47096 - if (args[i] == NULL)
47099 - /* Allocate a new expression. */
47100 - newp = (struct expression *) malloc (sizeof (*newp));
47101 - if (newp != NULL)
47103 - newp->nargs = nargs;
47104 - newp->operation = op;
47105 - for (i = nargs - 1; i >= 0; i--)
47106 - newp->val.args[i] = args[i];
47111 - for (i = nargs - 1; i >= 0; i--)
47112 - FREE_EXPRESSION (args[i]);
47117 -static inline struct expression *
47118 -new_exp_0 (enum operator op)
47120 - return new_exp (0, op, NULL);
47123 -static inline struct expression *
47124 -new_exp_1 (enum operator op, struct expression *right)
47126 - struct expression *args[1];
47129 - return new_exp (1, op, args);
47132 -static struct expression *
47133 -new_exp_2 (enum operator op, struct expression *left, struct expression *right)
47135 - struct expression *args[2];
47139 - return new_exp (2, op, args);
47142 -static inline struct expression *
47143 -new_exp_3 (enum operator op, struct expression *bexp,
47144 - struct expression *tbranch, struct expression *fbranch)
47146 - struct expression *args[3];
47149 - args[1] = tbranch;
47150 - args[2] = fbranch;
47151 - return new_exp (3, op, args);
47156 -/* This declares that all operators have the same associativity and the
47157 - precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
47158 - There is no unary minus and no bitwise operators.
47159 - Operators with the same syntactic behaviour have been merged into a single
47160 - token, to save space in the array generated by bison. */
47161 -%right '?' /* ? */
47162 -%left '|' /* || */
47163 -%left '&' /* && */
47164 -%left EQUOP2 /* == != */
47165 -%left CMPOP2 /* < > <= >= */
47166 -%left ADDOP2 /* + - */
47167 -%left MULOP2 /* * / % */
47168 -%right '!' /* ! */
47170 -%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
47171 -%token <num> NUMBER
47180 - ((struct parse_args *) arg)->res = $1;
47184 -exp: exp '?' exp ':' exp
47186 - $$ = new_exp_3 (qmop, $1, $3, $5);
47190 - $$ = new_exp_2 (lor, $1, $3);
47194 - $$ = new_exp_2 (land, $1, $3);
47198 - $$ = new_exp_2 ($2, $1, $3);
47202 - $$ = new_exp_2 ($2, $1, $3);
47206 - $$ = new_exp_2 ($2, $1, $3);
47210 - $$ = new_exp_2 ($2, $1, $3);
47214 - $$ = new_exp_1 (lnot, $2);
47218 - $$ = new_exp_0 (var);
47222 - if (($$ = new_exp_0 (num)) != NULL)
47223 - $$->val.num = $1;
47235 -FREE_EXPRESSION (struct expression *exp)
47240 - /* Handle the recursive case. */
47241 - switch (exp->nargs)
47244 - FREE_EXPRESSION (exp->val.args[2]);
47245 - /* FALLTHROUGH */
47247 - FREE_EXPRESSION (exp->val.args[1]);
47248 - /* FALLTHROUGH */
47250 - FREE_EXPRESSION (exp->val.args[0]);
47251 - /* FALLTHROUGH */
47261 -yylex (YYSTYPE *lval, const char **pexp)
47263 - const char *exp = *pexp;
47268 - if (exp[0] == '\0')
47274 - if (exp[0] != ' ' && exp[0] != '\t')
47283 - case '0': case '1': case '2': case '3': case '4':
47284 - case '5': case '6': case '7': case '8': case '9':
47286 - unsigned long int n = result - '0';
47287 - while (exp[0] >= '0' && exp[0] <= '9')
47290 - n += exp[0] - '0';
47299 - if (exp[0] == '=')
47302 - lval->op = equal;
47306 - result = YYERRCODE;
47310 - if (exp[0] == '=')
47313 - lval->op = not_equal;
47320 - if (exp[0] == result)
47323 - result = YYERRCODE;
47327 - if (exp[0] == '=')
47330 - lval->op = less_or_equal;
47333 - lval->op = less_than;
47338 - if (exp[0] == '=')
47341 - lval->op = greater_or_equal;
47344 - lval->op = greater_than;
47354 - lval->op = divide;
47359 - lval->op = module;
47369 - lval->op = minus;
47378 - /* Nothing, just return the character. */
47384 - /* Be safe and let the user call this function again. */
47390 - result = YYERRCODE;
47404 -yyerror (const char *str)
47406 - /* Do nothing. We don't print error messages here. */
47408 diff -urN BUILD/abook-0.6.0pre2/intl/printf-args.c abook/intl/printf-args.c
47409 --- BUILD/abook-0.6.0pre2/intl/printf-args.c 2005-09-17 12:10:26.000000000 +0200
47410 +++ abook/intl/printf-args.c 1970-01-01 01:00:00.000000000 +0100
47412 -/* Decomposed printf argument list.
47413 - Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
47415 - This program is free software; you can redistribute it and/or modify it
47416 - under the terms of the GNU Library General Public License as published
47417 - by the Free Software Foundation; either version 2, or (at your option)
47418 - any later version.
47420 - This program is distributed in the hope that it will be useful,
47421 - but WITHOUT ANY WARRANTY; without even the implied warranty of
47422 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
47423 - Library General Public License for more details.
47425 - You should have received a copy of the GNU Library General Public
47426 - License along with this program; if not, write to the Free Software
47427 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
47430 -#ifdef HAVE_CONFIG_H
47431 -# include <config.h>
47434 -/* Specification. */
47435 -#include "printf-args.h"
47441 -printf_fetchargs (va_list args, arguments *a)
47446 - for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
47447 - switch (ap->type)
47450 - ap->a.a_schar = va_arg (args, /*signed char*/ int);
47453 - ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
47456 - ap->a.a_short = va_arg (args, /*short*/ int);
47458 - case TYPE_USHORT:
47459 - ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
47462 - ap->a.a_int = va_arg (args, int);
47465 - ap->a.a_uint = va_arg (args, unsigned int);
47467 - case TYPE_LONGINT:
47468 - ap->a.a_longint = va_arg (args, long int);
47470 - case TYPE_ULONGINT:
47471 - ap->a.a_ulongint = va_arg (args, unsigned long int);
47473 -#ifdef HAVE_LONG_LONG
47474 - case TYPE_LONGLONGINT:
47475 - ap->a.a_longlongint = va_arg (args, long long int);
47477 - case TYPE_ULONGLONGINT:
47478 - ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
47481 - case TYPE_DOUBLE:
47482 - ap->a.a_double = va_arg (args, double);
47484 -#ifdef HAVE_LONG_DOUBLE
47485 - case TYPE_LONGDOUBLE:
47486 - ap->a.a_longdouble = va_arg (args, long double);
47490 - ap->a.a_char = va_arg (args, int);
47492 -#ifdef HAVE_WINT_T
47493 - case TYPE_WIDE_CHAR:
47494 - ap->a.a_wide_char = va_arg (args, wint_t);
47497 - case TYPE_STRING:
47498 - ap->a.a_string = va_arg (args, const char *);
47500 -#ifdef HAVE_WCHAR_T
47501 - case TYPE_WIDE_STRING:
47502 - ap->a.a_wide_string = va_arg (args, const wchar_t *);
47505 - case TYPE_POINTER:
47506 - ap->a.a_pointer = va_arg (args, void *);
47508 - case TYPE_COUNT_SCHAR_POINTER:
47509 - ap->a.a_count_schar_pointer = va_arg (args, signed char *);
47511 - case TYPE_COUNT_SHORT_POINTER:
47512 - ap->a.a_count_short_pointer = va_arg (args, short *);
47514 - case TYPE_COUNT_INT_POINTER:
47515 - ap->a.a_count_int_pointer = va_arg (args, int *);
47517 - case TYPE_COUNT_LONGINT_POINTER:
47518 - ap->a.a_count_longint_pointer = va_arg (args, long int *);
47520 -#ifdef HAVE_LONG_LONG
47521 - case TYPE_COUNT_LONGLONGINT_POINTER:
47522 - ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
47526 - /* Unknown type. */
47531 diff -urN BUILD/abook-0.6.0pre2/intl/printf-args.h abook/intl/printf-args.h
47532 --- BUILD/abook-0.6.0pre2/intl/printf-args.h 2005-09-17 12:10:26.000000000 +0200
47533 +++ abook/intl/printf-args.h 1970-01-01 01:00:00.000000000 +0100
47535 -/* Decomposed printf argument list.
47536 - Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
47538 - This program is free software; you can redistribute it and/or modify it
47539 - under the terms of the GNU Library General Public License as published
47540 - by the Free Software Foundation; either version 2, or (at your option)
47541 - any later version.
47543 - This program is distributed in the hope that it will be useful,
47544 - but WITHOUT ANY WARRANTY; without even the implied warranty of
47545 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
47546 - Library General Public License for more details.
47548 - You should have received a copy of the GNU Library General Public
47549 - License along with this program; if not, write to the Free Software
47550 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
47553 -#ifndef _PRINTF_ARGS_H
47554 -#define _PRINTF_ARGS_H
47557 -#include <stddef.h>
47559 -/* Get wchar_t. */
47560 -#ifdef HAVE_WCHAR_T
47561 -# include <stddef.h>
47565 -#ifdef HAVE_WINT_T
47566 -# include <wchar.h>
47569 -/* Get va_list. */
47570 -#include <stdarg.h>
47573 -/* Argument types */
47585 -#ifdef HAVE_LONG_LONG
47586 - TYPE_LONGLONGINT,
47587 - TYPE_ULONGLONGINT,
47590 -#ifdef HAVE_LONG_DOUBLE
47594 -#ifdef HAVE_WINT_T
47598 -#ifdef HAVE_WCHAR_T
47599 - TYPE_WIDE_STRING,
47602 - TYPE_COUNT_SCHAR_POINTER,
47603 - TYPE_COUNT_SHORT_POINTER,
47604 - TYPE_COUNT_INT_POINTER,
47605 - TYPE_COUNT_LONGINT_POINTER
47606 -#ifdef HAVE_LONG_LONG
47607 -, TYPE_COUNT_LONGLONGINT_POINTER
47611 -/* Polymorphic argument */
47617 - signed char a_schar;
47618 - unsigned char a_uchar;
47620 - unsigned short a_ushort;
47622 - unsigned int a_uint;
47623 - long int a_longint;
47624 - unsigned long int a_ulongint;
47625 -#ifdef HAVE_LONG_LONG
47626 - long long int a_longlongint;
47627 - unsigned long long int a_ulonglongint;
47631 -#ifdef HAVE_LONG_DOUBLE
47632 - long double a_longdouble;
47635 -#ifdef HAVE_WINT_T
47636 - wint_t a_wide_char;
47638 - const char* a_string;
47639 -#ifdef HAVE_WCHAR_T
47640 - const wchar_t* a_wide_string;
47643 - signed char * a_count_schar_pointer;
47644 - short * a_count_short_pointer;
47645 - int * a_count_int_pointer;
47646 - long int * a_count_longint_pointer;
47647 -#ifdef HAVE_LONG_LONG
47648 - long long int * a_count_longlongint_pointer;
47663 -/* Fetch the arguments, putting them into a. */
47669 -int printf_fetchargs (va_list args, arguments *a);
47671 -#endif /* _PRINTF_ARGS_H */
47672 diff -urN BUILD/abook-0.6.0pre2/intl/printf.c abook/intl/printf.c
47673 --- BUILD/abook-0.6.0pre2/intl/printf.c 2005-09-17 12:10:26.000000000 +0200
47674 +++ abook/intl/printf.c 1970-01-01 01:00:00.000000000 +0100
47676 -/* Formatted output to strings, using POSIX/XSI format strings with positions.
47677 - Copyright (C) 2003 Free Software Foundation, Inc.
47678 - Written by Bruno Haible <bruno@clisp.org>, 2003.
47680 - This program is free software; you can redistribute it and/or modify it
47681 - under the terms of the GNU Library General Public License as published
47682 - by the Free Software Foundation; either version 2, or (at your option)
47683 - any later version.
47685 - This program is distributed in the hope that it will be useful,
47686 - but WITHOUT ANY WARRANTY; without even the implied warranty of
47687 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
47688 - Library General Public License for more details.
47690 - You should have received a copy of the GNU Library General Public
47691 - License along with this program; if not, write to the Free Software
47692 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
47695 -#ifdef HAVE_CONFIG_H
47696 -# include <config.h>
47700 -# define alloca __builtin_alloca
47701 -# define HAVE_ALLOCA 1
47704 -# include <malloc.h>
47705 -# define alloca _alloca
47707 -# if defined HAVE_ALLOCA_H || defined _LIBC
47708 -# include <alloca.h>
47721 -#include <stdio.h>
47723 -#if !HAVE_POSIX_PRINTF
47725 -#include <stdlib.h>
47726 -#include <string.h>
47728 -/* When building a DLL, we must export some functions. Note that because
47729 - the functions are only defined for binary backward compatibility, we
47730 - don't need to use __declspec(dllimport) in any case. */
47731 -#if defined _MSC_VER && BUILDING_DLL
47732 -# define DLL_EXPORTED __declspec(dllexport)
47734 -# define DLL_EXPORTED
47737 -#define STATIC static
47739 -/* Define auxiliary functions declared in "printf-args.h". */
47740 -#include "printf-args.c"
47742 -/* Define auxiliary functions declared in "printf-parse.h". */
47743 -#include "printf-parse.c"
47745 -/* Define functions declared in "vasnprintf.h". */
47746 -#define vasnprintf libintl_vasnprintf
47747 -#include "vasnprintf.c"
47748 -#if 0 /* not needed */
47749 -#define asnprintf libintl_asnprintf
47750 -#include "asnprintf.c"
47755 -libintl_vfprintf (FILE *stream, const char *format, va_list args)
47757 - if (strchr (format, '$') == NULL)
47758 - return vfprintf (stream, format, args);
47762 - char *result = libintl_vasnprintf (NULL, &length, format, args);
47764 - if (result != NULL)
47766 - if (fwrite (result, 1, length, stream) == length)
47776 -libintl_fprintf (FILE *stream, const char *format, ...)
47781 - va_start (args, format);
47782 - retval = libintl_vfprintf (stream, format, args);
47789 -libintl_vprintf (const char *format, va_list args)
47791 - return libintl_vfprintf (stdout, format, args);
47796 -libintl_printf (const char *format, ...)
47801 - va_start (args, format);
47802 - retval = libintl_vprintf (format, args);
47809 -libintl_vsprintf (char *resultbuf, const char *format, va_list args)
47811 - if (strchr (format, '$') == NULL)
47812 - return vsprintf (resultbuf, format, args);
47815 - size_t length = (size_t) ~0 / (4 * sizeof (char));
47816 - char *result = libintl_vasnprintf (resultbuf, &length, format, args);
47817 - if (result != resultbuf)
47829 -libintl_sprintf (char *resultbuf, const char *format, ...)
47834 - va_start (args, format);
47835 - retval = libintl_vsprintf (resultbuf, format, args);
47842 -# if HAVE_DECL__SNPRINTF
47844 -# define system_vsnprintf _vsnprintf
47847 -# define system_vsnprintf vsnprintf
47852 -libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
47854 - if (strchr (format, '$') == NULL)
47855 - return system_vsnprintf (resultbuf, length, format, args);
47858 - size_t maxlength = length;
47859 - char *result = libintl_vasnprintf (resultbuf, &length, format, args);
47860 - if (result != resultbuf)
47862 - if (maxlength > 0)
47864 - if (length < maxlength)
47866 - memcpy (resultbuf, result, maxlength - 1);
47867 - resultbuf[maxlength - 1] = '\0';
47879 -libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
47884 - va_start (args, format);
47885 - retval = libintl_vsnprintf (resultbuf, length, format, args);
47896 -libintl_vasprintf (char **resultp, const char *format, va_list args)
47899 - char *result = libintl_vasnprintf (NULL, &length, format, args);
47900 - if (result == NULL)
47902 - *resultp = result;
47908 -libintl_asprintf (char **resultp, const char *format, ...)
47913 - va_start (args, format);
47914 - retval = libintl_vasprintf (resultp, format, args);
47923 -#include <wchar.h>
47925 -#define WIDE_CHAR_VERSION 1
47927 -/* Define auxiliary functions declared in "wprintf-parse.h". */
47928 -#include "printf-parse.c"
47930 -/* Define functions declared in "vasnprintf.h". */
47931 -#define vasnwprintf libintl_vasnwprintf
47932 -#include "vasnprintf.c"
47933 -#if 0 /* not needed */
47934 -#define asnwprintf libintl_asnwprintf
47935 -#include "asnprintf.c"
47938 -# if HAVE_DECL__SNWPRINTF
47940 -# define system_vswprintf _vsnwprintf
47943 -# define system_vswprintf vswprintf
47948 -libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
47950 - if (wcschr (format, '$') == NULL)
47951 - return vfwprintf (stream, format, args);
47955 - wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
47957 - if (result != NULL)
47960 - for (i = 0; i < length; i++)
47961 - if (fputwc (result[i], stream) == WEOF)
47973 -libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
47978 - va_start (args, format);
47979 - retval = libintl_vfwprintf (stream, format, args);
47986 -libintl_vwprintf (const wchar_t *format, va_list args)
47988 - return libintl_vfwprintf (stdout, format, args);
47993 -libintl_wprintf (const wchar_t *format, ...)
47998 - va_start (args, format);
47999 - retval = libintl_vwprintf (format, args);
48006 -libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
48008 - if (wcschr (format, '$') == NULL)
48009 - return system_vswprintf (resultbuf, length, format, args);
48012 - size_t maxlength = length;
48013 - wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
48014 - if (result != resultbuf)
48016 - if (maxlength > 0)
48018 - if (length < maxlength)
48020 - memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
48021 - resultbuf[maxlength - 1] = 0;
48033 -libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
48038 - va_start (args, format);
48039 - retval = libintl_vswprintf (resultbuf, length, format, args);
48047 diff -urN BUILD/abook-0.6.0pre2/intl/printf-parse.c abook/intl/printf-parse.c
48048 --- BUILD/abook-0.6.0pre2/intl/printf-parse.c 2005-09-17 12:10:26.000000000 +0200
48049 +++ abook/intl/printf-parse.c 1970-01-01 01:00:00.000000000 +0100
48051 -/* Formatted output to strings.
48052 - Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
48054 - This program is free software; you can redistribute it and/or modify it
48055 - under the terms of the GNU Library General Public License as published
48056 - by the Free Software Foundation; either version 2, or (at your option)
48057 - any later version.
48059 - This program is distributed in the hope that it will be useful,
48060 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48061 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48062 - Library General Public License for more details.
48064 - You should have received a copy of the GNU Library General Public
48065 - License along with this program; if not, write to the Free Software
48066 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48069 -#ifdef HAVE_CONFIG_H
48070 -# include <config.h>
48073 -/* Specification. */
48074 -#if WIDE_CHAR_VERSION
48075 -# include "wprintf-parse.h"
48077 -# include "printf-parse.h"
48080 -/* Get size_t, NULL. */
48081 -#include <stddef.h>
48083 -/* Get intmax_t. */
48084 -#if HAVE_STDINT_H_WITH_UINTMAX
48085 -# include <stdint.h>
48087 -#if HAVE_INTTYPES_H_WITH_UINTMAX
48088 -# include <inttypes.h>
48091 -/* malloc(), realloc(), free(). */
48092 -#include <stdlib.h>
48094 -/* Checked size_t computations. */
48095 -#include "xsize.h"
48097 -#if WIDE_CHAR_VERSION
48098 -# define PRINTF_PARSE wprintf_parse
48099 -# define CHAR_T wchar_t
48100 -# define DIRECTIVE wchar_t_directive
48101 -# define DIRECTIVES wchar_t_directives
48103 -# define PRINTF_PARSE printf_parse
48104 -# define CHAR_T char
48105 -# define DIRECTIVE char_directive
48106 -# define DIRECTIVES char_directives
48113 -PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
48115 - const CHAR_T *cp = format; /* pointer into format */
48116 - size_t arg_posn = 0; /* number of regular arguments consumed */
48117 - size_t d_allocated; /* allocated elements of d->dir */
48118 - size_t a_allocated; /* allocated elements of a->arg */
48119 - size_t max_width_length = 0;
48120 - size_t max_precision_length = 0;
48124 - d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
48125 - if (d->dir == NULL)
48126 - /* Out of memory. */
48133 -#define REGISTER_ARG(_index_,_type_) \
48135 - size_t n = (_index_); \
48136 - if (n >= a_allocated) \
48138 - size_t memory_size; \
48139 - argument *memory; \
48141 - a_allocated = xtimes (a_allocated, 2); \
48142 - if (a_allocated <= n) \
48143 - a_allocated = xsum (n, 1); \
48144 - memory_size = xtimes (a_allocated, sizeof (argument)); \
48145 - if (size_overflow_p (memory_size)) \
48146 - /* Overflow, would lead to out of memory. */ \
48148 - memory = (a->arg \
48149 - ? realloc (a->arg, memory_size) \
48150 - : malloc (memory_size)); \
48151 - if (memory == NULL) \
48152 - /* Out of memory. */ \
48154 - a->arg = memory; \
48156 - while (a->count <= n) \
48157 - a->arg[a->count++].type = TYPE_NONE; \
48158 - if (a->arg[n].type == TYPE_NONE) \
48159 - a->arg[n].type = (_type_); \
48160 - else if (a->arg[n].type != (_type_)) \
48161 - /* Ambiguous type for positional argument. */ \
48165 - while (*cp != '\0')
48167 - CHAR_T c = *cp++;
48170 - size_t arg_index = ARG_NONE;
48171 - DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
48173 - /* Initialize the next directive. */
48174 - dp->dir_start = cp - 1;
48176 - dp->width_start = NULL;
48177 - dp->width_end = NULL;
48178 - dp->width_arg_index = ARG_NONE;
48179 - dp->precision_start = NULL;
48180 - dp->precision_end = NULL;
48181 - dp->precision_arg_index = ARG_NONE;
48182 - dp->arg_index = ARG_NONE;
48184 - /* Test for positional argument. */
48185 - if (*cp >= '0' && *cp <= '9')
48187 - const CHAR_T *np;
48189 - for (np = cp; *np >= '0' && *np <= '9'; np++)
48195 - for (np = cp; *np >= '0' && *np <= '9'; np++)
48196 - n = xsum (xtimes (n, 10), *np - '0');
48198 - /* Positional argument 0. */
48200 - if (size_overflow_p (n))
48201 - /* n too large, would lead to out of memory later. */
48203 - arg_index = n - 1;
48208 - /* Read the flags. */
48213 - dp->flags |= FLAG_GROUP;
48216 - else if (*cp == '-')
48218 - dp->flags |= FLAG_LEFT;
48221 - else if (*cp == '+')
48223 - dp->flags |= FLAG_SHOWSIGN;
48226 - else if (*cp == ' ')
48228 - dp->flags |= FLAG_SPACE;
48231 - else if (*cp == '#')
48233 - dp->flags |= FLAG_ALT;
48236 - else if (*cp == '0')
48238 - dp->flags |= FLAG_ZERO;
48245 - /* Parse the field width. */
48248 - dp->width_start = cp;
48250 - dp->width_end = cp;
48251 - if (max_width_length < 1)
48252 - max_width_length = 1;
48254 - /* Test for positional argument. */
48255 - if (*cp >= '0' && *cp <= '9')
48257 - const CHAR_T *np;
48259 - for (np = cp; *np >= '0' && *np <= '9'; np++)
48265 - for (np = cp; *np >= '0' && *np <= '9'; np++)
48266 - n = xsum (xtimes (n, 10), *np - '0');
48268 - /* Positional argument 0. */
48270 - if (size_overflow_p (n))
48271 - /* n too large, would lead to out of memory later. */
48273 - dp->width_arg_index = n - 1;
48277 - if (dp->width_arg_index == ARG_NONE)
48279 - dp->width_arg_index = arg_posn++;
48280 - if (dp->width_arg_index == ARG_NONE)
48281 - /* arg_posn wrapped around. */
48284 - REGISTER_ARG (dp->width_arg_index, TYPE_INT);
48286 - else if (*cp >= '0' && *cp <= '9')
48288 - size_t width_length;
48290 - dp->width_start = cp;
48291 - for (; *cp >= '0' && *cp <= '9'; cp++)
48293 - dp->width_end = cp;
48294 - width_length = dp->width_end - dp->width_start;
48295 - if (max_width_length < width_length)
48296 - max_width_length = width_length;
48299 - /* Parse the precision. */
48305 - dp->precision_start = cp - 1;
48307 - dp->precision_end = cp;
48308 - if (max_precision_length < 2)
48309 - max_precision_length = 2;
48311 - /* Test for positional argument. */
48312 - if (*cp >= '0' && *cp <= '9')
48314 - const CHAR_T *np;
48316 - for (np = cp; *np >= '0' && *np <= '9'; np++)
48322 - for (np = cp; *np >= '0' && *np <= '9'; np++)
48323 - n = xsum (xtimes (n, 10), *np - '0');
48325 - /* Positional argument 0. */
48327 - if (size_overflow_p (n))
48328 - /* n too large, would lead to out of memory
48331 - dp->precision_arg_index = n - 1;
48335 - if (dp->precision_arg_index == ARG_NONE)
48337 - dp->precision_arg_index = arg_posn++;
48338 - if (dp->precision_arg_index == ARG_NONE)
48339 - /* arg_posn wrapped around. */
48342 - REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
48346 - size_t precision_length;
48348 - dp->precision_start = cp - 1;
48349 - for (; *cp >= '0' && *cp <= '9'; cp++)
48351 - dp->precision_end = cp;
48352 - precision_length = dp->precision_end - dp->precision_start;
48353 - if (max_precision_length < precision_length)
48354 - max_precision_length = precision_length;
48361 - /* Parse argument type/size specifiers. */
48369 - flags |= (1 << (flags & 1));
48372 - else if (*cp == 'L')
48377 - else if (*cp == 'l')
48382 -#ifdef HAVE_INTMAX_T
48383 - else if (*cp == 'j')
48385 - if (sizeof (intmax_t) > sizeof (long))
48387 - /* intmax_t = long long */
48390 - else if (sizeof (intmax_t) > sizeof (int))
48392 - /* intmax_t = long */
48398 - else if (*cp == 'z' || *cp == 'Z')
48400 - /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
48401 - because the warning facility in gcc-2.95.2 understands
48402 - only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */
48403 - if (sizeof (size_t) > sizeof (long))
48405 - /* size_t = long long */
48408 - else if (sizeof (size_t) > sizeof (int))
48410 - /* size_t = long */
48415 - else if (*cp == 't')
48417 - if (sizeof (ptrdiff_t) > sizeof (long))
48419 - /* ptrdiff_t = long long */
48422 - else if (sizeof (ptrdiff_t) > sizeof (int))
48424 - /* ptrdiff_t = long */
48433 - /* Read the conversion character. */
48437 - case 'd': case 'i':
48438 -#ifdef HAVE_LONG_LONG
48439 - if (flags >= 16 || (flags & 4))
48440 - type = TYPE_LONGLONGINT;
48444 - type = TYPE_LONGINT;
48445 - else if (flags & 2)
48446 - type = TYPE_SCHAR;
48447 - else if (flags & 1)
48448 - type = TYPE_SHORT;
48452 - case 'o': case 'u': case 'x': case 'X':
48453 -#ifdef HAVE_LONG_LONG
48454 - if (flags >= 16 || (flags & 4))
48455 - type = TYPE_ULONGLONGINT;
48459 - type = TYPE_ULONGINT;
48460 - else if (flags & 2)
48461 - type = TYPE_UCHAR;
48462 - else if (flags & 1)
48463 - type = TYPE_USHORT;
48465 - type = TYPE_UINT;
48467 - case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
48468 - case 'a': case 'A':
48469 -#ifdef HAVE_LONG_DOUBLE
48470 - if (flags >= 16 || (flags & 4))
48471 - type = TYPE_LONGDOUBLE;
48474 - type = TYPE_DOUBLE;
48478 -#ifdef HAVE_WINT_T
48479 - type = TYPE_WIDE_CHAR;
48484 - type = TYPE_CHAR;
48486 -#ifdef HAVE_WINT_T
48488 - type = TYPE_WIDE_CHAR;
48494 -#ifdef HAVE_WCHAR_T
48495 - type = TYPE_WIDE_STRING;
48500 - type = TYPE_STRING;
48502 -#ifdef HAVE_WCHAR_T
48504 - type = TYPE_WIDE_STRING;
48509 - type = TYPE_POINTER;
48512 -#ifdef HAVE_LONG_LONG
48513 - if (flags >= 16 || (flags & 4))
48514 - type = TYPE_COUNT_LONGLONGINT_POINTER;
48518 - type = TYPE_COUNT_LONGINT_POINTER;
48519 - else if (flags & 2)
48520 - type = TYPE_COUNT_SCHAR_POINTER;
48521 - else if (flags & 1)
48522 - type = TYPE_COUNT_SHORT_POINTER;
48524 - type = TYPE_COUNT_INT_POINTER;
48527 - type = TYPE_NONE;
48530 - /* Unknown conversion character. */
48535 - if (type != TYPE_NONE)
48537 - dp->arg_index = arg_index;
48538 - if (dp->arg_index == ARG_NONE)
48540 - dp->arg_index = arg_posn++;
48541 - if (dp->arg_index == ARG_NONE)
48542 - /* arg_posn wrapped around. */
48545 - REGISTER_ARG (dp->arg_index, type);
48547 - dp->conversion = c;
48548 - dp->dir_end = cp;
48552 - if (d->count >= d_allocated)
48554 - size_t memory_size;
48555 - DIRECTIVE *memory;
48557 - d_allocated = xtimes (d_allocated, 2);
48558 - memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
48559 - if (size_overflow_p (memory_size))
48560 - /* Overflow, would lead to out of memory. */
48562 - memory = realloc (d->dir, memory_size);
48563 - if (memory == NULL)
48564 - /* Out of memory. */
48570 - d->dir[d->count].dir_start = cp;
48572 - d->max_width_length = max_width_length;
48573 - d->max_precision_length = max_precision_length;
48587 -#undef PRINTF_PARSE
48588 diff -urN BUILD/abook-0.6.0pre2/intl/printf-parse.h abook/intl/printf-parse.h
48589 --- BUILD/abook-0.6.0pre2/intl/printf-parse.h 2005-09-17 12:10:26.000000000 +0200
48590 +++ abook/intl/printf-parse.h 1970-01-01 01:00:00.000000000 +0100
48592 -/* Parse printf format string.
48593 - Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
48595 - This program is free software; you can redistribute it and/or modify it
48596 - under the terms of the GNU Library General Public License as published
48597 - by the Free Software Foundation; either version 2, or (at your option)
48598 - any later version.
48600 - This program is distributed in the hope that it will be useful,
48601 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48602 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48603 - Library General Public License for more details.
48605 - You should have received a copy of the GNU Library General Public
48606 - License along with this program; if not, write to the Free Software
48607 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48610 -#ifndef _PRINTF_PARSE_H
48611 -#define _PRINTF_PARSE_H
48613 -#include "printf-args.h"
48617 -#define FLAG_GROUP 1 /* ' flag */
48618 -#define FLAG_LEFT 2 /* - flag */
48619 -#define FLAG_SHOWSIGN 4 /* + flag */
48620 -#define FLAG_SPACE 8 /* space flag */
48621 -#define FLAG_ALT 16 /* # flag */
48622 -#define FLAG_ZERO 32
48624 -/* arg_index value indicating that no argument is consumed. */
48625 -#define ARG_NONE (~(size_t)0)
48627 -/* A parsed directive. */
48630 - const char* dir_start;
48631 - const char* dir_end;
48633 - const char* width_start;
48634 - const char* width_end;
48635 - size_t width_arg_index;
48636 - const char* precision_start;
48637 - const char* precision_end;
48638 - size_t precision_arg_index;
48639 - char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
48640 - size_t arg_index;
48644 -/* A parsed format string. */
48648 - char_directive *dir;
48649 - size_t max_width_length;
48650 - size_t max_precision_length;
48655 -/* Parses the format string. Fills in the number N of directives, and fills
48656 - in directives[0], ..., directives[N-1], and sets directives[N].dir_start
48657 - to the end of the format string. Also fills in the arg_type fields of the
48658 - arguments and the needed count of arguments. */
48664 -int printf_parse (const char *format, char_directives *d, arguments *a);
48666 -#endif /* _PRINTF_PARSE_H */
48667 diff -urN BUILD/abook-0.6.0pre2/intl/ref-add.sin abook/intl/ref-add.sin
48668 --- BUILD/abook-0.6.0pre2/intl/ref-add.sin 2005-09-17 12:10:26.000000000 +0200
48669 +++ abook/intl/ref-add.sin 1970-01-01 01:00:00.000000000 +0100
48671 -# Add this package to a list of references stored in a text file.
48673 -# Copyright (C) 2000 Free Software Foundation, Inc.
48675 -# This program is free software; you can redistribute it and/or modify it
48676 -# under the terms of the GNU Library General Public License as published
48677 -# by the Free Software Foundation; either version 2, or (at your option)
48678 -# any later version.
48680 -# This program is distributed in the hope that it will be useful,
48681 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
48682 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48683 -# Library General Public License for more details.
48685 -# You should have received a copy of the GNU Library General Public
48686 -# License along with this program; if not, write to the Free Software
48687 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48690 -# Written by Bruno Haible <haible@clisp.cons.org>.
48692 -/^# Packages using this file: / {
48693 - s/# Packages using this file://
48696 - s/ @PACKAGE@ / @PACKAGE@ /
48698 - s/ $/ @PACKAGE@ /
48700 - s/^/# Packages using this file:/
48702 diff -urN BUILD/abook-0.6.0pre2/intl/ref-del.sin abook/intl/ref-del.sin
48703 --- BUILD/abook-0.6.0pre2/intl/ref-del.sin 2005-09-17 12:10:26.000000000 +0200
48704 +++ abook/intl/ref-del.sin 1970-01-01 01:00:00.000000000 +0100
48706 -# Remove this package from a list of references stored in a text file.
48708 -# Copyright (C) 2000 Free Software Foundation, Inc.
48710 -# This program is free software; you can redistribute it and/or modify it
48711 -# under the terms of the GNU Library General Public License as published
48712 -# by the Free Software Foundation; either version 2, or (at your option)
48713 -# any later version.
48715 -# This program is distributed in the hope that it will be useful,
48716 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
48717 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48718 -# Library General Public License for more details.
48720 -# You should have received a copy of the GNU Library General Public
48721 -# License along with this program; if not, write to the Free Software
48722 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48725 -# Written by Bruno Haible <haible@clisp.cons.org>.
48727 -/^# Packages using this file: / {
48728 - s/# Packages using this file://
48730 - s/^/# Packages using this file:/
48732 diff -urN BUILD/abook-0.6.0pre2/intl/relocatable.c abook/intl/relocatable.c
48733 --- BUILD/abook-0.6.0pre2/intl/relocatable.c 2005-09-17 12:10:26.000000000 +0200
48734 +++ abook/intl/relocatable.c 1970-01-01 01:00:00.000000000 +0100
48736 -/* Provide relocatable packages.
48737 - Copyright (C) 2003-2004 Free Software Foundation, Inc.
48738 - Written by Bruno Haible <bruno@clisp.org>, 2003.
48740 - This program is free software; you can redistribute it and/or modify it
48741 - under the terms of the GNU Library General Public License as published
48742 - by the Free Software Foundation; either version 2, or (at your option)
48743 - any later version.
48745 - This program is distributed in the hope that it will be useful,
48746 - but WITHOUT ANY WARRANTY; without even the implied warranty of
48747 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48748 - Library General Public License for more details.
48750 - You should have received a copy of the GNU Library General Public
48751 - License along with this program; if not, write to the Free Software
48752 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
48756 -/* Tell glibc's <stdio.h> to provide a prototype for getline().
48757 - This must come before <config.h> because <config.h> may include
48758 - <features.h>, and once <features.h> has been included, it's too late. */
48759 -#ifndef _GNU_SOURCE
48760 -# define _GNU_SOURCE 1
48763 -#ifdef HAVE_CONFIG_H
48764 -# include "config.h"
48767 -/* Specification. */
48768 -#include "relocatable.h"
48770 -#if ENABLE_RELOCATABLE
48772 -#include <stddef.h>
48773 -#include <stdio.h>
48774 -#include <stdlib.h>
48775 -#include <string.h>
48778 -# define xmalloc malloc
48780 -# include "xalloc.h"
48783 -#if defined _WIN32 || defined __WIN32__
48784 -# define WIN32_LEAN_AND_MEAN
48785 -# include <windows.h>
48788 -#if DEPENDS_ON_LIBCHARSET
48789 -# include <libcharset.h>
48791 -#if DEPENDS_ON_LIBICONV && HAVE_ICONV
48792 -# include <iconv.h>
48794 -#if DEPENDS_ON_LIBINTL && ENABLE_NLS
48795 -# include <libintl.h>
48798 -/* Faked cheap 'bool'. */
48806 -/* Pathname support.
48807 - ISSLASH(C) tests whether C is a directory separator character.
48808 - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
48810 -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
48811 - /* Win32, Cygwin, OS/2, DOS */
48812 -# define ISSLASH(C) ((C) == '/' || (C) == '\\')
48813 -# define HAS_DEVICE(P) \
48814 - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
48815 - && (P)[1] == ':')
48816 -# define IS_PATH_WITH_DIR(P) \
48817 - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
48818 -# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
48821 -# define ISSLASH(C) ((C) == '/')
48822 -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
48823 -# define FILE_SYSTEM_PREFIX_LEN(P) 0
48826 -/* Original installation prefix. */
48827 -static char *orig_prefix;
48828 -static size_t orig_prefix_len;
48829 -/* Current installation prefix. */
48830 -static char *curr_prefix;
48831 -static size_t curr_prefix_len;
48832 -/* These prefixes do not end in a slash. Anything that will be concatenated
48833 - to them must start with a slash. */
48835 -/* Sets the original and the current installation prefix of this module.
48836 - Relocation simply replaces a pathname starting with the original prefix
48837 - by the corresponding pathname with the current prefix instead. Both
48838 - prefixes should be directory names without trailing slash (i.e. use ""
48839 - instead of "/"). */
48841 -set_this_relocation_prefix (const char *orig_prefix_arg,
48842 - const char *curr_prefix_arg)
48844 - if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
48845 - /* Optimization: if orig_prefix and curr_prefix are equal, the
48846 - relocation is a nop. */
48847 - && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
48849 - /* Duplicate the argument strings. */
48852 - orig_prefix_len = strlen (orig_prefix_arg);
48853 - curr_prefix_len = strlen (curr_prefix_arg);
48854 - memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
48856 - if (memory != NULL)
48859 - memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
48860 - orig_prefix = memory;
48861 - memory += orig_prefix_len + 1;
48862 - memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
48863 - curr_prefix = memory;
48867 - orig_prefix = NULL;
48868 - curr_prefix = NULL;
48869 - /* Don't worry about wasted memory here - this function is usually only
48873 -/* Sets the original and the current installation prefix of the package.
48874 - Relocation simply replaces a pathname starting with the original prefix
48875 - by the corresponding pathname with the current prefix instead. Both
48876 - prefixes should be directory names without trailing slash (i.e. use ""
48877 - instead of "/"). */
48879 -set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
48881 - set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
48883 - /* Now notify all dependent libraries. */
48884 -#if DEPENDS_ON_LIBCHARSET
48885 - libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
48887 -#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
48888 - libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
48890 -#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
48891 - libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
48895 -#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
48897 -/* Convenience function:
48898 - Computes the current installation prefix, based on the original
48899 - installation prefix, the original installation directory of a particular
48900 - file, and the current pathname of this file. Returns NULL upon failure. */
48902 -#define compute_curr_prefix local_compute_curr_prefix
48906 -compute_curr_prefix (const char *orig_installprefix,
48907 - const char *orig_installdir,
48908 - const char *curr_pathname)
48910 - const char *curr_installdir;
48911 - const char *rel_installdir;
48913 - if (curr_pathname == NULL)
48916 - /* Determine the relative installation directory, relative to the prefix.
48917 - This is simply the difference between orig_installprefix and
48918 - orig_installdir. */
48919 - if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
48921 - /* Shouldn't happen - nothing should be installed outside $(prefix). */
48923 - rel_installdir = orig_installdir + strlen (orig_installprefix);
48925 - /* Determine the current installation directory. */
48927 - const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname);
48928 - const char *p = curr_pathname + strlen (curr_pathname);
48931 - while (p > p_base)
48934 - if (ISSLASH (*p))
48938 - q = (char *) xmalloc (p - curr_pathname + 1);
48943 - memcpy (q, curr_pathname, p - curr_pathname);
48944 - q[p - curr_pathname] = '\0';
48945 - curr_installdir = q;
48948 - /* Compute the current installation prefix by removing the trailing
48949 - rel_installdir from it. */
48951 - const char *rp = rel_installdir + strlen (rel_installdir);
48952 - const char *cp = curr_installdir + strlen (curr_installdir);
48953 - const char *cp_base =
48954 - curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
48956 - while (rp > rel_installdir && cp > cp_base)
48958 - bool same = false;
48959 - const char *rpi = rp;
48960 - const char *cpi = cp;
48962 - while (rpi > rel_installdir && cpi > cp_base)
48966 - if (ISSLASH (*rpi) || ISSLASH (*cpi))
48968 - if (ISSLASH (*rpi) && ISSLASH (*cpi))
48972 -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
48973 - /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
48974 - if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
48975 - != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
48978 - if (*rpi != *cpi)
48984 - /* The last pathname component was the same. opi and cpi now point
48985 - to the slash before it. */
48990 - if (rp > rel_installdir)
48991 - /* Unexpected: The curr_installdir does not end with rel_installdir. */
48995 - size_t curr_prefix_len = cp - curr_installdir;
48996 - char *curr_prefix;
48998 - curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
49000 - if (curr_prefix == NULL)
49003 - memcpy (curr_prefix, curr_installdir, curr_prefix_len);
49004 - curr_prefix[curr_prefix_len] = '\0';
49006 - return curr_prefix;
49011 -#endif /* !IN_LIBRARY || PIC */
49013 -#if defined PIC && defined INSTALLDIR
49015 -/* Full pathname of shared library, or NULL. */
49016 -static char *shared_library_fullname;
49018 -#if defined _WIN32 || defined __WIN32__
49020 -/* Determine the full pathname of the shared library when it is loaded. */
49023 -DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
49027 - if (event == DLL_PROCESS_ATTACH)
49029 - /* The DLL is being loaded into an application's address range. */
49030 - static char location[MAX_PATH];
49032 - if (!GetModuleFileName (module_handle, location, sizeof (location)))
49033 - /* Shouldn't happen. */
49036 - if (!IS_PATH_WITH_DIR (location))
49037 - /* Shouldn't happen. */
49040 - shared_library_fullname = strdup (location);
49049 -find_shared_library_fullname ()
49051 -#if defined __linux__ && __GLIBC__ >= 2
49052 - /* Linux has /proc/self/maps. glibc 2 has the getline() function. */
49055 - /* Open the current process' maps file. It describes one VMA per line. */
49056 - fp = fopen ("/proc/self/maps", "r");
49059 - unsigned long address = (unsigned long) &find_shared_library_fullname;
49062 - unsigned long start, end;
49065 - if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
49067 - if (address >= start && address <= end - 1)
49069 - /* Found it. Now see if this line contains a filename. */
49070 - while (c = getc (fp), c != EOF && c != '\n' && c != '/')
49078 - shared_library_fullname = NULL; size = 0;
49079 - len = getline (&shared_library_fullname, &size, fp);
49082 - /* Success: filled shared_library_fullname. */
49083 - if (len > 0 && shared_library_fullname[len - 1] == '\n')
49084 - shared_library_fullname[len - 1] = '\0';
49089 - while (c = getc (fp), c != EOF && c != '\n')
49097 -#endif /* WIN32 / Unix */
49099 -/* Return the full pathname of the current shared library.
49100 - Return NULL if unknown.
49101 - Guaranteed to work only on Linux and Woe32. */
49103 -get_shared_library_fullname ()
49105 -#if !(defined _WIN32 || defined __WIN32__)
49106 - static bool tried_find_shared_library_fullname;
49107 - if (!tried_find_shared_library_fullname)
49109 - find_shared_library_fullname ();
49110 - tried_find_shared_library_fullname = true;
49113 - return shared_library_fullname;
49118 -/* Returns the pathname, relocated according to the current installation
49121 -relocate (const char *pathname)
49123 -#if defined PIC && defined INSTALLDIR
49124 - static int initialized;
49126 - /* Initialization code for a shared library. */
49127 - if (!initialized)
49129 - /* At this point, orig_prefix and curr_prefix likely have already been
49130 - set through the main program's set_program_name_and_installdir
49131 - function. This is sufficient in the case that the library has
49132 - initially been installed in the same orig_prefix. But we can do
49133 - better, to also cover the cases that 1. it has been installed
49134 - in a different prefix before being moved to orig_prefix and (later)
49135 - to curr_prefix, 2. unlike the program, it has not moved away from
49137 - const char *orig_installprefix = INSTALLPREFIX;
49138 - const char *orig_installdir = INSTALLDIR;
49139 - const char *curr_prefix_better;
49141 - curr_prefix_better =
49142 - compute_curr_prefix (orig_installprefix, orig_installdir,
49143 - get_shared_library_fullname ());
49144 - if (curr_prefix_better == NULL)
49145 - curr_prefix_better = curr_prefix;
49147 - set_relocation_prefix (orig_installprefix, curr_prefix_better);
49153 - /* Note: It is not necessary to perform case insensitive comparison here,
49154 - even for DOS-like filesystems, because the pathname argument was
49155 - typically created from the same Makefile variable as orig_prefix came
49157 - if (orig_prefix != NULL && curr_prefix != NULL
49158 - && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
49160 - if (pathname[orig_prefix_len] == '\0')
49161 - /* pathname equals orig_prefix. */
49162 - return curr_prefix;
49163 - if (ISSLASH (pathname[orig_prefix_len]))
49165 - /* pathname starts with orig_prefix. */
49166 - const char *pathname_tail = &pathname[orig_prefix_len];
49168 - (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
49171 - if (result != NULL)
49174 - memcpy (result, curr_prefix, curr_prefix_len);
49175 - strcpy (result + curr_prefix_len, pathname_tail);
49180 - /* Nothing to relocate. */
49185 diff -urN BUILD/abook-0.6.0pre2/intl/relocatable.h abook/intl/relocatable.h
49186 --- BUILD/abook-0.6.0pre2/intl/relocatable.h 2005-09-17 12:10:26.000000000 +0200
49187 +++ abook/intl/relocatable.h 1970-01-01 01:00:00.000000000 +0100
49189 -/* Provide relocatable packages.
49190 - Copyright (C) 2003 Free Software Foundation, Inc.
49191 - Written by Bruno Haible <bruno@clisp.org>, 2003.
49193 - This program is free software; you can redistribute it and/or modify it
49194 - under the terms of the GNU Library General Public License as published
49195 - by the Free Software Foundation; either version 2, or (at your option)
49196 - any later version.
49198 - This program is distributed in the hope that it will be useful,
49199 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49200 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49201 - Library General Public License for more details.
49203 - You should have received a copy of the GNU Library General Public
49204 - License along with this program; if not, write to the Free Software
49205 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49208 -#ifndef _RELOCATABLE_H
49209 -#define _RELOCATABLE_H
49211 -#ifdef __cplusplus
49216 -/* This can be enabled through the configure --enable-relocatable option. */
49217 -#if ENABLE_RELOCATABLE
49219 -/* When building a DLL, we must export some functions. Note that because
49220 - this is a private .h file, we don't need to use __declspec(dllimport)
49222 -#if defined _MSC_VER && BUILDING_DLL
49223 -# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
49225 -# define RELOCATABLE_DLL_EXPORTED
49228 -/* Sets the original and the current installation prefix of the package.
49229 - Relocation simply replaces a pathname starting with the original prefix
49230 - by the corresponding pathname with the current prefix instead. Both
49231 - prefixes should be directory names without trailing slash (i.e. use ""
49232 - instead of "/"). */
49233 -extern RELOCATABLE_DLL_EXPORTED void
49234 - set_relocation_prefix (const char *orig_prefix,
49235 - const char *curr_prefix);
49237 -/* Returns the pathname, relocated according to the current installation
49239 -extern const char * relocate (const char *pathname);
49241 -/* Memory management: relocate() leaks memory, because it has to construct
49242 - a fresh pathname. If this is a problem because your program calls
49243 - relocate() frequently, think about caching the result. */
49245 -/* Convenience function:
49246 - Computes the current installation prefix, based on the original
49247 - installation prefix, the original installation directory of a particular
49248 - file, and the current pathname of this file. Returns NULL upon failure. */
49249 -extern const char * compute_curr_prefix (const char *orig_installprefix,
49250 - const char *orig_installdir,
49251 - const char *curr_pathname);
49255 -/* By default, we use the hardwired pathnames. */
49256 -#define relocate(pathname) (pathname)
49261 -#ifdef __cplusplus
49265 -#endif /* _RELOCATABLE_H */
49266 diff -urN BUILD/abook-0.6.0pre2/intl/textdomain.c abook/intl/textdomain.c
49267 --- BUILD/abook-0.6.0pre2/intl/textdomain.c 2005-09-17 12:10:26.000000000 +0200
49268 +++ abook/intl/textdomain.c 1970-01-01 01:00:00.000000000 +0100
49270 -/* Implementation of the textdomain(3) function.
49271 - Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
49273 - This program is free software; you can redistribute it and/or modify it
49274 - under the terms of the GNU Library General Public License as published
49275 - by the Free Software Foundation; either version 2, or (at your option)
49276 - any later version.
49278 - This program is distributed in the hope that it will be useful,
49279 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49280 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49281 - Library General Public License for more details.
49283 - You should have received a copy of the GNU Library General Public
49284 - License along with this program; if not, write to the Free Software
49285 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49288 -#ifdef HAVE_CONFIG_H
49289 -# include <config.h>
49292 -#include <stdlib.h>
49293 -#include <string.h>
49296 -# include <libintl.h>
49298 -# include "libgnuintl.h"
49300 -#include "gettextP.h"
49303 -/* We have to handle multi-threaded applications. */
49304 -# include <bits/libc-lock.h>
49306 -/* Provide dummy implementation if this is outside glibc. */
49307 -# define __libc_rwlock_define(CLASS, NAME)
49308 -# define __libc_rwlock_wrlock(NAME)
49309 -# define __libc_rwlock_unlock(NAME)
49312 -/* The internal variables in the standalone libintl.a must have different
49313 - names than the internal variables in GNU libc, otherwise programs
49314 - using libintl.a cannot be linked statically. */
49315 -#if !defined _LIBC
49316 -# define _nl_default_default_domain libintl_nl_default_default_domain
49317 -# define _nl_current_default_domain libintl_nl_current_default_domain
49320 -/* @@ end of prolog @@ */
49322 -/* Name of the default text domain. */
49323 -extern const char _nl_default_default_domain[] attribute_hidden;
49325 -/* Default text domain in which entries for gettext(3) are to be found. */
49326 -extern const char *_nl_current_default_domain attribute_hidden;
49329 -/* Names for the libintl functions are a problem. They must not clash
49330 - with existing names and they should follow ANSI C. But this source
49331 - code is also used in GNU C Library where the names have a __
49332 - prefix. So we have to make a difference here. */
49334 -# define TEXTDOMAIN __textdomain
49336 -# define strdup(str) __strdup (str)
49339 -# define TEXTDOMAIN libintl_textdomain
49342 -/* Lock variable to protect the global data in the gettext implementation. */
49343 -__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
49345 -/* Set the current default message catalog to DOMAINNAME.
49346 - If DOMAINNAME is null, return the current default.
49347 - If DOMAINNAME is "", reset to the default of "messages". */
49349 -TEXTDOMAIN (const char *domainname)
49351 - char *new_domain;
49352 - char *old_domain;
49354 - /* A NULL pointer requests the current setting. */
49355 - if (domainname == NULL)
49356 - return (char *) _nl_current_default_domain;
49358 - __libc_rwlock_wrlock (_nl_state_lock);
49360 - old_domain = (char *) _nl_current_default_domain;
49362 - /* If domain name is the null string set to default domain "messages". */
49363 - if (domainname[0] == '\0'
49364 - || strcmp (domainname, _nl_default_default_domain) == 0)
49366 - _nl_current_default_domain = _nl_default_default_domain;
49367 - new_domain = (char *) _nl_current_default_domain;
49369 - else if (strcmp (domainname, old_domain) == 0)
49370 - /* This can happen and people will use it to signal that some
49371 - environment variable changed. */
49372 - new_domain = old_domain;
49375 - /* If the following malloc fails `_nl_current_default_domain'
49376 - will be NULL. This value will be returned and so signals we
49377 - are out of core. */
49378 -#if defined _LIBC || defined HAVE_STRDUP
49379 - new_domain = strdup (domainname);
49381 - size_t len = strlen (domainname) + 1;
49382 - new_domain = (char *) malloc (len);
49383 - if (new_domain != NULL)
49384 - memcpy (new_domain, domainname, len);
49387 - if (new_domain != NULL)
49388 - _nl_current_default_domain = new_domain;
49391 - /* We use this possibility to signal a change of the loaded catalogs
49392 - since this is most likely the case and there is no other easy we
49393 - to do it. Do it only when the call was successful. */
49394 - if (new_domain != NULL)
49396 - ++_nl_msg_cat_cntr;
49398 - if (old_domain != new_domain && old_domain != _nl_default_default_domain)
49399 - free (old_domain);
49402 - __libc_rwlock_unlock (_nl_state_lock);
49404 - return new_domain;
49408 -/* Alias for function name in GNU C Library. */
49409 -weak_alias (__textdomain, textdomain);
49411 diff -urN BUILD/abook-0.6.0pre2/intl/vasnprintf.c abook/intl/vasnprintf.c
49412 --- BUILD/abook-0.6.0pre2/intl/vasnprintf.c 2005-09-17 12:10:26.000000000 +0200
49413 +++ abook/intl/vasnprintf.c 1970-01-01 01:00:00.000000000 +0100
49415 -/* vsprintf with automatic memory allocation.
49416 - Copyright (C) 1999, 2002-2005 Free Software Foundation, Inc.
49418 - This program is free software; you can redistribute it and/or modify it
49419 - under the terms of the GNU Library General Public License as published
49420 - by the Free Software Foundation; either version 2, or (at your option)
49421 - any later version.
49423 - This program is distributed in the hope that it will be useful,
49424 - but WITHOUT ANY WARRANTY; without even the implied warranty of
49425 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49426 - Library General Public License for more details.
49428 - You should have received a copy of the GNU Library General Public
49429 - License along with this program; if not, write to the Free Software
49430 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
49433 -/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
49434 - This must come before <config.h> because <config.h> may include
49435 - <features.h>, and once <features.h> has been included, it's too late. */
49436 -#ifndef _GNU_SOURCE
49437 -# define _GNU_SOURCE 1
49440 -#ifdef HAVE_CONFIG_H
49441 -# include <config.h>
49443 -#ifndef IN_LIBINTL
49444 -# include <alloca.h>
49447 -/* Specification. */
49448 -#if WIDE_CHAR_VERSION
49449 -# include "vasnwprintf.h"
49451 -# include "vasnprintf.h"
49454 -#include <stdio.h> /* snprintf(), sprintf() */
49455 -#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
49456 -#include <string.h> /* memcpy(), strlen() */
49457 -#include <errno.h> /* errno */
49458 -#include <limits.h> /* CHAR_BIT, INT_MAX */
49459 -#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
49460 -#if WIDE_CHAR_VERSION
49461 -# include "wprintf-parse.h"
49463 -# include "printf-parse.h"
49466 -/* Checked size_t computations. */
49467 -#include "xsize.h"
49469 -/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
49471 -# define EOVERFLOW E2BIG
49474 -#ifdef HAVE_WCHAR_T
49475 -# ifdef HAVE_WCSLEN
49476 -# define local_wcslen wcslen
49478 - /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
49479 - a dependency towards this library, here is a local substitute.
49480 - Define this substitute only once, even if this file is included
49481 - twice in the same compilation unit. */
49482 -# ifndef local_wcslen_defined
49483 -# define local_wcslen_defined 1
49485 -local_wcslen (const wchar_t *s)
49487 - const wchar_t *ptr;
49489 - for (ptr = s; *ptr != (wchar_t) 0; ptr++)
49497 -#if WIDE_CHAR_VERSION
49498 -# define VASNPRINTF vasnwprintf
49499 -# define CHAR_T wchar_t
49500 -# define DIRECTIVE wchar_t_directive
49501 -# define DIRECTIVES wchar_t_directives
49502 -# define PRINTF_PARSE wprintf_parse
49503 -# define USE_SNPRINTF 1
49504 -# if HAVE_DECL__SNWPRINTF
49505 - /* On Windows, the function swprintf() has a different signature than
49506 - on Unix; we use the _snwprintf() function instead. */
49507 -# define SNPRINTF _snwprintf
49510 -# define SNPRINTF swprintf
49513 -# define VASNPRINTF vasnprintf
49514 -# define CHAR_T char
49515 -# define DIRECTIVE char_directive
49516 -# define DIRECTIVES char_directives
49517 -# define PRINTF_PARSE printf_parse
49518 -# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
49519 -# if HAVE_DECL__SNPRINTF
49521 -# define SNPRINTF _snprintf
49524 -# define SNPRINTF snprintf
49529 -VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
49534 - if (PRINTF_PARSE (format, &d, &a) < 0)
49540 -#define CLEANUP() \
49545 - if (printf_fetchargs (args, &a) < 0)
49553 - size_t buf_neededlength;
49555 - CHAR_T *buf_malloced;
49556 - const CHAR_T *cp;
49559 - /* Output string accumulator. */
49561 - size_t allocated;
49564 - /* Allocate a small buffer that will hold a directive passed to
49565 - sprintf or snprintf. */
49566 - buf_neededlength =
49567 - xsum4 (7, d.max_width_length, d.max_precision_length, 6);
49569 - if (buf_neededlength < 4000 / sizeof (CHAR_T))
49571 - buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
49572 - buf_malloced = NULL;
49577 - size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
49578 - if (size_overflow_p (buf_memsize))
49579 - goto out_of_memory_1;
49580 - buf = (CHAR_T *) malloc (buf_memsize);
49582 - goto out_of_memory_1;
49583 - buf_malloced = buf;
49586 - if (resultbuf != NULL)
49588 - result = resultbuf;
49589 - allocated = *lengthp;
49598 - result is either == resultbuf or == NULL or malloc-allocated.
49599 - If length > 0, then result != NULL. */
49601 - /* Ensures that allocated >= needed. Aborts through a jump to
49602 - out_of_memory if needed is SIZE_MAX or otherwise too big. */
49603 -#define ENSURE_ALLOCATION(needed) \
49604 - if ((needed) > allocated) \
49606 - size_t memory_size; \
49607 - CHAR_T *memory; \
49609 - allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \
49610 - if ((needed) > allocated) \
49611 - allocated = (needed); \
49612 - memory_size = xtimes (allocated, sizeof (CHAR_T)); \
49613 - if (size_overflow_p (memory_size)) \
49614 - goto out_of_memory; \
49615 - if (result == resultbuf || result == NULL) \
49616 - memory = (CHAR_T *) malloc (memory_size); \
49618 - memory = (CHAR_T *) realloc (result, memory_size); \
49619 - if (memory == NULL) \
49620 - goto out_of_memory; \
49621 - if (result == resultbuf && length > 0) \
49622 - memcpy (memory, result, length * sizeof (CHAR_T)); \
49623 - result = memory; \
49626 - for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
49628 - if (cp != dp->dir_start)
49630 - size_t n = dp->dir_start - cp;
49631 - size_t augmented_length = xsum (length, n);
49633 - ENSURE_ALLOCATION (augmented_length);
49634 - memcpy (result + length, cp, n * sizeof (CHAR_T));
49635 - length = augmented_length;
49637 - if (i == d.count)
49640 - /* Execute a single directive. */
49641 - if (dp->conversion == '%')
49643 - size_t augmented_length;
49645 - if (!(dp->arg_index == ARG_NONE))
49647 - augmented_length = xsum (length, 1);
49648 - ENSURE_ALLOCATION (augmented_length);
49649 - result[length] = '%';
49650 - length = augmented_length;
49654 - if (!(dp->arg_index != ARG_NONE))
49657 - if (dp->conversion == 'n')
49659 - switch (a.arg[dp->arg_index].type)
49661 - case TYPE_COUNT_SCHAR_POINTER:
49662 - *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
49664 - case TYPE_COUNT_SHORT_POINTER:
49665 - *a.arg[dp->arg_index].a.a_count_short_pointer = length;
49667 - case TYPE_COUNT_INT_POINTER:
49668 - *a.arg[dp->arg_index].a.a_count_int_pointer = length;
49670 - case TYPE_COUNT_LONGINT_POINTER:
49671 - *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
49673 -#ifdef HAVE_LONG_LONG
49674 - case TYPE_COUNT_LONGLONGINT_POINTER:
49675 - *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
49684 - arg_type type = a.arg[dp->arg_index].type;
49686 - unsigned int prefix_count;
49689 - size_t tmp_length;
49690 - CHAR_T tmpbuf[700];
49693 - /* Allocate a temporary buffer of sufficient size for calling
49697 - size_t precision;
49700 - if (dp->width_start != dp->width_end)
49702 - if (dp->width_arg_index != ARG_NONE)
49706 - if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
49708 - arg = a.arg[dp->width_arg_index].a.a_int;
49709 - width = (arg < 0 ? (unsigned int) (-arg) : arg);
49713 - const CHAR_T *digitp = dp->width_start;
49716 - width = xsum (xtimes (width, 10), *digitp++ - '0');
49717 - while (digitp != dp->width_end);
49722 - if (dp->precision_start != dp->precision_end)
49724 - if (dp->precision_arg_index != ARG_NONE)
49728 - if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
49730 - arg = a.arg[dp->precision_arg_index].a.a_int;
49731 - precision = (arg < 0 ? 0 : arg);
49735 - const CHAR_T *digitp = dp->precision_start + 1;
49738 - while (digitp != dp->precision_end)
49739 - precision = xsum (xtimes (precision, 10), *digitp++ - '0');
49743 - switch (dp->conversion)
49746 - case 'd': case 'i': case 'u':
49747 -# ifdef HAVE_LONG_LONG
49748 - if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
49750 - (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
49751 - * 0.30103 /* binary -> decimal */
49752 - * 2 /* estimate for FLAG_GROUP */
49754 - + 1 /* turn floor into ceil */
49755 - + 1; /* account for leading sign */
49758 - if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
49760 - (unsigned int) (sizeof (unsigned long) * CHAR_BIT
49761 - * 0.30103 /* binary -> decimal */
49762 - * 2 /* estimate for FLAG_GROUP */
49764 - + 1 /* turn floor into ceil */
49765 - + 1; /* account for leading sign */
49768 - (unsigned int) (sizeof (unsigned int) * CHAR_BIT
49769 - * 0.30103 /* binary -> decimal */
49770 - * 2 /* estimate for FLAG_GROUP */
49772 - + 1 /* turn floor into ceil */
49773 - + 1; /* account for leading sign */
49777 -# ifdef HAVE_LONG_LONG
49778 - if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
49780 - (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
49781 - * 0.333334 /* binary -> octal */
49783 - + 1 /* turn floor into ceil */
49784 - + 1; /* account for leading sign */
49787 - if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
49789 - (unsigned int) (sizeof (unsigned long) * CHAR_BIT
49790 - * 0.333334 /* binary -> octal */
49792 - + 1 /* turn floor into ceil */
49793 - + 1; /* account for leading sign */
49796 - (unsigned int) (sizeof (unsigned int) * CHAR_BIT
49797 - * 0.333334 /* binary -> octal */
49799 - + 1 /* turn floor into ceil */
49800 - + 1; /* account for leading sign */
49803 - case 'x': case 'X':
49804 -# ifdef HAVE_LONG_LONG
49805 - if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
49807 - (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
49808 - * 0.25 /* binary -> hexadecimal */
49810 - + 1 /* turn floor into ceil */
49811 - + 2; /* account for leading sign or alternate form */
49814 - if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
49816 - (unsigned int) (sizeof (unsigned long) * CHAR_BIT
49817 - * 0.25 /* binary -> hexadecimal */
49819 - + 1 /* turn floor into ceil */
49820 - + 2; /* account for leading sign or alternate form */
49823 - (unsigned int) (sizeof (unsigned int) * CHAR_BIT
49824 - * 0.25 /* binary -> hexadecimal */
49826 - + 1 /* turn floor into ceil */
49827 - + 2; /* account for leading sign or alternate form */
49830 - case 'f': case 'F':
49831 -# ifdef HAVE_LONG_DOUBLE
49832 - if (type == TYPE_LONGDOUBLE)
49834 - (unsigned int) (LDBL_MAX_EXP
49835 - * 0.30103 /* binary -> decimal */
49836 - * 2 /* estimate for FLAG_GROUP */
49838 - + 1 /* turn floor into ceil */
49839 - + 10; /* sign, decimal point etc. */
49843 - (unsigned int) (DBL_MAX_EXP
49844 - * 0.30103 /* binary -> decimal */
49845 - * 2 /* estimate for FLAG_GROUP */
49847 - + 1 /* turn floor into ceil */
49848 - + 10; /* sign, decimal point etc. */
49849 - tmp_length = xsum (tmp_length, precision);
49852 - case 'e': case 'E': case 'g': case 'G':
49853 - case 'a': case 'A':
49855 - 12; /* sign, decimal point, exponent etc. */
49856 - tmp_length = xsum (tmp_length, precision);
49860 -# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
49861 - if (type == TYPE_WIDE_CHAR)
49862 - tmp_length = MB_CUR_MAX;
49869 -# ifdef HAVE_WCHAR_T
49870 - if (type == TYPE_WIDE_STRING)
49873 - local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
49875 -# if !WIDE_CHAR_VERSION
49876 - tmp_length = xtimes (tmp_length, MB_CUR_MAX);
49881 - tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
49886 - (unsigned int) (sizeof (void *) * CHAR_BIT
49887 - * 0.25 /* binary -> hexadecimal */
49889 - + 1 /* turn floor into ceil */
49890 - + 2; /* account for leading 0x */
49897 - if (tmp_length < width)
49898 - tmp_length = width;
49900 - tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
49903 - if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
49907 - size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
49909 - if (size_overflow_p (tmp_memsize))
49910 - /* Overflow, would lead to out of memory. */
49911 - goto out_of_memory;
49912 - tmp = (CHAR_T *) malloc (tmp_memsize);
49914 - /* Out of memory. */
49915 - goto out_of_memory;
49919 - /* Construct the format string for calling snprintf or
49923 - if (dp->flags & FLAG_GROUP)
49925 - if (dp->flags & FLAG_LEFT)
49927 - if (dp->flags & FLAG_SHOWSIGN)
49929 - if (dp->flags & FLAG_SPACE)
49931 - if (dp->flags & FLAG_ALT)
49933 - if (dp->flags & FLAG_ZERO)
49935 - if (dp->width_start != dp->width_end)
49937 - size_t n = dp->width_end - dp->width_start;
49938 - memcpy (p, dp->width_start, n * sizeof (CHAR_T));
49941 - if (dp->precision_start != dp->precision_end)
49943 - size_t n = dp->precision_end - dp->precision_start;
49944 - memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
49950 -#ifdef HAVE_LONG_LONG
49951 - case TYPE_LONGLONGINT:
49952 - case TYPE_ULONGLONGINT:
49956 - case TYPE_LONGINT:
49957 - case TYPE_ULONGINT:
49958 -#ifdef HAVE_WINT_T
49959 - case TYPE_WIDE_CHAR:
49961 -#ifdef HAVE_WCHAR_T
49962 - case TYPE_WIDE_STRING:
49966 -#ifdef HAVE_LONG_DOUBLE
49967 - case TYPE_LONGDOUBLE:
49974 - *p = dp->conversion;
49983 - /* Construct the arguments for calling snprintf or sprintf. */
49984 - prefix_count = 0;
49985 - if (dp->width_arg_index != ARG_NONE)
49987 - if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
49989 - prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
49991 - if (dp->precision_arg_index != ARG_NONE)
49993 - if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
49995 - prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
49999 - /* Prepare checking whether snprintf returns the count
50001 - ENSURE_ALLOCATION (xsum (length, 1));
50002 - result[length] = '\0';
50011 - maxlen = allocated - length;
50016 -# define SNPRINTF_BUF(arg) \
50017 - switch (prefix_count) \
50020 - retcount = SNPRINTF (result + length, maxlen, buf, \
50024 - retcount = SNPRINTF (result + length, maxlen, buf, \
50025 - prefixes[0], arg, &count); \
50028 - retcount = SNPRINTF (result + length, maxlen, buf, \
50029 - prefixes[0], prefixes[1], arg, \
50036 -# define SNPRINTF_BUF(arg) \
50037 - switch (prefix_count) \
50040 - count = sprintf (tmp, buf, arg); \
50043 - count = sprintf (tmp, buf, prefixes[0], arg); \
50046 - count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
50058 - int arg = a.arg[dp->arg_index].a.a_schar;
50059 - SNPRINTF_BUF (arg);
50064 - unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
50065 - SNPRINTF_BUF (arg);
50070 - int arg = a.arg[dp->arg_index].a.a_short;
50071 - SNPRINTF_BUF (arg);
50074 - case TYPE_USHORT:
50076 - unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
50077 - SNPRINTF_BUF (arg);
50082 - int arg = a.arg[dp->arg_index].a.a_int;
50083 - SNPRINTF_BUF (arg);
50088 - unsigned int arg = a.arg[dp->arg_index].a.a_uint;
50089 - SNPRINTF_BUF (arg);
50092 - case TYPE_LONGINT:
50094 - long int arg = a.arg[dp->arg_index].a.a_longint;
50095 - SNPRINTF_BUF (arg);
50098 - case TYPE_ULONGINT:
50100 - unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
50101 - SNPRINTF_BUF (arg);
50104 -#ifdef HAVE_LONG_LONG
50105 - case TYPE_LONGLONGINT:
50107 - long long int arg = a.arg[dp->arg_index].a.a_longlongint;
50108 - SNPRINTF_BUF (arg);
50111 - case TYPE_ULONGLONGINT:
50113 - unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
50114 - SNPRINTF_BUF (arg);
50118 - case TYPE_DOUBLE:
50120 - double arg = a.arg[dp->arg_index].a.a_double;
50121 - SNPRINTF_BUF (arg);
50124 -#ifdef HAVE_LONG_DOUBLE
50125 - case TYPE_LONGDOUBLE:
50127 - long double arg = a.arg[dp->arg_index].a.a_longdouble;
50128 - SNPRINTF_BUF (arg);
50134 - int arg = a.arg[dp->arg_index].a.a_char;
50135 - SNPRINTF_BUF (arg);
50138 -#ifdef HAVE_WINT_T
50139 - case TYPE_WIDE_CHAR:
50141 - wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
50142 - SNPRINTF_BUF (arg);
50146 - case TYPE_STRING:
50148 - const char *arg = a.arg[dp->arg_index].a.a_string;
50149 - SNPRINTF_BUF (arg);
50152 -#ifdef HAVE_WCHAR_T
50153 - case TYPE_WIDE_STRING:
50155 - const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
50156 - SNPRINTF_BUF (arg);
50160 - case TYPE_POINTER:
50162 - void *arg = a.arg[dp->arg_index].a.a_pointer;
50163 - SNPRINTF_BUF (arg);
50171 - /* Portability: Not all implementations of snprintf()
50172 - are ISO C 99 compliant. Determine the number of
50173 - bytes that snprintf() has produced or would have
50177 - /* Verify that snprintf() has NUL-terminated its
50179 - if (count < maxlen && result[length + count] != '\0')
50181 - /* Portability hack. */
50182 - if (retcount > count)
50183 - count = retcount;
50187 - /* snprintf() doesn't understand the '%n'
50189 - if (p[1] != '\0')
50191 - /* Don't use the '%n' directive; instead, look
50192 - at the snprintf() return value. */
50198 - /* Look at the snprintf() return value. */
50199 - if (retcount < 0)
50201 - /* HP-UX 10.20 snprintf() is doubly deficient:
50202 - It doesn't understand the '%n' directive,
50203 - *and* it returns -1 (rather than the length
50204 - that would have been required) when the
50205 - buffer is too small. */
50206 - size_t bigger_need =
50207 - xsum (xtimes (allocated, 2), 12);
50208 - ENSURE_ALLOCATION (bigger_need);
50212 - count = retcount;
50217 - /* Attempt to handle failure. */
50220 - if (!(result == resultbuf || result == NULL))
50222 - if (buf_malloced != NULL)
50223 - free (buf_malloced);
50230 - if (count >= tmp_length)
50231 - /* tmp_length was incorrectly calculated - fix the
50236 - /* Make room for the result. */
50237 - if (count >= maxlen)
50239 - /* Need at least count bytes. But allocate
50240 - proportionally, to avoid looping eternally if
50241 - snprintf() reports a too small count. */
50243 - xmax (xsum (length, count), xtimes (allocated, 2));
50245 - ENSURE_ALLOCATION (n);
50252 - /* The snprintf() result did fit. */
50254 - /* Append the sprintf() result. */
50255 - memcpy (result + length, tmp, count * sizeof (CHAR_T));
50256 - if (tmp != tmpbuf)
50267 - /* Add the final NUL. */
50268 - ENSURE_ALLOCATION (xsum (length, 1));
50269 - result[length] = '\0';
50271 - if (result != resultbuf && length + 1 < allocated)
50273 - /* Shrink the allocated memory if possible. */
50276 - memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
50277 - if (memory != NULL)
50281 - if (buf_malloced != NULL)
50282 - free (buf_malloced);
50284 - *lengthp = length;
50285 - if (length > INT_MAX)
50286 - goto length_overflow;
50290 - /* We could produce such a big string, but its length doesn't fit into
50291 - an 'int'. POSIX says that snprintf() fails with errno = EOVERFLOW in
50293 - if (result != resultbuf)
50295 - errno = EOVERFLOW;
50299 - if (!(result == resultbuf || result == NULL))
50301 - if (buf_malloced != NULL)
50302 - free (buf_malloced);
50311 -#undef USE_SNPRINTF
50312 -#undef PRINTF_PARSE
50317 diff -urN BUILD/abook-0.6.0pre2/intl/vasnprintf.h abook/intl/vasnprintf.h
50318 --- BUILD/abook-0.6.0pre2/intl/vasnprintf.h 2005-09-17 12:10:26.000000000 +0200
50319 +++ abook/intl/vasnprintf.h 1970-01-01 01:00:00.000000000 +0100
50321 -/* vsprintf with automatic memory allocation.
50322 - Copyright (C) 2002-2004 Free Software Foundation, Inc.
50324 - This program is free software; you can redistribute it and/or modify it
50325 - under the terms of the GNU Library General Public License as published
50326 - by the Free Software Foundation; either version 2, or (at your option)
50327 - any later version.
50329 - This program is distributed in the hope that it will be useful,
50330 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50331 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50332 - Library General Public License for more details.
50334 - You should have received a copy of the GNU Library General Public
50335 - License along with this program; if not, write to the Free Software
50336 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50339 -#ifndef _VASNPRINTF_H
50340 -#define _VASNPRINTF_H
50342 -/* Get va_list. */
50343 -#include <stdarg.h>
50346 -#include <stddef.h>
50348 -#ifndef __attribute__
50349 -/* This feature is available in gcc versions 2.5 and later. */
50350 -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
50351 -# define __attribute__(Spec) /* empty */
50353 -/* The __-protected variants of `format' and `printf' attributes
50354 - are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
50355 -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
50356 -# define __format__ format
50357 -# define __printf__ printf
50361 -#ifdef __cplusplus
50365 -/* Write formatted output to a string dynamically allocated with malloc().
50366 - You can pass a preallocated buffer for the result in RESULTBUF and its
50367 - size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
50368 - If successful, return the address of the string (this may be = RESULTBUF
50369 - if no dynamic memory allocation was necessary) and set *LENGTHP to the
50370 - number of resulting bytes, excluding the trailing NUL. Upon error, set
50371 - errno and return NULL.
50373 - When dynamic memory allocation occurs, the preallocated buffer is left
50374 - alone (with possibly modified contents). This makes it possible to use
50375 - a statically allocated or stack-allocated buffer, like this:
50378 - size_t len = sizeof (buf);
50379 - char *output = vasnprintf (buf, &len, format, args);
50380 - if (output == NULL)
50381 - ... error handling ...;
50384 - ... use the output string ...;
50385 - if (output != buf)
50389 -extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
50390 - __attribute__ ((__format__ (__printf__, 3, 4)));
50391 -extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
50392 - __attribute__ ((__format__ (__printf__, 3, 0)));
50394 -#ifdef __cplusplus
50398 -#endif /* _VASNPRINTF_H */
50399 diff -urN BUILD/abook-0.6.0pre2/intl/vasnwprintf.h abook/intl/vasnwprintf.h
50400 --- BUILD/abook-0.6.0pre2/intl/vasnwprintf.h 2005-09-17 12:10:26.000000000 +0200
50401 +++ abook/intl/vasnwprintf.h 1970-01-01 01:00:00.000000000 +0100
50403 -/* vswprintf with automatic memory allocation.
50404 - Copyright (C) 2002-2003 Free Software Foundation, Inc.
50406 - This program is free software; you can redistribute it and/or modify it
50407 - under the terms of the GNU Library General Public License as published
50408 - by the Free Software Foundation; either version 2, or (at your option)
50409 - any later version.
50411 - This program is distributed in the hope that it will be useful,
50412 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50413 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50414 - Library General Public License for more details.
50416 - You should have received a copy of the GNU Library General Public
50417 - License along with this program; if not, write to the Free Software
50418 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50421 -#ifndef _VASNWPRINTF_H
50422 -#define _VASNWPRINTF_H
50424 -/* Get va_list. */
50425 -#include <stdarg.h>
50427 -/* Get wchar_t, size_t. */
50428 -#include <stddef.h>
50430 -#ifdef __cplusplus
50434 -/* Write formatted output to a string dynamically allocated with malloc().
50435 - You can pass a preallocated buffer for the result in RESULTBUF and its
50436 - size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
50437 - If successful, return the address of the string (this may be = RESULTBUF
50438 - if no dynamic memory allocation was necessary) and set *LENGTHP to the
50439 - number of resulting bytes, excluding the trailing NUL. Upon error, set
50440 - errno and return NULL. */
50441 -extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
50442 -extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
50444 -#ifdef __cplusplus
50448 -#endif /* _VASNWPRINTF_H */
50449 diff -urN BUILD/abook-0.6.0pre2/intl/VERSION abook/intl/VERSION
50450 --- BUILD/abook-0.6.0pre2/intl/VERSION 2005-09-17 12:10:26.000000000 +0200
50451 +++ abook/intl/VERSION 1970-01-01 01:00:00.000000000 +0100
50453 -GNU gettext library from gettext-0.14.4
50454 diff -urN BUILD/abook-0.6.0pre2/intl/wprintf-parse.h abook/intl/wprintf-parse.h
50455 --- BUILD/abook-0.6.0pre2/intl/wprintf-parse.h 2005-09-17 12:10:26.000000000 +0200
50456 +++ abook/intl/wprintf-parse.h 1970-01-01 01:00:00.000000000 +0100
50458 -/* Parse printf format string.
50459 - Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
50461 - This program is free software; you can redistribute it and/or modify it
50462 - under the terms of the GNU Library General Public License as published
50463 - by the Free Software Foundation; either version 2, or (at your option)
50464 - any later version.
50466 - This program is distributed in the hope that it will be useful,
50467 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50468 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50469 - Library General Public License for more details.
50471 - You should have received a copy of the GNU Library General Public
50472 - License along with this program; if not, write to the Free Software
50473 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50476 -#ifndef _WPRINTF_PARSE_H
50477 -#define _WPRINTF_PARSE_H
50479 -#include "printf-args.h"
50483 -#define FLAG_GROUP 1 /* ' flag */
50484 -#define FLAG_LEFT 2 /* - flag */
50485 -#define FLAG_SHOWSIGN 4 /* + flag */
50486 -#define FLAG_SPACE 8 /* space flag */
50487 -#define FLAG_ALT 16 /* # flag */
50488 -#define FLAG_ZERO 32
50490 -/* arg_index value indicating that no argument is consumed. */
50491 -#define ARG_NONE (~(size_t)0)
50493 -/* A parsed directive. */
50496 - const wchar_t* dir_start;
50497 - const wchar_t* dir_end;
50499 - const wchar_t* width_start;
50500 - const wchar_t* width_end;
50501 - size_t width_arg_index;
50502 - const wchar_t* precision_start;
50503 - const wchar_t* precision_end;
50504 - size_t precision_arg_index;
50505 - wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
50506 - size_t arg_index;
50508 -wchar_t_directive;
50510 -/* A parsed format string. */
50514 - wchar_t_directive *dir;
50515 - size_t max_width_length;
50516 - size_t max_precision_length;
50518 -wchar_t_directives;
50521 -/* Parses the format string. Fills in the number N of directives, and fills
50522 - in directives[0], ..., directives[N-1], and sets directives[N].dir_start
50523 - to the end of the format string. Also fills in the arg_type fields of the
50524 - arguments and the needed count of arguments. */
50530 -int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
50532 -#endif /* _WPRINTF_PARSE_H */
50533 diff -urN BUILD/abook-0.6.0pre2/intl/xsize.h abook/intl/xsize.h
50534 --- BUILD/abook-0.6.0pre2/intl/xsize.h 2005-09-17 12:10:26.000000000 +0200
50535 +++ abook/intl/xsize.h 1970-01-01 01:00:00.000000000 +0100
50537 -/* xsize.h -- Checked size_t computations.
50539 - Copyright (C) 2003 Free Software Foundation, Inc.
50541 - This program is free software; you can redistribute it and/or modify it
50542 - under the terms of the GNU Library General Public License as published
50543 - by the Free Software Foundation; either version 2, or (at your option)
50544 - any later version.
50546 - This program is distributed in the hope that it will be useful,
50547 - but WITHOUT ANY WARRANTY; without even the implied warranty of
50548 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
50549 - Library General Public License for more details.
50551 - You should have received a copy of the GNU Library General Public
50552 - License along with this program; if not, write to the Free Software
50553 - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
50560 -#include <stddef.h>
50562 -/* Get SIZE_MAX. */
50563 -#include <limits.h>
50565 -# include <stdint.h>
50568 -/* The size of memory objects is often computed through expressions of
50569 - type size_t. Example:
50570 - void* p = malloc (header_size + n * element_size).
50571 - These computations can lead to overflow. When this happens, malloc()
50572 - returns a piece of memory that is way too small, and the program then
50573 - crashes while attempting to fill the memory.
50574 - To avoid this, the functions and macros in this file check for overflow.
50575 - The convention is that SIZE_MAX represents overflow.
50576 - malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
50577 - implementation that uses mmap --, it's recommended to use size_overflow_p()
50578 - or size_in_bounds_p() before invoking malloc().
50579 - The example thus becomes:
50580 - size_t size = xsum (header_size, xtimes (n, element_size));
50581 - void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
50584 -/* Convert an arbitrary value >= 0 to type size_t. */
50585 -#define xcast_size_t(N) \
50586 - ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
50588 -/* Sum of two sizes, with overflow check. */
50589 -static inline size_t
50591 -__attribute__ ((__pure__))
50593 -xsum (size_t size1, size_t size2)
50595 - size_t sum = size1 + size2;
50596 - return (sum >= size1 ? sum : SIZE_MAX);
50599 -/* Sum of three sizes, with overflow check. */
50600 -static inline size_t
50602 -__attribute__ ((__pure__))
50604 -xsum3 (size_t size1, size_t size2, size_t size3)
50606 - return xsum (xsum (size1, size2), size3);
50609 -/* Sum of four sizes, with overflow check. */
50610 -static inline size_t
50612 -__attribute__ ((__pure__))
50614 -xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
50616 - return xsum (xsum (xsum (size1, size2), size3), size4);
50619 -/* Maximum of two sizes, with overflow check. */
50620 -static inline size_t
50622 -__attribute__ ((__pure__))
50624 -xmax (size_t size1, size_t size2)
50626 - /* No explicit check is needed here, because for any n:
50627 - max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
50628 - return (size1 >= size2 ? size1 : size2);
50631 -/* Multiplication of a count with an element size, with overflow check.
50632 - The count must be >= 0 and the element size must be > 0.
50633 - This is a macro, not an inline function, so that it works correctly even
50634 - when N is of a wider tupe and N > SIZE_MAX. */
50635 -#define xtimes(N, ELSIZE) \
50636 - ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
50638 -/* Check for overflow. */
50639 -#define size_overflow_p(SIZE) \
50640 - ((SIZE) == SIZE_MAX)
50641 -/* Check against overflow. */
50642 -#define size_in_bounds_p(SIZE) \
50643 - ((SIZE) != SIZE_MAX)
50645 -#endif /* _XSIZE_H */
50646 diff -urN BUILD/abook-0.6.0pre2/ldif.c abook/ldif.c
50647 --- BUILD/abook-0.6.0pre2/ldif.c 2005-07-29 08:28:55.000000000 +0200
50648 +++ abook/ldif.c 2013-03-13 15:07:45.000000000 +0100
50652 - * $Id: ldif.c,v 1.5 2005/07/29 06:28:55 jheinonen Exp $
50654 * adapted to use with abook by JH <jheinonen@users.sourceforge.net>
50657 diff -urN BUILD/abook-0.6.0pre2/list.c abook/list.c
50658 --- BUILD/abook-0.6.0pre2/list.c 2006-09-05 10:21:35.000000000 +0200
50659 +++ abook/list.c 2013-03-13 15:07:45.000000000 +0100
50663 - * $Id: list.c,v 1.33 2006/09/05 08:21:35 jheinonen Exp $
50666 * by JH <jheinonen@users.sourceforge.net>
50670 #include "options.h"
50671 #include "xmalloc.h"
50672 +#include "color.h"
50676 @@ -180,7 +181,7 @@
50677 width = len ? bytes2width(s, len) : strwidth(s);
50678 x_start = *x_pos + ((e->d.field.len < 0) ? len - width : 0);
50679 if(width + x_start >= COLS)
50680 - width = COLS - x_start;
50681 + width = bytes2width(s, COLS - x_start);
50684 mvwaddnstr(list, line, x_start, s, width);
50685 @@ -194,7 +195,10 @@
50687 highlight_line(WINDOW *win, int line)
50690 + wattrset(win, COLOR_PAIR(CP_LIST_HIGHLIGHT));
50691 + if(!opt_get_bool(BOOL_USE_COLORS)) {
50696 * this is a tricky one
50697 @@ -224,6 +228,10 @@
50698 struct index_elem *cur;
50701 + if(item % 2 == 0)
50702 + wattrset(list, COLOR_PAIR(CP_LIST_EVEN));
50704 + wattrset(list, COLOR_PAIR(CP_LIST_ODD));
50705 scrollok(list, FALSE);
50707 highlight_line(list, line);
50708 @@ -300,13 +308,18 @@
50709 #if defined(A_BOLD) && defined(A_NORMAL)
50712 + attrset(COLOR_PAIR(CP_LIST_HEADER));
50713 + mvhline(2, 0, ' ', COLS);
50715 for(e = index_elements; e; e = e->next)
50716 if(e->type == INDEX_TEXT)
50717 x_pos += strwidth(e->d.text);
50718 else if(e->type == INDEX_FIELD) {
50719 get_field_info(e->d.field.id, NULL, &str, NULL);
50720 - width = e->d.field.len ? abs(e->d.field.len) : strwidth(str);
50721 + width = e->d.field.len ?
50722 + abs(e->d.field.len) : strwidth(str);
50723 + if(width + x_pos > COLS)
50724 + width = bytes2width(str, COLS - x_pos);
50725 mvaddnstr(2, x_pos, str, width);
50728 @@ -485,6 +498,12 @@
50733 +list_get_firstitem()
50735 + return first_list_item;
50739 list_set_curitem(int i)
50741 diff -urN BUILD/abook-0.6.0pre2/list.h abook/list.h
50742 --- BUILD/abook-0.6.0pre2/list.h 2006-09-05 10:13:33.000000000 +0200
50743 +++ abook/list.h 2013-03-13 15:07:45.000000000 +0100
50745 void invert_selection();
50746 int list_is_empty();
50747 int list_get_curitem();
50748 +int list_get_firstitem();
50749 void list_set_curitem(int i);
50750 int duplicate_item();
50752 diff -urN BUILD/abook-0.6.0pre2/m4/codeset.m4 abook/m4/codeset.m4
50753 --- BUILD/abook-0.6.0pre2/m4/codeset.m4 2005-09-17 12:10:26.000000000 +0200
50754 +++ abook/m4/codeset.m4 2013-03-13 15:07:45.000000000 +0100
50756 -# codeset.m4 serial AM1 (gettext-0.10.40)
50757 -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
50758 +# codeset.m4 serial 4 (gettext-0.18)
50759 +dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
50760 dnl This file is free software; the Free Software Foundation
50761 dnl gives unlimited permission to copy and/or distribute it,
50762 dnl with or without modifications, as long as this notice is preserved.
50765 AC_DEFUN([AM_LANGINFO_CODESET],
50767 - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
50768 + AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
50769 [AC_TRY_LINK([#include <langinfo.h>],
50770 - [char* cs = nl_langinfo(CODESET);],
50771 - am_cv_langinfo_codeset=yes,
50772 - am_cv_langinfo_codeset=no)
50773 + [char* cs = nl_langinfo(CODESET); return !cs;],
50774 + [am_cv_langinfo_codeset=yes],
50775 + [am_cv_langinfo_codeset=no])
50777 if test $am_cv_langinfo_codeset = yes; then
50778 - AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
50779 + AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
50780 [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
50783 diff -urN BUILD/abook-0.6.0pre2/m4/fcntl-o.m4 abook/m4/fcntl-o.m4
50784 --- BUILD/abook-0.6.0pre2/m4/fcntl-o.m4 1970-01-01 01:00:00.000000000 +0100
50785 +++ abook/m4/fcntl-o.m4 2013-03-13 15:07:45.000000000 +0100
50787 +# fcntl-o.m4 serial 1
50788 +dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
50789 +dnl This file is free software; the Free Software Foundation
50790 +dnl gives unlimited permission to copy and/or distribute it,
50791 +dnl with or without modifications, as long as this notice is preserved.
50793 +dnl Written by Paul Eggert.
50795 +# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
50796 +# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
50797 +# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
50798 +AC_DEFUN([gl_FCNTL_O_FLAGS],
50800 + dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
50801 + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
50802 + AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
50804 + [AC_LANG_PROGRAM(
50805 + [[#include <sys/types.h>
50806 + #include <sys/stat.h>
50807 + #include <unistd.h>
50808 + #include <fcntl.h>
50809 + #ifndef O_NOATIME
50810 + #define O_NOATIME 0
50812 + #ifndef O_NOFOLLOW
50813 + #define O_NOFOLLOW 0
50815 + static int const constants[] =
50817 + O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
50818 + O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
50822 + int status = !constants;
50824 + static char const sym[] = "conftest.sym";
50825 + if (symlink (".", sym) != 0
50826 + || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
50831 + static char const file[] = "confdefs.h";
50832 + int fd = open (file, O_RDONLY | O_NOATIME);
50834 + struct stat st0, st1;
50836 + || fstat (fd, &st0) != 0
50837 + || sleep (1) != 0
50838 + || read (fd, &c, 1) != 1
50839 + || close (fd) != 0
50840 + || stat (file, &st1) != 0
50841 + || st0.st_atime != st1.st_atime)
50844 + return status;]])],
50845 + [gl_cv_header_working_fcntl_h=yes],
50847 + 32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
50848 + 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
50849 + 96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
50850 + *) gl_cv_header_working_fcntl_h='no';;
50852 + [gl_cv_header_working_fcntl_h=cross-compiling])])
50854 + case $gl_cv_header_working_fcntl_h in #(
50855 + *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
50858 + AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
50859 + [Define to 1 if O_NOATIME works.])
50861 + case $gl_cv_header_working_fcntl_h in #(
50862 + *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
50865 + AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
50866 + [Define to 1 if O_NOFOLLOW works.])
50868 diff -urN BUILD/abook-0.6.0pre2/m4/gettext.m4 abook/m4/gettext.m4
50869 --- BUILD/abook-0.6.0pre2/m4/gettext.m4 2005-09-17 12:10:26.000000000 +0200
50870 +++ abook/m4/gettext.m4 2013-03-13 15:07:45.000000000 +0100
50872 -# gettext.m4 serial 37 (gettext-0.14.4)
50873 -dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
50874 +# gettext.m4 serial 63 (gettext-0.18)
50875 +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
50876 dnl This file is free software; the Free Software Foundation
50877 dnl gives unlimited permission to copy and/or distribute it,
50878 dnl with or without modifications, as long as this notice is preserved.
50882 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
50883 -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
50884 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
50886 dnl Macro to add for using GNU gettext.
50888 @@ -60,11 +60,18 @@
50889 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
50890 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
50892 + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
50893 + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
50894 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
50895 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
50897 - define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
50898 + define([gt_included_intl],
50899 + ifelse([$1], [external],
50900 + ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
50902 define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
50904 + AM_GNU_GETTEXT_NEED([$2])
50906 AC_REQUIRE([AM_PO_SUBDIRS])dnl
50907 ifelse(gt_included_intl, yes, [
50909 dnl Sometimes libintl requires libiconv, so first search for libiconv.
50910 dnl Ideally we would do this search only after the
50911 dnl if test "$USE_NLS" = "yes"; then
50912 - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
50913 + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
50914 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
50915 dnl the configure script would need to contain the same shell code
50916 dnl again, outside any 'if'. There are two solutions:
50922 + AC_REQUIRE([AM_NLS])
50924 ifelse(gt_included_intl, yes, [
50925 BUILD_INCLUDED_LIBINTL=no
50926 @@ -104,16 +111,25 @@
50930 + dnl Add a version number to the cache macros.
50931 + case " $gt_needs " in
50932 + *" need-formatstring-macros "*) gt_api_version=3 ;;
50933 + *" need-ngettext "*) gt_api_version=2 ;;
50934 + *) gt_api_version=1 ;;
50936 + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
50937 + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
50939 dnl If we use NLS figure out what method
50940 if test "$USE_NLS" = "yes"; then
50941 gt_use_preinstalled_gnugettext=no
50942 ifelse(gt_included_intl, yes, [
50943 AC_MSG_CHECKING([whether included gettext is requested])
50944 - AC_ARG_WITH(included-gettext,
50945 + AC_ARG_WITH([included-gettext],
50946 [ --with-included-gettext use the GNU gettext library included here],
50947 nls_cv_force_use_gnu_gettext=$withval,
50948 nls_cv_force_use_gnu_gettext=no)
50949 - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
50950 + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
50952 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
50953 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
50954 @@ -122,28 +138,35 @@
50955 dnl to use. If GNU gettext is available we use this. Else we have
50956 dnl to fall back to GNU NLS library.
50958 - dnl Add a version number to the cache macros.
50959 - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
50960 - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
50961 - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
50963 - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
50964 - [AC_TRY_LINK([#include <libintl.h>
50965 -]ifelse([$2], [need-formatstring-macros],
50966 -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
50967 + if test $gt_api_version -ge 3; then
50968 + gt_revision_test_code='
50969 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
50970 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
50973 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
50974 changequote([,])dnl
50975 -], [])[extern int _nl_msg_cat_cntr;
50978 + gt_revision_test_code=
50980 + if test $gt_api_version -ge 2; then
50981 + gt_expression_test_code=' + * ngettext ("", "", 0)'
50983 + gt_expression_test_code=
50986 + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
50987 + [AC_TRY_LINK([#include <libintl.h>
50988 +$gt_revision_test_code
50989 +extern int _nl_msg_cat_cntr;
50990 extern int *_nl_domain_bindings;],
50991 [bindtextdomain ("", "");
50992 -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
50993 - gt_cv_func_gnugettext_libc=yes,
50994 - gt_cv_func_gnugettext_libc=no)])
50995 +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
50996 + [eval "$gt_func_gnugettext_libc=yes"],
50997 + [eval "$gt_func_gnugettext_libc=no"])])
50999 - if test "$gt_cv_func_gnugettext_libc" != "yes"; then
51000 + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
51001 dnl Sometimes libintl requires libiconv, so first search for libiconv.
51002 ifelse(gt_included_intl, yes, , [
51004 @@ -154,52 +177,40 @@
51005 dnl even if libiconv doesn't exist.
51006 AC_LIB_LINKFLAGS_BODY([intl])
51007 AC_CACHE_CHECK([for GNU gettext in libintl],
51008 - gt_cv_func_gnugettext_libintl,
51009 + [$gt_func_gnugettext_libintl],
51010 [gt_save_CPPFLAGS="$CPPFLAGS"
51011 CPPFLAGS="$CPPFLAGS $INCINTL"
51012 gt_save_LIBS="$LIBS"
51013 LIBS="$LIBS $LIBINTL"
51014 dnl Now see whether libintl exists and does not depend on libiconv.
51015 AC_TRY_LINK([#include <libintl.h>
51016 -]ifelse([$2], [need-formatstring-macros],
51017 -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
51018 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
51021 -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
51022 -changequote([,])dnl
51023 -], [])[extern int _nl_msg_cat_cntr;
51024 +$gt_revision_test_code
51025 +extern int _nl_msg_cat_cntr;
51030 const char *_nl_expand_alias (const char *);],
51031 [bindtextdomain ("", "");
51032 -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
51033 - gt_cv_func_gnugettext_libintl=yes,
51034 - gt_cv_func_gnugettext_libintl=no)
51035 +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
51036 + [eval "$gt_func_gnugettext_libintl=yes"],
51037 + [eval "$gt_func_gnugettext_libintl=no"])
51038 dnl Now see whether libintl exists and depends on libiconv.
51039 - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
51040 + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
51041 LIBS="$LIBS $LIBICONV"
51042 AC_TRY_LINK([#include <libintl.h>
51043 -]ifelse([$2], [need-formatstring-macros],
51044 -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
51045 -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
51048 -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
51049 -changequote([,])dnl
51050 -], [])[extern int _nl_msg_cat_cntr;
51051 +$gt_revision_test_code
51052 +extern int _nl_msg_cat_cntr;
51057 const char *_nl_expand_alias (const char *);],
51058 [bindtextdomain ("", "");
51059 -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
51060 +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
51061 [LIBINTL="$LIBINTL $LIBICONV"
51062 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
51063 - gt_cv_func_gnugettext_libintl=yes
51064 + eval "$gt_func_gnugettext_libintl=yes"
51067 CPPFLAGS="$gt_save_CPPFLAGS"
51068 @@ -210,8 +221,8 @@
51069 dnl use it. But if this macro is used in GNU gettext, and GNU
51070 dnl gettext is already preinstalled in libintl, we update this
51071 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
51072 - if test "$gt_cv_func_gnugettext_libc" = "yes" \
51073 - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
51074 + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
51075 + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
51076 && test "$PACKAGE" != gettext-runtime \
51077 && test "$PACKAGE" != gettext-tools; }; then
51078 gt_use_preinstalled_gnugettext=yes
51079 @@ -234,8 +245,8 @@
51080 dnl Mark actions used to generate GNU NLS library.
51081 BUILD_INCLUDED_LIBINTL=yes
51082 USE_INCLUDED_LIBINTL=yes
51083 - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
51084 - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
51085 + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
51086 + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
51087 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
51090 @@ -258,7 +269,7 @@
51092 if test "$gt_use_preinstalled_gnugettext" = "yes" \
51093 || test "$nls_cv_use_gnu_gettext" = "yes"; then
51094 - AC_DEFINE(ENABLE_NLS, 1,
51095 + AC_DEFINE([ENABLE_NLS], [1],
51096 [Define to 1 if translation of program messages to the user's native language
51099 @@ -271,7 +282,7 @@
51100 if test "$USE_NLS" = "yes"; then
51101 AC_MSG_CHECKING([where the gettext function comes from])
51102 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
51103 - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
51104 + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
51105 gt_source="external libintl"
51108 @@ -285,16 +296,16 @@
51109 if test "$USE_NLS" = "yes"; then
51111 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
51112 - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
51113 + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
51114 AC_MSG_CHECKING([how to link with libintl])
51115 AC_MSG_RESULT([$LIBINTL])
51116 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
51119 dnl For backward compatibility. Some packages may be using this.
51120 - AC_DEFINE(HAVE_GETTEXT, 1,
51121 + AC_DEFINE([HAVE_GETTEXT], [1],
51122 [Define if the GNU gettext() function is already present or preinstalled.])
51123 - AC_DEFINE(HAVE_DCGETTEXT, 1,
51124 + AC_DEFINE([HAVE_DCGETTEXT], [1],
51125 [Define if the GNU dcgettext() function is already present or preinstalled.])
51128 @@ -310,9 +321,9 @@
51131 dnl Make all variables we use known to autoconf.
51132 - AC_SUBST(BUILD_INCLUDED_LIBINTL)
51133 - AC_SUBST(USE_INCLUDED_LIBINTL)
51134 - AC_SUBST(CATOBJEXT)
51135 + AC_SUBST([BUILD_INCLUDED_LIBINTL])
51136 + AC_SUBST([USE_INCLUDED_LIBINTL])
51137 + AC_SUBST([CATOBJEXT])
51139 dnl For backward compatibility. Some configure.ins may be using this.
51140 nls_cv_header_intl=
51141 @@ -320,228 +331,51 @@
51143 dnl For backward compatibility. Some Makefiles may be using this.
51145 - AC_SUBST(DATADIRNAME)
51146 + AC_SUBST([DATADIRNAME])
51148 dnl For backward compatibility. Some Makefiles may be using this.
51150 - AC_SUBST(INSTOBJEXT)
51151 + AC_SUBST([INSTOBJEXT])
51153 dnl For backward compatibility. Some Makefiles may be using this.
51156 + AC_SUBST([GENCAT])
51158 dnl For backward compatibility. Some Makefiles may be using this.
51160 if test "$USE_INCLUDED_LIBINTL" = yes; then
51161 INTLOBJS="\$(GETTOBJS)"
51163 - AC_SUBST(INTLOBJS)
51164 + AC_SUBST([INTLOBJS])
51166 dnl Enable libtool support if the surrounding package wishes it.
51167 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
51168 - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
51169 + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
51172 dnl For backward compatibility. Some Makefiles may be using this.
51173 INTLLIBS="$LIBINTL"
51174 - AC_SUBST(INTLLIBS)
51175 + AC_SUBST([INTLLIBS])
51177 dnl Make all documented variables known to autoconf.
51178 - AC_SUBST(LIBINTL)
51179 - AC_SUBST(LTLIBINTL)
51184 -dnl Checks for all prerequisites of the intl subdirectory,
51185 -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
51186 -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
51187 -AC_DEFUN([AM_INTL_SUBDIR],
51189 - AC_REQUIRE([AC_PROG_INSTALL])dnl
51190 - AC_REQUIRE([AM_MKINSTALLDIRS])dnl
51191 - AC_REQUIRE([AC_PROG_CC])dnl
51192 - AC_REQUIRE([AC_CANONICAL_HOST])dnl
51193 - AC_REQUIRE([gt_GLIBC2])dnl
51194 - AC_REQUIRE([AC_PROG_RANLIB])dnl
51195 - AC_REQUIRE([AC_ISC_POSIX])dnl
51196 - AC_REQUIRE([AC_HEADER_STDC])dnl
51197 - AC_REQUIRE([AC_C_CONST])dnl
51198 - AC_REQUIRE([bh_C_SIGNED])dnl
51199 - AC_REQUIRE([AC_C_INLINE])dnl
51200 - AC_REQUIRE([AC_TYPE_OFF_T])dnl
51201 - AC_REQUIRE([AC_TYPE_SIZE_T])dnl
51202 - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
51203 - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
51204 - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
51205 - AC_REQUIRE([gt_TYPE_WINT_T])dnl
51206 - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
51207 - AC_REQUIRE([gl_AC_HEADER_STDINT_H])
51208 - AC_REQUIRE([gt_TYPE_INTMAX_T])
51209 - AC_REQUIRE([gt_PRINTF_POSIX])
51210 - AC_REQUIRE([AC_FUNC_ALLOCA])dnl
51211 - AC_REQUIRE([AC_FUNC_MMAP])dnl
51212 - AC_REQUIRE([gl_GLIBC21])dnl
51213 - AC_REQUIRE([gt_INTDIV0])dnl
51214 - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
51215 - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
51216 - AC_REQUIRE([gt_INTTYPES_PRI])dnl
51217 - AC_REQUIRE([gl_XSIZE])dnl
51218 - AC_REQUIRE([gt_INTL_MACOSX])dnl
51220 - AC_CHECK_TYPE([ptrdiff_t], ,
51221 - [AC_DEFINE([ptrdiff_t], [long],
51222 - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
51224 - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
51225 -stdlib.h string.h unistd.h sys/param.h])
51226 - AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
51227 -mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
51228 -strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
51231 - dnl Use the _snprintf function only if it is declared (because on NetBSD it
51232 - dnl is defined as a weak alias of snprintf; we prefer to use the latter).
51233 - gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
51234 - gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
51236 - dnl Use the *_unlocked functions only if they are declared.
51237 - dnl (because some of them were defined without being declared in Solaris
51238 - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
51239 - dnl on Solaris 2.5.1 to run on Solaris 2.6).
51240 - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
51241 - gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
51242 - gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
51243 - gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
51245 - case $gt_cv_func_printf_posix in
51246 - *yes) HAVE_POSIX_PRINTF=1 ;;
51247 - *) HAVE_POSIX_PRINTF=0 ;;
51249 - AC_SUBST([HAVE_POSIX_PRINTF])
51250 - if test "$ac_cv_func_asprintf" = yes; then
51255 - AC_SUBST([HAVE_ASPRINTF])
51256 - if test "$ac_cv_func_snprintf" = yes; then
51261 - AC_SUBST([HAVE_SNPRINTF])
51262 - if test "$ac_cv_func_wprintf" = yes; then
51267 - AC_SUBST([HAVE_WPRINTF])
51270 - AM_LANGINFO_CODESET
51271 - if test $ac_cv_header_locale_h = yes; then
51275 - if test -n "$INTL_MACOSX_LIBS"; then
51276 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
51279 - dnl intl/plural.c is generated from intl/plural.y. It requires bison,
51280 - dnl because plural.y uses bison specific features. It requires at least
51281 - dnl bison-1.26 because earlier versions generate a plural.c that doesn't
51283 - dnl bison is only needed for the maintainer (who touches plural.y). But in
51284 - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
51285 - dnl the rule in general Makefile. Now, some people carelessly touch the
51286 - dnl files or have a broken "make" program, hence the plural.c rule will
51287 - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
51288 - dnl present or too old.
51289 - AC_CHECK_PROGS([INTLBISON], [bison])
51290 - if test -z "$INTLBISON"; then
51293 - dnl Found it, now check the version.
51294 - AC_MSG_CHECKING([version of bison])
51295 -changequote(<<,>>)dnl
51296 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
51297 - case $ac_prog_version in
51298 - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
51299 - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
51300 -changequote([,])dnl
51301 - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
51302 - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
51304 - AC_MSG_RESULT([$ac_prog_version])
51306 - if test $ac_verc_fail = yes; then
51309 + AC_SUBST([LIBINTL])
51310 + AC_SUBST([LTLIBINTL])
51311 + AC_SUBST([POSUB])
51315 -dnl Checks for special options needed on MacOS X.
51316 -dnl Defines INTL_MACOSX_LIBS.
51317 -AC_DEFUN([gt_INTL_MACOSX],
51318 +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
51319 +m4_define([gt_NEEDS_INIT],
51321 - dnl Check for API introduced in MacOS X 10.2.
51322 - AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
51323 - gt_cv_func_CFPreferencesCopyAppValue,
51324 - [gt_save_CPPFLAGS="$CPPFLAGS"
51325 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
51326 - gt_save_LIBS="$LIBS"
51327 - LIBS="$LIBS -framework CoreFoundation"
51328 - AC_TRY_LINK([#include <CFPreferences.h>],
51329 - [CFPreferencesCopyAppValue(NULL, NULL)],
51330 - [gt_cv_func_CFPreferencesCopyAppValue=yes],
51331 - [gt_cv_func_CFPreferencesCopyAppValue=no])
51332 - CPPFLAGS="$gt_save_CPPFLAGS"
51333 - LIBS="$gt_save_LIBS"])
51334 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
51335 - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
51336 - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
51338 - dnl Check for API introduced in MacOS X 10.3.
51339 - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
51340 - [gt_save_CPPFLAGS="$CPPFLAGS"
51341 - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
51342 - gt_save_LIBS="$LIBS"
51343 - LIBS="$LIBS -framework CoreFoundation"
51344 - AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
51345 - [gt_cv_func_CFLocaleCopyCurrent=yes],
51346 - [gt_cv_func_CFLocaleCopyCurrent=no])
51347 - CPPFLAGS="$gt_save_CPPFLAGS"
51348 - LIBS="$gt_save_LIBS"])
51349 - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
51350 - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
51351 - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
51353 - INTL_MACOSX_LIBS=
51354 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
51355 - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
51357 - AC_SUBST([INTL_MACOSX_LIBS])
51358 + m4_divert_text([DEFAULTS], [gt_needs=])
51359 + m4_define([gt_NEEDS_INIT], [])
51363 -dnl gt_CHECK_DECL(FUNC, INCLUDES)
51364 -dnl Check whether a function is declared.
51365 -AC_DEFUN([gt_CHECK_DECL],
51366 +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
51367 +AC_DEFUN([AM_GNU_GETTEXT_NEED],
51369 - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
51370 - [AC_TRY_COMPILE([$2], [
51372 - char *p = (char *) $1;
51374 -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
51375 - if test $ac_cv_have_decl_$1 = yes; then
51380 - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
51381 - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
51382 + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
51386 diff -urN BUILD/abook-0.6.0pre2/m4/glibc21.m4 abook/m4/glibc21.m4
51387 --- BUILD/abook-0.6.0pre2/m4/glibc21.m4 2005-09-17 12:10:26.000000000 +0200
51388 +++ abook/m4/glibc21.m4 2013-03-13 15:07:45.000000000 +0100
51390 -# glibc21.m4 serial 3
51391 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
51392 +# glibc21.m4 serial 4
51393 +dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
51394 dnl This file is free software; the Free Software Foundation
51395 dnl gives unlimited permission to copy and/or distribute it,
51396 dnl with or without modifications, as long as this notice is preserved.
51399 AC_DEFUN([gl_GLIBC21],
51401 - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
51402 - ac_cv_gnu_library_2_1,
51403 + AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
51404 + [ac_cv_gnu_library_2_1],
51405 [AC_EGREP_CPP([Lucky GNU user],
51408 #include <features.h>
51409 #ifdef __GNU_LIBRARY__
51410 #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
51415 - ac_cv_gnu_library_2_1=yes,
51416 - ac_cv_gnu_library_2_1=no)
51418 + [ac_cv_gnu_library_2_1=yes],
51419 + [ac_cv_gnu_library_2_1=no])
51422 - AC_SUBST(GLIBC21)
51423 + AC_SUBST([GLIBC21])
51424 GLIBC21="$ac_cv_gnu_library_2_1"
51427 diff -urN BUILD/abook-0.6.0pre2/m4/glibc2.m4 abook/m4/glibc2.m4
51428 --- BUILD/abook-0.6.0pre2/m4/glibc2.m4 2005-09-17 12:10:26.000000000 +0200
51429 +++ abook/m4/glibc2.m4 2013-03-13 15:07:45.000000000 +0100
51431 -# glibc2.m4 serial 1
51432 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
51433 +# glibc2.m4 serial 2
51434 +dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
51435 dnl This file is free software; the Free Software Foundation
51436 dnl gives unlimited permission to copy and/or distribute it,
51437 dnl with or without modifications, as long as this notice is preserved.
51440 AC_DEFUN([gt_GLIBC2],
51442 - AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
51443 - ac_cv_gnu_library_2,
51444 + AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
51445 + [ac_cv_gnu_library_2],
51446 [AC_EGREP_CPP([Lucky GNU user],
51449 #include <features.h>
51450 #ifdef __GNU_LIBRARY__
51451 #if (__GLIBC__ >= 2)
51456 - ac_cv_gnu_library_2=yes,
51457 - ac_cv_gnu_library_2=no)
51459 + [ac_cv_gnu_library_2=yes],
51460 + [ac_cv_gnu_library_2=no])
51464 + AC_SUBST([GLIBC2])
51465 GLIBC2="$ac_cv_gnu_library_2"
51468 diff -urN BUILD/abook-0.6.0pre2/m4/iconv.m4 abook/m4/iconv.m4
51469 --- BUILD/abook-0.6.0pre2/m4/iconv.m4 2005-09-17 12:10:26.000000000 +0200
51470 +++ abook/m4/iconv.m4 2013-03-13 15:07:45.000000000 +0100
51472 -# iconv.m4 serial AM4 (gettext-0.11.3)
51473 -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
51474 +# iconv.m4 serial 11 (gettext-0.18.1)
51475 +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
51476 dnl This file is free software; the Free Software Foundation
51477 dnl gives unlimited permission to copy and/or distribute it,
51478 dnl with or without modifications, as long as this notice is preserved.
51481 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
51482 dnl those with the standalone portable GNU libiconv installed).
51483 + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
51485 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
51488 am_save_CPPFLAGS="$CPPFLAGS"
51489 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
51491 - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
51492 + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
51493 am_cv_func_iconv="no, consider installing GNU libiconv"
51495 AC_TRY_LINK([#include <stdlib.h>
51497 [iconv_t cd = iconv_open("","");
51498 iconv(cd,NULL,NULL,NULL,NULL);
51500 - am_cv_func_iconv=yes)
51501 + [am_cv_func_iconv=yes])
51502 if test "$am_cv_func_iconv" != yes; then
51503 am_save_LIBS="$LIBS"
51504 LIBS="$LIBS $LIBICONV"
51505 @@ -50,13 +51,110 @@
51506 [iconv_t cd = iconv_open("","");
51507 iconv(cd,NULL,NULL,NULL,NULL);
51509 - am_cv_lib_iconv=yes
51510 - am_cv_func_iconv=yes)
51511 + [am_cv_lib_iconv=yes]
51512 + [am_cv_func_iconv=yes])
51513 LIBS="$am_save_LIBS"
51516 if test "$am_cv_func_iconv" = yes; then
51517 - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
51518 + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
51519 + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
51520 + am_save_LIBS="$LIBS"
51521 + if test $am_cv_lib_iconv = yes; then
51522 + LIBS="$LIBS $LIBICONV"
51525 +#include <iconv.h>
51526 +#include <string.h>
51529 + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
51532 + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
51533 + if (cd_utf8_to_88591 != (iconv_t)(-1))
51535 + static const char input[] = "\342\202\254"; /* EURO SIGN */
51537 + const char *inptr = input;
51538 + size_t inbytesleft = strlen (input);
51539 + char *outptr = buf;
51540 + size_t outbytesleft = sizeof (buf);
51541 + size_t res = iconv (cd_utf8_to_88591,
51542 + (char **) &inptr, &inbytesleft,
51543 + &outptr, &outbytesleft);
51548 + /* Test against Solaris 10 bug: Failures are not distinguishable from
51549 + successful returns. */
51551 + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
51552 + if (cd_ascii_to_88591 != (iconv_t)(-1))
51554 + static const char input[] = "\263";
51556 + const char *inptr = input;
51557 + size_t inbytesleft = strlen (input);
51558 + char *outptr = buf;
51559 + size_t outbytesleft = sizeof (buf);
51560 + size_t res = iconv (cd_ascii_to_88591,
51561 + (char **) &inptr, &inbytesleft,
51562 + &outptr, &outbytesleft);
51567 +#if 0 /* This bug could be worked around by the caller. */
51568 + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
51570 + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
51571 + if (cd_88591_to_utf8 != (iconv_t)(-1))
51573 + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
51575 + const char *inptr = input;
51576 + size_t inbytesleft = strlen (input);
51577 + char *outptr = buf;
51578 + size_t outbytesleft = sizeof (buf);
51579 + size_t res = iconv (cd_88591_to_utf8,
51580 + (char **) &inptr, &inbytesleft,
51581 + &outptr, &outbytesleft);
51582 + if ((int)res > 0)
51587 + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
51589 + if (/* Try standardized names. */
51590 + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
51591 + /* Try IRIX, OSF/1 names. */
51592 + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
51593 + /* Try AIX names. */
51594 + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
51595 + /* Try HP-UX names. */
51596 + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
51599 +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
51600 + [case "$host_os" in
51601 + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
51602 + *) am_cv_func_iconv_works="guessing yes" ;;
51604 + LIBS="$am_save_LIBS"
51606 + case "$am_cv_func_iconv_works" in
51607 + *no) am_func_iconv=no am_cv_lib_iconv=no ;;
51608 + *) am_func_iconv=yes ;;
51611 + am_func_iconv=no am_cv_lib_iconv=no
51613 + if test "$am_func_iconv" = yes; then
51614 + AC_DEFINE([HAVE_ICONV], [1],
51615 + [Define if you have the iconv() function and it works.])
51617 if test "$am_cv_lib_iconv" = yes; then
51618 AC_MSG_CHECKING([how to link with libiconv])
51619 @@ -68,16 +166,31 @@
51623 - AC_SUBST(LIBICONV)
51624 - AC_SUBST(LTLIBICONV)
51625 + AC_SUBST([LIBICONV])
51626 + AC_SUBST([LTLIBICONV])
51629 -AC_DEFUN([AM_ICONV],
51630 +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
51631 +dnl avoid warnings like
51632 +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
51633 +dnl This is tricky because of the way 'aclocal' is implemented:
51634 +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
51635 +dnl Otherwise aclocal's initial scan pass would miss the macro definition.
51636 +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
51637 +dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
51639 +m4_define([gl_iconv_AC_DEFUN],
51640 + m4_version_prereq([2.64],
51645 +gl_iconv_AC_DEFUN([AM_ICONV],
51648 if test "$am_cv_func_iconv" = yes; then
51649 AC_MSG_CHECKING([for iconv declaration])
51650 - AC_CACHE_VAL(am_cv_proto_iconv, [
51651 + AC_CACHE_VAL([am_cv_proto_iconv], [
51653 #include <stdlib.h>
51655 @@ -90,12 +203,12 @@
51659 -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
51660 +], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
51661 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);"])
51662 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
51663 - AC_MSG_RESULT([$]{ac_t:-
51664 - }[$]am_cv_proto_iconv)
51665 - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
51667 + $am_cv_proto_iconv])
51668 + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
51669 [Define as const if the declaration of iconv() needs const.])
51672 diff -urN BUILD/abook-0.6.0pre2/m4/intdiv0.m4 abook/m4/intdiv0.m4
51673 --- BUILD/abook-0.6.0pre2/m4/intdiv0.m4 2005-09-17 12:10:26.000000000 +0200
51674 +++ abook/m4/intdiv0.m4 2013-03-13 15:07:45.000000000 +0100
51676 -# intdiv0.m4 serial 1 (gettext-0.11.3)
51677 -dnl Copyright (C) 2002 Free Software Foundation, Inc.
51678 +# intdiv0.m4 serial 3 (gettext-0.18)
51679 +dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
51680 dnl This file is free software; the Free Software Foundation
51681 dnl gives unlimited permission to copy and/or distribute it,
51682 dnl with or without modifications, as long as this notice is preserved.
51683 @@ -14,16 +14,27 @@
51684 AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
51685 gt_cv_int_divbyzero_sigfpe,
51688 + gt_cv_int_divbyzero_sigfpe=
51690 + case "$host_os" in
51691 + macos* | darwin[6-9]* | darwin[1-9][0-9]*)
51692 + # On MacOS X 10.2 or newer, just assume the same as when cross-
51693 + # compiling. If we were to perform the real test, 1 Crash Report
51694 + # dialog window would pop up.
51695 + case "$host_cpu" in
51696 + i[34567]86 | x86_64)
51697 + gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
51701 +changequote([,])dnl
51702 + if test -z "$gt_cv_int_divbyzero_sigfpe"; then
51704 #include <stdlib.h>
51705 #include <signal.h>
51708 -#ifdef __cplusplus
51709 sigfpe_handler (int sig)
51711 -sigfpe_handler (sig) int sig;
51714 /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
51715 exit (sig != SIGFPE);
51716 @@ -50,21 +61,24 @@
51720 -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
51722 - # Guess based on the CPU.
51723 - case "$host_cpu" in
51724 - alpha* | i[34567]86 | m68k | s390*)
51725 - gt_cv_int_divbyzero_sigfpe="guessing yes";;
51727 - gt_cv_int_divbyzero_sigfpe="guessing no";;
51730 +], [gt_cv_int_divbyzero_sigfpe=yes], [gt_cv_int_divbyzero_sigfpe=no],
51732 + # Guess based on the CPU.
51734 + case "$host_cpu" in
51735 + alpha* | i[34567]86 | x86_64 | m68k | s390*)
51736 + gt_cv_int_divbyzero_sigfpe="guessing yes";;
51738 + gt_cv_int_divbyzero_sigfpe="guessing no";;
51740 +changequote([,])dnl
51744 case "$gt_cv_int_divbyzero_sigfpe" in
51748 - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
51749 + AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
51750 [Define if integer division by zero raises signal SIGFPE.])
51752 diff -urN BUILD/abook-0.6.0pre2/m4/intldir.m4 abook/m4/intldir.m4
51753 --- BUILD/abook-0.6.0pre2/m4/intldir.m4 1970-01-01 01:00:00.000000000 +0100
51754 +++ abook/m4/intldir.m4 2013-03-13 15:07:45.000000000 +0100
51756 +# intldir.m4 serial 2 (gettext-0.18)
51757 +dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
51758 +dnl This file is free software; the Free Software Foundation
51759 +dnl gives unlimited permission to copy and/or distribute it,
51760 +dnl with or without modifications, as long as this notice is preserved.
51762 +dnl This file can can be used in projects which are not available under
51763 +dnl the GNU General Public License or the GNU Library General Public
51764 +dnl License but which still want to provide support for the GNU gettext
51765 +dnl functionality.
51766 +dnl Please note that the actual code of the GNU gettext library is covered
51767 +dnl by the GNU Library General Public License, and the rest of the GNU
51768 +dnl gettext package package is covered by the GNU General Public License.
51769 +dnl They are *not* in the public domain.
51773 +dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
51774 +AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
51775 diff -urN BUILD/abook-0.6.0pre2/m4/intl.m4 abook/m4/intl.m4
51776 --- BUILD/abook-0.6.0pre2/m4/intl.m4 1970-01-01 01:00:00.000000000 +0100
51777 +++ abook/m4/intl.m4 2013-03-13 15:07:45.000000000 +0100
51779 +# intl.m4 serial 17 (gettext-0.18)
51780 +dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
51781 +dnl This file is free software; the Free Software Foundation
51782 +dnl gives unlimited permission to copy and/or distribute it,
51783 +dnl with or without modifications, as long as this notice is preserved.
51785 +dnl This file can can be used in projects which are not available under
51786 +dnl the GNU General Public License or the GNU Library General Public
51787 +dnl License but which still want to provide support for the GNU gettext
51788 +dnl functionality.
51789 +dnl Please note that the actual code of the GNU gettext library is covered
51790 +dnl by the GNU Library General Public License, and the rest of the GNU
51791 +dnl gettext package package is covered by the GNU General Public License.
51792 +dnl They are *not* in the public domain.
51795 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
51796 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009.
51800 +dnl Checks for all prerequisites of the intl subdirectory,
51801 +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
51802 +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
51803 +AC_DEFUN([AM_INTL_SUBDIR],
51805 + AC_REQUIRE([AC_PROG_INSTALL])dnl
51806 + AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
51807 + AC_REQUIRE([AC_PROG_CC])dnl
51808 + AC_REQUIRE([AC_CANONICAL_HOST])dnl
51809 + AC_REQUIRE([gt_GLIBC2])dnl
51810 + AC_REQUIRE([AC_PROG_RANLIB])dnl
51811 + AC_REQUIRE([gl_VISIBILITY])dnl
51812 + AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
51813 + AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
51814 + AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
51815 + AC_REQUIRE([gt_TYPE_WINT_T])dnl
51816 + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
51817 + AC_REQUIRE([gt_TYPE_INTMAX_T])
51818 + AC_REQUIRE([gt_PRINTF_POSIX])
51819 + AC_REQUIRE([gl_GLIBC21])dnl
51820 + AC_REQUIRE([gl_XSIZE])dnl
51821 + AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
51822 + AC_REQUIRE([gt_INTL_MACOSX])dnl
51824 + dnl Support for automake's --enable-silent-rules.
51825 + case "$enable_silent_rules" in
51826 + yes) INTL_DEFAULT_VERBOSITY=0;;
51827 + no) INTL_DEFAULT_VERBOSITY=1;;
51828 + *) INTL_DEFAULT_VERBOSITY=1;;
51830 + AC_SUBST([INTL_DEFAULT_VERBOSITY])
51832 + AC_CHECK_TYPE([ptrdiff_t], ,
51833 + [AC_DEFINE([ptrdiff_t], [long],
51834 + [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
51836 + AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
51837 + AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
51838 + snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
51840 + dnl Use the _snprintf function only if it is declared (because on NetBSD it
51841 + dnl is defined as a weak alias of snprintf; we prefer to use the latter).
51842 + gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
51843 + gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
51845 + dnl Use the *_unlocked functions only if they are declared.
51846 + dnl (because some of them were defined without being declared in Solaris
51847 + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
51848 + dnl on Solaris 2.5.1 to run on Solaris 2.6).
51849 + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
51850 + gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
51852 + case $gt_cv_func_printf_posix in
51853 + *yes) HAVE_POSIX_PRINTF=1 ;;
51854 + *) HAVE_POSIX_PRINTF=0 ;;
51856 + AC_SUBST([HAVE_POSIX_PRINTF])
51857 + if test "$ac_cv_func_asprintf" = yes; then
51862 + AC_SUBST([HAVE_ASPRINTF])
51863 + if test "$ac_cv_func_snprintf" = yes; then
51868 + AC_SUBST([HAVE_SNPRINTF])
51869 + if test "$ac_cv_func_newlocale" = yes; then
51874 + AC_SUBST([HAVE_NEWLOCALE])
51875 + if test "$ac_cv_func_wprintf" = yes; then
51880 + AC_SUBST([HAVE_WPRINTF])
51882 + AM_LANGINFO_CODESET
51885 + dnl Compilation on mingw and Cygwin needs special Makefile rules, because
51886 + dnl 1. when we install a shared library, we must arrange to export
51887 + dnl auxiliary pointer variables for every exported variable,
51888 + dnl 2. when we install a shared library and a static library simultaneously,
51889 + dnl the include file specifies __declspec(dllimport) and therefore we
51890 + dnl must arrange to define the auxiliary pointer variables for the
51891 + dnl exported variables _also_ in the static library.
51892 + if test "$enable_shared" = yes; then
51893 + case "$host_os" in
51894 + mingw* | cygwin*) is_woe32dll=yes ;;
51895 + *) is_woe32dll=no ;;
51900 + WOE32DLL=$is_woe32dll
51901 + AC_SUBST([WOE32DLL])
51903 + dnl On mingw and Cygwin, we can activate special Makefile rules which add
51904 + dnl version information to the shared libraries and executables.
51905 + case "$host_os" in
51906 + mingw* | cygwin*) is_woe32=yes ;;
51907 + *) is_woe32=no ;;
51910 + AC_SUBST([WOE32])
51911 + if test $WOE32 = yes; then
51912 + dnl Check for a program that compiles Windows resource files.
51913 + AC_CHECK_TOOL([WINDRES], [windres])
51916 + dnl Determine whether when creating a library, "-lc" should be passed to
51917 + dnl libtool or not. On many platforms, it is required for the libtool option
51918 + dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
51919 + dnl in the *.la files - makes it impossible to create multithreaded programs,
51920 + dnl because libtool also reorders the -lc to come before the -pthread, and
51921 + dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
51922 + case "$host_os" in
51923 + hpux*) LTLIBC="" ;;
51924 + *) LTLIBC="-lc" ;;
51926 + AC_SUBST([LTLIBC])
51928 + dnl Rename some macros and functions used for locking.
51930 +#define __libc_lock_t gl_lock_t
51931 +#define __libc_lock_define gl_lock_define
51932 +#define __libc_lock_define_initialized gl_lock_define_initialized
51933 +#define __libc_lock_init gl_lock_init
51934 +#define __libc_lock_lock gl_lock_lock
51935 +#define __libc_lock_unlock gl_lock_unlock
51936 +#define __libc_lock_recursive_t gl_recursive_lock_t
51937 +#define __libc_lock_define_recursive gl_recursive_lock_define
51938 +#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
51939 +#define __libc_lock_init_recursive gl_recursive_lock_init
51940 +#define __libc_lock_lock_recursive gl_recursive_lock_lock
51941 +#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
51942 +#define glthread_in_use libintl_thread_in_use
51943 +#define glthread_lock_init_func libintl_lock_init_func
51944 +#define glthread_lock_lock_func libintl_lock_lock_func
51945 +#define glthread_lock_unlock_func libintl_lock_unlock_func
51946 +#define glthread_lock_destroy_func libintl_lock_destroy_func
51947 +#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded
51948 +#define glthread_rwlock_init_func libintl_rwlock_init_func
51949 +#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded
51950 +#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func
51951 +#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded
51952 +#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func
51953 +#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded
51954 +#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func
51955 +#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded
51956 +#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func
51957 +#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded
51958 +#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func
51959 +#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded
51960 +#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func
51961 +#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded
51962 +#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func
51963 +#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded
51964 +#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func
51965 +#define glthread_once_func libintl_once_func
51966 +#define glthread_once_singlethreaded libintl_once_singlethreaded
51967 +#define glthread_once_multithreaded libintl_once_multithreaded
51972 +dnl Checks for the core files of the intl subdirectory:
51979 +dnl hash-string.h hash-string.c
51981 +dnl libgnuintl.h.in (except the *printf stuff)
51986 +dnl plural-exp.h plural-exp.c
51988 +dnl Used by libglocale.
51989 +AC_DEFUN([gt_INTL_SUBDIR_CORE],
51991 + AC_REQUIRE([AC_C_INLINE])dnl
51992 + AC_REQUIRE([AC_TYPE_SIZE_T])dnl
51993 + AC_REQUIRE([gl_AC_HEADER_STDINT_H])
51994 + AC_REQUIRE([AC_FUNC_ALLOCA])dnl
51995 + AC_REQUIRE([AC_FUNC_MMAP])dnl
51996 + AC_REQUIRE([gt_INTDIV0])dnl
51997 + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
51998 + AC_REQUIRE([gt_INTTYPES_PRI])dnl
51999 + AC_REQUIRE([gl_LOCK])dnl
52002 + [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
52004 + [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
52005 + [Define to 1 if the compiler understands __builtin_expect.])])
52007 + AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
52008 + AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
52009 + stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
52010 + argz_stringify argz_next __fsetlocking])
52012 + dnl Use the *_unlocked functions only if they are declared.
52013 + dnl (because some of them were defined without being declared in Solaris
52014 + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
52015 + dnl on Solaris 2.5.1 to run on Solaris 2.6).
52016 + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
52017 + gt_CHECK_DECL([feof_unlocked], [#include <stdio.h>])
52018 + gt_CHECK_DECL([fgets_unlocked], [#include <stdio.h>])
52022 + dnl intl/plural.c is generated from intl/plural.y. It requires bison,
52023 + dnl because plural.y uses bison specific features. It requires at least
52024 + dnl bison-1.26 because earlier versions generate a plural.c that doesn't
52026 + dnl bison is only needed for the maintainer (who touches plural.y). But in
52027 + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
52028 + dnl the rule in general Makefile. Now, some people carelessly touch the
52029 + dnl files or have a broken "make" program, hence the plural.c rule will
52030 + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
52031 + dnl present or too old.
52032 + AC_CHECK_PROGS([INTLBISON], [bison])
52033 + if test -z "$INTLBISON"; then
52036 + dnl Found it, now check the version.
52037 + AC_MSG_CHECKING([version of bison])
52038 +changequote(<<,>>)dnl
52039 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
52040 + case $ac_prog_version in
52041 + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
52042 + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
52043 +changequote([,])dnl
52044 + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
52045 + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
52047 + AC_MSG_RESULT([$ac_prog_version])
52049 + if test $ac_verc_fail = yes; then
52055 +dnl gt_CHECK_DECL(FUNC, INCLUDES)
52056 +dnl Check whether a function is declared.
52057 +AC_DEFUN([gt_CHECK_DECL],
52059 + AC_CACHE_CHECK([whether $1 is declared], [ac_cv_have_decl_$1],
52060 + [AC_TRY_COMPILE([$2], [
52062 + char *p = (char *) $1;
52064 +], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
52065 + if test $ac_cv_have_decl_$1 = yes; then
52070 + AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
52071 + [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
52073 diff -urN BUILD/abook-0.6.0pre2/m4/intlmacosx.m4 abook/m4/intlmacosx.m4
52074 --- BUILD/abook-0.6.0pre2/m4/intlmacosx.m4 1970-01-01 01:00:00.000000000 +0100
52075 +++ abook/m4/intlmacosx.m4 2013-03-13 15:07:45.000000000 +0100
52077 +# intlmacosx.m4 serial 3 (gettext-0.18)
52078 +dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
52079 +dnl This file is free software; the Free Software Foundation
52080 +dnl gives unlimited permission to copy and/or distribute it,
52081 +dnl with or without modifications, as long as this notice is preserved.
52083 +dnl This file can can be used in projects which are not available under
52084 +dnl the GNU General Public License or the GNU Library General Public
52085 +dnl License but which still want to provide support for the GNU gettext
52086 +dnl functionality.
52087 +dnl Please note that the actual code of the GNU gettext library is covered
52088 +dnl by the GNU Library General Public License, and the rest of the GNU
52089 +dnl gettext package package is covered by the GNU General Public License.
52090 +dnl They are *not* in the public domain.
52092 +dnl Checks for special options needed on MacOS X.
52093 +dnl Defines INTL_MACOSX_LIBS.
52094 +AC_DEFUN([gt_INTL_MACOSX],
52096 + dnl Check for API introduced in MacOS X 10.2.
52097 + AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
52098 + [gt_cv_func_CFPreferencesCopyAppValue],
52099 + [gt_save_LIBS="$LIBS"
52100 + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
52101 + AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
52102 + [CFPreferencesCopyAppValue(NULL, NULL)],
52103 + [gt_cv_func_CFPreferencesCopyAppValue=yes],
52104 + [gt_cv_func_CFPreferencesCopyAppValue=no])
52105 + LIBS="$gt_save_LIBS"])
52106 + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
52107 + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
52108 + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
52110 + dnl Check for API introduced in MacOS X 10.3.
52111 + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
52112 + [gt_save_LIBS="$LIBS"
52113 + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
52114 + AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
52115 + [gt_cv_func_CFLocaleCopyCurrent=yes],
52116 + [gt_cv_func_CFLocaleCopyCurrent=no])
52117 + LIBS="$gt_save_LIBS"])
52118 + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
52119 + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
52120 + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
52122 + INTL_MACOSX_LIBS=
52123 + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
52124 + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
52126 + AC_SUBST([INTL_MACOSX_LIBS])
52128 diff -urN BUILD/abook-0.6.0pre2/m4/intmax.m4 abook/m4/intmax.m4
52129 --- BUILD/abook-0.6.0pre2/m4/intmax.m4 2005-09-17 12:10:26.000000000 +0200
52130 +++ abook/m4/intmax.m4 2013-03-13 15:07:45.000000000 +0100
52132 -# intmax.m4 serial 2 (gettext-0.14.2)
52133 -dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
52134 +# intmax.m4 serial 5 (gettext-0.18)
52135 +dnl Copyright (C) 2002-2005, 2008-2010 Free Software Foundation, Inc.
52136 dnl This file is free software; the Free Software Foundation
52137 dnl gives unlimited permission to copy and/or distribute it,
52138 dnl with or without modifications, as long as this notice is preserved.
52141 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
52142 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
52143 - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
52144 + AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
52146 #include <stddef.h>
52147 #include <stdlib.h>
52149 #if HAVE_INTTYPES_H_WITH_UINTMAX
52150 #include <inttypes.h>
52152 -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
52153 +], [intmax_t x = -1;
52155 + [gt_cv_c_intmax_t=yes],
52156 + [gt_cv_c_intmax_t=no])])
52157 if test $gt_cv_c_intmax_t = yes; then
52158 - AC_DEFINE(HAVE_INTMAX_T, 1,
52159 + AC_DEFINE([HAVE_INTMAX_T], [1],
52160 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
52163 diff -urN BUILD/abook-0.6.0pre2/m4/inttypes_h.m4 abook/m4/inttypes_h.m4
52164 --- BUILD/abook-0.6.0pre2/m4/inttypes_h.m4 2005-09-17 12:10:26.000000000 +0200
52165 +++ abook/m4/inttypes_h.m4 2013-03-13 15:07:45.000000000 +0100
52167 -# inttypes_h.m4 serial 6
52168 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
52169 +# inttypes_h.m4 serial 9
52170 +dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
52171 dnl This file is free software; the Free Software Foundation
52172 dnl gives unlimited permission to copy and/or distribute it,
52173 dnl with or without modifications, as long as this notice is preserved.
52174 @@ -11,15 +11,15 @@
52176 AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
52178 - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
52179 + AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
52181 [#include <sys/types.h>
52182 #include <inttypes.h>],
52183 - [uintmax_t i = (uintmax_t) -1;],
52184 - gl_cv_header_inttypes_h=yes,
52185 - gl_cv_header_inttypes_h=no)])
52186 + [uintmax_t i = (uintmax_t) -1; return !i;],
52187 + [gl_cv_header_inttypes_h=yes],
52188 + [gl_cv_header_inttypes_h=no])])
52189 if test $gl_cv_header_inttypes_h = yes; then
52190 - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
52191 + AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
52192 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
52193 and declares uintmax_t. ])
52195 diff -urN BUILD/abook-0.6.0pre2/m4/inttypes.m4 abook/m4/inttypes.m4
52196 --- BUILD/abook-0.6.0pre2/m4/inttypes.m4 2005-09-17 12:10:26.000000000 +0200
52197 +++ abook/m4/inttypes.m4 1970-01-01 01:00:00.000000000 +0100
52199 -# inttypes.m4 serial 1 (gettext-0.11.4)
52200 -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
52201 -dnl This file is free software; the Free Software Foundation
52202 -dnl gives unlimited permission to copy and/or distribute it,
52203 -dnl with or without modifications, as long as this notice is preserved.
52205 -dnl From Paul Eggert.
52207 -# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
52210 -AC_DEFUN([gt_HEADER_INTTYPES_H],
52212 - AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
52215 - [#include <sys/types.h>
52216 -#include <inttypes.h>],
52217 - [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
52219 - if test $gt_cv_header_inttypes_h = yes; then
52220 - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
52221 - [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
52224 diff -urN BUILD/abook-0.6.0pre2/m4/inttypes-pri.m4 abook/m4/inttypes-pri.m4
52225 --- BUILD/abook-0.6.0pre2/m4/inttypes-pri.m4 2005-09-17 12:10:26.000000000 +0200
52226 +++ abook/m4/inttypes-pri.m4 2013-03-13 15:07:45.000000000 +0100
52228 -# inttypes-pri.m4 serial 1 (gettext-0.11.4)
52229 -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
52230 +# inttypes-pri.m4 serial 6 (gettext-0.18)
52231 +dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc.
52232 dnl This file is free software; the Free Software Foundation
52233 dnl gives unlimited permission to copy and/or distribute it,
52234 dnl with or without modifications, as long as this notice is preserved.
52236 dnl From Bruno Haible.
52240 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
52241 # macros to non-string values. This is the case on AIX 4.3.3.
52243 AC_DEFUN([gt_INTTYPES_PRI],
52245 - AC_REQUIRE([gt_HEADER_INTTYPES_H])
52246 - if test $gt_cv_header_inttypes_h = yes; then
52247 + AC_CHECK_HEADERS([inttypes.h])
52248 + if test $ac_cv_header_inttypes_h = yes; then
52249 AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
52250 - gt_cv_inttypes_pri_broken,
52251 + [gt_cv_inttypes_pri_broken],
52253 AC_TRY_COMPILE([#include <inttypes.h>
52257 -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
52258 +], [], [gt_cv_inttypes_pri_broken=no], [gt_cv_inttypes_pri_broken=yes])
52261 if test "$gt_cv_inttypes_pri_broken" = yes; then
52262 - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
52263 + AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
52264 [Define if <inttypes.h> exists and defines unusable PRI* macros.])
52265 + PRI_MACROS_BROKEN=1
52267 + PRI_MACROS_BROKEN=0
52269 + AC_SUBST([PRI_MACROS_BROKEN])
52271 diff -urN BUILD/abook-0.6.0pre2/m4/lcmessage.m4 abook/m4/lcmessage.m4
52272 --- BUILD/abook-0.6.0pre2/m4/lcmessage.m4 2005-09-17 12:10:26.000000000 +0200
52273 +++ abook/m4/lcmessage.m4 2013-03-13 15:07:45.000000000 +0100
52275 -# lcmessage.m4 serial 4 (gettext-0.14.2)
52276 -dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
52277 +# lcmessage.m4 serial 6 (gettext-0.18)
52278 +dnl Copyright (C) 1995-2002, 2004-2005, 2008-2010 Free Software Foundation,
52280 dnl This file is free software; the Free Software Foundation
52281 dnl gives unlimited permission to copy and/or distribute it,
52282 dnl with or without modifications, as long as this notice is preserved.
52283 @@ -20,11 +21,11 @@
52285 AC_DEFUN([gt_LC_MESSAGES],
52287 - AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
52288 + AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
52289 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
52290 - gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
52291 + [gt_cv_val_LC_MESSAGES=yes], [gt_cv_val_LC_MESSAGES=no])])
52292 if test $gt_cv_val_LC_MESSAGES = yes; then
52293 - AC_DEFINE(HAVE_LC_MESSAGES, 1,
52294 + AC_DEFINE([HAVE_LC_MESSAGES], [1],
52295 [Define if your <locale.h> file defines LC_MESSAGES.])
52298 diff -urN BUILD/abook-0.6.0pre2/m4/lib-ld.m4 abook/m4/lib-ld.m4
52299 --- BUILD/abook-0.6.0pre2/m4/lib-ld.m4 2005-09-17 12:10:26.000000000 +0200
52300 +++ abook/m4/lib-ld.m4 2013-03-13 15:07:45.000000000 +0100
52302 -# lib-ld.m4 serial 3 (gettext-0.13)
52303 -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
52304 +# lib-ld.m4 serial 4 (gettext-0.18)
52305 +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
52306 dnl This file is free software; the Free Software Foundation
52307 dnl gives unlimited permission to copy and/or distribute it,
52308 dnl with or without modifications, as long as this notice is preserved.
52311 dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
52312 AC_DEFUN([AC_LIB_PROG_LD_GNU],
52313 -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
52314 +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
52315 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
52316 case `$LD -v 2>&1 </dev/null` in
52317 *GNU* | *'with BFD'*)
52320 dnl From libtool-1.4. Sets the variable LD.
52321 AC_DEFUN([AC_LIB_PROG_LD],
52322 -[AC_ARG_WITH(gnu-ld,
52323 +[AC_ARG_WITH([gnu-ld],
52324 [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
52325 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
52326 AC_REQUIRE([AC_PROG_CC])dnl
52328 # Canonicalize the path of ld
52329 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
52330 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
52331 - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
52332 + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
52334 test -z "$LD" && LD="$ac_prog"
52338 AC_MSG_CHECKING([for non-GNU ld])
52340 -AC_CACHE_VAL(acl_cv_path_LD,
52341 +AC_CACHE_VAL([acl_cv_path_LD],
52342 [if test -z "$LD"; then
52343 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
52344 for ac_dir in $PATH; do
52346 # Break only if it was the GNU/non-GNU ld that we prefer.
52347 case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
52348 *GNU* | *'with BFD'*)
52349 - test "$with_gnu_ld" != no && break ;;
52350 + test "$with_gnu_ld" != no && break ;;
52352 - test "$with_gnu_ld" != yes && break ;;
52353 + test "$with_gnu_ld" != yes && break ;;
52357 @@ -101,9 +101,9 @@
52359 LD="$acl_cv_path_LD"
52360 if test -n "$LD"; then
52361 - AC_MSG_RESULT($LD)
52362 + AC_MSG_RESULT([$LD])
52364 - AC_MSG_RESULT(no)
52365 + AC_MSG_RESULT([no])
52367 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
52369 diff -urN BUILD/abook-0.6.0pre2/m4/lib-link.m4 abook/m4/lib-link.m4
52370 --- BUILD/abook-0.6.0pre2/m4/lib-link.m4 2005-09-17 12:10:26.000000000 +0200
52371 +++ abook/m4/lib-link.m4 2013-03-13 15:07:45.000000000 +0100
52373 -# lib-link.m4 serial 6 (gettext-0.14.3)
52374 -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
52375 +# lib-link.m4 serial 21 (gettext-0.18)
52376 +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
52377 dnl This file is free software; the Free Software Foundation
52378 dnl gives unlimited permission to copy and/or distribute it,
52379 dnl with or without modifications, as long as this notice is preserved.
52381 dnl From Bruno Haible.
52386 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
52387 dnl the libraries corresponding to explicit and implicit dependencies.
52388 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
52389 dnl augments the CPPFLAGS variable.
52390 +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
52391 +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
52392 AC_DEFUN([AC_LIB_LINKFLAGS],
52394 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
52395 AC_REQUIRE([AC_LIB_RPATH])
52396 - define([Name],[translit([$1],[./-], [___])])
52397 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52398 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52399 + pushdef([Name],[translit([$1],[./-], [___])])
52400 + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52401 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52402 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
52403 AC_LIB_LINKFLAGS_BODY([$1], [$2])
52404 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
52405 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
52406 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
52407 + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
52409 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
52410 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
52411 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
52412 + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
52413 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
52414 AC_SUBST([LIB]NAME)
52415 AC_SUBST([LTLIB]NAME)
52416 + AC_SUBST([LIB]NAME[_PREFIX])
52417 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
52418 dnl results of this search when this library appears as a dependency.
52426 -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
52427 +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
52428 dnl searches for libname and the libraries corresponding to explicit and
52429 dnl implicit dependencies, together with the specified include files and
52430 -dnl the ability to compile and link the specified testcode. If found, it
52431 -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
52432 -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
52433 +dnl the ability to compile and link the specified testcode. The missing-message
52434 +dnl defaults to 'no' and may contain additional hints for the user.
52435 +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
52436 +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
52437 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
52438 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
52439 +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
52440 +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
52441 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
52443 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
52444 AC_REQUIRE([AC_LIB_RPATH])
52445 - define([Name],[translit([$1],[./-], [___])])
52446 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52447 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52448 + pushdef([Name],[translit([$1],[./-], [___])])
52449 + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52450 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52452 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
52454 @@ -66,13 +74,25 @@
52456 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
52457 ac_save_LIBS="$LIBS"
52458 - LIBS="$LIBS $LIB[]NAME"
52459 - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
52460 + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
52461 + dnl because these -l options might require -L options that are present in
52462 + dnl LIBS. -l options benefit only from the -L options listed before it.
52463 + dnl Otherwise, add it to the front of LIBS, because it may be a static
52464 + dnl library that depends on another static library that is present in LIBS.
52465 + dnl Static libraries benefit only from the static libraries listed after
52467 + case " $LIB[]NAME" in
52468 + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
52469 + *) LIBS="$LIB[]NAME $LIBS" ;;
52471 + AC_TRY_LINK([$3], [$4],
52472 + [ac_cv_lib[]Name=yes],
52473 + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
52474 LIBS="$ac_save_LIBS"
52476 if test "$ac_cv_lib[]Name" = yes; then
52478 - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
52479 + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
52480 AC_MSG_CHECKING([how to link with lib[]$1])
52481 AC_MSG_RESULT([$LIB[]NAME])
52483 @@ -82,17 +102,23 @@
52484 CPPFLAGS="$ac_save_CPPFLAGS"
52487 + LIB[]NAME[]_PREFIX=
52489 AC_SUBST([HAVE_LIB]NAME)
52490 AC_SUBST([LIB]NAME)
52491 AC_SUBST([LTLIB]NAME)
52494 + AC_SUBST([LIB]NAME[_PREFIX])
52499 dnl Determine the platform dependent parameters needed to use rpath:
52500 -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
52501 -dnl hardcode_direct, hardcode_minus_L.
52504 +dnl acl_hardcode_libdir_flag_spec,
52505 +dnl acl_hardcode_libdir_separator,
52506 +dnl acl_hardcode_direct,
52507 +dnl acl_hardcode_minus_L.
52508 AC_DEFUN([AC_LIB_RPATH],
52510 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
52511 @@ -101,7 +127,7 @@
52512 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
52513 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
52514 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
52515 - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
52516 + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
52517 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
52518 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
52520 @@ -109,34 +135,66 @@
52524 - libext="$acl_cv_libext"
52525 - shlibext="$acl_cv_shlibext"
52526 - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
52527 - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
52528 - hardcode_direct="$acl_cv_hardcode_direct"
52529 - hardcode_minus_L="$acl_cv_hardcode_minus_L"
52530 + acl_libext="$acl_cv_libext"
52531 + acl_shlibext="$acl_cv_shlibext"
52532 + acl_libname_spec="$acl_cv_libname_spec"
52533 + acl_library_names_spec="$acl_cv_library_names_spec"
52534 + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
52535 + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
52536 + acl_hardcode_direct="$acl_cv_hardcode_direct"
52537 + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
52538 dnl Determine whether the user wants rpath handling at all.
52539 - AC_ARG_ENABLE(rpath,
52540 + AC_ARG_ENABLE([rpath],
52541 [ --disable-rpath do not hardcode runtime library paths],
52542 :, enable_rpath=yes)
52545 +dnl AC_LIB_FROMPACKAGE(name, package)
52546 +dnl declares that libname comes from the given package. The configure file
52547 +dnl will then not have a --with-libname-prefix option but a
52548 +dnl --with-package-prefix option. Several libraries can come from the same
52549 +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
52550 +dnl macro call that searches for libname.
52551 +AC_DEFUN([AC_LIB_FROMPACKAGE],
52553 + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52554 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52555 + define([acl_frompackage_]NAME, [$2])
52557 + pushdef([PACK],[$2])
52558 + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
52559 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52560 + define([acl_libsinpackage_]PACKUP,
52561 + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
52566 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
52567 dnl the libraries corresponding to explicit and implicit dependencies.
52568 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
52569 +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
52570 +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
52571 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
52573 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52574 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52575 + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
52576 + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
52577 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52578 + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
52579 + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
52580 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
52581 + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
52582 + dnl Autoconf >= 2.61 supports dots in --with options.
52583 + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
52584 dnl By default, look in $includedir and $libdir.
52586 AC_LIB_WITH_FINAL_PREFIX([
52587 eval additional_includedir=\"$includedir\"
52588 eval additional_libdir=\"$libdir\"
52590 - AC_LIB_ARG_WITH([lib$1-prefix],
52591 -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
52592 - --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
52593 + AC_ARG_WITH(P_A_C_K[-prefix],
52594 +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
52595 + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
52597 if test "X$withval" = "Xno"; then
52599 @@ -148,7 +206,11 @@
52602 additional_includedir="$withval/include"
52603 - additional_libdir="$withval/lib"
52604 + additional_libdir="$withval/$acl_libdirstem"
52605 + if test "$acl_libdirstem2" != "$acl_libdirstem" \
52606 + && ! test -d "$withval/$acl_libdirstem"; then
52607 + additional_libdir="$withval/$acl_libdirstem2"
52612 @@ -157,6 +219,10 @@
52616 + LIB[]NAME[]_PREFIX=
52617 + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
52618 + dnl computed. So it has to be reset here.
52622 names_already_handled=
52623 @@ -196,22 +262,55 @@
52627 + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
52628 + if test -n "$acl_shlibext"; then
52629 + shrext=".$acl_shlibext" # typically: shrext=.so
52633 if test $use_additional = yes; then
52634 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
52635 - found_dir="$additional_libdir"
52636 - found_so="$additional_libdir/lib$name.$shlibext"
52637 - if test -f "$additional_libdir/lib$name.la"; then
52638 - found_la="$additional_libdir/lib$name.la"
52641 - if test -f "$additional_libdir/lib$name.$libext"; then
52642 - found_dir="$additional_libdir"
52643 - found_a="$additional_libdir/lib$name.$libext"
52644 - if test -f "$additional_libdir/lib$name.la"; then
52645 - found_la="$additional_libdir/lib$name.la"
52646 + dir="$additional_libdir"
52647 + dnl The same code as in the loop below:
52648 + dnl First look for a shared library.
52649 + if test -n "$acl_shlibext"; then
52650 + if test -f "$dir/$libname$shrext"; then
52652 + found_so="$dir/$libname$shrext"
52654 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
52655 + ver=`(cd "$dir" && \
52656 + for f in "$libname$shrext".*; do echo "$f"; done \
52657 + | sed -e "s,^$libname$shrext\\\\.,," \
52658 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
52659 + | sed 1q ) 2>/dev/null`
52660 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
52662 + found_so="$dir/$libname$shrext.$ver"
52665 + eval library_names=\"$acl_library_names_spec\"
52666 + for f in $library_names; do
52667 + if test -f "$dir/$f"; then
52669 + found_so="$dir/$f"
52676 + dnl Then look for a static library.
52677 + if test "X$found_dir" = "X"; then
52678 + if test -f "$dir/$libname.$acl_libext"; then
52680 + found_a="$dir/$libname.$acl_libext"
52683 + if test "X$found_dir" != "X"; then
52684 + if test -f "$dir/$libname.la"; then
52685 + found_la="$dir/$libname.la"
52689 if test "X$found_dir" = "X"; then
52690 for x in $LDFLAGS $LTLIB[]NAME; do
52691 @@ -219,21 +318,46 @@
52694 dir=`echo "X$x" | sed -e 's/^X-L//'`
52695 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
52697 - found_so="$dir/lib$name.$shlibext"
52698 - if test -f "$dir/lib$name.la"; then
52699 - found_la="$dir/lib$name.la"
52702 - if test -f "$dir/lib$name.$libext"; then
52703 + dnl First look for a shared library.
52704 + if test -n "$acl_shlibext"; then
52705 + if test -f "$dir/$libname$shrext"; then
52707 - found_a="$dir/lib$name.$libext"
52708 - if test -f "$dir/lib$name.la"; then
52709 - found_la="$dir/lib$name.la"
52710 + found_so="$dir/$libname$shrext"
52712 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
52713 + ver=`(cd "$dir" && \
52714 + for f in "$libname$shrext".*; do echo "$f"; done \
52715 + | sed -e "s,^$libname$shrext\\\\.,," \
52716 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
52717 + | sed 1q ) 2>/dev/null`
52718 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
52720 + found_so="$dir/$libname$shrext.$ver"
52723 + eval library_names=\"$acl_library_names_spec\"
52724 + for f in $library_names; do
52725 + if test -f "$dir/$f"; then
52727 + found_so="$dir/$f"
52734 + dnl Then look for a static library.
52735 + if test "X$found_dir" = "X"; then
52736 + if test -f "$dir/$libname.$acl_libext"; then
52738 + found_a="$dir/$libname.$acl_libext"
52741 + if test "X$found_dir" != "X"; then
52742 + if test -f "$dir/$libname.la"; then
52743 + found_la="$dir/$libname.la"
52748 if test "X$found_dir" != "X"; then
52749 @@ -248,7 +372,9 @@
52750 dnl Linking with a shared library. We attempt to hardcode its
52751 dnl directory into the executable's runpath, unless it's the
52752 dnl standard /usr/lib.
52753 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
52754 + if test "$enable_rpath" = no \
52755 + || test "X$found_dir" = "X/usr/$acl_libdirstem" \
52756 + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
52757 dnl No hardcoding is needed.
52758 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
52760 @@ -267,12 +393,12 @@
52761 ltrpathdirs="$ltrpathdirs $found_dir"
52763 dnl The hardcoding into $LIBNAME is system dependent.
52764 - if test "$hardcode_direct" = yes; then
52765 + if test "$acl_hardcode_direct" = yes; then
52766 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
52767 dnl resulting binary.
52768 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
52770 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
52771 + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
52772 dnl Use an explicit option to hardcode DIR into the resulting
52774 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
52775 @@ -303,13 +429,13 @@
52776 if test -z "$haveit"; then
52777 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
52779 - if test "$hardcode_minus_L" != no; then
52780 + if test "$acl_hardcode_minus_L" != no; then
52781 dnl FIXME: Not sure whether we should use
52782 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
52784 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
52786 - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
52787 + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
52788 dnl here, because this doesn't fit in flags passed to the
52789 dnl compiler. So give up. No hardcoding. This affects only
52790 dnl very old systems.
52791 @@ -334,8 +460,18 @@
52792 dnl Assume the include files are nearby.
52793 additional_includedir=
52794 case "$found_dir" in
52796 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
52797 + */$acl_libdirstem | */$acl_libdirstem/)
52798 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
52799 + if test "$name" = '$1'; then
52800 + LIB[]NAME[]_PREFIX="$basedir"
52802 + additional_includedir="$basedir/include"
52804 + */$acl_libdirstem2 | */$acl_libdirstem2/)
52805 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
52806 + if test "$name" = '$1'; then
52807 + LIB[]NAME[]_PREFIX="$basedir"
52809 additional_includedir="$basedir/include"
52812 @@ -396,9 +532,11 @@
52813 dnl 3. if it's already present in $LDFLAGS or the already
52814 dnl constructed $LIBNAME,
52815 dnl 4. if it doesn't exist as a directory.
52816 - if test "X$additional_libdir" != "X/usr/lib"; then
52817 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
52818 + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
52820 - if test "X$additional_libdir" = "X/usr/local/lib"; then
52821 + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
52822 + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
52823 if test -n "$GCC"; then
52825 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
52826 @@ -497,18 +635,18 @@
52829 if test "X$rpathdirs" != "X"; then
52830 - if test -n "$hardcode_libdir_separator"; then
52831 + if test -n "$acl_hardcode_libdir_separator"; then
52832 dnl Weird platform: only the last -rpath option counts, the user must
52833 dnl pass all path elements in one option. We can arrange that for a
52834 dnl single library, but not when more than one $LIBNAMEs are used.
52836 for found_dir in $rpathdirs; do
52837 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
52838 + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
52840 - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
52841 + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
52842 acl_save_libdir="$libdir"
52844 - eval flag=\"$hardcode_libdir_flag_spec\"
52845 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
52846 libdir="$acl_save_libdir"
52847 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
52849 @@ -516,7 +654,7 @@
52850 for found_dir in $rpathdirs; do
52851 acl_save_libdir="$libdir"
52852 libdir="$found_dir"
52853 - eval flag=\"$hardcode_libdir_flag_spec\"
52854 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
52855 libdir="$acl_save_libdir"
52856 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
52858 @@ -529,6 +667,11 @@
52859 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
52862 + popdef([P_A_C_K])
52863 + popdef([PACKLIBS])
52869 dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
52870 @@ -551,3 +694,81 @@
52875 +dnl For those cases where a variable contains several -L and -l options
52876 +dnl referring to unknown libraries and directories, this macro determines the
52877 +dnl necessary additional linker options for the runtime path.
52878 +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
52879 +dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
52880 +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
52881 +dnl otherwise linking without libtool is assumed.
52882 +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
52884 + AC_REQUIRE([AC_LIB_RPATH])
52885 + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
52887 + if test "$enable_rpath" != no; then
52888 + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
52889 + dnl Use an explicit option to hardcode directories into the resulting
52893 + for opt in $2; do
52894 + if test -n "$next"; then
52896 + dnl No need to hardcode the standard /usr/lib.
52897 + if test "X$dir" != "X/usr/$acl_libdirstem" \
52898 + && test "X$dir" != "X/usr/$acl_libdirstem2"; then
52899 + rpathdirs="$rpathdirs $dir"
52905 + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
52906 + dnl No need to hardcode the standard /usr/lib.
52907 + if test "X$dir" != "X/usr/$acl_libdirstem" \
52908 + && test "X$dir" != "X/usr/$acl_libdirstem2"; then
52909 + rpathdirs="$rpathdirs $dir"
52916 + if test "X$rpathdirs" != "X"; then
52917 + if test -n ""$3""; then
52918 + dnl libtool is used for linking. Use -R options.
52919 + for dir in $rpathdirs; do
52920 + $1="${$1}${$1:+ }-R$dir"
52923 + dnl The linker is used for linking directly.
52924 + if test -n "$acl_hardcode_libdir_separator"; then
52925 + dnl Weird platform: only the last -rpath option counts, the user
52926 + dnl must pass all path elements in one option.
52928 + for dir in $rpathdirs; do
52929 + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
52931 + acl_save_libdir="$libdir"
52932 + libdir="$alldirs"
52933 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
52934 + libdir="$acl_save_libdir"
52937 + dnl The -rpath options are cumulative.
52938 + for dir in $rpathdirs; do
52939 + acl_save_libdir="$libdir"
52941 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
52942 + libdir="$acl_save_libdir"
52943 + $1="${$1}${$1:+ }$flag"
52952 diff -urN BUILD/abook-0.6.0pre2/m4/lib-prefix.m4 abook/m4/lib-prefix.m4
52953 --- BUILD/abook-0.6.0pre2/m4/lib-prefix.m4 2005-09-17 12:10:26.000000000 +0200
52954 +++ abook/m4/lib-prefix.m4 2013-03-13 15:07:45.000000000 +0100
52956 -# lib-prefix.m4 serial 4 (gettext-0.14.2)
52957 -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
52958 +# lib-prefix.m4 serial 7 (gettext-0.18)
52959 +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
52960 dnl This file is free software; the Free Software Foundation
52961 dnl gives unlimited permission to copy and/or distribute it,
52962 dnl with or without modifications, as long as this notice is preserved.
52964 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
52965 AC_REQUIRE([AC_PROG_CC])
52966 AC_REQUIRE([AC_CANONICAL_HOST])
52967 + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
52968 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
52969 dnl By default, look in $includedir and $libdir.
52974 additional_includedir="$withval/include"
52975 - additional_libdir="$withval/lib"
52976 + additional_libdir="$withval/$acl_libdirstem"
52981 dnl 2. if it's already present in $LDFLAGS,
52982 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
52983 dnl 4. if it doesn't exist as a directory.
52984 - if test "X$additional_libdir" != "X/usr/lib"; then
52985 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
52987 for x in $LDFLAGS; do
52988 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
52992 if test -z "$haveit"; then
52993 - if test "X$additional_libdir" = "X/usr/local/lib"; then
52994 + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
52995 if test -n "$GCC"; then
52997 linux*) haveit=yes;;
52998 @@ -151,3 +152,73 @@
52999 exec_prefix="$acl_save_exec_prefix"
53000 prefix="$acl_save_prefix"
53003 +dnl AC_LIB_PREPARE_MULTILIB creates
53004 +dnl - a variable acl_libdirstem, containing the basename of the libdir, either
53005 +dnl "lib" or "lib64" or "lib/64",
53006 +dnl - a variable acl_libdirstem2, as a secondary possible value for
53007 +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
53009 +AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
53011 + dnl There is no formal standard regarding lib and lib64.
53012 + dnl On glibc systems, the current practice is that on a system supporting
53013 + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
53014 + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
53015 + dnl the compiler's default mode by looking at the compiler's library search
53016 + dnl path. If at least one of its elements ends in /lib64 or points to a
53017 + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
53018 + dnl Otherwise we use the default, namely "lib".
53019 + dnl On Solaris systems, the current practice is that on a system supporting
53020 + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
53021 + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
53022 + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
53023 + AC_REQUIRE([AC_CANONICAL_HOST])
53024 + acl_libdirstem=lib
53026 + case "$host_os" in
53028 + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
53029 + dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
53030 + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
53031 + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
53032 + dnl symlink is missing, so we set acl_libdirstem2 too.
53033 + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
53034 + [AC_EGREP_CPP([sixtyfour bits], [
53038 + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
53040 + if test $gl_cv_solaris_64bit = yes; then
53041 + acl_libdirstem=lib/64
53042 + case "$host_cpu" in
53043 + sparc*) acl_libdirstem2=lib/sparcv9 ;;
53044 + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
53049 + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
53050 + if test -n "$searchpath"; then
53051 + acl_save_IFS="${IFS= }"; IFS=":"
53052 + for searchdir in $searchpath; do
53053 + if test -d "$searchdir"; then
53054 + case "$searchdir" in
53055 + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
53057 + # Better ignore directories of this form. They are misleading.
53059 + *) searchdir=`cd "$searchdir" && pwd`
53060 + case "$searchdir" in
53061 + */lib64 ) acl_libdirstem=lib64 ;;
53066 + IFS="$acl_save_IFS"
53070 + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
53072 diff -urN BUILD/abook-0.6.0pre2/m4/lock.m4 abook/m4/lock.m4
53073 --- BUILD/abook-0.6.0pre2/m4/lock.m4 1970-01-01 01:00:00.000000000 +0100
53074 +++ abook/m4/lock.m4 2013-03-13 15:07:45.000000000 +0100
53076 +# lock.m4 serial 10 (gettext-0.18)
53077 +dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
53078 +dnl This file is free software; the Free Software Foundation
53079 +dnl gives unlimited permission to copy and/or distribute it,
53080 +dnl with or without modifications, as long as this notice is preserved.
53082 +dnl From Bruno Haible.
53084 +AC_DEFUN([gl_LOCK],
53086 + AC_REQUIRE([gl_THREADLIB])
53087 + if test "$gl_threads_api" = posix; then
53088 + # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
53089 + # pthread_rwlock_* functions.
53090 + AC_CHECK_TYPE([pthread_rwlock_t],
53091 + [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
53092 + [Define if the POSIX multithreading library has read/write locks.])],
53094 + [#include <pthread.h>])
53095 + # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
53096 + AC_TRY_COMPILE([#include <pthread.h>],
53097 + [#if __FreeBSD__ == 4
53098 +error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
53100 +int x = (int)PTHREAD_MUTEX_RECURSIVE;
53103 + [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
53104 + [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
53109 +# Prerequisites of lib/lock.c.
53110 +AC_DEFUN([gl_PREREQ_LOCK], [
53111 + AC_REQUIRE([AC_C_INLINE])
53113 diff -urN BUILD/abook-0.6.0pre2/m4/longdouble.m4 abook/m4/longdouble.m4
53114 --- BUILD/abook-0.6.0pre2/m4/longdouble.m4 2005-09-17 12:10:26.000000000 +0200
53115 +++ abook/m4/longdouble.m4 1970-01-01 01:00:00.000000000 +0100
53117 -# longdouble.m4 serial 1 (gettext-0.12)
53118 -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
53119 -dnl This file is free software; the Free Software Foundation
53120 -dnl gives unlimited permission to copy and/or distribute it,
53121 -dnl with or without modifications, as long as this notice is preserved.
53123 -dnl From Bruno Haible.
53124 -dnl Test whether the compiler supports the 'long double' type.
53125 -dnl Prerequisite: AC_PROG_CC
53127 -AC_DEFUN([gt_TYPE_LONGDOUBLE],
53129 - AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
53130 - [if test "$GCC" = yes; then
53131 - gt_cv_c_long_double=yes
53134 - /* The Stardent Vistra knows sizeof(long double), but does not support it. */
53135 - long double foo = 0.0;
53136 - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
53137 - int array [2*(sizeof(long double) >= sizeof(double)) - 1];
53139 - gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
53141 - if test $gt_cv_c_long_double = yes; then
53142 - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
53145 diff -urN BUILD/abook-0.6.0pre2/m4/longlong.m4 abook/m4/longlong.m4
53146 --- BUILD/abook-0.6.0pre2/m4/longlong.m4 2005-09-17 12:10:26.000000000 +0200
53147 +++ abook/m4/longlong.m4 2013-03-13 15:07:45.000000000 +0100
53149 -# longlong.m4 serial 5
53150 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
53151 +# longlong.m4 serial 14
53152 +dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
53153 dnl This file is free software; the Free Software Foundation
53154 dnl gives unlimited permission to copy and/or distribute it,
53155 dnl with or without modifications, as long as this notice is preserved.
53157 dnl From Paul Eggert.
53159 -# Define HAVE_LONG_LONG if 'long long' works.
53160 +# Define HAVE_LONG_LONG_INT if 'long long int' works.
53161 +# This fixes a bug in Autoconf 2.61, but can be removed once we
53162 +# assume 2.62 everywhere.
53164 -AC_DEFUN([gl_AC_TYPE_LONG_LONG],
53165 +# Note: If the type 'long long int' exists but is only 32 bits large
53166 +# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
53167 +# defined. In this case you can treat 'long long int' like 'long int'.
53169 +AC_DEFUN([AC_TYPE_LONG_LONG_INT],
53171 + AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
53173 + [_AC_TYPE_LONG_LONG_SNIPPET],
53174 + [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
53175 + dnl If cross compiling, assume the bug isn't important, since
53176 + dnl nobody cross compiles for this platform as far as we know.
53178 + [AC_LANG_PROGRAM(
53179 + [[@%:@include <limits.h>
53180 + @%:@ifndef LLONG_MAX
53181 + @%:@ define HALF \
53182 + (1LL << (sizeof (long long int) * CHAR_BIT - 2))
53183 + @%:@ define LLONG_MAX (HALF - 1 + HALF)
53185 + [[long long int n = 1;
53187 + for (i = 0; ; i++)
53189 + long long int m = n << i;
53192 + if (LLONG_MAX / 2 < m)
53196 + [ac_cv_type_long_long_int=yes],
53197 + [ac_cv_type_long_long_int=no],
53198 + [ac_cv_type_long_long_int=yes])],
53199 + [ac_cv_type_long_long_int=no])])
53200 + if test $ac_cv_type_long_long_int = yes; then
53201 + AC_DEFINE([HAVE_LONG_LONG_INT], [1],
53202 + [Define to 1 if the system has the type `long long int'.])
53206 +# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
53207 +# This fixes a bug in Autoconf 2.61, but can be removed once we
53208 +# assume 2.62 everywhere.
53210 +# Note: If the type 'unsigned long long int' exists but is only 32 bits
53211 +# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
53212 +# will not be defined. In this case you can treat 'unsigned long long int'
53213 +# like 'unsigned long int'.
53215 +AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
53217 - AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
53218 - [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
53219 - [long long llmax = (long long) -1;
53220 - return ll << i | ll >> i | llmax / ll | llmax % ll;],
53221 - ac_cv_type_long_long=yes,
53222 - ac_cv_type_long_long=no)])
53223 - if test $ac_cv_type_long_long = yes; then
53224 - AC_DEFINE(HAVE_LONG_LONG, 1,
53225 - [Define if you have the 'long long' type.])
53226 + AC_CACHE_CHECK([for unsigned long long int],
53227 + [ac_cv_type_unsigned_long_long_int],
53229 + [_AC_TYPE_LONG_LONG_SNIPPET],
53230 + [ac_cv_type_unsigned_long_long_int=yes],
53231 + [ac_cv_type_unsigned_long_long_int=no])])
53232 + if test $ac_cv_type_unsigned_long_long_int = yes; then
53233 + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
53234 + [Define to 1 if the system has the type `unsigned long long int'.])
53238 +# Expands to a C program that can be used to test for simultaneous support
53239 +# of 'long long' and 'unsigned long long'. We don't want to say that
53240 +# 'long long' is available if 'unsigned long long' is not, or vice versa,
53241 +# because too many programs rely on the symmetry between signed and unsigned
53242 +# integer types (excluding 'bool').
53243 +AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
53246 + [[/* For now, do not test the preprocessor; as of 2007 there are too many
53247 + implementations with broken preprocessors. Perhaps this can
53248 + be revisited in 2012. In the meantime, code should not expect
53249 + #if to work with literals wider than 32 bits. */
53250 + /* Test literals. */
53251 + long long int ll = 9223372036854775807ll;
53252 + long long int nll = -9223372036854775807LL;
53253 + unsigned long long int ull = 18446744073709551615ULL;
53254 + /* Test constant expressions. */
53255 + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
53257 + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
53260 + [[/* Test availability of runtime routines for shift and division. */
53261 + long long int llmax = 9223372036854775807ll;
53262 + unsigned long long int ullmax = 18446744073709551615ull;
53263 + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
53264 + | (llmax / ll) | (llmax % ll)
53265 + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
53266 + | (ullmax / ull) | (ullmax % ull));]])
53268 diff -urN BUILD/abook-0.6.0pre2/m4/nls.m4 abook/m4/nls.m4
53269 --- BUILD/abook-0.6.0pre2/m4/nls.m4 2005-09-17 12:10:26.000000000 +0200
53270 +++ abook/m4/nls.m4 2013-03-13 15:07:45.000000000 +0100
53272 -# nls.m4 serial 2 (gettext-0.14.3)
53273 -dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
53274 +# nls.m4 serial 5 (gettext-0.18)
53275 +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
53277 dnl This file is free software; the Free Software Foundation
53278 dnl gives unlimited permission to copy and/or distribute it,
53279 dnl with or without modifications, as long as this notice is preserved.
53280 @@ -17,35 +18,15 @@
53281 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
53282 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
53289 AC_MSG_CHECKING([whether NLS is requested])
53290 dnl Default is enabled NLS
53291 - AC_ARG_ENABLE(nls,
53292 + AC_ARG_ENABLE([nls],
53293 [ --disable-nls do not use Native Language Support],
53294 USE_NLS=$enableval, USE_NLS=yes)
53295 - AC_MSG_RESULT($USE_NLS)
53296 - AC_SUBST(USE_NLS)
53299 -AC_DEFUN([AM_MKINSTALLDIRS],
53301 - dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
53302 - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
53303 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
53304 - dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
53305 - dnl Try to locate it.
53307 - if test -n "$ac_aux_dir"; then
53308 - case "$ac_aux_dir" in
53309 - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
53310 - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
53313 - if test -z "$MKINSTALLDIRS"; then
53314 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
53316 - AC_SUBST(MKINSTALLDIRS)
53317 + AC_MSG_RESULT([$USE_NLS])
53318 + AC_SUBST([USE_NLS])
53320 diff -urN BUILD/abook-0.6.0pre2/m4/po.m4 abook/m4/po.m4
53321 --- BUILD/abook-0.6.0pre2/m4/po.m4 2005-09-17 12:10:26.000000000 +0200
53322 +++ abook/m4/po.m4 2013-03-13 15:07:45.000000000 +0100
53324 -# po.m4 serial 7 (gettext-0.14.3)
53325 -dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
53326 +# po.m4 serial 17 (gettext-0.18)
53327 +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
53328 dnl This file is free software; the Free Software Foundation
53329 dnl gives unlimited permission to copy and/or distribute it,
53330 dnl with or without modifications, as long as this notice is preserved.
53331 @@ -17,16 +17,20 @@
53332 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
53333 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
53338 dnl Checks for all prerequisites of the po subdirectory.
53339 AC_DEFUN([AM_PO_SUBDIRS],
53341 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
53342 AC_REQUIRE([AC_PROG_INSTALL])dnl
53343 - AC_REQUIRE([AM_MKINSTALLDIRS])dnl
53344 + AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
53345 AC_REQUIRE([AM_NLS])dnl
53347 + dnl Release version of the gettext macros. This is used to ensure that
53348 + dnl the gettext macros and po/Makefile.in.in are in sync.
53349 + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
53351 dnl Perform the following tests also if --disable-nls has been given,
53352 dnl because they are needed for "make dist" to work.
53355 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
53356 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
53358 - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
53359 + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
53361 + dnl Test whether it is GNU msgfmt >= 0.15.
53363 + case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
53364 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
53365 + *) MSGFMT_015=$MSGFMT ;;
53367 +changequote([,])dnl
53368 + AC_SUBST([MSGFMT_015])
53370 + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
53371 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
53372 + *) GMSGFMT_015=$GMSGFMT ;;
53374 +changequote([,])dnl
53375 + AC_SUBST([GMSGFMT_015])
53377 dnl Search for GNU xgettext 0.12 or newer in the PATH.
53378 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
53379 @@ -49,44 +69,30 @@
53380 dnl Remove leftover from FreeBSD xgettext call.
53383 + dnl Test whether it is GNU xgettext >= 0.15.
53385 + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
53386 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
53387 + *) XGETTEXT_015=$XGETTEXT ;;
53389 +changequote([,])dnl
53390 + AC_SUBST([XGETTEXT_015])
53392 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
53393 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
53394 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
53396 - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
53397 - dnl Test whether we really found GNU msgfmt.
53398 - if test "$GMSGFMT" != ":"; then
53399 - dnl If it is no GNU msgfmt we define it as : so that the
53400 - dnl Makefiles still can work.
53401 - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
53402 - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
53405 - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
53407 - [found $GMSGFMT program is not GNU msgfmt; ignore it])
53411 + dnl Installation directories.
53412 + dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
53413 + dnl have to define it here, so that it can be used in po/Makefile.
53414 + test -n "$localedir" || localedir='${datadir}/locale'
53415 + AC_SUBST([localedir])
53417 + dnl Support for AM_XGETTEXT_OPTION.
53418 + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
53419 + AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
53421 - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
53422 - dnl Test whether we really found GNU xgettext.
53423 - if test "$XGETTEXT" != ":"; then
53424 - dnl If it is no GNU xgettext we define it as : so that the
53425 - dnl Makefiles still can work.
53426 - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
53427 - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
53431 - [found xgettext program is not GNU xgettext; ignore it])
53434 - dnl Remove leftover from FreeBSD xgettext call.
53435 - rm -f messages.po
53438 - AC_OUTPUT_COMMANDS([
53439 + AC_CONFIG_COMMANDS([po-directories], [[
53440 for ac_file in $CONFIG_FILES; do
53441 # Support "outfile[:infile[:infile...]]"
53443 @@ -123,11 +129,12 @@
53444 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
53446 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
53447 - # Hide the ALL_LINGUAS assigment from automake.
53448 + # Hide the ALL_LINGUAS assigment from automake < 1.5.
53449 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
53450 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
53452 # The set of available languages was given in configure.in.
53453 + # Hide the ALL_LINGUAS assigment from automake < 1.5.
53454 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
53457 @@ -186,13 +193,21 @@
53459 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
53460 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"
53461 + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
53462 + if test -f "$f"; then
53464 + *.orig | *.bak | *~) ;;
53465 + *) cat "$f" >> "$ac_dir/Makefile" ;;
53474 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
53475 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
53477 + # from automake < 1.5.
53478 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
53479 # Capture the value of LINGUAS because we need it to compute CATALOGS.
53480 LINGUAS="${LINGUAS-%UNSET%}"
53481 @@ -278,7 +293,7 @@
53482 changequote([,])dnl
53484 # Set POTFILES to the value of the Makefile variable POTFILES.
53485 - sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
53486 + sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
53487 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
53488 # Compute POTFILES_DEPS as
53489 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
53490 @@ -297,10 +312,10 @@
53491 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
53493 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
53494 - sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
53495 + sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
53496 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
53498 - # Hide the ALL_LINGUAS assigment from automake.
53499 + # Hide the ALL_LINGUAS assigment from automake < 1.5.
53500 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
53502 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
53503 @@ -419,3 +434,16 @@
53505 mv "$ac_file.tmp" "$ac_file"
53508 +dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
53509 +AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
53511 + XGETTEXT_EXTRA_OPTIONS=
53514 +dnl Registers an option to be passed to xgettext in the po subdirectory.
53515 +AC_DEFUN([AM_XGETTEXT_OPTION],
53517 + AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
53518 + XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
53520 diff -urN BUILD/abook-0.6.0pre2/m4/printf-posix.m4 abook/m4/printf-posix.m4
53521 --- BUILD/abook-0.6.0pre2/m4/printf-posix.m4 2005-09-17 12:10:26.000000000 +0200
53522 +++ abook/m4/printf-posix.m4 2013-03-13 15:07:45.000000000 +0100
53524 -# printf-posix.m4 serial 2 (gettext-0.13.1)
53525 -dnl Copyright (C) 2003 Free Software Foundation, Inc.
53526 +# printf-posix.m4 serial 5 (gettext-0.18)
53527 +dnl Copyright (C) 2003, 2007, 2009-2010 Free Software Foundation, Inc.
53528 dnl This file is free software; the Free Software Foundation
53529 dnl gives unlimited permission to copy and/or distribute it,
53530 dnl with or without modifications, as long as this notice is preserved.
53531 @@ -27,17 +27,18 @@
53532 return (strcmp (buf, "55 33") != 0);
53533 }], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
53535 - AC_EGREP_CPP(notposix, [
53536 -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
53537 + AC_EGREP_CPP([notposix], [
53538 +#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
53541 - ], gt_cv_func_printf_posix="guessing no",
53542 - gt_cv_func_printf_posix="guessing yes")
53544 + [gt_cv_func_printf_posix="guessing no"],
53545 + [gt_cv_func_printf_posix="guessing yes"])
53548 case $gt_cv_func_printf_posix in
53550 - AC_DEFINE(HAVE_POSIX_PRINTF, 1,
53551 + AC_DEFINE([HAVE_POSIX_PRINTF], [1],
53552 [Define if your printf() function supports format strings with positions.])
53555 diff -urN BUILD/abook-0.6.0pre2/m4/progtest.m4 abook/m4/progtest.m4
53556 --- BUILD/abook-0.6.0pre2/m4/progtest.m4 2005-09-17 12:10:26.000000000 +0200
53557 +++ abook/m4/progtest.m4 2013-03-13 15:07:45.000000000 +0100
53559 -# progtest.m4 serial 4 (gettext-0.14.2)
53560 -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
53561 +# progtest.m4 serial 6 (gettext-0.18)
53562 +dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
53563 dnl This file is free software; the Free Software Foundation
53564 dnl gives unlimited permission to copy and/or distribute it,
53565 dnl with or without modifications, as long as this notice is preserved.
53568 dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
53573 # Search path for a program which passes the given test.
53576 # Extract the first word of "$2", so it can be a program name with args.
53577 set dummy $2; ac_word=[$]2
53578 AC_MSG_CHECKING([for $ac_word])
53579 -AC_CACHE_VAL(ac_cv_path_$1,
53580 +AC_CACHE_VAL([ac_cv_path_$1],
53582 [[\\/]]* | ?:[[\\/]]*)
53583 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
53586 $1="$ac_cv_path_$1"
53587 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
53588 - AC_MSG_RESULT([$]$1)
53589 + AC_MSG_RESULT([$][$1])
53591 - AC_MSG_RESULT(no)
53592 + AC_MSG_RESULT([no])
53597 diff -urN BUILD/abook-0.6.0pre2/m4/signed.m4 abook/m4/signed.m4
53598 --- BUILD/abook-0.6.0pre2/m4/signed.m4 2005-09-17 12:10:26.000000000 +0200
53599 +++ abook/m4/signed.m4 1970-01-01 01:00:00.000000000 +0100
53601 -# signed.m4 serial 1 (gettext-0.10.40)
53602 -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
53603 -dnl This file is free software; the Free Software Foundation
53604 -dnl gives unlimited permission to copy and/or distribute it,
53605 -dnl with or without modifications, as long as this notice is preserved.
53607 -dnl From Bruno Haible.
53609 -AC_DEFUN([bh_C_SIGNED],
53611 - AC_CACHE_CHECK([for signed], bh_cv_c_signed,
53612 - [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
53613 - if test $bh_cv_c_signed = no; then
53614 - AC_DEFINE(signed, ,
53615 - [Define to empty if the C compiler doesn't support this keyword.])
53618 diff -urN BUILD/abook-0.6.0pre2/m4/size_max.m4 abook/m4/size_max.m4
53619 --- BUILD/abook-0.6.0pre2/m4/size_max.m4 2005-09-17 12:10:26.000000000 +0200
53620 +++ abook/m4/size_max.m4 2013-03-13 15:07:45.000000000 +0100
53622 -# size_max.m4 serial 2
53623 -dnl Copyright (C) 2003 Free Software Foundation, Inc.
53624 +# size_max.m4 serial 9
53625 +dnl Copyright (C) 2003, 2005-2006, 2008-2010 Free Software Foundation, Inc.
53626 dnl This file is free software; the Free Software Foundation
53627 dnl gives unlimited permission to copy and/or distribute it,
53628 dnl with or without modifications, as long as this notice is preserved.
53631 AC_DEFUN([gl_SIZE_MAX],
53633 - AC_CHECK_HEADERS(stdint.h)
53634 + AC_CHECK_HEADERS([stdint.h])
53635 dnl First test whether the system already has SIZE_MAX.
53636 - AC_MSG_CHECKING([for SIZE_MAX])
53638 - AC_EGREP_CPP([Found it], [
53639 + AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [
53641 + AC_EGREP_CPP([Found it], [
53642 #include <limits.h>
53644 #include <stdint.h>
53645 @@ -20,40 +20,56 @@
53650 - if test -z "$result"; then
53651 - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
53652 - dnl than the type 'unsigned long'.
53653 - dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
53654 - dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
53655 - _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
53656 - [#include <stddef.h>], result=?)
53657 - _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
53658 - [#include <stddef.h>], result=?)
53659 - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
53660 - [#include <stddef.h>], result=?)
53661 - if test "$fits_in_uint" = 1; then
53662 - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
53663 - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
53664 - AC_TRY_COMPILE([#include <stddef.h>
53665 - extern size_t foo;
53666 - extern unsigned long foo;
53667 - ], [], fits_in_uint=0)
53669 - if test -z "$result"; then
53670 - if test "$fits_in_uint" = 1; then
53671 - result="$res_hi$res_lo"U
53672 +], [gl_cv_size_max=yes])
53673 + if test -z "$gl_cv_size_max"; then
53674 + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
53675 + dnl than the type 'unsigned long'. Try hard to find a definition that can
53676 + dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
53677 + AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],
53678 + [#include <stddef.h>
53679 +#include <limits.h>], [size_t_bits_minus_1=])
53680 + AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)],
53681 + [#include <stddef.h>], [fits_in_uint=])
53682 + if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
53683 + if test $fits_in_uint = 1; then
53684 + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
53685 + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
53686 + AC_TRY_COMPILE([#include <stddef.h>
53687 + extern size_t foo;
53688 + extern unsigned long foo;
53689 + ], [], [fits_in_uint=0])
53691 + dnl We cannot use 'expr' to simplify this expression, because 'expr'
53692 + dnl works only with 'long' integers in the host environment, while we
53693 + dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
53694 + if test $fits_in_uint = 1; then
53695 + gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
53697 + gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
53700 - result="$res_hi$res_lo"UL
53701 + dnl Shouldn't happen, but who knows...
53702 + gl_cv_size_max='((size_t)~(size_t)0)'
53705 - dnl Shouldn't happen, but who knows...
53706 - result='~(size_t)0'
53709 - AC_MSG_RESULT([$result])
53710 - if test "$result" != yes; then
53711 - AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
53713 + if test "$gl_cv_size_max" != yes; then
53714 + AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
53715 [Define as the maximum value of type 'size_t', if the system doesn't define it.])
53717 + dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
53718 + dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
53719 + dnl #define by AC_DEFINE_UNQUOTED.
53720 + AH_VERBATIM([SIZE_MAX],
53721 +[/* Define as the maximum value of type 'size_t', if the system doesn't define
53728 +dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
53729 +dnl Remove this when we can assume autoconf >= 2.61.
53730 +m4_ifdef([AC_COMPUTE_INT], [], [
53731 + AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
53733 diff -urN BUILD/abook-0.6.0pre2/m4/stdint_h.m4 abook/m4/stdint_h.m4
53734 --- BUILD/abook-0.6.0pre2/m4/stdint_h.m4 2005-09-17 12:10:26.000000000 +0200
53735 +++ abook/m4/stdint_h.m4 2013-03-13 15:07:45.000000000 +0100
53737 -# stdint_h.m4 serial 5
53738 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
53739 +# stdint_h.m4 serial 8
53740 +dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
53741 dnl This file is free software; the Free Software Foundation
53742 dnl gives unlimited permission to copy and/or distribute it,
53743 dnl with or without modifications, as long as this notice is preserved.
53744 @@ -11,15 +11,15 @@
53746 AC_DEFUN([gl_AC_HEADER_STDINT_H],
53748 - AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
53749 + AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
53751 [#include <sys/types.h>
53752 #include <stdint.h>],
53753 - [uintmax_t i = (uintmax_t) -1;],
53754 - gl_cv_header_stdint_h=yes,
53755 - gl_cv_header_stdint_h=no)])
53756 + [uintmax_t i = (uintmax_t) -1; return !i;],
53757 + [gl_cv_header_stdint_h=yes],
53758 + [gl_cv_header_stdint_h=no])])
53759 if test $gl_cv_header_stdint_h = yes; then
53760 - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
53761 + AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
53762 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
53763 and declares uintmax_t. ])
53765 diff -urN BUILD/abook-0.6.0pre2/m4/threadlib.m4 abook/m4/threadlib.m4
53766 --- BUILD/abook-0.6.0pre2/m4/threadlib.m4 1970-01-01 01:00:00.000000000 +0100
53767 +++ abook/m4/threadlib.m4 2013-03-13 15:07:45.000000000 +0100
53769 +# threadlib.m4 serial 5 (gettext-0.18)
53770 +dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
53771 +dnl This file is free software; the Free Software Foundation
53772 +dnl gives unlimited permission to copy and/or distribute it,
53773 +dnl with or without modifications, as long as this notice is preserved.
53775 +dnl From Bruno Haible.
53779 +dnl Tests for a multithreading library to be used.
53780 +dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
53781 +dnl USE_PTH_THREADS, USE_WIN32_THREADS
53782 +dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
53783 +dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
53785 +dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
53786 +dnl programs that really need multithread functionality. The difference
53787 +dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
53788 +dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
53789 +dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
53790 +dnl multithread-safe programs.
53792 +AC_DEFUN([gl_THREADLIB_EARLY],
53794 + AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
53797 +dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
53799 +AC_DEFUN([gl_THREADLIB_EARLY_BODY],
53801 + dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
53802 + dnl influences the result of the autoconf tests that test for *_unlocked
53803 + dnl declarations, on AIX 5 at least. Therefore it must come early.
53804 + AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
53805 + AC_BEFORE([$0], [gl_ARGP])dnl
53807 + AC_REQUIRE([AC_CANONICAL_HOST])
53808 + dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
53809 + dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
53810 + dnl AC_GNU_SOURCE.
53811 + m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
53812 + [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
53813 + [AC_REQUIRE([AC_GNU_SOURCE])])
53814 + dnl Check for multithreading.
53815 + m4_divert_text([DEFAULTS], [gl_use_threads_default=])
53816 + AC_ARG_ENABLE([threads],
53817 +AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
53818 +AC_HELP_STRING([--disable-threads], [build without multithread safety]),
53819 + [gl_use_threads=$enableval],
53820 + [if test -n "$gl_use_threads_default"; then
53821 + gl_use_threads="$gl_use_threads_default"
53824 + case "$host_os" in
53825 + dnl Disable multithreading by default on OSF/1, because it interferes
53826 + dnl with fork()/exec(): When msgexec is linked with -lpthread, its
53827 + dnl child process gets an endless segmentation fault inside execvp().
53828 + dnl Disable multithreading by default on Cygwin 1.5.x, because it has
53829 + dnl bugs that lead to endless loops or crashes. See
53830 + dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
53831 + osf*) gl_use_threads=no ;;
53833 + case `uname -r` in
53834 + 1.[0-5].*) gl_use_threads=no ;;
53835 + *) gl_use_threads=yes ;;
53838 + *) gl_use_threads=yes ;;
53840 +changequote([,])dnl
53843 + if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
53844 + # For using <pthread.h>:
53845 + case "$host_os" in
53847 + # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
53848 + # groks <pthread.h>. cc also understands the flag -pthread, but
53849 + # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
53850 + # 2. putting a flag into CPPFLAGS that has an effect on the linker
53851 + # causes the AC_TRY_LINK test below to succeed unexpectedly,
53852 + # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
53853 + CPPFLAGS="$CPPFLAGS -D_REENTRANT"
53856 + # Some systems optimize for single-threaded programs by default, and
53857 + # need special flags to disable these optimizations. For example, the
53858 + # definition of 'errno' in <errno.h>.
53859 + case "$host_os" in
53860 + aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
53861 + solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
53866 +dnl The guts of gl_THREADLIB. Needs to be expanded only once.
53868 +AC_DEFUN([gl_THREADLIB_BODY],
53870 + AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
53871 + gl_threads_api=none
53875 + LTLIBMULTITHREAD=
53876 + if test "$gl_use_threads" != no; then
53877 + dnl Check whether the compiler and linker support weak declarations.
53878 + AC_CACHE_CHECK([whether imported symbols can be declared weak],
53879 + [gl_cv_have_weak],
53880 + [gl_cv_have_weak=no
53881 + dnl First, test whether the compiler accepts it syntactically.
53882 + AC_TRY_LINK([extern void xyzzy ();
53883 +#pragma weak xyzzy], [xyzzy();], [gl_cv_have_weak=maybe])
53884 + if test $gl_cv_have_weak = maybe; then
53885 + dnl Second, test whether it actually works. On Cygwin 1.7.2, with
53886 + dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
53888 +#include <stdio.h>
53889 +#pragma weak fputs
53892 + return (fputs == NULL);
53893 +}], [gl_cv_have_weak=yes], [gl_cv_have_weak=no],
53894 + [dnl When cross-compiling, assume that only ELF platforms support
53895 + dnl weak symbols.
53896 + AC_EGREP_CPP([Extensible Linking Format],
53898 + Extensible Linking Format
53901 + [gl_cv_have_weak="guessing yes"],
53902 + [gl_cv_have_weak="guessing no"])
53906 + if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
53907 + # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
53908 + # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
53909 + AC_CHECK_HEADER([pthread.h],
53910 + [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
53911 + if test "$gl_have_pthread_h" = yes; then
53912 + # Other possible tests:
53913 + # -lpthreads (FSU threads, PCthreads)
53916 + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
53917 + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
53918 + # the second one only in libpthread, and lock.c needs it.
53919 + AC_TRY_LINK([#include <pthread.h>],
53920 + [pthread_mutex_lock((pthread_mutex_t*)0);
53921 + pthread_mutexattr_init((pthread_mutexattr_t*)0);],
53922 + [gl_have_pthread=yes])
53923 + # Test for libpthread by looking for pthread_kill. (Not pthread_self,
53924 + # since it is defined as a macro on OSF/1.)
53925 + if test -n "$gl_have_pthread"; then
53926 + # The program links fine without libpthread. But it may actually
53927 + # need to link with libpthread in order to create multiple threads.
53928 + AC_CHECK_LIB([pthread], [pthread_kill],
53929 + [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
53930 + # On Solaris and HP-UX, most pthread functions exist also in libc.
53931 + # Therefore pthread_in_use() needs to actually try to create a
53932 + # thread: pthread_create from libc will fail, whereas
53933 + # pthread_create will actually create a thread.
53934 + case "$host_os" in
53935 + solaris* | hpux*)
53936 + AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
53937 + [Define if the pthread_in_use() detection is hard.])
53941 + # Some library is needed. Try libpthread and libc_r.
53942 + AC_CHECK_LIB([pthread], [pthread_kill],
53943 + [gl_have_pthread=yes
53944 + LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
53945 + LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
53946 + if test -z "$gl_have_pthread"; then
53948 + AC_CHECK_LIB([c_r], [pthread_kill],
53949 + [gl_have_pthread=yes
53950 + LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
53951 + LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
53954 + if test -n "$gl_have_pthread"; then
53955 + gl_threads_api=posix
53956 + AC_DEFINE([USE_POSIX_THREADS], [1],
53957 + [Define if the POSIX multithreading library can be used.])
53958 + if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
53959 + if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
53960 + AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
53961 + [Define if references to the POSIX multithreading library should be made weak.])
53969 + if test -z "$gl_have_pthread"; then
53970 + if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
53971 + gl_have_solaristhread=
53972 + gl_save_LIBS="$LIBS"
53973 + LIBS="$LIBS -lthread"
53974 + AC_TRY_LINK([#include <thread.h>
53975 +#include <synch.h>],
53977 + [gl_have_solaristhread=yes])
53978 + LIBS="$gl_save_LIBS"
53979 + if test -n "$gl_have_solaristhread"; then
53980 + gl_threads_api=solaris
53981 + LIBTHREAD=-lthread
53982 + LTLIBTHREAD=-lthread
53983 + LIBMULTITHREAD="$LIBTHREAD"
53984 + LTLIBMULTITHREAD="$LTLIBTHREAD"
53985 + AC_DEFINE([USE_SOLARIS_THREADS], [1],
53986 + [Define if the old Solaris multithreading library can be used.])
53987 + if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
53988 + AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
53989 + [Define if references to the old Solaris multithreading library should be made weak.])
53996 + if test "$gl_use_threads" = pth; then
53997 + gl_save_CPPFLAGS="$CPPFLAGS"
53998 + AC_LIB_LINKFLAGS([pth])
54000 + gl_save_LIBS="$LIBS"
54001 + LIBS="$LIBS -lpth"
54002 + AC_TRY_LINK([#include <pth.h>], [pth_self();], [gl_have_pth=yes])
54003 + LIBS="$gl_save_LIBS"
54004 + if test -n "$gl_have_pth"; then
54005 + gl_threads_api=pth
54006 + LIBTHREAD="$LIBPTH"
54007 + LTLIBTHREAD="$LTLIBPTH"
54008 + LIBMULTITHREAD="$LIBTHREAD"
54009 + LTLIBMULTITHREAD="$LTLIBTHREAD"
54010 + AC_DEFINE([USE_PTH_THREADS], [1],
54011 + [Define if the GNU Pth multithreading library can be used.])
54012 + if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
54013 + if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
54014 + AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
54015 + [Define if references to the GNU Pth multithreading library should be made weak.])
54021 + CPPFLAGS="$gl_save_CPPFLAGS"
54024 + if test -z "$gl_have_pthread"; then
54025 + if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
54026 + if { case "$host_os" in
54031 + gl_threads_api=win32
54032 + AC_DEFINE([USE_WIN32_THREADS], [1],
54033 + [Define if the Win32 multithreading API can be used.])
54038 + AC_MSG_CHECKING([for multithread API to use])
54039 + AC_MSG_RESULT([$gl_threads_api])
54040 + AC_SUBST([LIBTHREAD])
54041 + AC_SUBST([LTLIBTHREAD])
54042 + AC_SUBST([LIBMULTITHREAD])
54043 + AC_SUBST([LTLIBMULTITHREAD])
54046 +AC_DEFUN([gl_THREADLIB],
54048 + AC_REQUIRE([gl_THREADLIB_EARLY])
54049 + AC_REQUIRE([gl_THREADLIB_BODY])
54053 +dnl gl_DISABLE_THREADS
54054 +dnl ------------------
54055 +dnl Sets the gl_THREADLIB default so that threads are not used by default.
54056 +dnl The user can still override it at installation time, by using the
54057 +dnl configure option '--enable-threads'.
54059 +AC_DEFUN([gl_DISABLE_THREADS], [
54060 + m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
54064 +dnl Survey of platforms:
54066 +dnl Platform Available Compiler Supports test-lock
54067 +dnl flavours option weak result
54068 +dnl --------------- --------- --------- -------- ---------
54069 +dnl Linux 2.4/glibc posix -lpthread Y OK
54071 +dnl GNU Hurd/glibc posix
54073 +dnl FreeBSD 5.3 posix -lc_r Y
54074 +dnl posix -lkse ? Y
54075 +dnl posix -lpthread ? Y
54078 +dnl FreeBSD 5.2 posix -lc_r Y
54082 +dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
54086 +dnl OpenBSD 3.4 posix -lpthread Y OK
54088 +dnl MacOS X 10.[123] posix -lpthread Y OK
54090 +dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
54091 +dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
54093 +dnl HP-UX 11 posix -lpthread N (cc) OK
54096 +dnl IRIX 6.5 posix -lpthread Y 0.5
54098 +dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
54100 +dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
54101 +dnl -lpthread (gcc) Y
54103 +dnl Cygwin posix -lpthread Y OK
54105 +dnl Any of the above pth -lpth 0.0
54107 +dnl Mingw win32 N OK
54111 +dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
54113 +dnl OK if all three tests terminate OK,
54114 +dnl 0.5 if the first test terminates OK but the second one loops endlessly,
54115 +dnl 0.0 if the first test already loops endlessly.
54116 diff -urN BUILD/abook-0.6.0pre2/m4/uintmax_t.m4 abook/m4/uintmax_t.m4
54117 --- BUILD/abook-0.6.0pre2/m4/uintmax_t.m4 2005-09-17 12:10:26.000000000 +0200
54118 +++ abook/m4/uintmax_t.m4 2013-03-13 15:07:45.000000000 +0100
54120 -# uintmax_t.m4 serial 9
54121 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
54122 +# uintmax_t.m4 serial 12
54123 +dnl Copyright (C) 1997-2004, 2007-2010 Free Software Foundation, Inc.
54124 dnl This file is free software; the Free Software Foundation
54125 dnl gives unlimited permission to copy and/or distribute it,
54126 dnl with or without modifications, as long as this notice is preserved.
54128 dnl From Paul Eggert.
54133 # Define uintmax_t to 'unsigned long' or 'unsigned long long'
54134 # if it is not already defined in <stdint.h> or <inttypes.h>.
54135 @@ -16,15 +16,15 @@
54136 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
54137 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
54138 if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
54139 - AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
54140 - test $ac_cv_type_unsigned_long_long = yes \
54141 + AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
54142 + test $ac_cv_type_unsigned_long_long_int = yes \
54143 && ac_type='unsigned long long' \
54144 || ac_type='unsigned long'
54145 - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
54146 + AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
54147 [Define to unsigned long or unsigned long long
54148 if <stdint.h> and <inttypes.h> don't define.])
54150 - AC_DEFINE(HAVE_UINTMAX_T, 1,
54151 + AC_DEFINE([HAVE_UINTMAX_T], [1],
54152 [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
54155 diff -urN BUILD/abook-0.6.0pre2/m4/ulonglong.m4 abook/m4/ulonglong.m4
54156 --- BUILD/abook-0.6.0pre2/m4/ulonglong.m4 2005-09-17 12:10:26.000000000 +0200
54157 +++ abook/m4/ulonglong.m4 1970-01-01 01:00:00.000000000 +0100
54159 -# ulonglong.m4 serial 4
54160 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
54161 -dnl This file is free software; the Free Software Foundation
54162 -dnl gives unlimited permission to copy and/or distribute it,
54163 -dnl with or without modifications, as long as this notice is preserved.
54165 -dnl From Paul Eggert.
54167 -# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
54169 -AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
54171 - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
54172 - [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
54173 - [unsigned long long ullmax = (unsigned long long) -1;
54174 - return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
54175 - ac_cv_type_unsigned_long_long=yes,
54176 - ac_cv_type_unsigned_long_long=no)])
54177 - if test $ac_cv_type_unsigned_long_long = yes; then
54178 - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
54179 - [Define if you have the 'unsigned long long' type.])
54182 diff -urN BUILD/abook-0.6.0pre2/m4/visibility.m4 abook/m4/visibility.m4
54183 --- BUILD/abook-0.6.0pre2/m4/visibility.m4 1970-01-01 01:00:00.000000000 +0100
54184 +++ abook/m4/visibility.m4 2013-03-13 15:07:45.000000000 +0100
54186 +# visibility.m4 serial 3 (gettext-0.18)
54187 +dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
54188 +dnl This file is free software; the Free Software Foundation
54189 +dnl gives unlimited permission to copy and/or distribute it,
54190 +dnl with or without modifications, as long as this notice is preserved.
54192 +dnl From Bruno Haible.
54194 +dnl Tests whether the compiler supports the command-line option
54195 +dnl -fvisibility=hidden and the function and variable attributes
54196 +dnl __attribute__((__visibility__("hidden"))) and
54197 +dnl __attribute__((__visibility__("default"))).
54198 +dnl Does *not* test for __visibility__("protected") - which has tricky
54199 +dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
54201 +dnl Does *not* test for __visibility__("internal") - which has processor
54202 +dnl dependent semantics.
54203 +dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
54204 +dnl "really only recommended for legacy code".
54205 +dnl Set the variable CFLAG_VISIBILITY.
54206 +dnl Defines and sets the variable HAVE_VISIBILITY.
54208 +AC_DEFUN([gl_VISIBILITY],
54210 + AC_REQUIRE([AC_PROG_CC])
54211 + CFLAG_VISIBILITY=
54212 + HAVE_VISIBILITY=0
54213 + if test -n "$GCC"; then
54214 + dnl First, check whether -Werror can be added to the command line, or
54215 + dnl whether it leads to an error because of some other option that the
54216 + dnl user has put into $CC $CFLAGS $CPPFLAGS.
54217 + AC_MSG_CHECKING([whether the -Werror option is usable])
54218 + AC_CACHE_VAL([gl_cv_cc_vis_werror], [
54219 + gl_save_CFLAGS="$CFLAGS"
54220 + CFLAGS="$CFLAGS -Werror"
54221 + AC_TRY_COMPILE([], [],
54222 + [gl_cv_cc_vis_werror=yes],
54223 + [gl_cv_cc_vis_werror=no])
54224 + CFLAGS="$gl_save_CFLAGS"])
54225 + AC_MSG_RESULT([$gl_cv_cc_vis_werror])
54226 + dnl Now check whether visibility declarations are supported.
54227 + AC_MSG_CHECKING([for simple visibility declarations])
54228 + AC_CACHE_VAL([gl_cv_cc_visibility], [
54229 + gl_save_CFLAGS="$CFLAGS"
54230 + CFLAGS="$CFLAGS -fvisibility=hidden"
54231 + dnl We use the option -Werror and a function dummyfunc, because on some
54232 + dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
54233 + dnl "visibility attribute not supported in this configuration; ignored"
54234 + dnl at the first function definition in every compilation unit, and we
54235 + dnl don't want to use the option in this case.
54236 + if test $gl_cv_cc_vis_werror = yes; then
54237 + CFLAGS="$CFLAGS -Werror"
54240 + [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
54241 + extern __attribute__((__visibility__("default"))) int exportedvar;
54242 + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
54243 + extern __attribute__((__visibility__("default"))) int exportedfunc (void);
54244 + void dummyfunc (void) {}],
54246 + [gl_cv_cc_visibility=yes],
54247 + [gl_cv_cc_visibility=no])
54248 + CFLAGS="$gl_save_CFLAGS"])
54249 + AC_MSG_RESULT([$gl_cv_cc_visibility])
54250 + if test $gl_cv_cc_visibility = yes; then
54251 + CFLAG_VISIBILITY="-fvisibility=hidden"
54252 + HAVE_VISIBILITY=1
54255 + AC_SUBST([CFLAG_VISIBILITY])
54256 + AC_SUBST([HAVE_VISIBILITY])
54257 + AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
54258 + [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
54260 diff -urN BUILD/abook-0.6.0pre2/m4/wchar_t.m4 abook/m4/wchar_t.m4
54261 --- BUILD/abook-0.6.0pre2/m4/wchar_t.m4 2005-09-17 12:10:26.000000000 +0200
54262 +++ abook/m4/wchar_t.m4 2013-03-13 15:07:45.000000000 +0100
54264 -# wchar_t.m4 serial 1 (gettext-0.12)
54265 -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
54266 +# wchar_t.m4 serial 3 (gettext-0.18)
54267 +dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
54268 dnl This file is free software; the Free Software Foundation
54269 dnl gives unlimited permission to copy and/or distribute it,
54270 dnl with or without modifications, as long as this notice is preserved.
54271 @@ -10,11 +10,11 @@
54273 AC_DEFUN([gt_TYPE_WCHAR_T],
54275 - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
54276 + AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
54277 [AC_TRY_COMPILE([#include <stddef.h>
54278 wchar_t foo = (wchar_t)'\0';], ,
54279 - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
54280 + [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
54281 if test $gt_cv_c_wchar_t = yes; then
54282 - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
54283 + AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
54286 diff -urN BUILD/abook-0.6.0pre2/m4/wint_t.m4 abook/m4/wint_t.m4
54287 --- BUILD/abook-0.6.0pre2/m4/wint_t.m4 2005-09-17 12:10:26.000000000 +0200
54288 +++ abook/m4/wint_t.m4 2013-03-13 15:07:45.000000000 +0100
54290 -# wint_t.m4 serial 1 (gettext-0.12)
54291 -dnl Copyright (C) 2003 Free Software Foundation, Inc.
54292 +# wint_t.m4 serial 4 (gettext-0.18)
54293 +dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
54294 dnl This file is free software; the Free Software Foundation
54295 dnl gives unlimited permission to copy and/or distribute it,
54296 dnl with or without modifications, as long as this notice is preserved.
54297 @@ -10,11 +10,19 @@
54299 AC_DEFUN([gt_TYPE_WINT_T],
54301 - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
54302 - [AC_TRY_COMPILE([#include <wchar.h>
54303 + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
54304 + [AC_TRY_COMPILE([
54305 +/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
54307 + BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
54308 + before <wchar.h>. */
54309 +#include <stddef.h>
54310 +#include <stdio.h>
54312 +#include <wchar.h>
54313 wint_t foo = (wchar_t)'\0';], ,
54314 - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
54315 + [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])])
54316 if test $gt_cv_c_wint_t = yes; then
54317 - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
54318 + AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
54321 diff -urN BUILD/abook-0.6.0pre2/m4/xsize.m4 abook/m4/xsize.m4
54322 --- BUILD/abook-0.6.0pre2/m4/xsize.m4 2005-09-17 12:10:26.000000000 +0200
54323 +++ abook/m4/xsize.m4 2013-03-13 15:07:45.000000000 +0100
54325 -# xsize.m4 serial 3
54326 -dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
54327 +# xsize.m4 serial 4
54328 +dnl Copyright (C) 2003-2004, 2008-2010 Free Software Foundation, Inc.
54329 dnl This file is free software; the Free Software Foundation
54330 dnl gives unlimited permission to copy and/or distribute it,
54331 dnl with or without modifications, as long as this notice is preserved.
54333 dnl Prerequisites of lib/xsize.h.
54334 AC_REQUIRE([gl_SIZE_MAX])
54335 AC_REQUIRE([AC_C_INLINE])
54336 - AC_CHECK_HEADERS(stdint.h)
54337 + AC_CHECK_HEADERS([stdint.h])
54339 diff -urN BUILD/abook-0.6.0pre2/Makefile.am abook/Makefile.am
54340 --- BUILD/abook-0.6.0pre2/Makefile.am 2006-09-05 09:55:19.000000000 +0200
54341 +++ abook/Makefile.am 2013-03-13 15:07:45.000000000 +0100
54344 bin_PROGRAMS = abook
54346 +if ENABLE_VFORMAT_SUPPORT
54347 +vformat_SOURCE = vcard.c vcard.h
54348 +AM_LDFLAGS = -lvformat
54353 abook_SOURCES = abook.c abook_rl.c database.c edit.c \
54354 filter.c getname.c getopt.c getopt1.c gettext.c \
54355 ldif.c list.c mbswidth.c misc.c options.c \
54356 ui.c views.c xmalloc.c \
54358 - abook.h abook_curses.h abook_rl.h database.h edit.h \
54359 + abook.h abook_curses.h abook_rl.h database.h edit.h \
54360 filter.h getname.h getopt.h gettext.h \
54361 help.h list.h ldif.h mbswidth.h misc.h options.h \
54362 - ui.h views.h xmalloc.h
54363 + ui.h views.h xmalloc.h \
54364 + $(vformat_SOURCE)
54366 EXTRA_DIST = config.rpath ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
54367 abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
54369 -rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
54375 ACLOCAL_AMFLAGS = -I m4
54377 diff -urN BUILD/abook-0.6.0pre2/Makefile.in abook/Makefile.in
54378 --- BUILD/abook-0.6.0pre2/Makefile.in 2006-09-05 10:19:36.000000000 +0200
54379 +++ abook/Makefile.in 2013-03-13 15:07:45.000000000 +0100
54381 -# Makefile.in generated by automake 1.9.3 from Makefile.am.
54382 +# Makefile.in generated by automake 1.11.6 from Makefile.am.
54383 # @configure_input@
54385 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
54386 -# 2003, 2004 Free Software Foundation, Inc.
54387 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
54388 +# Foundation, Inc.
54389 # This Makefile.in is free software; the Free Software Foundation
54390 # gives unlimited permission to copy and/or distribute it,
54391 # with or without modifications, as long as this notice is preserved.
54392 @@ -14,17 +15,29 @@
54396 -SOURCES = $(abook_SOURCES)
54399 -top_srcdir = @top_srcdir@
54401 +am__make_dryrun = \
54404 + case $$MAKEFLAGS in \
54406 + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
54407 + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
54409 + for am__flg in $$MAKEFLAGS; do \
54410 + case $$am__flg in \
54412 + *n*) am__dry=yes; break;; \
54416 + test $$am__dry = yes; \
54418 pkgdatadir = $(datadir)/@PACKAGE@
54419 -pkglibdir = $(libdir)/@PACKAGE@
54420 pkgincludedir = $(includedir)/@PACKAGE@
54422 +pkglibdir = $(libdir)/@PACKAGE@
54423 +pkglibexecdir = $(libexecdir)/@PACKAGE@
54424 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
54425 -INSTALL = @INSTALL@
54426 install_sh_DATA = $(install_sh) -c -m 644
54427 install_sh_PROGRAM = $(install_sh) -c
54428 install_sh_SCRIPT = $(install_sh) -c
54429 @@ -39,63 +52,73 @@
54430 build_triplet = @build@
54431 host_triplet = @host@
54432 bin_PROGRAMS = abook$(EXEEXT)
54434 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
54435 $(srcdir)/Makefile.in $(srcdir)/abook.spec.in \
54436 - $(srcdir)/config.h.in $(top_srcdir)/configure \
54437 - $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
54438 - ChangeLog INSTALL NEWS THANKS TODO config.guess config.rpath \
54439 - config.sub depcomp install-sh missing mkinstalldirs
54441 + $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
54442 + AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \
54443 + config.guess config.rpath config.sub depcomp install-sh \
54444 + missing mkinstalldirs
54445 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
54446 -am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
54447 - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
54448 - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
54449 - $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
54450 - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
54451 - $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
54452 +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
54453 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
54454 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
54455 - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
54456 - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
54457 - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
54458 - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
54459 - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
54460 - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
54461 - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
54462 - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
54463 - $(top_srcdir)/configure.in
54464 + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
54465 + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
54466 + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
54467 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
54469 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
54470 - configure.lineno configure.status.lineno
54471 + configure.lineno config.status.lineno
54472 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
54473 CONFIG_HEADER = config.h
54474 -CONFIG_CLEAN_FILES = abook.spec intl/Makefile
54475 +CONFIG_CLEAN_FILES = abook.spec
54476 +CONFIG_CLEAN_VPATH_FILES =
54477 am__installdirs = "$(DESTDIR)$(bindir)"
54478 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
54479 PROGRAMS = $(bin_PROGRAMS)
54480 +am__abook_SOURCES_DIST = abook.c abook_rl.c database.c edit.c filter.c \
54481 + getname.c getopt.c getopt1.c gettext.c ldif.c list.c \
54482 + mbswidth.c misc.c options.c ui.c views.c xmalloc.c abook.h \
54483 + abook_curses.h abook_rl.h database.h edit.h filter.h getname.h \
54484 + getopt.h gettext.h help.h list.h ldif.h mbswidth.h misc.h \
54485 + options.h ui.h views.h xmalloc.h vcard.c vcard.h
54486 +@ENABLE_VFORMAT_SUPPORT_TRUE@am__objects_1 = vcard.$(OBJEXT)
54487 am_abook_OBJECTS = abook.$(OBJEXT) abook_rl.$(OBJEXT) \
54488 database.$(OBJEXT) edit.$(OBJEXT) filter.$(OBJEXT) \
54489 getname.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \
54490 gettext.$(OBJEXT) ldif.$(OBJEXT) list.$(OBJEXT) \
54491 mbswidth.$(OBJEXT) misc.$(OBJEXT) options.$(OBJEXT) \
54492 - ui.$(OBJEXT) views.$(OBJEXT) xmalloc.$(OBJEXT)
54493 + ui.$(OBJEXT) views.$(OBJEXT) xmalloc.$(OBJEXT) \
54495 abook_OBJECTS = $(am_abook_OBJECTS)
54496 abook_DEPENDENCIES =
54497 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
54498 +DEFAULT_INCLUDES = -I.@am__isrc@
54499 depcomp = $(SHELL) $(top_srcdir)/depcomp
54500 am__depfiles_maybe = depfiles
54502 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
54503 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
54505 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
54506 SOURCES = $(abook_SOURCES)
54507 -DIST_SOURCES = $(abook_SOURCES)
54508 +DIST_SOURCES = $(am__abook_SOURCES_DIST)
54509 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
54510 html-recursive info-recursive install-data-recursive \
54511 - install-exec-recursive install-info-recursive \
54512 - install-recursive installcheck-recursive installdirs-recursive \
54513 - pdf-recursive ps-recursive uninstall-info-recursive \
54514 - uninstall-recursive
54515 + install-dvi-recursive install-exec-recursive \
54516 + install-html-recursive install-info-recursive \
54517 + install-pdf-recursive install-ps-recursive install-recursive \
54518 + installcheck-recursive installdirs-recursive pdf-recursive \
54519 + ps-recursive uninstall-recursive
54520 +am__can_run_installinfo = \
54521 + case $$AM_UPDATE_INFO_DIR in \
54522 + n|no|NO) false;; \
54523 + *) (install-info --version) >/dev/null 2>&1;; \
54525 +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
54526 + distclean-recursive maintainer-clean-recursive
54527 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
54528 + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
54529 + distdir dist dist-all distcheck
54532 DIST_SUBDIRS = $(SUBDIRS)
54533 @@ -103,31 +126,54 @@
54534 distdir = $(PACKAGE)-$(VERSION)
54535 top_distdir = $(distdir)
54536 am__remove_distdir = \
54537 - { test ! -d $(distdir) \
54538 - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
54539 - && rm -fr $(distdir); }; }
54540 + if test -d "$(distdir)"; then \
54541 + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
54542 + && rm -rf "$(distdir)" \
54543 + || { sleep 5 && rm -rf "$(distdir)"; }; \
54545 +am__relativize = \
54547 + sed_first='s,^\([^/]*\)/.*$$,\1,'; \
54548 + sed_rest='s,^[^/]*/*,,'; \
54549 + sed_last='s,^.*/\([^/]*\)$$,\1,'; \
54550 + sed_butlast='s,/*[^/]*$$,,'; \
54551 + while test -n "$$dir1"; do \
54552 + first=`echo "$$dir1" | sed -e "$$sed_first"`; \
54553 + if test "$$first" != "."; then \
54554 + if test "$$first" = ".."; then \
54555 + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
54556 + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
54558 + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
54559 + if test "$$first2" = "$$first"; then \
54560 + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
54562 + dir2="../$$dir2"; \
54564 + dir0="$$dir0"/"$$first"; \
54567 + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
54570 DIST_ARCHIVES = $(distdir).tar.gz
54572 distuninstallcheck_listfiles = find . -type f -print
54573 +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
54574 + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
54575 distcleancheck_listfiles = find . -type f -print
54576 ACLOCAL = @ACLOCAL@
54578 -AMDEP_FALSE = @AMDEP_FALSE@
54579 -AMDEP_TRUE = @AMDEP_TRUE@
54581 AUTOCONF = @AUTOCONF@
54582 AUTOHEADER = @AUTOHEADER@
54583 AUTOMAKE = @AUTOMAKE@
54585 -BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
54586 -CATOBJEXT = @CATOBJEXT@
54588 CCDEPMODE = @CCDEPMODE@
54591 CPPFLAGS = @CPPFLAGS@
54592 CYGPATH_W = @CYGPATH_W@
54593 -DATADIRNAME = @DATADIRNAME@
54597 @@ -135,23 +181,16 @@
54603 -GLIBC21 = @GLIBC21@
54604 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
54605 GMSGFMT = @GMSGFMT@
54606 -HAVE_ASPRINTF = @HAVE_ASPRINTF@
54607 -HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
54608 -HAVE_SNPRINTF = @HAVE_SNPRINTF@
54609 -HAVE_WPRINTF = @HAVE_WPRINTF@
54610 +GMSGFMT_015 = @GMSGFMT_015@
54612 +INSTALL = @INSTALL@
54613 INSTALL_DATA = @INSTALL_DATA@
54614 INSTALL_PROGRAM = @INSTALL_PROGRAM@
54615 INSTALL_SCRIPT = @INSTALL_SCRIPT@
54616 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
54617 -INSTOBJEXT = @INSTOBJEXT@
54618 -INTLBISON = @INTLBISON@
54619 INTLLIBS = @INTLLIBS@
54620 -INTLOBJS = @INTLOBJS@
54621 -INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
54622 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
54623 LDFLAGS = @LDFLAGS@
54624 LIBICONV = @LIBICONV@
54625 @@ -162,8 +201,9 @@
54626 LTLIBINTL = @LTLIBINTL@
54627 LTLIBOBJS = @LTLIBOBJS@
54628 MAKEINFO = @MAKEINFO@
54629 -MKINSTALLDIRS = @MKINSTALLDIRS@
54630 +MKDIR_P = @MKDIR_P@
54632 +MSGFMT_015 = @MSGFMT_015@
54633 MSGMERGE = @MSGMERGE@
54635 PACKAGE = @PACKAGE@
54636 @@ -171,25 +211,24 @@
54637 PACKAGE_NAME = @PACKAGE_NAME@
54638 PACKAGE_STRING = @PACKAGE_STRING@
54639 PACKAGE_TARNAME = @PACKAGE_TARNAME@
54640 +PACKAGE_URL = @PACKAGE_URL@
54641 PACKAGE_VERSION = @PACKAGE_VERSION@
54642 PATH_SEPARATOR = @PATH_SEPARATOR@
54645 SET_MAKE = @SET_MAKE@
54649 -USE_INCLUDED_INTL_H_FALSE = @USE_INCLUDED_INTL_H_FALSE@
54650 -USE_INCLUDED_INTL_H_TRUE = @USE_INCLUDED_INTL_H_TRUE@
54651 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
54652 USE_NLS = @USE_NLS@
54653 VERSION = @VERSION@
54654 XGETTEXT = @XGETTEXT@
54655 +XGETTEXT_015 = @XGETTEXT_015@
54656 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
54657 +abs_builddir = @abs_builddir@
54658 +abs_srcdir = @abs_srcdir@
54659 +abs_top_builddir = @abs_top_builddir@
54660 +abs_top_srcdir = @abs_top_srcdir@
54661 ac_ct_CC = @ac_ct_CC@
54662 -ac_ct_RANLIB = @ac_ct_RANLIB@
54663 -ac_ct_STRIP = @ac_ct_STRIP@
54664 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
54665 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
54666 am__include = @am__include@
54667 am__leading_dot = @am__leading_dot@
54668 am__quote = @am__quote@
54669 @@ -201,13 +240,18 @@
54670 build_cpu = @build_cpu@
54671 build_os = @build_os@
54672 build_vendor = @build_vendor@
54673 +builddir = @builddir@
54674 datadir = @datadir@
54675 +datarootdir = @datarootdir@
54678 exec_prefix = @exec_prefix@
54680 host_alias = @host_alias@
54681 host_cpu = @host_cpu@
54682 host_os = @host_os@
54683 host_vendor = @host_vendor@
54684 +htmldir = @htmldir@
54685 includedir = @includedir@
54686 infodir = @infodir@
54687 install_sh = @install_sh@
54688 @@ -218,27 +262,37 @@
54690 mkdir_p = @mkdir_p@
54691 oldincludedir = @oldincludedir@
54694 program_transform_name = @program_transform_name@
54696 sbindir = @sbindir@
54697 sharedstatedir = @sharedstatedir@
54699 sysconfdir = @sysconfdir@
54700 target_alias = @target_alias@
54701 +top_build_prefix = @top_build_prefix@
54702 +top_builddir = @top_builddir@
54703 +top_srcdir = @top_srcdir@
54704 +@ENABLE_VFORMAT_SUPPORT_FALSE@vformat_SOURCE =
54705 +@ENABLE_VFORMAT_SUPPORT_TRUE@vformat_SOURCE = vcard.c vcard.h
54706 +@ENABLE_VFORMAT_SUPPORT_TRUE@AM_LDFLAGS = -lvformat
54707 abook_SOURCES = abook.c abook_rl.c database.c edit.c \
54708 filter.c getname.c getopt.c getopt1.c gettext.c \
54709 ldif.c list.c mbswidth.c misc.c options.c \
54710 ui.c views.c xmalloc.c \
54712 - abook.h abook_curses.h abook_rl.h database.h edit.h \
54713 + abook.h abook_curses.h abook_rl.h database.h edit.h \
54714 filter.h getname.h getopt.h gettext.h \
54715 help.h list.h ldif.h mbswidth.h misc.h options.h \
54716 - ui.h views.h xmalloc.h
54717 + ui.h views.h xmalloc.h \
54718 + $(vformat_SOURCE)
54720 EXTRA_DIST = config.rpath ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
54721 abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
54723 abook_LDADD = @LIBINTL@
54726 ACLOCAL_AMFLAGS = -I m4
54727 @USE_INCLUDED_INTL_H_TRUE@AM_CPPFLAGS = -Iintl
54729 @@ -246,21 +300,21 @@
54732 .SUFFIXES: .c .o .obj
54734 +am--refresh: Makefile
54736 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
54737 @for dep in $?; do \
54738 case '$(am__configure_deps)' in \
54740 - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
54741 - cd $(srcdir) && $(AUTOMAKE) --gnu \
54742 + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
54743 + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
54748 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
54749 - cd $(top_srcdir) && \
54750 - $(AUTOMAKE) --gnu Makefile
54751 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
54752 + $(am__cd) $(top_srcdir) && \
54753 + $(AUTOMAKE) --gnu Makefile
54754 .PRECIOUS: Makefile
54755 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
54757 @@ -276,21 +330,20 @@
54758 $(SHELL) ./config.status --recheck
54760 $(top_srcdir)/configure: $(am__configure_deps)
54761 - cd $(srcdir) && $(AUTOCONF)
54762 + $(am__cd) $(srcdir) && $(AUTOCONF)
54763 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
54764 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
54765 + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
54766 +$(am__aclocal_m4_deps):
54769 - @if test ! -f $@; then \
54770 - rm -f stamp-h1; \
54771 - $(MAKE) stamp-h1; \
54773 + @if test ! -f $@; then rm -f stamp-h1; else :; fi
54774 + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
54776 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
54778 cd $(top_builddir) && $(SHELL) ./config.status config.h
54779 $(srcdir)/config.h.in: $(am__configure_deps)
54780 - cd $(top_srcdir) && $(AUTOHEADER)
54781 + ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
54785 @@ -298,34 +351,49 @@
54786 -rm -f config.h stamp-h1
54787 abook.spec: $(top_builddir)/config.status $(srcdir)/abook.spec.in
54788 cd $(top_builddir) && $(SHELL) ./config.status $@
54789 -intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
54790 - cd $(top_builddir) && $(SHELL) ./config.status $@
54791 install-binPROGRAMS: $(bin_PROGRAMS)
54793 - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
54794 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
54795 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
54798 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
54799 - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
54800 - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
54803 + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
54804 + if test -n "$$list"; then \
54805 + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
54806 + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
54808 + for p in $$list; do echo "$$p $$p"; done | \
54809 + sed 's/$(EXEEXT)$$//' | \
54810 + while read p p1; do if test -f $$p; \
54811 + then echo "$$p"; echo "$$p"; else :; fi; \
54813 + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
54814 + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
54815 + sed 'N;N;N;s,\n, ,g' | \
54816 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
54817 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
54818 + if ($$2 == $$4) files[d] = files[d] " " $$1; \
54819 + else { print "f", $$3 "/" $$4, $$1; } } \
54820 + END { for (d in files) print "f", d, files[d] }' | \
54821 + while read type dir files; do \
54822 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
54823 + test -z "$$files" || { \
54824 + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
54825 + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
54829 uninstall-binPROGRAMS:
54830 @$(NORMAL_UNINSTALL)
54831 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
54832 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
54833 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
54834 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
54836 + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
54837 + files=`for p in $$list; do echo "$$p"; done | \
54838 + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
54839 + -e 's/$$/$(EXEEXT)/' `; \
54840 + test -n "$$list" || exit 0; \
54841 + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
54842 + cd "$(DESTDIR)$(bindir)" && rm -f $$files
54845 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
54846 -abook$(EXEEXT): $(abook_OBJECTS) $(abook_DEPENDENCIES)
54847 +abook$(EXEEXT): $(abook_OBJECTS) $(abook_DEPENDENCIES) $(EXTRA_abook_DEPENDENCIES)
54848 @rm -f abook$(EXEEXT)
54849 - $(LINK) $(abook_LDFLAGS) $(abook_OBJECTS) $(abook_LDADD) $(LIBS)
54850 + $(LINK) $(abook_OBJECTS) $(abook_LDADD) $(LIBS)
54852 mostlyclean-compile:
54854 @@ -348,23 +416,23 @@
54855 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
54856 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
54857 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Po@am__quote@
54858 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcard.Po@am__quote@
54859 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/views.Po@am__quote@
54860 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
54863 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
54864 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
54865 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
54866 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
54867 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
54868 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
54869 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
54872 -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
54873 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
54874 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
54875 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
54876 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
54877 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
54878 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
54879 -uninstall-info-am:
54881 # This directory's subdirectories are mostly independent; you can cd
54882 # into them and run `make' without going through this Makefile.
54883 @@ -373,7 +441,13 @@
54884 # (which will cause the Makefiles to be regenerated when you run `make');
54885 # (2) otherwise, pass the desired values on the `make' command line.
54886 $(RECURSIVE_TARGETS):
54887 - @set fnord $$MAKEFLAGS; amf=$$2; \
54888 + @fail= failcom='exit 1'; \
54889 + for f in x $$MAKEFLAGS; do \
54891 + *=* | --[!k]*);; \
54892 + *k*) failcom='fail=yes';; \
54896 target=`echo $@ | sed s/-recursive//`; \
54897 list='$(SUBDIRS)'; for subdir in $$list; do \
54898 @@ -384,16 +458,21 @@
54900 local_target="$$target"; \
54902 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
54903 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
54904 + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
54905 + || eval $$failcom; \
54907 if test "$$dot_seen" = "no"; then \
54908 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
54909 fi; test -z "$$fail"
54911 -mostlyclean-recursive clean-recursive distclean-recursive \
54912 -maintainer-clean-recursive:
54913 - @set fnord $$MAKEFLAGS; amf=$$2; \
54914 +$(RECURSIVE_CLEAN_TARGETS):
54915 + @fail= failcom='exit 1'; \
54916 + for f in x $$MAKEFLAGS; do \
54918 + *=* | --[!k]*);; \
54919 + *k*) failcom='fail=yes';; \
54924 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
54925 @@ -413,16 +492,16 @@
54927 local_target="$$target"; \
54929 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
54930 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
54931 + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
54932 + || eval $$failcom; \
54933 done && test -z "$$fail"
54935 list='$(SUBDIRS)'; for subdir in $$list; do \
54936 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
54937 + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
54940 list='$(SUBDIRS)'; for subdir in $$list; do \
54941 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
54942 + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
54945 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
54946 @@ -430,14 +509,14 @@
54947 unique=`for i in $$list; do \
54948 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
54950 - $(AWK) ' { files[$$0] = 1; } \
54951 - END { for (i in files) print i; }'`; \
54952 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
54953 + END { if (nonempty) { for (i in files) print i; }; }'`; \
54957 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
54958 $(TAGS_FILES) $(LISP)
54962 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
54963 include_option=--etags-include; \
54964 @@ -449,99 +528,129 @@
54965 list='$(SUBDIRS)'; for subdir in $$list; do \
54966 if test "$$subdir" = .; then :; else \
54967 test ! -f $$subdir/TAGS || \
54968 - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
54969 + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
54972 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
54973 unique=`for i in $$list; do \
54974 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
54976 - $(AWK) ' { files[$$0] = 1; } \
54977 - END { for (i in files) print i; }'`; \
54978 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
54979 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
54980 + END { if (nonempty) { for (i in files) print i; }; }'`; \
54982 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
54983 test -n "$$unique" || unique=$$empty_fix; \
54984 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
54985 - $$tags $$unique; \
54986 + if test $$# -gt 0; then \
54987 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
54988 + "$$@" $$unique; \
54990 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
54995 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
54996 $(TAGS_FILES) $(LISP)
54999 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
55000 unique=`for i in $$list; do \
55001 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
55003 - $(AWK) ' { files[$$0] = 1; } \
55004 - END { for (i in files) print i; }'`; \
55005 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
55006 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
55007 + END { if (nonempty) { for (i in files) print i; }; }'`; \
55008 + test -z "$(CTAGS_ARGS)$$unique" \
55009 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
55014 here=`$(am__cd) $(top_builddir) && pwd` \
55015 - && cd $(top_srcdir) \
55016 - && gtags -i $(GTAGS_ARGS) $$here
55017 + && $(am__cd) $(top_srcdir) \
55018 + && gtags -i $(GTAGS_ARGS) "$$here"
55021 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
55023 distdir: $(DISTFILES)
55024 $(am__remove_distdir)
55026 - $(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/intl $(distdir)/m4 $(distdir)/po
55027 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
55028 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
55029 - list='$(DISTFILES)'; for file in $$list; do \
55031 - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
55032 - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
55034 + test -d "$(distdir)" || mkdir "$(distdir)"
55035 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
55036 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
55037 + list='$(DISTFILES)'; \
55038 + dist_files=`for file in $$list; do echo $$file; done | \
55039 + sed -e "s|^$$srcdirstrip/||;t" \
55040 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
55041 + case $$dist_files in \
55042 + */*) $(MKDIR_P) `echo "$$dist_files" | \
55043 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
55046 + for file in $$dist_files; do \
55047 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
55048 - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
55049 - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
55051 - $(mkdir_p) "$(distdir)$$dir"; \
55055 if test -d $$d/$$file; then \
55056 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
55057 + if test -d "$(distdir)/$$file"; then \
55058 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
55060 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
55061 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
55062 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
55063 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
55065 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
55066 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
55068 - test -f $(distdir)/$$file \
55069 - || cp -p $$d/$$file $(distdir)/$$file \
55070 + test -f "$(distdir)/$$file" \
55071 + || cp -p $$d/$$file "$(distdir)/$$file" \
55075 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
55076 + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
55077 if test "$$subdir" = .; then :; else \
55078 - test -d "$(distdir)/$$subdir" \
55079 - || $(mkdir_p) "$(distdir)/$$subdir" \
55081 - distdir=`$(am__cd) $(distdir) && pwd`; \
55082 - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
55083 - (cd $$subdir && \
55084 + $(am__make_dryrun) \
55085 + || test -d "$(distdir)/$$subdir" \
55086 + || $(MKDIR_P) "$(distdir)/$$subdir" \
55088 + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
55089 + $(am__relativize); \
55090 + new_distdir=$$reldir; \
55091 + dir1=$$subdir; dir2="$(top_distdir)"; \
55092 + $(am__relativize); \
55093 + new_top_distdir=$$reldir; \
55094 + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
55095 + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
55096 + ($(am__cd) $$subdir && \
55097 $(MAKE) $(AM_MAKEFLAGS) \
55098 - top_distdir="$$top_distdir" \
55099 - distdir="$$distdir/$$subdir" \
55100 + top_distdir="$$new_top_distdir" \
55101 + distdir="$$new_distdir" \
55102 + am__remove_distdir=: \
55103 + am__skip_length_check=: \
55104 + am__skip_mode_fix=: \
55109 - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
55110 + -test -n "$(am__skip_mode_fix)" \
55111 + || find "$(distdir)" -type d ! -perm -755 \
55112 + -exec chmod u+rwx,go+rx {} \; -o \
55113 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
55114 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
55115 - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
55116 - || chmod -R a+r $(distdir)
55117 + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
55118 + || chmod -R a+r "$(distdir)"
55120 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
55121 $(am__remove_distdir)
55123 dist-bzip2: distdir
55124 - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
55125 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
55126 + $(am__remove_distdir)
55128 +dist-lzip: distdir
55129 + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
55130 + $(am__remove_distdir)
55132 +dist-lzma: distdir
55133 + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
55134 + $(am__remove_distdir)
55137 + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
55138 $(am__remove_distdir)
55141 @@ -567,25 +676,33 @@
55143 case '$(DIST_ARCHIVES)' in \
55145 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
55146 + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
55148 - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
55149 + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
55151 + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
55153 + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
55155 + xz -dc $(distdir).tar.xz | $(am__untar) ;;\
55157 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
55159 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
55160 + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
55162 unzip $(distdir).zip ;;\
55164 - chmod -R a-w $(distdir); chmod a+w $(distdir)
55165 + chmod -R a-w $(distdir); chmod u+w $(distdir)
55166 mkdir $(distdir)/_build
55167 mkdir $(distdir)/_inst
55168 chmod a-w $(distdir)
55169 + test -d $(distdir)/_build || exit 0; \
55170 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
55171 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
55172 - && cd $(distdir)/_build \
55173 + && am__cwd=`pwd` \
55174 + && $(am__cd) $(distdir)/_build \
55175 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
55176 - --with-included-gettext \
55177 + $(AM_DISTCHECK_CONFIGURE_FLAGS) \
55178 $(DISTCHECK_CONFIGURE_FLAGS) \
55179 && $(MAKE) $(AM_MAKEFLAGS) \
55180 && $(MAKE) $(AM_MAKEFLAGS) dvi \
55181 @@ -606,14 +723,24 @@
55182 && rm -rf "$$dc_destdir" \
55183 && $(MAKE) $(AM_MAKEFLAGS) dist \
55184 && rm -rf $(DIST_ARCHIVES) \
55185 - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
55186 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
55187 + && cd "$$am__cwd" \
55189 $(am__remove_distdir)
55190 @(echo "$(distdir) archives ready for distribution: "; \
55191 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
55192 - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
55193 + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
55194 distuninstallcheck:
55195 - @cd $(distuninstallcheck_dir) \
55196 - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
55197 + @test -n '$(distuninstallcheck_dir)' || { \
55198 + echo 'ERROR: trying to run $@ with an empty' \
55199 + '$$(distuninstallcheck_dir)' >&2; \
55202 + $(am__cd) '$(distuninstallcheck_dir)' || { \
55203 + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
55206 + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
55207 || { echo "ERROR: files left after uninstall:" ; \
55208 if test -n "$(DESTDIR)"; then \
55209 echo " (check DESTDIR support)"; \
55210 @@ -635,7 +762,7 @@
55211 installdirs: installdirs-recursive
55213 for dir in "$(DESTDIR)$(bindir)"; do \
55214 - test -z "$$dir" || $(mkdir_p) "$$dir"; \
55215 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
55217 install: install-recursive
55218 install-exec: install-exec-recursive
55219 @@ -647,16 +774,22 @@
55221 installcheck: installcheck-recursive
55223 - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
55224 - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
55225 - `test -z '$(STRIP)' || \
55226 - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
55227 + if test -z '$(STRIP)'; then \
55228 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
55229 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
55232 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
55233 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
55234 + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
55236 mostlyclean-generic:
55241 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
55242 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
55244 maintainer-clean-generic:
55245 @echo "This command is intended for maintainers to use"
55246 @@ -678,18 +811,38 @@
55248 html: html-recursive
55252 info: info-recursive
55256 install-data-am: install-data-local
55258 +install-dvi: install-dvi-recursive
55262 install-exec-am: install-binPROGRAMS
55264 +install-html: install-html-recursive
55268 install-info: install-info-recursive
55274 +install-pdf: install-pdf-recursive
55278 +install-ps: install-ps-recursive
55284 maintainer-clean: maintainer-clean-recursive
55285 @@ -711,26 +864,28 @@
55289 -uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local
55290 +uninstall-am: uninstall-binPROGRAMS uninstall-local
55292 -uninstall-info: uninstall-info-recursive
55293 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
55294 + ctags-recursive install-am install-strip tags-recursive
55296 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
55297 - check-am clean clean-binPROGRAMS clean-generic clean-recursive \
55298 - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
55299 - dist-shar dist-tarZ dist-zip distcheck distclean \
55300 - distclean-compile distclean-generic distclean-hdr \
55301 - distclean-recursive distclean-tags distcleancheck distdir \
55302 - distuninstallcheck dvi dvi-am html html-am info info-am \
55303 - install install-am install-binPROGRAMS install-data \
55304 - install-data-am install-data-local install-exec \
55305 - install-exec-am install-info install-info-am install-man \
55306 - install-strip installcheck installcheck-am installdirs \
55307 - installdirs-am maintainer-clean maintainer-clean-generic \
55308 - maintainer-clean-recursive mostlyclean mostlyclean-compile \
55309 - mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
55310 +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
55311 + all all-am am--refresh check check-am clean clean-binPROGRAMS \
55312 + clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
55313 + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
55314 + dist-zip distcheck distclean distclean-compile \
55315 + distclean-generic distclean-hdr distclean-tags distcleancheck \
55316 + distdir distuninstallcheck dvi dvi-am html html-am info \
55317 + info-am install install-am install-binPROGRAMS install-data \
55318 + install-data-am install-data-local install-dvi install-dvi-am \
55319 + install-exec install-exec-am install-html install-html-am \
55320 + install-info install-info-am install-man install-pdf \
55321 + install-pdf-am install-ps install-ps-am install-strip \
55322 + installcheck installcheck-am installdirs installdirs-am \
55323 + maintainer-clean maintainer-clean-generic mostlyclean \
55324 + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
55325 tags tags-recursive uninstall uninstall-am \
55326 - uninstall-binPROGRAMS uninstall-info-am uninstall-local
55327 + uninstall-binPROGRAMS uninstall-local
55330 install-data-local:
55331 @@ -741,6 +896,7 @@
55333 -rm -f $(DESTDIR)$(mandir)/man1/abook.1
55334 -rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
55336 # Tell versions [3.59,3.63) of GNU make to not export all variables.
55337 # Otherwise a system limit (for SysV at least) may be exceeded.
55339 diff -urN BUILD/abook-0.6.0pre2/misc.c abook/misc.c
55340 --- BUILD/abook-0.6.0pre2/misc.c 2013-03-14 10:42:00.100864946 +0100
55341 +++ abook/misc.c 2013-03-13 15:07:45.000000000 +0100
55345 - * $Id: misc.c,v 1.23 2006/09/04 18:29:25 cduval Exp $
55348 * by JH <jheinonen@users.sourceforge.net>
55354 +#ifndef HAVE_STRCASESTR
55356 -strcasestr(char *haystack, char *needle)
55357 +strcasestr(const char *haystack, const char *needle)
55368 #ifdef HAVE_CONFIG_H
55369 # include "config.h"
55370 diff -urN BUILD/abook-0.6.0pre2/misc.h abook/misc.h
55371 --- BUILD/abook-0.6.0pre2/misc.h 2013-03-14 10:42:00.100864946 +0100
55372 +++ abook/misc.h 2013-03-13 15:07:45.000000000 +0100
55375 int is_number(char *s);
55377 -char *strcasestr(char *haystack, char *needle);
55379 char *strdup_printf(const char *format, ... );
55380 char *strconcat(const char *str, ...);
55383 #ifndef HAVE_VSNPRINTF
55384 int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
55387 +#ifndef HAVE_STRCASESTR
55388 +char *strcasestr(const char *, const char *);
55394 diff -urN BUILD/abook-0.6.0pre2/missing abook/missing
55395 --- BUILD/abook-0.6.0pre2/missing 2001-10-02 20:15:53.000000000 +0200
55396 +++ abook/missing 2013-03-13 15:07:45.000000000 +0100
55399 # Common stub for a few missing GNU programs while installing.
55400 -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
55402 +scriptversion=2012-01-06.13; # UTC
55404 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
55405 +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
55406 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
55408 # This program is free software; you can redistribute it and/or modify
55410 # GNU General Public License for more details.
55412 # You should have received a copy of the GNU General Public License
55413 -# along with this program; if not, write to the Free Software
55414 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
55415 -# 02111-1307, USA.
55416 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
55418 # As a special exception to the GNU General Public License, if you
55419 # distribute this file as part of a program that contains a
55424 +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
55425 +sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
55427 # In the cases where this matters, `missing' is being run in the
55429 @@ -38,18 +42,24 @@
55430 configure_ac=configure.in
55434 +msg="missing on your system"
55438 # Try to run requested program, and just exit if it succeeds.
55442 + # Exit code 63 means version mismatch. This often happens
55443 + # when the user try to use an ancient version of a tool on
55444 + # a file that requires a minimum version. In this case we
55445 + # we should proceed has if the program had been absent, or
55446 + # if --run hadn't been passed.
55447 + if test $? = 63; then
55449 + msg="probably too old"
55454 -# If it does not exist, or fails to run (possibly an outdated version),
55455 -# try to emulate it.
55458 -h|--h|--he|--hel|--help)
55460 @@ -67,18 +77,25 @@
55461 aclocal touch file \`aclocal.m4'
55462 autoconf touch file \`configure'
55463 autoheader touch file \`config.h.in'
55464 + autom4te touch the output file, or create a stub one
55465 automake touch all \`Makefile.in' files
55466 bison create \`y.tab.[ch]', if possible, from existing .[ch]
55467 flex create \`lex.yy.c', if possible, from existing .c
55468 help2man touch the output file
55469 lex create \`lex.yy.c', if possible, from existing .c
55470 makeinfo touch the output file
55471 - tar try tar, gnutar, gtar, then tar without non-portable flags
55472 - yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
55473 + yacc create \`y.tab.[ch]', if possible, from existing .[ch]
55475 +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
55476 +\`g' are ignored when checking the name.
55478 +Send bug reports to <bug-automake@gnu.org>."
55482 -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
55483 - echo "missing 0.3 - GNU automake"
55484 + echo "missing $scriptversion (GNU Automake)"
55489 @@ -87,27 +104,60 @@
55496 +# normalize program name to check for.
55497 +program=`echo "$1" | sed '
55502 +# Now exit if we have it, but it failed. Also exit now if we
55503 +# don't have it and --version was passed (most likely to detect
55504 +# the program). This is about non-GNU programs, so use $1 not
55508 + # Not GNU programs, they don't have --version.
55512 + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
55513 + # We have it, but it failed.
55515 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
55516 + # Could not run --version or --help. This is probably someone
55517 + # running `$TOOL --version' or `$TOOL --help' to check whether
55518 + # $TOOL exists and not knowing $TOOL uses missing.
55524 +# If it does not exist, or fails to run (possibly an outdated version),
55525 +# try to emulate it.
55529 -WARNING: \`$1' is missing on your system. You should only need it if
55530 +WARNING: \`$1' is $msg. You should only need it if
55531 you modified \`acinclude.m4' or \`${configure_ac}'. You might want
55532 to install the \`Automake' and \`Perl' packages. Grab them from
55533 any GNU archive site."
55540 -WARNING: \`$1' is missing on your system. You should only need it if
55541 +WARNING: \`$1' is $msg. You should only need it if
55542 you modified \`${configure_ac}'. You might want to install the
55543 \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
55551 -WARNING: \`$1' is missing on your system. You should only need it if
55552 +WARNING: \`$1' is $msg. You should only need it if
55553 you modified \`acconfig.h' or \`${configure_ac}'. You might want
55554 to install the \`Autoconf' and \`GNU m4' packages. Grab them
55555 from any GNU archive site."
55556 @@ -115,7 +165,7 @@
55557 test -z "$files" && files="config.h"
55559 for f in $files; do
55562 *:*) touch_files="$touch_files "`echo "$f" |
55563 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
55564 *) touch_files="$touch_files $f.in";;
55565 @@ -124,9 +174,9 @@
55572 -WARNING: \`$1' is missing on your system. You should only need it if
55573 +WARNING: \`$1' is $msg. You should only need it if
55574 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
55575 You might want to install the \`Automake' and \`Perl' packages.
55576 Grab them from any GNU archive site."
55577 @@ -135,145 +185,135 @@
55578 while read f; do touch "$f"; done
55584 +WARNING: \`$1' is needed, but is $msg.
55585 + You might have modified some files without having the
55586 + proper tools for further handling them.
55587 + You can get \`$1' as part of \`Autoconf' from any GNU
55590 + file=`echo "$*" | sed -n "$sed_output"`
55591 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
55592 + if test -f "$file"; then
55595 + test -z "$file" || exec >$file
55596 + echo "#! /bin/sh"
55597 + echo "# Created by GNU Automake missing as a replacement of"
55607 -WARNING: \`$1' is missing on your system. You should only need it if
55608 +WARNING: \`$1' $msg. You should only need it if
55609 you modified a \`.y' file. You may need the \`Bison' package
55610 in order for those modifications to take effect. You can get
55611 \`Bison' from any GNU archive site."
55612 rm -f y.tab.c y.tab.h
55613 - if [ $# -ne 1 ]; then
55614 - eval LASTARG="\${$#}"
55615 - case "$LASTARG" in
55616 + if test $# -ne 1; then
55617 + eval LASTARG=\${$#}
55620 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
55621 - if [ -f "$SRCFILE" ]; then
55622 + if test -f "$SRCFILE"; then
55623 cp "$SRCFILE" y.tab.c
55625 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
55626 - if [ -f "$SRCFILE" ]; then
55627 + if test -f "$SRCFILE"; then
55628 cp "$SRCFILE" y.tab.h
55633 - if [ ! -f y.tab.h ]; then
55634 + if test ! -f y.tab.h; then
55637 - if [ ! -f y.tab.c ]; then
55638 + if test ! -f y.tab.c; then
55639 echo 'main() { return 0; }' >y.tab.c
55646 -WARNING: \`$1' is missing on your system. You should only need it if
55647 +WARNING: \`$1' is $msg. You should only need it if
55648 you modified a \`.l' file. You may need the \`Flex' package
55649 in order for those modifications to take effect. You can get
55650 \`Flex' from any GNU archive site."
55652 - if [ $# -ne 1 ]; then
55653 - eval LASTARG="\${$#}"
55654 - case "$LASTARG" in
55655 + if test $# -ne 1; then
55656 + eval LASTARG=\${$#}
55659 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
55660 - if [ -f "$SRCFILE" ]; then
55661 + if test -f "$SRCFILE"; then
55662 cp "$SRCFILE" lex.yy.c
55667 - if [ ! -f lex.yy.c ]; then
55668 + if test ! -f lex.yy.c; then
55669 echo 'main() { return 0; }' >lex.yy.c
55676 -WARNING: \`$1' is missing on your system. You should only need it if
55677 +WARNING: \`$1' is $msg. You should only need it if
55678 you modified a dependency of a manual page. You may need the
55679 \`Help2man' package in order for those modifications to take
55680 effect. You can get \`Help2man' from any GNU archive site."
55682 - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
55683 - if test -z "$file"; then
55684 - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
55686 - if [ -f "$file" ]; then
55687 + file=`echo "$*" | sed -n "$sed_output"`
55688 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
55689 + if test -f "$file"; then
55692 test -z "$file" || exec >$file
55693 echo ".ab help2man is required to generate this page"
55700 - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
55701 - # We have makeinfo, but it failed.
55707 -WARNING: \`$1' is missing on your system. You should only need it if
55708 +WARNING: \`$1' is $msg. You should only need it if
55709 you modified a \`.texi' or \`.texinfo' file, or any other file
55710 indirectly affecting the aspect of the manual. The spurious
55711 call might also be the consequence of using a buggy \`make' (AIX,
55712 DU, IRIX). You might want to install the \`Texinfo' package or
55713 the \`GNU make' package. Grab either from any GNU archive site."
55714 - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
55715 + # The file to touch is that specified with -o ...
55716 + file=`echo "$*" | sed -n "$sed_output"`
55717 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
55718 if test -z "$file"; then
55719 - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
55720 - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
55722 + # ... or it is the one specified with @setfilename ...
55723 + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
55726 + s/.* \([^ ]*\) *$/\1/
55730 + # ... or it is derived from the source name (dir/f.texi becomes f.info)
55731 + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
55733 + # If the file does not exist, the user really needs makeinfo;
55734 + # let's fail without touching anything.
55735 + test -f $file || exit 1
55741 - if test -n "$run"; then
55742 - echo 1>&2 "ERROR: \`tar' requires --run"
55746 - # We have already tried tar in the generic part.
55747 - # Look for gnutar/gtar before invocation to avoid ugly error
55749 - if (gnutar --version > /dev/null 2>&1); then
55750 - gnutar ${1+"$@"} && exit 0
55752 - if (gtar --version > /dev/null 2>&1); then
55753 - gtar ${1+"$@"} && exit 0
55757 - case "$firstarg" in
55759 - firstarg=`echo "$firstarg" | sed s/o//`
55760 - tar "$firstarg" ${1+"$@"} && exit 0
55763 - case "$firstarg" in
55765 - firstarg=`echo "$firstarg" | sed s/h//`
55766 - tar "$firstarg" ${1+"$@"} && exit 0
55772 -WARNING: I can't seem to be able to run \`tar' with the given arguments.
55773 - You may want to install GNU tar or Free paxutils, or check the
55774 - command line arguments."
55780 -WARNING: \`$1' is needed, and you do not seem to have it handy on your
55781 - system. You might have modified some files without having the
55782 +WARNING: \`$1' is needed, and is $msg.
55783 + You might have modified some files without having the
55784 proper tools for further handling them. Check the \`README' file,
55785 - it often tells you about the needed prerequirements for installing
55786 + it often tells you about the needed prerequisites for installing
55787 this package. You may also peek at any GNU archive site, in case
55788 some other package would contain this missing \`$1' program."
55790 @@ -281,3 +321,11 @@
55795 +# Local variables:
55796 +# eval: (add-hook 'write-file-hooks 'time-stamp)
55797 +# time-stamp-start: "scriptversion="
55798 +# time-stamp-format: "%:y-%02m-%02d.%02H"
55799 +# time-stamp-time-zone: "UTC"
55800 +# time-stamp-end: "; # UTC"
55802 diff -urN BUILD/abook-0.6.0pre2/mkinstalldirs abook/mkinstalldirs
55803 --- BUILD/abook-0.6.0pre2/mkinstalldirs 2001-03-12 11:13:19.000000000 +0100
55804 +++ abook/mkinstalldirs 2013-03-13 15:07:45.000000000 +0100
55807 # mkinstalldirs --- make directory hierarchy
55808 -# Author: Noah Friedman <friedman@prep.ai.mit.edu>
55809 -# Created: 1993-05-16
55812 -# $Id: mkinstalldirs,v 1.1.1.1 2001/03/12 10:13:19 jheinonen Exp $
55813 +scriptversion=2009-04-28.21; # UTC
55815 +# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
55816 +# Created: 1993-05-16
55819 +# This file is maintained in Automake, please report
55820 +# bugs to <bug-automake@gnu.org> or send patches to
55821 +# <automake-patches@gnu.org>.
55830 +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
55832 +Create each directory DIR (with mode MODE, if specified), including all
55833 +leading file name components.
55835 +Report bugs to <bug-automake@gnu.org>."
55837 +# process command line arguments
55838 +while test $# -gt 0 ; do
55840 + -h | --help | --h*) # -h for help
55844 + -m) # -m PERM arg
55846 + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
55851 + echo "$0 $scriptversion"
55854 + --) # stop option processing
55858 + -*) # unknown option
55859 + echo "$usage" 1>&2
55862 + *) # first non-opt arg
55870 - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
55872 + if test -d "$file"; then
55883 +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
55884 +# mkdir -p a/c at the same time, both will detect that a is missing,
55885 +# one will create a, then the other will try to create a and die with
55886 +# a "File exists" error. This is a problem when calling mkinstalldirs
55887 +# from a parallel make. We use --version in the probe to restrict
55888 +# ourselves to GNU mkdir, which is thread-safe.
55891 + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
55892 + echo "mkdir -p -- $*"
55893 + exec mkdir -p -- "$@"
55895 + # On NextStep and OpenStep, the `mkdir' command does not
55896 + # recognize any option. It will interpret all options as
55897 + # directories to create, and then abort because `.' already
55899 + test -d ./-p && rmdir ./-p
55900 + test -d ./--version && rmdir ./--version
55904 + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
55905 + test ! -d ./--version; then
55906 + echo "mkdir -m $dirmode -p -- $*"
55907 + exec mkdir -m "$dirmode" -p -- "$@"
55909 + # Clean up after NextStep and OpenStep mkdir.
55910 + for d in ./-m ./-p ./--version "./$dirmode";
55912 + test -d $d && rmdir $d
55921 - pathcomp="$pathcomp$d"
55922 - case "$pathcomp" in
55923 - -* ) pathcomp=./$pathcomp ;;
55926 - if test ! -d "$pathcomp"; then
55927 - echo "mkdir $pathcomp" 1>&2
55929 - mkdir "$pathcomp" || lasterr=$?
55931 - if test ! -d "$pathcomp"; then
55932 - errstatus=$lasterr
55938 + /*) pathcomp=/ ;;
55949 + test "x$d" = x && continue
55951 + pathcomp=$pathcomp$d
55952 + case $pathcomp in
55953 + -*) pathcomp=./$pathcomp ;;
55956 + if test ! -d "$pathcomp"; then
55957 + echo "mkdir $pathcomp"
55959 + mkdir "$pathcomp" || lasterr=$?
55961 + if test ! -d "$pathcomp"; then
55962 + errstatus=$lasterr
55964 + if test ! -z "$dirmode"; then
55965 + echo "chmod $dirmode $pathcomp"
55967 + chmod "$dirmode" "$pathcomp" || lasterr=$?
55969 + if test ! -z "$lasterr"; then
55970 + errstatus=$lasterr
55976 - pathcomp="$pathcomp/"
55978 + pathcomp=$pathcomp/
55984 -# mkinstalldirs ends here
55985 +# Local Variables:
55986 +# mode: shell-script
55987 +# sh-indentation: 2
55988 +# eval: (add-hook 'write-file-hooks 'time-stamp)
55989 +# time-stamp-start: "scriptversion="
55990 +# time-stamp-format: "%:y-%02m-%02d.%02H"
55991 +# time-stamp-time-zone: "UTC"
55992 +# time-stamp-end: "; # UTC"
55994 diff -urN BUILD/abook-0.6.0pre2/options.c abook/options.c
55995 --- BUILD/abook-0.6.0pre2/options.c 2006-09-06 10:48:33.000000000 +0200
55996 +++ abook/options.c 2013-03-13 15:07:45.000000000 +0100
56000 - * $Id: options.c,v 1.33 2006/09/06 08:48:33 jheinonen Exp $
56003 * by JH <jheinonen@users.sourceforge.net>
56006 { "preserve_fields", OT_STR, STR_PRESERVE_FIELDS, UL "standard" },
56007 { "sort_field", OT_STR, STR_SORT_FIELD, UL "nick" },
56008 { "show_cursor", OT_BOOL, BOOL_SHOW_CURSOR, FALSE },
56010 + { "use_mouse", OT_BOOL, BOOL_USE_MOUSE, FALSE },
56011 + { "use_colors", OT_BOOL, BOOL_USE_COLORS, FALSE },
56012 + { "color_header_fg", OT_STR, STR_COLOR_HEADER_FG, UL "blue" },
56013 + { "color_header_fg", OT_STR, STR_COLOR_HEADER_FG, UL "blue" },
56014 + { "color_header_bg", OT_STR, STR_COLOR_HEADER_BG, UL "red" },
56015 + { "color_footer_fg", OT_STR, STR_COLOR_FOOTER_FG, UL "red" },
56016 + { "color_footer_bg", OT_STR, STR_COLOR_FOOTER_BG, UL "default" },
56017 + { "color_list_even_fg", OT_STR, STR_COLOR_LIST_EVEN_FG, UL "yellow" },
56018 + { "color_list_even_bg", OT_STR, STR_COLOR_LIST_EVEN_BG, UL "default" },
56019 + { "color_list_odd_fg", OT_STR, STR_COLOR_LIST_ODD_FG, UL "default" },
56020 + { "color_list_odd_bg", OT_STR, STR_COLOR_LIST_ODD_BG, UL "default" },
56021 + { "color_list_header_fg", OT_STR, STR_COLOR_LIST_HEADER_FG, UL "white" },
56022 + { "color_list_header_bg", OT_STR, STR_COLOR_LIST_HEADER_BG, UL "blue" },
56023 + { "color_list_highlight_fg", OT_STR, STR_COLOR_LIST_HIGHLIGHT_FG, UL "black" },
56024 + { "color_list_highlight_bg", OT_STR, STR_COLOR_LIST_HIGHLIGHT_BG, UL "green" },
56025 + { "color_tab_border_fg", OT_STR, STR_COLOR_TAB_BORDER_FG, UL "cyan" },
56026 + { "color_tab_border_bg", OT_STR, STR_COLOR_TAB_BORDER_BG, UL "default" },
56027 + { "color_tab_label_fg", OT_STR, STR_COLOR_TAB_LABEL_FG, UL "magenta" },
56028 + { "color_tab_label_bg", OT_STR, STR_COLOR_TAB_LABEL_BG, UL "default" },
56029 + { "color_field_name_fg", OT_STR, STR_COLOR_FIELD_NAME_FG, UL "yellow" },
56030 + { "color_field_name_bg", OT_STR, STR_COLOR_FIELD_NAME_BG, UL "default" },
56031 + { "color_field_value_fg", OT_STR, STR_COLOR_FIELD_VALUE_FG, UL "green" },
56032 + { "color_field_value_bg", OT_STR, STR_COLOR_FIELD_VALUE_BG, UL "default" },
56036 diff -urN BUILD/abook-0.6.0pre2/options.h abook/options.h
56037 --- BUILD/abook-0.6.0pre2/options.h 2006-09-04 21:24:18.000000000 +0200
56038 +++ abook/options.h 2013-03-13 15:07:45.000000000 +0100
56040 BOOL_USE_ASCII_ONLY,
56041 BOOL_ADD_EMAIL_PREVENT_DUPLICATES,
56050 STR_PRESERVE_FIELDS,
56052 + STR_COLOR_HEADER_FG,
56053 + STR_COLOR_HEADER_BG,
56054 + STR_COLOR_FOOTER_FG,
56055 + STR_COLOR_FOOTER_BG,
56056 + STR_COLOR_LIST_EVEN_FG,
56057 + STR_COLOR_LIST_EVEN_BG,
56058 + STR_COLOR_LIST_ODD_FG,
56059 + STR_COLOR_LIST_ODD_BG,
56060 + STR_COLOR_LIST_HEADER_FG,
56061 + STR_COLOR_LIST_HEADER_BG,
56062 + STR_COLOR_LIST_HIGHLIGHT_FG,
56063 + STR_COLOR_LIST_HIGHLIGHT_BG,
56064 + STR_COLOR_TAB_BORDER_FG,
56065 + STR_COLOR_TAB_BORDER_BG,
56066 + STR_COLOR_TAB_LABEL_FG,
56067 + STR_COLOR_TAB_LABEL_BG,
56068 + STR_COLOR_FIELD_NAME_FG,
56069 + STR_COLOR_FIELD_NAME_BG,
56070 + STR_COLOR_FIELD_VALUE_FG,
56071 + STR_COLOR_FIELD_VALUE_BG,
56075 diff -urN BUILD/abook-0.6.0pre2/po/abook.pot abook/po/abook.pot
56076 --- BUILD/abook-0.6.0pre2/po/abook.pot 2006-09-06 16:14:38.000000000 +0200
56077 +++ abook/po/abook.pot 2013-03-13 15:07:45.000000000 +0100
56078 @@ -6,229 +6,248 @@
56082 -"Project-Id-Version: PACKAGE VERSION\n"
56083 +"Project-Id-Version: abook 0.6.0pre2\n"
56084 "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
56085 -"POT-Creation-Date: 2006-09-06 17:14+0300\n"
56086 +"POT-Creation-Date: 2013-01-17 14:44+0100\n"
56087 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
56088 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
56089 "Language-Team: LANGUAGE <LL@li.org>\n"
56091 "MIME-Version: 1.0\n"
56092 "Content-Type: text/plain; charset=CHARSET\n"
56093 "Content-Transfer-Encoding: 8bit\n"
56098 msgid "Cannot create directory %s\n"
56104 msgid "%s is not a directory\n"
56110 msgid "Memory allocation failure: %s\n"
56116 msgid "Press enter to continue...\n"
56122 msgid "File %s is not writeable"
56127 msgid "If you continue all changes will be lost. Do you want to continue?"
56132 msgid "Save database"
56137 msgid "Quit without saving"
56143 msgid "%s is not a valid HOME directory\n"
56150 "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
56157 msgid "please use option --%s after --convert option\n"
56163 +msgid "please use option --outformat after --convert or --mutt-query option\n"
56168 +msgid "Invalid custom format string\n"
56173 msgid "%s: unrecognized arguments on command line\n"
56178 msgid " -h\t--help\t\t\t\tshow usage"
56183 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
56188 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
56193 msgid "\t--mutt-query\t<string>\tmake a query for mutt"
56199 "\t--add-email\t\t\tread an e-mail message from stdin and\n"
56200 "\t\t\t\t\tadd the sender to the addressbook"
56206 "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
56207 "\t\t\t\t\trequire to confirm adding"
56212 msgid "\t--convert\t\t\tconvert address book files"
56217 msgid "\toptions to use with --convert:"
56222 msgid "\t--informat\t<format>\tformat for input file"
56227 msgid "\t\t\t\t\t(default: abook)"
56232 msgid "\t--infile\t<file>\t\tsource file"
56237 msgid "\t\t\t\t\t(default: stdin)"
56242 msgid "\t--outformat\t<format>\tformat for output file"
56247 msgid "\t\t\t\t\t(default: text)"
56252 msgid "\t--outfile\t<file>\t\tdestination file"
56257 msgid "\t\t\t\t\t(default: stdout)"
56262 +msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
56266 +msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
56270 msgid "\t--formats\t\t\tlist available formats"
56276 msgid "Cannot open database\n"
56282 msgid "too few arguments to make conversion\n"
56288 msgid "try --help\n"
56295 "input and output formats are the same\n"
56302 msgid "input format %s not supported\n"
56308 msgid "cannot read file %s\n"
56314 msgid "output format %s not supported\n"
56320 msgid "cannot write file %s\n"
56326 msgid "cannot open %s\n"
56332 msgid "%d item(s) added to %s\n"
56337 msgid "Valid sender address not found"
56343 msgid "Address %s already in addressbook\n"
56350 "cannot open /dev/tty\n"
56351 "you may want to use --add-email-quiet\n"
56357 msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
56360 -#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
56361 +#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
56362 msgid "keybinding for yes|y"
56365 -#: abook.c:753 abook.c:755 ui.c:341
56366 +#: abook.c:781 abook.c:783 ui.c:432
56367 msgid "keybinding for no|n"
56373 msgid "stdin is a directory or cannot stat stdin\n"
56375 @@ -301,196 +320,239 @@
56376 msgid "Anniversary day"
56385 msgid "field already defined"
56390 msgid "standard field does not need to be declared"
56395 msgid "unknown type"
56400 msgid "Invalid field value defined in configuration"
56405 msgid "Invalid field value for sorting"
56410 msgid "Tab name too wide for screen"
56415 msgid "keybindings_new_123456789|n123456789"
56421 msgid "Choose %s to modify (<1>%s%c%s%s."
56469 msgid "Year (optional): "
56474 msgid "Invalid date"
56484 msgid "?:help q:quit editor"
56487 -#: filter.c:71 filter.c:82
56488 +#: filter.c:88 filter.c:100
56489 msgid "abook native format"
56494 msgid "ldif / Netscape addressbook"
56497 -#: filter.c:73 filter.c:84
56498 +#: filter.c:90 filter.c:103 filter.c:121
56502 -#: filter.c:74 filter.c:86
56503 +#: filter.c:91 filter.c:106
56504 msgid "pine addressbook"
56507 -#: filter.c:75 filter.c:88
56508 +#: filter.c:92 filter.c:107
56509 msgid "comma separated values"
56512 -#: filter.c:76 filter.c:89
56513 +#: filter.c:93 filter.c:108
56514 msgid "comma separated values (all fields)"
56517 -#: filter.c:77 filter.c:90
56518 +#: filter.c:94 filter.c:109
56519 msgid "Palm comma separated values"
56524 +msgid "vCard file"
56528 msgid "ldif / Netscape addressbook (.4ld)"
56532 -msgid "html document"
56533 +#: filter.c:102 filter.c:120
56534 +msgid "vCard 2 file"
56538 -msgid "GnomeCard (VCard) addressbook"
56540 +msgid "mutt query format (internal use)"
56545 +msgid "html document"
56559 msgid "Wanderlust address book"
56564 msgid "Spruce address book"
56569 msgid "BSD calendar"
56574 +#: filter.c:115 filter.c:122
56575 +msgid "Custom format"
56579 +msgid "input formats:"
56585 +msgid "output formats:"
56590 +msgid "query-compatible output formats:"
56594 msgid "import database"
56597 -#: filter.c:182 filter.c:299
56598 +#: filter.c:216 filter.c:345
56599 msgid "please select a filter"
56602 -#: filter.c:190 filter.c:307
56603 +#: filter.c:224 filter.c:353
56604 msgid "x -\tcancel"
56607 -#: filter.c:211 filter.c:345
56608 +#: filter.c:245 filter.c:391
56614 msgid "Error occured while opening the file"
56619 msgid "File does not seem to be a valid addressbook"
56624 msgid "export database"
56629 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
56632 -#: filter.c:331 ui.c:632
56633 +#: filter.c:377 ui.c:769
56634 msgid "keybindings:all/selected/cancel|asc"
56639 msgid "Error occured while exporting"
56645 msgid "%02d/%02d\tAnniversary of %s\n"
56650 +msgid "parse_custom_format: fmt_string or ft not allocated\n"
56655 +msgid "parse_custom_format: invalid placeholder: {%s}\n"
56660 +msgid "%s: invalid format, index %ld\n"
56664 msgid "\t?\t\thelp\n"
56666 @@ -528,255 +590,271 @@
56670 +msgid "\tM\t\tmerge selected items (into top one)\n"
56674 msgid "\tD\t\tduplicate item\n"
56678 +msgid "\tU\t\tremove duplicates\n"
56682 msgid "\tspace\t\tselect item\n"
56687 msgid "\t+\t\tselect all\n"
56692 msgid "\t-\t\tunselect all\n"
56697 msgid "\t*\t\tinvert selection\n"
56702 msgid "\tw\t\twrite database to disk\n"
56707 msgid "\tl\t\tread database from disk\n"
56712 msgid "\tC\t\tclear whole database\n"
56717 msgid "\ti\t\timport database\n"
56722 msgid "\te\t\texport database\n"
56727 msgid "\tp\t\tprint database\n"
56732 msgid "\to\t\topen database\n"
56737 msgid "\ts\t\tsort database\n"
56742 msgid "\tS\t\t\"surname sort\"\n"
56747 msgid "\tF\t\tsort by field (defined in configuration file)\n"
56752 msgid "\t/\t\tsearch\n"
56757 msgid "\t\\\t\tsearch next occurrence\n"
56762 msgid "\tA\t\tmove current item up\n"
56767 msgid "\tZ\t\tmove current item down\n"
56772 msgid "\tm\t\tsend mail with mutt\n"
56777 msgid "\tv\t\tview URL with web browser\n"
56782 msgid "\tarrows/h,l\t\tchange tab\n"
56787 msgid "\tq\t\t\tquit to main screen\n"
56792 msgid "\t1 - 5 A - Z\t\tedit fields\n"
56797 msgid "\tk or <\t\t\tprevious item\n"
56802 msgid "\tj or >\t\t\tnext item\n"
56807 msgid "\tr\t\t\troll e-mail addresses up\n"
56812 msgid "\tESC-r\t\t\troll e-mail addresses down\n"
56817 msgid "\tu\t\t\tundo\n"
56822 msgid "\tm\t\t\tsend mail with mutt\n"
56827 msgid "\tv\t\t\tview url with web browser\n"
56832 msgid "quote mismatch"
56837 msgid "no assignment character found"
56842 msgid "error in comma separated list"
56845 -#: options.c:289 options.c:308
56846 +#: options.c:311 options.c:330
56847 msgid "invalid value"
56852 msgid "unknown option"
56859 "valid values for the 'preserve_fields' option are 'all', "
56860 "'standard' (default), and 'none'\n"
56867 "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
56873 msgid "invalid value assignment"
56879 "customfield: obsolete command - please use the 'field' and 'view' commands "
56885 msgid "no view name provided"
56890 msgid "no field identifier provided"
56895 msgid "no field name provided"
56901 msgid "%s: parse error at line %d: "
56907 msgid "unknown token %s\n"
56913 msgid "Your terminal size is %dx%d\n"
56919 msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
56939 msgid "Press any key to continue..."
56944 msgid "Remove selected item(s)"
56949 +msgid "Merge selected items"
56953 +msgid "Remove duplicates"
56957 msgid "Clear WHOLE database"
56962 msgid "Search hit bottom, continuing at top"
56968 msgid "Your current data will be lost - Press '%c' to continue"
56973 msgid "Print <a>ll, print <s>elected, or <c>ancel?"
56978 msgid "No selected items"
56983 msgid "File to open: "
56988 msgid "Save current database"
56993 msgid "Sorry, the specified file appears not to be a valid abook addressbook"
56996 diff -urN BUILD/abook-0.6.0pre2/po/boldquot.sed abook/po/boldquot.sed
56997 --- BUILD/abook-0.6.0pre2/po/boldquot.sed 1970-01-01 01:00:00.000000000 +0100
56998 +++ abook/po/boldquot.sed 2013-03-13 15:07:45.000000000 +0100
57000 +s/"\([^"]*\)"/ā\1ā/g
57001 +s/`\([^`']*\)'/ā\1ā/g
57002 +s/ '\([^`']*\)' / ā\1ā /g
57003 +s/ '\([^`']*\)'$/ ā\1ā/g
57004 +s/^'\([^`']*\)' /ā\1ā /g
57010 Binarne pliki BUILD/abook-0.6.0pre2/po/de.gmo i abook/po/de.gmo rĆ³Å¼niÄ
siÄ
57011 diff -urN BUILD/abook-0.6.0pre2/po/de.po abook/po/de.po
57012 --- BUILD/abook-0.6.0pre2/po/de.po 2006-09-06 16:14:38.000000000 +0200
57013 +++ abook/po/de.po 2013-03-13 15:07:45.000000000 +0100
57015 # German translations for abook package.
57016 -# Copyright (C) 2005 Free Software Foundation, Inc.
57017 +# Copyright (C) 2005 Jaakko Heinonen
57018 # This file is distributed under the same license as the abook package.
57019 # Johannes WeiĆl <jargon@molb.org>, 2005.
57020 -# Gerfried Fuchs <alfie@ist.org>, 2006.
57021 +# Gerfried Fuchs <rhonda@deb.at>, 2007-2010.
57025 "Project-Id-Version: abook 0.5.5pre1\n"
57026 "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
57027 -"POT-Creation-Date: 2006-09-06 17:14+0300\n"
57028 -"PO-Revision-Date: 2006-09-04 21:00+0200\n"
57029 -"Last-Translator: Johannes WeiĆl <jargon@molb.org>\n"
57030 +"POT-Creation-Date: 2013-01-17 14:44+0100\n"
57031 +"PO-Revision-Date: 2010-02-15 18:10+0100\n"
57032 +"Last-Translator: Gerfried Fuchs <rhonda@deb.at>\n"
57033 "Language-Team: German <de@li.org>\n"
57035 "MIME-Version: 1.0\n"
57036 "Content-Type: text/plain; charset=utf-8\n"
57037 "Content-Transfer-Encoding: 8bit\n"
57038 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
57040 # Difficulties: how to translate tab, item, custom, comma separated values
57044 msgid "Cannot create directory %s\n"
57045 msgstr "Kann Verzeichnis %s nicht anlegen\n"
57050 msgid "%s is not a directory\n"
57051 msgstr "%s ist kein Verzeichnis\n"
57056 msgid "Memory allocation failure: %s\n"
57057 msgstr "Fehler beim Anfordern von Hauptspeicher: %s\n"
57062 msgid "Press enter to continue...\n"
57063 msgstr "Eingabetaste drĆ¼cken, um fortzufahren...\n"
57068 msgid "File %s is not writeable"
57069 msgstr "Datei %s ist nicht beschreibbar"
57073 msgid "If you continue all changes will be lost. Do you want to continue?"
57074 msgstr "Beim Fortfahren gehen alle Ćnderungen verloren. Fortfahren?"
57078 msgid "Save database"
57079 msgstr "Speichere Datenbank"
57083 msgid "Quit without saving"
57084 msgstr "Beenden ohne zu speichern"
57089 msgid "%s is not a valid HOME directory\n"
57090 msgstr "%s ist kein gĆ¼ltiges HOME Verzeichnis\n"
57096 "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
57097 @@ -69,33 +70,43 @@
57098 "Die Optionen --mutt-query, --convert, --add-email und --add-email-"
57099 "quietkƶnnen nicht kombiniert werden\n"
57104 msgid "please use option --%s after --convert option\n"
57105 msgstr "Bitte die Option --%s nach der Option --convert angeben\n"
57109 +#, fuzzy, c-format
57110 +msgid "please use option --outformat after --convert or --mutt-query option\n"
57111 +msgstr "Bitte die Option --%s nach der Option --convert angeben\n"
57114 +#, fuzzy, c-format
57115 +msgid "Invalid custom format string\n"
57116 +msgstr "UngĆ¼ltiger Feld-Wert fĆ¼r die Sortierung"
57120 msgid "%s: unrecognized arguments on command line\n"
57121 msgstr "%s: unbekannte Argumente auf der Kommandozeile\n"
57125 msgid " -h\t--help\t\t\t\tshow usage"
57126 msgstr " -h\t--help\t\t\t\tHilfe anzeigen"
57130 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
57131 msgstr " -C\t--config\t<datei>\t\tAlternative Config-Datei verwenden"
57135 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
57136 msgstr "\t--datafile\t<datei>\t\tAlternative Adressbuch-Datei verwenden"
57140 msgid "\t--mutt-query\t<string>\tmake a query for mutt"
57141 msgstr "\t--mutt-query\t<string>\tMutt-Anfrage durchfĆ¼hren"
57146 "\t--add-email\t\t\tread an e-mail message from stdin and\n"
57147 "\t\t\t\t\tadd the sender to the addressbook"
57148 @@ -103,7 +114,7 @@
57149 "\t--add-email\t\t\tE-Mail-Adresse von stdin lesen und\n"
57150 "\t\t\t\t\tAbsender zum Adressbuch hinzufĆ¼gen"
57155 "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
57156 "\t\t\t\t\trequire to confirm adding"
57157 @@ -111,67 +122,76 @@
57158 "\t--add-email-quiet\t\twie --add-email, aber man muss\n"
57159 "\t\t\t\t\tdas HinzufĆ¼gen nicht bestƤtigen"
57163 msgid "\t--convert\t\t\tconvert address book files"
57164 msgstr "\t--convert\t\t\tAdressbuch-Dateien konvertieren"
57168 msgid "\toptions to use with --convert:"
57169 msgstr "\tOptionen in Verbindung mit --convert:"
57173 msgid "\t--informat\t<format>\tformat for input file"
57174 msgstr "\t--informat\t<format>\tFormat fĆ¼r Eingabedatei"
57178 msgid "\t\t\t\t\t(default: abook)"
57179 msgstr "\t\t\t\t\t(Standard: abook)"
57183 msgid "\t--infile\t<file>\t\tsource file"
57184 msgstr "\t--infile\t<datei>\t\tQuelldatei"
57188 msgid "\t\t\t\t\t(default: stdin)"
57189 msgstr "\t\t\t\t\t(Standard: stdin)"
57193 msgid "\t--outformat\t<format>\tformat for output file"
57194 msgstr "\t--outformat\t<format>\tFormat fĆ¼r Ausgabedatei"
57198 msgid "\t\t\t\t\t(default: text)"
57199 msgstr "\t\t\t\t\t(Standard: text)"
57203 msgid "\t--outfile\t<file>\t\tdestination file"
57204 msgstr "\t--outfile\t<datei>\t\tZieldatei"
57208 msgid "\t\t\t\t\t(default: stdout)"
57209 msgstr "\t\t\t\t\t(Standard: stdout)"
57214 +msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
57215 +msgstr "\t--outformat\t<format>\tFormat fĆ¼r Ausgabedatei"
57218 +msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
57222 msgid "\t--formats\t\t\tlist available formats"
57223 msgstr "\t--formats\t\t\tVerfĆ¼gbare Formate auflisten"
57228 msgid "Cannot open database\n"
57229 msgstr "Kann die Datenbank nicht ƶffnen\n"
57234 msgid "too few arguments to make conversion\n"
57235 msgstr "zu wenig Argumente um die Konvertierung durchzufĆ¼hren\n"
57240 msgid "try --help\n"
57241 msgstr "versuche einmal --help\n"
57243 # I think "Abbruch" is better than e.g. "Beenden"
57248 "input and output formats are the same\n"
57249 @@ -180,47 +200,47 @@
57250 "Eingabe- und Ausgabedatei sind identisch\n"
57256 msgid "input format %s not supported\n"
57257 msgstr "Eingabeformat %s wird nicht unterstĆ¼tzt\n"
57262 msgid "cannot read file %s\n"
57263 msgstr "kann die Datei %s nicht lesen\n"
57268 msgid "output format %s not supported\n"
57269 msgstr "Ausgabeformat %s wird nicht unterstĆ¼tzt\n"
57274 msgid "cannot write file %s\n"
57275 msgstr "kann die Datei %s nicht schreiben\n"
57280 msgid "cannot open %s\n"
57281 msgstr "kann %s nicht ƶffnen\n"
57286 msgid "%d item(s) added to %s\n"
57287 msgstr "%d Element(e) zu %s hinzugefĆ¼gt\n"
57291 msgid "Valid sender address not found"
57292 msgstr "Keine gĆ¼ltige Absender-Adresse gefunden"
57297 msgid "Address %s already in addressbook\n"
57298 msgstr "Adresse %s befindet sich bereits im Adressbuch\n"
57300 # I don't want to translate 'you' with 'du'
57305 "cannot open /dev/tty\n"
57306 @@ -229,20 +249,20 @@
57307 "kann /dev/tty nicht ƶffnen\n"
57308 "versuche es einmal mit --add-email-quiet\n"
57313 msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
57314 msgstr "FĆ¼ge \"%s <%s>\" zu %s hinzu? (%c/%c)\n"
57316 -#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
57317 +#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
57318 msgid "keybinding for yes|y"
57321 -#: abook.c:753 abook.c:755 ui.c:341
57322 +#: abook.c:781 abook.c:783 ui.c:432
57323 msgid "keybinding for no|n"
57329 msgid "stdin is a directory or cannot stat stdin\n"
57331 @@ -316,202 +336,246 @@
57335 +# Anniversary already _means_ day!
57337 msgid "Anniversary day"
57338 +msgstr "Jahrestag"
57346 msgid "field already defined"
57347 msgstr "Feld bereits definiert"
57351 msgid "standard field does not need to be declared"
57353 +msgstr "Standardfeld muss nicht deklariert werden"
57357 msgid "unknown type"
57358 msgstr "unbekannter Typ"
57362 msgid "Invalid field value defined in configuration"
57363 msgstr "UngĆ¼ltiger Feld-Wert in der Konfiguration festgelegt"
57368 msgid "Invalid field value for sorting"
57369 -msgstr "UngĆ¼ltiger Feld-Wert in der Konfiguration festgelegt"
57370 +msgstr "UngĆ¼ltiger Feld-Wert fĆ¼r die Sortierung"
57374 msgid "Tab name too wide for screen"
57375 msgstr "Kartei-Name zu breit fĆ¼r den Bildschirm"
57379 msgid "keybindings_new_123456789|n123456789"
57380 msgstr "n123456789"
57385 msgid "Choose %s to modify (<1>%s%c%s%s."
57387 +msgstr "%s zum Ćndern wƤhlen (<1>%s%c%s%s."
57402 msgstr " oder <n>eu"
57436 msgid "Year (optional): "
57438 +msgstr "Jahr (optional): "
57443 msgid "Invalid date"
57444 -msgstr "ungĆ¼ltiger Wert"
57445 +msgstr "ungĆ¼ltiges Datum"
57454 msgid "?:help q:quit editor"
57455 msgstr "?:Hilfe q:Editor beenden"
57457 -#: filter.c:71 filter.c:82
57458 +#: filter.c:88 filter.c:100
57459 msgid "abook native format"
57460 -msgstr "abooks eigenes Format"
57461 +msgstr "abook-eigenes Format"
57465 msgid "ldif / Netscape addressbook"
57466 msgstr "ldif / Netscape Adressbuch"
57468 -#: filter.c:73 filter.c:84
57469 +#: filter.c:90 filter.c:103 filter.c:121
57471 -msgstr "mutt alias"
57472 +msgstr "mutt-Alias"
57474 -#: filter.c:74 filter.c:86
57475 +#: filter.c:91 filter.c:106
57476 msgid "pine addressbook"
57477 -msgstr "pine Adressbuch"
57478 +msgstr "pine-Adressbuch"
57480 -#: filter.c:75 filter.c:88
57481 +#: filter.c:92 filter.c:107
57482 msgid "comma separated values"
57483 msgstr "komma-separierte Werte"
57485 -#: filter.c:76 filter.c:89
57486 +#: filter.c:93 filter.c:108
57487 msgid "comma separated values (all fields)"
57488 msgstr "komma-separierte Werte (alle Felder)"
57490 -#: filter.c:77 filter.c:90
57491 +#: filter.c:94 filter.c:109
57492 msgid "Palm comma separated values"
57493 msgstr "Palm komma-separierte Werte"
57497 +msgid "vCard file"
57501 msgid "ldif / Netscape addressbook (.4ld)"
57502 msgstr "ldif / Netscape Adressbuch (.4ld)"
57505 -msgid "html document"
57506 -msgstr "HTML Dokument"
57507 +#: filter.c:102 filter.c:120
57508 +msgid "vCard 2 file"
57512 +msgid "mutt query format (internal use)"
57516 -msgid "GnomeCard (VCard) addressbook"
57517 -msgstr "GnomeCard (VCard) Adressbuch"
57519 +msgid "html document"
57520 +msgstr "HTML-Dokument"
57535 msgid "Wanderlust address book"
57536 -msgstr "pine Adressbuch"
57537 +msgstr "Wanderlust-Adressbuch"
57541 msgid "Spruce address book"
57542 -msgstr "Spruce Adressbuch"
57543 +msgstr "Spruce-Adressbuch"
57547 msgid "BSD calendar"
57549 +msgstr "BSD-Kalender"
57551 +#: filter.c:115 filter.c:122
57553 +msgid "Custom format"
57554 +msgstr "Benutzer1"
57560 +msgid "input formats:"
57567 +msgid "output formats:"
57572 +msgid "query-compatible output formats:"
57576 msgid "import database"
57577 msgstr "importiere Datenbank"
57579 -#: filter.c:182 filter.c:299
57580 +#: filter.c:216 filter.c:345
57581 msgid "please select a filter"
57582 msgstr "Bitte Filter auswƤhlen"
57584 -#: filter.c:190 filter.c:307
57585 +#: filter.c:224 filter.c:353
57586 msgid "x -\tcancel"
57587 msgstr "x -\tabbrechen"
57589 -#: filter.c:211 filter.c:345
57590 +#: filter.c:245 filter.c:391
57592 msgstr "Dateiname: "
57596 msgid "Error occured while opening the file"
57597 msgstr "Fehler beim Ćffnen der Datei"
57601 msgid "File does not seem to be a valid addressbook"
57602 msgstr "Die Datei scheint kein gĆ¼ltiges Adressbuch zu sein"
57606 msgid "export database"
57607 msgstr "exportiere Datenbank"
57609 # instead: Exportiere alle (a), exportiere ausgewƤhlte (s), oder abbrechen (c)?
57612 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
57613 msgstr "Exportiere <a>lle, exportiere au<s>gewƤhlte, oder bri<c>h ab?"
57615 -#: filter.c:331 ui.c:632
57616 +#: filter.c:377 ui.c:769
57617 msgid "keybindings:all/selected/cancel|asc"
57623 msgid "Error occured while exporting"
57624 msgstr "Fehler beim Exportieren aufgetreten"
57629 msgid "%02d/%02d\tAnniversary of %s\n"
57630 +msgstr "%02d/%02d\tJahrestag von %s\n"
57634 +msgid "parse_custom_format: fmt_string or ft not allocated\n"
57639 +msgid "parse_custom_format: invalid placeholder: {%s}\n"
57644 +msgid "%s: invalid format, index %ld\n"
57648 @@ -554,281 +618,302 @@
57649 msgstr "\tr / Entf.\tAusgewƤhlte Elemente entfernen\n"
57652 +msgid "\tM\t\tmerge selected items (into top one)\n"
57656 msgid "\tD\t\tduplicate item\n"
57657 msgstr "\tD\t\tElement verdoppeln\n"
57661 +msgid "\tU\t\tremove duplicates\n"
57662 +msgstr "\tD\t\tElement verdoppeln\n"
57665 msgid "\tspace\t\tselect item\n"
57666 msgstr "\tLeertaste\tElement auswƤhlen\n"
57670 msgid "\t+\t\tselect all\n"
57671 msgstr "\t+\t\tAlle auswƤhlen\n"
57675 msgid "\t-\t\tunselect all\n"
57676 msgstr "\t-\t\tAuswahl aufheben\n"
57680 msgid "\t*\t\tinvert selection\n"
57681 msgstr "\t*\t\tAuswahl umkehren\n"
57685 msgid "\tw\t\twrite database to disk\n"
57686 msgstr "\tw\t\tDatenbank auf die Festplatte speichern\n"
57690 msgid "\tl\t\tread database from disk\n"
57691 msgstr "\tl\t\tDatenbank von der Festplatte lesen\n"
57695 msgid "\tC\t\tclear whole database\n"
57696 msgstr "\tC\t\tGesamte Datenbank lƶschen\n"
57700 msgid "\ti\t\timport database\n"
57701 msgstr "\ti\t\tDatenbank importieren\n"
57705 msgid "\te\t\texport database\n"
57706 msgstr "\te\t\tDatenbank exportieren\n"
57710 msgid "\tp\t\tprint database\n"
57711 msgstr "\tp\t\tDatenbank ausdrucken\n"
57715 msgid "\to\t\topen database\n"
57716 msgstr "\to\t\tDatenbank ƶffnen\n"
57720 msgid "\ts\t\tsort database\n"
57721 msgstr "\ts\t\tDatenbank sortieren\n"
57725 msgid "\tS\t\t\"surname sort\"\n"
57726 msgstr "\tS\t\t\"Nachnamen-Sortierung\"\n"
57730 msgid "\tF\t\tsort by field (defined in configuration file)\n"
57732 "\tF\t\tNach Feld sortieren\n"
57733 "\t\t\t(wie in der Konfigurationsdatei festgelegt)\n"
57737 msgid "\t/\t\tsearch\n"
57738 msgstr "\t/\t\tSuchen\n"
57742 msgid "\t\\\t\tsearch next occurrence\n"
57743 msgstr "\t\\\t\tNach nƤchstem Eintrag suchen\n"
57747 msgid "\tA\t\tmove current item up\n"
57748 msgstr "\tA\t\tAktuelles Element nach oben verschieben\n"
57752 msgid "\tZ\t\tmove current item down\n"
57753 msgstr "\tZ\t\tAktuelles Element nach unten verschieben\n"
57757 msgid "\tm\t\tsend mail with mutt\n"
57758 msgstr "\tm\t\tE-Mail mit Mutt senden\n"
57762 msgid "\tv\t\tview URL with web browser\n"
57763 msgstr "\tv\t\tURL mit Web-Browser anzeigen\n"
57768 msgid "\tarrows/h,l\t\tchange tab\n"
57769 -msgstr "\ta,c,p,o,C/Pfeilt./h,l\tTab wechseln\n"
57770 +msgstr "\tPfeilt./h,l\t\tTab wechseln\n"
57775 msgid "\tq\t\t\tquit to main screen\n"
57776 -msgstr "\tQ\t\tBeenden ohne zu speichern\n"
57777 +msgstr "\tq\t\t\tZum Hauptschirm zurĆ¼ck kehren\n"
57782 msgid "\t1 - 5 A - Z\t\tedit fields\n"
57783 -msgstr "\t1 - 5\t\t\tFelder bearbeiten\n"
57784 +msgstr "\t1 - 5 A - Z\t\tFelder bearbeiten\n"
57788 msgid "\tk or <\t\t\tprevious item\n"
57789 msgstr "\tk or <\t\t\tVorheriges Element\n"
57793 msgid "\tj or >\t\t\tnext item\n"
57794 msgstr "\tj or >\t\t\tNƤchstes Element\n"
57799 msgid "\tr\t\t\troll e-mail addresses up\n"
57800 -msgstr "\tr\t\t\tE-Mail-Adressen rotieren\n"
57801 +msgstr "\tr\t\t\tE-Mail-Adressen nach oben rotieren\n"
57806 msgid "\tESC-r\t\t\troll e-mail addresses down\n"
57807 -msgstr "\tr\t\t\tE-Mail-Adressen rotieren\n"
57808 +msgstr "\tESC-r\t\t\tE-Mail-Adressen nach unten rotieren\n"
57812 msgid "\tu\t\t\tundo\n"
57813 msgstr "\tu\t\t\tRĆ¼ckgƤngig\n"
57817 msgid "\tm\t\t\tsend mail with mutt\n"
57818 msgstr "\tm\t\t\tE-Mail mit Mutt senden\n"
57822 msgid "\tv\t\t\tview url with web browser\n"
57823 msgstr "\tv\t\t\tURL mit Web-Browser anzeigen\n"
57827 msgid "quote mismatch"
57829 +msgstr "fehlendes Hochkomma"
57833 msgid "no assignment character found"
57835 +msgstr "kein Zuweisungszeichen gefunden"
57839 msgid "error in comma separated list"
57840 msgstr "Fehler in komma-separierter Liste"
57842 -#: options.c:289 options.c:308
57843 +#: options.c:311 options.c:330
57844 msgid "invalid value"
57845 msgstr "ungĆ¼ltiger Wert"
57849 msgid "unknown option"
57850 msgstr "unbekannte Option"
57856 "valid values for the 'preserve_fields' option are 'all', "
57857 "'standard' (default), and 'none'\n"
57859 +"gĆ¼ltige Werte fĆ¼r die Option Ā»preserve_fieldsĀ« sind Ā»allĀ«, "
57860 +"Ā»standardĀ« (Voreinstellung) und Ā»noneĀ«\n"
57866 "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
57869 +"gĆ¼ltige Werte fĆ¼r die Option Ā»address_styleĀ« sind Ā»euĀ« (Voreinstellung), "
57870 +"Ā»ukĀ« und Ā»usĀ«\n"
57874 msgid "invalid value assignment"
57875 msgstr "ungĆ¼ltige Wertzuweisung"
57880 "customfield: obsolete command - please use the 'field' and 'view' commands "
57883 +"customfield: veralteter Befehl - verwenden Sie bitte die Befehle Ā»fieldĀ« und "
57888 msgid "no view name provided"
57890 +msgstr "kein Name fĆ¼r Ansicht angegeben"
57894 msgid "no field identifier provided"
57896 +msgstr "keine Feldkennzeichnung angegeben"
57900 msgid "no field name provided"
57902 +msgstr "kein Feldname angegeben"
57907 msgid "%s: parse error at line %d: "
57908 msgstr "%s: Fehler beim Parsen in Zeile %d: "
57913 msgid "unknown token %s\n"
57914 msgstr "unbekanntes Symbol %s\n"
57919 msgid "Your terminal size is %dx%d\n"
57920 msgstr "Die GrƶĆe des Terminals ist %dx%d.\n"
57925 msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
57926 msgstr "Das Terminal ist zu klein. Die minimale GrƶĆe fĆ¼r abook ist %dx%d.\n"
57945 msgid "Press any key to continue..."
57946 msgstr "Taste drĆ¼cken, um fortzufahren..."
57948 # "Lƶsche ausgewƤhlte(s) Element(e)" sounds silly ... plural form is ok.
57951 msgid "Remove selected item(s)"
57952 msgstr "Lƶsche ausgewƤhlte Elemente"
57957 +msgid "Merge selected items"
57958 +msgstr "Keine Elemente ausgewƤhlt"
57960 +# "Lƶsche ausgewƤhlte(s) Element(e)" sounds silly ... plural form is ok.
57963 +msgid "Remove duplicates"
57964 +msgstr "Lƶsche ausgewƤhlte Elemente"
57967 msgid "Clear WHOLE database"
57968 msgstr "Lƶsche GESAMTE Datenbank"
57972 msgid "Search hit bottom, continuing at top"
57973 msgstr "Suche hat das Ende erreicht, weiter am Anfang"
57975 # Why 'y', and not 'j'?
57980 msgid "Your current data will be lost - Press '%c' to continue"
57981 msgstr "Die aktuellen Daten sind verloren - DrĆ¼cke '%c' um fortzufahren"
57983 # instead: Drucke alle (a), drucke ausgewƤhlte (s), oder abbrechen (c)?
57986 msgid "Print <a>ll, print <s>elected, or <c>ancel?"
57987 msgstr "Drucke <a>lle, drucke au<s>gewƤhlte oder bri<c>h ab?"
57991 msgid "No selected items"
57992 msgstr "Keine Elemente ausgewƤhlt"
57996 msgid "File to open: "
57997 msgstr "Ćffne Datei: "
58001 msgid "Save current database"
58002 msgstr "Speichere aktuelle Datenbank"
58006 msgid "Sorry, the specified file appears not to be a valid abook addressbook"
58008 "Die angegebene Datei scheint leider kein gĆ¼ltiges abook Adressbuch zu sein"
58011 msgid "undeclared field"
58013 +msgstr "undefiniertes Feld"
58016 msgid "maximal number of fields per view reached"
58018 +msgstr "maximale Anzahl von Feldern fĆ¼r Ansicht erreicht"
58021 msgid "field already in this view"
58023 +msgstr "Feld in dieser Ansicht bereits vorhanden"
58027 @@ -869,3 +954,6 @@
58032 +#~ msgid "GnomeCard (VCard) addressbook"
58033 +#~ msgstr "GnomeCard (VCard) Adressbuch"
58034 diff -urN BUILD/abook-0.6.0pre2/po/en@boldquot.header abook/po/en@boldquot.header
58035 --- BUILD/abook-0.6.0pre2/po/en@boldquot.header 1970-01-01 01:00:00.000000000 +0100
58036 +++ abook/po/en@boldquot.header 2013-03-13 15:07:45.000000000 +0100
58038 +# All this catalog "translates" are quotation characters.
58039 +# The msgids must be ASCII and therefore cannot contain real quotation
58040 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
58041 +# and double quote (0x22). These substitutes look strange; see
58042 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
58044 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
58045 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
58046 +# It also translates pairs of apostrophe (0x27) to
58047 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
58048 +# and pairs of quotation mark (0x22) to
58049 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
58051 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
58052 +# When output to an ISO-8859-1 terminal, the single quotation marks are
58053 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
58054 +# grave/acute accent (by libiconv), and the double quotation marks are
58055 +# transliterated to 0x22.
58056 +# When output to an ASCII terminal, the single quotation marks are
58057 +# transliterated to apostrophes, and the double quotation marks are
58058 +# transliterated to 0x22.
58060 +# This catalog furthermore displays the text between the quotation marks in
58061 +# bold face, assuming the VT100/XTerm escape sequences.
58063 diff -urN BUILD/abook-0.6.0pre2/po/en@quot.header abook/po/en@quot.header
58064 --- BUILD/abook-0.6.0pre2/po/en@quot.header 1970-01-01 01:00:00.000000000 +0100
58065 +++ abook/po/en@quot.header 2013-03-13 15:07:45.000000000 +0100
58067 +# All this catalog "translates" are quotation characters.
58068 +# The msgids must be ASCII and therefore cannot contain real quotation
58069 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
58070 +# and double quote (0x22). These substitutes look strange; see
58071 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
58073 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
58074 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
58075 +# It also translates pairs of apostrophe (0x27) to
58076 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
58077 +# and pairs of quotation mark (0x22) to
58078 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
58080 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
58081 +# When output to an ISO-8859-1 terminal, the single quotation marks are
58082 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
58083 +# grave/acute accent (by libiconv), and the double quotation marks are
58084 +# transliterated to 0x22.
58085 +# When output to an ASCII terminal, the single quotation marks are
58086 +# transliterated to apostrophes, and the double quotation marks are
58087 +# transliterated to 0x22.
58089 Binarne pliki BUILD/abook-0.6.0pre2/po/fr.gmo i abook/po/fr.gmo rĆ³Å¼niÄ
siÄ
58090 diff -urN BUILD/abook-0.6.0pre2/po/fr.po abook/po/fr.po
58091 --- BUILD/abook-0.6.0pre2/po/fr.po 2006-09-06 16:14:38.000000000 +0200
58092 +++ abook/po/fr.po 2013-03-13 15:07:45.000000000 +0100
58094 -# SOME DESCRIPTIVE TITLE.
58095 -# Copyright (C) YEAR Free Software Foundation, Inc.
58096 -# This file is distributed under the same license as the PACKAGE package.
58097 -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
58098 +# French translation for abook package.
58099 +# Copyright (C) 2005 Free Software Foundation, Inc.
58100 +# This file is distributed under the same license as the abook package.
58101 +# Cedric Duval <cedricduval+abook@free.fr>, 2005-2006.
58102 +# MichĆØle Garoche <michele.garoche@easyconnect.fr>, 2006.
58106 "Project-Id-Version: abook\n"
58107 "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
58108 -"POT-Creation-Date: 2006-09-06 17:14+0300\n"
58109 -"PO-Revision-Date: 2006-09-05 11:42+0200\n"
58110 -"Last-Translator: Cedric Duval <cedricduval+abook@free.fr>\n"
58111 +"POT-Creation-Date: 2013-01-17 14:44+0100\n"
58112 +"PO-Revision-Date: 2006-09-08 14:37+0200\n"
58113 +"Last-Translator: MichĆØle Garoche <michele.garoche@easyconnect.fr>\n"
58114 "Language-Team: french\n"
58116 "MIME-Version: 1.0\n"
58117 "Content-Type: text/plain; charset=utf-8\n"
58118 "Content-Transfer-Encoding: 8bit\n"
58123 msgid "Cannot create directory %s\n"
58124 msgstr "Impossible de crƩer le rƩpertoire %s\n"
58129 msgid "%s is not a directory\n"
58130 msgstr "%s n'est pas un rƩpertoire\n"
58135 msgid "Memory allocation failure: %s\n"
58136 msgstr "Erreur d'allocation mƩmoire: %s\n"
58141 msgid "Press enter to continue...\n"
58142 msgstr "Appuyez sur entrƩe pour continuer...\n"
58147 msgid "File %s is not writeable"
58148 msgstr "Impossible d'Ć©crire dans le fichier %s"
58152 msgid "If you continue all changes will be lost. Do you want to continue?"
58154 "Si vous continuez, vos modifications seront perdues. Voulez-vous continuer ?"
58158 msgid "Save database"
58159 msgstr "Sauvegarder la base de donnƩes"
58163 msgid "Quit without saving"
58164 msgstr "Quitter sans sauvegarder"
58169 msgid "%s is not a valid HOME directory\n"
58170 msgstr "%s n'est pas un rƩpertoire personnel (HOME) valide\n"
58176 "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
58177 @@ -67,34 +69,44 @@
58178 "Impossible de combiner les options --mutt-query, --convert, --add-email ou --"
58179 "add-email-quiet\n"
58184 msgid "please use option --%s after --convert option\n"
58185 msgstr "Veuillez utiliser l'option --%s aprĆØs l'option --convert\n"
58189 +#, fuzzy, c-format
58190 +msgid "please use option --outformat after --convert or --mutt-query option\n"
58191 +msgstr "Veuillez utiliser l'option --%s aprĆØs l'option --convert\n"
58194 +#, fuzzy, c-format
58195 +msgid "Invalid custom format string\n"
58196 +msgstr "Valeur de champ invalide pour le classement"
58200 msgid "%s: unrecognized arguments on command line\n"
58201 msgstr "%s: paramĆØtres de ligne de commande non reconnus\n"
58205 msgid " -h\t--help\t\t\t\tshow usage"
58206 msgstr " -h\t--help\t\t\t\tafficher l'aide"
58210 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
58212 " -C\t--config\t<fichier>\tutiliser un autre fichier de configuration"
58216 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
58217 msgstr "\t--datafile\t<fichier>\tutiliser un autre carnet d'adresses"
58221 msgid "\t--mutt-query\t<string>\tmake a query for mutt"
58222 msgstr "\t--mutt-query\t<chaine>\teffectuer une requĆŖte pour mutt"
58227 "\t--add-email\t\t\tread an e-mail message from stdin and\n"
58228 "\t\t\t\t\tadd the sender to the addressbook"
58229 @@ -103,7 +115,7 @@
58230 "\t\t\t\t\tl'entrƩe standard et ajouter\n"
58231 "\t\t\t\t\tl'expƩditeur au carnet d'adresses"
58236 "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
58237 "\t\t\t\t\trequire to confirm adding"
58238 @@ -111,66 +123,75 @@
58239 "\t--add-email-quiet\t\tcomme --add-email mais sans nƩcessitƩ de confirmer\n"
58240 "\t\t\t\t\tl'ajout"
58244 msgid "\t--convert\t\t\tconvert address book files"
58245 msgstr "\t--convert\t\t\tconvertir des carnets d'adresses"
58249 msgid "\toptions to use with --convert:"
58250 msgstr "\toptions Ć utiliser avec --convert:"
58254 msgid "\t--informat\t<format>\tformat for input file"
58255 msgstr "\t--informat\t<format>\tformat du fichier source"
58259 msgid "\t\t\t\t\t(default: abook)"
58260 msgstr "\t\t\t\t\t(dƩfaut: abook)"
58264 msgid "\t--infile\t<file>\t\tsource file"
58265 msgstr "\t--infile\t<file>\t\tfichier source"
58269 msgid "\t\t\t\t\t(default: stdin)"
58270 msgstr "\t\t\t\t\t(dƩfaut: entrƩe standard)"
58274 msgid "\t--outformat\t<format>\tformat for output file"
58275 msgstr "\t--outformat\t<format>\tformat du fichier de destination"
58279 msgid "\t\t\t\t\t(default: text)"
58280 msgstr "\t\t\t\t\t(dƩfaut: texte)"
58284 msgid "\t--outfile\t<file>\t\tdestination file"
58285 msgstr "\t--outfile\t<file>\t\tfichier de destination"
58289 msgid "\t\t\t\t\t(default: stdout)"
58290 msgstr "\t\t\t\t\t(dƩfaut: sortie standard)"
58295 +msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
58296 +msgstr "\t--outformat\t<format>\tformat du fichier de destination"
58299 +msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
58303 msgid "\t--formats\t\t\tlist available formats"
58304 msgstr "\t--formats\t\t\tlister les formats disponibles"
58309 msgid "Cannot open database\n"
58310 msgstr "Impossible d'ouvrir la base de donnƩes\n"
58315 msgid "too few arguments to make conversion\n"
58316 msgstr "trop peu de paramĆØtres pour effectuer la conversion\n"
58321 msgid "try --help\n"
58322 msgstr "essayez --help\n"
58328 "input and output formats are the same\n"
58329 @@ -179,46 +200,46 @@
58330 "la source et la destination sont identiques\n"
58336 msgid "input format %s not supported\n"
58337 -msgstr "le format source %s n'est pas supportƩ\n"
58338 +msgstr "le format source %s n'est pas gƩrƩ\n"
58343 msgid "cannot read file %s\n"
58344 msgstr "Impossible de lire le fichier %s\n"
58349 msgid "output format %s not supported\n"
58350 -msgstr "le format de destination %s n'est pas supportƩ\n"
58351 +msgstr "le format de destination %s n'est pas gƩrƩ\n"
58356 msgid "cannot write file %s\n"
58357 msgstr "impossible d'Ć©crire le fichier %s\n"
58362 msgid "cannot open %s\n"
58363 msgstr "impossible d'ouvrir %s\n"
58368 msgid "%d item(s) added to %s\n"
58369 msgstr "%d entrĆ©es ajoutĆ©es Ć %s\n"
58373 msgid "Valid sender address not found"
58374 msgstr "Aucune adresse d'expƩditeur valide trouvƩe"
58379 msgid "Address %s already in addressbook\n"
58380 msgstr "L'adresse %s figure dĆ©jĆ dans le carnet d'adresses\n"
58386 "cannot open /dev/tty\n"
58387 @@ -227,27 +248,27 @@
58388 "impossible d'ouvrir /dev/tty\n"
58389 "peut-ĆŖtre souhaitez-vous utiliser --add-email-quiet\n"
58394 msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
58395 msgstr "Ajouter \"%s <%s>\" Ć %s ? (%c/%c)\n"
58397 -#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
58398 +#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
58399 msgid "keybinding for yes|y"
58402 -#: abook.c:753 abook.c:755 ui.c:341
58403 +#: abook.c:781 abook.c:783 ui.c:432
58404 msgid "keybinding for no|n"
58410 msgid "stdin is a directory or cannot stat stdin\n"
58411 msgstr "stdin est un rƩpertoire, ou impossible d'en quƩrir son Ʃtat\n"
58414 msgid "q:quit ?:help a:add r:remove"
58415 -msgstr "q:quitter ?:aide a:ajouter r:supprimer"
58416 +msgstr "q:quitter ?:aide a:ajouter r:supprimer"
58420 @@ -255,7 +276,7 @@
58423 msgid "E-mail addresses"
58424 -msgstr "Adresses email:"
58425 +msgstr "Adresses email"
58429 @@ -313,195 +334,240 @@
58430 msgid "Anniversary day"
58431 msgstr "Date d'anniversaire"
58439 msgid "field already defined"
58440 msgstr "champ dĆ©jĆ dĆ©fini"
58444 msgid "standard field does not need to be declared"
58445 msgstr "les champs standard n'ont pas besoin d'ĆŖtre dĆ©clarĆ©s"
58449 msgid "unknown type"
58450 msgstr "type inconnu"
58454 msgid "Invalid field value defined in configuration"
58455 msgstr "Valeur de champ invalide dƩfinie dans la configuration"
58459 msgid "Invalid field value for sorting"
58460 msgstr "Valeur de champ invalide pour le classement"
58462 -# Comment traduire 'tab' ?
58465 msgid "Tab name too wide for screen"
58466 msgstr "IntitulƩ d'onglet trop large pour l'Ʃcran"
58470 msgid "keybindings_new_123456789|n123456789"
58471 msgstr "n123456789"
58476 msgid "Choose %s to modify (<1>%s%c%s%s."
58477 msgstr "Choisir %s Ć modifier (<1>%s%c%s%s."
58492 msgstr " ou <n>nouveau"
58524 msgid "Year (optional): "
58525 msgstr "AnnƩe (optionnelle): "
58529 msgid "Invalid date"
58530 msgstr "Date invalide"
58539 msgid "?:help q:quit editor"
58540 -msgstr "?:aide q:quitter l'Ć©diteur"
58541 +msgstr "?: aide q: quitter l'Ć©diteur"
58543 -#: filter.c:71 filter.c:82
58544 +#: filter.c:88 filter.c:100
58545 msgid "abook native format"
58546 msgstr "format natif abook"
58550 msgid "ldif / Netscape addressbook"
58551 msgstr "ldif / carnet d'adresses Netscape"
58553 -#: filter.c:73 filter.c:84
58554 +#: filter.c:90 filter.c:103 filter.c:121
58556 msgstr "alias mutt"
58558 -#: filter.c:74 filter.c:86
58559 +#: filter.c:91 filter.c:106
58560 msgid "pine addressbook"
58561 msgstr "carnet d'adresses pine"
58563 -#: filter.c:75 filter.c:88
58564 +#: filter.c:92 filter.c:107
58565 msgid "comma separated values"
58566 msgstr "valeurs dƩlimitƩes par des virgules"
58568 -#: filter.c:76 filter.c:89
58569 +#: filter.c:93 filter.c:108
58570 msgid "comma separated values (all fields)"
58571 msgstr "valeurs dƩlimitƩes par des virgules (tous les champs)"
58573 -#: filter.c:77 filter.c:90
58574 +#: filter.c:94 filter.c:109
58575 msgid "Palm comma separated values"
58576 msgstr "valeur dƩlimitƩes par des virgules, format Palm"
58580 +msgid "vCard file"
58584 msgid "ldif / Netscape addressbook (.4ld)"
58585 msgstr "ldif / carnet d'adresses Netscape (.41d)"
58588 +#: filter.c:102 filter.c:120
58589 +msgid "vCard 2 file"
58593 +msgid "mutt query format (internal use)"
58597 msgid "html document"
58598 msgstr "document html"
58601 -msgid "GnomeCard (VCard) addressbook"
58602 -msgstr "carnet d'adresses GnomCard (VCard)"
58612 msgstr "texte simple"
58616 msgid "Wanderlust address book"
58617 msgstr "carnet d'adresses Wanderlust"
58621 msgid "Spruce address book"
58622 msgstr "carnet d'adresses Spruce"
58626 msgid "BSD calendar"
58628 +msgstr "Calendrier BSD"
58630 +#: filter.c:115 filter.c:122
58632 +msgid "Custom format"
58633 +msgstr "PersonnalisƩ1"
58639 +msgid "input formats:"
58646 +msgid "output formats:"
58651 +msgid "query-compatible output formats:"
58655 msgid "import database"
58656 msgstr "importer la base de donnƩes"
58658 -#: filter.c:182 filter.c:299
58659 +#: filter.c:216 filter.c:345
58660 msgid "please select a filter"
58661 msgstr "veuillez choisir un filtre"
58663 -#: filter.c:190 filter.c:307
58664 +#: filter.c:224 filter.c:353
58665 msgid "x -\tcancel"
58666 msgstr "x - \tannuler"
58668 -#: filter.c:211 filter.c:345
58669 +#: filter.c:245 filter.c:391
58671 msgstr "Nom de fichier: "
58675 msgid "Error occured while opening the file"
58676 msgstr "Une erreur est survenue Ć l'ouverture du fichier"
58680 msgid "File does not seem to be a valid addressbook"
58681 msgstr "Le fichier spĆ©cifiĆ© ne semble pas ĆŖtre un carnet d'adresses valide"
58685 msgid "export database"
58686 msgstr "exporter la base de donnƩes"
58690 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
58691 msgstr "Exporter <t>out, exporter les entrƩes <s>ƩlectionnƩes, ou <a>nnuler ?"
58693 -#: filter.c:331 ui.c:632
58694 +#: filter.c:377 ui.c:769
58695 msgid "keybindings:all/selected/cancel|asc"
58700 msgid "Error occured while exporting"
58701 msgstr "Une erreur est survenue lors de l'exportation"
58706 msgid "%02d/%02d\tAnniversary of %s\n"
58707 +msgstr "%02d/%02d\tAnniversaire de %s\n"
58711 +msgid "parse_custom_format: fmt_string or ft not allocated\n"
58716 +msgid "parse_custom_format: invalid placeholder: {%s}\n"
58721 +msgid "%s: invalid format, index %ld\n"
58725 @@ -540,155 +606,164 @@
58728 msgid "\tr / del\t\tremove selected items\n"
58729 -msgstr "\tr / suppr\t\tsupprimer les entrƩes sƩlectionnƩes\n"
58730 +msgstr "\tr / suppr\tsupprimer les entrƩes sƩlectionnƩes\n"
58733 +msgid "\tM\t\tmerge selected items (into top one)\n"
58737 msgid "\tD\t\tduplicate item\n"
58738 msgstr "\tD\t\tdupliquer une entrƩe\n"
58742 +msgid "\tU\t\tremove duplicates\n"
58743 +msgstr "\tD\t\tdupliquer une entrƩe\n"
58746 msgid "\tspace\t\tselect item\n"
58747 msgstr "\tespace\t\tsƩlectionner une entrƩe\n"
58751 msgid "\t+\t\tselect all\n"
58752 msgstr "\t+\t\ttout sƩlectionner\n"
58756 msgid "\t-\t\tunselect all\n"
58757 msgstr "\t-\t\ttout dƩsƩlectionner\n"
58761 msgid "\t*\t\tinvert selection\n"
58762 msgstr "\t*\t\tinverser la sƩlection\n"
58766 msgid "\tw\t\twrite database to disk\n"
58767 msgstr "\tw\t\tƩcrire la base de donnƩes sur le disque\n"
58771 msgid "\tl\t\tread database from disk\n"
58772 msgstr "\tl\t\tlire la base de donnƩes depuis le disque\n"
58776 msgid "\tC\t\tclear whole database\n"
58777 msgstr "\tC\t\teffacer entiĆØrement la base de donnĆ©es\n"
58781 msgid "\ti\t\timport database\n"
58782 msgstr "\ti\t\timporter une base de donnƩes\n"
58786 msgid "\te\t\texport database\n"
58787 msgstr "\te\t\texporter la base de donnƩes\n"
58791 msgid "\tp\t\tprint database\n"
58792 msgstr "\tp\t\timprimer la base de donnƩes\n"
58796 msgid "\to\t\topen database\n"
58797 msgstr "\to\t\touvrir une base de donnƩes\n"
58801 msgid "\ts\t\tsort database\n"
58802 msgstr "\ts\t\tclasser la base de donnƩes\n"
58806 msgid "\tS\t\t\"surname sort\"\n"
58807 msgstr "\tS\t\tclassement par nom de famille\n"
58811 msgid "\tF\t\tsort by field (defined in configuration file)\n"
58813 "\tF\t\tclassement par champ\n"
58814 "\t\t\t(dƩfini dans le fichier de configuration)\n"
58818 msgid "\t/\t\tsearch\n"
58819 msgstr "\t/\t\trechercher\n"
58823 msgid "\t\\\t\tsearch next occurrence\n"
58824 msgstr "\t\\\t\trechercher la correspondance suivante\n"
58828 msgid "\tA\t\tmove current item up\n"
58829 msgstr "\tA\t\tdƩplacer l'entrƩe courante vers le haut\n"
58833 msgid "\tZ\t\tmove current item down\n"
58834 msgstr "\tZ\t\tdƩplacer l'entrƩe courante vers le bas\n"
58838 msgid "\tm\t\tsend mail with mutt\n"
58839 msgstr "\tm\t\tenvoyer un courrier Ć©lectronique avec mutt\n"
58843 msgid "\tv\t\tview URL with web browser\n"
58844 msgstr "\tv\t\tvisualiser l'URL avec un navigateur web\n"
58848 msgid "\tarrows/h,l\t\tchange tab\n"
58849 -msgstr "\tflĆØches/h,l\tchanger de \"tab\"\n"
58850 +msgstr "\tflĆØches/h,l\tchanger d'onglet\n"
58854 msgid "\tq\t\t\tquit to main screen\n"
58855 msgstr "\tq\t\tretourner Ć l'Ć©cran principal\n"
58859 msgid "\t1 - 5 A - Z\t\tedit fields\n"
58860 msgstr "\t1 - 5 A - Z\t\t\tƩditer les champs\n"
58864 msgid "\tk or <\t\t\tprevious item\n"
58865 msgstr "\tk ou <\t\t\tentrƩe prƩcƩdente\n"
58869 msgid "\tj or >\t\t\tnext item\n"
58870 msgstr "\tj ou >\t\t\tentrƩe suivante\n"
58874 msgid "\tr\t\t\troll e-mail addresses up\n"
58875 msgstr "\tr\t\t\trotation des adresses email vers le haut\n"
58879 msgid "\tESC-r\t\t\troll e-mail addresses down\n"
58880 msgstr "\tESC-r\t\t\trotation des adresses email vers le bas\n"
58884 msgid "\tu\t\t\tundo\n"
58885 msgstr "\tu\t\t\tannuler\n"
58889 msgid "\tm\t\t\tsend mail with mutt\n"
58890 msgstr "\tm\t\t\tenvoyer un courrier Ć©lectronique avec mutt\n"
58894 msgid "\tv\t\t\tview url with web browser\n"
58895 msgstr "\tv\t\t\tvisualiser l'URL avec un navigateur web\n"
58899 msgid "quote mismatch"
58900 msgstr "problĆØme de correspondance de guillemets"
58904 msgid "no assignment character found"
58905 msgstr "pas de caractĆØre d'affectation trouvĆ©"
58909 msgid "error in comma separated list"
58910 msgstr "erreur dans la liste de valeurs dƩlimitƩes par des virgules"
58912 -#: options.c:289 options.c:308
58913 +#: options.c:311 options.c:330
58914 msgid "invalid value"
58915 msgstr "valeur invalide"
58919 msgid "unknown option"
58920 msgstr "option inconnue"
58926 "valid values for the 'preserve_fields' option are 'all', "
58927 @@ -697,7 +772,7 @@
58928 "les valeurs correctes pour 'preserve_fields' sont 'all', "
58929 "'standard' (dƩfaut), et 'none'\n"
58935 "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
58936 @@ -706,11 +781,11 @@
58937 "les valeurs correctes pour 'address_style' sont 'eu' (dƩfaut), 'uk', et "
58942 msgid "invalid value assignment"
58943 msgstr "affectation de valeur invalide"
58948 "customfield: obsolete command - please use the 'field' and 'view' commands "
58950 @@ -718,88 +793,98 @@
58951 "customfield: commande obsolĆØte - veuillez utiliser les commandes 'field' et "
58956 msgid "no view name provided"
58957 msgstr "aucun nom de vue donnƩ"
58961 msgid "no field identifier provided"
58962 msgstr "aucun identifieur de champ donnƩ"
58966 msgid "no field name provided"
58967 msgstr "aucun nom de champ donnƩ"
58972 msgid "%s: parse error at line %d: "
58973 msgstr "%s: erreur d'analyse lexicale Ć la ligne %d: "
58978 msgid "unknown token %s\n"
58979 msgstr "symbole inconnu %s\n"
58984 msgid "Your terminal size is %dx%d\n"
58985 msgstr "La taille de votre terminal est de %dx%d\n"
58990 msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
58991 msgstr "Terminal trop petit. Taille minimale de terminal pour abook: %dx%d\n"
59010 msgid "Press any key to continue..."
59011 msgstr "Appuyez sur une touche pour continuer..."
59015 msgid "Remove selected item(s)"
59016 msgstr "Supprimer les entrƩes sƩlectionnƩes"
59021 +msgid "Merge selected items"
59022 +msgstr "Pas d'entrƩe sƩlectionnƩe"
59026 +msgid "Remove duplicates"
59027 +msgstr "Supprimer les entrƩes sƩlectionnƩes"
59030 msgid "Clear WHOLE database"
59031 msgstr "Effacer ENTIĆREMENT la base de donnĆ©es"
59035 msgid "Search hit bottom, continuing at top"
59036 msgstr "La recherche a atteint la fin, poursuite au dƩbut"
59041 msgid "Your current data will be lost - Press '%c' to continue"
59042 msgstr "Vos donnƩes actuelles seront perdues - Appuyez sur '%c' pour continuer"
59046 msgid "Print <a>ll, print <s>elected, or <c>ancel?"
59047 msgstr "Imprimer <t>out, imprimer les entrƩes <s>ƩlectionnƩes, ou <a>nnuler ?"
59051 msgid "No selected items"
59052 msgstr "Pas d'entrƩe sƩlectionnƩe"
59056 msgid "File to open: "
59057 msgstr "Fichier Ć ouvrir: "
59061 msgid "Save current database"
59062 msgstr "Sauvegarder la base de donnƩes"
59066 msgid "Sorry, the specified file appears not to be a valid abook addressbook"
59068 "DĆ©solĆ©, le fichier spĆ©cifiĆ© ne semble pas ĆŖtre un carnet d'adresses valide"
59069 @@ -856,11 +941,5 @@
59071 msgstr "PersonnalisƩ5"
59073 -#~ msgid "sorry, input for this field type is not yet implemented"
59074 -#~ msgstr "dƩsolƩ, l'entrƩe pour ce type de champ n'est pas encore implƩmentƩe"
59076 -#~ msgid "?:help c:contact a:address p:phone o:other"
59077 -#~ msgstr "?:aide c:contact a:adresse p:tƩlƩphone o:autre"
59079 -#~ msgid "invalid custom field number"
59080 -#~ msgstr "numƩro de champ personnalisƩ invalide"
59081 +#~ msgid "GnomeCard (VCard) addressbook"
59082 +#~ msgstr "carnet d'adresses GnomCard (VCard)"
59083 diff -urN BUILD/abook-0.6.0pre2/po/insert-header.sin abook/po/insert-header.sin
59084 --- BUILD/abook-0.6.0pre2/po/insert-header.sin 1970-01-01 01:00:00.000000000 +0100
59085 +++ abook/po/insert-header.sin 2013-03-13 15:07:45.000000000 +0100
59087 +# Sed script that inserts the file called HEADER before the header entry.
59089 +# At each occurrence of a line starting with "msgid ", we execute the following
59090 +# commands. At the first occurrence, insert the file. At the following
59091 +# occurrences, do nothing. The distinction between the first and the following
59092 +# occurrences is achieved by looking at the hold space.
59095 +# Test if the hold space is empty.
59098 +# Yes it was empty. First occurrence. Read the file.
59100 +# Output the file's contents by reading the next line. But don't lose the
59101 +# current line while doing this.
59106 +# The hold space was nonempty. Following occurrences. Do nothing.
59110 Binarne pliki BUILD/abook-0.6.0pre2/po/it.gmo i abook/po/it.gmo rĆ³Å¼niÄ
siÄ
59111 diff -urN BUILD/abook-0.6.0pre2/po/it.po abook/po/it.po
59112 --- BUILD/abook-0.6.0pre2/po/it.po 2006-09-06 16:14:38.000000000 +0200
59113 +++ abook/po/it.po 2013-03-13 15:07:45.000000000 +0100
59116 "Project-Id-Version: abook 0.5.5\n"
59117 "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
59118 -"POT-Creation-Date: 2006-09-06 17:14+0300\n"
59119 +"POT-Creation-Date: 2013-01-17 14:44+0100\n"
59120 "PO-Revision-Date: 2006-08-26 01:26+0200\n"
59121 "Last-Translator: Claudio Stazzone <c.stazzo@jumpy.it>\n"
59122 "Language-Team: none\n"
59124 "MIME-Version: 1.0\n"
59125 "Content-Type: text/plain; charset=ISO-8859-15\n"
59126 "Content-Transfer-Encoding: 8bit\n"
59127 @@ -19,49 +20,49 @@
59128 "X-Poedit-Country: ITALY\n"
59129 "X-Poedit-SourceCharset: iso-8859-15\n"
59134 msgid "Cannot create directory %s\n"
59135 msgstr "Non posso creare la directory %s\n"
59140 msgid "%s is not a directory\n"
59141 msgstr "%s non ĆØ una directory\n"
59146 msgid "Memory allocation failure: %s\n"
59147 msgstr "Allocazione di memoria fallita: %s\n"
59152 msgid "Press enter to continue...\n"
59153 msgstr "Premi invio per continuare...\n"
59158 msgid "File %s is not writeable"
59159 msgstr "Il file %s non ĆØ scrivibile"
59163 msgid "If you continue all changes will be lost. Do you want to continue?"
59164 msgstr "Se continui i cambiamenti verranno persi. Vuoi continuare?"
59168 msgid "Save database"
59169 msgstr "Salva il database"
59173 msgid "Quit without saving"
59174 msgstr "Esci senza salvare"
59179 msgid "%s is not a valid HOME directory\n"
59180 msgstr "%s non ĆØ una directory HOME valida\n"
59186 "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
59187 @@ -70,33 +71,43 @@
59188 "Non posso combinare le opzioni --mutt-query, --convert, --add-email o --add-"
59194 msgid "please use option --%s after --convert option\n"
59195 msgstr "per favore usa l'opzione --%s dopo --convert option\n"
59199 +#, fuzzy, c-format
59200 +msgid "please use option --outformat after --convert or --mutt-query option\n"
59201 +msgstr "per favore usa l'opzione --%s dopo --convert option\n"
59204 +#, fuzzy, c-format
59205 +msgid "Invalid custom format string\n"
59206 +msgstr "Valore di campo errato per l'ordinamento"
59210 msgid "%s: unrecognized arguments on command line\n"
59211 msgstr "%s: argomenti non validi\n"
59215 msgid " -h\t--help\t\t\t\tshow usage"
59216 msgstr " -h\t--help\t\t\t\tmostra l'utilizzo"
59220 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
59221 msgstr " -C\t--config\t<file>\t\tusa un file di configurazione diverso"
59225 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
59226 msgstr "\t--datafile\t<file>\t\tusa un file di rubrica diverso"
59230 msgid "\t--mutt-query\t<string>\tmake a query for mutt"
59231 msgstr "\t--mutt-query\t<string>\tesegue una ricerca per mutt"
59236 "\t--add-email\t\t\tread an e-mail message from stdin and\n"
59237 "\t\t\t\t\tadd the sender to the addressbook"
59238 @@ -104,7 +115,7 @@
59239 "\t--add-email\t\t\tlegge un messaggio da standard input e\n"
59240 "\t\t\t\t\taggiunge il mittente alla rubrica"
59245 "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
59246 "\t\t\t\t\trequire to confirm adding"
59247 @@ -112,66 +123,75 @@
59248 "\t--add-email-quiet\t\tlo stesso che --add-email ma non\n"
59249 "\t\t\t\t\trichiede la conferma"
59253 msgid "\t--convert\t\t\tconvert address book files"
59254 msgstr "\t--convert\t\t\tconverte i file di rubrica"
59258 msgid "\toptions to use with --convert:"
59259 msgstr "\topzioni da usare con --convert:"
59263 msgid "\t--informat\t<format>\tformat for input file"
59264 msgstr "\t--informat\t<format>\tformato del file di input"
59268 msgid "\t\t\t\t\t(default: abook)"
59269 msgstr "\t\t\t\t\t(predefinito: abook)"
59273 msgid "\t--infile\t<file>\t\tsource file"
59274 msgstr "\t--infile\t<file>\t\tfile sorgente"
59278 msgid "\t\t\t\t\t(default: stdin)"
59279 msgstr "\t\t\t\t\t(predefinito: standard input)"
59283 msgid "\t--outformat\t<format>\tformat for output file"
59284 msgstr "\t--outformat\t<format>\tformato file di output"
59288 msgid "\t\t\t\t\t(default: text)"
59289 msgstr "\t\t\t\t\t(predefinito: testo)"
59293 msgid "\t--outfile\t<file>\t\tdestination file"
59294 msgstr "\t--outfile\t<file>\t\tfile di destinazione"
59298 msgid "\t\t\t\t\t(default: stdout)"
59299 msgstr "\t\t\t\t\t(predefinito: standard output)"
59304 +msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
59305 +msgstr "\t--outformat\t<format>\tformato file di output"
59308 +msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
59312 msgid "\t--formats\t\t\tlist available formats"
59313 msgstr "\t--formats\t\t\tlista dei formati disponibili"
59318 msgid "Cannot open database\n"
59319 msgstr "Non posso aprire il database\n"
59324 msgid "too few arguments to make conversion\n"
59325 msgstr "argomenti insufficienti per convertire\n"
59330 msgid "try --help\n"
59331 msgstr "prova --help\n"
59337 "input and output formats are the same\n"
59338 @@ -180,46 +200,46 @@
59339 "i formati di input e output sono gli stessi\n"
59345 msgid "input format %s not supported\n"
59346 msgstr "formato di input %s non supportato\n"
59351 msgid "cannot read file %s\n"
59352 msgstr "non posso leggere il file %s\n"
59357 msgid "output format %s not supported\n"
59358 msgstr "formato di output %s non supportato\n"
59363 msgid "cannot write file %s\n"
59364 msgstr "non posso scrivere il file %s\n"
59369 msgid "cannot open %s\n"
59370 msgstr "non posso aprire %s\n"
59375 msgid "%d item(s) added to %s\n"
59376 msgstr "%d oggetto/i aggiunto/i a %s\n"
59380 msgid "Valid sender address not found"
59381 msgstr "Impossibile trovare un valido indirizzo del mittente"
59386 msgid "Address %s already in addressbook\n"
59387 msgstr "Indirizzo %s giĆ presente in rubrica\n"
59393 "cannot open /dev/tty\n"
59394 @@ -228,20 +248,20 @@
59395 "non posso aprire /dev/tty\n"
59396 "puoi usare --add-email-quiet\n"
59401 msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
59402 msgstr "Aggiungi \"%s <%s>\" a %s? (%c/%c)\n"
59404 -#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
59405 +#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
59406 msgid "keybinding for yes|y"
59409 -#: abook.c:753 abook.c:755 ui.c:341
59410 +#: abook.c:781 abook.c:783 ui.c:432
59411 msgid "keybinding for no|n"
59417 msgid "stdin is a directory or cannot stat stdin\n"
59418 msgstr "standard input ĆØ una directory o non posso usare standard input\n"
59419 @@ -314,197 +334,243 @@
59420 msgid "Anniversary day"
59421 msgstr "Anniversario"
59429 msgid "field already defined"
59430 msgstr "campo giĆ definito"
59434 msgid "standard field does not need to be declared"
59435 msgstr "campo standard non necessita dichiarazione"
59439 msgid "unknown type"
59440 msgstr "tipo sconosciuto"
59444 msgid "Invalid field value defined in configuration"
59445 msgstr "Valore di campo errato nella configurazione"
59449 msgid "Invalid field value for sorting"
59450 msgstr "Valore di campo errato per l'ordinamento"
59454 msgid "Tab name too wide for screen"
59455 msgstr "Nome etichetta troppo largo per lo schermo"
59459 msgid "keybindings_new_123456789|n123456789"
59460 msgstr "keybindings_new_123456789|n123456789"
59465 msgid "Choose %s to modify (<1>%s%c%s%s."
59466 msgstr "Scegli %s per modificare (<1>%s%c%s%s."
59513 msgid "Year (optional): "
59519 msgid "Invalid date"
59520 msgstr "valore non valido"
59529 msgid "?:help q:quit editor"
59530 msgstr "?:aiuto q:esci editor"
59532 -#: filter.c:71 filter.c:82
59533 +#: filter.c:88 filter.c:100
59534 msgid "abook native format"
59535 msgstr "formato nativo di abook"
59539 msgid "ldif / Netscape addressbook"
59540 msgstr "ldif / rubrica Netscape"
59542 -#: filter.c:73 filter.c:84
59543 +#: filter.c:90 filter.c:103 filter.c:121
59545 msgstr "alias di mutt"
59547 -#: filter.c:74 filter.c:86
59548 +#: filter.c:91 filter.c:106
59549 msgid "pine addressbook"
59550 msgstr "rubrica di Pine"
59552 -#: filter.c:75 filter.c:88
59553 +#: filter.c:92 filter.c:107
59554 msgid "comma separated values"
59555 msgstr "valori separati da virgole"
59557 -#: filter.c:76 filter.c:89
59558 +#: filter.c:93 filter.c:108
59559 msgid "comma separated values (all fields)"
59560 msgstr "valori separati da virgole (tutti i campi)"
59562 -#: filter.c:77 filter.c:90
59563 +#: filter.c:94 filter.c:109
59564 msgid "Palm comma separated values"
59565 msgstr "Valori separati da virgole per Palm"
59569 +msgid "vCard file"
59573 msgid "ldif / Netscape addressbook (.4ld)"
59574 msgstr "ldif / rubrica Netscape (.4ld)"
59577 +#: filter.c:102 filter.c:120
59578 +msgid "vCard 2 file"
59582 +msgid "mutt query format (internal use)"
59586 msgid "html document"
59587 msgstr "documento html"
59590 -msgid "GnomeCard (VCard) addressbook"
59591 -msgstr "Rubrica GnomeCard (VCard)"
59596 msgstr "alias di elm"
59601 msgstr "testo puro"
59605 msgid "Wanderlust address book"
59606 msgstr "Rubrica Wanderlust"
59610 msgid "Spruce address book"
59611 msgstr "Rubrica Spruce"
59615 msgid "BSD calendar"
59620 +#: filter.c:115 filter.c:122
59622 +msgid "Custom format"
59623 +msgstr "Personalizzato 1"
59627 +msgid "input formats:"
59634 +msgid "output formats:"
59639 +msgid "query-compatible output formats:"
59643 msgid "import database"
59644 msgstr "importa un database"
59646 -#: filter.c:182 filter.c:299
59647 +#: filter.c:216 filter.c:345
59648 msgid "please select a filter"
59649 msgstr "seleziona un filtro"
59651 -#: filter.c:190 filter.c:307
59652 +#: filter.c:224 filter.c:353
59653 msgid "x -\tcancel"
59654 msgstr "x -\tcancella"
59656 -#: filter.c:211 filter.c:345
59657 +#: filter.c:245 filter.c:391
59659 msgstr "Nome del file:"
59663 msgid "Error occured while opening the file"
59664 msgstr "Errore nell'apertura del file"
59668 msgid "File does not seem to be a valid addressbook"
59669 msgstr "Il file non sembra essere una rubrica valida"
59673 msgid "export database"
59674 msgstr "esporta il database"
59678 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
59679 msgstr "Esporta <t>utti, esporta <s>elezionati, o <c>ancella?"
59681 -#: filter.c:331 ui.c:632
59682 +#: filter.c:377 ui.c:769
59683 msgid "keybindings:all/selected/cancel|asc"
59688 msgid "Error occured while exporting"
59689 msgstr "Errore nell'esportazione"
59694 msgid "%02d/%02d\tAnniversary of %s\n"
59699 +msgid "parse_custom_format: fmt_string or ft not allocated\n"
59704 +msgid "parse_custom_format: invalid placeholder: {%s}\n"
59709 +msgid "%s: invalid format, index %ld\n"
59713 msgid "\t?\t\thelp\n"
59714 msgstr "\t?\t\taiuto\n"
59715 @@ -544,152 +610,161 @@
59716 msgstr "\tr / del\t\tcancella oggetti selezionati\n"
59719 +msgid "\tM\t\tmerge selected items (into top one)\n"
59723 msgid "\tD\t\tduplicate item\n"
59724 msgstr "\tD\t\tduplica oggetto\n"
59728 +msgid "\tU\t\tremove duplicates\n"
59729 +msgstr "\tD\t\tduplica oggetto\n"
59732 msgid "\tspace\t\tselect item\n"
59733 msgstr "\tspace\t\tseleziona oggetto\n"
59737 msgid "\t+\t\tselect all\n"
59738 msgstr "\t+\t\tseleziona tutti\n"
59742 msgid "\t-\t\tunselect all\n"
59743 msgstr "\t-\t\tdeseleziona tutti\n"
59747 msgid "\t*\t\tinvert selection\n"
59748 msgstr "\t*\t\tinverti selezione\n"
59752 msgid "\tw\t\twrite database to disk\n"
59753 msgstr "\tw\t\tscrivi database su disco\n"
59757 msgid "\tl\t\tread database from disk\n"
59758 msgstr "\tl\t\tleggi database da disco\n"
59762 msgid "\tC\t\tclear whole database\n"
59763 msgstr "\tC\t\tcancella l'intero database\n"
59767 msgid "\ti\t\timport database\n"
59768 msgstr "\ti\t\timporta database\n"
59772 msgid "\te\t\texport database\n"
59773 msgstr "\te\t\tesporta database\n"
59777 msgid "\tp\t\tprint database\n"
59778 msgstr "\tp\t\tstampa database\n"
59782 msgid "\to\t\topen database\n"
59783 msgstr "\to\t\tapri database\n"
59787 msgid "\ts\t\tsort database\n"
59788 msgstr "\ts\t\tordina database\n"
59792 msgid "\tS\t\t\"surname sort\"\n"
59793 msgstr "\tS\t\tordinamento per cognome\n"
59797 msgid "\tF\t\tsort by field (defined in configuration file)\n"
59799 "\tF\t\tordina per campo (definito nel file di\n"
59800 "\t\t\tconfigurazione)\n"
59804 msgid "\t/\t\tsearch\n"
59805 msgstr "\t/\t\tcerca\n"
59809 msgid "\t\\\t\tsearch next occurrence\n"
59810 msgstr "\t\\\t\tricerca occorrenza successiva\n"
59814 msgid "\tA\t\tmove current item up\n"
59815 msgstr "\tA\t\tmuovi oggetto corrente in alto\n"
59819 msgid "\tZ\t\tmove current item down\n"
59820 msgstr "\tZ\t\tmuovi oggetto corrente in basso\n"
59824 msgid "\tm\t\tsend mail with mutt\n"
59825 msgstr "\tm\t\tspedisci mail con mutt\n"
59829 msgid "\tv\t\tview URL with web browser\n"
59830 msgstr "\tv\t\tmostra URL con browser html\n"
59834 msgid "\tarrows/h,l\t\tchange tab\n"
59835 msgstr "\tfrecce/h,l\tcambia tab\n"
59839 msgid "\tq\t\t\tquit to main screen\n"
59840 msgstr "\tq\t\t\tvai allo schermo principale\n"
59844 msgid "\t1 - 5 A - Z\t\tedit fields\n"
59845 msgstr "\t1 - 5 A - Z\t\tmodifica campi\n"
59849 msgid "\tk or <\t\t\tprevious item\n"
59850 msgstr "\tk or <\t\t\toggetto precedente\n"
59854 msgid "\tj or >\t\t\tnext item\n"
59855 msgstr "\tj or >\t\t\toggetto successivo\n"
59859 msgid "\tr\t\t\troll e-mail addresses up\n"
59860 msgstr "\tr\t\t\tporta verso l'alto indirizzi e-mail\n"
59864 msgid "\tESC-r\t\t\troll e-mail addresses down\n"
59865 msgstr "\tESC-r\t\t\tporta verso il basso indirizzi e-mail\n"
59869 msgid "\tu\t\t\tundo\n"
59870 msgstr "\tu\t\t\tannulla\n"
59874 msgid "\tm\t\t\tsend mail with mutt\n"
59875 msgstr "\tm\t\t\tspedisci mail con mutt\n"
59879 msgid "\tv\t\t\tview url with web browser\n"
59880 msgstr "\tv\t\t\tmostra url con browser html\n"
59884 msgid "quote mismatch"
59885 msgstr "manca una virgoletta"
59889 msgid "no assignment character found"
59890 msgstr "errore di assegnamento"
59894 msgid "error in comma separated list"
59895 msgstr "errore nei valori separati da virgole"
59897 -#: options.c:289 options.c:308
59898 +#: options.c:311 options.c:330
59899 msgid "invalid value"
59900 msgstr "valore non valido"
59904 msgid "unknown option"
59905 msgstr "opzione sconosciuta"
59911 "valid values for the 'preserve_fields' option are 'all', "
59912 @@ -698,7 +773,7 @@
59913 "valori validi per l'opzione 'preserved_fields' sono 'all', "
59914 "'standard' (predefinito), e 'none'\n"
59920 "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
59921 @@ -707,99 +782,109 @@
59922 "valori validi per l'opzione 'address_style' sono 'eu' (predefinito), 'uk', e "
59927 msgid "invalid value assignment"
59928 msgstr "assegnazione di valore errata"
59933 "customfield: obsolete command - please use the 'field' and 'view' commands "
59935 msgstr "customfield: comando obsoleto - usare i comandi 'field' e 'view'"
59939 msgid "no view name provided"
59940 msgstr "nessun nome della vista fornito"
59944 msgid "no field identifier provided"
59945 msgstr "nessun identificatore di campo fornito"
59949 msgid "no field name provided"
59950 msgstr "nome campo non fornito"
59955 msgid "%s: parse error at line %d: "
59956 msgstr "%s: errore interpretazione linea %d: "
59961 msgid "unknown token %s\n"
59962 msgstr "istruzione %s sconosciuta\n"
59967 msgid "Your terminal size is %dx%d\n"
59968 msgstr "La dimensione del terminale ĆØ %dx%d\n"
59973 msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
59975 "Il terminale ĆØ troppo piccolo. La dimensione minima per abook ĆØ %dx%d\n"
59994 msgid "Press any key to continue..."
59995 msgstr "Premi un tasto per continuare..."
59999 msgid "Remove selected item(s)"
60000 msgstr "Cancella l'oggetto/gli oggetti selezionato/i"
60005 +msgid "Merge selected items"
60006 +msgstr "Nessun oggetto selezionato"
60010 +msgid "Remove duplicates"
60011 +msgstr "Cancella l'oggetto/gli oggetti selezionato/i"
60014 msgid "Clear WHOLE database"
60015 msgstr "Cancella TUTTO il database"
60019 msgid "Search hit bottom, continuing at top"
60020 msgstr "La ricerca ĆØ finita, continuo dall'inizio"
60025 msgid "Your current data will be lost - Press '%c' to continue"
60026 msgstr "I dati correnti saranno persi - Premi '%c' per continuare"
60030 msgid "Print <a>ll, print <s>elected, or <c>ancel?"
60031 msgstr "Stampa <t>utti, stampa <s>elezionati, o <c>ancella?"
60035 msgid "No selected items"
60036 msgstr "Nessun oggetto selezionato"
60040 msgid "File to open: "
60041 msgstr "File da aprire:"
60045 msgid "Save current database"
60046 msgstr "Salva il database corrente"
60050 msgid "Sorry, the specified file appears not to be a valid abook addressbook"
60051 msgstr "Mi dispiace, il file selezionato non ĆØ una rubrica valida per Abook"
60053 @@ -855,6 +940,9 @@
60055 msgstr "Personalizzato 5"
60057 +#~ msgid "GnomeCard (VCard) addressbook"
60058 +#~ msgstr "Rubrica GnomeCard (VCard)"
60060 #~ msgid "sorry, input for this field type is not yet implemented"
60061 #~ msgstr "mi dispiace, questo tipo di campo non e' ancora stato implementato"
60063 Binarne pliki BUILD/abook-0.6.0pre2/po/ja.gmo i abook/po/ja.gmo rĆ³Å¼niÄ
siÄ
60064 diff -urN BUILD/abook-0.6.0pre2/po/ja.po abook/po/ja.po
60065 --- BUILD/abook-0.6.0pre2/po/ja.po 2006-09-06 16:14:38.000000000 +0200
60066 +++ abook/po/ja.po 2013-03-13 15:07:45.000000000 +0100
60069 "Project-Id-Version: 0.5.5\n"
60070 "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
60071 -"POT-Creation-Date: 2006-09-06 17:14+0300\n"
60072 +"POT-Creation-Date: 2013-01-17 14:44+0100\n"
60073 "PO-Revision-Date: 2005-10-18 18:10+0200\n"
60074 "Last-Translator: TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>\n"
60075 "Language-Team: japanese\n"
60077 "MIME-Version: 1.0\n"
60078 "Content-Type: text/plain; charset=euc-jp\n"
60079 "Content-Transfer-Encoding: 8bit\n"
60084 msgid "Cannot create directory %s\n"
60085 msgstr "Ā„ĆĀ„Ā£Ā„ƬĀ„ĀÆĀ„ĆĀ„ĆŖ %s Ā¤Ā¬ĀŗĆ®ĆĀ®Ā¤ĆĀ¤ĀĀ¤ĆĀ¤Ā»Ā¤Ć³\n"
60090 msgid "%s is not a directory\n"
60091 msgstr "%s Ā¤ĆĀ„ĆĀ„Ā£Ā„ƬĀ„ĀÆĀ„ĆĀ„ĆŖĀ¤ĆĀ¤ĆĀ¤Ā¢Ā¤ĆŖĀ¤ĆĀ¤Ā»Ā¤Ć³\n"
60096 msgid "Memory allocation failure: %s\n"
60097 msgstr "Ā„Ć”Ā„Ć¢Ā„ĆŖĀ¼ĆØĆĆĀ¤ĆĀ¼ĀŗĆĆĀ¤Ā·Ā¤ĆĀ¤Ā·Ā¤Āæ: %s\n"
60102 msgid "Press enter to continue...\n"
60103 msgstr "ĆĀ³Ā¤Ā±Ā¤Ć«Ā¤ĆĀ¤Ć Enter Ā„ĀĀ”Ā¼Ā¤Ć²...\n"
60108 msgid "File %s is not writeable"
60109 msgstr "Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć« %s Ā¤ĆĀ½Ć±Ā¤ĀĀ¹Ć¾Ā¤ĆĆĆĀ²ĆĆĀ½Ā¤ĆĀ¤Ā¹"
60113 msgid "If you continue all changes will be lost. Do you want to continue?"
60114 msgstr "Ā¤Ā³Ā¤ĆĀ¤ĆĀ¤ĆĀ¤ĆĀ¤ĆĆĆĀ¹Ā¹Ć
ĆĀ¤Ā¬Ā¤Ā¹Ā¤ĆĀ¤ĆĀ¾ĆĀ¤ĀØĀ¤ĆĀ¤Ā·Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹Ā¤Ā¬Ā”Ā¢ĆĀ³Ā¤Ā±Ā¤ĆĀ¤Ć¢Ā¤ĆØĀ¤ĆĀ¤Ā·Ā¤Ā¤Ā¤ĆĀ¤Ā¹Ā¤Ā«?"
60118 msgid "Save database"
60119 msgstr "Ā„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤Ć²ĆĆĆĀø"
60123 msgid "Quit without saving"
60124 msgstr "ĆĆĆĀøĀ¤Ā»Ā¤ĀŗĀ¤ĆĀ½ĀŖĆĀ»"
60129 msgid "%s is not a valid HOME directory\n"
60130 msgstr "%s Ā¤ĆĆĀµĀ¤Ā·Ā¤Ā¤ HOME Ā„ĆĀ„Ā£Ā„ƬĀ„ĀÆĀ„ĆĀ„ĆŖĀ¤ĆĀ¤ĆĀ¤Ā¢Ā¤ĆŖĀ¤ĆĀ¤Ā»Ā¤Ć³\n"
60136 "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
60137 @@ -64,35 +65,45 @@
60138 "Ā¼Ā”Ā¤ĆĀ„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤Ć²ĆĀ±Ā»Ć¾Ā¤ĆĆĀ£ĀæĆ“Ā»ĆĆĆĀ¤Ā¹Ā¤Ć«Ā¤Ā³Ā¤ĆĀ¤ĆĀ¤ĆĀ¤ĀĀ¤ĆĀ¤Ā»Ā¤Ć³: --mutt-query, --convert, "
60139 "--add-email, --add-email-quiet\n"
60144 msgid "please use option --%s after --convert option\n"
60145 msgstr "--%s Ā„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤Ć --convert Ā„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤ĆĀøĆ„Ā¤ĆĀ»ĆĆĆŖĀ¤Ā·Ā¤ĆĀ¤ĀÆĀ¤ĆĀ¤ĀµĀ¤Ā¤\n"
60149 +#, fuzzy, c-format
60150 +msgid "please use option --outformat after --convert or --mutt-query option\n"
60151 +msgstr "--%s Ā„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤Ć --convert Ā„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤ĆĀøĆ„Ā¤ĆĀ»ĆĆĆŖĀ¤Ā·Ā¤ĆĀ¤ĀÆĀ¤ĆĀ¤ĀµĀ¤Ā¤\n"
60154 +#, fuzzy, c-format
60155 +msgid "Invalid custom format string\n"
60156 +msgstr "ĆĆĆĀµĀ¤ĆĀ¹Ć ĆĆĆĀ¾Ā¤Ā¬ĆĆĆĆŖĀ¤ĀµĀ¤Ć¬Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹"
60160 msgid "%s: unrecognized arguments on command line\n"
60161 msgstr "%s: ĆĀ§Ā¼Ā±Ā¤ĆĀ¤ĀĀ¤ĆĀ¤Ā¤Ā„Ā³Ā„ĆĀ„Ć³Ā„ĆĀ„Ć©Ā„Ā¤Ā„Ć³Ā°ĆŗĀæĆ“Ā¤ĆĀ¤Ā¹\n"
60165 msgid " -h\t--help\t\t\t\tshow usage"
60166 msgstr " -h\t--help\t\t\t\tĀ»ĆĆĆĆĆ½ĆĀ”"
60170 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
60172 " -C\t--config\t<Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«>\t\tĆĆĀ¾ĆÆĀ¤ĆĀ¾Ć¬Ā½ĆŖĀ°ĆĀ³Ā°Ā¤ĆĀ¤Ā¢Ā¤Ć«ĆĆĆĆŖĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤Ć²Ā»ĆĀ¤Ā¦"
60176 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
60178 "\t--datafile\t<Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«>\t\tĆĆĀ¾ĆÆĀ¤ĆĀ¾Ć¬Ā½ĆŖĀ°ĆĀ³Ā°Ā¤ĆĀ¤Ā¢Ā¤Ć«Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤Ć²Ā»ĆĀ¤Ā¦"
60182 msgid "\t--mutt-query\t<string>\tmake a query for mutt"
60183 msgstr "\t--mutt-query\t<ĆĀøĀ»ĆŗĆĆ³>\tĆƤĀ¤Ā¤Ā¹Ć§Ā¤ĆÆĀ¤Ā»Ā¤ĆĆĆĀ¤Ā·Ā¤Ć mutt ĆĆĀ¤ĆĆĀ°Ā·ĆĀ½ĆĆĆĀ¤Ā¹Ā¤Ć«"
60188 "\t--add-email\t\t\tread an e-mail message from stdin and\n"
60189 "\t\t\t\t\tadd the sender to the addressbook"
60190 @@ -100,7 +111,7 @@
60191 "\t--add-email\t\t\tĀ„Ć”Ā”Ā¼Ā„Ć«Ā¤Ć²ĆĀøĀ½Ć ĆĆ¾ĆĆĀ¤Ā«Ā¤Ć©ĆĆĀ¤ĆĀ½ĆĀ¤Ā·Ā¤Ć\n"
60192 "\t\t\t\t\tĀ¤Ā½Ā¤ĆĀŗĀ¹Ā½ĆĀæĆĀ¤Ć²Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢Ā¤ĆĆĆĀ²ĆĀ¤Ā¹Ā¤Ć«"
60197 "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
60198 "\t\t\t\t\trequire to confirm adding"
60199 @@ -108,66 +119,75 @@
60200 "\t--add-email-quiet\t\t--add-email Ā¤ĆĆĀ±Ā¤ĀøĀ”Ā£Ā¤ĀæĀ¤ĆĀ¤Ā·\n"
60201 "\t\t\t\t\tĆĆĀ²ĆĀ¤Ā¹Ā¤Ć«ĆĀ°Ā¤ĆĀ³ĆĆĀ§Ā¤Ć²ĀµĆ”Ā¤Ć”Ā¤ĆĀ¤Ā¤"
60205 msgid "\t--convert\t\t\tconvert address book files"
60206 msgstr "\t--convert\t\t\tĀ„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤Ć²ĆĀ¾Ā·ĆĀ¼Ā°Ā¤ĆĆĆĀ“Ā¹Ā¤Ā¹Ā¤Ć«"
60210 msgid "\toptions to use with --convert:"
60211 msgstr "\t--convert Ā¤ĆĀ»ĆĀ¤Ā¦Ā„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³:"
60215 msgid "\t--informat\t<format>\tformat for input file"
60216 msgstr "\t--informat\t<Ā·ĆĀ¼Ā°>\tĆĆĀ“Ā¹ĀøĀµĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤ĆĀ·ĆĀ¼Ā°"
60220 msgid "\t\t\t\t\t(default: abook)"
60221 msgstr "\t\t\t\t\t(Ā“Ć»ĆĆŖĆĆ: abook)"
60225 msgid "\t--infile\t<file>\t\tsource file"
60226 msgstr "\t--infile\t<Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«>\t\tĆĆĀ“Ā¹ĀøĀµĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«"
60230 msgid "\t\t\t\t\t(default: stdin)"
60231 msgstr "\t\t\t\t\t(Ā“Ć»ĆĆŖĆĆ: ĆĀøĀ½Ć ĆĆ¾ĆĆ)"
60235 msgid "\t--outformat\t<format>\tformat for output file"
60236 msgstr "\t--outformat\t<Ā·ĆĀ¼Ā°>\tĀ½ĆĆĆĆĆØĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤ĆĀ·ĆĀ¼Ā°"
60240 msgid "\t\t\t\t\t(default: text)"
60241 msgstr "\t\t\t\t\t(Ā“Ć»ĆĆŖĆĆ: text)"
60245 msgid "\t--outfile\t<file>\t\tdestination file"
60246 msgstr "\t--outfile\t<Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«>\t\tĀ½ĆĆĆĆĆØĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«"
60250 msgid "\t\t\t\t\t(default: stdout)"
60251 msgstr "\t\t\t\t\t(Ā“Ć»ĆĆŖĆĆ: ĆĀøĀ½Ć Ā½ĆĆĆ)"
60256 +msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
60257 +msgstr "\t--outformat\t<Ā·ĆĀ¼Ā°>\tĀ½ĆĆĆĆĆØĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤ĆĀ·ĆĀ¼Ā°"
60260 +msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
60264 msgid "\t--formats\t\t\tlist available formats"
60265 msgstr "\t--formats\t\t\tĆĆøĆĆĀ²ĆĆĀ½Ā¤ĆĀ·ĆĀ¼Ā°Ā°Ć¬ĆĆ·Ā¤Ć²ĆĀ½Ā¼ĀØĀ¤Ā¹Ā¤Ć«"
60270 msgid "Cannot open database\n"
60271 msgstr "Ā„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤Ā¬Ā³Ā«Ā¤Ā±Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60276 msgid "too few arguments to make conversion\n"
60277 msgstr "ĆĆĀ“Ā¹Ā¤ĆĆĀ¬ĆĆĀ¤ĆĀ„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤Ā¬Ā»ĆĆĆŖĀ¤ĀµĀ¤Ć¬Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60282 msgid "try --help\n"
60283 msgstr "--help Ā¤Ć²Ā¤Ā“ĆĆ·Ā¤ĀÆĀ¤ĆĀ¤ĀµĀ¤Ā¤\n"
60289 "input and output formats are the same\n"
60290 @@ -176,46 +196,46 @@
60291 "ĆĆ¾ĆĆĀ¤ĆĀ½ĆĆĆĀ¤ĆĀ·ĆĀ¼Ā°Ā¤Ā¬ĆĀ±Ā¤ĀøĀ¤ĆĀ¤Ā¹\n"
60292 "Ā½ĀŖĆĀ»Ā¤Ā·Ā¤ĆĀ¤Ā¹\n"
60297 msgid "input format %s not supported\n"
60298 msgstr "ĆĆ¾ĆĆĀ·ĆĀ¼Ā°Ā¤ĆĀ¤Ā·Ā¤Ć %s Ā¤ĆĀ¤Ā“ĆĆøĆĆĀ¤Ā¤Ā¤ĀæĀ¤ĆĀ¤Ā±Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60303 msgid "cannot read file %s\n"
60304 msgstr "Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć« %s Ā¤Ā¬ĆĆĀ¤ĆĀ½ĆĀ¤Ā»Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60309 msgid "output format %s not supported\n"
60310 msgstr "Ā½ĆĆĆĀ·ĆĀ¼Ā°Ā¤ĆĀ¤Ā·Ā¤Ć %s Ā¤ĆĀ¤Ā“ĆĆøĆĆĀ¤Ā¤Ā¤ĀæĀ¤ĆĀ¤Ā±Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60315 msgid "cannot write file %s\n"
60316 msgstr "Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć« %s Ā¤ĆĀ½Ć±Ā¤ĀĀ¹Ć¾Ā¤Ć”Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60321 msgid "cannot open %s\n"
60322 msgstr "%s Ā¤Ā¬Ā³Ā«Ā¤Ā±Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60327 msgid "%d item(s) added to %s\n"
60328 msgstr "%d ĀøĆĀ¤ĆĀ¹Ć ĆĆĀ¤Ć² %s Ā¤ĆĆĆĀ²ĆĀ¤Ā·Ā¤ĆĀ¤Ā·Ā¤Āæ\n"
60332 msgid "Valid sender address not found"
60333 msgstr "ĆĀ§Ā¼Ā±Ā²ĆĆĀ½Ā¤ĆĀŗĀ¹Ā½ĆĀæĆĀ„Ā¢Ā„ĆĀ„ƬĀ„Ā¹Ā¤Ā¬Ā¤Ā¢Ā¤ĆŖĀ¤ĆĀ¤Ā»Ā¤Ć³Ā¤ĆĀ¤Ā·Ā¤Āæ"
60338 msgid "Address %s already in addressbook\n"
60339 msgstr "Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ %s Ā¤ĆĀ“Ć»Ā¤ĆĀ„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢Ā¤ĆĆĆ¾Ā¤ĆĀ¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹\n"
60345 "cannot open /dev/tty\n"
60346 @@ -224,20 +244,20 @@
60347 "/dev/tty Ā¤Ā¬Ā³Ā«Ā¤Ā±Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60348 "--add-email-quiet Ā¤Ć²Ā¤Ā“ĆĆøĆĆĀ¤ĆĀ¤ĆĀ¤ĆĀ¤ĀæĆĆ½Ā¤Ā¬ĆĆĀ¤Ā¤Ā¤Ā«Ā¤Ć¢Ā¤Ā·Ā¤Ć¬Ā¤ĆĀ¤Ā»Ā¤Ć³\n"
60353 msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
60354 msgstr "\"%s <%s>\" Ā¤Ć² %s Ā¤ĆĆĆĀ²ĆĀ¤Ā·Ā¤ĆĀ¤Ā¹Ā¤Ā«? (%c/%c)\n"
60356 -#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
60357 +#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
60358 msgid "keybinding for yes|y"
60361 -#: abook.c:753 abook.c:755 ui.c:341
60362 +#: abook.c:781 abook.c:783 ui.c:432
60363 msgid "keybinding for no|n"
60369 msgid "stdin is a directory or cannot stat stdin\n"
60370 msgstr "ĆĀøĀ½Ć ĆĆ¾ĆĆĀ¤Ā¬Ā„ĆĀ„Ā£Ā„ƬĀ„ĀÆĀ„ĆĀ„ĆŖĀ¤Ā«Ā”Ā¢stat ĆĆĀ²ĆĆĀ½Ā¤ĆĀ¤Ā¹\n"
60371 @@ -311,202 +331,248 @@
60372 msgid "Anniversary day"
60381 msgid "field already defined"
60386 msgid "standard field does not need to be declared"
60392 msgid "unknown type"
60393 msgstr "ĆĆĆĆĀ¤ĆĀ„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤ĆĀ¤Ā¹"
60397 msgid "Invalid field value defined in configuration"
60398 msgstr "ĆĆĆĀµĀ¤ĆĀ¹Ć ĆĆĆĀ¾Ā¤Ā¬ĆĆĆĆŖĀ¤ĀµĀ¤Ć¬Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹"
60403 msgid "Invalid field value for sorting"
60404 msgstr "ĆĆĆĀµĀ¤ĆĀ¹Ć ĆĆĆĀ¾Ā¤Ā¬ĆĆĆĆŖĀ¤ĀµĀ¤Ć¬Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹"
60408 msgid "Tab name too wide for screen"
60409 msgstr "Ā„ĀæĀ„ĆĆĀ¾Ā¤Ā¬Ā²ĆØĆĆĀ¤Ā«Ā¤Ć©Ā¤ĆĀ¤ĆĀ½ĆĀ¤ĆĀ¤Ā¹"
60413 msgid "keybindings_new_123456789|n123456789"
60419 msgid "Choose %s to modify (<1>%s%c%s%s."
60426 msgstr "Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹"
60442 msgstr "Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹"
60469 msgid "Year (optional): "
60475 msgid "Invalid date"
60476 msgstr "ĆĆĆĀµĀ¤ĆĆĆĀ¤ĆĀ¤Ā¹"
60486 msgid "?:help q:quit editor"
60489 -#: filter.c:71 filter.c:82
60490 +#: filter.c:88 filter.c:100
60491 msgid "abook native format"
60492 msgstr "abook ĆĆĀ¼Ā«Ā·ĆĀ¼Ā°"
60496 msgid "ldif / Netscape addressbook"
60497 msgstr "ldif / Netscape Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢"
60499 -#: filter.c:73 filter.c:84
60500 +#: filter.c:90 filter.c:103 filter.c:121
60502 msgstr "mutt alias"
60504 -#: filter.c:74 filter.c:86
60505 +#: filter.c:91 filter.c:106
60506 msgid "pine addressbook"
60507 msgstr "pine Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢"
60509 -#: filter.c:75 filter.c:88
60510 +#: filter.c:92 filter.c:107
60511 msgid "comma separated values"
60512 msgstr "Ā„Ā³Ā„Ć³Ā„ĆĀ¶ĆØĆĆĀ¤ĆŖĀ„ĆĀ„ĀĀ„Ā¹Ā„Ć"
60514 -#: filter.c:76 filter.c:89
60515 +#: filter.c:93 filter.c:108
60516 msgid "comma separated values (all fields)"
60517 msgstr "Ā„Ā³Ā„Ć³Ā„ĆĀ¶ĆØĆĆĀ¤ĆŖĀ„ĆĀ„ĀĀ„Ā¹Ā„Ć (ĆĀ“Ā¹Ć ĆĆ)"
60519 -#: filter.c:77 filter.c:90
60520 +#: filter.c:94 filter.c:109
60521 msgid "Palm comma separated values"
60522 msgstr "Palm ĆĆĀ„Ā³Ā„Ć³Ā„ĆĀ¶ĆØĆĆĀ¤ĆŖĀ„ĆĀ„ĀĀ„Ā¹Ā„Ć"
60526 +msgid "vCard file"
60530 msgid "ldif / Netscape addressbook (.4ld)"
60531 msgstr "ldif / Netscape Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢ (.4ld)"
60534 +#: filter.c:102 filter.c:120
60535 +msgid "vCard 2 file"
60539 +msgid "mutt query format (internal use)"
60543 msgid "html document"
60544 msgstr "HTML ĆĀøĀ½Ć±"
60547 -msgid "GnomeCard (VCard) addressbook"
60548 -msgstr "GnomeCard (vCard) Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢"
60558 msgstr "Ā„ĆĀ„ƬĀ”Ā¼Ā„Ć³Ā„ĆĀ„ĀĀ„Ā¹Ā„Ć"
60562 msgid "Wanderlust address book"
60563 msgstr "Wanderlust Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢"
60567 msgid "Spruce address book"
60568 msgstr "Spruce Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢"
60572 msgid "BSD calendar"
60577 +#: filter.c:115 filter.c:122
60579 +msgid "Custom format"
60580 +msgstr "Ā³ĆĆĀ„Ā¾Ć°ĆĆ³1"
60584 +msgid "input formats:"
60591 +msgid "output formats:"
60596 +msgid "query-compatible output formats:"
60600 msgid "import database"
60601 msgstr "Ā„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĀ¼ĆØĀ¤ĆŖĀ¹Ć¾Ā¤Ć"
60603 -#: filter.c:182 filter.c:299
60604 +#: filter.c:216 filter.c:345
60605 msgid "please select a filter"
60606 msgstr "Ā·ĆĀ¼Ā°Ā¤Ć²ĆĀŖĀ¤Ć³Ā¤ĆĀ¤ĀÆĀ¤ĆĀ¤ĀµĀ¤Ā¤"
60608 -#: filter.c:190 filter.c:307
60609 +#: filter.c:224 filter.c:353
60610 msgid "x -\tcancel"
60611 msgstr "x -\tĆƦĀ»Ć"
60613 -#: filter.c:211 filter.c:345
60614 +#: filter.c:245 filter.c:391
60616 msgstr "Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«ĆĀ¾: "
60620 msgid "Error occured while opening the file"
60621 msgstr "Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤Ć²Ā³Ā«Ā¤ĀÆĀŗĆĀ¤ĆĀ„ĀØĀ„Ć©Ā”Ā¼Ā¤Ā¬ĆĀÆĆĀøĀ¤Ā·Ā¤ĆĀ¤Ā·Ā¤Āæ"
60625 msgid "File does not seem to be a valid addressbook"
60626 msgstr "Ā„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤Ā¬ĆĀµĀ¤Ā·Ā¤Ā¤Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢Ā¤ĆĀ¤ĆĀ¤ĆĀ¤Ā¤Ā¤ĆØĀ¤Ā¦Ā¤ĆĀ¤Ā¹"
60630 msgid "export database"
60631 msgstr "Ā„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĀ½ĆĆĆ"
60635 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
60636 msgstr "Ā½ĆĆĆĆĆĀ¾Ć a:Ā¤Ā¹Ā¤ĆĀ¤Ć s:ĆĀŖĆĆ²ĆĆ“ĆĀ¬Ā¤ĆĀ¤Ć c:ĆƦĀ»Ć?"
60638 -#: filter.c:331 ui.c:632
60639 +#: filter.c:377 ui.c:769
60640 msgid "keybindings:all/selected/cancel|asc"
60645 msgid "Error occured while exporting"
60646 msgstr "Ā½ĆĆĆĆƦĀ¤ĆĀ„ĀØĀ„Ć©Ā”Ā¼Ā¤Ā¬ĆĀÆĆĀøĀ¤Ā·Ā¤ĆĀ¤Ā·Ā¤Āæ"
60651 msgid "%02d/%02d\tAnniversary of %s\n"
60656 +msgid "parse_custom_format: fmt_string or ft not allocated\n"
60661 +msgid "parse_custom_format: invalid placeholder: {%s}\n"
60666 +msgid "%s: invalid format, index %ld\n"
60670 msgid "\t?\t\thelp\n"
60671 msgstr "\t?\t\tĀ„ĆĀ„Ć«Ā„Ć\n"
60672 @@ -544,261 +610,280 @@
60673 msgstr "\tr / Del\t\tĆĀŖĆĆ²Ā¹Ć ĆĆĀ¤ĆĀŗĆÆĀ½Ć¼\n"
60676 +msgid "\tM\t\tmerge selected items (into top one)\n"
60680 msgid "\tD\t\tduplicate item\n"
60681 msgstr "\tD\t\tĀ¹Ć ĆĆĀ¤ĆĆĀ£ĆĀ½\n"
60685 +msgid "\tU\t\tremove duplicates\n"
60686 +msgstr "\tD\t\tĀ¹Ć ĆĆĀ¤ĆĆĀ£ĆĀ½\n"
60689 msgid "\tspace\t\tselect item\n"
60690 msgstr "\tĀ„Ā¹Ā„ĆĀ”Ā¼Ā„Ā¹Ā„ĀĀ”Ā¼\tĀ¹Ć ĆĆĀ¤ĆĆĀŖĆĆ²\n"
60694 msgid "\t+\t\tselect all\n"
60695 msgstr "\t+\t\tĀ¤Ā¹Ā¤ĆĀ¤ĆĆĀŖĆĆ²\n"
60699 msgid "\t-\t\tunselect all\n"
60700 msgstr "\t-\t\tĀ¤Ā¹Ā¤ĆĀ¤ĆĆĀŖĆĆ²Ā²Ć²Ā½Ć¼\n"
60704 msgid "\t*\t\tinvert selection\n"
60705 msgstr "\t*\t\tĆĀŖĆĆ²Ā¤Ć²ĆĀæĆ
Ā¾\n"
60709 msgid "\tw\t\twrite database to disk\n"
60710 msgstr "\tw\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤Ć²Ā„ĆĀ„Ā£Ā„Ā¹Ā„ĀÆĀ¤ĆĀ½Ć±Ā¤ĀĀ¹Ć¾Ā¤Ć\n"
60714 msgid "\tl\t\tread database from disk\n"
60715 msgstr "\tl\t\tĀ„ĆĀ„Ā£Ā„Ā¹Ā„ĀÆĀ¤Ā«Ā¤Ć©Ā„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤Ć²ĆĆĀ¤ĆĀ½ĆĀ¤Ā·\n"
60719 msgid "\tC\t\tclear whole database\n"
60720 msgstr "\tC\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĆĀ“Ā¾ĆĀµĆ®\n"
60724 msgid "\ti\t\timport database\n"
60725 msgstr "\ti\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĀ¼ĆØĀ¤ĆŖĀ¹Ć¾Ā¤Ć\n"
60729 msgid "\te\t\texport database\n"
60730 msgstr "\te\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĀ½ĆĆĆ\n"
60734 msgid "\tp\t\tprint database\n"
60735 msgstr "\tp\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĀ°ĆµĀŗĆ¾\n"
60739 msgid "\to\t\topen database\n"
60740 msgstr "\to\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤Ć²Ā³Ā«Ā¤ĀÆ\n"
60744 msgid "\ts\t\tsort database\n"
60745 msgstr "\ts\t\tĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤ĆĆĀ°ĆĆ³\n"
60749 msgid "\tS\t\t\"surname sort\"\n"
60750 msgstr "\tS\t\tĀ²Ā¼Ā¤ĆĆĀ¾ĆĀ°Ā¤ĆĆĀ°ĆĆ³\n"
60754 msgid "\tF\t\tsort by field (defined in configuration file)\n"
60755 msgstr "\tF\t\tĆĆĆĆŖĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤ĆĀ»ĆĆĆŖĀ¤Ā·Ā¤ĀæĀ¹Ć ĆĆĀ¤ĆĀ¤ĆØĀ¤Ć«ĆĀ°ĆĆ³\n"
60759 msgid "\t/\t\tsearch\n"
60760 msgstr "\t/\t\tĀøĀ”ĀŗĆ·\n"
60764 msgid "\t\\\t\tsearch next occurrence\n"
60765 msgstr "\t\\\t\tĀ¼Ā”Ā¤Ć²ĀøĀ”ĀŗĆ·\n"
60769 msgid "\tA\t\tmove current item up\n"
60770 msgstr "\tA\t\tĀ¹Ć ĆĆĀ¤Ć²Ā¾Ć„Ā¤ĆĀ°ĆĆĀ°\n"
60774 msgid "\tZ\t\tmove current item down\n"
60775 msgstr "\tZ\t\tĀ¹Ć ĆĆĀ¤Ć²Ā²Ā¼Ā¤ĆĀ°ĆĆĀ°\n"
60779 msgid "\tm\t\tsend mail with mutt\n"
60780 msgstr "\tm\t\tMutt Ā¤ĆĀ„Ć”Ā”Ā¼Ā„Ć«Ā¤Ć²ĆĆ·Ā¤Ć«\n"
60784 msgid "\tv\t\tview URL with web browser\n"
60785 msgstr "\tv\t\tURL Ā¤Ć²Ā„ĆĀ„Ć©Ā„Ā¦Ā„Ā¶Ā¤ĆĀ±ĆĆĆ·Ā¤Ā¹Ā¤Ć«\n"
60790 msgid "\tarrows/h,l\t\tchange tab\n"
60791 msgstr "\ta,c,p,o,C/ĆĆ°Ā°Ćµ/h,l\tĀ„ĀæĀ„ĆĀ¤ĆĆĆĀ¹Ā¹\n"
60796 msgid "\tq\t\t\tquit to main screen\n"
60797 msgstr "\tQ\t\tĆĆĆĀøĀ¤Ā»Ā¤ĀŗĀ¤ĆĀ½ĀŖĆĀ»\n"
60802 msgid "\t1 - 5 A - Z\t\tedit fields\n"
60803 msgstr "\t1 - 5\t\t\tĀ¹Ć ĆĆĀ¤ĆĆĆĀ½Āø\n"
60807 msgid "\tk or <\t\t\tprevious item\n"
60808 msgstr "\tk,<\t\t\tĆĀ°Ā¤ĆĀ¹Ć ĆĆ\n"
60812 msgid "\tj or >\t\t\tnext item\n"
60813 msgstr "\tj,>\t\t\tĀ¼Ā”Ā¤ĆĀ¹Ć ĆĆ\n"
60818 msgid "\tr\t\t\troll e-mail addresses up\n"
60819 msgstr "\tr\t\t\tĀ„Ć”Ā”Ā¼Ā„Ć«Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹Ā¤ĆĀ½Ć§ĆĆĀ¤Ć²ĆĆĀ¤ĀØĀ¤Ć«\n"
60824 msgid "\tESC-r\t\t\troll e-mail addresses down\n"
60825 msgstr "\tr\t\t\tĀ„Ć”Ā”Ā¼Ā„Ć«Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹Ā¤ĆĀ½Ć§ĆĆĀ¤Ć²ĆĆĀ¤ĀØĀ¤Ć«\n"
60829 msgid "\tu\t\t\tundo\n"
60830 msgstr "\tu\t\t\tĀ„Ā¢Ā„Ć³Ā„ĆĀ„Ā„ (Ā°Ć¬Ā¤ĆĆĀ°Ā¤ĆĀ¾ĆµĆĆĀ¤ĆĆĆ”Ā¤Ā¹)\n"
60834 msgid "\tm\t\t\tsend mail with mutt\n"
60835 msgstr "\tm\t\t\tMutt Ā¤ĆĀ„Ć”Ā”Ā¼Ā„Ć«Ā¤Ć²ĆĆ·Ā¤Ć«\n"
60839 msgid "\tv\t\t\tview url with web browser\n"
60840 msgstr "\tv\t\t\tURL Ā¤Ć²Ā„ĆĀ„Ć©Ā„Ā¦Ā„Ā¶Ā¤ĆĀ±ĆĆĆ·\n"
60844 msgid "quote mismatch"
60849 msgid "no assignment character found"
60855 msgid "error in comma separated list"
60856 msgstr "Ā„Ā³Ā„Ć³Ā„ĆĀ¶ĆØĆĆĀ¤ĆŖĀ„ĆĀ„ĀĀ„Ā¹Ā„Ć"
60858 -#: options.c:289 options.c:308
60859 +#: options.c:311 options.c:330
60860 msgid "invalid value"
60861 msgstr "ĆĆĆĀµĀ¤ĆĆĆĀ¤ĆĀ¤Ā¹"
60865 msgid "unknown option"
60866 msgstr "ĆĆĆĆĀ¤ĆĀ„ĀŖĀ„ĆĀ„Ā·Ā„ƧĀ„Ć³Ā¤ĆĀ¤Ā¹"
60872 "valid values for the 'preserve_fields' option are 'all', "
60873 "'standard' (default), and 'none'\n"
60880 "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
60886 msgid "invalid value assignment"
60887 msgstr "ĆĆĆĀµĀ¤ĆĆĆ„ĆĆ¾Ā¤ĆĀ¤Ā¹"
60892 "customfield: obsolete command - please use the 'field' and 'view' commands "
60898 msgid "no view name provided"
60903 msgid "no field identifier provided"
60908 msgid "no field name provided"
60914 msgid "%s: parse error at line %d: "
60915 msgstr "%s: ĆĀøĆĀ”Ā„ĀØĀ„Ć©Ā”Ā¼Ā¤Ā¬ %d Ā¹ĆĆĆĀ¤ĆĀ¤Ā¢Ā¤ĆŖĀ¤ĆĀ¤Ā¹: "
60920 msgid "unknown token %s\n"
60921 msgstr "%s Ā¤ĆĆĆĆĆĀ¤ĆĆĆĆĆŖĀ„Ā³Ā„ĆĀ„Ć³Ā„ĆĀ¤ĆĀ¤Ā¹\n"
60926 msgid "Your terminal size is %dx%d\n"
60927 msgstr "Ā²ĆØĆĆĀ„ĀµĀ„Ā¤Ā„ĀŗĀ¤Ć %dx%d Ā¤ĆĀ¤Ā¹\n"
60932 msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
60933 msgstr "Ā²ĆØĆĆĀ¤Ā¬Ā¾Ā®Ā¤ĀµĀ¤Ā¹Ā¤Ā®Ā¤ĆĀ¤Ā¹Ā”Ā£Ā¾ĀÆĀ¤ĆĀ¤ĀÆĀ¤ĆĀ¤Ć¢ %dx%d Ā¤ĆĆĀ¬ĆĆĀ¤ĆĀ¤Ā¹\n"
60948 msgstr "Ā„ĆĀ„Ć«Ā„Ć"
60952 msgid "Press any key to continue..."
60953 msgstr "Ā²ĀæĀ¤Ā«Ā„ĀĀ”Ā¼Ā¤Ć²Ā²Ā”Ā¤Ā·Ā¤ĆĀ¤ĀÆĀ¤ĆĀ¤ĀµĀ¤Ā¤..."
60957 msgid "Remove selected item(s)"
60958 msgstr "ĆĀŖĆĆ²Ā¹Ć ĆĆĀ¤Ć²ĀŗĆÆĀ½Ć¼Ā¤Ā·Ā¤ĆĀ¤Ā¹Ā¤Ā«"
60963 +msgid "Merge selected items"
60964 +msgstr "Ā²ĀæĀ¤Ć¢ĆĀŖĆĆ²Ā¤ĀµĀ¤Ć¬Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā»Ā¤Ć³"
60968 +msgid "Remove duplicates"
60969 +msgstr "ĆĀŖĆĆ²Ā¹Ć ĆĆĀ¤Ć²ĀŗĆÆĀ½Ć¼Ā¤Ā·Ā¤ĆĀ¤Ā¹Ā¤Ā«"
60972 msgid "Clear WHOLE database"
60973 msgstr "Ā„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹ĆĀ“ĆĆĀ¤Ć²Ā¾ĆĀµĆ®Ā¤Ā·Ā¤ĆĀ¤Ā¹Ā¤Ā«"
60977 msgid "Search hit bottom, continuing at top"
60978 msgstr "ĀŗĆĀøĆ„Ā¤ĆĀ¤ĆĀøĀ”ĀŗĆ·Ā¤Ā·Ā¤ĆĀ¤Ā·Ā¤ĀæĀ”Ā£ĀŗĆĀ½Ć©Ā¤Ā«Ā¤Ć©Ā¤Ć¢ĀøĀ”ĀŗĆ·Ā¤Ā·Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹"
60983 msgid "Your current data will be lost - Press '%c' to continue"
60984 msgstr "ĀøĀ½ĀŗĆĀ¤ĆĀ„ĆĀ”Ā¼Ā„ĀæĀ¤ĆĀ¾ĆĀ¤ĀØĀ¤ĆĀ¤Ā·Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā¹Ā”Ā£Ā¤ĆØĀ¤ĆĀ¤Ā·Ā¤Ā±Ā¤Ć¬Ā¤Ć '%c' Ā¤ĆĆĀ³Ā¤Ā±Ā¤ĆĀ¤ĀÆĀ¤ĆĀ¤ĀµĀ¤Ā¤"
60988 msgid "Print <a>ll, print <s>elected, or <c>ancel?"
60989 msgstr "Ā°ĆµĀŗĆ¾ĆĆĀ¾Ć a:Ā¤Ā¹Ā¤ĆĀ¤Ć s:ĆĀŖĆĆ²Ā¹Ć ĆĆĀ¤ĆĀ¤Ć c:ĆƦĀ»Ć?"
60993 msgid "No selected items"
60994 msgstr "Ā²ĀæĀ¤Ć¢ĆĀŖĆĆ²Ā¤ĀµĀ¤Ć¬Ā¤ĆĀ¤Ā¤Ā¤ĆĀ¤Ā»Ā¤Ć³"
60998 msgid "File to open: "
60999 msgstr "Ā³Ā«Ā¤ĀÆĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«: "
61003 msgid "Save current database"
61004 msgstr "ĀøĀ½ĀŗĆĀ¤ĆĀ„ĆĀ”Ā¼Ā„ĀæĀ„ĆĀ”Ā¼Ā„Ā¹Ā¤Ć²ĆĆĆĀøĀ¤Ā·Ā¤ĆĀ¤Ā¹Ā¤Ā«"
61008 msgid "Sorry, the specified file appears not to be a valid abook addressbook"
61010 "ĀæĀ½Ā¤Ā·ĆƵĀ¤Ā¢Ā¤ĆŖĀ¤ĆĀ¤Ā»Ā¤Ć³Ā¤Ā¬Ā”Ā¢Ā¤Ā“Ā»ĆĆĆŖĀ¤ĆĀ„ĆĀ„Ā”Ā„Ā¤Ā„Ć«Ā¤ĆĆĀµĀµĀ¬Ā¤Ć abook Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢Ā¤ĆĀ¤ĆĀ¤ĆĀ¤Ā¤Ā¤ĆØĀ¤Ā¦Ā¤ĆĀ¤Ā¹"
61011 @@ -858,6 +943,9 @@
61013 msgstr "Ā³ĆĆĀ„Ā¾Ć°ĆĆ³5"
61015 +#~ msgid "GnomeCard (VCard) addressbook"
61016 +#~ msgstr "GnomeCard (vCard) Ā„Ā¢Ā„ĆĀ„ƬĀ„Ā¹ĆĀ¢"
61018 #~ msgid "?:help c:contact a:address p:phone o:other"
61019 #~ msgstr "?:Ā„ĆĀ„Ć«Ā„Ć c:ĆĀ¢ĆĆĆĆØ a:Ā½Ā»Ā½ĆŖ p:Ć
Ć
ĆĆ o:Ā¤Ā½Ā¤ĆĆĀ¾"
61021 diff -urN BUILD/abook-0.6.0pre2/po/Makefile.in.in abook/po/Makefile.in.in
61022 --- BUILD/abook-0.6.0pre2/po/Makefile.in.in 2006-08-04 22:30:07.000000000 +0200
61023 +++ abook/po/Makefile.in.in 2013-03-13 15:07:45.000000000 +0100
61025 # Makefile for PO directory in any package using GNU gettext.
61026 -# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
61027 +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
61029 # This file can be copied and used freely without restrictions. It can
61030 # be used in projects which are not available under the GNU General Public
61032 # Please note that the actual code of GNU gettext is covered by the GNU
61033 # General Public License and is *not* in the public domain.
61035 -# Origin: gettext-0.14.4
61036 +# Origin: gettext-0.18
61037 +GETTEXT_MACRO_VERSION = 0.18
61039 PACKAGE = @PACKAGE@
61040 VERSION = @VERSION@
61041 @@ -23,19 +24,38 @@
61044 exec_prefix = @exec_prefix@
61045 -datadir = @datadir@
61046 datarootdir = @datarootdir@
61047 +datadir = @datadir@
61048 localedir = @localedir@
61049 gettextsrcdir = $(datadir)/gettext/po
61051 INSTALL = @INSTALL@
61052 INSTALL_DATA = @INSTALL_DATA@
61053 -MKINSTALLDIRS = @MKINSTALLDIRS@
61054 -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
61056 -GMSGFMT = @GMSGFMT@
61058 -XGETTEXT = @XGETTEXT@
61059 +# We use $(mkdir_p).
61060 +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
61061 +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
61062 +# @install_sh@ does not start with $(SHELL), so we add it.
61063 +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
61064 +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
61065 +# versions, $(mkinstalldirs) and $(install_sh) are unused.
61066 +mkinstalldirs = $(SHELL) @install_sh@ -d
61067 +install_sh = $(SHELL) @install_sh@
61068 +MKDIR_P = @MKDIR_P@
61069 +mkdir_p = @mkdir_p@
61071 +GMSGFMT_ = @GMSGFMT@
61072 +GMSGFMT_no = @GMSGFMT@
61073 +GMSGFMT_yes = @GMSGFMT_015@
61074 +GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
61075 +MSGFMT_ = @MSGFMT@
61076 +MSGFMT_no = @MSGFMT@
61077 +MSGFMT_yes = @MSGFMT_015@
61078 +MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
61079 +XGETTEXT_ = @XGETTEXT@
61080 +XGETTEXT_no = @XGETTEXT@
61081 +XGETTEXT_yes = @XGETTEXT_015@
61082 +XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
61083 MSGMERGE = msgmerge
61084 MSGMERGE_UPDATE = @MSGMERGE@ --update
61086 @@ -68,19 +88,26 @@
61088 @lang=`echo $* | sed -e 's,.*/,,'`; \
61089 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
61090 - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
61091 - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
61092 + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
61093 + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
61096 sed -e '/^#/d' $< > t-$@
61100 -all: all-@USE_NLS@
61101 +all: check-macro-version all-@USE_NLS@
61106 +# Ensure that the gettext macros and this Makefile.in.in are in sync.
61107 +check-macro-version:
61108 + @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
61109 + || { 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; \
61113 # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
61114 # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
61115 # we don't want to bother translators with empty POT files). We assume that
61116 @@ -111,16 +138,34 @@
61117 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
61118 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
61119 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
61120 + if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
61121 + package_gnu='GNU '; \
61123 + package_gnu=''; \
61125 if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
61126 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
61128 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
61130 - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
61131 - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
61132 - --files-from=$(srcdir)/POTFILES.in \
61133 - --copyright-holder='$(COPYRIGHT_HOLDER)' \
61134 - --msgid-bugs-address="$$msgid_bugs_address"
61135 + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
61136 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
61137 + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
61138 + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
61139 + --files-from=$(srcdir)/POTFILES.in \
61140 + --copyright-holder='$(COPYRIGHT_HOLDER)' \
61141 + --msgid-bugs-address="$$msgid_bugs_address" \
61144 + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
61145 + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
61146 + --files-from=$(srcdir)/POTFILES.in \
61147 + --copyright-holder='$(COPYRIGHT_HOLDER)' \
61148 + --package-name="$${package_gnu}@PACKAGE@" \
61149 + --package-version='@VERSION@' \
61150 + --msgid-bugs-address="$$msgid_bugs_address" \
61153 test ! -f $(DOMAIN).po || { \
61154 if test -f $(srcdir)/$(DOMAIN).pot; then \
61155 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
61156 @@ -148,8 +193,15 @@
61157 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
61158 if test -f "$(srcdir)/$${lang}.po"; then \
61159 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
61160 - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
61161 - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
61162 + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
61164 + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
61165 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
61166 + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
61168 + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
61172 $(MAKE) $${lang}.po-create; \
61174 @@ -159,7 +211,7 @@
61176 install-data: install-data-@USE_NLS@
61177 if test "$(PACKAGE)" = "gettext-tools"; then \
61178 - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
61179 + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
61180 for file in $(DISTFILES.common) Makevars.template; do \
61181 $(INSTALL_DATA) $(srcdir)/$$file \
61182 $(DESTDIR)$(gettextsrcdir)/$$file; \
61183 @@ -172,13 +224,12 @@
61185 install-data-no: all
61186 install-data-yes: all
61187 - $(mkinstalldirs) $(DESTDIR)$(datadir)
61188 @catalogs='$(CATALOGS)'; \
61189 for cat in $$catalogs; do \
61190 cat=`basename $$cat`; \
61191 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
61192 dir=$(localedir)/$$lang/LC_MESSAGES; \
61193 - $(mkinstalldirs) $(DESTDIR)$$dir; \
61194 + $(mkdir_p) $(DESTDIR)$$dir; \
61195 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
61196 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
61197 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
61198 @@ -218,19 +269,18 @@
61200 installdirs-data: installdirs-data-@USE_NLS@
61201 if test "$(PACKAGE)" = "gettext-tools"; then \
61202 - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
61203 + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
61207 installdirs-data-no:
61208 installdirs-data-yes:
61209 - $(mkinstalldirs) $(DESTDIR)$(datadir)
61210 @catalogs='$(CATALOGS)'; \
61211 for cat in $$catalogs; do \
61212 cat=`basename $$cat`; \
61213 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
61214 dir=$(localedir)/$$lang/LC_MESSAGES; \
61215 - $(mkinstalldirs) $(DESTDIR)$$dir; \
61216 + $(mkdir_p) $(DESTDIR)$$dir; \
61217 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
61218 if test -n "$$lc"; then \
61219 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
61220 @@ -350,9 +400,15 @@
61223 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
61224 - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
61225 + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
61227 - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
61228 + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
61229 + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
61230 + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
61232 + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
61235 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
61236 rm -f $$tmpdir/$$lang.new.po; \
61238 @@ -373,10 +429,13 @@
61239 update-gmo: Makefile $(GMOFILES)
61242 +# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
61243 +# because execution permission bits may not work on the current file system.
61244 +# Use @SHELL@, which is the shell determined by autoconf for the use by its
61245 +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
61246 Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
61247 cd $(top_builddir) \
61248 - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
61249 - $(SHELL) ./config.status
61250 + && @SHELL@ ./config.status $(subdir)/$@.in po-directories
61254 diff -urN BUILD/abook-0.6.0pre2/po/Makevars abook/po/Makevars
61255 --- BUILD/abook-0.6.0pre2/po/Makevars 2006-08-05 14:25:47.000000000 +0200
61256 +++ abook/po/Makevars 2013-03-13 15:07:45.000000000 +0100
61259 # This is the list of locale categories, beyond LC_MESSAGES, for which the
61260 # message catalogs shall be used. It is usually empty.
61261 -EXTRA_LOCALE_CATEGORIES =
61262 +EXTRA_LOCALE_CATEGORIES = LC_TIME
61263 diff -urN BUILD/abook-0.6.0pre2/po/Makevars.template abook/po/Makevars.template
61264 --- BUILD/abook-0.6.0pre2/po/Makevars.template 1970-01-01 01:00:00.000000000 +0100
61265 +++ abook/po/Makevars.template 2013-03-13 15:07:45.000000000 +0100
61267 +# Makefile variables for PO directory in any package using GNU gettext.
61269 +# Usually the message domain is the same as the package name.
61270 +DOMAIN = $(PACKAGE)
61272 +# These two variables depend on the location of this directory.
61276 +# These options get passed to xgettext.
61277 +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
61279 +# This is the copyright holder that gets inserted into the header of the
61280 +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
61281 +# package. (Note that the msgstr strings, extracted from the package's
61282 +# sources, belong to the copyright holder of the package.) Translators are
61283 +# expected to transfer the copyright for their translations to this person
61284 +# or entity, or to disclaim their copyright. The empty string stands for
61285 +# the public domain; in this case the translators are expected to disclaim
61286 +# their copyright.
61287 +COPYRIGHT_HOLDER = Free Software Foundation, Inc.
61289 +# This is the email address or URL to which the translators shall report
61290 +# bugs in the untranslated strings:
61291 +# - Strings which are not entire sentences, see the maintainer guidelines
61292 +# in the GNU gettext documentation, section 'Preparing Strings'.
61293 +# - Strings which use unclear terms or require additional context to be
61295 +# - Strings which make invalid assumptions about notation of date, time or
61297 +# - Pluralisation problems.
61298 +# - Incorrect English spelling.
61299 +# - Incorrect formatting.
61300 +# It can be your email address, or a mailing list address where translators
61301 +# can write to without being subscribed, or the URL of a web page through
61302 +# which the translators can contact you.
61303 +MSGID_BUGS_ADDRESS =
61305 +# This is the list of locale categories, beyond LC_MESSAGES, for which the
61306 +# message catalogs shall be used. It is usually empty.
61307 +EXTRA_LOCALE_CATEGORIES =
61308 diff -urN BUILD/abook-0.6.0pre2/po/quot.sed abook/po/quot.sed
61309 --- BUILD/abook-0.6.0pre2/po/quot.sed 1970-01-01 01:00:00.000000000 +0100
61310 +++ abook/po/quot.sed 2013-03-13 15:07:45.000000000 +0100
61312 +s/"\([^"]*\)"/ā\1ā/g
61313 +s/`\([^`']*\)'/ā\1ā/g
61314 +s/ '\([^`']*\)' / ā\1ā /g
61315 +s/ '\([^`']*\)'$/ ā\1ā/g
61316 +s/^'\([^`']*\)' /ā\1ā /g
61318 diff -urN BUILD/abook-0.6.0pre2/po/Rules-quot abook/po/Rules-quot
61319 --- BUILD/abook-0.6.0pre2/po/Rules-quot 1970-01-01 01:00:00.000000000 +0100
61320 +++ abook/po/Rules-quot 2013-03-13 15:07:45.000000000 +0100
61322 +# Special Makefile rules for English message catalogs with quotation marks.
61324 +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
61326 +.SUFFIXES: .insert-header .po-update-en
61328 +en@quot.po-create:
61329 + $(MAKE) en@quot.po-update
61330 +en@boldquot.po-create:
61331 + $(MAKE) en@boldquot.po-update
61333 +en@quot.po-update: en@quot.po-update-en
61334 +en@boldquot.po-update: en@boldquot.po-update-en
61336 +.insert-header.po-update-en:
61337 + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
61338 + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
61340 + echo "$$lang:"; \
61341 + ll=`echo $$lang | sed -e 's/@.*//'`; \
61342 + LC_ALL=C; export LC_ALL; \
61344 + 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 \
61345 + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
61346 + rm -f $$tmpdir/$$lang.new.po; \
61348 + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
61351 + echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
61356 + echo "creation of $$lang.po failed!" 1>&2; \
61357 + rm -f $$tmpdir/$$lang.new.po; \
61360 +en@quot.insert-header: insert-header.sin
61361 + sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
61363 +en@boldquot.insert-header: insert-header.sin
61364 + sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
61366 +mostlyclean: mostlyclean-quot
61368 + rm -f *.insert-header
61369 Binarne pliki BUILD/abook-0.6.0pre2/po/sv.gmo i abook/po/sv.gmo rĆ³Å¼niÄ
siÄ
61370 diff -urN BUILD/abook-0.6.0pre2/po/sv.po abook/po/sv.po
61371 --- BUILD/abook-0.6.0pre2/po/sv.po 2006-09-06 16:14:38.000000000 +0200
61372 +++ abook/po/sv.po 2013-03-13 15:07:45.000000000 +0100
61375 "Project-Id-Version: abook 0.5.4\n"
61376 "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
61377 -"POT-Creation-Date: 2006-09-06 17:14+0300\n"
61378 +"POT-Creation-Date: 2013-01-17 14:44+0100\n"
61379 "PO-Revision-Date: 2006-08-05 14:20+0200\n"
61380 "Last-Translator: Susanna Bjƶrverud <susanna.bjorverud@telia.com>\n"
61381 "Language-Team: none\n"
61383 "MIME-Version: 1.0\n"
61384 "Content-Type: text/plain; charset=utf-8\n"
61385 "Content-Transfer-Encoding: 8bit\n"
61386 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
61391 msgid "Cannot create directory %s\n"
61392 msgstr "Kan inte skapa mapp %s\n"
61397 msgid "%s is not a directory\n"
61398 msgstr "%s Ƥr inte en mapp\n"
61403 msgid "Memory allocation failure: %s\n"
61404 msgstr "Fel vid tilldelning av minne: %s\n"
61409 msgid "Press enter to continue...\n"
61410 msgstr "Tryck enter fƶr att fortsƤtta...\n"
61415 msgid "File %s is not writeable"
61416 msgstr "Filen %s kan inte skrivas"
61420 msgid "If you continue all changes will be lost. Do you want to continue?"
61422 "Om du fortsƤtter sƄ kommer alla Ƥndringar att gƄ fƶrlorade. Vill du fortsƤtta"
61426 msgid "Save database"
61427 msgstr "Spara databasen"
61431 msgid "Quit without saving"
61432 msgstr "Avsluta utan att spara"
61437 msgid "%s is not a valid HOME directory\n"
61438 msgstr "%s Ƥr inte en giltig hemmamapp\n"
61444 "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
61445 @@ -68,33 +69,43 @@
61446 "Det gƄr inte att kombinera flaggorna --mutt-query, --convert, --add-email "
61447 "eller --add-email-quiet\n"
61452 msgid "please use option --%s after --convert option\n"
61453 msgstr "var god och anvƤnd flaggan --%s efter flaggan --convert\n"
61457 +#, fuzzy, c-format
61458 +msgid "please use option --outformat after --convert or --mutt-query option\n"
61459 +msgstr "var god och anvƤnd flaggan --%s efter flaggan --convert\n"
61462 +#, fuzzy, c-format
61463 +msgid "Invalid custom format string\n"
61464 +msgstr "Ogiltigt fƤltvƤrde i konfigurationen"
61468 msgid "%s: unrecognized arguments on command line\n"
61469 msgstr "%s: okƤnda parametrar pƄ kommandoraden\n"
61473 msgid " -h\t--help\t\t\t\tshow usage"
61474 msgstr " -h\t--help\t\t\t\tvisa anvƤndning"
61478 msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
61479 msgstr " -C\t--config\t<fil>\t\tanvƤnd en alternative konfigurationsfil"
61483 msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
61484 msgstr "\t--datafile\t<fil>\t\tanvƤnd en alternative adressboksfil"
61488 msgid "\t--mutt-query\t<string>\tmake a query for mutt"
61489 msgstr "\t--mutt-query\t<strƤng>\tgƶr en fƶrfrƄgan till mutt"
61494 "\t--add-email\t\t\tread an e-mail message from stdin and\n"
61495 "\t\t\t\t\tadd the sender to the addressbook"
61496 @@ -102,7 +113,7 @@
61497 "\t--add-email\t\t\tlƤs ett ebrev frƄn stdin och\n"
61498 "\t\t\t\t\tlƤgg till avsƤndaren i adressboken"
61503 "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
61504 "\t\t\t\t\trequire to confirm adding"
61505 @@ -110,66 +121,75 @@
61506 "\t--add-email-quiet\t\tsamma som --add-email men utan\n"
61507 "\t\t\t\t\tanvƤndarbekrƤftelse"
61511 msgid "\t--convert\t\t\tconvert address book files"
61512 msgstr "\t--convert\t\t\tkonvertera adressbokfiler"
61516 msgid "\toptions to use with --convert:"
61517 msgstr "\tflaggor som kan anvƤndas med --convert:"
61521 msgid "\t--informat\t<format>\tformat for input file"
61522 msgstr "\t--informat\t<format>\tinputfilens format"
61526 msgid "\t\t\t\t\t(default: abook)"
61527 msgstr "\t\t\t\t\t(fƶrvalt: abook)"
61531 msgid "\t--infile\t<file>\t\tsource file"
61532 msgstr "\t--infile\t<fil>\t\tkƤllfil"
61536 msgid "\t\t\t\t\t(default: stdin)"
61537 msgstr "\t\t\t\t\t(fƶrvalt: stdin)"
61541 msgid "\t--outformat\t<format>\tformat for output file"
61542 msgstr "\t--outformat\t<format>\toutputfilens format"
61546 msgid "\t\t\t\t\t(default: text)"
61547 msgstr "\t\t\t\t\t(fƶrvalt: text)"
61551 msgid "\t--outfile\t<file>\t\tdestination file"
61552 msgstr "\t--outfile\t<fil>\t\tmƄlfil"
61556 msgid "\t\t\t\t\t(default: stdout)"
61557 msgstr "\t\t\t\t\t(fƶrvalt: stdout)"
61562 +msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
61563 +msgstr "\t--outformat\t<format>\toutputfilens format"
61566 +msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
61570 msgid "\t--formats\t\t\tlist available formats"
61571 msgstr "\t--formats\t\t\tlista tillgƤngliga format"
61576 msgid "Cannot open database\n"
61577 msgstr "Kan inte ƶppna databasen\n"
61582 msgid "too few arguments to make conversion\n"
61583 msgstr "alltfƶr fƄ parametrar fƶr att kunna konvertera\n"
61588 msgid "try --help\n"
61589 msgstr "prova --help\n"
61595 "input and output formats are the same\n"
61596 @@ -178,46 +198,46 @@
61597 "input- och outputformat Ƥr identiska\n"
61603 msgid "input format %s not supported\n"
61604 msgstr "inputformater %s stƶds ej\n"
61609 msgid "cannot read file %s\n"
61610 msgstr "kan inte lƤsa filen %s\n"
61615 msgid "output format %s not supported\n"
61616 msgstr "outputformatet %s stƶds ej\n"
61621 msgid "cannot write file %s\n"
61622 msgstr "kan inte skriva till filen %s\n"
61627 msgid "cannot open %s\n"
61628 msgstr "kan inte ƶppna %s\n"
61633 msgid "%d item(s) added to %s\n"
61634 msgstr "%d post(er) har lagts till i %s\n"
61638 msgid "Valid sender address not found"
61639 msgstr "Kunde inte hitta en giltig avsƤndaradress"
61644 msgid "Address %s already in addressbook\n"
61645 msgstr "Addressen %s finns redan i adressboken\n"
61651 "cannot open /dev/tty\n"
61652 @@ -226,20 +246,20 @@
61653 "kan inte ƶppna /dev/tty\n"
61654 "du bƶr kanske anvƤnda --add-email-quiet\n"
61659 msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
61660 msgstr "LƤgg till \"%s <%s>\" i %s? (j/n)\n"
61662 -#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
61663 +#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
61664 msgid "keybinding for yes|y"
61667 -#: abook.c:753 abook.c:755 ui.c:341
61668 +#: abook.c:781 abook.c:783 ui.c:432
61669 msgid "keybinding for no|n"
61675 msgid "stdin is a directory or cannot stat stdin\n"
61677 @@ -315,202 +335,248 @@
61678 msgid "Anniversary day"
61687 msgid "field already defined"
61692 msgid "standard field does not need to be declared"
61698 msgid "unknown type"
61699 msgstr "okƤnd flagga"
61703 msgid "Invalid field value defined in configuration"
61704 msgstr "Ogiltigt fƤltvƤrde i konfigurationen"
61709 msgid "Invalid field value for sorting"
61710 msgstr "Ogiltigt fƤltvƤrde i konfigurationen"
61714 msgid "Tab name too wide for screen"
61715 msgstr "Flikrubrik fƶr bred fƶr skƤrmen"
61719 msgid "keybindings_new_123456789|n123456789"
61725 msgid "Choose %s to modify (<1>%s%c%s%s."
61775 msgid "Year (optional): "
61781 msgid "Invalid date"
61782 msgstr "ogiltigt vƤrde"
61791 msgid "?:help q:quit editor"
61794 -#: filter.c:71 filter.c:82
61795 +#: filter.c:88 filter.c:100
61796 msgid "abook native format"
61797 msgstr "abooks eget format"
61801 msgid "ldif / Netscape addressbook"
61802 msgstr "ldif / adressbok fr Netscape"
61804 -#: filter.c:73 filter.c:84
61805 +#: filter.c:90 filter.c:103 filter.c:121
61807 msgstr "mutt-alias"
61809 -#: filter.c:74 filter.c:86
61810 +#: filter.c:91 filter.c:106
61811 msgid "pine addressbook"
61812 msgstr "pine-adressbok"
61814 -#: filter.c:75 filter.c:88
61815 +#: filter.c:92 filter.c:107
61816 msgid "comma separated values"
61817 msgstr "kommaseparerade vƤrden"
61819 -#: filter.c:76 filter.c:89
61820 +#: filter.c:93 filter.c:108
61821 msgid "comma separated values (all fields)"
61822 msgstr "kommaseparerade vƤrden (alla fƤlt)"
61824 -#: filter.c:77 filter.c:90
61825 +#: filter.c:94 filter.c:109
61826 msgid "Palm comma separated values"
61827 msgstr "kommaseparerade vƤrden frƄn Palm"
61831 +msgid "vCard file"
61835 msgid "ldif / Netscape addressbook (.4ld)"
61836 msgstr "ldif / adressbok fr Netscape (.4ld)"
61839 +#: filter.c:102 filter.c:120
61840 +msgid "vCard 2 file"
61844 +msgid "mutt query format (internal use)"
61848 msgid "html document"
61849 msgstr "html-dokument"
61852 -msgid "GnomeCard (VCard) addressbook"
61853 -msgstr "GnomeCard-adressbok (VCard)"
61868 msgid "Wanderlust address book"
61869 msgstr "pine-adressbok"
61873 msgid "Spruce address book"
61874 msgstr "Spruce-adressbok"
61878 msgid "BSD calendar"
61883 +#: filter.c:115 filter.c:122
61885 +msgid "Custom format"
61890 +msgid "input formats:"
61897 +msgid "output formats:"
61902 +msgid "query-compatible output formats:"
61906 msgid "import database"
61907 msgstr "importera databaser"
61909 -#: filter.c:182 filter.c:299
61910 +#: filter.c:216 filter.c:345
61911 msgid "please select a filter"
61912 msgstr "var god och vƤlj filter"
61914 -#: filter.c:190 filter.c:307
61915 +#: filter.c:224 filter.c:353
61916 msgid "x -\tcancel"
61917 msgstr "x -\tavbryt"
61919 -#: filter.c:211 filter.c:345
61920 +#: filter.c:245 filter.c:391
61926 msgid "Error occured while opening the file"
61927 msgstr "Fel vid ƶppnandet av filen"
61931 msgid "File does not seem to be a valid addressbook"
61932 msgstr "Den angivna filen verkar inte vara en giltig adressbok"
61936 msgid "export database"
61937 msgstr "exportera databasen"
61941 msgid "Export <a>ll, export <s>elected, or <c>ancel?"
61944 -#: filter.c:331 ui.c:632
61945 +#: filter.c:377 ui.c:769
61946 msgid "keybindings:all/selected/cancel|asc"
61951 msgid "Error occured while exporting"
61952 msgstr "Fel vid export"
61957 msgid "%02d/%02d\tAnniversary of %s\n"
61962 +msgid "parse_custom_format: fmt_string or ft not allocated\n"
61967 +msgid "parse_custom_format: invalid placeholder: {%s}\n"
61972 +msgid "%s: invalid format, index %ld\n"
61976 msgid "\t?\t\thelp\n"
61977 msgstr "\t?\t\thjƤlp\n"
61978 @@ -548,263 +614,282 @@
61979 msgstr "\tr / del\t\tta bort valda poster\n"
61982 +msgid "\tM\t\tmerge selected items (into top one)\n"
61986 msgid "\tD\t\tduplicate item\n"
61987 msgstr "\tD\t\tduplicera post\n"
61991 +msgid "\tU\t\tremove duplicates\n"
61992 +msgstr "\tD\t\tduplicera post\n"
61995 msgid "\tspace\t\tselect item\n"
61996 msgstr "\tspace\t\tvƤlj post\n"
62000 msgid "\t+\t\tselect all\n"
62001 msgstr "\t+\t\tvƤlj alla\n"
62005 msgid "\t-\t\tunselect all\n"
62006 -msgstr "\t+\t
\avmarkera alla\n"
62007 +msgstr "\t+\t\avmarkera alla\n"
62011 msgid "\t*\t\tinvert selection\n"
62012 msgstr "\t*\t\tinvertera urval\n"
62016 msgid "\tw\t\twrite database to disk\n"
62017 msgstr "\tw\t\tskriv databasen till disken\n"
62021 msgid "\tl\t\tread database from disk\n"
62022 msgstr "\tl\t\tlƤs databasen frƄn disken\n"
62026 msgid "\tC\t\tclear whole database\n"
62027 msgstr "\tC\t\tnollstƤll hela databasen\n"
62031 msgid "\ti\t\timport database\n"
62032 msgstr "\ti\t\timportera databas\n"
62036 msgid "\te\t\texport database\n"
62037 msgstr "\te\t\texportera databasen\n"
62041 msgid "\tp\t\tprint database\n"
62042 msgstr "\tp\t\tskriv ut databasen\n"
62046 msgid "\to\t\topen database\n"
62047 msgstr "\to\t\tƶppna databas\n"
62051 msgid "\ts\t\tsort database\n"
62052 msgstr "\ts\t\tsortera databasen\n"
62056 msgid "\tS\t\t\"surname sort\"\n"
62057 msgstr "\tS\t\t\"sortera efter efternamn\"\n"
62061 msgid "\tF\t\tsort by field (defined in configuration file)\n"
62062 msgstr "\tF\t\tsortera efter fƤlt (angivet i konfigurationsfilen)\n"
62066 msgid "\t/\t\tsearch\n"
62067 msgstr "\t/\t\tsƶk\n"
62071 msgid "\t\\\t\tsearch next occurrence\n"
62072 msgstr "\t\\\t\tsƶk efter nƤsta fƶrekomst\n"
62076 msgid "\tA\t\tmove current item up\n"
62077 msgstr "\tA\t\tflytta denna post uppƄt\n"
62081 msgid "\tZ\t\tmove current item down\n"
62082 msgstr "\tZ\t\tflytta denna post nedƄt\n"
62086 msgid "\tm\t\tsend mail with mutt\n"
62087 msgstr "\tm\t\tskicka post med mutt\n"
62091 msgid "\tv\t\tview URL with web browser\n"
62092 msgstr "\tv\t\tvisa URL i webblƤsare\n"
62097 msgid "\tarrows/h,l\t\tchange tab\n"
62098 msgstr "\ta,c,p,o,C/pilar/h,l\tbyt flik\n"
62103 msgid "\tq\t\t\tquit to main screen\n"
62104 msgstr "\tQ\t\tavsluta utan att spara\n"
62109 msgid "\t1 - 5 A - Z\t\tedit fields\n"
62110 msgstr "\t1 - 5\t\t\tredigera fƤlt\n"
62114 msgid "\tk or <\t\t\tprevious item\n"
62115 msgstr "\tk or <\t\t\tfƶregƄende post\n"
62119 msgid "\tj or >\t\t\tnext item\n"
62120 msgstr "\tj or >\t\t\tnƤsta post\n"
62125 msgid "\tr\t\t\troll e-mail addresses up\n"
62126 msgstr "\tr\t\t\trotera ebrevsadresser\n"
62131 msgid "\tESC-r\t\t\troll e-mail addresses down\n"
62132 msgstr "\tr\t\t\trotera ebrevsadresser\n"
62136 msgid "\tu\t\t\tundo\n"
62137 msgstr "\tu\t\t\tƄngra\n"
62141 msgid "\tm\t\t\tsend mail with mutt\n"
62142 msgstr "\tm\t\t\tskicka post med mutt\n"
62146 msgid "\tv\t\t\tview url with web browser\n"
62147 msgstr "\tv\t\t\tvisa url i webblƤsare\n"
62151 msgid "quote mismatch"
62156 msgid "no assignment character found"
62162 msgid "error in comma separated list"
62163 msgstr "kommaseparerade vƤrden"
62165 -#: options.c:289 options.c:308
62166 +#: options.c:311 options.c:330
62167 msgid "invalid value"
62168 msgstr "ogiltigt vƤrde"
62172 msgid "unknown option"
62173 msgstr "okƤnd flagga"
62179 "valid values for the 'preserve_fields' option are 'all', "
62180 "'standard' (default), and 'none'\n"
62187 "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
62193 msgid "invalid value assignment"
62194 msgstr "tilldelat ogiltigt vƤrde"
62199 "customfield: obsolete command - please use the 'field' and 'view' commands "
62205 msgid "no view name provided"
62210 msgid "no field identifier provided"
62215 msgid "no field name provided"
62221 msgid "%s: parse error at line %d: "
62222 msgstr "%s: parsning misslyckades pƄ rad %d: "
62227 msgid "unknown token %s\n"
62228 msgstr "okƤnd symbol %s\n"
62233 msgid "Your terminal size is %dx%d\n"
62234 msgstr "Storleken pƄ ditt terminalfƶnster Ƥr %dx%d\n"
62239 msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
62241 "Terminalfƶnstret Ƥr alltfƶr litet. Den minsta tillƄtna storleken fƶr abook "
62261 msgid "Press any key to continue..."
62262 msgstr "Tryck pƄ en tangent fƶr att fortsƤtta..."
62266 msgid "Remove selected item(s)"
62267 msgstr "Ta bort valda post(er)"
62272 +msgid "Merge selected items"
62273 +msgstr "Inga poster valda"
62277 +msgid "Remove duplicates"
62278 +msgstr "Ta bort valda post(er)"
62281 msgid "Clear WHOLE database"
62282 msgstr "NollstƤll HELA databasen"
62286 msgid "Search hit bottom, continuing at top"
62287 msgstr "Sƶk nƄdde slutet, fortsƤtter frƄn bƶrjan"
62292 msgid "Your current data will be lost - Press '%c' to continue"
62293 msgstr "Nuvarande data kommer att fƶrloras - Tryck pƄ 'y' fƶr att fortsƤtta"
62297 msgid "Print <a>ll, print <s>elected, or <c>ancel?"
62302 msgid "No selected items"
62303 msgstr "Inga poster valda"
62307 msgid "File to open: "
62308 msgstr "Ćppna fil: "
62312 msgid "Save current database"
62313 msgstr "Spara denna databas"
62317 msgid "Sorry, the specified file appears not to be a valid abook addressbook"
62319 "FƶrlƄt, men den angivna filen verkar inte vara en giltig abook-adressbok"
62320 @@ -864,6 +949,9 @@
62324 +#~ msgid "GnomeCard (VCard) addressbook"
62325 +#~ msgstr "GnomeCard-adressbok (VCard)"
62327 #~ msgid "?:help c:contact a:address p:phone o:other"
62328 #~ msgstr "?:hjƤlp c:kontact a:adress p:telefon o:annat"
62330 diff -urN BUILD/abook-0.6.0pre2/README abook/README
62331 --- BUILD/abook-0.6.0pre2/README 2006-09-05 10:05:33.000000000 +0200
62332 +++ abook/README 2013-03-13 15:07:45.000000000 +0100
62334 It's also recommended to set pipe_decode variable in mutt configuration.
62335 See the mutt manual for details.
62337 +Abook can also convert from/to mutt alias files and a number of other formats.
62338 +Mutt groups are fully supported.
62340 UPGRADING FROM VERSION 0.5
62342 See RELEASE_NOTES .
62343 diff -urN BUILD/abook-0.6.0pre2/RELEASE_NOTES abook/RELEASE_NOTES
62344 --- BUILD/abook-0.6.0pre2/RELEASE_NOTES 2006-09-04 20:29:24.000000000 +0200
62345 +++ abook/RELEASE_NOTES 2013-03-13 15:07:45.000000000 +0100
62347 A more comprehensive list of changes can be found in the ChangeLog file.
62351 + * support for mouse
62352 + * support for a colored UI
62353 + * added "groups" as a default field
62354 + * the UI now support merging selected entries [key M]
62355 + and removing duplicates [key U]
62356 + * a "custom" output filter allow the specification of an output
62357 + format using placeholders
62358 + * search-next is now bound to "/" too
62359 + * some output filters can now be used in the context
62360 + of --mutt-query. This is the case of "vcard" and "custom"
62361 + [ no --query option has been created and --mutt-query is fully
62362 + backward compatible ]
62363 + * ldif output filter has been fixed [output modified] in multiple
62364 + ways, does not force output to latin1 anymore and support input
62366 + * vcard input/output support:
62367 + An original input filter implementation was provided soon
62369 + In 2012, an optional build-time option to link against libvformat
62370 + was added for the very same task: parsing vcard.
62371 + - It depends on the --enable-vformat ./configure switch
62372 + - It's only used as an input filter, especially useful to
62373 + deal with multi-valued fields and encoded characters.
62376 +0.6.0pre2 (2010-07-22):
62377 + * Added anniversary as a default field
62378 + * Display dates according to current locale
62379 * The four following configuration options have been deprecated and will
62380 no longer be accepted by abook:
62382 diff -urN BUILD/abook-0.6.0pre2/sample.abookrc abook/sample.abookrc
62383 --- BUILD/abook-0.6.0pre2/sample.abookrc 2006-09-04 21:24:18.000000000 +0200
62384 +++ abook/sample.abookrc 2013-03-13 15:07:45.000000000 +0100
62385 @@ -108,3 +108,9 @@
62386 # show cursor in main display
62387 set show_cursor=false
62390 +set use_colors = true
62391 +set color_header_fg = red
62392 +set color_header_bg = default
62393 +set color_list_header_fg = blue
62394 +set color_list_header_bg = default
62395 diff -urN BUILD/abook-0.6.0pre2/stamp-h.in abook/stamp-h.in
62396 --- BUILD/abook-0.6.0pre2/stamp-h.in 1970-01-01 01:00:00.000000000 +0100
62397 +++ abook/stamp-h.in 2013-03-13 15:07:45.000000000 +0100
62400 diff -urN BUILD/abook-0.6.0pre2/THANKS abook/THANKS
62401 --- BUILD/abook-0.6.0pre2/THANKS 2006-09-06 16:27:14.000000000 +0200
62402 +++ abook/THANKS 2013-03-13 15:07:45.000000000 +0100
62410 diff -urN BUILD/abook-0.6.0pre2/TODO abook/TODO
62411 --- BUILD/abook-0.6.0pre2/TODO 2006-09-05 10:34:24.000000000 +0200
62412 +++ abook/TODO 2013-03-13 15:07:45.000000000 +0100
62415 - - allcsv should export all fields
62419 - new file format (xml?)
62420 diff -urN BUILD/abook-0.6.0pre2/ui.c abook/ui.c
62421 --- BUILD/abook-0.6.0pre2/ui.c 2006-09-06 07:26:10.000000000 +0200
62422 +++ abook/ui.c 2013-03-13 15:07:45.000000000 +0100
62426 - * $Id: ui.c,v 1.58 2006/09/06 02:24:33 cduval Exp $
62429 * by JH <jheinonen@users.sourceforge.net>
62432 #include "options.h"
62433 #include "filter.h"
62434 #include "xmalloc.h"
62435 +#include "color.h"
62436 +#include <sys/time.h>
62437 #ifdef HAVE_CONFIG_H
62438 # include "config.h"
62442 static bool should_resize = FALSE;
62443 static bool can_resize = FALSE;
62444 +static struct timeval last_click_time;
62445 +static int double_click_interval = 200; /* maximum time in milliseconds */
62447 static WINDOW *top = NULL, *bottom = NULL;
62449 @@ -129,7 +133,92 @@
62452 intrflush(stdscr, FALSE);
62453 + if(opt_get_bool(BOOL_USE_MOUSE)) {
62454 + mouseinterval(0);
62455 + timerclear(&last_click_time);
62456 + ui_enable_mouse(TRUE);
62458 keypad(stdscr, TRUE);
62459 + if(opt_get_bool(BOOL_USE_COLORS) && has_colors()) {
62461 + use_default_colors();
62462 + ui_init_color_pairs_user();
62467 +ui_enable_mouse(bool enabled)
62471 + mask = BUTTON1_CLICKED | BUTTON4_PRESSED;
62472 +#if NCURSES_MOUSE_VERSION == 2
62473 + mask |= BUTTON5_PRESSED;
62478 + mousemask(mask, NULL);
62481 +/** Check the time elapsed since last click and tell if it should be
62482 + * interpreted as a double click
62485 +was_double_click() {
62486 + struct timeval click_time, click_diff, maxdiff;
62487 + maxdiff.tv_sec = double_click_interval / 1000;
62488 + maxdiff.tv_usec = (double_click_interval % 1000)*1000;
62489 + gettimeofday(&click_time, NULL);
62491 + timersub(&click_time, &last_click_time, &click_diff);
62492 + last_click_time = click_time;
62493 + return !timercmp(&click_diff, &maxdiff, >);
62496 +#define CHECK_COLOR_NAME(value, name, DEFNAME) \
62497 + if(!strcmp((name), (value))){ \
62498 + return DEFNAME; \
62501 +opt_color_to_color(enum str_opts enum_name)
62503 + char* name = opt_get_str(enum_name);
62504 + CHECK_COLOR_NAME(name, "default", COLOR_DEFAULT)
62505 + else CHECK_COLOR_NAME(name, "black", COLOR_BLACK)
62506 + else CHECK_COLOR_NAME(name, "red", COLOR_RED)
62507 + else CHECK_COLOR_NAME(name, "green", COLOR_GREEN)
62508 + else CHECK_COLOR_NAME(name, "yellow", COLOR_YELLOW)
62509 + else CHECK_COLOR_NAME(name, "blue", COLOR_BLUE)
62510 + else CHECK_COLOR_NAME(name, "magenta", COLOR_MAGENTA)
62511 + else CHECK_COLOR_NAME(name, "cyan", COLOR_CYAN)
62512 + else CHECK_COLOR_NAME(name, "white", COLOR_WHITE)
62513 + else return COLOR_DEFAULT;
62517 +ui_init_color_pairs_user()
62519 + init_pair(CP_HEADER, opt_color_to_color(STR_COLOR_HEADER_FG),
62520 + opt_color_to_color(STR_COLOR_HEADER_BG));
62521 + init_pair(CP_FOOTER, opt_color_to_color(STR_COLOR_FOOTER_FG),
62522 + opt_color_to_color(STR_COLOR_FOOTER_BG));
62523 + init_pair(CP_LIST_EVEN, opt_color_to_color(STR_COLOR_LIST_EVEN_FG),
62524 + opt_color_to_color(STR_COLOR_LIST_EVEN_BG));
62525 + init_pair(CP_LIST_ODD, opt_color_to_color(STR_COLOR_LIST_ODD_FG),
62526 + opt_color_to_color(STR_COLOR_LIST_ODD_BG));
62527 + init_pair(CP_LIST_HEADER, opt_color_to_color(STR_COLOR_LIST_HEADER_FG),
62528 + opt_color_to_color(STR_COLOR_LIST_HEADER_BG));
62529 + init_pair(CP_LIST_HIGHLIGHT, opt_color_to_color(STR_COLOR_LIST_HIGHLIGHT_FG),
62530 + opt_color_to_color(STR_COLOR_LIST_HIGHLIGHT_BG));
62531 + init_pair(CP_TAB_BORDER, opt_color_to_color(STR_COLOR_TAB_BORDER_FG),
62532 + opt_color_to_color(STR_COLOR_TAB_BORDER_BG));
62533 + init_pair(CP_TAB_LABEL, opt_color_to_color(STR_COLOR_TAB_LABEL_FG),
62534 + opt_color_to_color(STR_COLOR_TAB_LABEL_BG));
62535 + init_pair(CP_FIELD_NAME, opt_color_to_color(STR_COLOR_FIELD_NAME_FG),
62536 + opt_color_to_color(STR_COLOR_FIELD_NAME_BG));
62537 + init_pair(CP_FIELD_VALUE, opt_color_to_color(STR_COLOR_FIELD_VALUE_FG),
62538 + opt_color_to_color(STR_COLOR_FIELD_VALUE_BG));
62542 @@ -179,6 +268,8 @@
62546 + wattrset(top, COLOR_PAIR(CP_HEADER));
62547 + mvwhline(top, 0, 0, ' ', COLS);
62548 mvwhline(top, 1, 0, UI_HLINE_CHAR, COLS);
62550 mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str);
62551 @@ -355,6 +446,7 @@
62555 + wattrset(bottom, COLOR_PAIR(CP_FOOTER));
62556 mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS);
62559 @@ -448,6 +540,28 @@
62560 if(!opt_get_bool(BOOL_SHOW_CURSOR))
62562 can_resize = FALSE; /* it's not safe to resize anymore */
62563 + if(ch == KEY_MOUSE) {
62565 + bool double_clicked = was_double_click();
62566 + if(getmouse(&event) == OK) {
62567 + if(event.bstate & BUTTON1_CLICKED
62568 + || event.bstate & BUTTON1_DOUBLE_CLICKED) {
62569 + if(event.y == 0) {
62572 + list_set_curitem(event.y + list_get_firstitem() - LIST_TOP);
62573 + if(double_clicked) {
62578 + } else if(event.bstate & BUTTON4_PRESSED) {
62580 + } else if(event.bstate & BUTTON5_PRESSED) {
62587 case 'Q': quit_abook(QUIT_DONTSAVE); break;
62588 @@ -463,7 +577,9 @@
62591 case 'r': ui_remove_items(); break;
62592 + case 'M': ui_merge_items(); break;
62593 case 'D': duplicate_item(); break;
62594 + case 'U': ui_remove_duplicates(); break;
62595 case 12: refresh_screen(); break;
62598 @@ -494,6 +610,7 @@
62599 case 'F': sort_by_field(NULL); break;
62601 case '/': ui_find(0); break;
62603 case '\\': ui_find(1); break;
62605 case ' ': if(list_get_curitem() >= 0) {
62606 @@ -544,6 +661,25 @@
62612 + if(statusline_ask_boolean(_("Merge selected items"), TRUE))
62613 + merge_selected_items();
62615 + clear_statusline();
62619 +void ui_remove_duplicates()
62621 + if(statusline_ask_boolean(_("Remove duplicates"), TRUE))
62622 + remove_duplicates();
62624 + clear_statusline();
62629 ui_clear_database()
62631 if(statusline_ask_boolean(_("Clear WHOLE database"), FALSE)) {
62632 @@ -593,6 +729,7 @@
62633 char *str = strdup_printf(" " "|%3d/%3d",
62634 selected_items(), db_n_items());
62636 + attrset(COLOR_PAIR(CP_HEADER));
62637 mvaddstr(0, COLS-strlen(str), str);
62640 diff -urN BUILD/abook-0.6.0pre2/ui.h abook/ui.h
62641 --- BUILD/abook-0.6.0pre2/ui.h 2006-04-10 10:15:46.000000000 +0200
62642 +++ abook/ui.h 2013-03-13 15:07:45.000000000 +0100
62645 int is_ui_initialized();
62646 void ui_init_curses();
62647 +void ui_init_color_pairs_user();
62648 +void ui_enable_mouse(bool enabled);
62651 void headerline(const char *str);
62653 void refresh_statusline();
62654 void get_commands();
62655 void ui_remove_items();
62656 +void ui_merge_items();
62657 +void ui_remove_duplicates();
62658 void ui_clear_database();
62659 void ui_find(int next);
62660 void ui_print_number_of_items();
62662 void ui_print_database();
62663 void ui_open_datafile();
62665 +#if NCURSES_MOUSE_VERSION != 2
62666 +#define BUTTON5_PRESSED (0x80 | 0x8000000)
62669 #include "options.h" /* needed for options_get_bool */
62671 diff -urN BUILD/abook-0.6.0pre2/vcard.c abook/vcard.c
62672 --- BUILD/abook-0.6.0pre2/vcard.c 1970-01-01 01:00:00.000000000 +0100
62673 +++ abook/vcard.c 2013-03-13 15:07:45.000000000 +0100
62677 + * Copyright 2012, Raphaƫl Droz <raphael.droz+floss@gmail.com>
62679 + * abook's wrapper for libvformat:
62680 + * fits a vcard parsed by libvformat into a usable abook item list
62683 + * libvformat's vf_iface.h
62684 + * http://www.imc.org/pdi/vcard-21.txt
62689 +#include <stdio.h>
62690 +#include <string.h>
62692 +#include "database.h"
62693 +#include "options.h" // bool
62694 +#include "misc.h" // abook_list_to_csv
62695 +#include "xmalloc.h"
62697 +#include "vcard.h"
62699 +int vcard_parse_file_libvformat(char *filename) {
62700 + VF_OBJECT_T* vfobj;
62701 + if (!vf_read_file(&vfobj, filename)) {
62702 + fprintf(stderr, "Could not read VCF file %s\n", filename);
62706 + // a libvformat property
62708 + // property number (used for multivalued properties)
62710 + // temporary values
62711 + abook_list *multivalues = NULL;
62712 + char *propval = 0;
62713 + bool phone_found;
62716 + list_item item = item_create();
62717 + phone_found = false;
62718 + /* Note: libvformat use va_args, we *must* cast the last
62719 + NULL argument to (char*) for arch where
62720 + sizeof(int) != sizeof(char *) */
62722 + // fullname [ or struct-name [ or name ] ]
62723 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "FN", (char*)0))
62724 + if ((propval = vf_get_prop_value_string(prop, 0)))
62725 + item_fput(item, NAME, xstrdup(propval));
62727 + if (!propval && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "N", (char*)0)) {
62728 + // TODO: GIVENNAME, FAMILYNAME
62729 + propval = vf_get_prop_value_string(prop, 0);
62731 + item_fput(item, NAME, xstrdup(propval));
62734 + if (!propval && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "NAME", (char*)0)) {
62735 + propval = vf_get_prop_value_string(prop, 0);
62737 + item_fput(item, NAME, xstrdup(propval));
62740 + // email(s). (TODO: EMAIL;PREF: should be abook's first)
62741 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "EMAIL", (char*)0)) {
62744 + while ((propval = vf_get_prop_value_string(prop, props++))) {
62745 + abook_list_append(&multivalues, propval);
62747 + } while (vf_get_next_property(&prop));
62748 + item_fput(item, EMAIL, abook_list_to_csv(multivalues));
62749 + abook_list_free(&multivalues);
62752 + // format for ADR:
62753 + // PO Box, Extended Addr, Street, Locality, Region, Postal Code, Country
62754 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "ADR", (char*)0)) {
62756 + // PO Box: abook ignores
62757 + vf_get_prop_value_string(prop, props++);
62760 + propval = vf_get_prop_value_string(prop, props++);
62761 + if(propval) item_fput(item, ADDRESS2, xstrdup(propval));
62762 + // address (street)
62763 + propval = vf_get_prop_value_string(prop, props++);
62764 + if(propval) item_fput(item, ADDRESS, xstrdup(propval));
62765 + // locality (city)
62766 + propval = vf_get_prop_value_string(prop, props++);
62767 + if(propval) item_fput(item, CITY, xstrdup(propval));
62768 + // region (state)
62769 + propval = vf_get_prop_value_string(prop, props++);
62770 + if(propval) item_fput(item, STATE, xstrdup(propval));
62771 + // postal-code (zip)
62772 + propval = vf_get_prop_value_string(prop, props++);
62773 + if(propval) item_fput(item, ZIP, xstrdup(propval));
62775 + propval = vf_get_prop_value_string(prop, props++);
62776 + if(propval) item_fput(item, COUNTRY, xstrdup(propval));
62781 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "HOME", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
62782 + item_fput(item, PHONE, xstrdup(propval)); phone_found = true;
62785 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "WORK", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
62786 + item_fput(item, WORKPHONE, xstrdup(propval)); phone_found = true;
62790 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "FAX", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
62791 + item_fput(item, FAX, xstrdup(propval)); phone_found = true;
62795 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "CELL", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
62796 + item_fput(item, MOBILEPHONE, xstrdup(propval)); phone_found = true;
62799 + // or grab any other one as default
62800 + if(! phone_found && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
62801 + item_fput(item, PHONE, xstrdup(propval));
62805 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "NICKNAME", (char*)0)) {
62806 + propval = vf_get_prop_value_string(prop, 0);
62807 + item_fput(item, NICK, xstrdup(propval));
62811 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "URL", (char*)0)) {
62812 + propval = vf_get_prop_value_string(prop, 0);
62813 + item_fput(item, URL, xstrdup(propval));
62817 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "NOTE", (char*)0)) {
62818 + propval = vf_get_prop_value_string(prop, 0);
62819 + item_fput(item, NOTES, xstrdup(propval));
62823 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "BDAY", (char*)0)) {
62824 + propval = vf_get_prop_value_string(prop, 0);
62825 + item_fput(item, ANNIVERSARY, xstrdup(propval));
62829 + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "CATEGORIES", (char*)0)) {
62832 + while ((propval = vf_get_prop_value_string(prop, props++))) {
62833 + abook_list_append(&multivalues, propval);
62835 + } while (vf_get_next_property(&prop));
62836 + item_fput(item, GROUPS, abook_list_to_csv(multivalues));
62837 + abook_list_free(&multivalues);
62840 + add_item2database(item);
62841 + item_free(&item);
62842 + } while (vf_get_next_object(&vfobj));
62846 diff -urN BUILD/abook-0.6.0pre2/vcard.h abook/vcard.h
62847 --- BUILD/abook-0.6.0pre2/vcard.h 1970-01-01 01:00:00.000000000 +0100
62848 +++ abook/vcard.h 2013-03-13 15:07:45.000000000 +0100
62853 +#include <vf_iface.h>
62855 +int vcard_parse_file_libvformat(char *filename);
62858 diff -urN BUILD/abook-0.6.0pre2/views.c abook/views.c
62859 --- BUILD/abook-0.6.0pre2/views.c 2006-08-08 08:19:05.000000000 +0200
62860 +++ abook/views.c 2013-03-13 15:07:45.000000000 +0100
62863 - * $Id: views.c,v 1.2 2006/08/07 15:06:53 cduval Exp $
62866 * by Cedric Duval <cedricduval@free.fr>
62868 @@ -140,7 +140,7 @@
62870 { ADDRESS, ADDRESS2, CITY, STATE, ZIP, COUNTRY, -1 } },
62871 { N_("PHONE"), { PHONE, WORKPHONE, FAX, MOBILEPHONE, -1 } },
62872 - { N_("OTHER"), { NICK, URL, NOTES, -1 } },
62873 + { N_("OTHER"), { NICK, URL, NOTES, ANNIVERSARY, GROUPS, -1 } },
62877 diff -urN BUILD/abook-0.6.0pre2/xmalloc.c abook/xmalloc.c
62878 --- BUILD/abook-0.6.0pre2/xmalloc.c 2005-09-26 17:59:04.000000000 +0200
62879 +++ abook/xmalloc.c 2013-03-13 15:07:45.000000000 +0100
62882 - * $Id: xmalloc.c,v 1.7 2005/09/26 15:59:04 cduval Exp $
62885 * Common xmalloc memory allocation routines