--- /dev/null
+diff -urN BUILD/abook-0.6.0pre2/abook.1 abook/abook.1
+--- BUILD/abook-0.6.0pre2/abook.1 2006-09-06 07:26:10.000000000 +0200
++++ abook/abook.1 2013-03-13 15:07:45.000000000 +0100
+@@ -27,12 +27,14 @@
+ \fB\-\-datafile\fP \fI<filename>\fR
+ Use an alternative addressbook file (default is \fI$HOME/.abook/addressbook\fR).
+ .TP
+-\fB\-\-mutt\-query\fP \fI<string>\fR
++\fB\-\-mutt\-query\fP \fI<string>\fR [ \fB\-\-outformat\fP \fI<outputformat>\fR ]
+ Make a query for mutt (search the addressbook for \fI<string>\fR).
+ .br
+ The \fB\-\-datafile\fP option, as documented above, may be used
+ .BI BEFORE
+ this option to search a different addressbook file.
++.br
++Only a subset of the below \fI<outputformat>\fR are allowed: \fBmutt\fP (default), \fBvcard\fP and \fBcustom\fP
+ .TP
+ \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 ]
+ Converts \fI<inputfile>\fR in \fI<inputformat>\fR to \fI<outputfile>\fR in \fI<outputformat>\fR
+@@ -52,6 +54,8 @@
+ - \fBcsv\fP comma separated values
+ .br
+ - \fBpalmcsv\fP Palm comma separated values
++.br
++- \fBvcard\fP VCard addressbook
+
+ .br
+ The following \fIoutputformats\fR are supported:
+@@ -66,7 +70,7 @@
+ .br
+ - \fBpine\fP pine addressbook
+ .br
+-- \fBgcrd\fP GnomeCard (VCard) addressbook
++- \fBvcard\fP VCard addressbook
+ .br
+ - \fBcsv\fP comma separated values
+ .br
+@@ -81,6 +85,17 @@
+ - \fBwl\fP Wanderlust address book
+ .br
+ - \fBbsdcal\fP BSD calendar
++.br
++- \fBcustom\fP Custom output format, see below
++.TP
++\fB\-\-outformatstr\fP \fI<string>\fR
++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.
++.br
++A placeholder can be any of the standard fields names (see \fBabookrc\fP(5)) and must be encapsulated by curly brackets.
++.br
++The default value is "{nick} ({name}): {mobile}"
++.br
++If \fI<string>\fR starts with \fI!\fR only entries whose all fields from \fI<string>\fR are non-NULL are included.
+ .TP
+ \fB\-\-add-email\fP
+ Read an e-mail message from stdin and add the sender to the addressbook.
+diff -urN BUILD/abook-0.6.0pre2/abook.c abook/abook.c
+--- BUILD/abook-0.6.0pre2/abook.c 2006-09-04 21:24:12.000000000 +0200
++++ abook/abook.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: abook.c,v 1.60 2006/09/04 18:29:24 cduval Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -50,6 +50,12 @@
+ char *datafile = NULL;
+ static char *rcfile = NULL;
+
++// custom formatting
++char custom_format[FORMAT_STRING_LEN] = "{nick} ({name}): {mobile}";
++char *parsed_custom_format = NULL;
++enum field_types *custom_format_fields = 0;
++struct abook_output_item_filter selected_item_filter;
++
+ bool alternative_datafile = FALSE;
+ bool alternative_rcfile = FALSE;
+
+@@ -187,9 +193,11 @@
+ main(int argc, char **argv)
+ {
+ #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
+- setlocale(LC_ALL, "");
++ setlocale(LC_MESSAGES, "");
++ setlocale(LC_TIME, "");
++ setlocale(LC_CTYPE, "");
++ setlocale(LC_COLLATE, "");
+ #endif
+-
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+@@ -301,6 +309,7 @@
+ *infile = "-",
+ *outfile = "-";
+ int c;
++ selected_item_filter = select_output_item_filter("muttq");
+
+ for(;;) {
+ int option_index = 0;
+@@ -311,6 +320,7 @@
+ OPT_CONVERT,
+ OPT_INFORMAT,
+ OPT_OUTFORMAT,
++ OPT_OUTFORMAT_STR,
+ OPT_INFILE,
+ OPT_OUTFILE,
+ OPT_FORMATS
+@@ -325,6 +335,7 @@
+ { "convert", 0, 0, OPT_CONVERT },
+ { "informat", 1, 0, OPT_INFORMAT },
+ { "outformat", 1, 0, OPT_OUTFORMAT },
++ { "outformatstr", 1, 0, OPT_OUTFORMAT_STR },
+ { "infile", 1, 0, OPT_INFILE },
+ { "outfile", 1, 0, OPT_OUTFILE },
+ { "formats", 0, 0, OPT_FORMATS },
+@@ -366,7 +377,21 @@
+ set_convert_var(informat);
+ break;
+ case OPT_OUTFORMAT:
+- set_convert_var(outformat);
++ if(mode != MODE_CONVERT && mode != MODE_QUERY) {
++ fprintf(stderr,
++ _("please use option --outformat after --convert or --mutt-query option\n"));
++ exit(EXIT_FAILURE);
++ }
++ // ascii-name is stored, it's used to traverse
++ // e_filters[] in MODE_CONVERT (see export_file())
++ outformat = optarg;
++ // but in case a query-compatible filter is requested
++ // try to guess right now which one it is, from u_filters[]
++ selected_item_filter = select_output_item_filter(outformat);
++ break;
++ case OPT_OUTFORMAT_STR:
++ strncpy(custom_format, optarg, FORMAT_STRING_LEN);
++ custom_format[FORMAT_STRING_LEN - 1] = 0;
+ break;
+ case OPT_INFILE:
+ set_convert_var(infile);
+@@ -382,6 +407,23 @@
+ }
+ }
+
++ // if the output format requested does not allow filtered querying
++ // (not in u_filter[]) and --convert has not been specified; bailout
++ if(! selected_item_filter.func && mode != MODE_CONVERT) {
++ printf("output format %s not supported or incompatible with --mutt-query\n", outformat);
++ exit(EXIT_FAILURE);
++ }
++ if(! selected_item_filter.func)
++ selected_item_filter = select_output_item_filter("muttq");
++ else if (! strcmp(outformat, "custom")) {
++ if(! *custom_format) {
++ fprintf(stderr, _("Invalid custom format string\n"));
++ exit(EXIT_FAILURE);
++ }
++ parsed_custom_format = (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
++ custom_format_fields = (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
++ parse_custom_format(custom_format, parsed_custom_format, custom_format_fields);
++ }
+ if(optind < argc) {
+ fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
+ argv[0]);
+@@ -427,6 +469,8 @@
+ puts (_(" (default: text)"));
+ puts (_(" --outfile <file> destination file"));
+ puts (_(" (default: stdout)"));
++ puts (_(" --outformatstr <str> format to use for \"custom\" --outformat"));
++ puts (_(" (default: \"{nick} ({name}): {mobile}\")"));
+ puts (_(" --formats list available formats"));
+ }
+
+@@ -445,34 +489,12 @@
+ }
+
+ static void
+-muttq_print_item(FILE *file, int item)
+-{
+- abook_list *emails, *e;
+- char *tmp = db_email_get(item);
+-
+- emails = csv_to_abook_list(tmp);
+- free(tmp);
+-
+- for(e = emails; e; e = e->next) {
+- fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
+- !db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
+- );
+- if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
+- break;
+- }
+- abook_list_free(&emails);
+-}
+-
+-static void
+ mutt_query(char *str)
+ {
+ init_mutt_query();
+
+ if( str == NULL || !strcasecmp(str, "all") ) {
+- struct db_enumerator e = init_db_enumerator(ENUM_ALL);
+- printf("All items\n");
+- db_enumerate_items(e)
+- muttq_print_item(stdout, e.item);
++ export_file("muttq", "-");
+ } else {
+ int search_fields[] = {NAME, EMAIL, NICK, -1};
+ int i;
+@@ -480,9 +502,14 @@
+ printf("Not found\n");
+ quit_mutt_query(EXIT_FAILURE);
+ }
+- putchar('\n');
++ // mutt expects a leading line containing
++ // a message about the query.
++ // Others output filter supporting query (vcard, custom)
++ // don't needs this.
++ if(!strcmp(selected_item_filter.filtname, "muttq"))
++ putchar('\n');
+ while(i >= 0) {
+- muttq_print_item(stdout, i);
++ e_write_item(stdout, i, selected_item_filter.func);
+ i = find_item(str, i + 1, search_fields);
+ }
+ }
+@@ -708,6 +735,7 @@
+ check_abook_directory();
+ init_opts();
+ load_opts(rcfile);
++ init_standard_fields();
+ atexit(free_opts);
+
+ /*
+diff -urN BUILD/abook-0.6.0pre2/abook.h abook/abook.h
+--- BUILD/abook-0.6.0pre2/abook.h 2005-10-26 01:27:24.000000000 +0200
++++ abook/abook.h 2013-03-13 15:07:45.000000000 +0100
+@@ -50,6 +50,7 @@
+ #define ISSPACE(c) isspace((unsigned char)c)
+
+ #define SKIPWS(c) while(*(c) && ISSPACE(*(c))) c++
++#define SKIPNONWS(c) while(*(c) && ! ISSPACE(*(c))) c++
+
+ #ifndef DEBUG
+ # define NDEBUG 1
+diff -urN BUILD/abook-0.6.0pre2/abookrc.5 abook/abookrc.5
+--- BUILD/abook-0.6.0pre2/abookrc.5 2006-09-04 21:24:13.000000000 +0200
++++ abook/abookrc.5 2013-03-13 15:07:45.000000000 +0100
+@@ -90,7 +90,7 @@
+ \fI{name:22}\fP
+ displays the \fIname\fP field with a maximal width of 22 characters.
+ .TP
+-\fI{phone:-13|workphone|mobile}\fP
++\fI{phone:-12|workphone|mobile}\fP
+ 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.
+ .RE
+ .IP
+@@ -146,6 +146,84 @@
+ \fBshow_cursor\fP=[true|false]
+ Defines if the cursor is visible in main display. Default is false.
+
++.TP
++\fBuse_mouse\fP=[true|false]
++Defines if navigation via the mouse is activated. Default is false.
++
++.TP
++\fBuse_colors\fP=[true|false]
++Defines if the output of abook is colorized. Default is false.
++
++.TP
++Color settings:
++\fBcolor_header_fg\fP=color
++Foreground color for header bar
++
++\fBcolor_header_bg\fP=color
++Background color for header bar
++
++\fBcolor_footer_fg\fP=color
++Foreground color for footer bar
++
++\fBcolor_footer_bg\fP=color
++Background color for footer bar
++
++\fBcolor_list_even_fg\fP=color
++Foreground color for normal list entries with even index in the list (starting
++with index 0)
++
++\fBcolor_list_even_bg\fP=color
++Background color for normal list entries with even index in the list (starting
++with index 0)
++
++\fBcolor_list_odd_fg\fP=color
++Foreground color for normal list entries with odd index in the list (starting
++with index 0)
++
++\fBcolor_list_odd_bg\fP=color
++Background color for normal list entries with odd index in the list (starting
++with index 0)
++
++\fBcolor_list_header_fg\fP=color
++Foreground color for the list header
++
++\fBcolor_list_header_bg\fP=color
++Background color for the list header
++
++\fBcolor_list_highlight_fg\fP=color
++Foreground color for highlighted list entries
++
++\fBcolor_list_highlight_bg\fP=color
++Background color for highlighted list entries
++
++\fBcolor_tab_border_fg\fP=color
++Foreground color for tab borders on details page
++
++\fBcolor_tab_border_bg\fP=color
++Background color for tab borders on details page
++
++\fBcolor_tab_label_fg\fP=color
++Foreground color for tab labes on details page
++
++\fBcolor_tab_label_bg\fP=color
++Background color for tab labes on details page
++
++\fBcolor_field_name_fg\fP=color
++Foreground color for field names on details page
++
++\fBcolor_field_name_bg\fP=color
++Background color for field names on details page
++
++\fBcolor_field_value_fg\fP=color
++Foreground color for field values on details page
++
++\fBcolor_field_value_bg\fP=color
++Background color for field values on details page
++
++Where \fBcolor\fP can be: default, black, red, green, yellow, blue, magenta, cyan, white
++
++
++
+ .SH SAMPLE CONFIGURATION FILE
+
+ .nf
+diff -urN BUILD/abook-0.6.0pre2/abook_rl.c abook/abook_rl.c
+--- BUILD/abook-0.6.0pre2/abook_rl.c 2005-09-23 17:42:11.000000000 +0200
++++ abook/abook_rl.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: abook_rl.c,v 1.16 2005/09/23 15:42:11 jheinonen Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+diff -urN BUILD/abook-0.6.0pre2/abook.spec abook/abook.spec
+--- BUILD/abook-0.6.0pre2/abook.spec 2006-09-06 11:45:14.000000000 +0200
++++ abook/abook.spec 1970-01-01 01:00:00.000000000 +0100
+@@ -1,47 +0,0 @@
+-Summary: Text-based addressbook program
+-Name: abook
+-Version: 0.6.0pre2
+-Release: 1
+-License: GPL
+-Group: Utilities
+-Source: http://prdownloads.sourceforge.net/abook/%{name}-%{version}.tar.gz
+-URL: http://abook.sourceforge.net/
+-BuildPreReq: ncurses-devel readline-devel gettext
+-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+-
+-%description
+-Abook is a text-based addressbook program designed to
+-use with mutt mail client.
+-
+-
+-%prep
+-%setup -q
+-
+-
+-%build
+-%configure
+-make %{_smp_mflags}
+-
+-
+-%install
+-%makeinstall
+-
+-%find_lang %{name}
+-
+-
+-%clean
+-rm -rf -- "%{buildroot}"
+-
+-
+-%files -f %{name}.lang
+-%defattr(-,root,root)
+-%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO sample.abookrc
+-%{_bindir}/abook
+-%{_mandir}/man1/abook.*
+-%{_mandir}/man5/abookrc.*
+-
+-
+-%changelog
+-* Mon Mar 11 2002 Jaakko Heinonen <jheinonen@users.sourceforge.net>
+-- rewrote the spec file originally written by
+- Gustavo Niemeyer <niemeyer@conectiva.com>
+diff -urN BUILD/abook-0.6.0pre2/ABOUT-NLS abook/ABOUT-NLS
+--- BUILD/abook-0.6.0pre2/ABOUT-NLS 2005-09-17 12:10:23.000000000 +0200
++++ abook/ABOUT-NLS 2013-03-13 15:07:45.000000000 +0100
+@@ -18,35 +18,7 @@
+ available translations. They tell how people wanting to contribute and
+ work on translations can contact the appropriate team.
+
+- When reporting bugs in the `intl/' directory or bugs which may be
+-related to internationalization, you should tell about the version of
+-`gettext' which is used. The information can be found in the
+-`intl/VERSION' file, in internationalized packages.
+-
+-1.1 Quick configuration advice
+-==============================
+-
+-If you want to exploit the full power of internationalization, you
+-should configure it using
+-
+- ./configure --with-included-gettext
+-
+-to force usage of internationalizing routines provided within this
+-package, despite the existence of internationalizing capabilities in the
+-operating system where this package is being installed. So far, only
+-the `gettext' implementation in the GNU C library version 2 provides as
+-many features (such as locale alias, message inheritance, automatic
+-charset conversion or plural form handling) as the implementation here.
+-It is also not possible to offer this additional functionality on top
+-of a `catgets' implementation. Future versions of GNU `gettext' will
+-very likely convey even more functionality. So it might be a good idea
+-to change to GNU `gettext' as soon as possible.
+-
+- So you need _not_ provide this option if you are using GNU libc 2 or
+-you have installed a recent copy of the GNU gettext package with the
+-included `libintl'.
+-
+-1.2 INSTALL Matters
++1.1 INSTALL Matters
+ ===================
+
+ Some packages are "localizable" when properly installed; the programs
+@@ -56,36 +28,19 @@
+
+ By default, this package will be installed to allow translation of
+ messages. It will automatically detect whether the system already
+-provides the GNU `gettext' functions. If not, the included GNU
+-`gettext' library will be used. This library is wholly contained
+-within this package, usually in the `intl/' subdirectory, so prior
+-installation of the GNU `gettext' package is _not_ required.
+-Installers may use special options at configuration time for changing
+-the default behaviour. The commands:
++provides the GNU `gettext' functions. Installers may use special
++options at configuration time for changing the default behaviour. The
++command:
+
+- ./configure --with-included-gettext
+ ./configure --disable-nls
+
+-will, respectively, bypass any pre-existing `gettext' to use the
+-internationalizing routines provided within this package, or else,
+-_totally_ disable translation of messages.
++will _totally_ disable translation of messages.
+
+ When you already have GNU `gettext' installed on your system and run
+ configure without an option for your new package, `configure' will
+-probably detect the previously built and installed `libintl.a' file and
+-will decide to use this. This might not be desirable. You should use
+-the more recent version of the GNU `gettext' library. I.e. if the file
+-`intl/VERSION' shows that the library which comes with this package is
+-more recent, you should use
+-
+- ./configure --with-included-gettext
+-
+-to prevent auto-detection.
+-
+- The configuration process will not test for the `catgets' function
+-and therefore it will not be used. The reason is that even an
+-emulation of `gettext' on top of `catgets' could not provide all the
+-extensions of the GNU `gettext' library.
++probably detect the previously built and installed `libintl' library
++and will decide to use it. If not, you may have to to use the
++`--with-libintl-prefix' option to tell `configure' where to look for it.
+
+ Internationalized packages usually have many `po/LL.po' files, where
+ LL gives an ISO 639 two-letter code identifying the language. Unless
+@@ -96,13 +51,16 @@
+ `LINGUAS' should then contain a space separated list of two-letter
+ codes, stating which languages are allowed.
+
+-1.3 Using This Package
++1.2 Using This Package
+ ======================
+
+ As a user, if your language has been installed for this package, you
+ only have to set the `LANG' environment variable to the appropriate
+-`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
+-and `CC' is an ISO 3166 two-letter country code. For example, let's
++`LL_CC' combination. If you happen to have the `LC_ALL' or some other
++`LC_xxx' environment variables set, you should unset them before
++setting `LANG', otherwise the setting of `LANG' will not have the
++desired effect. Here `LL' is an ISO 639 two-letter language code, and
++`CC' is an ISO 3166 two-letter country code. For example, let's
+ suppose that you speak German and live in Germany. At the shell
+ prompt, merely execute `setenv LANG de_DE' (in `csh'),
+ `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+@@ -118,8 +76,8 @@
+ language and `CC' denoting the country, is the one use on systems based
+ on GNU libc. On other systems, some variations of this scheme are
+ used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
+-locales supported by your system for your country by running the command
+-`locale -a | grep '^LL''.
++locales supported by your system for your language by running the
++command `locale -a | grep '^LL''.
+
+ Not all programs have translations for all languages. By default, an
+ English message is shown in place of a nonexistent translation. If you
+@@ -145,7 +103,7 @@
+ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+ (Portuguese as spoken in Portugal) in this context.
+
+-1.4 Translating Teams
++1.3 Translating Teams
+ =====================
+
+ For the Free Translation Project to be a success, we need interested
+@@ -153,8 +111,7 @@
+ able to synergize with other translators speaking the same language.
+ Each translation team has its own mailing list. The up-to-date list of
+ teams can be found at the Free Translation Project's homepage,
+-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+-area.
++`http://translationproject.org/', in the "Teams" area.
+
+ If you'd like to volunteer to _work_ at translating messages, you
+ should become a member of the translating team for your own language.
+@@ -168,786 +125,1125 @@
+ _actively_ in translations, or at solving translational difficulties,
+ rather than merely lurking around. If your team does not exist yet and
+ you want to start one, or if you are unsure about what to do or how to
+-get started, please write to `translation@iro.umontreal.ca' to reach the
+-coordinator for all translator teams.
++get started, please write to `coordinator@translationproject.org' to
++reach the coordinator for all translator teams.
+
+ The English team is special. It works at improving and uniformizing
+-the terminology in use. Proven linguistic skill are praised more than
+-programming skill, here.
++the terminology in use. Proven linguistic skills are praised more than
++programming skills, here.
+
+-1.5 Available Packages
++1.4 Available Packages
+ ======================
+
+ Languages are not equally supported in all packages. The following
+-matrix shows the current state of internationalization, as of April
+-2005. The matrix shows, in regard of each package, for which languages
++matrix shows the current state of internationalization, as of June
++2010. The matrix shows, in regard of each package, for which languages
+ PO files have been submitted to translation coordination, with a
+ translation percentage of at least 50%.
+
+- Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB
++ Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca
++ +--------------------------------------------------+
++ a2ps | [] [] |
++ aegis | |
++ ant-phone | |
++ anubis | |
++ aspell | [] [] |
++ bash | |
++ bfd | |
++ bibshelf | [] |
++ binutils | |
++ bison | |
++ bison-runtime | [] |
++ bluez-pin | [] [] |
++ bombono-dvd | |
++ buzztard | |
++ cflow | |
++ clisp | |
++ coreutils | [] [] |
++ cpio | |
++ cppi | |
++ cpplib | [] |
++ cryptsetup | |
++ dfarc | |
++ dialog | [] [] |
++ dico | |
++ diffutils | [] |
++ dink | |
++ doodle | |
++ e2fsprogs | [] |
++ enscript | [] |
++ exif | |
++ fetchmail | [] |
++ findutils | [] |
++ flex | [] |
++ freedink | |
++ gas | |
++ gawk | [] [] |
++ gcal | [] |
++ gcc | |
++ gettext-examples | [] [] [] [] |
++ gettext-runtime | [] [] |
++ gettext-tools | [] [] |
++ gip | [] |
++ gjay | |
++ gliv | [] |
++ glunarclock | [] [] |
++ gnubiff | |
++ gnucash | [] |
++ gnuedu | |
++ gnulib | |
++ gnunet | |
++ gnunet-gtk | |
++ gnutls | |
++ gold | |
++ gpe-aerial | |
++ gpe-beam | |
++ gpe-bluetooth | |
++ gpe-calendar | |
++ gpe-clock | [] |
++ gpe-conf | |
++ gpe-contacts | |
++ gpe-edit | |
++ gpe-filemanager | |
++ gpe-go | |
++ gpe-login | |
++ gpe-ownerinfo | [] |
++ gpe-package | |
++ gpe-sketchbook | |
++ gpe-su | [] |
++ gpe-taskmanager | [] |
++ gpe-timesheet | [] |
++ gpe-today | [] |
++ gpe-todo | |
++ gphoto2 | |
++ gprof | [] |
++ gpsdrive | |
++ gramadoir | |
++ grep | |
++ grub | [] [] |
++ gsasl | |
++ gss | |
++ gst-plugins-bad | [] |
++ gst-plugins-base | [] |
++ gst-plugins-good | [] |
++ gst-plugins-ugly | [] |
++ gstreamer | [] [] [] |
++ gtick | |
++ gtkam | [] |
++ gtkorphan | [] |
++ gtkspell | [] [] [] |
++ gutenprint | |
++ hello | [] |
++ help2man | |
++ hylafax | |
++ idutils | |
++ indent | [] [] |
++ iso_15924 | |
++ iso_3166 | [] [] [] [] [] [] [] |
++ iso_3166_2 | |
++ iso_4217 | |
++ iso_639 | [] [] [] [] |
++ iso_639_3 | |
++ jwhois | |
++ kbd | |
++ keytouch | [] |
++ keytouch-editor | |
++ keytouch-keyboa... | [] |
++ klavaro | [] |
++ latrine | |
++ ld | [] |
++ leafpad | [] [] |
++ libc | [] [] |
++ libexif | () |
++ libextractor | |
++ libgnutls | |
++ libgpewidget | |
++ libgpg-error | |
++ libgphoto2 | |
++ libgphoto2_port | |
++ libgsasl | |
++ libiconv | [] |
++ libidn | |
++ lifelines | |
++ liferea | [] [] |
++ lilypond | |
++ linkdr | [] |
++ lordsawar | |
++ lprng | |
++ lynx | [] |
++ m4 | |
++ mailfromd | |
++ mailutils | |
++ make | |
++ man-db | |
++ man-db-manpages | |
++ minicom | |
++ mkisofs | |
++ myserver | |
++ nano | [] [] |
++ opcodes | |
++ parted | |
++ pies | |
++ popt | |
++ psmisc | |
++ pspp | [] |
++ pwdutils | |
++ radius | [] |
++ recode | [] [] |
++ rosegarden | |
++ rpm | |
++ rush | |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] [] |
++ sed | [] [] |
++ sharutils | [] [] |
++ shishi | |
++ skencil | |
++ solfege | |
++ solfege-manual | |
++ soundtracker | |
++ sp | |
++ sysstat | |
++ tar | [] |
++ texinfo | |
++ tin | |
++ unicode-han-tra... | |
++ unicode-transla... | |
++ util-linux-ng | [] |
++ vice | |
++ vmm | |
++ vorbis-tools | |
++ wastesedge | |
++ wdiff | |
++ wget | [] [] |
++ wyslij-po | |
++ xchat | [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] |
++ +--------------------------------------------------+
++ af am an ar as ast az be be@latin bg bn_IN bs ca
++ 6 0 1 2 3 19 1 10 3 28 3 1 38
++
++ crh cs da de el en en_GB en_ZA eo es et eu fa
+ +-------------------------------------------------+
+- GNUnet | |
+- a2ps | [] [] [] [] [] |
+- aegis | () |
+- ant-phone | () |
+- anubis | [] |
+- ap-utils | |
+- aspell | [] [] [] [] |
+- bash | [] [] |
+- batchelor | [] |
+- bfd | |
+- bibshelf | [] |
+- binutils | [] |
+- bison | [] [] |
+- bluez-pin | [] [] [] [] |
+- clisp | [] [] |
+- console-tools | [] [] |
+- coreutils | [] [] [] [] |
++ a2ps | [] [] [] [] [] [] [] |
++ aegis | [] [] [] |
++ ant-phone | [] () |
++ anubis | [] [] |
++ aspell | [] [] [] [] [] |
++ bash | [] [] [] |
++ bfd | [] |
++ bibshelf | [] [] [] |
++ binutils | [] |
++ bison | [] [] |
++ bison-runtime | [] [] [] [] |
++ bluez-pin | [] [] [] [] [] [] |
++ bombono-dvd | [] |
++ buzztard | [] [] [] |
++ cflow | [] [] |
++ clisp | [] [] [] [] |
++ coreutils | [] [] [] [] |
+ cpio | |
+- cpplib | [] [] [] |
+- darkstat | [] () [] |
+- dialog | [] [] [] [] [] [] |
+- diffutils | [] [] [] [] [] |
+- doodle | [] |
+- e2fsprogs | [] [] |
+- enscript | [] [] [] [] |
+- error | [] [] [] [] |
+- fetchmail | [] () [] [] [] |
+- fileutils | [] [] |
+- findutils | [] [] [] |
+- flex | [] [] [] |
+- fslint | [] |
+- gas | |
+- gawk | [] [] [] |
+- gbiff | [] |
+- gcal | [] |
+- gcc | [] |
+- gettext-examples | [] [] [] [] |
+- gettext-runtime | [] [] [] [] |
+- gettext-tools | [] [] |
+- gimp-print | [] [] [] [] |
+- gip | |
+- gliv | [] |
+- glunarclock | |
+- gmult | [] [] |
+- gnubiff | () |
+- gnucash | [] () () [] |
+- gnucash-glossary | [] () |
+- gpe-aerial | [] [] |
+- gpe-beam | [] [] |
+- gpe-calendar | [] [] |
+- gpe-clock | [] [] |
+- gpe-conf | [] [] |
+- gpe-contacts | |
+- gpe-edit | [] |
+- gpe-go | [] |
+- gpe-login | [] [] |
+- gpe-ownerinfo | [] [] |
+- gpe-sketchbook | [] [] |
+- gpe-su | [] [] |
+- gpe-taskmanager | [] [] |
+- gpe-timesheet | [] |
+- gpe-today | [] [] |
+- gpe-todo | [] [] |
+- gphoto2 | [] [] [] [] |
+- gprof | [] [] |
+- gpsdrive | () () |
+- gramadoir | [] [] |
+- grep | [] [] [] [] [] [] |
+- gretl | |
+- gsasl | [] |
++ cppi | |
++ cpplib | [] [] [] |
++ cryptsetup | [] |
++ dfarc | [] [] [] |
++ dialog | [] [] [] [] [] |
++ dico | |
++ diffutils | [] [] [] [] [] [] |
++ dink | [] [] [] |
++ doodle | [] |
++ e2fsprogs | [] [] [] |
++ enscript | [] [] [] |
++ exif | () [] [] |
++ fetchmail | [] [] () [] [] [] |
++ findutils | [] [] [] |
++ flex | [] [] |
++ freedink | [] [] [] |
++ gas | [] |
++ gawk | [] [] [] |
++ gcal | [] |
++ gcc | [] [] |
++ gettext-examples | [] [] [] [] |
++ gettext-runtime | [] [] [] [] |
++ gettext-tools | [] [] [] |
++ gip | [] [] [] [] |
++ gjay | [] |
++ gliv | [] [] [] |
++ glunarclock | [] [] |
++ gnubiff | () |
++ gnucash | [] () () () () |
++ gnuedu | [] [] |
++ gnulib | [] [] |
++ gnunet | |
++ gnunet-gtk | [] |
++ gnutls | [] [] |
++ gold | [] |
++ gpe-aerial | [] [] [] [] |
++ gpe-beam | [] [] [] [] |
++ gpe-bluetooth | [] [] |
++ gpe-calendar | [] |
++ gpe-clock | [] [] [] [] |
++ gpe-conf | [] [] [] |
++ gpe-contacts | [] [] [] |
++ gpe-edit | [] [] |
++ gpe-filemanager | [] [] [] |
++ gpe-go | [] [] [] [] |
++ gpe-login | [] [] |
++ gpe-ownerinfo | [] [] [] [] |
++ gpe-package | [] [] [] |
++ gpe-sketchbook | [] [] [] [] |
++ gpe-su | [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] |
++ gpe-timesheet | [] [] [] [] |
++ gpe-today | [] [] [] [] |
++ gpe-todo | [] [] [] |
++ gphoto2 | [] [] () [] [] [] |
++ gprof | [] [] [] |
++ gpsdrive | [] [] [] |
++ gramadoir | [] [] [] |
++ grep | [] |
++ grub | [] [] |
++ gsasl | [] |
+ gss | |
+- gst-plugins | [] [] [] [] [] [] |
+- gstreamer | [] [] [] [] [] |
+- gtick | [] () |
+- gtkspell | [] [] [] |
+- hello | [] [] [] [] |
+- id-utils | [] [] |
+- impost | |
+- indent | [] [] |
+- iso_3166 | |
+- iso_3166_1 | [] [] [] [] [] |
+- iso_3166_2 | |
+- iso_3166_3 | [] |
+- iso_4217 | |
+- iso_639 | |
+- jpilot | [] |
+- jtag | |
+- jwhois | |
+- kbd | [] [] [] [] |
+- latrine | () |
+- ld | [] |
+- libc | [] [] [] [] [] |
++ gst-plugins-bad | [] [] [] [] [] |
++ gst-plugins-base | [] [] [] [] [] |
++ gst-plugins-good | [] [] [] [] [] [] |
++ gst-plugins-ugly | [] [] [] [] [] [] |
++ gstreamer | [] [] [] [] [] |
++ gtick | [] () [] |
++ gtkam | [] [] () [] [] |
++ gtkorphan | [] [] [] [] |
++ gtkspell | [] [] [] [] [] [] [] |
++ gutenprint | [] [] [] |
++ hello | [] [] [] [] |
++ help2man | [] |
++ hylafax | [] [] |
++ idutils | [] [] |
++ indent | [] [] [] [] [] [] [] |
++ iso_15924 | [] () [] [] |
++ iso_3166 | [] [] [] [] () [] [] [] () |
++ iso_3166_2 | () |
++ iso_4217 | [] [] [] () [] [] |
++ iso_639 | [] [] [] [] () [] [] |
++ iso_639_3 | [] |
++ jwhois | [] |
++ kbd | [] [] [] [] [] |
++ keytouch | [] [] |
++ keytouch-editor | [] [] |
++ keytouch-keyboa... | [] |
++ klavaro | [] [] [] [] |
++ latrine | [] () |
++ ld | [] [] |
++ leafpad | [] [] [] [] [] [] |
++ libc | [] [] [] [] |
++ libexif | [] [] () |
+ libextractor | |
+- libgpewidget | [] [] [] |
++ libgnutls | [] |
++ libgpewidget | [] [] |
++ libgpg-error | [] [] |
++ libgphoto2 | [] () |
++ libgphoto2_port | [] () [] |
+ libgsasl | |
+- libiconv | [] [] [] [] [] |
+- libidn | |
+- lifelines | [] () |
+- lilypond | [] |
+- lingoteach | |
+- lynx | [] [] [] [] |
+- m4 | [] [] [] [] |
+- mailutils | [] |
+- make | [] [] |
+- man-db | [] () [] [] |
+- minicom | [] [] |
+- mysecretdiary | [] [] |
+- nano | [] () [] |
+- nano_1_0 | [] () [] [] |
+- opcodes | [] |
+- parted | [] [] [] [] |
+- psmisc | |
+- ptx | [] [] [] |
+- pwdutils | |
+- python | |
+- radius | [] |
+- recode | [] [] [] [] [] |
+- rpm | [] [] |
++ libiconv | [] [] [] [] [] |
++ libidn | [] [] [] |
++ lifelines | [] () |
++ liferea | [] [] [] [] [] |
++ lilypond | [] [] [] |
++ linkdr | [] [] [] |
++ lordsawar | [] |
++ lprng | |
++ lynx | [] [] [] [] |
++ m4 | [] [] [] [] |
++ mailfromd | |
++ mailutils | [] |
++ make | [] [] [] |
++ man-db | |
++ man-db-manpages | |
++ minicom | [] [] [] [] |
++ mkisofs | |
++ myserver | |
++ nano | [] [] [] |
++ opcodes | [] [] |
++ parted | [] [] |
++ pies | |
++ popt | [] [] [] [] [] |
++ psmisc | [] [] [] |
++ pspp | [] |
++ pwdutils | [] |
++ radius | [] |
++ recode | [] [] [] [] [] [] |
++ rosegarden | () () () |
++ rpm | [] [] [] |
++ rush | |
++ sarg | |
+ screem | |
+- scrollkeeper | [] [] [] [] [] [] [] [] |
+- sed | [] [] |
+- sh-utils | [] [] |
+- shared-mime-info | [] [] |
+- sharutils | [] [] [] [] [] |
+- silky | |
+- skencil | [] () |
+- sketch | [] () |
+- solfege | [] |
+- soundtracker | [] [] |
+- sp | [] |
+- stardict | [] |
+- tar | |
+- texinfo | [] [] |
+- textutils | [] [] [] |
+- tin | () () |
+- tp-robot | [] |
+- tuxpaint | [] [] [] [] [] [] [] |
++ scrollkeeper | [] [] [] [] [] |
++ sed | [] [] [] [] [] [] |
++ sharutils | [] [] [] [] |
++ shishi | |
++ skencil | [] () [] |
++ solfege | [] [] [] |
++ solfege-manual | [] [] |
++ soundtracker | [] [] [] |
++ sp | [] |
++ sysstat | [] [] [] |
++ tar | [] [] [] [] |
++ texinfo | [] [] [] |
++ tin | [] [] |
+ unicode-han-tra... | |
+ unicode-transla... | |
+- util-linux | [] [] [] [] |
+- vorbis-tools | [] [] [] [] |
+- wastesedge | () |
+- wdiff | [] [] [] [] |
+- wget | [] [] [] [] [] [] |
+- xchat | [] [] [] [] |
+- xkeyboard-config | |
+- xpad | |
++ util-linux-ng | [] [] [] [] |
++ vice | () () |
++ vmm | [] |
++ vorbis-tools | [] [] |
++ wastesedge | [] |
++ wdiff | [] [] |
++ wget | [] [] [] |
++ wyslij-po | |
++ xchat | [] [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] [] [] [] |
+ +-------------------------------------------------+
+- af am ar az be bg bs ca cs cy da de el en en_GB
+- 10 0 0 2 7 4 0 41 43 3 52 90 20 1 15
++ crh cs da de el en en_GB en_ZA eo es et eu fa
++ 5 64 105 117 18 1 8 0 28 89 18 19 0
+
+- eo es et eu fa fi fr ga gl he hr hu id is it
+- +-----------------------------------------------+
+- GNUnet | |
+- a2ps | [] [] [] () |
+- aegis | |
+- ant-phone | [] |
+- anubis | [] |
+- ap-utils | [] |
+- aspell | [] [] |
+- bash | [] [] [] [] |
+- batchelor | [] [] |
+- bfd | [] |
+- bibshelf | [] [] [] |
+- binutils | [] [] |
+- bison | [] [] [] [] [] [] |
+- bluez-pin | [] [] [] [] [] [] |
+- clisp | [] [] |
+- console-tools | |
+- coreutils | [] [] [] [] [] |
+- cpio | [] [] |
+- cpplib | [] [] |
+- darkstat | [] () [] [] [] |
+- dialog | [] [] [] [] [] [] [] [] |
+- diffutils | [] [] [] [] [] [] [] [] [] [] |
+- doodle | [] [] |
+- e2fsprogs | [] [] [] |
+- enscript | [] [] |
+- error | [] [] [] [] [] |
+- fetchmail | [] |
+- fileutils | [] [] [] [] [] [] |
+- findutils | [] [] [] [] [] |
+- flex | [] [] [] |
+- fslint | [] |
+- gas | [] [] |
+- gawk | [] [] [] [] |
+- gbiff | [] |
+- gcal | [] [] |
+- gcc | [] |
+- gettext-examples | [] [] [] [] |
+- gettext-runtime | [] [] [] [] [] [] |
+- gettext-tools | [] [] [] |
+- gimp-print | [] [] |
+- gip | [] [] [] |
+- gliv | () |
+- glunarclock | [] [] [] |
+- gmult | [] [] [] |
+- gnubiff | () () |
+- gnucash | [] () [] |
+- gnucash-glossary | [] [] |
+- gpe-aerial | [] [] |
+- gpe-beam | [] [] |
+- gpe-calendar | [] [] [] [] |
+- gpe-clock | [] [] [] |
+- gpe-conf | [] |
+- gpe-contacts | [] |
+- gpe-edit | [] [] |
+- gpe-go | [] [] |
+- gpe-login | [] [] [] |
+- gpe-ownerinfo | [] [] [] [] [] |
+- gpe-sketchbook | [] [] |
+- gpe-su | [] [] [] |
+- gpe-taskmanager | [] [] [] |
+- gpe-timesheet | [] [] [] [] |
+- gpe-today | [] [] [] [] |
+- gpe-todo | [] [] [] |
+- gphoto2 | [] [] [] [] [] |
+- gprof | [] [] [] |
+- gpsdrive | () () [] () |
+- gramadoir | [] [] |
+- grep | [] [] [] [] [] [] [] [] [] [] [] [] |
+- gretl | [] [] [] |
+- gsasl | [] [] [] |
+- gss | [] |
+- gst-plugins | [] [] [] |
+- gstreamer | [] |
+- gtick | [] [] [] [] [] |
+- gtkspell | [] [] [] [] [] [] |
+- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
+- id-utils | [] [] [] [] |
+- impost | [] [] |
+- indent | [] [] [] [] [] [] [] [] [] [] [] |
+- iso_3166 | [] [] [] |
+- iso_3166_1 | [] [] [] [] [] [] [] |
+- iso_3166_2 | [] |
+- iso_3166_3 | [] |
+- iso_4217 | [] [] [] |
+- iso_639 | [] [] [] [] |
+- jpilot | [] [] |
+- jtag | [] |
+- jwhois | [] [] [] [] [] |
+- kbd | [] [] |
+- latrine | [] [] [] |
+- ld | [] [] |
+- libc | [] [] [] [] [] |
+- libextractor | |
+- libgpewidget | [] [] [] [] [] |
+- libgsasl | [] [] |
+- libiconv | [] [] [] [] [] [] [] [] [] [] [] |
+- libidn | [] [] |
+- lifelines | () |
+- lilypond | [] |
+- lingoteach | [] [] [] |
+- lynx | [] [] [] |
+- m4 | [] [] [] [] |
+- mailutils | [] [] |
+- make | [] [] [] [] [] [] [] |
+- man-db | () |
+- minicom | [] [] [] [] |
+- mysecretdiary | [] [] [] |
+- nano | [] [] () [] [] |
+- nano_1_0 | [] [] [] [] [] |
+- opcodes | [] [] |
+- parted | [] [] [] [] |
+- psmisc | [] [] |
+- ptx | [] [] [] [] [] [] [] [] [] |
+- pwdutils | |
+- python | |
+- radius | [] [] |
+- recode | [] [] [] [] [] [] [] [] |
+- rpm | [] |
+- screem | |
+- scrollkeeper | [] [] [] |
+- sed | [] [] [] [] [] |
+- sh-utils | [] [] [] [] [] [] [] |
+- shared-mime-info | [] [] [] [] [] [] |
+- sharutils | [] [] [] [] [] [] [] |
+- silky | [] |
+- skencil | [] [] |
+- sketch | [] [] |
+- solfege | [] |
+- soundtracker | [] [] [] |
+- sp | [] |
+- stardict | [] |
+- tar | [] [] [] [] [] |
+- texinfo | [] [] [] |
+- textutils | [] [] [] [] [] |
+- tin | [] () |
+- tp-robot | [] [] |
+- tuxpaint | [] [] [] [] [] [] [] [] [] |
+- unicode-han-tra... | |
+- unicode-transla... | [] [] |
+- util-linux | [] [] [] [] [] [] |
+- vorbis-tools | [] [] |
+- wastesedge | () |
+- wdiff | [] [] [] [] [] [] [] [] |
+- wget | [] [] [] [] [] [] [] [] [] [] |
+- xchat | [] [] [] [] [] |
+- xkeyboard-config | |
+- xpad | [] [] [] |
+- +-----------------------------------------------+
+- eo es et eu fa fi fr ga gl he hr hu id is it
+- 13 85 21 15 2 35 115 45 17 8 6 40 27 1 45
++ fi fr ga gl gu he hi hr hu hy id is it ja ka kn
++ +----------------------------------------------------+
++ a2ps | [] [] [] [] |
++ aegis | [] [] |
++ ant-phone | [] [] |
++ anubis | [] [] [] [] |
++ aspell | [] [] [] [] |
++ bash | [] [] [] [] |
++ bfd | [] [] [] |
++ bibshelf | [] [] [] [] [] |
++ binutils | [] [] [] |
++ bison | [] [] [] [] |
++ bison-runtime | [] [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] [] [] [] |
++ bombono-dvd | [] |
++ buzztard | [] |
++ cflow | [] [] [] |
++ clisp | [] |
++ coreutils | [] [] [] [] [] |
++ cpio | [] [] [] [] |
++ cppi | [] [] |
++ cpplib | [] [] [] |
++ cryptsetup | [] [] [] |
++ dfarc | [] [] [] |
++ dialog | [] [] [] [] [] [] [] |
++ dico | |
++ diffutils | [] [] [] [] [] [] [] [] [] |
++ dink | [] |
++ doodle | [] [] |
++ e2fsprogs | [] [] |
++ enscript | [] [] [] [] |
++ exif | [] [] [] [] [] [] |
++ fetchmail | [] [] [] [] |
++ findutils | [] [] [] [] [] [] |
++ flex | [] [] [] |
++ freedink | [] [] [] |
++ gas | [] [] |
++ gawk | [] [] [] [] () [] |
++ gcal | [] |
++ gcc | [] |
++ gettext-examples | [] [] [] [] [] [] [] |
++ gettext-runtime | [] [] [] [] [] [] |
++ gettext-tools | [] [] [] [] |
++ gip | [] [] [] [] [] [] |
++ gjay | [] |
++ gliv | [] () |
++ glunarclock | [] [] [] [] |
++ gnubiff | () [] () |
++ gnucash | () () () () () [] |
++ gnuedu | [] [] |
++ gnulib | [] [] [] [] [] [] |
++ gnunet | |
++ gnunet-gtk | [] |
++ gnutls | [] [] |
++ gold | [] [] |
++ gpe-aerial | [] [] [] |
++ gpe-beam | [] [] [] [] |
++ gpe-bluetooth | [] [] [] [] |
++ gpe-calendar | [] [] |
++ gpe-clock | [] [] [] [] [] |
++ gpe-conf | [] [] [] [] |
++ gpe-contacts | [] [] [] [] |
++ gpe-edit | [] [] [] |
++ gpe-filemanager | [] [] [] [] |
++ gpe-go | [] [] [] [] [] |
++ gpe-login | [] [] [] |
++ gpe-ownerinfo | [] [] [] [] [] |
++ gpe-package | [] [] [] |
++ gpe-sketchbook | [] [] [] [] |
++ gpe-su | [] [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] [] |
++ gpe-timesheet | [] [] [] [] [] |
++ gpe-today | [] [] [] [] [] [] [] |
++ gpe-todo | [] [] [] |
++ gphoto2 | [] [] [] [] [] [] |
++ gprof | [] [] [] [] |
++ gpsdrive | [] [] [] |
++ gramadoir | [] [] [] |
++ grep | [] [] |
++ grub | [] [] [] [] |
++ gsasl | [] [] [] [] [] |
++ gss | [] [] [] [] [] |
++ gst-plugins-bad | [] [] [] [] [] [] |
++ gst-plugins-base | [] [] [] [] [] [] |
++ gst-plugins-good | [] [] [] [] [] [] |
++ gst-plugins-ugly | [] [] [] [] [] [] |
++ gstreamer | [] [] [] [] [] |
++ gtick | [] [] [] [] [] |
++ gtkam | [] [] [] [] [] |
++ gtkorphan | [] [] [] |
++ gtkspell | [] [] [] [] [] [] [] [] [] |
++ gutenprint | [] [] [] [] |
++ hello | [] [] [] |
++ help2man | [] [] |
++ hylafax | [] |
++ idutils | [] [] [] [] [] [] |
++ indent | [] [] [] [] [] [] [] [] |
++ iso_15924 | [] () [] [] |
++ iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] |
++ iso_3166_2 | () [] [] [] |
++ iso_4217 | [] () [] [] [] [] |
++ iso_639 | [] () [] [] [] [] [] [] [] |
++ iso_639_3 | () [] [] |
++ jwhois | [] [] [] [] [] |
++ kbd | [] [] |
++ keytouch | [] [] [] [] [] [] |
++ keytouch-editor | [] [] [] [] [] |
++ keytouch-keyboa... | [] [] [] [] [] |
++ klavaro | [] [] |
++ latrine | [] [] [] |
++ ld | [] [] [] [] |
++ leafpad | [] [] [] [] [] [] [] () |
++ libc | [] [] [] [] [] |
++ libexif | [] |
++ libextractor | |
++ libgnutls | [] [] |
++ libgpewidget | [] [] [] [] |
++ libgpg-error | [] [] |
++ libgphoto2 | [] [] [] |
++ libgphoto2_port | [] [] [] |
++ libgsasl | [] [] [] [] [] |
++ libiconv | [] [] [] [] [] [] |
++ libidn | [] [] [] [] |
++ lifelines | () |
++ liferea | [] [] [] [] |
++ lilypond | [] [] |
++ linkdr | [] [] [] [] [] |
++ lordsawar | |
++ lprng | [] |
++ lynx | [] [] [] [] [] |
++ m4 | [] [] [] [] [] [] |
++ mailfromd | |
++ mailutils | [] [] |
++ make | [] [] [] [] [] [] [] [] [] |
++ man-db | [] [] |
++ man-db-manpages | [] |
++ minicom | [] [] [] [] [] |
++ mkisofs | [] [] [] [] |
++ myserver | |
++ nano | [] [] [] [] [] [] |
++ opcodes | [] [] [] [] |
++ parted | [] [] [] [] |
++ pies | |
++ popt | [] [] [] [] [] [] [] [] [] |
++ psmisc | [] [] [] |
++ pspp | |
++ pwdutils | [] [] |
++ radius | [] [] |
++ recode | [] [] [] [] [] [] [] [] |
++ rosegarden | () () () () () |
++ rpm | [] [] |
++ rush | |
++ sarg | [] |
++ screem | [] [] |
++ scrollkeeper | [] [] [] [] |
++ sed | [] [] [] [] [] [] [] [] |
++ sharutils | [] [] [] [] [] [] [] |
++ shishi | [] |
++ skencil | [] |
++ solfege | [] [] [] [] |
++ solfege-manual | [] [] |
++ soundtracker | [] [] |
++ sp | [] () |
++ sysstat | [] [] [] [] [] |
++ tar | [] [] [] [] [] [] [] |
++ texinfo | [] [] [] [] |
++ tin | [] |
++ unicode-han-tra... | |
++ unicode-transla... | [] [] |
++ util-linux-ng | [] [] [] [] [] [] |
++ vice | () () () |
++ vmm | [] |
++ vorbis-tools | [] |
++ wastesedge | () () |
++ wdiff | [] |
++ wget | [] [] [] [] [] [] [] [] |
++ wyslij-po | [] [] [] |
++ xchat | [] [] [] [] [] [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] [] [] |
++ +----------------------------------------------------+
++ fi fr ga gl gu he hi hr hu hy id is it ja ka kn
++ 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4
+
+- ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
++ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+ +-----------------------------------------------+
+- GNUnet | |
+- a2ps | () [] [] () |
+- aegis | () |
+- ant-phone | [] |
+- anubis | [] [] [] |
+- ap-utils | |
+- aspell | [] [] |
+- bash | [] |
+- batchelor | [] |
++ a2ps | [] |
++ aegis | |
++ ant-phone | |
++ anubis | [] [] |
++ aspell | [] |
++ bash | |
+ bfd | |
+- bibshelf | |
++ bibshelf | [] [] |
+ binutils | |
+- bison | [] [] [] |
+- bluez-pin | [] |
+- clisp | [] |
+- console-tools | |
+- coreutils | [] [] |
++ bison | [] |
++ bison-runtime | [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] |
++ bombono-dvd | |
++ buzztard | |
++ cflow | |
++ clisp | |
++ coreutils | [] |
+ cpio | |
++ cppi | |
+ cpplib | |
+- darkstat | [] [] |
+- dialog | [] |
+- diffutils | [] [] [] |
++ cryptsetup | |
++ dfarc | [] |
++ dialog | [] [] [] [] [] |
++ dico | |
++ diffutils | [] [] |
++ dink | |
+ doodle | |
+ e2fsprogs | |
+- enscript | [] |
+- error | [] |
+- fetchmail | [] [] |
+- fileutils | [] [] |
+- findutils | [] |
+- flex | [] [] |
+- fslint | [] |
++ enscript | |
++ exif | [] |
++ fetchmail | |
++ findutils | |
++ flex | |
++ freedink | [] |
+ gas | |
+- gawk | [] [] |
+- gbiff | [] |
++ gawk | |
+ gcal | |
+ gcc | |
+- gettext-examples | [] [] |
+- gettext-runtime | [] [] [] |
+- gettext-tools | [] [] |
+- gimp-print | [] [] |
+- gip | [] |
+- gliv | [] |
+- glunarclock | [] [] |
+- gmult | [] |
++ gettext-examples | [] [] [] [] |
++ gettext-runtime | [] |
++ gettext-tools | [] |
++ gip | [] [] |
++ gjay | |
++ gliv | |
++ glunarclock | [] |
+ gnubiff | |
+- gnucash | () () [] |
+- gnucash-glossary | [] |
+- gpe-aerial | [] |
+- gpe-beam | [] |
+- gpe-calendar | [] |
+- gpe-clock | [] |
+- gpe-conf | [] |
+- gpe-contacts | |
+- gpe-edit | [] |
+- gpe-go | [] |
+- gpe-login | [] |
+- gpe-ownerinfo | [] |
+- gpe-sketchbook | [] |
+- gpe-su | [] |
+- gpe-taskmanager | [] [] |
+- gpe-timesheet | [] |
+- gpe-today | [] |
+- gpe-todo | [] |
+- gphoto2 | [] [] |
+- gprof | |
+- gpsdrive | () () () |
+- gramadoir | () |
+- grep | [] [] [] |
+- gretl | |
+- gsasl | [] |
++ gnucash | () () () () |
++ gnuedu | |
++ gnulib | |
++ gnunet | |
++ gnunet-gtk | |
++ gnutls | [] |
++ gold | |
++ gpe-aerial | [] |
++ gpe-beam | [] |
++ gpe-bluetooth | [] [] |
++ gpe-calendar | [] |
++ gpe-clock | [] [] [] [] [] |
++ gpe-conf | [] [] |
++ gpe-contacts | [] [] |
++ gpe-edit | [] |
++ gpe-filemanager | [] [] |
++ gpe-go | [] [] [] |
++ gpe-login | [] |
++ gpe-ownerinfo | [] [] |
++ gpe-package | [] [] |
++ gpe-sketchbook | [] [] |
++ gpe-su | [] [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] [] [] |
++ gpe-timesheet | [] [] |
++ gpe-today | [] [] [] [] |
++ gpe-todo | [] [] |
++ gphoto2 | |
++ gprof | [] |
++ gpsdrive | |
++ gramadoir | |
++ grep | |
++ grub | |
++ gsasl | |
+ gss | |
+- gst-plugins | [] |
+- gstreamer | [] |
+- gtick | [] |
+- gtkspell | [] [] |
+- hello | [] [] [] [] [] [] [] [] |
+- id-utils | [] |
+- impost | |
+- indent | [] [] |
+- iso_3166 | [] |
+- iso_3166_1 | [] [] |
+- iso_3166_2 | [] |
+- iso_3166_3 | [] |
+- iso_4217 | [] [] [] |
+- iso_639 | [] [] [] |
+- jpilot | () () () |
+- jtag | |
+- jwhois | [] |
+- kbd | [] |
+- latrine | [] |
++ gst-plugins-bad | [] [] [] [] |
++ gst-plugins-base | [] [] |
++ gst-plugins-good | [] [] |
++ gst-plugins-ugly | [] [] [] [] [] |
++ gstreamer | |
++ gtick | |
++ gtkam | [] |
++ gtkorphan | [] [] |
++ gtkspell | [] [] [] [] [] [] [] |
++ gutenprint | |
++ hello | [] [] [] |
++ help2man | |
++ hylafax | |
++ idutils | |
++ indent | |
++ iso_15924 | [] [] |
++ iso_3166 | [] [] () [] [] [] [] [] |
++ iso_3166_2 | |
++ iso_4217 | [] [] |
++ iso_639 | [] [] |
++ iso_639_3 | [] |
++ jwhois | [] |
++ kbd | |
++ keytouch | [] |
++ keytouch-editor | [] |
++ keytouch-keyboa... | [] |
++ klavaro | [] |
++ latrine | [] |
+ ld | |
+- libc | [] [] [] [] [] |
++ leafpad | [] [] [] |
++ libc | [] |
++ libexif | |
+ libextractor | |
+- libgpewidget | [] |
+- libgsasl | [] |
+- libiconv | [] |
++ libgnutls | [] |
++ libgpewidget | [] [] |
++ libgpg-error | |
++ libgphoto2 | |
++ libgphoto2_port | |
++ libgsasl | |
++ libiconv | |
+ libidn | |
+- lifelines | [] |
+- lilypond | [] |
+- lingoteach | [] |
+- lynx | [] [] |
+- m4 | [] [] |
++ lifelines | |
++ liferea | |
++ lilypond | |
++ linkdr | |
++ lordsawar | |
++ lprng | |
++ lynx | |
++ m4 | |
++ mailfromd | |
+ mailutils | |
+- make | [] [] [] |
+- man-db | () |
+- minicom | [] |
+- mysecretdiary | [] |
+- nano | [] [] |
+- nano_1_0 | [] [] [] |
+- opcodes | [] |
+- parted | [] [] |
+- psmisc | [] [] |
+- ptx | [] [] [] |
++ make | [] |
++ man-db | |
++ man-db-manpages | |
++ minicom | [] |
++ mkisofs | |
++ myserver | |
++ nano | [] [] |
++ opcodes | |
++ parted | |
++ pies | |
++ popt | [] [] [] |
++ psmisc | |
++ pspp | |
+ pwdutils | |
+- python | |
+ radius | |
+- recode | [] |
+- rpm | [] [] |
+- screem | [] |
+- scrollkeeper | [] [] [] |
+- sed | [] [] |
+- sh-utils | [] [] |
+- shared-mime-info | [] [] [] [] |
+- sharutils | [] [] |
+- silky | [] |
++ recode | |
++ rosegarden | |
++ rpm | |
++ rush | |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] |
++ sed | |
++ sharutils | |
++ shishi | |
+ skencil | |
+- sketch | |
+- solfege | [] [] |
++ solfege | [] |
++ solfege-manual | |
+ soundtracker | |
+- sp | () |
+- stardict | [] [] |
+- tar | [] [] |
+- texinfo | [] [] [] |
+- textutils | [] [] [] |
++ sp | |
++ sysstat | [] |
++ tar | [] |
++ texinfo | [] |
+ tin | |
+- tp-robot | [] |
+- tuxpaint | [] [] [] [] [] [] |
+ unicode-han-tra... | |
+ unicode-transla... | |
+- util-linux | [] [] |
+- vorbis-tools | [] |
+- wastesedge | [] |
+- wdiff | [] [] |
+- wget | [] [] |
+- xchat | [] [] [] [] |
+- xkeyboard-config | [] |
+- xpad | [] |
++ util-linux-ng | |
++ vice | |
++ vmm | |
++ vorbis-tools | |
++ wastesedge | |
++ wdiff | |
++ wget | [] |
++ wyslij-po | |
++ xchat | [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] |
+ +-----------------------------------------------+
+- ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
+- 33 11 1 1 1 2 2 3 11 0 15 96 7 5 0
+-
+- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
+- +-------------------------------------------------+
+- GNUnet | |
+- a2ps | () [] [] [] [] [] [] |
+- aegis | () () |
+- ant-phone | [] |
+- anubis | [] [] [] |
+- ap-utils | () |
+- aspell | [] [] |
+- bash | [] [] [] |
+- batchelor | [] |
+- bfd | |
+- bibshelf | |
+- binutils | [] [] |
+- bison | [] [] [] [] [] |
+- bluez-pin | [] [] [] [] [] [] [] [] |
+- clisp | [] |
+- console-tools | [] |
+- coreutils | [] [] [] [] |
+- cpio | [] [] |
+- cpplib | |
+- darkstat | [] [] [] [] [] [] |
+- dialog | [] [] [] [] [] [] [] |
+- diffutils | [] [] [] [] [] [] |
+- doodle | [] |
+- e2fsprogs | [] [] |
+- enscript | [] [] [] [] |
+- error | [] [] [] |
+- fetchmail | [] () [] [] [] |
+- fileutils | [] [] [] [] [] |
+- findutils | [] [] [] [] [] [] |
+- flex | [] [] [] [] [] |
+- fslint | [] [] [] |
+- gas | |
+- gawk | [] [] [] [] |
+- gbiff | [] |
+- gcal | [] |
+- gcc | |
+- gettext-examples | [] [] [] [] [] [] |
+- gettext-runtime | [] [] [] [] [] [] [] |
+- gettext-tools | [] [] [] [] [] [] [] |
+- gimp-print | [] [] |
+- gip | [] [] [] |
+- gliv | [] [] [] |
+- glunarclock | [] [] [] [] [] [] |
+- gmult | [] [] [] [] |
+- gnubiff | () [] |
+- gnucash | () [] [] [] [] |
+- gnucash-glossary | [] [] [] |
+- gpe-aerial | [] [] [] [] [] [] |
+- gpe-beam | [] [] [] [] [] [] |
+- gpe-calendar | [] [] [] [] [] [] [] |
+- gpe-clock | [] [] [] [] [] [] [] |
+- gpe-conf | [] [] [] [] [] [] |
+- gpe-contacts | [] [] [] |
+- gpe-edit | [] [] [] [] [] [] [] |
+- gpe-go | [] [] [] [] [] |
+- gpe-login | [] [] [] [] [] [] [] |
+- gpe-ownerinfo | [] [] [] [] [] [] [] |
+- gpe-sketchbook | [] [] [] [] [] [] [] |
+- gpe-su | [] [] [] [] [] [] [] |
+- gpe-taskmanager | [] [] [] [] [] [] [] |
+- gpe-timesheet | [] [] [] [] [] [] [] |
+- gpe-today | [] [] [] [] [] [] [] |
+- gpe-todo | [] [] [] [] [] [] [] |
+- gphoto2 | [] [] [] [] |
+- gprof | [] [] [] |
+- gpsdrive | [] |
+- gramadoir | [] |
+- grep | [] [] [] [] [] [] [] |
+- gretl | [] |
+- gsasl | [] [] [] [] [] |
+- gss | [] [] [] |
+- gst-plugins | [] [] [] [] |
+- gstreamer | [] [] [] [] |
+- gtick | [] [] [] |
+- gtkspell | [] [] [] [] [] [] |
+- hello | [] [] [] [] [] [] [] |
+- id-utils | [] [] [] [] |
+- impost | |
+- indent | [] [] [] [] [] [] |
+- iso_3166 | [] [] [] [] [] |
+- iso_3166_1 | [] [] [] [] |
+- iso_3166_2 | |
+- iso_3166_3 | [] [] [] |
+- iso_4217 | [] [] |
+- iso_639 | [] [] [] |
+- jpilot | |
+- jtag | [] |
+- jwhois | [] [] [] () () |
+- kbd | [] [] [] |
+- latrine | [] [] |
+- ld | [] |
+- libc | [] [] [] [] [] |
+- libextractor | [] |
+- libgpewidget | [] [] [] [] [] [] |
+- libgsasl | [] [] [] |
+- libiconv | [] [] [] [] [] [] [] [] [] [] |
+- libidn | [] () |
+- lifelines | [] [] |
+- lilypond | [] |
+- lingoteach | [] |
+- lynx | [] [] [] |
+- m4 | [] [] [] [] [] |
+- mailutils | [] [] [] |
+- make | [] [] [] [] |
+- man-db | [] [] |
+- minicom | [] [] [] [] |
+- mysecretdiary | [] [] [] [] |
+- nano | [] [] [] |
+- nano_1_0 | [] [] [] [] |
+- opcodes | [] [] |
+- parted | [] [] [] [] |
+- psmisc | [] [] |
+- ptx | [] [] [] [] [] [] |
+- pwdutils | [] |
+- python | |
+- radius | [] [] |
+- recode | [] [] [] [] [] [] |
+- rpm | [] [] [] [] |
+- screem | |
+- scrollkeeper | [] [] [] [] [] [] [] |
+- sed | [] [] [] [] [] [] [] [] |
+- sh-utils | [] [] [] |
+- shared-mime-info | [] [] [] [] [] |
+- sharutils | [] [] [] |
+- silky | [] |
+- skencil | [] [] [] |
+- sketch | [] [] [] |
+- solfege | |
+- soundtracker | [] [] |
+- sp | |
+- stardict | [] [] |
+- tar | [] [] [] [] |
+- texinfo | [] [] [] [] |
+- textutils | [] [] [] |
+- tin | |
+- tp-robot | [] |
+- tuxpaint | [] [] [] [] [] [] [] [] |
+- unicode-han-tra... | |
+- unicode-transla... | |
+- util-linux | [] [] [] |
+- vorbis-tools | [] [] |
+- wastesedge | |
+- wdiff | [] [] [] [] [] [] |
+- wget | [] [] [] [] [] [] [] [] [] |
+- xchat | [] [] [] [] [] [] |
+- xkeyboard-config | |
+- xpad | |
+- +-------------------------------------------------+
+- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
+- 1 0 48 30 58 6 79 71 5 45 13 12 50 86 0
++ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
++ 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1
+
+- tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+- +--------------------------------------------+
+- GNUnet | | 0
+- a2ps | [] [] [] | 19
+- aegis | | 0
+- ant-phone | [] | 4
+- anubis | [] | 9
+- ap-utils | () | 1
+- aspell | [] [] [] | 13
+- bash | | 10
+- batchelor | [] [] | 7
+- bfd | | 1
+- bibshelf | [] | 5
+- binutils | [] | 6
+- bison | [] | 17
+- bluez-pin | [] [] [] [] [] | 24
+- clisp | | 7
+- console-tools | [] | 4
+- coreutils | [] | 16
+- cpio | [] [] | 6
+- cpplib | [] [] | 7
+- darkstat | [] () () | 15
+- dialog | [] [] [] | 25
+- diffutils | [] [] [] [] | 28
+- doodle | [] | 5
+- e2fsprogs | [] | 8
+- enscript | [] | 12
+- error | [] [] [] | 16
+- fetchmail | [] | 12
+- fileutils | [] [] [] | 18
+- findutils | [] [] | 17
+- flex | [] [] | 15
+- fslint | [] | 7
+- gas | [] | 3
+- gawk | [] | 14
+- gbiff | | 4
+- gcal | [] | 5
+- gcc | [] | 3
+- gettext-examples | [] [] [] [] | 20
+- gettext-runtime | [] [] [] [] [] | 25
+- gettext-tools | [] [] [] | 17
+- gimp-print | [] | 11
+- gip | [] | 8
+- gliv | [] | 6
+- glunarclock | [] [] | 13
+- gmult | [] [] [] | 13
+- gnubiff | [] | 3
+- gnucash | () [] | 10
+- gnucash-glossary | [] | 8
+- gpe-aerial | [] [] | 13
+- gpe-beam | [] [] | 13
+- gpe-calendar | [] [] [] [] | 18
+- gpe-clock | [] [] [] [] | 17
+- gpe-conf | [] [] | 12
+- gpe-contacts | [] [] | 6
+- gpe-edit | [] [] [] [] | 15
+- gpe-go | [] [] | 11
+- gpe-login | [] [] [] [] [] | 18
+- gpe-ownerinfo | [] [] [] [] | 19
+- gpe-sketchbook | [] [] | 14
+- gpe-su | [] [] [] | 16
+- gpe-taskmanager | [] [] [] | 17
+- gpe-timesheet | [] [] [] [] | 17
+- gpe-today | [] [] [] [] [] | 19
+- gpe-todo | [] [] [] | 16
+- gphoto2 | [] [] | 17
+- gprof | [] [] | 10
+- gpsdrive | | 2
+- gramadoir | [] | 6
+- grep | [] [] [] [] | 32
+- gretl | | 4
+- gsasl | [] [] | 12
+- gss | [] | 5
+- gst-plugins | [] [] | 16
+- gstreamer | [] [] [] | 14
+- gtick | [] | 11
+- gtkspell | [] [] [] | 20
+- hello | [] [] [] [] | 37
+- id-utils | [] [] | 13
+- impost | [] | 3
+- indent | [] [] [] | 24
+- iso_3166 | [] [] [] | 12
+- iso_3166_1 | [] [] | 20
+- iso_3166_2 | | 2
+- iso_3166_3 | [] [] | 8
+- iso_4217 | [] [] | 10
+- iso_639 | [] [] | 12
+- jpilot | [] [] [] | 6
+- jtag | | 2
+- jwhois | [] [] [] | 12
+- kbd | [] [] | 12
+- latrine | [] [] | 8
+- ld | [] | 5
+- libc | [] [] | 22
+- libextractor | | 1
+- libgpewidget | [] [] | 17
+- libgsasl | [] | 7
+- libiconv | [] [] [] [] [] | 32
+- libidn | [] [] | 5
+- lifelines | | 4
+- lilypond | [] | 5
+- lingoteach | | 5
+- lynx | [] [] | 14
+- m4 | [] [] | 17
+- mailutils | [] | 7
+- make | [] [] | 18
+- man-db | | 5
+- minicom | | 11
+- mysecretdiary | [] [] | 12
+- nano | | 11
+- nano_1_0 | [] [] | 17
+- opcodes | [] | 7
+- parted | [] [] [] | 17
+- psmisc | [] | 7
+- ptx | [] [] | 23
+- pwdutils | | 1
+- python | | 0
+- radius | [] | 6
+- recode | [] [] | 22
+- rpm | [] [] | 11
+- screem | | 1
+- scrollkeeper | [] [] | 23
+- sed | [] [] | 19
+- sh-utils | [] | 15
+- shared-mime-info | [] [] | 19
+- sharutils | [] [] [] | 20
+- silky | | 3
+- skencil | | 6
+- sketch | | 6
+- solfege | | 4
+- soundtracker | [] | 8
+- sp | [] | 3
+- stardict | [] [] [] [] | 10
+- tar | [] [] | 13
+- texinfo | [] [] | 14
+- textutils | [] [] [] | 17
+- tin | | 1
+- tp-robot | [] [] | 7
+- tuxpaint | [] [] [] [] | 34
+- unicode-han-tra... | | 0
+- unicode-transla... | | 2
+- util-linux | [] [] | 17
+- vorbis-tools | [] | 10
+- wastesedge | | 1
+- wdiff | [] [] | 22
+- wget | [] [] [] [] | 31
+- xchat | [] [] [] | 22
+- xkeyboard-config | | 1
+- xpad | [] | 5
+- +--------------------------------------------+
+- 72 teams tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
+- 147 domains 0 0 1 78 29 0 71 16 0 41 20 0 1711
++ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
++ +---------------------------------------------------+
++ a2ps | [] [] [] [] [] [] [] [] |
++ aegis | [] [] [] |
++ ant-phone | [] [] |
++ anubis | [] [] [] |
++ aspell | [] [] [] [] [] |
++ bash | [] [] |
++ bfd | [] |
++ bibshelf | [] [] |
++ binutils | [] [] |
++ bison | [] [] [] |
++ bison-runtime | [] [] [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] [] [] [] |
++ bombono-dvd | [] () |
++ buzztard | [] [] |
++ cflow | [] |
++ clisp | [] [] |
++ coreutils | [] [] [] [] [] [] |
++ cpio | [] [] [] |
++ cppi | [] |
++ cpplib | [] |
++ cryptsetup | [] |
++ dfarc | [] |
++ dialog | [] [] [] [] |
++ dico | [] |
++ diffutils | [] [] [] [] [] [] |
++ dink | () |
++ doodle | [] [] |
++ e2fsprogs | [] [] |
++ enscript | [] [] [] [] [] |
++ exif | [] [] [] () [] |
++ fetchmail | [] [] [] [] |
++ findutils | [] [] [] [] [] |
++ flex | [] [] [] [] [] |
++ freedink | [] [] |
++ gas | |
++ gawk | [] [] [] [] |
++ gcal | |
++ gcc | [] |
++ gettext-examples | [] [] [] [] [] [] [] [] |
++ gettext-runtime | [] [] [] [] [] [] [] [] [] |
++ gettext-tools | [] [] [] [] [] [] |
++ gip | [] [] [] [] [] |
++ gjay | |
++ gliv | [] [] [] [] [] [] |
++ glunarclock | [] [] [] [] [] |
++ gnubiff | [] () |
++ gnucash | [] () () () |
++ gnuedu | [] |
++ gnulib | [] [] [] [] |
++ gnunet | |
++ gnunet-gtk | |
++ gnutls | [] [] |
++ gold | |
++ gpe-aerial | [] [] [] [] [] [] [] |
++ gpe-beam | [] [] [] [] [] [] [] |
++ gpe-bluetooth | [] [] |
++ gpe-calendar | [] [] [] [] |
++ gpe-clock | [] [] [] [] [] [] [] [] |
++ gpe-conf | [] [] [] [] [] [] [] |
++ gpe-contacts | [] [] [] [] [] |
++ gpe-edit | [] [] [] |
++ gpe-filemanager | [] [] [] |
++ gpe-go | [] [] [] [] [] [] [] [] |
++ gpe-login | [] [] |
++ gpe-ownerinfo | [] [] [] [] [] [] [] [] |
++ gpe-package | [] [] |
++ gpe-sketchbook | [] [] [] [] [] [] [] |
++ gpe-su | [] [] [] [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] [] [] [] [] |
++ gpe-timesheet | [] [] [] [] [] [] [] [] |
++ gpe-today | [] [] [] [] [] [] [] [] |
++ gpe-todo | [] [] [] [] [] |
++ gphoto2 | [] [] [] [] [] [] [] [] |
++ gprof | [] [] [] |
++ gpsdrive | [] [] |
++ gramadoir | [] [] |
++ grep | [] [] [] [] |
++ grub | [] [] [] |
++ gsasl | [] [] [] [] |
++ gss | [] [] [] |
++ gst-plugins-bad | [] [] [] [] [] [] |
++ gst-plugins-base | [] [] [] [] [] |
++ gst-plugins-good | [] [] [] [] [] |
++ gst-plugins-ugly | [] [] [] [] [] [] |
++ gstreamer | [] [] [] [] [] |
++ gtick | [] [] [] |
++ gtkam | [] [] [] [] [] [] |
++ gtkorphan | [] |
++ gtkspell | [] [] [] [] [] [] [] [] [] [] |
++ gutenprint | [] [] |
++ hello | [] [] [] [] |
++ help2man | [] [] |
++ hylafax | [] |
++ idutils | [] [] [] [] [] |
++ indent | [] [] [] [] [] [] [] |
++ iso_15924 | [] [] [] [] |
++ iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
++ iso_3166_2 | [] [] [] |
++ iso_4217 | [] [] [] [] [] [] [] [] |
++ iso_639 | [] [] [] [] [] [] [] [] [] |
++ iso_639_3 | [] [] |
++ jwhois | [] [] [] [] |
++ kbd | [] [] [] |
++ keytouch | [] [] [] |
++ keytouch-editor | [] [] [] |
++ keytouch-keyboa... | [] [] [] |
++ klavaro | [] [] |
++ latrine | [] [] |
++ ld | |
++ leafpad | [] [] [] [] [] [] [] [] [] |
++ libc | [] [] [] [] |
++ libexif | [] [] () [] |
++ libextractor | |
++ libgnutls | [] [] |
++ libgpewidget | [] [] [] |
++ libgpg-error | [] [] |
++ libgphoto2 | [] [] |
++ libgphoto2_port | [] [] [] [] [] |
++ libgsasl | [] [] [] [] [] |
++ libiconv | [] [] [] [] [] |
++ libidn | [] [] |
++ lifelines | [] [] |
++ liferea | [] [] [] [] [] () () [] |
++ lilypond | [] |
++ linkdr | [] [] [] |
++ lordsawar | |
++ lprng | [] |
++ lynx | [] [] [] |
++ m4 | [] [] [] [] [] |
++ mailfromd | [] |
++ mailutils | [] |
++ make | [] [] [] [] |
++ man-db | [] [] [] |
++ man-db-manpages | [] [] [] |
++ minicom | [] [] [] [] |
++ mkisofs | [] [] [] |
++ myserver | |
++ nano | [] [] [] [] |
++ opcodes | [] [] |
++ parted | [] [] [] [] |
++ pies | [] |
++ popt | [] [] [] [] |
++ psmisc | [] [] [] |
++ pspp | [] [] |
++ pwdutils | [] |
++ radius | [] [] [] |
++ recode | [] [] [] [] [] [] [] [] |
++ rosegarden | () () |
++ rpm | [] [] [] |
++ rush | [] [] |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] [] [] [] [] [] [] |
++ sed | [] [] [] [] [] [] [] [] [] |
++ sharutils | [] [] [] [] |
++ shishi | [] |
++ skencil | [] [] |
++ solfege | [] [] [] [] |
++ solfege-manual | [] [] [] |
++ soundtracker | [] |
++ sp | |
++ sysstat | [] [] [] [] |
++ tar | [] [] [] [] |
++ texinfo | [] [] [] [] |
++ tin | [] |
++ unicode-han-tra... | |
++ unicode-transla... | |
++ util-linux-ng | [] [] [] [] [] |
++ vice | [] |
++ vmm | [] |
++ vorbis-tools | [] [] |
++ wastesedge | [] |
++ wdiff | [] [] |
++ wget | [] [] [] [] [] [] [] |
++ wyslij-po | [] [] [] |
++ xchat | [] [] [] [] [] [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] |
++ +---------------------------------------------------+
++ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
++ 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37
++
++ sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
++ +---------------------------------------------------+
++ a2ps | [] [] [] [] [] | 27
++ aegis | [] | 9
++ ant-phone | [] [] [] [] | 9
++ anubis | [] [] [] [] | 15
++ aspell | [] [] [] | 20
++ bash | [] [] [] | 12
++ bfd | [] | 6
++ bibshelf | [] [] [] | 16
++ binutils | [] [] | 8
++ bison | [] [] | 12
++ bison-runtime | [] [] [] [] [] [] | 29
++ bluez-pin | [] [] [] [] [] [] [] [] | 37
++ bombono-dvd | [] | 4
++ buzztard | [] | 7
++ cflow | [] [] [] | 9
++ clisp | | 10
++ coreutils | [] [] [] [] | 22
++ cpio | [] [] [] [] [] [] | 13
++ cppi | [] [] | 5
++ cpplib | [] [] [] [] [] [] | 14
++ cryptsetup | [] [] | 7
++ dfarc | [] | 9
++ dialog | [] [] [] [] [] [] [] | 30
++ dico | [] | 2
++ diffutils | [] [] [] [] [] [] | 30
++ dink | | 4
++ doodle | [] [] | 7
++ e2fsprogs | [] [] [] | 11
++ enscript | [] [] [] [] | 17
++ exif | [] [] [] | 16
++ fetchmail | [] [] [] | 17
++ findutils | [] [] [] [] [] | 20
++ flex | [] [] [] [] | 15
++ freedink | [] | 10
++ gas | [] | 4
++ gawk | [] [] [] [] | 18
++ gcal | [] [] | 5
++ gcc | [] [] [] | 7
++ gettext-examples | [] [] [] [] [] [] [] | 34
++ gettext-runtime | [] [] [] [] [] [] [] | 29
++ gettext-tools | [] [] [] [] [] [] | 22
++ gip | [] [] [] [] | 22
++ gjay | [] | 3
++ gliv | [] [] [] | 14
++ glunarclock | [] [] [] [] [] | 19
++ gnubiff | [] [] | 4
++ gnucash | () [] () [] () | 10
++ gnuedu | [] [] | 7
++ gnulib | [] [] [] [] | 16
++ gnunet | [] | 1
++ gnunet-gtk | [] [] [] | 5
++ gnutls | [] [] [] | 10
++ gold | [] | 4
++ gpe-aerial | [] [] [] | 18
++ gpe-beam | [] [] [] | 19
++ gpe-bluetooth | [] [] [] | 13
++ gpe-calendar | [] [] [] [] | 12
++ gpe-clock | [] [] [] [] [] | 28
++ gpe-conf | [] [] [] [] | 20
++ gpe-contacts | [] [] [] | 17
++ gpe-edit | [] [] [] | 12
++ gpe-filemanager | [] [] [] [] | 16
++ gpe-go | [] [] [] [] [] | 25
++ gpe-login | [] [] [] | 11
++ gpe-ownerinfo | [] [] [] [] [] | 25
++ gpe-package | [] [] [] | 13
++ gpe-sketchbook | [] [] [] | 20
++ gpe-su | [] [] [] [] [] | 30
++ gpe-taskmanager | [] [] [] [] [] | 29
++ gpe-timesheet | [] [] [] [] [] | 25
++ gpe-today | [] [] [] [] [] [] | 30
++ gpe-todo | [] [] [] [] | 17
++ gphoto2 | [] [] [] [] [] | 24
++ gprof | [] [] [] | 15
++ gpsdrive | [] [] [] | 11
++ gramadoir | [] [] [] | 11
++ grep | [] [] [] | 10
++ grub | [] [] [] | 14
++ gsasl | [] [] [] [] | 14
++ gss | [] [] [] | 11
++ gst-plugins-bad | [] [] [] [] | 26
++ gst-plugins-base | [] [] [] [] [] | 24
++ gst-plugins-good | [] [] [] [] | 24
++ gst-plugins-ugly | [] [] [] [] [] | 29
++ gstreamer | [] [] [] [] | 22
++ gtick | [] [] [] | 13
++ gtkam | [] [] [] | 20
++ gtkorphan | [] [] [] | 14
++ gtkspell | [] [] [] [] [] [] [] [] [] | 45
++ gutenprint | [] | 10
++ hello | [] [] [] [] [] [] | 21
++ help2man | [] [] | 7
++ hylafax | [] | 5
++ idutils | [] [] [] [] | 17
++ indent | [] [] [] [] [] [] | 30
++ iso_15924 | () [] () [] [] | 16
++ iso_3166 | [] [] () [] [] () [] [] [] () | 53
++ iso_3166_2 | () [] () [] | 9
++ iso_4217 | [] () [] [] () [] [] | 26
++ iso_639 | [] [] [] () [] () [] [] [] [] | 38
++ iso_639_3 | [] () | 8
++ jwhois | [] [] [] [] [] | 16
++ kbd | [] [] [] [] [] | 15
++ keytouch | [] [] [] | 16
++ keytouch-editor | [] [] [] | 14
++ keytouch-keyboa... | [] [] [] | 14
++ klavaro | [] | 11
++ latrine | [] [] [] | 10
++ ld | [] [] [] [] | 11
++ leafpad | [] [] [] [] [] [] | 33
++ libc | [] [] [] [] [] | 21
++ libexif | [] () | 7
++ libextractor | [] | 1
++ libgnutls | [] [] [] | 9
++ libgpewidget | [] [] [] | 14
++ libgpg-error | [] [] [] | 9
++ libgphoto2 | [] [] | 8
++ libgphoto2_port | [] [] [] [] | 14
++ libgsasl | [] [] [] | 13
++ libiconv | [] [] [] [] | 21
++ libidn | () [] [] | 11
++ lifelines | [] | 4
++ liferea | [] [] [] | 21
++ lilypond | [] | 7
++ linkdr | [] [] [] [] [] | 17
++ lordsawar | | 1
++ lprng | [] | 3
++ lynx | [] [] [] [] | 17
++ m4 | [] [] [] [] | 19
++ mailfromd | [] [] | 3
++ mailutils | [] | 5
++ make | [] [] [] [] | 21
++ man-db | [] [] [] | 8
++ man-db-manpages | | 4
++ minicom | [] [] | 16
++ mkisofs | [] [] | 9
++ myserver | | 0
++ nano | [] [] [] [] | 21
++ opcodes | [] [] [] | 11
++ parted | [] [] [] [] [] | 15
++ pies | [] [] | 3
++ popt | [] [] [] [] [] [] | 27
++ psmisc | [] [] | 11
++ pspp | | 4
++ pwdutils | [] [] | 6
++ radius | [] [] | 9
++ recode | [] [] [] [] | 28
++ rosegarden | () | 0
++ rpm | [] [] [] | 11
++ rush | [] [] | 4
++ sarg | | 1
++ screem | [] | 3
++ scrollkeeper | [] [] [] [] [] | 27
++ sed | [] [] [] [] [] | 30
++ sharutils | [] [] [] [] [] | 22
++ shishi | [] | 3
++ skencil | [] [] | 7
++ solfege | [] [] [] [] | 16
++ solfege-manual | [] | 8
++ soundtracker | [] [] [] | 9
++ sp | [] | 3
++ sysstat | [] [] | 15
++ tar | [] [] [] [] [] [] | 23
++ texinfo | [] [] [] [] [] | 17
++ tin | | 4
++ unicode-han-tra... | | 0
++ unicode-transla... | | 2
++ util-linux-ng | [] [] [] [] | 20
++ vice | () () | 1
++ vmm | [] | 4
++ vorbis-tools | [] | 6
++ wastesedge | | 2
++ wdiff | [] [] | 7
++ wget | [] [] [] [] [] | 26
++ wyslij-po | [] [] | 8
++ xchat | [] [] [] [] [] [] | 36
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63
++ xkeyboard-config | [] [] [] | 22
++ +---------------------------------------------------+
++ 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
++ 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618
+
+ Some counters in the preceding matrix are higher than the number of
+ visible blocks let us expect. This is because a few extra PO files are
+@@ -960,12 +1256,12 @@
+ lag between the mere existence a PO file and its wide availability in a
+ distribution.
+
+- If April 2005 seems to be old, you may fetch a more recent copy of
++ If June 2010 seems to be old, you may fetch a more recent copy of
+ this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
+ matrix with full percentage details can be found at
+-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
++`http://translationproject.org/extra/matrix.html'.
+
+-1.6 Using `gettext' in new packages
++1.5 Using `gettext' in new packages
+ ===================================
+
+ If you are writing a freely available program and want to
+@@ -981,6 +1277,6 @@
+ Free Translation Project is also available for packages which are not
+ developed inside the GNU project. Therefore the information given above
+ applies also for every other Free Software Project. Contact
+-`translation@iro.umontreal.ca' to make the `.pot' files available to
+-the translation teams.
++`coordinator@translationproject.org' to make the `.pot' files available
++to the translation teams.
+
+ AC_DEFUN([AC_LIB_READLINE], [
+diff -urN BUILD/abook-0.6.0pre2/aclocal.m4 abook/aclocal.m4
+--- BUILD/abook-0.6.0pre2/aclocal.m4 2006-09-05 10:19:33.000000000 +0200
++++ abook/aclocal.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,55 +12,62 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
++[m4_warning([this file was generated for autoconf 2.69.
++You have another version of autoconf. It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
++# Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 1
+
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.11'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version. Point them to the right macro.
++m4_if([$1], [1.11.6], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.3])])
+-
+-# AM_AUX_DIR_EXPAND
++[AM_AUTOMAKE_VERSION([1.11.6])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# serial 1
+
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+@@ -106,26 +114,16 @@
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
++# AM_CONDITIONAL -*- Autoconf -*-
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 6
++# serial 9
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -134,8 +132,11 @@
+ [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++m4_define([_AM_COND_VALUE_$1], [$2])dnl
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+@@ -149,26 +150,14 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# serial 7 -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
++# 2010, 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 12
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -177,7 +166,6 @@
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+-
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -197,6 +185,7 @@
+ ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+@@ -208,6 +197,7 @@
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -225,6 +215,16 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
++ am__universal=false
++ m4_case([$1], [CC],
++ [case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac],
++ [CXX],
++ [case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac])
++
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+@@ -242,7 +242,17 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
+ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -252,18 +262,23 @@
+ break
+ fi
+ ;;
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
+ none) break ;;
+ esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+@@ -312,74 +327,79 @@
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([am__nodep])dnl
++_AM_SUBST_NOTMAKE([am__nodep])dnl
+ ])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-#serial 2
++#serial 5
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # So let's grep whole file.
+- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
++[{
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
+ done
+-done
++}
+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+@@ -396,55 +416,20 @@
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
++# Do all the work for Automake. -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 7
+-
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# Do all the work for Automake. -*- Autoconf -*-
++# serial 16
+
+-# This macro actually does too much some checks are only needed if
++# This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 11
+-
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+@@ -457,16 +442,20 @@
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
++[AC_PREREQ([2.62])dnl
+ dnl Autoconf wants to disallow AM_ names. We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++ fi
+ fi
+
+ # test whether we have cygpath
+@@ -486,6 +475,9 @@
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+@@ -501,8 +493,8 @@
+ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+ AM_MISSING_PROG(AUTOHEADER, autoheader)
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+@@ -510,19 +502,36 @@
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++ [_AM_PROG_TAR([v7])])])
+ _AM_IF_OPTION([no-dependencies],,
+ [AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_CC],
++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-])
+-])
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_CXX],
++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++ [_AM_DEPENDENCIES(OBJC)],
++ [define([AC_PROG_OBJC],
++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++])
++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
++AC_CONFIG_COMMANDS_PRE(dnl
++[m4_provide_if([_AM_COMPILER_EXEEXT],
++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
++])
++
++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
++dnl mangled by Autoconf and run in a shell conditional statement.
++m4_define([_AC_COMPILER_EXEEXT],
++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+ # When config.status generates a header, we must update the stamp-h file.
+@@ -534,62 +543,49 @@
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $1 | $1:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++
++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
++# Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 1
+
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++if test x"${install_sh}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
++fi
+ AC_SUBST(install_sh)])
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 1
++# serial 2
+
+ # Check whether the underlying file-system supports filenames
+ # with a leading dot. For instance MS-DOS doesn't.
+@@ -604,26 +600,15 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 4
+
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -632,7 +617,7 @@
+ [am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+- @echo done
++ @echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -642,24 +627,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
+ fi
+ AC_SUBST([am__include])
+ AC_SUBST([am__quote])
+@@ -667,27 +652,16 @@
+ rm -f confinc confmf
+ ])
+
+-# -*- Autoconf -*-
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 3
++# serial 6
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -703,7 +677,15 @@
+ # If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++AC_REQUIRE_AUX_FILE([missing])dnl
++if test x"${MISSING+set}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++ *)
++ MISSING="\${SHELL} $am_aux_dir/missing" ;;
++ esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+@@ -713,100 +695,45 @@
+ fi
+ ])
+
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
++# Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# serial 1
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake. There are at least two reasons why we must not
+-# use `-m 0755':
+-# - it causes special bits like SGID to be ignored,
+-# - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out. Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
+ AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+- else
+- mkdir_p='$(install_sh) -d'
+- fi
+-fi
+-AC_SUBST([mkdir_p])])
+-
+-# Helper functions for option handling. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++ [[\\/$]]* | ?:[[\\/]]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Helper functions for option handling. -*- Autoconf -*-
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
++# Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 5
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -814,16 +741,16 @@
+ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+ # _AM_SET_OPTION(NAME)
+-# ------------------------------
++# --------------------
+ # Set option NAME. Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+ [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+ # _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
++# ------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+ # -------------------------------------------
+@@ -831,29 +758,19 @@
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+-
+-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
++# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 3
++# serial 5
+
+ AC_DEFUN([AM_C_PROTOTYPES],
+ [AC_REQUIRE([AC_C_PROTOTYPES])
++AC_DIAGNOSE([obsolete],
++ [$0: automatic de-ANSI-fication support is deprecated])
+ if test "$ac_cv_prog_cc_stdc" != no; then
+ U= ANSI2KNR=
+ else
+@@ -861,35 +778,24 @@
+ fi
+ # Ensure some checks needed by ansi2knr itself.
+ AC_REQUIRE([AC_HEADER_STDC])
+-AC_CHECK_HEADERS(string.h)
+-AC_SUBST(U)dnl
+-AC_SUBST(ANSI2KNR)dnl
++AC_CHECK_HEADERS([string.h])
++AC_SUBST([U])dnl
++AC_SUBST([ANSI2KNR])dnl
++_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
+ ])
+
+ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+
+-#
+-# Check to make sure that the build environment is sane.
+-#
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 5
+
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -898,16 +804,29 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name. Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++ *[[\\\"\#\$\&\'\`$am_lf]]*)
++ AC_MSG_ERROR([unsafe absolute working directory name]);;
++esac
++case $srcdir in
++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments. Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
++ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+@@ -932,25 +851,16 @@
+ fi
+ AC_MSG_RESULT(yes)])
+
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# serial 1
+
++# AM_PROG_INSTALL_STRIP
++# ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries. This is especially
+ # annoying in cross-compiling environments, where the build's strip
+@@ -968,30 +878,37 @@
+ if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Check how to create a tarball. -*- Autoconf -*-
++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# Copyright (C) 2004 Free Software Foundation, Inc.
++# serial 3
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
++# AM_SUBST_NOTMAKE(VARIABLE)
++# --------------------------
++# Public sister of _AM_SUBST_NOTMAKE.
++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Check how to create a tarball. -*- Autoconf -*-
+
+-# serial 1
++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 2
+
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+@@ -1007,10 +924,11 @@
+ # a tarball read from stdin.
+ # $(am__untar) < result.tar
+ AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
++[# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AC_SUBST([AMTAR], ['$${TAR-tar}'])
+ m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+@@ -1079,32 +997,13 @@
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+
+-m4_include([m4/codeset.m4])
+ m4_include([m4/gettext.m4])
+-m4_include([m4/glibc2.m4])
+-m4_include([m4/glibc21.m4])
+ m4_include([m4/iconv.m4])
+-m4_include([m4/intdiv0.m4])
+-m4_include([m4/intmax.m4])
+-m4_include([m4/inttypes-pri.m4])
+-m4_include([m4/inttypes.m4])
+-m4_include([m4/inttypes_h.m4])
+-m4_include([m4/lcmessage.m4])
++m4_include([m4/intlmacosx.m4])
+ m4_include([m4/lib-ld.m4])
+ m4_include([m4/lib-link.m4])
+ m4_include([m4/lib-prefix.m4])
+-m4_include([m4/longdouble.m4])
+-m4_include([m4/longlong.m4])
+ m4_include([m4/nls.m4])
+ m4_include([m4/po.m4])
+-m4_include([m4/printf-posix.m4])
+ m4_include([m4/progtest.m4])
+-m4_include([m4/signed.m4])
+-m4_include([m4/size_max.m4])
+-m4_include([m4/stdint_h.m4])
+-m4_include([m4/uintmax_t.m4])
+-m4_include([m4/ulonglong.m4])
+-m4_include([m4/wchar_t.m4])
+-m4_include([m4/wint_t.m4])
+-m4_include([m4/xsize.m4])
+ m4_include([acinclude.m4])
+diff -urN BUILD/abook-0.6.0pre2/AUTHORS abook/AUTHORS
+--- BUILD/abook-0.6.0pre2/AUTHORS 2006-08-30 12:32:15.000000000 +0200
++++ abook/AUTHORS 2013-03-13 15:07:45.000000000 +0100
+@@ -26,3 +26,21 @@
+ - palmcsv export filter
+ - fixes
+
++Michael Krolikowski <mkroli@yahoo.de>
++ - built-in vcard import filter
++
++Raphaël Droz <raphael.droz+floss@gmail.com>
++ - custom output format
++ - reworked ldif input/output
++ - vcard import filter through libvformat
++ - fixes
++
++Thorsten Wißmann <edu@thorsten-wissmann.de>
++ - color support
++ - mouse support
++
++Fabio Zanini <fabio.zanini@fastmail.fm>
++ - merge entries
++ - duplicated entries removal
++ - mutt "groups"
++ - fixes
+diff -urN BUILD/abook-0.6.0pre2/ChangeLog abook/ChangeLog
+--- BUILD/abook-0.6.0pre2/ChangeLog 2006-09-06 15:22:53.000000000 +0200
++++ abook/ChangeLog 2013-03-13 15:07:45.000000000 +0100
+@@ -1,11 +1,24 @@
++git
++ - custom output format (Raphaël Droz)
++ - remove duplicates (Fabio Zanini)
++ - merge entries (Fabio Zanini)
++ - mutt groups support (Fabio Zanini)
++ - vcard initial input filter (Michael Krolikowski)
++ - vcard parser improvements (Fabio Zanini, Raphaël Droz)
++ - color support (Thorsten Wißmann)
++ - mouse support (Thorsten Wißmann)
++ - extra-fields deletion bugfix (Jorrit Tijben)
++ - additinal keybinding (Hagen Fuchs)
++ - autotools update (Fabio Zanini)
++ - case-sensitive ldif fields parsing (Christian Brabandt)
++ - ldif standard input support (Raphaël Droz)
++ - ldif extensible field management rewritting (Raphaël Droz)
++
+ 0.6.0
+ - configurable views (Cedric Duval)
+ - new field types, lists and improved custom field support (Cedric Duval)
+ - index_format option (Cedric Duval)
+ - Italian translation (Claudio Stazzone)
+- - BSD calendar export filter (Guillem Jover)
+- - translation updates
+- - bugfixes
+
+ 0.5.6
+ - translation fixes
+diff -urN BUILD/abook-0.6.0pre2/color.h abook/color.h
+--- BUILD/abook-0.6.0pre2/color.h 1970-01-01 01:00:00.000000000 +0100
++++ abook/color.h 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,21 @@
++
++#ifndef __ABOOK_COLORS_H_
++#define __ABOOK_COLORS_H_
++
++#define COLOR_DEFAULT -1
++
++enum {
++ CP_HEADER = 1,
++ CP_FOOTER,
++ CP_LIST_EVEN,
++ CP_LIST_ODD,
++ CP_LIST_HEADER,
++ CP_LIST_HIGHLIGHT,
++ CP_TAB_BORDER,
++ CP_TAB_LABEL,
++ CP_FIELD_NAME,
++ CP_FIELD_VALUE,
++};
++
++#endif
++
+diff -urN BUILD/abook-0.6.0pre2/config.guess abook/config.guess
+--- BUILD/abook-0.6.0pre2/config.guess 2006-08-04 22:18:23.000000000 +0200
++++ abook/config.guess 2013-03-13 15:07:45.000000000 +0100
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2006-02-23'
++timestamp='2012-09-25'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -16,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -26,16 +25,16 @@
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -55,7 +54,8 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -138,12 +138,35 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
++case "${UNAME_SYSTEM}" in
++Linux|GNU/*)
++ eval $set_cc_for_build
++ cat <<-EOF > $dummy.c
++ #include <features.h>
++ #ifdef __UCLIBC__
++ # ifdef __UCLIBC_CONFIG_VERSION__
++ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
++ # else
++ LIBC=uclibc
++ # endif
++ #else
++ # ifdef __dietlibc__
++ LIBC=dietlibc
++ # else
++ LIBC=gnu
++ # endif
++ #endif
++ EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ ;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+@@ -160,6 +183,7 @@
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
++ sh5el) machine=sh5le-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+@@ -168,7 +192,7 @@
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+- | grep __ELF__ >/dev/null
++ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+@@ -178,7 +202,7 @@
+ fi
+ ;;
+ *)
+- os=netbsd
++ os=netbsd
+ ;;
+ esac
+ # The OS release
+@@ -199,6 +223,10 @@
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
++ *:Bitrig:*:*)
++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -210,7 +238,7 @@
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -221,7 +249,7 @@
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -267,7 +295,10 @@
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit ;;
++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++ exitcode=$?
++ trap '' 0
++ exit $exitcode ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+@@ -293,12 +324,12 @@
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+- echo powerpc-ibm-os400
++ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+- arm:riscos:*:*|arm:RISCOS:*:*)
++ arm*:riscos:*:*|arm*:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -322,14 +353,33 @@
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
++ s390x:SunOS:*:*)
++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:SunOS:5.*:*)
+- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++ eval $set_cc_for_build
++ SUN_ARCH="i386"
++ # If there is a compiler, see if it is configured for 64-bit objects.
++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++ # This test works for both compilers.
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ SUN_ARCH="x86_64"
++ fi
++ fi
++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -373,23 +423,23 @@
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit ;;
++ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+- echo m68k-milan-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-milan-mint${UNAME_RELEASE}
++ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+- echo m68k-hades-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-hades-mint${UNAME_RELEASE}
++ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+- echo m68k-unknown-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-unknown-mint${UNAME_RELEASE}
++ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
+@@ -459,8 +509,8 @@
+ echo m88k-motorola-sysv3
+ exit ;;
+ AViiON:dgux:*:*)
+- # DG/UX returns AViiON for all architectures
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ # DG/UX returns AViiON for all architectures
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -473,7 +523,7 @@
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit ;;
+@@ -530,7 +580,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[45])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -573,52 +623,52 @@
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+- case "${sc_cpu_version}" in
+- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+- 532) # CPU_PA_RISC2_0
+- case "${sc_kernel_bits}" in
+- 32) HP_ARCH="hppa2.0n" ;;
+- 64) HP_ARCH="hppa2.0w" ;;
++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ case "${sc_cpu_version}" in
++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++ 532) # CPU_PA_RISC2_0
++ case "${sc_kernel_bits}" in
++ 32) HP_ARCH="hppa2.0n" ;;
++ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+- esac ;;
+- esac
++ esac ;;
++ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ sed 's/^ //' << EOF >$dummy.c
+
+- #define _HPUX_SOURCE
+- #include <stdlib.h>
+- #include <unistd.h>
+-
+- int main ()
+- {
+- #if defined(_SC_KERNEL_BITS)
+- long bits = sysconf(_SC_KERNEL_BITS);
+- #endif
+- long cpu = sysconf (_SC_CPU_VERSION);
+-
+- switch (cpu)
+- {
+- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+- case CPU_PA_RISC2_0:
+- #if defined(_SC_KERNEL_BITS)
+- switch (bits)
+- {
+- case 64: puts ("hppa2.0w"); break;
+- case 32: puts ("hppa2.0n"); break;
+- default: puts ("hppa2.0"); break;
+- } break;
+- #else /* !defined(_SC_KERNEL_BITS) */
+- puts ("hppa2.0"); break;
+- #endif
+- default: puts ("hppa1.0"); break;
+- }
+- exit (0);
+- }
++ #define _HPUX_SOURCE
++ #include <stdlib.h>
++ #include <unistd.h>
++
++ int main ()
++ {
++ #if defined(_SC_KERNEL_BITS)
++ long bits = sysconf(_SC_KERNEL_BITS);
++ #endif
++ long cpu = sysconf (_SC_CPU_VERSION);
++
++ switch (cpu)
++ {
++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++ case CPU_PA_RISC2_0:
++ #if defined(_SC_KERNEL_BITS)
++ switch (bits)
++ {
++ case 64: puts ("hppa2.0w"); break;
++ case 32: puts ("hppa2.0n"); break;
++ default: puts ("hppa2.0"); break;
++ } break;
++ #else /* !defined(_SC_KERNEL_BITS) */
++ puts ("hppa2.0"); break;
++ #endif
++ default: puts ("hppa1.0"); break;
++ }
++ exit (0);
++ }
+ EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -638,7 +688,7 @@
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+- grep __LP64__ >/dev/null
++ grep -q __LP64__
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -709,22 +759,22 @@
+ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+- exit ;;
++ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit ;;
++ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+- exit ;;
++ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+- exit ;;
++ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+- exit ;;
++ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+@@ -748,14 +798,14 @@
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit ;;
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -767,38 +817,51 @@
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- case ${UNAME_MACHINE} in
+- pc98)
+- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
++ case ${UNAME_PROCESSOR} in
++ amd64)
++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+- i*:MINGW*:*)
+- echo ${UNAME_MACHINE}-pc-mingw32
++ *:MINGW64*:*)
++ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
+- i*:MSYS_NT-*:*:*)
++ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ i*:windows32*:*)
+- # uname -m includes "-pc" on this system.
+- echo ${UNAME_MACHINE}-mingw32
++ # uname -m includes "-pc" on this system.
++ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- x86:Interix*:[345]*)
+- echo i586-pc-interix${UNAME_RELEASE}
+- exit ;;
+- EM64T:Interix*:[345]*)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
+- exit ;;
++ *:Interix*:*)
++ case ${UNAME_MACHINE} in
++ x86)
++ echo i586-pc-interix${UNAME_RELEASE}
++ exit ;;
++ authenticamd | genuineintel | EM64T)
++ echo x86_64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ IA64)
++ echo ia64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
++ 8664:Windows_NT:*)
++ echo x86_64-pc-mks
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -819,197 +882,145 @@
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ aarch64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ aarch64_be:Linux:*:*)
++ UNAME_MACHINE=aarch64_be
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ eval $set_cc_for_build
++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_EABI__
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ else
++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++ fi
++ fi
++ exit ;;
++ avr32*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ hexagon:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ i*86:Linux:*:*)
++ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+- mips:Linux:*:*)
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+- #undef mips
+- #undef mipsel
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mipsel
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips
++ CPU=${UNAME_MACHINE}
+ #else
+ CPU=
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+- ;;
+- mips64:Linux:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
+- #undef mips64
+- #undef mips64el
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mips64el
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips64
+- #else
+- CPU=
+- #endif
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ padre:Linux:*:*)
++ echo sparc-unknown-linux-${LIBC}
+ exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-gnu ;;
+- PA8*) echo hppa2.0-unknown-linux-gnu ;;
+- *) echo hppa-unknown-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++ *) echo hppa-unknown-linux-${LIBC} ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-${LIBC}
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ tile*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-gnu
++ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ xtensa*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
+- a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit ;;
+- coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit ;;
+- "")
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
+- # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit ;;
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1017,11 +1028,11 @@
+ echo i386-sequent-sysv4
+ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+- # Unixware is an offshoot of SVR4, but it has its own version
+- # number series starting with 2...
+- # I am not positive that other SVR4 systems won't match this,
++ # Unixware is an offshoot of SVR4, but it has its own version
++ # number series starting with 2...
++ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+- # Use sysv4.2uw... so that sysv4* matches it.
++ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit ;;
+ i*86:OS/2:*:*)
+@@ -1038,7 +1049,7 @@
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+@@ -1053,7 +1064,7 @@
+ fi
+ exit ;;
+ i*86:*:5:[678]*)
+- # UnixWare 7.x, OpenUNIX and OpenServer 6.
++ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+@@ -1081,10 +1092,13 @@
+ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+- # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i386.
+- echo i386-pc-msdosdjgpp
+- exit ;;
++ # uname -m prints for DJGPP always 'pc', but it prints nothing about
++ # the processor, so we play safe by assuming i586.
++ # Note: whatever this is, it MUST be the same as what config.sub
++ # prints for the "djgpp" host, or else GDB configury will decide that
++ # this is a cross-build.
++ echo i586-pc-msdosdjgpp
++ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit ;;
+@@ -1119,8 +1133,18 @@
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4; exit; } ;;
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4; exit; } ;;
++ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++ OS_REL='.3'
++ test -r /etc/.relid \
++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+@@ -1133,7 +1157,7 @@
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+@@ -1153,10 +1177,10 @@
+ echo ns32k-sni-sysv
+ fi
+ exit ;;
+- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+- # says <Richard.M.Bartel@ccMail.Census.GOV>
+- echo i586-unisys-sysv4
+- exit ;;
++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++ # says <Richard.M.Bartel@ccMail.Census.GOV>
++ echo i586-unisys-sysv4
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes@openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+@@ -1182,11 +1206,11 @@
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+- echo mips-nec-sysv${UNAME_RELEASE}
++ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+- echo mips-unknown-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit ;;
+@@ -1196,6 +1220,12 @@
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
++ echo i586-pc-haiku
++ exit ;;
++ x86_64:Haiku:*:*)
++ echo x86_64-unknown-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1205,6 +1235,15 @@
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
++ SX-7:SUPER-UX:*:*)
++ echo sx7-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8:SUPER-UX:*:*)
++ echo sx8-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8R:SUPER-UX:*:*)
++ echo sx8r-nec-superux${UNAME_RELEASE}
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+@@ -1214,6 +1253,16 @@
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1229,7 +1278,10 @@
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit ;;
+- NSE-?:NONSTOP_KERNEL:*:*)
++ NEO-?:NONSTOP_KERNEL:*:*)
++ echo neo-tandem-nsk${UNAME_RELEASE}
++ exit ;;
++ NSE-*:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1274,13 +1326,13 @@
+ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+- echo mips-sei-seiux${UNAME_RELEASE}
++ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+@@ -1295,11 +1347,14 @@
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
++ i*86:AROS:*:*)
++ echo ${UNAME_MACHINE}-pc-aros
++ exit ;;
++ x86_64:VMkernel:*:*)
++ echo ${UNAME_MACHINE}-unknown-esx
++ exit ;;
+ esac
+
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1317,11 +1372,11 @@
+ #include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+- "4"
++ "4"
+ #else
+- ""
++ ""
+ #endif
+- ); exit (0);
++ ); exit (0);
+ #endif
+ #endif
+
+@@ -1455,9 +1510,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -urN BUILD/abook-0.6.0pre2/config.h.in abook/config.h.in
+--- BUILD/abook-0.6.0pre2/config.h.in 2006-09-05 10:19:48.000000000 +0200
++++ abook/config.h.in 2013-03-13 15:07:45.000000000 +0100
+@@ -1,12 +1,4 @@
+-/* config.h.in. Generated from configure.in by autoheader. */
+-
+-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+- systems. This function is required for `alloca.c' support on those systems.
+- */
+-#undef CRAY_STACKSEG_END
+-
+-/* Define to 1 if using `alloca.c'. */
+-#undef C_ALLOCA
++/* config.h.in. Generated from configure.ac by autoheader. */
+
+ /* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+@@ -15,19 +7,6 @@
+ /* Handle multibyte characters */
+ #undef HANDLE_MULTIBYTE
+
+-/* Define to 1 if you have `alloca', as a function or macro. */
+-#undef HAVE_ALLOCA
+-
+-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+- */
+-#undef HAVE_ALLOCA_H
+-
+-/* Define to 1 if you have the <argz.h> header file. */
+-#undef HAVE_ARGZ_H
+-
+-/* Define to 1 if you have the `asprintf' function. */
+-#undef HAVE_ASPRINTF
+-
+ /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+ #undef HAVE_CFLOCALECOPYCURRENT
+@@ -40,97 +19,31 @@
+ */
+ #undef HAVE_DCGETTEXT
+
+-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+- don't. */
+-#undef HAVE_DECL_FEOF_UNLOCKED
+-
+-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+- you don't. */
+-#undef HAVE_DECL_FGETS_UNLOCKED
+-
+-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+- don't. */
+-#undef HAVE_DECL_GETC_UNLOCKED
+-
+ /* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
+ don't. */
+ #undef HAVE_DECL_WCWIDTH
+
+-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+- don't. */
+-#undef HAVE_DECL__SNPRINTF
+-
+-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+- don't. */
+-#undef HAVE_DECL__SNWPRINTF
+-
+-/* Define to 1 if you have the `fwprintf' function. */
+-#undef HAVE_FWPRINTF
+-
+-/* Define to 1 if you have the `getcwd' function. */
+-#undef HAVE_GETCWD
+-
+-/* Define to 1 if you have the `getegid' function. */
+-#undef HAVE_GETEGID
+-
+-/* Define to 1 if you have the `geteuid' function. */
+-#undef HAVE_GETEUID
+-
+-/* Define to 1 if you have the `getgid' function. */
+-#undef HAVE_GETGID
+-
+-/* Define to 1 if you have the `getpagesize' function. */
+-#undef HAVE_GETPAGESIZE
+-
+ /* Define if the GNU gettext() function is already present or preinstalled. */
+ #undef HAVE_GETTEXT
+
+-/* Define to 1 if you have the `getuid' function. */
+-#undef HAVE_GETUID
+-
+ /* Define to 1 if you have the <history.h> header file. */
+ #undef HAVE_HISTORY_H
+
+-/* Define if you have the iconv() function. */
++/* Define if you have the iconv() function and it works. */
+ #undef HAVE_ICONV
+
+ /* Define to 1 if you have the <iconv.h> header file. */
+ #undef HAVE_ICONV_H
+
+-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+-#undef HAVE_INTMAX_T
+-
+-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
++/* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+- declares uintmax_t. */
+-#undef HAVE_INTTYPES_H_WITH_UINTMAX
+-
+-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+-#undef HAVE_LANGINFO_CODESET
+-
+-/* Define if your <locale.h> file defines LC_MESSAGES. */
+-#undef HAVE_LC_MESSAGES
+-
+ /* Define if you have a readline compatible library */
+ #undef HAVE_LIBREADLINE
+
+-/* Define to 1 if you have the <limits.h> header file. */
+-#undef HAVE_LIMITS_H
+-
+ /* Define to 1 if you have the <locale.h> header file. */
+ #undef HAVE_LOCALE_H
+
+-/* Define if you have the 'long double' type. */
+-#undef HAVE_LONG_DOUBLE
+-
+-/* Define if you have the 'long long' type. */
+-#undef HAVE_LONG_LONG
+-
+-/* Define to 1 if you have the <malloc.h> header file. */
+-#undef HAVE_MALLOC_H
+-
+ /* Define to 1 if you have the `mbrtowc' function. */
+ #undef HAVE_MBRTOWC
+
+@@ -143,27 +56,9 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
+-/* Define to 1 if you have the `mempcpy' function. */
+-#undef HAVE_MEMPCPY
+-
+-/* Define to 1 if you have a working `mmap' system call. */
+-#undef HAVE_MMAP
+-
+-/* Define to 1 if you have the `munmap' function. */
+-#undef HAVE_MUNMAP
+-
+ /* Define to 1 if you have the <ncurses.h> header file. */
+ #undef HAVE_NCURSES_H
+
+-/* Define to 1 if you have the <nl_types.h> header file. */
+-#undef HAVE_NL_TYPES_H
+-
+-/* Define if your printf() function supports format strings with positions. */
+-#undef HAVE_POSIX_PRINTF
+-
+-/* Define to 1 if you have the `putenv' function. */
+-#undef HAVE_PUTENV
+-
+ /* Define to 1 if you have the <readline.h> header file. */
+ #undef HAVE_READLINE_H
+
+@@ -179,9 +74,6 @@
+ /* Define to 1 if you have the `resizeterm' function. */
+ #undef HAVE_RESIZETERM
+
+-/* Define to 1 if you have the `setenv' function. */
+-#undef HAVE_SETENV
+-
+ /* Define to 1 if you have the `setlocale' function. */
+ #undef HAVE_SETLOCALE
+
+@@ -191,64 +83,39 @@
+ /* Define if you have the <stdarg.h> header file. */
+ #undef HAVE_STDARG_H
+
+-/* Define to 1 if you have the <stddef.h> header file. */
+-#undef HAVE_STDDEF_H
+-
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+
+-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+- uintmax_t. */
+-#undef HAVE_STDINT_H_WITH_UINTMAX
+-
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+
+-/* Define to 1 if you have the `stpcpy' function. */
+-#undef HAVE_STPCPY
+-
+-/* Define to 1 if you have the `strcasecmp' function. */
+-#undef HAVE_STRCASECMP
++/* Define to 1 if you have the `strcasestr' function. */
++#undef HAVE_STRCASESTR
+
+ /* Define to 1 if you have the `strcoll' function and it is properly defined.
+ */
+ #undef HAVE_STRCOLL
+
+-/* Define to 1 if you have the `strdup' function. */
+-#undef HAVE_STRDUP
+-
+ /* Define to 1 if you have the <strings.h> header file. */
+ #undef HAVE_STRINGS_H
+
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+
+-/* Define to 1 if you have the `strtoul' function. */
+-#undef HAVE_STRTOUL
+-
+ /* Define to 1 if you have the <sys/ioctl.h> header file. */
+ #undef HAVE_SYS_IOCTL_H
+
+-/* Define to 1 if you have the <sys/param.h> header file. */
+-#undef HAVE_SYS_PARAM_H
+-
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+
+-/* Define to 1 if you have the `tsearch' function. */
+-#undef HAVE_TSEARCH
+-
+-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
+-#undef HAVE_UINTMAX_T
+-
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
+-/* Define if you have the 'unsigned long long' type. */
+-#undef HAVE_UNSIGNED_LONG_LONG
++/* Defined if the vformat library is available */
++#undef HAVE_VFORMAT
+
+ /* Define to 1 if you have the `vsnprintf' function. */
+ #undef HAVE_VSNPRINTF
+@@ -256,36 +123,9 @@
+ /* Define if you have the <wchar.h> header file. */
+ #undef HAVE_WCHAR_H
+
+-/* Define if you have the 'wchar_t' type. */
+-#undef HAVE_WCHAR_T
+-
+-/* Define to 1 if you have the `wcslen' function. */
+-#undef HAVE_WCSLEN
+-
+ /* Define to 1 if you have the `wcwidth' function. */
+ #undef HAVE_WCWIDTH
+
+-/* Define if you have the 'wint_t' type. */
+-#undef HAVE_WINT_T
+-
+-/* Define to 1 if you have the `__argz_count' function. */
+-#undef HAVE___ARGZ_COUNT
+-
+-/* Define to 1 if you have the `__argz_next' function. */
+-#undef HAVE___ARGZ_NEXT
+-
+-/* Define to 1 if you have the `__argz_stringify' function. */
+-#undef HAVE___ARGZ_STRINGIFY
+-
+-/* Define to 1 if you have the `__fsetlocking' function. */
+-#undef HAVE___FSETLOCKING
+-
+-/* Define as const if the declaration of iconv() needs const. */
+-#undef ICONV_CONST
+-
+-/* Define if integer division by zero raises signal SIGFPE. */
+-#undef INTDIV0_RAISES_SIGFPE
+-
+ /* locale directory */
+ #undef LOCALEDIR
+
+@@ -304,58 +144,58 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+-#undef PRI_MACROS_BROKEN
+-
+ /* Define to 1 if the C compiler supports function prototypes. */
+ #undef PROTOTYPES
+
+-/* Define as the maximum value of type 'size_t', if the system doesn't define
+- it. */
+-#undef SIZE_MAX
+-
+-/* If using the C implementation of alloca, define if you know the
+- direction of stack growth for your system; otherwise it will be
+- automatically deduced at run-time.
+- STACK_DIRECTION > 0 => grows toward higher addresses
+- STACK_DIRECTION < 0 => grows toward lower addresses
+- STACK_DIRECTION = 0 => direction of growth unknown */
+-#undef STACK_DIRECTION
+-
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+
++/* Enable extensions on AIX 3, Interix. */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them. */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++/* Enable threading extensions on Solaris. */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop. */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris. */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
+ /* Version number of package */
+ #undef VERSION
+
++/* Define to 1 if on MINIX. */
++#undef _MINIX
++
++/* Define to 2 if the system does not provide POSIX.1 features except with
++ this defined. */
++#undef _POSIX_1_SOURCE
++
++/* Define to 1 if you need to in order for `stat' and other things to work. */
++#undef _POSIX_SOURCE
++
+ /* Define like PROTOTYPES; this can be used by system headers. */
+ #undef __PROTOTYPES
+
+-/* Define to empty if `const' does not conform to ANSI C. */
+-#undef const
+-
+ /* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+ #ifndef __cplusplus
+ #undef inline
+ #endif
+-
+-/* Define to `long' if <sys/types.h> does not define. */
+-#undef off_t
+-
+-/* Define as the type of the result of subtracting two pointers, if the system
+- doesn't define it. */
+-#undef ptrdiff_t
+-
+-/* Define to empty if the C compiler doesn't support this keyword. */
+-#undef signed
+-
+-/* Define to `unsigned' if <sys/types.h> does not define. */
+-#undef size_t
+-
+-/* Define to unsigned long or unsigned long long if <stdint.h> and
+- <inttypes.h> don't define. */
+-#undef uintmax_t
+diff -urN BUILD/abook-0.6.0pre2/config.rpath abook/config.rpath
+--- BUILD/abook-0.6.0pre2/config.rpath 2005-09-17 12:10:25.000000000 +0200
++++ abook/config.rpath 2013-03-13 15:07:45.000000000 +0100
+@@ -2,7 +2,7 @@
+ # Output a system dependent set of variables, describing how to set the
+ # run time search path of shared libraries in an executable.
+ #
+-# Copyright 1996-2005 Free Software Foundation, Inc.
++# Copyright 1996-2010 Free Software Foundation, Inc.
+ # Taken from GNU libtool, 2001
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -25,7 +25,7 @@
+ # known workaround is to choose shorter directory names for the build
+ # directory and/or the installation directory.
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ shrext=.so
+@@ -35,9 +35,19 @@
+ host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
++# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
++for cc_temp in $CC""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
++
++# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+ wl=
+ if test "$GCC" = yes; then
+@@ -48,13 +58,13 @@
+ wl='-Wl,'
+ ;;
+ darwin*)
+- case "$cc_basename" in
++ case $cc_basename in
+ xlc*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -64,9 +74,15 @@
+ ;;
+ newsos6)
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- icc* | ecc*)
++ ecc*)
++ wl='-Wl,'
++ ;;
++ icc* | ifort*)
++ wl='-Wl,'
++ ;;
++ lf95*)
+ wl='-Wl,'
+ ;;
+ pgcc | pgf77 | pgf90)
+@@ -78,12 +94,19 @@
+ como)
+ wl='-lopt='
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ wl='-Wl,'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ osf3* | osf4* | osf5*)
+ wl='-Wl,'
+ ;;
+- sco3.2v5*)
++ rdos*)
+ ;;
+ solaris*)
+ wl='-Wl,'
+@@ -91,11 +114,14 @@
+ sunos4*)
+ wl='-Qoption ld '
+ ;;
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ wl='-Wl,'
+ ;;
+ sysv4*MP*)
+ ;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ wl='-Wl,'
++ ;;
+ unicos*)
+ wl='-Wl,'
+ ;;
+@@ -104,7 +130,7 @@
+ esac
+ fi
+
+-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
++# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_separator=
+@@ -112,7 +138,7 @@
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -120,6 +146,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -127,8 +157,14 @@
+
+ ld_shlibs=yes
+ if test "$with_gnu_ld" = yes; then
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ # Unlike libtool, we use -rpath here, not --rpath, since the documented
++ # option of GNU ld is called -rpath, not --rpath.
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ case "$host_os" in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -152,7 +188,7 @@
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -162,9 +198,20 @@
+ ld_shlibs=no
+ fi
+ ;;
++ interix[3-9]*)
++ hardcode_direct=no
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ gnu* | linux* | k*bsd*-gnu)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ :
++ else
++ ld_shlibs=no
++ fi
++ ;;
+ netbsd*)
+ ;;
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+@@ -173,16 +220,23 @@
+ ld_shlibs=no
+ fi
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs=no
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ else
++ ld_shlibs=no
++ fi
++ ;;
++ esac
++ ;;
+ sunos4*)
+ hardcode_direct=yes
+ ;;
+- linux*)
+- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- :
+- else
+- ld_shlibs=no
+- fi
+- ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+@@ -191,10 +245,8 @@
+ fi
+ ;;
+ esac
+- if test "$ld_shlibs" = yes; then
+- # Unlike libtool, we use -rpath here, not --rpath, since the documented
+- # option of GNU ld is called -rpath, not --rpath.
+- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ if test "$ld_shlibs" = no; then
++ hardcode_libdir_flag_spec=
+ fi
+ else
+ case "$host_os" in
+@@ -208,7 +260,7 @@
+ hardcode_direct=unsupported
+ fi
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -218,13 +270,14 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
++ ;;
+ esac
+ fi
+ hardcode_direct=yes
+@@ -236,7 +289,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+@@ -244,6 +297,7 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
++ ;;
+ esac
+ fi
+ # Begin _LT_AC_SYS_LIBPATH_AIX.
+@@ -278,7 +332,7 @@
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -291,7 +345,7 @@
+ if test "$GCC" = yes ; then
+ :
+ else
+- case "$cc_basename" in
++ case $cc_basename in
+ xlc*)
+ ;;
+ *)
+@@ -314,7 +368,7 @@
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+- freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+@@ -326,24 +380,25 @@
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+- hpux10* | hpux11*)
++ hpux10*)
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+- hardcode_direct=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++ hardcode_direct=yes
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L=yes
++ fi
++ ;;
++ hpux11*)
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++ case $host_cpu in
++ hppa*64*|ia64*)
+ hardcode_direct=no
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- hardcode_minus_L=yes
+ ;;
+ *)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -366,18 +421,22 @@
+ hardcode_libdir_separator=:
+ ;;
+ openbsd*)
+- hardcode_direct=yes
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct=yes
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ else
++ case "$host_os" in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case "$host_os" in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- hardcode_libdir_flag_spec='-R$libdir'
+- ;;
+- *)
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs=no
+ fi
+ ;;
+ os2*)
+@@ -397,8 +456,6 @@
+ fi
+ hardcode_libdir_separator=:
+ ;;
+- sco3.2v5*)
+- ;;
+ solaris*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+@@ -427,14 +484,11 @@
+ ld_shlibs=yes
+ fi
+ ;;
+- sysv4.2uw2*)
+- hardcode_direct=yes
+- hardcode_minus_L=no
+- ;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ ;;
+- sysv5*)
+- hardcode_libdir_flag_spec=
++ sysv5* | sco3.2v5* | sco5v6*)
++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator=':'
+ ;;
+ uts4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -446,37 +500,55 @@
+ fi
+
+ # Check dynamic linker characteristics
+-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
++# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
++# Unlike libtool.m4, here we don't care about _all_ names of the library, but
++# only about the one the linker finds when passed -lNAME. This is the last
++# element of library_names_spec in libtool.m4, or possibly two of them if the
++# linker has special search rules.
++library_names_spec= # the last element of library_names_spec in libtool.m4
+ libname_spec='lib$name'
+ case "$host_os" in
+ aix3*)
++ library_names_spec='$libname.a'
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
++ library_names_spec='$libname$shrext'
+ ;;
+ amigaos*)
++ library_names_spec='$libname.a'
+ ;;
+ beos*)
++ library_names_spec='$libname$shrext'
+ ;;
+ bsdi[45]*)
++ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ shrext=.dll
++ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+ darwin* | rhapsody*)
+ shrext=.dylib
++ library_names_spec='$libname$shrext'
+ ;;
+ dgux*)
++ library_names_spec='$libname$shrext'
+ ;;
+ freebsd1*)
+ ;;
+- kfreebsd*-gnu)
+- ;;
+- freebsd*)
++ freebsd* | dragonfly*)
++ case "$host_os" in
++ freebsd[123]*)
++ library_names_spec='$libname$shrext$versuffix' ;;
++ *)
++ library_names_spec='$libname$shrext' ;;
++ esac
+ ;;
+ gnu*)
++ library_names_spec='$libname$shrext'
+ ;;
+ hpux9* | hpux10* | hpux11*)
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ shrext=.so
+ ;;
+@@ -487,8 +559,13 @@
+ shrext=.sl
+ ;;
+ esac
++ library_names_spec='$libname$shrext'
++ ;;
++ interix[3-9]*)
++ library_names_spec='$libname$shrext'
+ ;;
+ irix5* | irix6* | nonstopux*)
++ library_names_spec='$libname$shrext'
+ case "$host_os" in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -505,41 +582,59 @@
+ ;;
+ linux*oldld* | linux*aout* | linux*coff*)
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
++ library_names_spec='$libname$shrext'
+ ;;
+ knetbsd*-gnu)
++ library_names_spec='$libname$shrext'
+ ;;
+ netbsd*)
++ library_names_spec='$libname$shrext'
+ ;;
+ newsos6)
++ library_names_spec='$libname$shrext'
+ ;;
+ nto-qnx*)
++ library_names_spec='$libname$shrext'
+ ;;
+ openbsd*)
++ library_names_spec='$libname$shrext$versuffix'
+ ;;
+ os2*)
+ libname_spec='$name'
+ shrext=.dll
++ library_names_spec='$libname.a'
+ ;;
+ osf3* | osf4* | osf5*)
++ library_names_spec='$libname$shrext'
+ ;;
+- sco3.2v5*)
++ rdos*)
+ ;;
+ solaris*)
++ library_names_spec='$libname$shrext'
+ ;;
+ sunos4*)
++ library_names_spec='$libname$shrext$versuffix'
+ ;;
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.3*)
++ library_names_spec='$libname$shrext'
+ ;;
+ sysv4*MP*)
++ library_names_spec='$libname$shrext'
++ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ library_names_spec='$libname$shrext'
+ ;;
+ uts4*)
++ library_names_spec='$libname$shrext'
+ ;;
+ esac
+
+ sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+ shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
++escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+ escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+ LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+@@ -553,6 +648,12 @@
+ # Shared library suffix (normally "so").
+ shlibext="$shlibext"
+
++# Format of library name prefix.
++libname_spec="$escaped_libname_spec"
++
++# Library names that the linker finds when passed -lNAME.
++library_names_spec="$escaped_library_names_spec"
++
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+ hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+diff -urN BUILD/abook-0.6.0pre2/config.sub abook/config.sub
+--- BUILD/abook-0.6.0pre2/config.sub 2006-08-04 22:18:23.000000000 +0200
++++ abook/config.sub 2013-03-13 15:07:45.000000000 +0100
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2006-02-23'
++timestamp='2012-10-10'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -20,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -31,13 +30,16 @@
+
+
+ # Please send patches to <config-patches@gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -71,7 +73,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -119,12 +122,18 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++ knetbsd*-gnu* | netbsd*-gnu* | \
++ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
++ android-linux)
++ os=-linux-android
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+@@ -147,10 +156,13 @@
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze*)
+ os=
+ basic_machine=$1
+ ;;
++ -bluegene*)
++ os=-cnk
++ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+@@ -165,10 +177,10 @@
+ os=-chorusos
+ basic_machine=$1
+ ;;
+- -chorusrdb)
+- os=-chorusrdb
++ -chorusrdb)
++ os=-chorusrdb
+ basic_machine=$1
+- ;;
++ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+@@ -213,6 +225,12 @@
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
++ -lynx*178)
++ os=-lynxos178
++ ;;
++ -lynx*5)
++ os=-lynxos5
++ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+@@ -237,23 +255,32 @@
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
++ | aarch64 | aarch64_be \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+- | d10v | d30v | dlx | dsp16xx \
+- | fr30 | frv \
++ | d10v | d30v | dlx | dsp16xx | dvp \
++ | epiphany \
++ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
++ | le32 | le64 \
++ | lm32 \
++ | m32c | m32r | m32rle | m68000 | m68k | m88k \
++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+- | mips64vr | mips64vrel \
++ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
++ | mips64r5900 | mips64r5900el \
++ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+@@ -266,31 +293,42 @@
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
++ | moxie \
+ | mt \
+ | msp430 \
++ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
+ | ns16k | ns32k \
++ | open8 \
+ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++ | rl78 | rx \
++ | score \
++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+- | sparcv8 | sparcv9 | sparcv9b \
+- | strongarm \
+- | tahoe | thumb | tic4x | tic80 | tron \
+- | v850 | v850e \
++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++ | spu \
++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++ | ubicom32 \
++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | we32k \
+- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | z8k)
++ | x86 | xc16x | xstormy16 | xtensa \
++ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m32c)
+- basic_machine=$basic_machine-unknown
++ c54x)
++ basic_machine=tic54x-unknown
++ ;;
++ c55x)
++ basic_machine=tic55x-unknown
++ ;;
++ c6x)
++ basic_machine=tic6x-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
+- # Motorola 68HC11/12.
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -300,6 +338,21 @@
+ basic_machine=mt-unknown
+ ;;
+
++ strongarm | thumb | xscale)
++ basic_machine=arm-unknown
++ ;;
++ xgate)
++ basic_machine=$basic_machine-unknown
++ os=-none
++ ;;
++ xscaleeb)
++ basic_machine=armeb-unknown
++ ;;
++
++ xscaleel)
++ basic_machine=armel-unknown
++ ;;
++
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+@@ -314,29 +367,37 @@
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
++ | aarch64-* | aarch64_be-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+- | avr-* \
++ | avr-* | avr32-* \
++ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | m32r-* | m32rle-* \
++ | le32-* | le64-* \
++ | lm32-* \
++ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | microblaze-* | microblazeel-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+- | mips64vr-* | mips64vrel-* \
++ | mips64octeon-* | mips64octeonel-* \
+ | mips64orion-* | mips64orionel-* \
++ | mips64r5900-* | mips64r5900el-* \
++ | mips64vr-* | mips64vrel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+@@ -351,29 +412,36 @@
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
++ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
++ | open8-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++ | rl78-* | romp-* | rs6000-* | rx-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+- | tahoe-* | thumb-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile*-* \
+ | tron-* \
+- | v850-* | v850e-* | vax-* \
++ | ubicom32-* \
++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++ | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+- | xstormy16-* | xtensa-* \
++ | x86-* | x86_64-* | xc16x-* | xps100-* \
++ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+- | z8k-*)
++ | z8k-* | z80-*)
+ ;;
+- m32c-*)
++ # Recognize the basic CPU types without company name, with glob match.
++ xtensa*)
++ basic_machine=$basic_machine-unknown
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+@@ -391,7 +459,7 @@
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+- abacus)
++ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+@@ -437,6 +505,10 @@
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
++ aros)
++ basic_machine=i386-pc
++ os=-aros
++ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -445,10 +517,35 @@
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
++ blackfin)
++ basic_machine=bfin-unknown
++ os=-linux
++ ;;
++ blackfin-*)
++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
++ bluegene*)
++ basic_machine=powerpc-ibm
++ os=-cnk
++ ;;
++ c54x-*)
++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c55x-*)
++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c6x-*)
++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
++ cegcc)
++ basic_machine=arm-unknown
++ os=-cegcc
++ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+@@ -477,8 +574,8 @@
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16c)
+- basic_machine=cr16c-unknown
++ cr16 | cr16-*)
++ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+@@ -516,6 +613,10 @@
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ dicos)
++ basic_machine=i686-pc
++ os=-dicos
++ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+@@ -631,7 +732,6 @@
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+@@ -670,6 +770,14 @@
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
++ m68knommu)
++ basic_machine=m68k-unknown
++ os=-linux
++ ;;
++ m68knommu-*)
++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+@@ -681,10 +789,21 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze*)
++ basic_machine=microblaze-xilinx
++ ;;
++ mingw64)
++ basic_machine=x86_64-pc
++ os=-mingw64
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
++ mingw32ce)
++ basic_machine=arm-unknown
++ os=-mingw32ce
++ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+@@ -692,6 +811,24 @@
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
++ mipsEE* | ee | ps2)
++ basic_machine=mips64r5900el-scei
++ case $os in
++ -linux*)
++ ;;
++ *)
++ os=-elf
++ ;;
++ esac
++ ;;
++ iop)
++ basic_machine=mipsel-scei
++ os=-irx
++ ;;
++ dvp)
++ basic_machine=dvp-scei
++ os=-elf
++ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+@@ -713,10 +850,18 @@
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
++ msys)
++ basic_machine=i386-pc
++ os=-msys
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=-nacl
++ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -781,6 +926,12 @@
+ np1)
+ basic_machine=np1-gould
+ ;;
++ neo-tandem)
++ basic_machine=neo-tandem
++ ;;
++ nse-tandem)
++ basic_machine=nse-tandem
++ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+@@ -811,6 +962,14 @@
+ basic_machine=i860-intel
+ os=-osf
+ ;;
++ parisc)
++ basic_machine=hppa-unknown
++ os=-linux
++ ;;
++ parisc-*)
++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+@@ -855,9 +1014,10 @@
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+- ppc) basic_machine=powerpc-unknown
++ ppc | ppcbe) basic_machine=powerpc-unknown
+ ;;
+- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ppc-* | ppcbe-*)
++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+@@ -912,6 +1072,10 @@
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
++ sde)
++ basic_machine=mipsisa32-sde
++ os=-elf
++ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+@@ -923,6 +1087,9 @@
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
++ sh5el)
++ basic_machine=sh5le-unknown
++ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+@@ -944,6 +1111,9 @@
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
++ strongarm-* | thumb-*)
++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+@@ -1000,17 +1170,9 @@
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+- tic54x | c54x*)
+- basic_machine=tic54x-unknown
+- os=-coff
+- ;;
+- tic55x | c55x*)
+- basic_machine=tic55x-unknown
+- os=-coff
+- ;;
+- tic6x | c6x*)
+- basic_machine=tic6x-unknown
+- os=-coff
++ tile*)
++ basic_machine=$basic_machine-unknown
++ os=-linux-gnu
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+@@ -1079,6 +1241,9 @@
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
++ xscale-* | xscalee[bl]-*)
++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+@@ -1087,6 +1252,10 @@
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
++ z80-*-coff)
++ basic_machine=z80-unknown
++ os=-sim
++ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+@@ -1125,10 +1294,10 @@
+ we32k)
+ basic_machine=we32k-att
+ ;;
+- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+- sparc | sparcv8 | sparcv9 | sparcv9b)
++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+@@ -1172,9 +1341,12 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+- # First match some system type aliases
+- # that might get confused with valid system types.
++ # First match some system type aliases
++ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1195,29 +1367,31 @@
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+- | -aos* \
++ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+- | -openbsd* | -solidbsd* \
++ | -bitrig* | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -chorusos* | -chorusrdb* | -cegcc* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1256,7 +1430,7 @@
+ -opened*)
+ os=-openedition
+ ;;
+- -os400*)
++ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+@@ -1305,7 +1479,7 @@
+ -sinix*)
+ os=-sysv4
+ ;;
+- -tpf*)
++ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+@@ -1347,6 +1521,11 @@
+ -zvmoe)
+ os=-zvmoe
+ ;;
++ -dicos*)
++ os=-dicos
++ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1369,6 +1548,12 @@
+ # system, and we'll never get to this point.
+
+ case $basic_machine in
++ score-*)
++ os=-elf
++ ;;
++ spu-*)
++ os=-elf
++ ;;
+ *-acorn)
+ os=-riscix1.2
+ ;;
+@@ -1378,9 +1563,21 @@
+ arm*-semi)
+ os=-aout
+ ;;
+- c4x-* | tic4x-*)
+- os=-coff
+- ;;
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
++ hexagon-*)
++ os=-elf
++ ;;
++ tic54x-*)
++ os=-coff
++ ;;
++ tic55x-*)
++ os=-coff
++ ;;
++ tic6x-*)
++ os=-coff
++ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+@@ -1399,13 +1596,13 @@
+ ;;
+ m68000-sun)
+ os=-sunos3
+- # This also exists in the configure program, but was not the
+- # default.
+- # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
++ mep-*)
++ os=-elf
++ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+@@ -1430,7 +1627,7 @@
+ *-ibm)
+ os=-aix
+ ;;
+- *-knuth)
++ *-knuth)
+ os=-mmixware
+ ;;
+ *-wec)
+@@ -1535,7 +1732,7 @@
+ -sunos*)
+ vendor=sun
+ ;;
+- -aix*)
++ -cnk*|-aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+diff -urN BUILD/abook-0.6.0pre2/configure abook/configure
+--- BUILD/abook-0.6.0pre2/configure 2006-09-05 10:19:36.000000000 +0200
++++ abook/configure 2013-03-13 15:07:45.000000000 +0100
+@@ -1,81 +1,459 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.69.
++#
++#
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
++#
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## --------------------- ##
+-## M4sh Initialization. ##
+-## --------------------- ##
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
++esac
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- as_unset=unset
+-else
+- as_unset=false
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='print -r --'
++ as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='printf %s\n'
++ as_echo_n='printf %s'
++else
++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++ as_echo_n='/usr/ucb/echo -n'
++ else
++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++ as_echo_n_body='eval
++ arg=$1;
++ case $arg in #(
++ *"$as_nl"*)
++ expr "X$arg" : "X\\(.*\\)$as_nl";
++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++ esac;
++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++ '
++ export as_echo_n_body
++ as_echo_n='sh -c $as_echo_n_body as_echo'
++ fi
++ export as_echo_body
++ as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ PATH_SEPARATOR=:
++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++ PATH_SEPARATOR=';'
++ }
+ fi
+
+
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++as_myself=
++case $0 in #((
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ exit 1
++fi
++
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there. '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-for as_var in \
+- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+- LC_TELEPHONE LC_TIME
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# Use a proper internal environment variable to ensure we don't fall
++ # into an infinite loop, continuously re-executing ourselves.
++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++ _as_can_reexec=no; export _as_can_reexec;
++ # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++ fi
++ # We don't want this to propagate to other subprocesses.
++ { _as_can_reexec=; unset _as_can_reexec;}
++if test "x$CONFIG_SHELL" = x; then
++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++ emulate sh
++ NULLCMD=:
++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
++esac
++fi
++"
++ as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
++
++exitcode=0
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++ exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++ if (eval "$as_required") 2>/dev/null; then :
++ as_have_required=yes
++else
++ as_have_required=no
++fi
++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
++
++else
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+- eval $as_var=C; export $as_var
+- else
+- $as_unset $as_var
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ as_found=:
++ case $as_dir in #(
++ /*)
++ for as_base in sh bash ksh sh5; do
++ # Try only shells that exist, to save several forks.
++ as_shell=$as_dir/$as_base
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++ CONFIG_SHELL=$as_shell as_have_required=yes
++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++ break 2
++fi
++fi
++ done;;
++ esac
++ as_found=false
++done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++ CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
++IFS=$as_save_IFS
++
++
++ if test "x$CONFIG_SHELL" != x; then :
++ export CONFIG_SHELL
++ # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
++fi
++
++ if test x$as_have_required = xno; then :
++ $as_echo "$0: This script requires a shell more modern than all"
++ $as_echo "$0: the shells that I found on your system."
++ if test x${ZSH_VERSION+set} = xset ; then
++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
++ else
++ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
++$0: including any error possibly output before this
++$0: message. Then install a modern shell, or manually run
++$0: the script under such a shell if you do have one."
+ fi
+-done
++ exit 1
++fi
++fi
++fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
++
++## --------------------- ##
++## M4sh Shell Functions. ##
++## --------------------- ##
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++ { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++ return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++ set +e
++ as_fn_set_status $1
++ exit $1
++} # as_fn_exit
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || eval $as_mkdir_p || {
++ as_dirs=
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$as_dir" : 'X\(//\)[^/]' \| \
++ X"$as_dir" : 'X\(//\)$' \| \
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
++ done
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++ eval 'as_fn_append ()
++ {
++ eval $1+=\$2
++ }'
++else
++ as_fn_append ()
++ {
++ eval $1=\$$1\$2
++ }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++ eval 'as_fn_arith ()
++ {
++ as_val=$(( $* ))
++ }'
++else
++ as_fn_arith ()
++ {
++ as_val=`expr "$@" || test $? -eq 1`
++ }
++fi # as_fn_arith
++
+
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with STATUS, using 1 if that was 0.
++as_fn_error ()
++{
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ fi
++ $as_echo "$as_me: error: $2" >&2
++ as_fn_exit $as_status
++} # as_fn_error
++
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+ fi
+
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
+
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+-
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -83,146 +461,91 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
+-fi
+-
+-
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+-
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
+
+- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+- # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
+- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
++ as_lineno_1=$LINENO as_lineno_1a=$LINENO
++ as_lineno_2=$LINENO as_lineno_2a=$LINENO
++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
+ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
+ N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
++ s/-\n.*//
+ ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
+- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+- { (exit 1); exit 1; }; }
++ chmod +x "$as_me.lineno" ||
++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++ # already done that, so ensure we don't try to do so again and fall
++ # in an infinite loop. This has already happened in practice.
++ _as_can_reexec=no; export _as_can_reexec
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+ }
+
+-
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in #(((((
++-n*)
++ case `echo 'xy\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ xy) ECHO_C='\c';;
++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
++ ECHO_T=' ';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+- as_expr=expr
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
+ else
+- as_expr=false
++ rm -f conf$$.dir
++ mkdir conf$$.dir 2>/dev/null
+ fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
+- as_ln_s='cp -p'
+- else
++if (echo >conf$$.file) 2>/dev/null; then
++ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -pR'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++ as_ln_s='cp -pR'
++ elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
++ else
++ as_ln_s='cp -pR'
+ fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+- as_mkdir_p=:
++ as_mkdir_p='mkdir -p "$as_dir"'
+ else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,38 +554,25 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete. It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -270,51 +580,193 @@
+ PACKAGE_VERSION=
+ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
++PACKAGE_URL=
+
+ ac_unique_file="abook.c"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-# include <stdint.h>
+-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+
+-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'
++gt_needs=
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
++LIBOBJS
++ENABLE_VFORMAT_SUPPORT_FALSE
++ENABLE_VFORMAT_SUPPORT_TRUE
++ANSI2KNR
++U
++USE_INCLUDED_INTL_H_FALSE
++USE_INCLUDED_INTL_H_TRUE
++POSUB
++LTLIBINTL
++LIBINTL
++INTLLIBS
++LTLIBICONV
++LIBICONV
++INTL_MACOSX_LIBS
++host_os
++host_vendor
++host_cpu
++host
++build_os
++build_vendor
++build_cpu
++build
++XGETTEXT_EXTRA_OPTIONS
++MSGMERGE
++XGETTEXT_015
++XGETTEXT
++GMSGFMT_015
++MSGFMT_015
++GMSGFMT
++MSGFMT
++GETTEXT_MACRO_VERSION
++USE_NLS
++EGREP
++GREP
++CPP
++am__fastdepCC_FALSE
++am__fastdepCC_TRUE
++CCDEPMODE
++am__nodep
++AMDEPBACKSLASH
++AMDEP_FALSE
++AMDEP_TRUE
++am__quote
++am__include
++DEPDIR
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++am__untar
++am__tar
++AMTAR
++am__leading_dot
++SET_MAKE
++AWK
++mkdir_p
++MKDIR_P
++INSTALL_STRIP_PROGRAM
++STRIP
++install_sh
++MAKEINFO
++AUTOHEADER
++AUTOMAKE
++AUTOCONF
++ACLOCAL
++VERSION
++PACKAGE
++CYGPATH_W
++am__isrc
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_URL
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++enable_dependency_tracking
++enable_nls
++with_gnu_ld
++enable_rpath
++with_libiconv_prefix
++with_libintl_prefix
++with_localedir
++with_curses
++with_readline
++enable_vformat
++enable_debug
++'
++ ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++LIBS
++CPPFLAGS
++CPP'
++
+
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -337,34 +789,49 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+- eval "$ac_prev=\$ac_option"
++ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++ case $ac_option in
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
++ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+- case $ac_option in
++ case $ac_dashdash$ac_option in
++ --)
++ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+@@ -386,33 +853,59 @@
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+- | --da=*)
++ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++ | --dataroo | --dataro | --datar)
++ ac_prev=datarootdir ;;
++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++ datarootdir=$ac_optarg ;;
++
+ -disable-* | --disable-*)
+- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+- { (exit 1); exit 1; }; }
+- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- eval "enable_$ac_feature=no" ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid feature name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"enable_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
++ esac
++ eval enable_$ac_useropt=no ;;
++
++ -docdir | --docdir | --docdi | --doc | --do)
++ ac_prev=docdir ;;
++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++ docdir=$ac_optarg ;;
++
++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++ ac_prev=dvidir ;;
++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+- { (exit 1); exit 1; }; }
+- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid feature name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"enable_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
+ esac
+- eval "enable_$ac_feature='$ac_optarg'" ;;
++ eval enable_$ac_useropt=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -439,6 +932,12 @@
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++ ac_prev=htmldir ;;
++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++ | --ht=*)
++ htmldir=$ac_optarg ;;
++
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+@@ -463,13 +962,16 @@
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
++ -localedir | --localedir | --localedi | --localed | --locale)
++ ac_prev=localedir ;;
++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++ localedir=$ac_optarg ;;
++
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+- | --localstate | --localstat | --localsta | --localst \
+- | --locals | --local | --loca | --loc | --lo)
++ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -534,6 +1036,16 @@
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++ ac_prev=pdfdir ;;
++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++ pdfdir=$ac_optarg ;;
++
++ -psdir | --psdir | --psdi | --psd | --ps)
++ ac_prev=psdir ;;
++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++ psdir=$ac_optarg ;;
++
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+@@ -584,26 +1096,36 @@
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid package name: $ac_package" >&2
+- { (exit 1); exit 1; }; }
+- ac_package=`echo $ac_package| sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid package name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"with_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
+ esac
+- eval "with_$ac_package='$ac_optarg'" ;;
++ eval with_$ac_useropt=\$ac_optarg ;;
+
+ -without-* | --without-*)
+- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid package name: $ac_package" >&2
+- { (exit 1); exit 1; }; }
+- ac_package=`echo $ac_package | sed 's/-/_/g'`
+- eval "with_$ac_package=no" ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid package name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"with_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
++ esac
++ eval with_$ac_useropt=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -623,27 +1145,26 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) { echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2
+- { (exit 1); exit 1; }; }
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+- { (exit 1); exit 1; }; }
+- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+- eval "$ac_envvar='$ac_optarg'"
++ case $ac_envvar in #(
++ '' | [0-9]* | *[!_$as_cr_alnum]* )
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
++ esac
++ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+@@ -651,31 +1172,36 @@
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- { echo "$as_me: error: missing argument to $ac_option" >&2
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "missing argument to $ac_option"
+ fi
+
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+- eval ac_val=$`echo $ac_var`
+- case $ac_val in
+- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
++if test -n "$ac_unrecognized_opts"; then
++ case $enable_option_checking in
++ no) ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+-done
++fi
+
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+- localstatedir libdir includedir oldincludedir infodir mandir
++# Check all directory arguments for consistency.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
+- eval ac_val=$`echo $ac_var`
++ eval ac_val=\$$ac_var
++ # Remove trailing slashes.
++ case $ac_val in
++ */ )
++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++ eval $ac_var=\$ac_val;;
++ esac
++ # Be sure to have absolute directory names.
+ case $ac_val in
+- [\\/$]* | ?:[\\/]* ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
++ [\\/$]* | ?:[\\/]* ) continue;;
++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -689,8 +1215,6 @@
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -702,74 +1226,72 @@
+ test "$silent" = yes && exec 6>/dev/null
+
+
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++ as_fn_error $? "working directory cannot be determined"
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++ as_fn_error $? "pwd does not report name of working directory"
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+- # Try the directory containing this script, then its parent.
+- ac_confdir=`(dirname "$0") 2>/dev/null ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$0" : 'X\(//\)[^/]' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$0" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ # Try the directory containing this script, then the parent directory.
++ ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$as_myself" : 'X\(//\)[^/]' \| \
++ X"$as_myself" : 'X\(//\)$' \| \
++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ srcdir=$ac_confdir
+- if test ! -r $srcdir/$ac_unique_file; then
++ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+ else
+ ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+- if test "$ac_srcdir_defaulted" = yes; then
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+- { (exit 1); exit 1; }; }
+- else
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+- { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
++if test ! -r "$srcdir/$ac_unique_file"; then
++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
++ pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++ srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++ eval ac_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_env_${ac_var}_value=\$${ac_var}
++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+
+ #
+ # Report the --help message.
+@@ -792,20 +1314,17 @@
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+-_ACEOF
+-
+- cat <<_ACEOF
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+- [$ac_default_prefix]
++ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+- [PREFIX]
++ [PREFIX]
+
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+@@ -815,18 +1334,25 @@
+ For better control, use the options below.
+
+ Fine tuning of the installation directories:
+- --bindir=DIR user executables [EPREFIX/bin]
+- --sbindir=DIR system admin executables [EPREFIX/sbin]
+- --libexecdir=DIR program executables [EPREFIX/libexec]
+- --datadir=DIR read-only architecture-independent data [PREFIX/share]
+- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+- --libdir=DIR object code libraries [EPREFIX/lib]
+- --includedir=DIR C header files [PREFIX/include]
+- --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --infodir=DIR info documentation [PREFIX/info]
+- --mandir=DIR man documentation [PREFIX/man]
++ --bindir=DIR user executables [EPREFIX/bin]
++ --sbindir=DIR system admin executables [EPREFIX/sbin]
++ --libexecdir=DIR program executables [EPREFIX/libexec]
++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
++ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --libdir=DIR object code libraries [EPREFIX/lib]
++ --includedir=DIR C header files [PREFIX/include]
++ --oldincludedir=DIR C header files for non-gcc [/usr/include]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+@@ -847,12 +1373,14 @@
+ cat <<\_ACEOF
+
+ Optional Features:
++ --disable-option-checking ignore unrecognized --enable/--with options
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+- --disable-nls do not use Native Language Support
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
++ --disable-nls do not use Native Language Support
+ --disable-rpath do not hardcode runtime library paths
++ --enable-vformat Use libvformat is available
+ --enable-debug Enable debugging support
+
+ Optional Packages:
+@@ -861,7 +1389,6 @@
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
+- --with-included-gettext use the GNU gettext library included here
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir
+ --with-localedir=PATH Where the locale files are installed
+@@ -873,158 +1400,582 @@
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+- headers in a nonstandard directory <include dir>
++ LIBS libraries to pass to the linker, e.g. -l<library>
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
++ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+
++Report bugs to the package provider.
+ _ACEOF
++ac_status=$?
+ fi
+
+ if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+- ac_popdir=`pwd`
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d $ac_dir || continue
++ test -d "$ac_dir" ||
++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++ continue
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
+- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
+-
+- cd $ac_dir
+- # Check for guested configure; otherwise get Cygnus style configure.
+- if test -f $ac_srcdir/configure.gnu; then
+- echo
+- $SHELL $ac_srcdir/configure.gnu --help=recursive
+- elif test -f $ac_srcdir/configure; then
+- echo
+- $SHELL $ac_srcdir/configure --help=recursive
+- elif test -f $ac_srcdir/configure.ac ||
+- test -f $ac_srcdir/configure.in; then
+- echo
+- $ac_configure --help
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi
+- cd $ac_popdir
++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+ fi
+
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.69
+
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+- exit 0
++ exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+-
+-It was created by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
+-
+- $ $0 $@
+
+-_ACEOF
++## ------------------------ ##
++## Autoconf initialization. ##
++## ------------------------ ##
++
++# ac_fn_c_try_compile LINENO
++# --------------------------
++# Try to compile conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_compile ()
+ {
+-cat <<_ASUNAME
+-## --------- ##
+-## Platform. ##
+-## --------- ##
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ rm -f conftest.$ac_objext
++ if { { ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compile") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ grep -v '^ *+' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ mv -f conftest.er1 conftest.err
++ fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then :
++ ac_retval=0
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
++ ac_retval=1
++fi
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
++} # ac_fn_c_try_compile
+
+-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ if { { ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ grep -v '^ *+' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ mv -f conftest.er1 conftest.err
++ fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } > conftest.i && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then :
++ ac_retval=0
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_retval=1
++fi
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_cpp
++
++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
++# the include files in INCLUDES and setting the cache variable VAR
++# accordingly.
++ac_fn_c_check_header_mongrel ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ if eval \${$3+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if eval \${$3+:} false; then :
++ $as_echo_n "(cached) " >&6
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
++$as_echo_n "checking $2 usability... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_header_compiler=yes
++else
++ ac_header_compiler=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+
+-_ASUNAME
++# Is the header present?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
++$as_echo_n "checking $2 presence... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <$2>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++ ac_header_preproc=yes
++else
++ ac_header_preproc=no
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
+
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- echo "PATH: $as_dir"
+-done
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
++ yes:no: )
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++ ;;
++ no:yes:* )
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++ ;;
++esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if eval \${$3+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ eval "$3=\$ac_header_compiler"
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++fi
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++
++} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ if { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then :
++ ac_retval=0
++else
++ $as_echo "$as_me: program exited with status $ac_status" >&5
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_retval=$ac_status
++fi
++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_run
++
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if eval \${$3+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "$3=yes"
++else
++ eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++
++} # ac_fn_c_check_header_compile
++
++# ac_fn_c_try_link LINENO
++# -----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_link ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ rm -f conftest.$ac_objext conftest$ac_exeext
++ if { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ grep -v '^ *+' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ mv -f conftest.er1 conftest.err
++ fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext && {
++ test "$cross_compiling" = yes ||
++ test -x conftest$ac_exeext
++ }; then :
++ ac_retval=0
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_retval=1
++fi
++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
++ # interfere with the next link command; also delete a directory that is
++ # left behind by Apple's compiler. We do this before executing the actions.
++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_link
++
++# ac_fn_c_check_func LINENO FUNC VAR
++# ----------------------------------
++# Tests whether FUNC exists, setting the cache variable VAR accordingly
++ac_fn_c_check_func ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if eval \${$3+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $2 innocuous_$2
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $2 (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $2
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $2 ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$2 || defined __stub___$2
++choke me
++#endif
++
++int
++main ()
++{
++return $2 ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ eval "$3=yes"
++else
++ eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++
++} # ac_fn_c_check_func
++
++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
++# ---------------------------------------------
++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
++# accordingly.
++ac_fn_c_check_decl ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ as_decl_name=`echo $2|sed 's/ *(.*//'`
++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
++$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
++if eval \${$3+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$4
++int
++main ()
++{
++#ifndef $as_decl_name
++#ifdef __cplusplus
++ (void) $as_decl_use;
++#else
++ (void) $as_decl_name;
++#endif
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "$3=yes"
++else
++ eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++
++} # ac_fn_c_check_decl
++
++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
++# -------------------------------------------
++# Tests whether TYPE exists after having included INCLUDES, setting cache
++# variable VAR accordingly.
++ac_fn_c_check_type ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if eval \${$3+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ eval "$3=no"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$4
++int
++main ()
++{
++if (sizeof ($2))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$4
++int
++main ()
++{
++if (sizeof (($2)))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++else
++ eval "$3=yes"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++
++} # ac_fn_c_check_type
++cat >config.log <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by $as_me, which was
++generated by GNU Autoconf 2.69. Invocation command line was
++
++ $ $0 $@
++
++_ACEOF
++exec 5>>config.log
++{
++cat <<_ASUNAME
++## --------- ##
++## Platform. ##
++## --------- ##
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
++
++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ $as_echo "PATH: $as_dir"
++ done
++IFS=$as_save_IFS
+
+ } >&5
+
+@@ -1046,7 +1997,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1057,13 +2007,13 @@
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*)
++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+ 2)
+- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++ as_fn_append ac_configure_args1 " '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+@@ -1079,104 +2029,115 @@
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+- # Get rid of the leading space.
+- ac_sep=" "
++ as_fn_append ac_configure_args " '$ac_arg'"
+ ;;
+ esac
+ done
+ done
+-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++{ ac_configure_args0=; unset ac_configure_args0;}
++{ ac_configure_args1=; unset ac_configure_args1;}
+
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log. We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++ *) { eval $ac_var=; unset $ac_var;} ;;
++ esac ;;
++ esac
++ done
+ (set) 2>&1 |
+- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
+ sed -n \
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+- ;;
++ "s/'\''/'\''\\\\'\'''\''/g;
++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++ ;; #(
+ *)
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-}
++ esac |
++ sort
++)
+ echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
++ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
+-_ASBOX
++ $as_echo "## ------------------- ##
++## File substitutions. ##
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ case $ac_val in
++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++ esac
++ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+ echo
+- sed "/^$/d" confdefs.h | sort
++ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+- echo "$as_me: caught signal $ac_signal"
+- echo "$as_me: exit $exit_status"
++ $as_echo "$as_me: caught signal $ac_signal"
++ $as_echo "$as_me: exit $exit_status"
+ } >&5
+- rm -f core *.core &&
+- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++ rm -f core *.core core.conftest.* &&
++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+- ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+ done
+ ac_signal=0
+
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
++
++$as_echo "/* confdefs.h */" > confdefs.h
+
+ # Predefined preprocessor variables.
+
+@@ -1184,112 +2145,138 @@
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION "$PACKAGE_VERSION"
+ _ACEOF
+
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_STRING "$PACKAGE_STRING"
+ _ACEOF
+
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ _ACEOF
+
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_URL "$PACKAGE_URL"
++_ACEOF
++
+
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+- if test "x$prefix" != xNONE; then
+- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+- else
+- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+- fi
+-fi
+-for ac_site_file in $CONFIG_SITE; do
+- if test -r "$ac_site_file"; then
+- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-echo "$as_me: loading site script $ac_site_file" >&6;}
++# Prefer an explicitly selected file to automatically selected ones.
++ac_site_file1=NONE
++ac_site_file2=NONE
++if test -n "$CONFIG_SITE"; then
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
++elif test "x$prefix" != xNONE; then
++ ac_site_file1=$prefix/share/config.site
++ ac_site_file2=$prefix/etc/config.site
++else
++ ac_site_file1=$ac_default_prefix/share/config.site
++ ac_site_file2=$ac_default_prefix/etc/config.site
++fi
++for ac_site_file in "$ac_site_file1" "$ac_site_file2"
++do
++ test "x$ac_site_file" = xNONE && continue
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
++$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
+- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
++$as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+- [\\/]* | ?:[\\/]* ) . $cache_file;;
+- *) . ./$cache_file;;
++ [\\/]* | ?:[\\/]* ) . "$cache_file";;
++ *) . "./$cache_file";;
+ esac
+ fi
+ else
+- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
++$as_echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+
++gt_needs="$gt_needs "
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+- eval ac_new_val="\$ac_env_${ac_var}_value"
++ eval ac_old_val=\$ac_cv_env_${ac_var}_value
++ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+-echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+-echo "$as_me: current value: $ac_new_val" >&2;}
+- ac_cache_corrupted=:
++ # differences in whitespace do not lead to failure.
++ ac_old_val_w=`echo x $ac_old_val`
++ ac_new_val_w=`echo x $ac_new_val`
++ if test "$ac_old_val_w" != "$ac_new_val_w"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++ ac_cache_corrupted=:
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
++ eval $ac_var=\$ac_old_val
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+ esac
+ fi
+ done
+ if $ac_cache_corrupted; then
+- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++fi
++## -------------------- ##
++## Main body of script. ##
++## -------------------- ##
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -1299,47 +2286,36 @@
+
+
+
++am__api_version='1.11'
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-am__api_version="1.9"
+ ac_aux_dir=
+-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+- if test -f $ac_dir/install-sh; then
++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
++ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+- elif test -f $ac_dir/install.sh; then
++ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+- elif test -f $ac_dir/shtool; then
++ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++fi
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
++
+
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+@@ -1354,22 +2330,23 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++# Reject install programs that cannot install multiple files.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
++$as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++if ${ac_cv_path_install+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in
+- ./ | .// | /cC/* | \
++ # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in #((
++ ./ | .// | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -1377,7 +2354,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -1387,30 +2364,43 @@
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
++ rm -rf conftest.one conftest.two conftest.dir
++ echo one > conftest.one
++ echo two > conftest.two
++ mkdir conftest.dir
++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
++ test -s conftest.one && test -s conftest.two &&
++ test -s conftest.dir/conftest.one &&
++ test -s conftest.dir/conftest.two
++ then
++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++ break 3
++ fi
+ fi
+ fi
+ done
+ done
+ ;;
+ esac
+-done
+
++ done
++IFS=$as_save_IFS
++
++rm -rf conftest.one conftest.two conftest.dir
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+- # As a last resort, use the slow shell script. We don't cache a
+- # path for INSTALL within a source directory, because that will
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+- # removed, or if the path is relative.
++ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
++$as_echo "$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1420,21 +2410,34 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
++$as_echo_n "checking whether build environment is sane... " >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name. Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++ *[\\\"\#\$\&\'\`$am_lf]*)
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++esac
++case $srcdir in
++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments. Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
++ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -1444,11 +2447,8 @@
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+-alias in your environment" >&5
+-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+-alias in your environment" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
++alias in your environment" "$LINENO" 5
+ fi
+
+ test "$2" = conftest.file
+@@ -1457,139 +2457,268 @@
+ # Ok.
+ :
+ else
+- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+-Check your system clock" >&5
+-echo "$as_me: error: newly created file is older than distributed files!
+-Check your system clock" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "newly created file is older than distributed files!
++Check your system clock" "$LINENO" 5
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ test "$program_prefix" != NONE &&
+- program_transform_name="s,^,$program_prefix,;$program_transform_name"
++ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+-# Double any \ or $. echo might interpret backslashes.
++ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
++# Double any \ or $.
+ # By default was `s,x,x', remove it if useless.
+-cat <<\_ACEOF >conftest.sed
+-s/[\\$]/&&/g;s/;s,x,x,$//
+-_ACEOF
+-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++ *)
++ MISSING="\${SHELL} $am_aux_dir/missing" ;;
++ esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+ else
+ am_missing_run=
+- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+- else
+- mkdir_p='$(install_sh) -d'
+- fi
++if test x"${install_sh}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
+ fi
+
+-for ac_prog in gawk mawk nawk awk
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AWK+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_STRIP+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$AWK"; then
+- ac_cv_prog_AWK="$AWK" # Let the user override the test.
++ if test -n "$STRIP"; then
++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_AWK="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+-AWK=$ac_cv_prog_AWK
+-if test -n "$AWK"; then
+- echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+- test -n "$AWK" && break
+-done
+
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.make <<\_ACEOF
+-all:
+- @echo 'ac_maketemp="$(MAKE)"'
+-_ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+- eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+- eval ac_cv_prog_make_${ac_make}_set=no
+-fi
+-rm -f conftest.make
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- SET_MAKE=
++if test -z "$ac_cv_prog_STRIP"; then
++ ac_ct_STRIP=$STRIP
++ # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_STRIP"; then
++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_STRIP="strip"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
++else
++ STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
++if test -z "$MKDIR_P"; then
++ if ${ac_cv_path_mkdir+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in mkdir gmkdir; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
++ 'mkdir (GNU coreutils) '* | \
++ 'mkdir (coreutils) '* | \
++ 'mkdir (fileutils) '4.1*)
++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
++ break 3;;
++ esac
++ done
++ done
++ done
++IFS=$as_save_IFS
++
++fi
++
++ test -d ./--version && rmdir ./--version
++ if test "${ac_cv_path_mkdir+set}" = set; then
++ MKDIR_P="$ac_cv_path_mkdir -p"
++ else
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for MKDIR_P within a source directory, because that will
++ # break other packages using the cache if that directory is
++ # removed, or if the value is a relative name.
++ MKDIR_P="$ac_install_sh -d"
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
++$as_echo "$MKDIR_P" >&6; }
++
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++ [\\/$]* | ?:[\\/]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++
++for ac_prog in gawk mawk nawk awk
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_AWK+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$AWK"; then
++ ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_AWK="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$AWK" && break
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
++set x ${MAKE-make}
++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
++all:
++ @echo '@@@%%%=$(MAKE)=@@@%%%'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++ *@@@%%%=?*=@@@%%%*)
++ eval ac_cv_prog_make_${ac_make}_set=yes;;
++ *)
++ eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
++rm -f conftest.make
++fi
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ SET_MAKE=
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+@@ -1602,12 +2731,14 @@
+ fi
+ rmdir .tst 2>/dev/null
+
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+- { (exit 1); exit 1; }; }
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ am__isrc=' -I$(srcdir)'
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ fi
+ fi
+
+ # test whether we have cygpath
+@@ -1650,1448 +2781,910 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
++# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AMTAR='$${TAR-tar}'
+
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
++
++
++
++
++
++ac_config_headers="$ac_config_headers config.h"
++
++
++
++DEPDIR="${am__leading_dot}deps"
++
++ac_config_commands="$ac_config_commands depfiles"
++
++
++am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++ @echo this is the am__doit target
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
++$as_echo_n "checking for style of include used by $am_make... " >&6; }
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
++$as_echo "$_am_result" >&6; }
++rm -f confinc confmf
++
++# Check whether --enable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then :
++ enableval=$enable_dependency_tracking;
++fi
++
++if test "x$enable_dependency_tracking" != xno; then
++ am_depcomp="$ac_aux_dir/depcomp"
++ AMDEPBACKSLASH='\'
++ am__nodep='_no'
++fi
++ if test "x$enable_dependency_tracking" != xno; then
++ AMDEP_TRUE=
++ AMDEP_FALSE='#'
+ else
+- if test -n "$STRIP"; then
+- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++ AMDEP_TRUE='#'
++ AMDEP_FALSE=
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="${ac_tool_prefix}gcc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
++
+ fi
+-if test -z "$ac_cv_prog_STRIP"; then
+- ac_ct_STRIP=$STRIP
+- # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++if test -z "$ac_cv_prog_CC"; then
++ ac_ct_CC=$CC
++ # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$ac_ct_STRIP"; then
+- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_STRIP="strip"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_CC="gcc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ else
+- STRIP="$ac_cv_prog_STRIP"
+-fi
+-
++ CC="$ac_cv_prog_CC"
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+-
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-# Always define AMTAR for backward compatibility.
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+-
+-
+-
+-
+-
+- ac_config_headers="$ac_config_headers config.h"
+-
+
+-
+-
+-
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- case "$ac_aux_dir" in
+- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+- esac
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="${ac_tool_prefix}cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
++done
++ done
++IFS=$as_save_IFS
+
+-
+-
+- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
+- # Check whether --enable-nls or --disable-nls was given.
+-if test "${enable_nls+set}" = set; then
+- enableval="$enable_nls"
+- USE_NLS=$enableval
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+- USE_NLS=yes
+-fi;
+- echo "$as_me:$LINENO: result: $USE_NLS" >&5
+-echo "${ECHO_T}$USE_NLS" >&6
+-
+-
+-
+-
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+ fi
+- rm -f conf$$.sh
+ fi
+-
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- ac_executable_p="test -x"
++if test -z "$CC"; then
++ # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- ac_executable_p="test -f"
+-fi
+-rm -f conf$$.file
+-
+-# Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+- case "$MSGFMT" in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+- ;;
+- *)
+- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$ac_save_IFS"
+- test -z "$ac_dir" && ac_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+- echo "$as_me: trying $ac_dir/$ac_word..." >&5
+- if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+- break 2
+- fi
+- fi
+- done
+- done
+- IFS="$ac_save_IFS"
+- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+- ;;
+-esac
++ ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
++ fi
++ ac_cv_prog_CC="cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# != 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++ fi
+ fi
+-MSGFMT="$ac_cv_path_MSGFMT"
+-if test "$MSGFMT" != ":"; then
+- echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+- # Extract the first word of "gmsgfmt", so it can be a program name with args.
+-set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++
++fi
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in cl.exe
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- case $GMSGFMT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+- ;;
+-esac
+ fi
+-GMSGFMT=$ac_cv_path_GMSGFMT
+-
+-if test -n "$GMSGFMT"; then
+- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
+-
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
++ test -n "$CC" && break
++ done
+ fi
+-
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- ac_executable_p="test -x"
++if test -z "$CC"; then
++ ac_ct_CC=$CC
++ for ac_prog in cl.exe
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- ac_executable_p="test -f"
+-fi
+-rm -f conf$$.file
+-
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+- case "$XGETTEXT" in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+- ;;
+- *)
+- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$ac_save_IFS"
+- test -z "$ac_dir" && ac_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+- echo "$as_me: trying $ac_dir/$ac_word..." >&5
+- if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+- (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
+- ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+- break 2
+- fi
+- fi
+- done
+- done
+- IFS="$ac_save_IFS"
+- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+- ;;
+-esac
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_CC="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
+ fi
+-XGETTEXT="$ac_cv_path_XGETTEXT"
+-if test "$XGETTEXT" != ":"; then
+- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+- rm -f messages.po
+
++ test -n "$ac_ct_CC" && break
++done
+
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
++ if test "x$ac_ct_CC" = x; then
++ CC=""
+ else
+- PATH_SEPARATOR=:
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
+ fi
+- rm -f conf$$.sh
+-fi
+-
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- ac_executable_p="test -x"
+-else
+- ac_executable_p="test -f"
+ fi
+-rm -f conf$$.file
+
+-# Extract the first word of "msgmerge", so it can be a program name with args.
+-set dummy msgmerge; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case "$MSGMERGE" in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+- ;;
+- *)
+- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
+- IFS="$ac_save_IFS"
+- test -z "$ac_dir" && ac_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+- echo "$as_me: trying $ac_dir/$ac_word..." >&5
+- if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+- ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+- break 2
+- fi
+- fi
+- done
+- done
+- IFS="$ac_save_IFS"
+- test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+- ;;
+-esac
+-fi
+-MSGMERGE="$ac_cv_path_MSGMERGE"
+-if test "$MSGMERGE" != ":"; then
+- echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+-echo "${ECHO_T}$MSGMERGE" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ fi
+
+
+- if test "$GMSGFMT" != ":"; then
+- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- : ;
+- else
+- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+- echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
+- GMSGFMT=":"
+- fi
+- fi
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+
+- if test "$XGETTEXT" != ":"; then
+- if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+- (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
+- : ;
+- else
+- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+- XGETTEXT=":"
+- fi
+- rm -f messages.po
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
+ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
+
+- ac_config_commands="$ac_config_commands default-1"
+-
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-DEPDIR="${am__leading_dot}deps"
++int
++main ()
++{
+
+- ac_config_commands="$ac_config_commands depfiles"
+-
+-
+-am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
+-fi
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
++# The possible output files:
++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
+-rm -f confinc confmf
++ac_rmfiles=
++for ac_file in $ac_files
++do
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++ esac
++done
++rm -f $ac_rmfiles
+
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+-if test "${enable_dependency_tracking+set}" = set; then
+- enableval="$enable_dependency_tracking"
++if { { ac_try="$ac_link_default"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link_default") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile. We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files ''
++do
++ test -f "$ac_file" || continue
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
++ ;;
++ [ab].out )
++ # We found the default executable, but exeext='' is most
++ # certainly right.
++ break;;
++ *.* )
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ fi
++ # We set ac_cv_exeext here because the later test for it is not
++ # safe: cross compilers may not add the suffix if given an `-o'
++ # argument, so we may need to know it at that point already.
++ # Even if this section looks crufty: it has the advantage of
++ # actually working.
++ break;;
++ * )
++ break;;
++ esac
++done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+-fi;
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
++else
++ ac_file=''
+ fi
++if test -z "$ac_file"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-
+-if test "x$enable_dependency_tracking" != xno; then
+- AMDEP_TRUE=
+- AMDEP_FALSE='#'
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+- AMDEP_TRUE='#'
+- AMDEP_FALSE=
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
++ac_exeext=$ac_cv_exeext
+
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
++$as_echo_n "checking for suffix of executables... " >&6; }
++if { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
++ # If both `conftest.exe' and `conftest' are `present' (well, observable)
++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++for ac_file in conftest.exe conftest conftest.*; do
++ test -f "$ac_file" || continue
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ break;;
++ * ) break;;
++ esac
++done
++else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5; }
++fi
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
++$as_echo "$ac_cv_exeext" >&6; }
+
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details" "$LINENO" 5; }
++ fi
+ fi
+-done
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
+
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
++$as_echo_n "checking for suffix of object files... " >&6; }
++if ${ac_cv_objext+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="gcc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { { ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compile") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
++ for ac_file in conftest.o conftest.obj conftest.*; do
++ test -f "$ac_file" || continue;
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++ break;;
++ esac
+ done
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
++$as_echo "$ac_cv_objext" >&6; }
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++if ${ac_cv_c_compiler_gnu+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
+-fi
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
+
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_compiler_gnu=yes
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="${ac_tool_prefix}cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
++ ac_compiler_gnu=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++ GCC=yes
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ GCC=
+ fi
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if ${ac_cv_prog_cc_g+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
+ else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-
+-fi
+-if test -z "$CC"; then
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+- ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+- ac_prog_rejected=yes
+- continue
+- fi
+- ac_cv_prog_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-if test $ac_prog_rejected = yes; then
+- # We found a bogon in the path, so make sure we never use it.
+- set dummy $ac_cv_prog_CC
+- shift
+- if test $# != 0; then
+- # We chose a different compiler from the bogus one.
+- # However, it has the same basename, so the bogon will be chosen
+- # first if we set CC to just the basename; use the full file name.
+- shift
+- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+- fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
+ fi
+-done
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- test -n "$CC" && break
+- done
+-fi
+-if test -z "$CC"; then
+- ac_ct_CC=$CC
+- for ac_prog in cl
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
+ fi
+-done
+-done
+-
+-fi
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if ${ac_cv_prog_cc_c89+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- test -n "$ac_ct_CC" && break
+-done
+-
+- CC=$ac_ct_CC
+-fi
+-
+-fi
+-
+-
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++#include <stdio.h>
++struct stat;
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
+
+-# Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
++ function prototypes and stuff, but not '\xHH' hex character constants.
++ These don't provoke an error unfortunately, instead are silently treated
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+ }
+ _ACEOF
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+-# Try to create an executable without -o first, disregard a.out.
+-# It will help us diagnose broken compilers, and finding out an intuition
+-# of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+- (eval $ac_link_default) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- # Find the output, starting from the most likely. This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+- test -f "$ac_file" || continue
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+- ;;
+- conftest.$ac_ext )
+- # This is the source file.
+- ;;
+- [ab].out )
+- # We found the default executable, but exeext='' is most
+- # certainly right.
+- break;;
+- *.* )
+- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- # FIXME: I believe we export ac_cv_exeext for Libtool,
+- # but it would be cool to find out if it's true. Does anybody
+- # maintain Libtool? --akim.
+- export ac_cv_exeext
+- break;;
+- * )
+- break;;
+- esac
++ CC="$ac_save_CC $ac_arg"
++ if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_c89=$ac_arg
++fi
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
+
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
++ xno)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+-ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+- test -f "$ac_file" || continue
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- export ac_cv_exeext
+- break;;
+- * ) break;;
+- esac
+-done
+-else
+- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
++depcc="$CC" am_compiler_list=
+
+-rm -f conftest.$ac_ext
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ rm -rf conftest.dir
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
+
+-int
+-main ()
+-{
++ am_cv_CC_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++ fi
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+- break;;
+- esac
+-done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
+-OBJEXT=$ac_cv_objext
+-ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+- choke me
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_compiler_gnu=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_compiler_gnu=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_prog_cc_g=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+- function prototypes and stuff, but not '\xHH' hex character constants.
+- These don't provoke an error unfortunately, instead are silently treated
+- as 'x'. The following induces an error, until -std1 is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std1. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+- ;
+- return 0;
+-}
+-_ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+- x|xno)
+- echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+- *)
+- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+- CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+-fi
+-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-depcc="$CC" am_compiler_list=
+-
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_CC_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+- fi
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+@@ -3109,7 +3702,17 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
+ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -3119,18 +3722,23 @@
+ break
+ fi
+ ;;
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
+ none) break ;;
+ esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+@@ -3154,13 +3762,11 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+-
+-
+-if
++ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+@@ -3171,75 +3777,21 @@
+ fi
+
+
+-# Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+- { (exit 1); exit 1; }; }
+-
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+-if test "${ac_cv_build+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+- ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+- { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+- { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
+-build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+-if test "${ac_cv_host+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+- ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+- { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
+-host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+ fi
+ if test -z "$CPP"; then
+- if test "${ac_cv_prog_CPP+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ if ${ac_cv_prog_CPP+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -3253,11 +3805,7 @@
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -3266,78 +3814,34 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+
++else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+ continue
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
+ break
+ fi
+
+@@ -3349,8 +3853,8 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3360,11 +3864,7 @@
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -3373,85 +3873,40 @@
+ #endif
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+
++else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+ continue
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+- :
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++
+ else
+- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+
+ ac_ext=c
+@@ -3461,275 +3916,142 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if ${ac_cv_path_GREP+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -z "$GREP"; then
++ ac_path_GREP_found=false
++ # Loop through the user's path and test for each of PROGNAME-LIST
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in grep ggrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ as_fn_executable_p "$ac_path_GREP" || continue
++# Check for GNU ac_path_GREP and select it if it is found.
++ # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++ ac_count=0
++ $as_echo_n 0123456789 >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ $as_echo 'GREP' >> "conftest.nl"
++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ as_fn_arith $ac_count + 1 && ac_count=$as_val
++ if test $ac_count -gt ${ac_path_GREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_GREP="$ac_path_GREP"
++ ac_path_GREP_max=$ac_count
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
+-echo $ECHO_N "checking whether we are using the GNU C Library 2 or newer... $ECHO_C" >&6
+-if test "${ac_cv_gnu_library_2+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <features.h>
+-#ifdef __GNU_LIBRARY__
+- #if (__GLIBC__ >= 2)
+- Lucky GNU user
+- #endif
+-#endif
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+- ac_cv_gnu_library_2=yes
++ $ac_path_GREP_found && break 3
++ done
++ done
++ done
++IFS=$as_save_IFS
++ if test -z "$ac_cv_path_GREP"; then
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ fi
+ else
+- ac_cv_gnu_library_2=no
++ ac_cv_path_GREP=$GREP
+ fi
+-rm -f conftest*
+-
+-
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
+-echo "${ECHO_T}$ac_cv_gnu_library_2" >&6
+-
+- GLIBC2="$ac_cv_gnu_library_2"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
+
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$RANLIB"; then
+- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if ${ac_cv_path_EGREP+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++ then ac_cv_path_EGREP="$GREP -E"
++ else
++ if test -z "$EGREP"; then
++ ac_path_EGREP_found=false
++ # Loop through the user's path and test for each of PROGNAME-LIST
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ as_fn_executable_p "$ac_path_EGREP" || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ $as_echo_n 0123456789 >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ $as_echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ as_fn_arith $ac_count + 1 && ac_count=$as_val
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
+
+-fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+- ac_ct_RANLIB=$RANLIB
+- # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_RANLIB"; then
+- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_RANLIB="ranlib"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++ $ac_path_EGREP_found && break 3
++ done
++ done
++ done
++IFS=$as_save_IFS
++ if test -z "$ac_cv_path_EGREP"; then
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+-done
+-done
+-
+- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- RANLIB=$ac_ct_RANLIB
+ else
+- RANLIB="$ac_cv_prog_RANLIB"
++ ac_cv_path_EGREP=$EGREP
+ fi
+
+-echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+-if test "${ac_cv_search_strerror+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_strerror=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char strerror ();
+-int
+-main ()
+-{
+-strerror ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_strerror="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_strerror" = no; then
+- for ac_lib in cposix; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char strerror ();
+-int
+-main ()
+-{
+-strerror ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_strerror="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+-fi
+-LIBS=$ac_func_search_save_LIBS
++ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-echo "${ECHO_T}$ac_cv_search_strerror" >&6
+-if test "$ac_cv_search_strerror" != no; then
+- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
+
+-fi
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if ${ac_cv_header_stdc+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3744,51 +4066,23 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <string.h>
+
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "memchr" >/dev/null 2>&1; then
+- :
++ $EGREP "memchr" >/dev/null 2>&1; then :
++
+ else
+ ac_cv_header_stdc=no
+ fi
+@@ -3798,18 +4092,14 @@
+
+ if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdlib.h>
+
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "free" >/dev/null 2>&1; then
+- :
++ $EGREP "free" >/dev/null 2>&1; then :
++
+ else
+ ac_cv_header_stdc=no
+ fi
+@@ -3819,16 +4109,13 @@
+
+ if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+- if test "$cross_compiling" = yes; then
++ if test "$cross_compiling" = yes; then :
+ :
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -3848,5807 +4135,897 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- :
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_run "$LINENO"; then :
+
+-( exit $ac_status )
+-ac_cv_header_stdc=no
++else
++ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+ fi
+
+-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+-if test "${ac_cv_c_const+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++ inttypes.h stdint.h unistd.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-int
+-main ()
+-{
+-/* FIXME: Include the comments suggested by Paul. */
+-#ifndef __cplusplus
+- /* Ultrix mips cc rejects this. */
+- typedef int charset[2];
+- const charset x;
+- /* SunOS 4.1.1 cc rejects this. */
+- char const *const *ccp;
+- char **p;
+- /* NEC SVR4.0.2 mips cc rejects this. */
+- struct point {int x, y;};
+- static struct point const zero = {0,0};
+- /* AIX XL C 1.02.0.0 rejects this.
+- It does not let you subtract one const X* pointer from another in
+- an arm of an if-expression whose if-part is not a constant
+- expression */
+- const char *g = "string";
+- ccp = &g + (g ? g-g : 0);
+- /* HPUX 7.0 cc rejects these. */
+- ++ccp;
+- p = (char**) ccp;
+- ccp = (char const *const *) p;
+- { /* SCO 3.2v4 cc rejects this. */
+- char *t;
+- char const *s = 0 ? (char *) 0 : (char const *) 0;
++fi
+
+- *t++ = 0;
+- }
+- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+- int x[] = {25, 17};
+- const int *foo = &x[0];
+- ++foo;
+- }
+- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+- typedef const int *iptr;
+- iptr p = 0;
+- ++p;
+- }
+- { /* AIX XL C 1.02.0.0 rejects this saying
+- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+- struct s { int j; const int *ap[3]; };
+- struct s *b; b->j = 5;
+- }
+- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+- const int foo = 10;
+- }
+-#endif
++done
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_c_const=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_c_const=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
++if test "x$ac_cv_header_minix_config_h" = xyes; then :
++ MINIX=yes
++else
++ MINIX=
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+-echo "${ECHO_T}$ac_cv_c_const" >&6
+-if test $ac_cv_c_const = no; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define const
+-_ACEOF
+
+-fi
++ if test "$MINIX" = yes; then
++
++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
++
+
++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+- echo "$as_me:$LINENO: checking for signed" >&5
+-echo $ECHO_N "checking for signed... $ECHO_C" >&6
+-if test "${bh_cv_c_signed+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++
++$as_echo "#define _MINIX 1" >>confdefs.h
++
++ fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
++if ${ac_cv_safe_to_define___extensions__+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++# define __EXTENSIONS__ 1
++ $ac_includes_default
+ int
+ main ()
+ {
+-signed char x;
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- bh_cv_c_signed=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_safe_to_define___extensions__=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-bh_cv_c_signed=no
++ ac_cv_safe_to_define___extensions__=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
+-echo "${ECHO_T}$bh_cv_c_signed" >&6
+- if test $bh_cv_c_signed = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
++ test $ac_cv_safe_to_define___extensions__ = yes &&
++ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+-cat >>confdefs.h <<\_ACEOF
+-#define signed
+-_ACEOF
++ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+- fi
++ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+-echo "$as_me:$LINENO: checking for inline" >&5
+-echo $ECHO_N "checking for inline... $ECHO_C" >&6
+-if test "${ac_cv_c_inline+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_c_inline=no
+-for ac_kw in inline __inline__ __inline; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifndef __cplusplus
+-typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
+-#endif
++ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_c_inline=$ac_kw; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
++$as_echo_n "checking whether NLS is requested... " >&6; }
++ # Check whether --enable-nls was given.
++if test "${enable_nls+set}" = set; then :
++ enableval=$enable_nls; USE_NLS=$enableval
++else
++ USE_NLS=yes
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-echo "${ECHO_T}$ac_cv_c_inline" >&6
+
+-
+-case $ac_cv_c_inline in
+- inline | yes) ;;
+- *)
+- case $ac_cv_c_inline in
+- no) ac_val=;;
+- *) ac_val=$ac_cv_c_inline;;
+- esac
+- cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+- ;;
+-esac
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
++$as_echo "$USE_NLS" >&6; }
+
+
+
+
++ GETTEXT_MACRO_VERSION=0.18
+
+
+
+
+-
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- inttypes.h stdint.h unistd.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_Header=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Header=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
++else
++ ac_executable_p="test -f"
+ fi
++rm -f conf$$.file
+
+-done
+-
+-
+-echo "$as_me:$LINENO: checking for off_t" >&5
+-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+-if test "${ac_cv_type_off_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((off_t *) 0)
+- return 0;
+-if (sizeof (off_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_type_off_t=yes
++# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_MSGFMT+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_off_t=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ case "$MSGFMT" in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ echo "$as_me: trying $ac_dir/$ac_word..." >&5
++ if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
++ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
++ ;;
++esac
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+-echo "${ECHO_T}$ac_cv_type_off_t" >&6
+-if test $ac_cv_type_off_t = yes; then
+- :
++MSGFMT="$ac_cv_path_MSGFMT"
++if test "$MSGFMT" != ":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
++$as_echo "$MSGFMT" >&6; }
+ else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define off_t long
+-_ACEOF
+-
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+-echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+-if test "${ac_cv_type_size_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((size_t *) 0)
+- return 0;
+-if (sizeof (size_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_type_size_t=yes
++ # Extract the first word of "gmsgfmt", so it can be a program name with args.
++set dummy gmsgfmt; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_GMSGFMT+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ case $GMSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-ac_cv_type_size_t=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++ ;;
++esac
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
+-if test $ac_cv_type_size_t = yes; then
+- :
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
++$as_echo "$GMSGFMT" >&6; }
+ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned
+-_ACEOF
+
+-fi
+
++ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
++ *) MSGFMT_015=$MSGFMT ;;
++ esac
+
+- echo "$as_me:$LINENO: checking for long long" >&5
+-echo $ECHO_N "checking for long long... $ECHO_C" >&6
+-if test "${ac_cv_type_long_long+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-long long ll = 1LL; int i = 63;
+-int
+-main ()
+-{
+-long long llmax = (long long) -1;
+- return ll << i | ll >> i | llmax / ll | llmax % ll;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_type_long_long=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
++ *) GMSGFMT_015=$GMSGFMT ;;
++ esac
+
+-ac_cv_type_long_long=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long_long" >&6
+- if test $ac_cv_type_long_long = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LONG_LONG 1
+-_ACEOF
+
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
+ fi
++ rm -f conf$$.sh
++fi
+
+-
+- echo "$as_me:$LINENO: checking for long double" >&5
+-echo $ECHO_N "checking for long double... $ECHO_C" >&6
+-if test "${gt_cv_c_long_double+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
+ else
+- if test "$GCC" = yes; then
+- gt_cv_c_long_double=yes
+- else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
+- long double foo = 0.0;
+- /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
+- int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+-
+-int
+-main ()
+-{
++ ac_executable_p="test -f"
++fi
++rm -f conf$$.file
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_c_long_double=yes
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_XGETTEXT+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_c_long_double=no
++ case "$XGETTEXT" in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ echo "$as_me: trying $ac_dir/$ac_word..." >&5
++ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
++ (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
++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
++ ;;
++esac
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
++XGETTEXT="$ac_cv_path_XGETTEXT"
++if test "$XGETTEXT" != ":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
+-echo "${ECHO_T}$gt_cv_c_long_double" >&6
+- if test $gt_cv_c_long_double = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LONG_DOUBLE 1
+-_ACEOF
++ rm -f messages.po
+
+- fi
++ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
++ *) XGETTEXT_015=$XGETTEXT ;;
++ esac
+
+
+- echo "$as_me:$LINENO: checking for wchar_t" >&5
+-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+-if test "${gt_cv_c_wchar_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+- wchar_t foo = (wchar_t)'\0';
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_c_wchar_t=yes
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
++# Find out how to test for executable files. Don't use a zero-byte file,
++# as systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ ac_executable_p="test -x"
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_executable_p="test -f"
++fi
++rm -f conf$$.file
+
+-gt_cv_c_wchar_t=no
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_MSGMERGE+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case "$MSGMERGE" in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$ac_save_IFS"
++ test -z "$ac_dir" && ac_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
++ echo "$as_me: trying $ac_dir/$ac_word..." >&5
++ if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
++ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
++ break 2
++ fi
++ fi
++ done
++ done
++ IFS="$ac_save_IFS"
++ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
++ ;;
++esac
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++MSGMERGE="$ac_cv_path_MSGMERGE"
++if test "$MSGMERGE" != ":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
++$as_echo "$MSGMERGE" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
+-echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
+- if test $gt_cv_c_wchar_t = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WCHAR_T 1
+-_ACEOF
+
+- fi
++ test -n "$localedir" || localedir='${datadir}/locale'
+
+
+- echo "$as_me:$LINENO: checking for wint_t" >&5
+-echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
+-if test "${gt_cv_c_wint_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <wchar.h>
+- wint_t foo = (wchar_t)'\0';
+-int
+-main ()
+-{
++ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_c_wint_t=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-gt_cv_c_wint_t=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
+-echo "${ECHO_T}$gt_cv_c_wint_t" >&6
+- if test $gt_cv_c_wint_t = yes; then
++ ac_config_commands="$ac_config_commands po-directories"
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WINT_T 1
+-_ACEOF
+
+- fi
+
++ if test "X$prefix" = "XNONE"; then
++ acl_final_prefix="$ac_default_prefix"
++ else
++ acl_final_prefix="$prefix"
++ fi
++ if test "X$exec_prefix" = "XNONE"; then
++ acl_final_exec_prefix='${prefix}'
++ else
++ acl_final_exec_prefix="$exec_prefix"
++ fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
++ prefix="$acl_save_prefix"
+
+- echo "$as_me:$LINENO: checking for inttypes.h" >&5
+-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+-if test "${gl_cv_header_inttypes_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <inttypes.h>
+-int
+-main ()
+-{
+-uintmax_t i = (uintmax_t) -1;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gl_cv_header_inttypes_h=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Make sure we can run config.sub.
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+-gl_cv_header_inttypes_h=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
++$as_echo_n "checking build system type... " >&6; }
++if ${ac_cv_build+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
++$as_echo "$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++esac
++build=$ac_cv_build
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
++$as_echo_n "checking host system type... " >&6; }
++if ${ac_cv_host+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "x$host_alias" = x; then
++ ac_cv_host=$ac_cv_build
++else
++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ fi
+-echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
+-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6
+- if test $gl_cv_header_inttypes_h = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
++$as_echo "$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++esac
++host=$ac_cv_host
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+-_ACEOF
+
+- fi
+
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then :
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++ with_gnu_ld=no
++fi
+
+- echo "$as_me:$LINENO: checking for stdint.h" >&5
+-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
+-if test "${gl_cv_header_stdint_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++# Prepare PATH_SEPARATOR.
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
++$as_echo_n "checking for ld used by GCC... " >&6; }
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [\\/]* | [A-Za-z]:[\\/]*)
++ re_direlt='/[^/][^/]*/\.\./'
++ # Canonicalize the path of ld
++ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
++ ;;
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
++ ;;
++ esac
++elif test "$with_gnu_ld" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
++$as_echo_n "checking for GNU ld... " >&6; }
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <stdint.h>
+-int
+-main ()
+-{
+-uintmax_t i = (uintmax_t) -1;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gl_cv_header_stdint_h=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
++$as_echo_n "checking for non-GNU ld... " >&6; }
++fi
++if ${acl_cv_path_LD+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gl_cv_header_stdint_h=no
++ if test -z "$LD"; then
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++ acl_cv_path_LD="$ac_dir/$ac_prog"
++ # Check to see if the program is GNU ld. I'd rather use --version,
++ # but apparently some GNU ld's only accept -v.
++ # Break only if it was the GNU/non-GNU ld that we prefer.
++ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
++ *GNU* | *'with BFD'*)
++ test "$with_gnu_ld" != no && break ;;
++ *)
++ test "$with_gnu_ld" != yes && break ;;
++ esac
++ fi
++ done
++ IFS="$ac_save_ifs"
++else
++ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
+-echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
+- if test $gl_cv_header_stdint_h = yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STDINT_H_WITH_UINTMAX 1
+-_ACEOF
+
+- fi
++LD="$acl_cv_path_LD"
++if test -n "$LD"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
++$as_echo "$LD" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++if ${acl_cv_prog_gnu_ld+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++ acl_cv_prog_gnu_ld=yes ;;
++*)
++ acl_cv_prog_gnu_ld=no ;;
++esac
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
++$as_echo "$acl_cv_prog_gnu_ld" >&6; }
++with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+- echo "$as_me:$LINENO: checking for intmax_t" >&5
+-echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
+-if test "${gt_cv_c_intmax_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
++$as_echo_n "checking for shared library run path origin... " >&6; }
++if ${acl_cv_rpath+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <stddef.h>
+-#include <stdlib.h>
+-#if HAVE_STDINT_H_WITH_UINTMAX
+-#include <stdint.h>
+-#endif
+-#if HAVE_INTTYPES_H_WITH_UINTMAX
+-#include <inttypes.h>
+-#endif
+
+-int
+-main ()
+-{
+-intmax_t x = -1;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_c_intmax_t=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++ . ./conftest.sh
++ rm -f ./conftest.sh
++ acl_cv_rpath=done
+
+-gt_cv_c_intmax_t=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
++$as_echo "$acl_cv_rpath" >&6; }
++ wl="$acl_cv_wl"
++ acl_libext="$acl_cv_libext"
++ acl_shlibext="$acl_cv_shlibext"
++ acl_libname_spec="$acl_cv_libname_spec"
++ acl_library_names_spec="$acl_cv_library_names_spec"
++ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ acl_hardcode_direct="$acl_cv_hardcode_direct"
++ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ # Check whether --enable-rpath was given.
++if test "${enable_rpath+set}" = set; then :
++ enableval=$enable_rpath; :
++else
++ enable_rpath=yes
+ fi
+-echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
+-echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
+- if test $gt_cv_c_intmax_t = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_INTMAX_T 1
+-_ACEOF
+
+- fi
+
+
+
+- echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
+-echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6
+-if test "${gt_cv_func_printf_posix+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ acl_libdirstem=lib
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
++$as_echo_n "checking for 64-bit host... " >&6; }
++if ${gl_cv_solaris_64bit+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+-
+- if test "$cross_compiling" = yes; then
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+- notposix
++#ifdef _LP64
++sixtyfour bits
+ #endif
+
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "notposix" >/dev/null 2>&1; then
+- gt_cv_func_printf_posix="guessing no"
++ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
++ gl_cv_solaris_64bit=yes
+ else
+- gt_cv_func_printf_posix="guessing yes"
++ gl_cv_solaris_64bit=no
+ fi
+ rm -f conftest*
+
+
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <stdio.h>
+-#include <string.h>
+-/* The string "%2$d %1$d", with dollar characters protected from the shell's
+- dollar expansion (possibly an autoconf bug). */
+-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+-static char buf[100];
+-int main ()
+-{
+- sprintf (buf, format, 33, 55);
+- return (strcmp (buf, "55 33") != 0);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_printf_posix=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-gt_cv_func_printf_posix=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
+-echo "${ECHO_T}$gt_cv_func_printf_posix" >&6
+- case $gt_cv_func_printf_posix in
+- *yes)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_POSIX_PRINTF 1
+-_ACEOF
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
++$as_echo "$gl_cv_solaris_64bit" >&6; }
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
++ esac
++ fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
+ ;;
+ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+-# for constant arguments. Useless!
+-echo "$as_me:$LINENO: checking for working alloca.h" >&5
+-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
+-if test "${ac_cv_working_alloca_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <alloca.h>
+-int
+-main ()
+-{
+-char *p = (char *) alloca (2 * sizeof (int));
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_working_alloca_h=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_working_alloca_h=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+-if test $ac_cv_working_alloca_h = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALLOCA_H 1
+-_ACEOF
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking for alloca" >&5
+-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
+-if test "${ac_cv_func_alloca_works+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifdef __GNUC__
+-# define alloca __builtin_alloca
+-#else
+-# ifdef _MSC_VER
+-# include <malloc.h>
+-# define alloca _alloca
+-# else
+-# if HAVE_ALLOCA_H
+-# include <alloca.h>
+-# else
+-# ifdef _AIX
+- #pragma alloca
+-# else
+-# ifndef alloca /* predefined by HP cc +Olibcalls */
+-char *alloca ();
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-int
+-main ()
+-{
+-char *p = (char *) alloca (1);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_alloca_works=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_alloca_works=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
+-
+-if test $ac_cv_func_alloca_works = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALLOCA 1
+-_ACEOF
+-
+-else
+- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+-# that cause trouble. Some versions do not even contain alloca or
+-# contain a buggy version. If you still want to use their alloca,
+-# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+-ALLOCA=alloca.$ac_objext
+
+-cat >>confdefs.h <<\_ACEOF
+-#define C_ALLOCA 1
+-_ACEOF
+
+
+-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
+-if test "${ac_cv_os_cray+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#if defined(CRAY) && ! defined(CRAY2)
+-webecray
+-#else
+-wenotbecray
+-#endif
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "webecray" >/dev/null 2>&1; then
+- ac_cv_os_cray=yes
+-else
+- ac_cv_os_cray=no
+-fi
+-rm -f conftest*
+
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+-echo "${ECHO_T}$ac_cv_os_cray" >&6
+-if test $ac_cv_os_cray = yes; then
+- for ac_func in _getb67 GETB67 getb67; do
+- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+
+-int
+-main ()
+-{
+-return f != $ac_func;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ use_additional=yes
+
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
+
+-cat >>confdefs.h <<_ACEOF
+-#define CRAY_STACKSEG_END $ac_func
+-_ACEOF
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
+
+- break
+-fi
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+- done
+-fi
+
+-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
+-if test "${ac_cv_c_stack_direction+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then
+- ac_cv_c_stack_direction=0
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-int
+-find_stack_direction ()
+-{
+- static char *addr = 0;
+- auto char dummy;
+- if (addr == 0)
+- {
+- addr = &dummy;
+- return find_stack_direction ();
+- }
+- else
+- return (&dummy > addr) ? 1 : -1;
+-}
++# Check whether --with-libiconv-prefix was given.
++if test "${with_libiconv_prefix+set}" = set; then :
++ withval=$with_libiconv_prefix;
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
+
+-int
+-main ()
+-{
+- exit (find_stack_direction () < 0);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_c_stack_direction=1
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
+
+-( exit $ac_status )
+-ac_cv_c_stack_direction=-1
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
+
+-cat >>confdefs.h <<_ACEOF
+-#define STACK_DIRECTION $ac_cv_c_stack_direction
+-_ACEOF
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
++ fi
++ fi
+
+ fi
+
++ LIBICONV=
++ LTLIBICONV=
++ INCICONV=
++ LIBICONV_PREFIX=
++ HAVE_LIBICONV=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='iconv '
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
++ else
++ :
++ fi
++ else
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
++ if test -n "$acl_shlibext"; then
++ shrext=".$acl_shlibext" # typically: shrext=.so
++ else
++ shrext=
++ fi
++ if test $use_additional = yes; then
++ dir="$additional_libdir"
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIBICONV; do
+
+-
+-for ac_header in stdlib.h unistd.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-for ac_func in getpagesize
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != $ac_func;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-echo "$as_me:$LINENO: checking for working mmap" >&5
+-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
+-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then
+- ac_cv_func_mmap_fixed_mapped=no
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-/* malloc might have been renamed as rpl_malloc. */
+-#undef malloc
+-
+-/* Thanks to Mike Haertel and Jim Avera for this test.
+- Here is a matrix of mmap possibilities:
+- mmap private not fixed
+- mmap private fixed at somewhere currently unmapped
+- mmap private fixed at somewhere already mapped
+- mmap shared not fixed
+- mmap shared fixed at somewhere currently unmapped
+- mmap shared fixed at somewhere already mapped
+- For private mappings, we should verify that changes cannot be read()
+- back from the file, nor mmap's back from the file at a different
+- address. (There have been systems where private was not correctly
+- implemented like the infamous i386 svr4.0, and systems where the
+- VM page cache was not coherent with the file system buffer cache
+- like early versions of FreeBSD and possibly contemporary NetBSD.)
+- For shared mappings, we should conversely verify that changes get
+- propagated back to all the places they're supposed to be.
+-
+- Grep wants private fixed already mapped.
+- The main things grep needs to know about mmap are:
+- * does it exist and is it safe to write into the mmap'd area
+- * how to use it (BSD variants) */
+-
+-#include <fcntl.h>
+-#include <sys/mman.h>
+-
+-#if !STDC_HEADERS && !HAVE_STDLIB_H
+-char *malloc ();
+-#endif
+-
+-/* This mess was copied from the GNU getpagesize.h. */
+-#if !HAVE_GETPAGESIZE
+-/* Assume that all systems that can run configure have sys/param.h. */
+-# if !HAVE_SYS_PARAM_H
+-# define HAVE_SYS_PARAM_H 1
+-# endif
+-
+-# ifdef _SC_PAGESIZE
+-# define getpagesize() sysconf(_SC_PAGESIZE)
+-# else /* no _SC_PAGESIZE */
+-# if HAVE_SYS_PARAM_H
+-# include <sys/param.h>
+-# ifdef EXEC_PAGESIZE
+-# define getpagesize() EXEC_PAGESIZE
+-# else /* no EXEC_PAGESIZE */
+-# ifdef NBPG
+-# define getpagesize() NBPG * CLSIZE
+-# ifndef CLSIZE
+-# define CLSIZE 1
+-# endif /* no CLSIZE */
+-# else /* no NBPG */
+-# ifdef NBPC
+-# define getpagesize() NBPC
+-# else /* no NBPC */
+-# ifdef PAGESIZE
+-# define getpagesize() PAGESIZE
+-# endif /* PAGESIZE */
+-# endif /* no NBPC */
+-# endif /* no NBPG */
+-# endif /* no EXEC_PAGESIZE */
+-# else /* no HAVE_SYS_PARAM_H */
+-# define getpagesize() 8192 /* punt totally */
+-# endif /* no HAVE_SYS_PARAM_H */
+-# endif /* no _SC_PAGESIZE */
+-
+-#endif /* no HAVE_GETPAGESIZE */
+-
+-int
+-main ()
+-{
+- char *data, *data2, *data3;
+- int i, pagesize;
+- int fd;
+-
+- pagesize = getpagesize ();
+-
+- /* First, make a file with some known garbage in it. */
+- data = (char *) malloc (pagesize);
+- if (!data)
+- exit (1);
+- for (i = 0; i < pagesize; ++i)
+- *(data + i) = rand ();
+- umask (0);
+- fd = creat ("conftest.mmap", 0600);
+- if (fd < 0)
+- exit (1);
+- if (write (fd, data, pagesize) != pagesize)
+- exit (1);
+- close (fd);
+-
+- /* Next, try to mmap the file at a fixed address which already has
+- something else allocated at it. If we can, also make sure that
+- we see the same garbage. */
+- fd = open ("conftest.mmap", O_RDWR);
+- if (fd < 0)
+- exit (1);
+- data2 = (char *) malloc (2 * pagesize);
+- if (!data2)
+- exit (1);
+- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
+- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+- MAP_PRIVATE | MAP_FIXED, fd, 0L))
+- exit (1);
+- for (i = 0; i < pagesize; ++i)
+- if (*(data + i) != *(data2 + i))
+- exit (1);
+-
+- /* Finally, make sure that changes to the mapped area do not
+- percolate back to the file as seen by read(). (This is a bug on
+- some variants of i386 svr4.0.) */
+- for (i = 0; i < pagesize; ++i)
+- *(data2 + i) = *(data2 + i) + 1;
+- data3 = (char *) malloc (pagesize);
+- if (!data3)
+- exit (1);
+- if (read (fd, data3, pagesize) != pagesize)
+- exit (1);
+- for (i = 0; i < pagesize; ++i)
+- if (*(data + i) != *(data3 + i))
+- exit (1);
+- close (fd);
+- exit (0);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_mmap_fixed_mapped=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_func_mmap_fixed_mapped=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
+-if test $ac_cv_func_mmap_fixed_mapped = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MMAP 1
+-_ACEOF
+-
+-fi
+-rm -f conftest.mmap
+-
+-
+- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
+-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
+-if test "${ac_cv_gnu_library_2_1+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <features.h>
+-#ifdef __GNU_LIBRARY__
+- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+- Lucky GNU user
+- #endif
+-#endif
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+- ac_cv_gnu_library_2_1=yes
+-else
+- ac_cv_gnu_library_2_1=no
+-fi
+-rm -f conftest*
+-
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
+-
+- GLIBC21="$ac_cv_gnu_library_2_1"
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
+-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
+-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- if test "$cross_compiling" = yes; then
+-
+- # Guess based on the CPU.
+- case "$host_cpu" in
+- alpha* | i3456786 | m68k | s390*)
+- gt_cv_int_divbyzero_sigfpe="guessing yes";;
+- *)
+- gt_cv_int_divbyzero_sigfpe="guessing no";;
+- esac
+-
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <stdlib.h>
+-#include <signal.h>
+-
+-static void
+-#ifdef __cplusplus
+-sigfpe_handler (int sig)
+-#else
+-sigfpe_handler (sig) int sig;
+-#endif
+-{
+- /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
+- exit (sig != SIGFPE);
+-}
+-
+-int x = 1;
+-int y = 0;
+-int z;
+-int nan;
+-
+-int main ()
+-{
+- signal (SIGFPE, sigfpe_handler);
+-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
+-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+- signal (SIGTRAP, sigfpe_handler);
+-#endif
+-/* Linux/SPARC yields signal SIGILL. */
+-#if defined (__sparc__) && defined (__linux__)
+- signal (SIGILL, sigfpe_handler);
+-#endif
+-
+- z = x / y;
+- nan = y / y;
+- exit (1);
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_int_divbyzero_sigfpe=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-gt_cv_int_divbyzero_sigfpe=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
+-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
+- case "$gt_cv_int_divbyzero_sigfpe" in
+- *yes) value=1;;
+- *) value=0;;
+- esac
+-
+-cat >>confdefs.h <<_ACEOF
+-#define INTDIV0_RAISES_SIGFPE $value
+-_ACEOF
+-
+-
+-
+- echo "$as_me:$LINENO: checking for unsigned long long" >&5
+-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
+-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-unsigned long long ull = 1ULL; int i = 63;
+-int
+-main ()
+-{
+-unsigned long long ullmax = (unsigned long long) -1;
+- return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_type_unsigned_long_long=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_unsigned_long_long=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
+- if test $ac_cv_type_unsigned_long_long = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UNSIGNED_LONG_LONG 1
+-_ACEOF
+-
+- fi
+-
+-
+-
+-
+- if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+-
+- test $ac_cv_type_unsigned_long_long = yes \
+- && ac_type='unsigned long long' \
+- || ac_type='unsigned long'
+-
+-cat >>confdefs.h <<_ACEOF
+-#define uintmax_t $ac_type
+-_ACEOF
+-
+- else
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UINTMAX_T 1
+-_ACEOF
+-
+- fi
+-
+-
+- echo "$as_me:$LINENO: checking for inttypes.h" >&5
+-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+-if test "${gt_cv_header_inttypes_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <inttypes.h>
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_header_inttypes_h=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_header_inttypes_h=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
+-echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
+- if test $gt_cv_header_inttypes_h = yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_INTTYPES_H 1
+-_ACEOF
+-
+- fi
+-
+-
+-
+- if test $gt_cv_header_inttypes_h = yes; then
+- echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
+-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
+-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <inttypes.h>
+-#ifdef PRId32
+-char *p = PRId32;
+-#endif
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_inttypes_pri_broken=no
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_inttypes_pri_broken=yes
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
+-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
+- fi
+- if test "$gt_cv_inttypes_pri_broken" = yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PRI_MACROS_BROKEN 1
+-_ACEOF
+-
+- fi
+-
+-
+-
+-for ac_header in stdint.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+- echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
+-echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
+- result=
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <limits.h>
+-#if HAVE_STDINT_H
+-#include <stdint.h>
+-#endif
+-#ifdef SIZE_MAX
+-Found it
+-#endif
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "Found it" >/dev/null 2>&1; then
+- result=yes
+-fi
+-rm -f conftest*
+-
+- if test -z "$result"; then
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) res_hi=$ac_lo;;
+-'') result=? ;;
+-esac
+-else
+- if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-long longval () { return ~(size_t)0 / 10; }
+-unsigned long ulongval () { return ~(size_t)0 / 10; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- exit (1);
+- if ((~(size_t)0 / 10) < 0)
+- {
+- long i = longval ();
+- if (i != (~(size_t)0 / 10))
+- exit (1);
+- fprintf (f, "%ld\n", i);
+- }
+- else
+- {
+- unsigned long i = ulongval ();
+- if (i != (~(size_t)0 / 10))
+- exit (1);
+- fprintf (f, "%lu\n", i);
+- }
+- exit (ferror (f) || fclose (f) != 0);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- res_hi=`cat conftest.val`
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-result=?
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) res_lo=$ac_lo;;
+-'') result=? ;;
+-esac
+-else
+- if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-long longval () { return ~(size_t)0 % 10; }
+-unsigned long ulongval () { return ~(size_t)0 % 10; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- exit (1);
+- if ((~(size_t)0 % 10) < 0)
+- {
+- long i = longval ();
+- if (i != (~(size_t)0 % 10))
+- exit (1);
+- fprintf (f, "%ld\n", i);
+- }
+- else
+- {
+- unsigned long i = ulongval ();
+- if (i != (~(size_t)0 % 10))
+- exit (1);
+- fprintf (f, "%lu\n", i);
+- }
+- exit (ferror (f) || fclose (f) != 0);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- res_lo=`cat conftest.val`
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-result=?
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) fits_in_uint=$ac_lo;;
+-'') result=? ;;
+-esac
+-else
+- if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+-long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
+-unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- exit (1);
+- if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
+- {
+- long i = longval ();
+- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
+- exit (1);
+- fprintf (f, "%ld\n", i);
+- }
+- else
+- {
+- unsigned long i = ulongval ();
+- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
+- exit (1);
+- fprintf (f, "%lu\n", i);
+- }
+- exit (ferror (f) || fclose (f) != 0);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- fits_in_uint=`cat conftest.val`
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-result=?
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+- if test "$fits_in_uint" = 1; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stddef.h>
+- extern size_t foo;
+- extern unsigned long foo;
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- fits_in_uint=0
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- fi
+- if test -z "$result"; then
+- if test "$fits_in_uint" = 1; then
+- result="$res_hi$res_lo"U
+- else
+- result="$res_hi$res_lo"UL
+- fi
+- else
+- result='~(size_t)0'
+- fi
+- fi
+- echo "$as_me:$LINENO: result: $result" >&5
+-echo "${ECHO_T}$result" >&6
+- if test "$result" != yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZE_MAX $result
+-_ACEOF
+-
+- fi
+-
+-
+-
+-
+-
+-for ac_header in stdint.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+- echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
+-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -framework CoreFoundation"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <CFPreferences.h>
+-int
+-main ()
+-{
+-CFPreferencesCopyAppValue(NULL, NULL)
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_CFPreferencesCopyAppValue=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_CFPreferencesCopyAppValue=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
+- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
+-_ACEOF
+-
+- fi
+- echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
+-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -framework CoreFoundation"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <CFLocale.h>
+-int
+-main ()
+-{
+-CFLocaleCopyCurrent();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_CFLocaleCopyCurrent=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_CFLocaleCopyCurrent=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
+- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CFLOCALECOPYCURRENT 1
+-_ACEOF
+-
+- fi
+- INTL_MACOSX_LIBS=
+- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+- fi
+-
+-
+-
+- if test "X$prefix" = "XNONE"; then
+- acl_final_prefix="$ac_default_prefix"
+- else
+- acl_final_prefix="$prefix"
+- fi
+- if test "X$exec_prefix" = "XNONE"; then
+- acl_final_exec_prefix='${prefix}'
+- else
+- acl_final_exec_prefix="$exec_prefix"
+- fi
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+- prefix="$acl_save_prefix"
+-
+-
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
+-else
+- with_gnu_ld=no
+-fi;
+-# Prepare PATH_SEPARATOR.
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
+-fi
+-ac_prog=ld
+-if test "$GCC" = yes; then
+- # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+- case $host in
+- *-*-mingw*)
+- # gcc leaves a trailing carriage return which upsets mingw
+- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+- *)
+- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+- esac
+- case $ac_prog in
+- # Accept absolute paths.
+- [\\/]* | [A-Za-z]:[\\/]*)
+- re_direlt='/[^/][^/]*/\.\./'
+- # Canonicalize the path of ld
+- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+- done
+- test -z "$LD" && LD="$ac_prog"
+- ;;
+- "")
+- # If it fails, then pretend we aren't using GCC.
+- ac_prog=ld
+- ;;
+- *)
+- # If it is relative, then search for the first ld in PATH.
+- with_gnu_ld=unknown
+- ;;
+- esac
+-elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+-else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+-fi
+-if test "${acl_cv_path_LD+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -z "$LD"; then
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+- for ac_dir in $PATH; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- acl_cv_path_LD="$ac_dir/$ac_prog"
+- # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
+- # Break only if it was the GNU/non-GNU ld that we prefer.
+- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+- *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
+- *)
+- test "$with_gnu_ld" != yes && break ;;
+- esac
+- fi
+- done
+- IFS="$ac_save_ifs"
+-else
+- acl_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
+-fi
+-
+-LD="$acl_cv_path_LD"
+-if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+- { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+-if test "${acl_cv_prog_gnu_ld+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+- acl_cv_prog_gnu_ld=yes ;;
+-*)
+- acl_cv_prog_gnu_ld=no ;;
+-esac
+-fi
+-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+-with_gnu_ld=$acl_cv_prog_gnu_ld
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+-if test "${acl_cv_rpath+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+- . ./conftest.sh
+- rm -f ./conftest.sh
+- acl_cv_rpath=done
+-
+-fi
+-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+-echo "${ECHO_T}$acl_cv_rpath" >&6
+- wl="$acl_cv_wl"
+- libext="$acl_cv_libext"
+- shlibext="$acl_cv_shlibext"
+- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+- hardcode_direct="$acl_cv_hardcode_direct"
+- hardcode_minus_L="$acl_cv_hardcode_minus_L"
+- # Check whether --enable-rpath or --disable-rpath was given.
+-if test "${enable_rpath+set}" = set; then
+- enableval="$enable_rpath"
+- :
+-else
+- enable_rpath=yes
+-fi;
+-
+-
+-
+-
+-
+-
+-
+- use_additional=yes
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+-
+-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+-if test "${with_libiconv_prefix+set}" = set; then
+- withval="$with_libiconv_prefix"
+-
+- if test "X$withval" = "Xno"; then
+- use_additional=no
+- else
+- if test "X$withval" = "X"; then
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- else
+- additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
+- fi
+- fi
+-
+-fi;
+- LIBICONV=
+- LTLIBICONV=
+- INCICONV=
+- rpathdirs=
+- ltrpathdirs=
+- names_already_handled=
+- names_next_round='iconv '
+- while test -n "$names_next_round"; do
+- names_this_round="$names_next_round"
+- names_next_round=
+- for name in $names_this_round; do
+- already_handled=
+- for n in $names_already_handled; do
+- if test "$n" = "$name"; then
+- already_handled=yes
+- break
+- fi
+- done
+- if test -z "$already_handled"; then
+- names_already_handled="$names_already_handled $name"
+- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+- eval value=\"\$HAVE_LIB$uppername\"
+- if test -n "$value"; then
+- if test "$value" = yes; then
+- eval value=\"\$LIB$uppername\"
+- test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+- eval value=\"\$LTLIB$uppername\"
+- test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+- else
+- :
+- fi
+- else
+- found_dir=
+- found_la=
+- found_so=
+- found_a=
+- if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- fi
+- fi
+- fi
+- if test "X$found_dir" = "X"; then
+- for x in $LDFLAGS $LTLIBICONV; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- case "$x" in
+- -L*)
+- dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
+- found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- fi
+- fi
+- ;;
+- esac
+- if test "X$found_dir" != "X"; then
+- break
+- fi
+- done
+- fi
+- if test "X$found_dir" != "X"; then
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+- if test "X$found_so" != "X"; then
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $found_dir"
+- fi
+- if test "$hardcode_direct" = yes; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $found_dir"
+- fi
+- else
+- haveit=
+- for x in $LDFLAGS $LIBICONV; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-L$found_dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+- fi
+- if test "$hardcode_minus_L" != no; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+- else
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+- fi
+- fi
+- fi
+- fi
+- else
+- if test "X$found_a" != "X"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+- else
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+- fi
+- fi
+- additional_includedir=
+- case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+- additional_includedir="$basedir/include"
+- ;;
+- esac
+- if test "X$additional_includedir" != "X"; then
+- if test "X$additional_includedir" != "X/usr/include"; then
+- haveit=
+- if test "X$additional_includedir" = "X/usr/local/include"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- for x in $CPPFLAGS $INCICONV; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-I$additional_includedir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_includedir"; then
+- INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test -n "$found_la"; then
+- save_libdir="$libdir"
+- case "$found_la" in
+- */* | *\\*) . "$found_la" ;;
+- *) . "./$found_la" ;;
+- esac
+- libdir="$save_libdir"
+- for dep in $dependency_libs; do
+- case "$dep" in
+- -L*)
+- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+- if test "X$additional_libdir" != "X/usr/lib"; then
+- haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
+- if test -n "$GCC"; then
+- case $host_os in
+- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+- esac
+- fi
+- fi
+- if test -z "$haveit"; then
+- haveit=
+- for x in $LDFLAGS $LIBICONV; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+- fi
+- fi
+- haveit=
+- for x in $LDFLAGS $LTLIBICONV; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X-L$additional_libdir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- if test -d "$additional_libdir"; then
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+- fi
+- fi
+- fi
+- fi
+- ;;
+- -R*)
+- dir=`echo "X$dep" | sed -e 's/^X-R//'`
+- if test "$enable_rpath" != no; then
+- haveit=
+- for x in $rpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- rpathdirs="$rpathdirs $dir"
+- fi
+- haveit=
+- for x in $ltrpathdirs; do
+- if test "X$x" = "X$dir"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- ltrpathdirs="$ltrpathdirs $dir"
+- fi
+- fi
+- ;;
+- -l*)
+- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+- ;;
+- *.la)
+- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+- ;;
+- *)
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+- ;;
+- esac
+- done
+- fi
+- else
+- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+- fi
+- fi
+- fi
+- done
+- done
+- if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
+- alldirs=
+- for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+- done
+- acl_save_libdir="$libdir"
+- libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+- else
+- for found_dir in $rpathdirs; do
+- acl_save_libdir="$libdir"
+- libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- libdir="$acl_save_libdir"
+- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+- done
+- fi
+- fi
+- if test "X$ltrpathdirs" != "X"; then
+- for found_dir in $ltrpathdirs; do
+- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+- done
+- fi
+-
+-
+-
+-
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
+-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
+-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((ptrdiff_t *) 0)
+- return 0;
+-if (sizeof (ptrdiff_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_type_ptrdiff_t=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_ptrdiff_t=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
+-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
+-if test $ac_cv_type_ptrdiff_t = yes; then
+- :
+-else
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ptrdiff_t long
+-_ACEOF
+-
+-
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+-stdlib.h string.h unistd.h sys/param.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
+-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+-__fsetlocking
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != $ac_func;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
+-echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6
+-if test "${ac_cv_have_decl__snprintf+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-
+-#ifndef _snprintf
+- char *p = (char *) _snprintf;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_have_decl__snprintf=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_have_decl__snprintf=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
+-echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6
+- if test $ac_cv_have_decl__snprintf = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL__SNPRINTF $gt_value
+-_ACEOF
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
+-echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6
+-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-
+-#ifndef _snwprintf
+- char *p = (char *) _snwprintf;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_have_decl__snwprintf=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_have_decl__snwprintf=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
+-echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6
+- if test $ac_cv_have_decl__snwprintf = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL__SNWPRINTF $gt_value
+-_ACEOF
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
+-echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
+-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-
+-#ifndef feof_unlocked
+- char *p = (char *) feof_unlocked;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_have_decl_feof_unlocked=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_have_decl_feof_unlocked=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
+- if test $ac_cv_have_decl_feof_unlocked = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
+-_ACEOF
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
+-echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
+-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-
+-#ifndef fgets_unlocked
+- char *p = (char *) fgets_unlocked;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_have_decl_fgets_unlocked=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_have_decl_fgets_unlocked=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
+- if test $ac_cv_have_decl_fgets_unlocked = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
+-_ACEOF
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
+-echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
+-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-
+-#ifndef getc_unlocked
+- char *p = (char *) getc_unlocked;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_have_decl_getc_unlocked=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_have_decl_getc_unlocked=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
+- if test $ac_cv_have_decl_getc_unlocked = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_GETC_UNLOCKED $gt_value
+-_ACEOF
+-
+-
+-
+- case $gt_cv_func_printf_posix in
+- *yes) HAVE_POSIX_PRINTF=1 ;;
+- *) HAVE_POSIX_PRINTF=0 ;;
+- esac
+-
+- if test "$ac_cv_func_asprintf" = yes; then
+- HAVE_ASPRINTF=1
+- else
+- HAVE_ASPRINTF=0
+- fi
+-
+- if test "$ac_cv_func_snprintf" = yes; then
+- HAVE_SNPRINTF=1
+- else
+- HAVE_SNPRINTF=0
+- fi
+-
+- if test "$ac_cv_func_wprintf" = yes; then
+- HAVE_WPRINTF=1
+- else
+- HAVE_WPRINTF=0
+- fi
+-
+-
+-
+-
+-
+-
+-
+- am_save_CPPFLAGS="$CPPFLAGS"
+-
+- for element in $INCICONV; do
+- haveit=
+- for x in $CPPFLAGS; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- if test "X$x" = "X$element"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+- fi
+- done
+-
+-
+- echo "$as_me:$LINENO: checking for iconv" >&5
+-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+-if test "${am_cv_func_iconv+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- am_cv_func_iconv="no, consider installing GNU libiconv"
+- am_cv_lib_iconv=no
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-#include <iconv.h>
+-int
+-main ()
+-{
+-iconv_t cd = iconv_open("","");
+- iconv(cd,NULL,NULL,NULL,NULL);
+- iconv_close(cd);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- am_cv_func_iconv=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- if test "$am_cv_func_iconv" != yes; then
+- am_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBICONV"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-#include <iconv.h>
+-int
+-main ()
+-{
+-iconv_t cd = iconv_open("","");
+- iconv(cd,NULL,NULL,NULL,NULL);
+- iconv_close(cd);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- LIBS="$am_save_LIBS"
+- fi
+-
+-fi
+-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+-echo "${ECHO_T}$am_cv_func_iconv" >&6
+- if test "$am_cv_func_iconv" = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ICONV 1
+-_ACEOF
+-
+- fi
+- if test "$am_cv_lib_iconv" = yes; then
+- echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+- echo "$as_me:$LINENO: result: $LIBICONV" >&5
+-echo "${ECHO_T}$LIBICONV" >&6
+- else
+- CPPFLAGS="$am_save_CPPFLAGS"
+- LIBICONV=
+- LTLIBICONV=
+- fi
+-
+-
+-
+- if test "$am_cv_func_iconv" = yes; then
+- echo "$as_me:$LINENO: checking for iconv declaration" >&5
+-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
+- if test "${am_cv_proto_iconv+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <stdlib.h>
+-#include <iconv.h>
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-#if defined(__STDC__) || defined(__cplusplus)
+-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+-#else
+-size_t iconv();
+-#endif
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- am_cv_proto_iconv_arg1=""
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-am_cv_proto_iconv_arg1="const"
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- 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);"
+-fi
+-
+- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- echo "$as_me:$LINENO: result: ${ac_t:-
+- }$am_cv_proto_iconv" >&5
+-echo "${ECHO_T}${ac_t:-
+- }$am_cv_proto_iconv" >&6
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ICONV_CONST $am_cv_proto_iconv_arg1
+-_ACEOF
+-
+- fi
+-
+-
+- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+-if test "${am_cv_langinfo_codeset+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <langinfo.h>
+-int
+-main ()
+-{
+-char* cs = nl_langinfo(CODESET);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- am_cv_langinfo_codeset=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-am_cv_langinfo_codeset=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+- if test $am_cv_langinfo_codeset = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LANGINFO_CODESET 1
+-_ACEOF
+-
+- fi
+-
+- if test $ac_cv_header_locale_h = yes; then
+-
+- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
+-if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <locale.h>
+-int
+-main ()
+-{
+-return LC_MESSAGES
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_val_LC_MESSAGES=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_val_LC_MESSAGES=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
+-echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6
+- if test $gt_cv_val_LC_MESSAGES = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LC_MESSAGES 1
+-_ACEOF
+-
+- fi
+-
+- fi
+-
+- if test -n "$INTL_MACOSX_LIBS"; then
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- fi
+-
+- for ac_prog in bison
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_INTLBISON+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$INTLBISON"; then
+- ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_INTLBISON="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-INTLBISON=$ac_cv_prog_INTLBISON
+-if test -n "$INTLBISON"; then
+- echo "$as_me:$LINENO: result: $INTLBISON" >&5
+-echo "${ECHO_T}$INTLBISON" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- test -n "$INTLBISON" && break
+-done
+-
+- if test -z "$INTLBISON"; then
+- ac_verc_fail=yes
+- else
+- echo "$as_me:$LINENO: checking version of bison" >&5
+-echo $ECHO_N "checking version of bison... $ECHO_C" >&6
+- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+- case $ac_prog_version in
+- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+- esac
+- echo "$as_me:$LINENO: result: $ac_prog_version" >&5
+-echo "${ECHO_T}$ac_prog_version" >&6
+- fi
+- if test $ac_verc_fail = yes; then
+- INTLBISON=:
+- fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
+-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -framework CoreFoundation"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <CFPreferences.h>
+-int
+-main ()
+-{
+-CFPreferencesCopyAppValue(NULL, NULL)
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_CFPreferencesCopyAppValue=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_CFPreferencesCopyAppValue=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
+- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
+-_ACEOF
+-
+- fi
+- echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
+-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -framework CoreFoundation"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <CFLocale.h>
+-int
+-main ()
+-{
+-CFLocaleCopyCurrent();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_CFLocaleCopyCurrent=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_CFLocaleCopyCurrent=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
+- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CFLOCALECOPYCURRENT 1
+-_ACEOF
+-
+- fi
+- INTL_MACOSX_LIBS=
+- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+- fi
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
+- # Check whether --enable-nls or --disable-nls was given.
+-if test "${enable_nls+set}" = set; then
+- enableval="$enable_nls"
+- USE_NLS=$enableval
+-else
+- USE_NLS=yes
+-fi;
+- echo "$as_me:$LINENO: result: $USE_NLS" >&5
+-echo "${ECHO_T}$USE_NLS" >&6
+-
+-
+-
+-
+- BUILD_INCLUDED_LIBINTL=no
+- USE_INCLUDED_LIBINTL=no
+-
+- LIBINTL=
+- LTLIBINTL=
+- POSUB=
+-
+- if test "$USE_NLS" = "yes"; then
+- gt_use_preinstalled_gnugettext=no
+-
+- echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
+-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
+-
+-# Check whether --with-included-gettext or --without-included-gettext was given.
+-if test "${with_included_gettext+set}" = set; then
+- withval="$with_included_gettext"
+- nls_cv_force_use_gnu_gettext=$withval
+-else
+- nls_cv_force_use_gnu_gettext=no
+-fi;
+- echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
+-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
+-
+- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+-
+-
+-
+-
+-
+-
+- echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
+-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_gnugettext1_libc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_gnugettext1_libc=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
+-
+- if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+-
+-
+-
+- use_additional=yes
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+-
+-# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+-if test "${with_libintl_prefix+set}" = set; then
+- withval="$with_libintl_prefix"
+-
+- if test "X$withval" = "Xno"; then
+- use_additional=no
+- else
+- if test "X$withval" = "X"; then
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+-
+- eval additional_includedir=\"$includedir\"
+- eval additional_libdir=\"$libdir\"
+-
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+-
+- else
+- additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
+- fi
+- fi
+-
+-fi;
+- LIBINTL=
+- LTLIBINTL=
+- INCINTL=
+- rpathdirs=
+- ltrpathdirs=
+- names_already_handled=
+- names_next_round='intl '
+- while test -n "$names_next_round"; do
+- names_this_round="$names_next_round"
+- names_next_round=
+- for name in $names_this_round; do
+- already_handled=
+- for n in $names_already_handled; do
+- if test "$n" = "$name"; then
+- already_handled=yes
+- break
+- fi
+- done
+- if test -z "$already_handled"; then
+- names_already_handled="$names_already_handled $name"
+- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+- eval value=\"\$HAVE_LIB$uppername\"
+- if test -n "$value"; then
+- if test "$value" = yes; then
+- eval value=\"\$LIB$uppername\"
+- test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+- eval value=\"\$LTLIB$uppername\"
+- test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+- else
+- :
+- fi
+- else
+- found_dir=
+- found_la=
+- found_so=
+- found_a=
+- if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- fi
+- fi
+- fi
+- if test "X$found_dir" = "X"; then
+- for x in $LDFLAGS $LTLIBINTL; do
+-
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
+ fi
+ fi
+ fi
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+@@ -9657,10 +5034,12 @@
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+@@ -9672,11 +5051,11 @@
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+- if test "$hardcode_direct" = yes; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ if test "$acl_hardcode_direct" = yes; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+@@ -9689,7 +5068,7 @@
+ fi
+ else
+ haveit=
+- for x in $LDFLAGS $LIBINTL; do
++ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+@@ -9705,27 +5084,37 @@
+ fi
+ done
+ if test -z "$haveit"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+- if test "$hardcode_minus_L" != no; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ if test "$acl_hardcode_minus_L" != no; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ */$acl_libdirstem | */$acl_libdirstem/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
++ if test "$name" = 'iconv'; then
++ LIBICONV_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = 'iconv'; then
++ LIBICONV_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -9740,7 +5129,7 @@
+ fi
+ fi
+ if test -z "$haveit"; then
+- for x in $CPPFLAGS $INCINTL; do
++ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+@@ -9757,7 +5146,7 @@
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+- INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
++ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+@@ -9774,9 +5163,11 @@
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+- if test "X$additional_libdir" != "X/usr/lib"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -9785,7 +5176,7 @@
+ fi
+ if test -z "$haveit"; then
+ haveit=
+- for x in $LDFLAGS $LIBINTL; do
++ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+@@ -9802,11 +5193,11 @@
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+- for x in $LDFLAGS $LTLIBINTL; do
++ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+@@ -9823,7 +5214,7 @@
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+@@ -9861,2691 +5252,2155 @@
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+- LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
++ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+- echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
+-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $INCINTL"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBINTL"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias (const char *);
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gt_cv_func_gnugettext1_libintl=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-gt_cv_func_gnugettext1_libintl=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+- LIBS="$LIBS $LIBICONV"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias (const char *);
+-int
+-main ()
+-{
+-bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- LIBINTL="$LIBINTL $LIBICONV"
+- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+- gt_cv_func_gnugettext1_libintl=yes
+-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- fi
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"
+-fi
+-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
+-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
+- fi
+-
+- if test "$gt_cv_func_gnugettext1_libc" = "yes" \
+- || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+- && test "$PACKAGE" != gettext-runtime \
+- && test "$PACKAGE" != gettext-tools; }; then
+- gt_use_preinstalled_gnugettext=yes
+- else
+- LIBINTL=
+- LTLIBINTL=
+- INCINTL=
+- fi
+-
+-
+- if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+- nls_cv_use_gnu_gettext=yes
+- fi
+- fi
+-
+- if test "$nls_cv_use_gnu_gettext" = "yes"; then
+- BUILD_INCLUDED_LIBINTL=yes
+- USE_INCLUDED_LIBINTL=yes
+- LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
+- LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
+- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+- fi
+-
+- CATOBJEXT=
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- CATOBJEXT=.gmo
+- fi
+-
+-
+- if test -n "$INTL_MACOSX_LIBS"; then
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+- LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+- fi
+- fi
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes" \
+- || test "$nls_cv_use_gnu_gettext" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
+-
+- else
+- USE_NLS=no
+- fi
+- fi
+-
+- echo "$as_me:$LINENO: checking whether to use NLS" >&5
+-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
+- echo "$as_me:$LINENO: result: $USE_NLS" >&5
+-echo "${ECHO_T}$USE_NLS" >&6
+- if test "$USE_NLS" = "yes"; then
+- echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
+- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- gt_source="external libintl"
+- else
+- gt_source="libc"
+- fi
+- else
+- gt_source="included intl directory"
+- fi
+- echo "$as_me:$LINENO: result: $gt_source" >&5
+-echo "${ECHO_T}$gt_source" >&6
+- fi
+-
+- if test "$USE_NLS" = "yes"; then
+-
+- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- echo "$as_me:$LINENO: checking how to link with libintl" >&5
+-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
+- echo "$as_me:$LINENO: result: $LIBINTL" >&5
+-echo "${ECHO_T}$LIBINTL" >&6
+-
+- for element in $INCINTL; do
+- haveit=
+- for x in $CPPFLAGS; do
+
+- acl_save_prefix="$prefix"
+- prefix="$acl_final_prefix"
+- acl_save_exec_prefix="$exec_prefix"
+- exec_prefix="$acl_final_exec_prefix"
+- eval x=\"$x\"
+- exec_prefix="$acl_save_exec_prefix"
+- prefix="$acl_save_prefix"
+
+- if test "X$x" = "X$element"; then
+- haveit=yes
+- break
+- fi
+- done
+- if test -z "$haveit"; then
+- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+- fi
+- done
+
+- fi
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DCGETTEXT 1
+-_ACEOF
+
+- fi
+
+- POSUB=po
+- fi
+
+
+- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+- BUILD_INCLUDED_LIBINTL=yes
+- fi
+
+
+
+
+
+- nls_cv_header_intl=
+- nls_cv_header_libgt=
+
+- DATADIRNAME=share
+
+
+- INSTOBJEXT=.mo
+
+
+- GENCAT=gencat
+
+
+- INTLOBJS=
+- if test "$USE_INCLUDED_LIBINTL" = yes; then
+- INTLOBJS="\$(GETTOBJS)"
+- fi
+
+
+- INTL_LIBTOOL_SUFFIX_PREFIX=
+
+
+
+- INTLLIBS="$LIBINTL"
+
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
++$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
++if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <CoreFoundation/CFPreferences.h>
++int
++main ()
++{
++CFPreferencesCopyAppValue(NULL, NULL)
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ gt_cv_func_CFPreferencesCopyAppValue=yes
++else
++ gt_cv_func_CFPreferencesCopyAppValue=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$gt_save_LIBS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
++$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
++ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
++$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
++$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
++if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <CoreFoundation/CFLocale.h>
++int
++main ()
++{
++CFLocaleCopyCurrent();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ gt_cv_func_CFLocaleCopyCurrent=yes
++else
++ gt_cv_func_CFLocaleCopyCurrent=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$gt_save_LIBS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
++$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
++ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
++$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
++ fi
++ INTL_MACOSX_LIBS=
++ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
++ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
++ fi
+
+
+
+
+
+- abook_localedir="$datadir/locale"
+- abook_localedir=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+- eval tmp_abook_prefix=\""$abook_localedir"\"
+- eval echo $tmp_abook_prefix
+- )`
+
+-localedir="\$(datadir)/locale"
++ LIBINTL=
++ LTLIBINTL=
++ POSUB=
+
++ case " $gt_needs " in
++ *" need-formatstring-macros "*) gt_api_version=3 ;;
++ *" need-ngettext "*) gt_api_version=2 ;;
++ *) gt_api_version=1 ;;
++ esac
++ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
++ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+-# Check whether --with-localedir or --without-localedir was given.
+-if test "${with_localedir+set}" = set; then
+- withval="$with_localedir"
++ if test "$USE_NLS" = "yes"; then
++ gt_use_preinstalled_gnugettext=no
+
+-fi;
+-if test "x$with_localedir" != "x"; then
+- abook_localedir="$with_localedir"
+- localedir="$with_localedir"
+-fi
+
++ if test $gt_api_version -ge 3; then
++ gt_revision_test_code='
++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
++#endif
++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
++'
++ else
++ gt_revision_test_code=
++ fi
++ if test $gt_api_version -ge 2; then
++ gt_expression_test_code=' + * ngettext ("", "", 0)'
++ else
++ gt_expression_test_code=
++ fi
+
+-cat >>confdefs.h <<_ACEOF
+-#define LOCALEDIR "$abook_localedir"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
++$as_echo_n "checking for GNU gettext in libc... " >&6; }
++if eval \${$gt_func_gnugettext_libc+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
++extern int *_nl_domain_bindings;
++int
++main ()
++{
++bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
++ ;
++ return 0;
++}
+ _ACEOF
+-
+-
+-
+-
+-
+-if test x$USE_INCLUDED_LIBINTL = xyes; then
+- USE_INCLUDED_INTL_H_TRUE=
+- USE_INCLUDED_INTL_H_FALSE='#'
++if ac_fn_c_try_link "$LINENO"; then :
++ eval "$gt_func_gnugettext_libc=yes"
+ else
+- USE_INCLUDED_INTL_H_TRUE='#'
+- USE_INCLUDED_INTL_H_FALSE=
++ eval "$gt_func_gnugettext_libc=no"
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++eval ac_res=\$$gt_func_gnugettext_libc
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+
++ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="gcc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
+-fi
+
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="${ac_tool_prefix}cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
++ am_save_CPPFLAGS="$CPPFLAGS"
+
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++ for element in $INCICONV; do
++ haveit=
++ for x in $CPPFLAGS; do
+
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
++ fi
++ done
+
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
+-fi
+
+-fi
+-if test -z "$CC"; then
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
++$as_echo_n "checking for iconv... " >&6; }
++if ${am_cv_func_iconv+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+- ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+- ac_prog_rejected=yes
+- continue
+- fi
+- ac_cv_prog_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+
+-if test $ac_prog_rejected = yes; then
+- # We found a bogon in the path, so make sure we never use it.
+- set dummy $ac_cv_prog_CC
+- shift
+- if test $# != 0; then
+- # We chose a different compiler from the bogus one.
+- # However, it has the same basename, so the bogon will be chosen
+- # first if we set CC to just the basename; use the full file name.
+- shift
+- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+- fi
+-fi
+-fi
++ am_cv_func_iconv="no, consider installing GNU libiconv"
++ am_cv_lib_iconv=no
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <iconv.h>
++int
++main ()
++{
++iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ am_cv_func_iconv=yes
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$am_cv_func_iconv" != yes; then
++ am_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBICONV"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <iconv.h>
++int
++main ()
++{
++iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ am_cv_lib_iconv=yes
++ am_cv_func_iconv=yes
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$am_save_LIBS"
++ fi
+
+ fi
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
++$as_echo "$am_cv_func_iconv" >&6; }
++ if test "$am_cv_func_iconv" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
++$as_echo_n "checking for working iconv... " >&6; }
++if ${am_cv_func_iconv_works+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++
++ am_save_LIBS="$LIBS"
++ if test $am_cv_lib_iconv = yes; then
++ LIBS="$LIBS $LIBICONV"
++ fi
++ if test "$cross_compiling" = yes; then :
++ case "$host_os" in
++ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
++ *) am_cv_func_iconv_works="guessing yes" ;;
++ esac
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++#include <iconv.h>
++#include <string.h>
++int main ()
++{
++ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
++ returns. */
++ {
++ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
++ if (cd_utf8_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\342\202\254"; /* EURO SIGN */
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_utf8_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
++#if 0 /* This bug could be worked around by the caller. */
++ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
++ {
++ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
++ if (cd_88591_to_utf8 != (iconv_t)(-1))
++ {
++ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
++ char buf[50];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_88591_to_utf8,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if ((int)res > 0)
++ return 1;
++ }
++ }
++#endif
++ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
++ provided. */
++ if (/* Try standardized names. */
++ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
++ /* Try IRIX, OSF/1 names. */
++ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
++ /* Try AIX names. */
++ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
++ /* Try HP-UX names. */
++ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
++ return 1;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ am_cv_func_iconv_works=yes
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ am_cv_func_iconv_works=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+- test -n "$CC" && break
+- done
++ LIBS="$am_save_LIBS"
++
+ fi
+-if test -z "$CC"; then
+- ac_ct_CC=$CC
+- for ac_prog in cl
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
++$as_echo "$am_cv_func_iconv_works" >&6; }
++ case "$am_cv_func_iconv_works" in
++ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
++ *) am_func_iconv=yes ;;
++ esac
++ else
++ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+-done
+-done
++ if test "$am_func_iconv" = yes; then
+
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+- test -n "$ac_ct_CC" && break
+-done
++ fi
++ if test "$am_cv_lib_iconv" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
++$as_echo_n "checking how to link with libiconv... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
++$as_echo "$LIBICONV" >&6; }
++ else
++ CPPFLAGS="$am_save_CPPFLAGS"
++ LIBICONV=
++ LTLIBICONV=
++ fi
+
+- CC=$ac_ct_CC
+-fi
++
++
++
++
++
++
++
++
++
++
++ use_additional=yes
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++
++# Check whether --with-libintl-prefix was given.
++if test "${with_libintl_prefix+set}" = set; then :
++ withval=$with_libintl_prefix;
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
++ fi
++ fi
+
+ fi
+
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ LIBINTL_PREFIX=
++ HAVE_LIBINTL=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='intl '
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
++ else
++ :
++ fi
++ else
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
++ if test -n "$acl_shlibext"; then
++ shrext=".$acl_shlibext" # typically: shrext=.so
++ else
++ shrext=
++ fi
++ if test $use_additional = yes; then
++ dir="$additional_libdir"
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIBINTL; do
+
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-# Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ if test "$acl_hardcode_direct" = yes; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ haveit=
++ for x in $LDFLAGS $LIBINTL; do
+
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+- choke me
+-#endif
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
++ fi
++ if test "$acl_hardcode_minus_L" != no; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
++ fi
++ fi
++ additional_includedir=
++ case "$found_dir" in
++ */$acl_libdirstem | */$acl_libdirstem/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
++ if test "$name" = 'intl'; then
++ LIBINTL_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = 'intl'; then
++ LIBINTL_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INCINTL; do
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_compiler_gnu=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-ac_compiler_gnu=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test -n "$found_la"; then
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIBINTL; do
+
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-int
+-main ()
+-{
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
++ for x in $LDFLAGS $LTLIBINTL; do
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_prog_cc_g=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ ;;
++ -R*)
++ dir=`echo "X$dep" | sed -e 's/^X-R//'`
++ if test "$enable_rpath" != no; then
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $dir"
++ fi
++ fi
++ ;;
++ -l*)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
++ ;;
++ *.la)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
++ ;;
++ *)
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
++ ;;
++ esac
++ done
++ fi
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
++ fi
++ fi
++ fi
++ done
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n "$acl_hardcode_libdir_separator"; then
++ alldirs=
++ for found_dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
++ done
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ else
++ for found_dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$found_dir"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ done
++ fi
+ fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
++ if test "X$ltrpathdirs" != "X"; then
++ for found_dir in $ltrpathdirs; do
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
++ done
+ fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+- function prototypes and stuff, but not '\xHH' hex character constants.
+- These don't provoke an error unfortunately, instead are silently treated
+- as 'x'. The following induces an error, until -std1 is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std1. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+- ;
+- return 0;
+-}
+-_ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+
+-fi
+
+-case "x$ac_cv_prog_cc_stdc" in
+- x|xno)
+- echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+- *)
+- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+- CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
++$as_echo_n "checking for GNU gettext in libintl... " >&6; }
++if eval \${$gt_func_gnugettext_libintl+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ gt_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $INCINTL"
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBINTL"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias (const char *);
+ int
+ main ()
+ {
+-exit (42);
++bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- :
++if ac_fn_c_try_link "$LINENO"; then :
++ eval "$gt_func_gnugettext_libintl=yes"
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
++ eval "$gt_func_gnugettext_libintl=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
++ LIBS="$LIBS $LIBICONV"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_declaration
++#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias (const char *);
+ int
+ main ()
+ {
+-exit (42);
++bindtextdomain ("", "");
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ LIBINTL="$LIBINTL $LIBICONV"
++ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
++ eval "$gt_func_gnugettext_libintl=yes"
+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ fi
++ CPPFLAGS="$gt_save_CPPFLAGS"
++ LIBS="$gt_save_LIBS"
+ fi
++eval ac_res=\$$gt_func_gnugettext_libintl
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++ fi
+
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
++ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
++ && test "$PACKAGE" != gettext-runtime \
++ && test "$PACKAGE" != gettext-tools; }; then
++ gt_use_preinstalled_gnugettext=yes
++ else
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ fi
+
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-depcc="$CC" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
++ if test -n "$INTL_MACOSX_LIBS"; then
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
++ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
++ fi
++ fi
+
+- am_cv_CC_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
++
++ else
++ USE_NLS=no
++ fi
+ fi
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+- case $depmode in
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
++$as_echo_n "checking whether to use NLS... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
++$as_echo "$USE_NLS" >&6; }
++ if test "$USE_NLS" = "yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
++$as_echo_n "checking where the gettext function comes from... " >&6; }
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
++ gt_source="external libintl"
+ else
+- break
+- fi
+- ;;
+- none) break ;;
+- esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+- if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CC_dependencies_compiler_type=$depmode
+- break
++ gt_source="libc"
+ fi
++ else
++ gt_source="included intl directory"
+ fi
+- done
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
++$as_echo "$gt_source" >&6; }
++ fi
+
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_CC_dependencies_compiler_type=none
+-fi
++ if test "$USE_NLS" = "yes"; then
+
+-fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
++$as_echo_n "checking how to link with libintl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
++$as_echo "$LIBINTL" >&6; }
+
++ for element in $INCINTL; do
++ haveit=
++ for x in $CPPFLAGS; do
+
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+- am__fastdepCC_TRUE=
+- am__fastdepCC_FALSE='#'
+-else
+- am__fastdepCC_TRUE='#'
+- am__fastdepCC_FALSE=
+-fi
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
++ fi
++ done
++
++ fi
+
+
+-echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+-if test "${ac_cv_search_strerror+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_strerror=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char strerror ();
+-int
+-main ()
+-{
+-strerror ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_strerror="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_strerror" = no; then
+- for ac_lib in cposix; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char strerror ();
+-int
+-main ()
+-{
+-strerror ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_strerror="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ fi
+
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+-fi
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-echo "${ECHO_T}$ac_cv_search_strerror" >&6
+-if test "$ac_cv_search_strerror" != no; then
+- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
++ POSUB=po
++ fi
+
+-fi
+
+-echo "$as_me:$LINENO: checking for function prototypes" >&5
+-echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
+-if test "$ac_cv_prog_cc_stdc" != no; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+
+-cat >>confdefs.h <<\_ACEOF
+-#define PROTOTYPES 1
+-_ACEOF
++ INTLLIBS="$LIBINTL"
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define __PROTOTYPES 1
+-_ACEOF
+
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+
+-if test "$ac_cv_prog_cc_stdc" != no; then
+- U= ANSI2KNR=
+-else
+- U=_ ANSI2KNR=./ansi2knr
+-fi
+-# Ensure some checks needed by ansi2knr itself.
+
+
+-for ac_header in string.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ abook_localedir="$datadir/locale"
++ abook_localedir=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++ eval tmp_abook_prefix=\""$abook_localedir"\"
++ eval echo $tmp_abook_prefix
++ )`
+
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++localedir="\$(datadir)/locale"
+
++
++# Check whether --with-localedir was given.
++if test "${with_localedir+set}" = set; then :
++ withval=$with_localedir;
+ fi
+
+-done
++if test "x$with_localedir" != "x"; then
++ abook_localedir="$with_localedir"
++ localedir="$with_localedir"
++fi
+
+
+-if test "x$U" != "x"; then
+- { { echo "$as_me:$LINENO: error: Compiler not ANSI compliant" >&5
+-echo "$as_me: error: Compiler not ANSI compliant" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-echo "$as_me:$LINENO: checking for inline" >&5
+-echo $ECHO_N "checking for inline... $ECHO_C" >&6
+-if test "${ac_cv_c_inline+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_c_inline=no
+-for ac_kw in inline __inline__ __inline; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++cat >>confdefs.h <<_ACEOF
++#define LOCALEDIR "$abook_localedir"
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifndef __cplusplus
+-typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
+-#endif
+
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_c_inline=$ac_kw; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+
++ if test x$USE_INCLUDED_LIBINTL = xyes; then
++ USE_INCLUDED_INTL_H_TRUE=
++ USE_INCLUDED_INTL_H_FALSE='#'
++else
++ USE_INCLUDED_INTL_H_TRUE='#'
++ USE_INCLUDED_INTL_H_FALSE=
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-echo "${ECHO_T}$ac_cv_c_inline" >&6
+
+
+-case $ac_cv_c_inline in
+- inline | yes) ;;
+- *)
+- case $ac_cv_c_inline in
+- no) ac_val=;;
+- *) ac_val=$ac_cv_c_inline;;
+- esac
+- cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+- ;;
+-esac
+
+-# Find a good install program. We prefer a C program (faster),
+-# so one script is as good as another. But avoid the broken or
+-# incompatible versions:
+-# SysV /etc/install, /usr/sbin/install
+-# SunOS /usr/etc/install
+-# IRIX /sbin/install
+-# AIX /bin/install
+-# AmigaOS /C/install, which installs bootblocks on floppy discs
+-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+-# OS/2's system install, which has a completely different semantic
+-# ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+-if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in
+- ./ | .// | /cC/* | \
+- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+- /usr/ucb/* ) ;;
+- *)
+- # OSF1 and SCO ODT 3.0 have their own names for install.
+- # Don't use installbsd from OSF since it installs stuff as root
+- # by default.
+- for ac_prog in ginstall scoinst install; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+- if test $ac_prog = install &&
+- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+- # AIX install. It has an incompatible calling convention.
+- :
+- elif test $ac_prog = install &&
+- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+- # program-specific install script used by HP pwplus--don't use.
+- :
+- else
+- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+- break 3
+- fi
+- fi
+- done
+- done
+- ;;
+-esac
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="${ac_tool_prefix}gcc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
+ done
+-
++ done
++IFS=$as_save_IFS
+
+ fi
+- if test "${ac_cv_path_install+set}" = set; then
+- INSTALL=$ac_cv_path_install
+- else
+- # As a last resort, use the slow shell script. We don't cache a
+- # path for INSTALL within a source directory, because that will
+- # break other packages using the cache if that directory is
+- # removed, or if the path is relative.
+- INSTALL=$ac_install_sh
+- fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
+-
+-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+-# It thinks the first close brace ends the variable substitution.
+-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+-
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+-
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+-
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+-int
+-main ()
+-{
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_header_stdc=yes
++fi
++if test -z "$ac_cv_prog_CC"; then
++ ac_ct_CC=$CC
++ # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_CC="gcc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-if test $ac_cv_header_stdc = yes; then
+- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <string.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "memchr" >/dev/null 2>&1; then
+- :
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+- ac_cv_header_stdc=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-rm -f conftest*
+
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
++else
++ CC="$ac_cv_prog_CC"
+ fi
+
+-if test $ac_cv_header_stdc = yes; then
+- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="${ac_tool_prefix}cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "free" >/dev/null 2>&1; then
+- :
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+- ac_cv_header_stdc=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-rm -f conftest*
+
+-fi
+
+-if test $ac_cv_header_stdc = yes; then
+- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+- if test "$cross_compiling" = yes; then
+- :
++ fi
++fi
++if test -z "$CC"; then
++ # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <ctype.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+- (('a' <= (c) && (c) <= 'i') \
+- || ('j' <= (c) && (c) <= 'r') \
+- || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
+-
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+- int i;
+- for (i = 0; i < 256; i++)
+- if (XOR (islower (i), ISLOWER (i))
+- || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- :
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
++ fi
++ ac_cv_prog_CC="cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-( exit $ac_status )
+-ac_cv_header_stdc=no
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# != 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++ fi
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+-if test $ac_cv_header_stdc = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
+
+ fi
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in cl.exe
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+
+-
+-
+-for ac_header in unistd.h locale.h sys/ioctl.h iconv.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ test -n "$CC" && break
++ done
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test -z "$CC"; then
++ ac_ct_CC=$CC
++ for ac_prog in cl.exe
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_CC="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+-ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+ fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
++
++ test -n "$ac_ct_CC" && break
++done
++
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
++ CC=$ac_ct_CC
++ fi
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+ fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+
+-fi
+
+-done
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+
+-if test "${ac_cv_header_stdarg_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for stdarg.h" >&5
+-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
+-if test "${ac_cv_header_stdarg_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
+-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking stdarg.h usability" >&5
+-echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <stdarg.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++if ${ac_cv_c_compiler_gnu+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
+
+-# Is the header present?
+-echo "$as_me:$LINENO: checking stdarg.h presence" >&5
+-echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdarg.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_compiler_gnu=yes
+ else
+- ac_cpp_err=yes
++ ac_compiler_gnu=no
+ fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+- ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: stdarg.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: stdarg.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: stdarg.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: stdarg.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for stdarg.h" >&5
+-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
+-if test "${ac_cv_header_stdarg_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++ GCC=yes
+ else
+- ac_cv_header_stdarg_h=$ac_header_preproc
++ GCC=
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
+-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if ${ac_cv_prog_cc_g+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-fi
+-if test $ac_cv_header_stdarg_h = yes; then
++int
++main ()
++{
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STDARG_H 1
++ ;
++ return 0;
++}
+ _ACEOF
+-
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
+ else
+- { { echo "$as_me:$LINENO: error: *** stdarg.h is missing on your system ***" >&5
+-echo "$as_me: error: *** stdarg.h is missing on your system ***" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+
+-echo "$as_me:$LINENO: checking for working strcoll" >&5
+-echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
+-if test "${ac_cv_func_strcoll_works+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then
+- ac_cv_func_strcoll_works=no
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
++
+ int
+ main ()
+ {
+-exit (strcoll ("abc", "def") >= 0 ||
+- strcoll ("ABC", "DEF") >= 0 ||
+- strcoll ("123", "456") >= 0)
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_strcoll_works=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_func_strcoll_works=no
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
+-echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
+-if test $ac_cv_func_strcoll_works = yes; then
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if ${ac_cv_prog_cc_c89+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++#include <stdio.h>
++struct stat;
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
++ function prototypes and stuff, but not '\xHH' hex character constants.
++ These don't provoke an error unfortunately, instead are silently treated
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRCOLL 1
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++ ;
++ return 0;
++}
+ _ACEOF
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_c89=$ac_arg
++fi
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
++done
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
+
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
++ xno)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
++fi
+
+-for ac_func in setlocale
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++depcc="$CC" am_compiler_list=
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ rm -rf conftest.dir
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++ am_cv_CC_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++ fi
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
++ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
++ else
++ break
++ fi
++ ;;
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
++ none) break ;;
++ esac
++ if depmode=$depmode \
++ source=sub/conftest.c object=$am__obj \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_CC_dependencies_compiler_type=$depmode
++ break
++ fi
++ fi
++ done
++
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_CC_dependencies_compiler_type=none
++fi
+
+-#undef $ac_func
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
++ if
++ test "x$enable_dependency_tracking" != xno \
++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
++ am__fastdepCC_TRUE=
++ am__fastdepCC_FALSE='#'
++else
++ am__fastdepCC_TRUE='#'
++ am__fastdepCC_FALSE=
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
++$as_echo_n "checking for library containing strerror... " >&6; }
++if ${ac_cv_search_strerror+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+ #ifdef __cplusplus
+-}
++extern "C"
+ #endif
+-
++char strerror ();
+ int
+ main ()
+ {
+-return f != $ac_func;
++return strerror ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
++for ac_lib in '' cposix; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_strerror=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if ${ac_cv_search_strerror+:} false; then :
++ break
++fi
++done
++if ${ac_cv_search_strerror+:} false; then :
++
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_search_strerror=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
++$as_echo "$ac_cv_search_strerror" >&6; }
++ac_res=$ac_cv_search_strerror
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5
++$as_echo_n "checking for function prototypes... " >&6; }
++if test "$ac_cv_prog_cc_c89" != no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define PROTOTYPES 1" >>confdefs.h
++
+
+-eval "$as_ac_var=no"
++$as_echo "#define __PROTOTYPES 1" >>confdefs.h
++
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++
++
++
++if test "$ac_cv_prog_cc_stdc" != no; then
++ U= ANSI2KNR=
++else
++ U=_ ANSI2KNR=./ansi2knr
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++# Ensure some checks needed by ansi2knr itself.
++
++for ac_header in string.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
++if test "x$ac_cv_header_string_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_STRING_H 1
+ _ACEOF
+
+ fi
++
+ done
+
+
+-ac_widec_funcs=yes
+-if test "${ac_cv_header_wchar_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for wchar.h" >&5
+-echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6
+-if test "${ac_cv_header_wchar_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "x$U" != "x"; then
++ as_fn_error $? "Compiler not ANSI compliant" "$LINENO" 5
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_wchar_h" >&5
+-echo "${ECHO_T}$ac_cv_header_wchar_h" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if ${ac_cv_c_inline+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking wchar.h usability" >&5
+-echo $ECHO_N "checking wchar.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
+-#include <wchar.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
+
+-# Is the header present?
+-echo "$as_me:$LINENO: checking wchar.h presence" >&5
+-echo $ECHO_N "checking wchar.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <wchar.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_inline=$ac_kw
+ fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ test "$ac_cv_c_inline" != no && break
++done
+
+- ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: wchar.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: wchar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: wchar.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: wchar.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: wchar.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: wchar.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: wchar.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: wchar.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: wchar.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: wchar.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: wchar.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: wchar.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: wchar.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: wchar.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: wchar.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: wchar.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++case $ac_cv_c_inline in
++ inline | yes) ;;
++ *)
++ case $ac_cv_c_inline in
++ no) ac_val=;;
++ *) ac_val=$ac_cv_c_inline;;
++ esac
++ cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for wchar.h" >&5
+-echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6
+-if test "${ac_cv_header_wchar_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if ${ac_cv_header_stdc+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- ac_cv_header_wchar_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_wchar_h" >&5
+-echo "${ECHO_T}$ac_cv_header_wchar_h" >&6
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_stdc=yes
++else
++ ac_cv_header_stdc=no
+ fi
+-if test $ac_cv_header_wchar_h = yes; then
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+- ac_have_wchar_h=yes
++if test $ac_cv_header_stdc = yes; then
++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <string.h>
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WCHAR_H 1
+ _ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "memchr" >/dev/null 2>&1; then :
+
+ else
+- ac_have_wchar_h=no
++ ac_cv_header_stdc=no
+ fi
++rm -f conftest*
+
++fi
+
++if test $ac_cv_header_stdc = yes; then
++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
+
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "free" >/dev/null 2>&1; then :
+
++else
++ ac_cv_header_stdc=no
++fi
++rm -f conftest*
+
++fi
+
+-for ac_func in mbtowc wcwidth mbrtowc mbsinit
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++if test $ac_cv_header_stdc = yes; then
++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++ if test "$cross_compiling" = yes; then :
++ :
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
++# define ISLOWER(c) \
++ (('a' <= (c) && (c) <= 'i') \
++ || ('j' <= (c) && (c) <= 'r') \
++ || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+ #endif
+
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
+-return f != $ac_func;
+- ;
++ int i;
++ for (i = 0; i < 256; i++)
++ if (XOR (islower (i), ISLOWER (i))
++ || toupper (i) != TOUPPER (i))
++ return 2;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_run "$LINENO"; then :
++
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
+-eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
++fi
++
++for ac_header in unistd.h locale.h sys/ioctl.h iconv.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+-else
+- ac_widec_funcs=no
+ fi
++
+ done
+
+-echo "$as_me:$LINENO: checking whether wcwidth is declared" >&5
+-echo $ECHO_N "checking whether wcwidth is declared... $ECHO_C" >&6
+-if test "${ac_cv_have_decl_wcwidth+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdarg_h" = xyes; then :
++
++$as_echo "#define HAVE_STDARG_H 1" >>confdefs.h
++
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ as_fn_error $? "*** stdarg.h is missing on your system ***" "$LINENO" 5
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
++$as_echo_n "checking for working strcoll... " >&6; }
++if ${ac_cv_func_strcoll_works+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "$cross_compiling" = yes; then :
++ ac_cv_func_strcoll_works=no
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $ac_includes_default
+ int
+ main ()
+ {
+-#ifndef wcwidth
+- char *p = (char *) wcwidth;
+-#endif
+-
++return (strcoll ("abc", "def") >= 0 ||
++ strcoll ("ABC", "DEF") >= 0 ||
++ strcoll ("123", "456") >= 0)
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_have_decl_wcwidth=yes
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_strcoll_works=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_have_decl_wcwidth=no
++ ac_cv_func_strcoll_works=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_wcwidth" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6
+-if test $ac_cv_have_decl_wcwidth = yes; then
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_WCWIDTH 1
+-_ACEOF
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
++$as_echo "$ac_cv_func_strcoll_works" >&6; }
++if test $ac_cv_func_strcoll_works = yes; then
+
++$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
+
+-else
++fi
++
++for ac_func in setlocale
++do :
++ ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
++if test "x$ac_cv_func_setlocale" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_WCWIDTH 0
++#define HAVE_SETLOCALE 1
+ _ACEOF
+
+-
+ fi
++done
++
++
++ac_widec_funcs=yes
++ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
++if test "x$ac_cv_header_wchar_h" = xyes; then :
++
++ ac_have_wchar_h=yes
+
++$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
+
+-echo "$as_me:$LINENO: checking for wchar_t" >&5
+-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+-if test "${ac_cv_type_wchar_t+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((wchar_t *) 0)
+- return 0;
+-if (sizeof (wchar_t))
+- return 0;
+- ;
+- return 0;
+-}
++ ac_have_wchar_h=no
++fi
++
++
++for ac_func in mbtowc wcwidth mbrtowc mbsinit
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_type_wchar_t=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_wchar_t=no
++else
++ ac_widec_funcs=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++ac_fn_c_check_decl "$LINENO" "wcwidth" "ac_cv_have_decl_wcwidth" "$ac_includes_default"
++if test "x$ac_cv_have_decl_wcwidth" = xyes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
+-echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+-if test $ac_cv_type_wchar_t = yes; then
+- :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_WCWIDTH $ac_have_decl
++_ACEOF
++
++ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
++if test "x$ac_cv_type_wchar_t" = xyes; then :
++
+ else
+ ac_widec_funcs=no
+ fi
+@@ -12560,231 +7415,65 @@
+
+ abook_cv_curses=/usr
+
+-# Check whether --with-curses or --without-curses was given.
+-if test "${with_curses+set}" = set; then
+- withval="$with_curses"
+- if test $withval != yes; then
++# Check whether --with-curses was given.
++if test "${with_curses+set}" = set; then :
++ withval=$with_curses; if test $withval != yes; then
+ abook_cv_curses=$withval
+ fi
+ if test x$abook_cv_curses != x/usr; then
+ LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
+ CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
+ fi
+-fi;
++fi
++
+
+-echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
+-echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
+-if test "${ac_cv_lib_ncursesw_initscr+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
++$as_echo_n "checking for initscr in -lncursesw... " >&6; }
++if ${ac_cv_lib_ncursesw_initscr+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lncursesw $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char initscr ();
+ int
+ main ()
+ {
+-initscr ();
++return initscr ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ncursesw_initscr=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ncursesw_initscr=no
++ ac_cv_lib_ncursesw_initscr=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ncursesw_initscr" >&5
+-echo "${ECHO_T}$ac_cv_lib_ncursesw_initscr" >&6
+-if test $ac_cv_lib_ncursesw_initscr = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
++$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
++if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
+ LIBS="$LIBS -lncursesw"
+ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+ fi
+-
+-for ac_header in ncurses.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ for ac_header in ncurses.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
++if test "x$ac_cv_header_ncurses_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_NCURSES_H 1
+ _ACEOF
+
+ fi
+@@ -12794,219 +7483,53 @@
+ else
+
+ ac_widec_possible=no
+- echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
+-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+-if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
++$as_echo_n "checking for initscr in -lncurses... " >&6; }
++if ${ac_cv_lib_ncurses_initscr+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lncurses $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char initscr ();
+ int
+ main ()
+ {
+-initscr ();
++return initscr ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ncurses_initscr=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ncurses_initscr=no
++ ac_cv_lib_ncurses_initscr=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
+-echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6
+-if test $ac_cv_lib_ncurses_initscr = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
++$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
++if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+ LIBS="$LIBS -lncurses"
+ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ fi
+-
+-for ac_header in ncurses.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ for ac_header in ncurses.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
++if test "x$ac_cv_header_ncurses_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_NCURSES_H 1
+ _ACEOF
+
+ fi
+@@ -13015,237 +7538,92 @@
+
+ else
+
+-echo "$as_me:$LINENO: checking for initscr" >&5
+-echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+-if test "${ac_cv_func_initscr+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define initscr to an innocuous variant, in case <limits.h> declares initscr.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define initscr innocuous_initscr
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char initscr (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef initscr
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char initscr ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_initscr) || defined (__stub___initscr)
+-choke me
+-#else
+-char (*f) () = initscr;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != initscr;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_initscr=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ac_fn_c_check_func "$LINENO" "initscr" "ac_cv_func_initscr"
++if test "x$ac_cv_func_initscr" = xyes; then :
+
+-ac_cv_func_initscr=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_initscr" >&5
+-echo "${ECHO_T}$ac_cv_func_initscr" >&6
+-if test $ac_cv_func_initscr = yes; then
+- :
+ else
+
+ case $host_os in #(vi
+ freebsd*) #(vi
+- echo "$as_me:$LINENO: checking for tgoto in -lmytinfo" >&5
+-echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+-if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -lmytinfo" >&5
++$as_echo_n "checking for tgoto in -lmytinfo... " >&6; }
++if ${ac_cv_lib_mytinfo_tgoto+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char tgoto ();
+ int
+ main ()
+ {
+-tgoto ();
++return tgoto ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_mytinfo_tgoto=no
++ ac_cv_lib_mytinfo_tgoto=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_tgoto" >&5
+-echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+-if test $ac_cv_lib_mytinfo_tgoto = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mytinfo_tgoto" >&5
++$as_echo "$ac_cv_lib_mytinfo_tgoto" >&6; }
++if test "x$ac_cv_lib_mytinfo_tgoto" = xyes; then :
+ LIBS="-lmytinfo $LIBS"
+ fi
+
+ ;;
+ hpux10.*|hpux11.*)
+- echo "$as_me:$LINENO: checking for initscr in -lcur_colr" >&5
+-echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+-if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcur_colr" >&5
++$as_echo_n "checking for initscr in -lcur_colr... " >&6; }
++if ${ac_cv_lib_cur_colr_initscr+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char initscr ();
+ int
+ main ()
+ {
+-initscr ();
++return initscr ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_cur_colr_initscr=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_cur_colr_initscr=no
++ ac_cv_lib_cur_colr_initscr=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_cur_colr_initscr" >&5
+-echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+-if test $ac_cv_lib_cur_colr_initscr = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cur_colr_initscr" >&5
++$as_echo "$ac_cv_lib_cur_colr_initscr" >&6; }
++if test "x$ac_cv_lib_cur_colr_initscr" = xyes; then :
+
+ LIBS="-lcur_colr $LIBS"
+ CFLAGS="-I/usr/include/curses_colr $CFLAGS"
+@@ -13253,264 +7631,120 @@
+
+ else
+
+- echo "$as_me:$LINENO: checking for initscr in -lHcurses" >&5
+-echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+-if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lHcurses" >&5
++$as_echo_n "checking for initscr in -lHcurses... " >&6; }
++if ${ac_cv_lib_Hcurses_initscr+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char initscr ();
+-int
+-main ()
+-{
+-initscr ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_Hcurses_initscr=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_Hcurses_initscr=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Hcurses_initscr" >&5
+-echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+-if test $ac_cv_lib_Hcurses_initscr = yes; then
+-
+- # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+- LIBS="-lHcurses $LIBS"
+- CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS"
+- ac_cv_func_initscr=yes
+-
+-fi
+-
+-fi
+-
+- ;;
+-linux*) # Suse Linux does not follow /usr/lib convention
+- LIBS="$LIBS -L/lib"
+- ;;
+-esac
+-
+-if test ".$With5lib" != ".no" ; then
+-if test -d /usr/5lib ; then
+- # SunOS 3.x or 4.x
+- CPPFLAGS="$CPPFLAGS -I/usr/5include"
+- LIBS="$LIBS -L/usr/5lib"
+-fi
+-fi
+-
+-if test ".$ac_cv_func_initscr" != .yes ; then
+- cf_save_LIBS="$LIBS"
+- cf_term_lib=""
+- cf_curs_lib=""
+-
+- # Check for library containing tgoto. Do this before curses library
+- # because it may be needed to link the test-case for initscr.
+- echo "$as_me:$LINENO: checking for tgoto" >&5
+-echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+-if test "${ac_cv_func_tgoto+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define tgoto to an innocuous variant, in case <limits.h> declares tgoto.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define tgoto innocuous_tgoto
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char tgoto (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef tgoto
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char tgoto ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_tgoto) || defined (__stub___tgoto)
+-choke me
+-#else
+-char (*f) () = tgoto;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+-
++char initscr ();
+ int
+ main ()
+ {
+-return f != tgoto;
++return initscr ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_tgoto=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_Hcurses_initscr=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_Hcurses_initscr=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Hcurses_initscr" >&5
++$as_echo "$ac_cv_lib_Hcurses_initscr" >&6; }
++if test "x$ac_cv_lib_Hcurses_initscr" = xyes; then :
++
++ # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
++ LIBS="-lHcurses $LIBS"
++ CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS"
++ ac_cv_func_initscr=yes
++
++fi
++
++fi
++
++ ;;
++linux*) # Suse Linux does not follow /usr/lib convention
++ LIBS="$LIBS -L/lib"
++ ;;
++esac
+
+-ac_cv_func_tgoto=no
++if test ".$With5lib" != ".no" ; then
++if test -d /usr/5lib ; then
++ # SunOS 3.x or 4.x
++ CPPFLAGS="$CPPFLAGS -I/usr/5include"
++ LIBS="$LIBS -L/usr/5lib"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_tgoto" >&5
+-echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+-if test $ac_cv_func_tgoto = yes; then
++
++if test ".$ac_cv_func_initscr" != .yes ; then
++ cf_save_LIBS="$LIBS"
++ cf_term_lib=""
++ cf_curs_lib=""
++
++ # Check for library containing tgoto. Do this before curses library
++ # because it may be needed to link the test-case for initscr.
++ ac_fn_c_check_func "$LINENO" "tgoto" "ac_cv_func_tgoto"
++if test "x$ac_cv_func_tgoto" = xyes; then :
+ cf_term_lib=predefined
+ else
+
+ for cf_term_lib in termcap termlib unknown
+ do
+- as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for tgoto in -l$cf_term_lib" >&5
+-echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ as_ac_Lib=`$as_echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -l$cf_term_lib" >&5
++$as_echo_n "checking for tgoto in -l$cf_term_lib... " >&6; }
++if eval \${$as_ac_Lib+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char tgoto ();
+ int
+ main ()
+ {
+-tgoto ();
++return tgoto ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Lib=no"
++ eval "$as_ac_Lib=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
++eval ac_res=\$$as_ac_Lib
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ break
+ fi
+
+@@ -13523,89 +7757,56 @@
+ test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+ for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown
+ do
+- as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for initscr in -l$cf_curs_lib" >&5
+-echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ as_ac_Lib=`$as_echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -l$cf_curs_lib" >&5
++$as_echo_n "checking for initscr in -l$cf_curs_lib... " >&6; }
++if eval \${$as_ac_Lib+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_curs_lib $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char initscr ();
+ int
+ main ()
+ {
+-initscr ();
++return initscr ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Lib=no"
++ eval "$as_ac_Lib=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
++eval ac_res=\$$as_ac_Lib
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ break
+ fi
+
+ done
+- test $cf_curs_lib = unknown && { { echo "$as_me:$LINENO: error: no curses library found" >&5
+-echo "$as_me: error: no curses library found" >&2;}
+- { (exit 1); exit 1; }; }
++ test $cf_curs_lib = unknown && as_fn_error $? "no curses library found" "$LINENO" 5
+
+ LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ if test "$cf_term_lib" = unknown ; then
+- echo "$as_me:$LINENO: checking if we can link with $cf_curs_lib library" >&5
+-echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link with $cf_curs_lib library" >&5
++$as_echo_n "checking if we can link with $cf_curs_lib library... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <${cf_cv_ncurses_header-curses.h}>
+ int
+@@ -13616,50 +7817,20 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ cf_result=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cf_result=no
++ cf_result=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:$LINENO: result: $cf_result" >&5
+-echo "${ECHO_T}$cf_result" >&6
+- test $cf_result = no && { { echo "$as_me:$LINENO: error: Cannot link curses library" >&5
+-echo "$as_me: error: Cannot link curses library" >&2;}
+- { (exit 1); exit 1; }; }
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_result" >&5
++$as_echo "$cf_result" >&6; }
++ test $cf_result = no && as_fn_error $? "Cannot link curses library" "$LINENO" 5
+ elif test "$cf_term_lib" != predefined ; then
+- echo "$as_me:$LINENO: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+-echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++$as_echo_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <${cf_cv_ncurses_header-curses.h}>
+ int
+@@ -13670,40 +7841,12 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ cf_result=no
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <${cf_cv_ncurses_header-curses.h}>
+ int
+@@ -13714,43 +7857,19 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ cf_result=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cf_result=error
++ cf_result=error
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:$LINENO: result: $cf_result" >&5
+-echo "${ECHO_T}$cf_result" >&6
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_result" >&5
++$as_echo "$cf_result" >&6; }
+ fi
+ fi
+
+@@ -13767,23 +7886,23 @@
+
+ abook_cv_readline=/usr
+
+-# Check whether --with-readline or --without-readline was given.
+-if test "${with_readline+set}" = set; then
+- withval="$with_readline"
+- if test $withval != yes; then
++# Check whether --with-readline was given.
++if test "${with_readline+set}" = set; then :
++ withval=$with_readline; if test $withval != yes; then
+ abook_cv_readline=$withval
+ fi
+ if test x$abook_cv_readline != x/usr; then
+ LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
+ CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
+ fi
+-fi;
++fi
+
+
+- echo "$as_me:$LINENO: checking for a readline compatible library" >&5
+-echo $ECHO_N "checking for a readline compatible library... $ECHO_C" >&6
+-if test "${ac_cv_lib_readline+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
++$as_echo_n "checking for a readline compatible library... " >&6; }
++if ${ac_cv_lib_readline+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+
+ ORIG_LIBS="$LIBS"
+@@ -13795,58 +7914,29 @@
+ TRY_LIB="-l$readline_lib -l$termcap_lib"
+ fi
+ LIBS="$ORIG_LIBS $TRY_LIB"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+ char readline ();
+ int
+ main ()
+ {
+-readline ();
++return readline ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_readline="$TRY_LIB"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ if test -n "$ac_cv_lib_readline"; then
+ break
+ fi
+@@ -13861,627 +7951,221 @@
+ LIBS="$ORIG_LIBS"
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_readline" >&5
+-echo "${ECHO_T}$ac_cv_lib_readline" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline" >&5
++$as_echo "$ac_cv_lib_readline" >&6; }
+
+ if test "$ac_cv_lib_readline" != "no"; then
+ LIBS="$LIBS $ac_cv_lib_readline"
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBREADLINE 1
+-_ACEOF
+-
+-
+-
+-for ac_header in readline.h readline/readline.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ for ac_header in readline.h readline/readline.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+- echo "$as_me:$LINENO: checking whether readline supports history" >&5
+-echo $ECHO_N "checking whether readline supports history... $ECHO_C" >&6
+-if test "${ac_cv_lib_readline_history+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5
++$as_echo_n "checking whether readline supports history... " >&6; }
++if ${ac_cv_lib_readline_history+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+
+ ac_cv_lib_readline_history="no"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char add_history ();
+-int
+-main ()
+-{
+-add_history ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_readline_history="yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history" >&5
+-echo "${ECHO_T}$ac_cv_lib_readline_history" >&6
+- if test "$ac_cv_lib_readline_history" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_READLINE_HISTORY 1
+-_ACEOF
+-
+-
+-
+-for ac_header in history.h readline/history.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+- fi
+- fi
+-
+-
+-
+-if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
+- { { echo "$as_me:$LINENO: error: *** readline library not found or it doesn't support history ***" >&5
+-echo "$as_me: error: *** readline library not found or it doesn't support history ***" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-if test x$ac_widec_possible = xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HANDLE_MULTIBYTE 1
+-_ACEOF
+-
+-fi
+-
+-
+-for ac_func in resizeterm
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+-}
++extern "C"
+ #endif
+-
++char add_history ();
+ int
+ main ()
+ {
+-return f != $ac_func;
++return add_history ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_readline_history="yes"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history" >&5
++$as_echo "$ac_cv_lib_readline_history" >&6; }
++ if test "$ac_cv_lib_readline_history" = "yes"; then
++
++$as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h
++
++ for ac_header in history.h readline/history.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
++
+ done
+
++ fi
++ fi
+
+
+
+-for ac_func in snprintf vsnprintf
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
++if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
++ as_fn_error $? "*** readline library not found or it doesn't support history ***" "$LINENO" 5
++fi
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
++# Check whether --enable-vformat was given.
++if test "${enable_vformat+set}" = set; then :
++ enableval=$enable_vformat; case "${enableval}" in
++ yes) vformat=true ;;
++ no) vformat=false ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-vformat" "$LINENO" 5 ;;
++ esac
++else
++ vformat=false
++fi
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
++if test x$vformat = xtrue; then
++ ac_fn_c_check_header_mongrel "$LINENO" "vf_iface.h" "ac_cv_header_vf_iface_h" "$ac_includes_default"
++if test "x$ac_cv_header_vf_iface_h" = xyes; then :
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vf_read_file in -lvformat" >&5
++$as_echo_n "checking for vf_read_file in -lvformat... " >&6; }
++if ${ac_cv_lib_vformat_vf_read_file+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lvformat $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+ #ifdef __cplusplus
+-}
++extern "C"
+ #endif
+-
++char vf_read_file ();
+ int
+ main ()
+ {
+-return f != $ac_func;
++return vf_read_file ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_vformat_vf_read_file=yes
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_vformat_vf_read_file=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vformat_vf_read_file" >&5
++$as_echo "$ac_cv_lib_vformat_vf_read_file" >&6; }
++if test "x$ac_cv_lib_vformat_vf_read_file" = xyes; then :
++
++ MODULES="$MODULES m_vcf"
++
++$as_echo "#define HAVE_VFORMAT 1" >>confdefs.h
++
++ have_vformat=yes
++
++fi
++
++
++fi
++
++
++fi
++ if test x"$have_vformat" = "xyes"; then
++ ENABLE_VFORMAT_SUPPORT_TRUE=
++ ENABLE_VFORMAT_SUPPORT_FALSE='#'
++else
++ ENABLE_VFORMAT_SUPPORT_TRUE='#'
++ ENABLE_VFORMAT_SUPPORT_FALSE=
++fi
++
++
++
++
++if test x$ac_widec_possible = xyes; then
++
++$as_echo "#define HANDLE_MULTIBYTE 1" >>confdefs.h
++
++fi
++
++for ac_func in resizeterm
++do :
++ ac_fn_c_check_func "$LINENO" "resizeterm" "ac_cv_func_resizeterm"
++if test "x$ac_cv_func_resizeterm" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_RESIZETERM 1
++_ACEOF
+
+-eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
++done
++
++
++for ac_func in snprintf vsnprintf
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++done
++
++
++for ac_func in strcasestr
++do :
++ ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
++if test "x$ac_cv_func_strcasestr" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_STRCASESTR 1
+ _ACEOF
++ $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
+
+ fi
+ done
+
+
+-# Check whether --enable-debug or --disable-debug was given.
+-if test "${enable_debug+set}" = set; then
+- enableval="$enable_debug"
+- case "${enableval}" in
++# Check whether --enable-debug was given.
++if test "${enable_debug+set}" = set; then :
++ enableval=$enable_debug; case "${enableval}" in
+ yes) debug=true ;;
+ no) debug=false ;;
+- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
+-echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
+- { (exit 1); exit 1; }; } ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
+ esac
+ else
+ debug=false
+-fi;
++fi
++
+
+ if test x$debug = xtrue; then
+ CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
+@@ -14492,7 +8176,8 @@
+ CFLAGS="-Wall $CFLAGS"
+ fi
+
+- ac_config_files="$ac_config_files Makefile abook.spec intl/Makefile po/Makefile.in"
++ac_config_files="$ac_config_files Makefile abook.spec po/Makefile.in"
++
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -14511,39 +8196,70 @@
+
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++ *) { eval $ac_var=; unset $ac_var;} ;;
++ esac ;;
++ esac
++ done
++
+ (set) 2>&1 |
+- case `(ac_space=' '; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
+- # `set' does not quote correctly, so add quotes (double-quote
+- # substitution turns \\\\ into \\, and sed turns \\ into \).
++ case $as_nl`(ac_space=' '; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
++ # `set' does not quote correctly, so add quotes: double-quote
++ # substitution turns \\\\ into \\, and sed turns \\ into \.
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+- ;;
++ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-} |
++ esac |
++ sort
++) |
+ sed '
++ /^ac_cv_env_/b end
+ t clear
+- : clear
++ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+- : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+- if test -w $cache_file; then
+- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+- cat confcache >$cache_file
++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++ :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++ if test -w "$cache_file"; then
++ if test "x$cache_file" != "x/dev/null"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
++ if test ! -f "$cache_file" || test -h "$cache_file"; then
++ cat confcache >"$cache_file"
++ else
++ case $cache_file in #(
++ */* | ?:*)
++ mv -f confcache "$cache_file"$$ &&
++ mv -f "$cache_file"$$ "$cache_file" ;; #(
++ *)
++ mv -f confcache "$cache_file" ;;
++ esac
++ fi
++ fi
+ else
+- echo "not updating unwritable cache $cache_file"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+ fi
+ rm -f confcache
+@@ -14552,73 +8268,61 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[ ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+- ac_i=`echo "$ac_i" |
+- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+- # 2. Add them.
+- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
++ # will be set to the directory where LIBOBJS objects are built.
++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+
+ LTLIBOBJS=$ac_ltlibobjs
+
+
++ if test -n "$EXEEXT"; then
++ am__EXEEXT_TRUE=
++ am__EXEEXT_FALSE='#'
++else
++ am__EXEEXT_TRUE='#'
++ am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_INCLUDED_INTL_H_TRUE}" && test -z "${USE_INCLUDED_INTL_H_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"USE_INCLUDED_INTL_H\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"USE_INCLUDED_INTL_H\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "conditional \"USE_INCLUDED_INTL_H\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${ENABLE_VFORMAT_SUPPORT_TRUE}" && test -z "${ENABLE_VFORMAT_SUPPORT_FALSE}"; then
++ as_fn_error $? "conditional \"ENABLE_VFORMAT_SUPPORT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
++ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
++as_write_fail=0
++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -14628,81 +8332,253 @@
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-## --------------------- ##
+-## M4sh Initialization. ##
+-## --------------------- ##
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
++esac
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- as_unset=unset
+-else
+- as_unset=false
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='print -r --'
++ as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='printf %s\n'
++ as_echo_n='printf %s'
++else
++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++ as_echo_n='/usr/ucb/echo -n'
++ else
++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++ as_echo_n_body='eval
++ arg=$1;
++ case $arg in #(
++ *"$as_nl"*)
++ expr "X$arg" : "X\\(.*\\)$as_nl";
++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++ esac;
++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++ '
++ export as_echo_n_body
++ as_echo_n='sh -c $as_echo_n_body as_echo'
++ fi
++ export as_echo_body
++ as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ PATH_SEPARATOR=:
++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++ PATH_SEPARATOR=';'
++ }
+ fi
+
+
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++as_myself=
++case $0 in #((
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ exit 1
++fi
++
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there. '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-for as_var in \
+- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+- LC_TELEPHONE LC_TIME
+-do
+- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+- eval $as_var=C; export $as_var
+- else
+- $as_unset $as_var
+- fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with STATUS, using 1 if that was 0.
++as_fn_error ()
++{
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ fi
++ $as_echo "$as_me: error: $2" >&2
++ as_fn_exit $as_status
++} # as_fn_error
++
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++ return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++ set +e
++ as_fn_set_status $1
++ exit $1
++} # as_fn_exit
++
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++ { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++ eval 'as_fn_append ()
++ {
++ eval $1+=\$2
++ }'
++else
++ as_fn_append ()
++ {
++ eval $1=\$$1\$2
++ }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++ eval 'as_fn_arith ()
++ {
++ as_val=$(( $* ))
++ }'
++else
++ as_fn_arith ()
++ {
++ as_val=`expr "$@" || test $? -eq 1`
++ }
++fi # as_fn_arith
+
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+ fi
+
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
+
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+-
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -14710,181 +8586,133 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
+-fi
+-
+-
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+-
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
+-
+- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+- # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
+- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
+- sed '
+- N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+- t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
+- ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
+- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+- { (exit 1); exit 1; }; }
+-
+- # Don't try to exec as it changes $[0], causing all sort of problems
+- # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
+- # Exit status is that of the last command.
+- exit
+-}
+-
+-
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in #(((((
++-n*)
++ case `echo 'xy\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ xy) ECHO_C='\c';;
++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
++ ECHO_T=' ';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+- as_expr=expr
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
+ else
+- as_expr=false
++ rm -f conf$$.dir
++ mkdir conf$$.dir 2>/dev/null
+ fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
+- as_ln_s='cp -p'
+- else
++if (echo >conf$$.file) 2>/dev/null; then
++ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -pR'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++ as_ln_s='cp -pR'
++ elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
++ else
++ as_ln_s='cp -pR'
+ fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || eval $as_mkdir_p || {
++ as_dirs=
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$as_dir" : 'X\(//\)[^/]' \| \
++ X"$as_dir" : 'X\(//\)$' \| \
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
++ done
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
+ if mkdir -p . 2>/dev/null; then
+- as_mkdir_p=:
++ as_mkdir_p='mkdir -p "$as_dir"'
+ else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+-
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+-exec 6>&1
+-
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+-# report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling. Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+- echo
+- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++exec 6>&1
++## ----------------------------------- ##
++## Main body of $CONFIG_STATUS script. ##
++## ----------------------------------- ##
++_ASEOF
++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# Save the log message, to keep $0 and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
++generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -14892,45 +8720,47 @@
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+
+-# Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
++esac
+
+-if test -n "$ac_config_headers"; then
+- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
++case $ac_config_headers in *"
++"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
++esac
+
+-if test -n "$ac_config_links"; then
+- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+
+-if test -n "$ac_config_commands"; then
+- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++# Files that config.status was made for.
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+
+-cat >>$CONFIG_STATUS <<\_ACEOF
++_ACEOF
+
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ ac_cs_usage="\
+-\`$as_me' instantiates files from templates according to the
+-current configuration.
++\`$as_me' instantiates files and other configuration actions
++from templates according to the current configuration. Unless the files
++and actions are specified as TAGs, all are instantiated by default.
+
+-Usage: $0 [OPTIONS] [FILE]...
++Usage: $0 [OPTION]... [TAG]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
+- -q, --quiet do not print progress messages
++ -V, --version print version number and configuration settings, then exit
++ --config print configuration, then exit
++ -q, --quiet, --silent
++ do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+- --file=FILE[:TEMPLATE]
+- instantiate the configuration file FILE
+- --header=FILE[:TEMPLATE]
+- instantiate the configuration header FILE
++ --file=FILE[:TEMPLATE]
++ instantiate the configuration file FILE
++ --header=FILE[:TEMPLATE]
++ instantiate the configuration header FILE
+
+ Configuration files:
+ $config_files
+@@ -14941,84 +8771,92 @@
+ Configuration commands:
+ $config_commands
+
+-Report bugs to <bug-autoconf@gnu.org>."
+-_ACEOF
++Report bugs to the package provider."
+
+-cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
+- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.69,
++ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
++AWK='$AWK'
++test -n "\$AWK" || AWK=awk
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-# If no file are specified by the user, then we need to provide default
+-# value. By we need to know if files were specified by the user.
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# The default lists apply if the user does not specify any file.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
+- ac_option=`expr "x$1" : 'x\([^=]*\)='`
+- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++ --*=?*)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
++ ac_shift=:
++ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
+ ac_shift=:
+ ;;
+- -*)
++ *)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+- *) # This is not an option, so the user has probably given explicit
+- # arguments.
+- ac_option=$1
+- ac_need_defaults=false;;
+ esac
+
+ case $ac_option in
+ # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+- --version | --vers* | -V )
+- echo "$ac_cs_version"; exit 0 ;;
+- --he | --h)
+- # Conflict between --help and --header
+- { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+- { (exit 1); exit 1; }; };;
+- --help | --hel | -h )
+- echo "$ac_cs_usage"; exit 0 ;;
+- --debug | --d* | -d )
++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
++ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++ case $ac_optarg in
++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
++ esac
++ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++ case $ac_optarg in
++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ esac
++ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+ ac_need_defaults=false;;
++ --he | --h)
++ # Conflict between --help and --header
++ as_fn_error $? "ambiguous option: \`$1'
++Try \`$0 --help' for more information.";;
++ --help | --hel | -h )
++ $as_echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ -*) as_fn_error $? "unrecognized option: \`$1'
++Try \`$0 --help' for more information." ;;
+
+- *) ac_config_targets="$ac_config_targets $1" ;;
++ *) as_fn_append ac_config_targets " $1"
++ ac_need_defaults=false ;;
+
+ esac
+ shift
+@@ -15032,50 +8870,61 @@
+ fi
+
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ shift
++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
++ CONFIG_SHELL='$SHELL'
++ export CONFIG_SHELL
++ exec "\$@"
+ fi
+
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++exec 5>>config.log
++{
++ echo
++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++ $as_echo "$ac_log"
++} >&5
+
+-cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ # Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+- # from automake.
++ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+
+-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+ _ACEOF
+
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+- case "$ac_config_target" in
+- # Handling of arguments.
+- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "abook.spec" ) CONFIG_FILES="$CONFIG_FILES abook.spec" ;;
+- "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+- { (exit 1); exit 1; }; };;
++ case $ac_config_target in
++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++ "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++ "abook.spec") CONFIG_FILES="$CONFIG_FILES abook.spec" ;;
++ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
++
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+ done
+
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used. Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -15087,758 +8936,680 @@
+ fi
+
+ # Have a temporary directory for convenience. Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+- trap '{ (exit 1); exit 1; }' 1 2 13 15
++ tmp= ac_tmp=
++ trap 'exit_status=$?
++ : "${ac_tmp:=$tmp}"
++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
++' 0
++ trap 'as_fn_exit 1' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+
+ {
+- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+- test -n "$tmp" && test -d "$tmp"
++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
++ test -d "$tmp"
+ } ||
+ {
+- tmp=./confstat$$-$RANDOM
+- (umask 077 && mkdir $tmp)
+-} ||
++ tmp=./conf$$-$RANDOM
++ (umask 077 && mkdir "$tmp")
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
++
++# Set up the scripts for CONFIG_FILES section.
++# No need to generate them if there are no CONFIG_FILES.
++# This happens for instance with `./config.status config.h'.
++if test -n "$CONFIG_FILES"; then
++
++
++ac_cr=`echo X | tr X '\015'`
++# On cygwin, bash can eat \r inside `` if the user requested igncr.
++# But we know of no other shell where ac_cr would be empty at this
++# point, so we can use a bashism as a fallback.
++if test "x$ac_cr" = x; then
++ eval ac_cr=\$\'\\r\'
++fi
++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
++ ac_cs_awk_cr='\\r'
++else
++ ac_cs_awk_cr=$ac_cr
++fi
++
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
++_ACEOF
++
++
+ {
+- echo "$me: cannot create a temporary directory in ." >&2
+- { (exit 1); exit 1; }
++ echo "cat >conf$$subs.awk <<_ACEOF" &&
++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
++ echo "_ACEOF"
++} >conf$$subs.sh ||
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ . ./conf$$subs.sh ||
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++
++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
++ if test $ac_delim_n = $ac_delim_num; then
++ break
++ elif $ac_last_try; then
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++ fi
++done
++rm -f conf$$subs.sh
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
++_ACEOF
++sed -n '
++h
++s/^/S["/; s/!.*/"]=/
++p
++g
++s/^[^!]*!//
++:repl
++t repl
++s/'"$ac_delim"'$//
++t delim
++:nl
++h
++s/\(.\{148\}\)..*/\1/
++t more1
++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
++p
++n
++b repl
++:more1
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t nl
++:delim
++h
++s/\(.\{148\}\)..*/\1/
++t more2
++s/["\\]/\\&/g; s/^/"/; s/$/"/
++p
++b
++:more2
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t delim
++' <conf$$subs.awk | sed '
++/^[^""]/{
++ N
++ s/\n//
++}
++' >>$CONFIG_STATUS || ac_write_fail=1
++rm -f conf$$subs.awk
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++_ACAWK
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
++ for (key in S) S_is_set[key] = 1
++ FS = "\a"
++
++}
++{
++ line = $ 0
++ nfields = split(line, field, "@")
++ substed = 0
++ len = length(field[1])
++ for (i = 2; i < nfields; i++) {
++ key = field[i]
++ keylen = length(key)
++ if (S_is_set[key]) {
++ value = S[key]
++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
++ len += length(value) + length(field[++i])
++ substed = 1
++ } else
++ len += 1 + keylen
++ }
++
++ print line
+ }
+
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
++else
++ cat
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-cat >>$CONFIG_STATUS <<_ACEOF
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
++s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
++s/^[^=]*=[ ]*$//
++}'
++fi
+
+-#
+-# CONFIG_FILES section.
+-#
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++fi # test -n "$CONFIG_FILES"
+
+-# No need to generate the scripts if there are no CONFIG_FILES.
+-# This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+- # Protect against being on the right side of a sed subst in config.status.
+- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s,@SHELL@,$SHELL,;t t
+-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s,@exec_prefix@,$exec_prefix,;t t
+-s,@prefix@,$prefix,;t t
+-s,@program_transform_name@,$program_transform_name,;t t
+-s,@bindir@,$bindir,;t t
+-s,@sbindir@,$sbindir,;t t
+-s,@libexecdir@,$libexecdir,;t t
+-s,@datadir@,$datadir,;t t
+-s,@sysconfdir@,$sysconfdir,;t t
+-s,@sharedstatedir@,$sharedstatedir,;t t
+-s,@localstatedir@,$localstatedir,;t t
+-s,@libdir@,$libdir,;t t
+-s,@includedir@,$includedir,;t t
+-s,@oldincludedir@,$oldincludedir,;t t
+-s,@infodir@,$infodir,;t t
+-s,@mandir@,$mandir,;t t
+-s,@build_alias@,$build_alias,;t t
+-s,@host_alias@,$host_alias,;t t
+-s,@target_alias@,$target_alias,;t t
+-s,@DEFS@,$DEFS,;t t
+-s,@ECHO_C@,$ECHO_C,;t t
+-s,@ECHO_N@,$ECHO_N,;t t
+-s,@ECHO_T@,$ECHO_T,;t t
+-s,@LIBS@,$LIBS,;t t
+-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+-s,@CYGPATH_W@,$CYGPATH_W,;t t
+-s,@PACKAGE@,$PACKAGE,;t t
+-s,@VERSION@,$VERSION,;t t
+-s,@ACLOCAL@,$ACLOCAL,;t t
+-s,@AUTOCONF@,$AUTOCONF,;t t
+-s,@AUTOMAKE@,$AUTOMAKE,;t t
+-s,@AUTOHEADER@,$AUTOHEADER,;t t
+-s,@MAKEINFO@,$MAKEINFO,;t t
+-s,@install_sh@,$install_sh,;t t
+-s,@STRIP@,$STRIP,;t t
+-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s,@mkdir_p@,$mkdir_p,;t t
+-s,@AWK@,$AWK,;t t
+-s,@SET_MAKE@,$SET_MAKE,;t t
+-s,@am__leading_dot@,$am__leading_dot,;t t
+-s,@AMTAR@,$AMTAR,;t t
+-s,@am__tar@,$am__tar,;t t
+-s,@am__untar@,$am__untar,;t t
+-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
+-s,@USE_NLS@,$USE_NLS,;t t
+-s,@MSGFMT@,$MSGFMT,;t t
+-s,@GMSGFMT@,$GMSGFMT,;t t
+-s,@XGETTEXT@,$XGETTEXT,;t t
+-s,@MSGMERGE@,$MSGMERGE,;t t
+-s,@CC@,$CC,;t t
+-s,@CFLAGS@,$CFLAGS,;t t
+-s,@LDFLAGS@,$LDFLAGS,;t t
+-s,@CPPFLAGS@,$CPPFLAGS,;t t
+-s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+-s,@OBJEXT@,$OBJEXT,;t t
+-s,@DEPDIR@,$DEPDIR,;t t
+-s,@am__include@,$am__include,;t t
+-s,@am__quote@,$am__quote,;t t
+-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s,@CCDEPMODE@,$CCDEPMODE,;t t
+-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s,@build@,$build,;t t
+-s,@build_cpu@,$build_cpu,;t t
+-s,@build_vendor@,$build_vendor,;t t
+-s,@build_os@,$build_os,;t t
+-s,@host@,$host,;t t
+-s,@host_cpu@,$host_cpu,;t t
+-s,@host_vendor@,$host_vendor,;t t
+-s,@host_os@,$host_os,;t t
+-s,@CPP@,$CPP,;t t
+-s,@EGREP@,$EGREP,;t t
+-s,@GLIBC2@,$GLIBC2,;t t
+-s,@RANLIB@,$RANLIB,;t t
+-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@ALLOCA@,$ALLOCA,;t t
+-s,@GLIBC21@,$GLIBC21,;t t
+-s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
+-s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
+-s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
+-s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
+-s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
+-s,@LIBICONV@,$LIBICONV,;t t
+-s,@LTLIBICONV@,$LTLIBICONV,;t t
+-s,@INTLBISON@,$INTLBISON,;t t
+-s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
+-s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
+-s,@CATOBJEXT@,$CATOBJEXT,;t t
+-s,@DATADIRNAME@,$DATADIRNAME,;t t
+-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
+-s,@GENCAT@,$GENCAT,;t t
+-s,@INTLOBJS@,$INTLOBJS,;t t
+-s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
+-s,@INTLLIBS@,$INTLLIBS,;t t
+-s,@LIBINTL@,$LIBINTL,;t t
+-s,@LTLIBINTL@,$LTLIBINTL,;t t
+-s,@POSUB@,$POSUB,;t t
+-s,@localedir@,$localedir,;t t
+-s,@USE_INCLUDED_INTL_H_TRUE@,$USE_INCLUDED_INTL_H_TRUE,;t t
+-s,@USE_INCLUDED_INTL_H_FALSE@,$USE_INCLUDED_INTL_H_FALSE,;t t
+-s,@U@,$U,;t t
+-s,@ANSI2KNR@,$ANSI2KNR,;t t
+-s,@LIBOBJS@,$LIBOBJS,;t t
+-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+- cat >>$CONFIG_STATUS <<\_ACEOF
+- # Split the substitutions into bite-sized pieces for seds with
+- # small command number limits, like on Digital OSF/1 and HP-UX.
+- ac_max_sed_lines=48
+- ac_sed_frag=1 # Number of current file.
+- ac_beg=1 # First line for current file.
+- ac_end=$ac_max_sed_lines # Line after last line for current file.
+- ac_more_lines=:
+- ac_sed_cmds=
+- while $ac_more_lines; do
+- if test $ac_beg -gt 1; then
+- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- else
+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+- fi
+- if test ! -s $tmp/subs.frag; then
+- ac_more_lines=false
+- else
+- # The purpose of the label and of the branching condition is to
+- # speed up the sed processing (if there are no `@' at all, there
+- # is no need to browse any of the substitutions).
+- # These are the two extra sed commands mentioned above.
+- (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+- else
+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+- fi
+- ac_sed_frag=`expr $ac_sed_frag + 1`
+- ac_beg=$ac_end
+- ac_end=`expr $ac_end + $ac_max_sed_lines`
+- fi
+- done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
++# Set up the scripts for CONFIG_HEADERS section.
++# No need to generate them if there are no CONFIG_HEADERS.
++# This happens for instance with `./config.status Makefile'.
++if test -n "$CONFIG_HEADERS"; then
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
++BEGIN {
++_ACEOF
++
++# Transform confdefs.h into an awk script `defines.awk', embedded as
++# here-document in config.status, that substitutes the proper values into
++# config.h.in to produce config.h.
++
++# Create a delimiter string that does not exist in confdefs.h, to ease
++# handling of long lines.
++ac_delim='%!_!# '
++for ac_last_try in false false :; do
++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++ if test -z "$ac_tt"; then
++ break
++ elif $ac_last_try; then
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
++ else
++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+-fi # test -n "$CONFIG_FILES"
++done
+
++# For the awk script, D is an array of macro values keyed by name,
++# likewise P contains macro parameters if any. Preserve backslash
++# newline sequences.
++
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++sed -n '
++s/.\{148\}/&'"$ac_delim"'/g
++t rset
++:rset
++s/^[ ]*#[ ]*define[ ][ ]*/ /
++t def
++d
++:def
++s/\\$//
++t bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3"/p
++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
++d
++:bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3\\\\\\n"\\/p
++t cont
++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
++t cont
++d
++:cont
++n
++s/.\{148\}/&'"$ac_delim"'/g
++t clear
++:clear
++s/\\$//
++t bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/"/p
++d
++:bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
++b cont
++' <confdefs.h | sed '
++s/'"$ac_delim"'/"\\\
++"/g' >>$CONFIG_STATUS || ac_write_fail=1
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ for (key in D) D_is_set[key] = 1
++ FS = "\a"
++}
++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
++ line = \$ 0
++ split(line, arg, " ")
++ if (arg[1] == "#") {
++ defundef = arg[2]
++ mac1 = arg[3]
++ } else {
++ defundef = substr(arg[1], 2)
++ mac1 = arg[2]
++ }
++ split(mac1, mac2, "(") #)
++ macro = mac2[1]
++ prefix = substr(line, 1, index(line, defundef) - 1)
++ if (D_is_set[macro]) {
++ # Preserve the white space surrounding the "#".
++ print prefix "define", macro P[macro] D[macro]
++ next
++ } else {
++ # Replace #undef with comments. This is necessary, for example,
++ # in the case of _POSIX_SOURCE, which is predefined and required
++ # on some systems where configure will not decide to define it.
++ if (defundef == "undef") {
++ print "/*", prefix defundef, macro, "*/"
++ next
++ }
++ }
++}
++{ print }
++_ACAWK
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+- case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
++fi # test -n "$CONFIG_HEADERS"
++
++
++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
++shift
++for ac_tag
++do
++ case $ac_tag in
++ :[FHLC]) ac_mode=$ac_tag; continue;;
++ esac
++ case $ac_mode$ac_tag in
++ :[FHL]*:*);;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :[FH]-) ac_tag=-:-;;
++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++ esac
++ ac_save_IFS=$IFS
++ IFS=:
++ set x $ac_tag
++ IFS=$ac_save_IFS
++ shift
++ ac_file=$1
++ shift
++
++ case $ac_mode in
++ :L) ac_source=$1;;
++ :[FH])
++ ac_file_inputs=
++ for ac_f
++ do
++ case $ac_f in
++ -) ac_f="$ac_tmp/stdin";;
++ *) # Look for the file first in the build tree, then in the source tree
++ # (if the path is not absolute). The absolute path cannot be DOS-style,
++ # because $ac_f cannot contain `:'.
++ test -f "$ac_f" ||
++ case $ac_f in
++ [\\/$]*) false;;
++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++ esac ||
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ esac
++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
++ as_fn_append ac_file_inputs " '$ac_f'"
++ done
++
++ # Let's still pretend it is `configure' which instantiates (i.e., don't
++ # use $as_me), people would be surprised to read:
++ # /* config.h. Generated by config.status. */
++ configure_input='Generated from '`
++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
++ `' by configure.'
++ if test x"$ac_file" != x-; then
++ configure_input="$ac_file. $configure_input"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
++$as_echo "$as_me: creating $ac_file" >&6;}
++ fi
++ # Neutralize special characters interpreted by sed in replacement strings.
++ case $configure_input in #(
++ *\&* | *\|* | *\\* )
++ ac_sed_conf_input=`$as_echo "$configure_input" |
++ sed 's/[\\\\&|]/\\\\&/g'`;; #(
++ *) ac_sed_conf_input=$configure_input;;
++ esac
++
++ case $ac_tag in
++ *:-:* | *:-) cat >"$ac_tmp/stdin" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ esac
++ ;;
+ esac
+
+- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++ ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
+-
++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$ac_file" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
+- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
+
++ case $ac_mode in
++ :F)
++ #
++ # CONFIG_FILE
++ #
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
++ ac_MKDIR_P=$MKDIR_P
++ case $MKDIR_P in
++ [\\/$]* | ?:[\\/]* ) ;;
++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++ esac
++_ACEOF
+
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+- # Let's still pretend it is `configure' which instantiates (i.e., don't
+- # use $as_me), people would be surprised to read:
+- # /* config.h. Generated by config.status. */
+- if test x"$ac_file" = x-; then
+- configure_input=
+- else
+- configure_input="$ac_file. "
+- fi
+- configure_input=$configure_input"Generated from `echo $ac_file_in |
+- sed 's,.*/,,'` by configure."
+-
+- # First look for the input files in the build tree, otherwise in the
+- # src tree.
+- ac_file_inputs=`IFS=:
+- for f in $ac_file_in; do
+- case $f in
+- -) echo $tmp/stdin ;;
+- [\\/$]*)
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- echo "$f";;
+- *) # Relative
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- fi;;
+- esac
+- done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++ac_sed_dataroot='
++/datarootdir/ {
++ p
++ q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p'
++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++*datarootdir*) ac_datarootdir_seen=yes;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ ac_datarootdir_hack='
++ s&@datadir@&$datadir&g
++ s&@docdir@&$docdir&g
++ s&@infodir@&$infodir&g
++ s&@localedir@&$localedir&g
++ s&@mandir@&$mandir&g
++ s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+- sed "$ac_vpsub
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_sed_extra="$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s,@configure_input@,$configure_input,;t t
+-s,@srcdir@,$ac_srcdir,;t t
+-s,@abs_srcdir@,$ac_abs_srcdir,;t t
+-s,@top_srcdir@,$ac_top_srcdir,;t t
+-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s,@builddir@,$ac_builddir,;t t
+-s,@abs_builddir@,$ac_abs_builddir,;t t
+-s,@top_builddir@,$ac_top_builddir,;t t
+-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s,@INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+- rm -f $tmp/stdin
+- if test x"$ac_file" != x-; then
+- mv $tmp/out $ac_file
+- else
+- cat $tmp/out
+- rm -f $tmp/out
+- fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
++s|@configure_input@|$ac_sed_conf_input|;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@top_build_prefix@&$ac_top_build_prefix&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++s&@MKDIR_P@&$ac_MKDIR_P&;t t
++$ac_datarootdir_hack
++"
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
++ "$ac_tmp/out"`; test -z "$ac_out"; } &&
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined. Please make sure it is defined" >&5
++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined. Please make sure it is defined" >&2;}
+
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+-ac_dB='[ ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
+-
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++ rm -f "$ac_tmp/stdin"
+ case $ac_file in
+- - | *:- | *:-:* ) # input from stdin
+- cat >$tmp/stdin
+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+- * ) ac_file_in=$ac_file.in ;;
+- esac
+-
+- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+- # First look for the input files in the build tree, otherwise in the
+- # src tree.
+- ac_file_inputs=`IFS=:
+- for f in $ac_file_in; do
+- case $f in
+- -) echo $tmp/stdin ;;
+- [\\/$]*)
+- # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- # Do quote $f, to prevent DOS paths from being IFS'd.
+- echo "$f";;
+- *) # Relative
+- if test -f "$f"; then
+- # Build tree
+- echo "$f"
+- elif test -f "$srcdir/$f"; then
+- # Source tree
+- echo "$srcdir/$f"
+- else
+- # /dev/null tree
+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+- { (exit 1); exit 1; }; }
+- fi;;
+- esac
+- done` || { (exit 1); exit 1; }
+- # Remove the trailing spaces.
+- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+-
+-_ACEOF
+-
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h. The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status. Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless. Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
+-
+-# This sed command replaces #undef with comments. This is necessary, for
+-# example, in the case of _POSIX_SOURCE, which is predefined and required
+-# on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+-_ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo ' :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+- # Write a limited-size here document to $tmp/defines.sed.
+- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+- # Speed up: don't consider the non `#define' lines.
+- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+- # Work around the forget-to-reset-the-flag bug.
+- echo 't clr' >>$CONFIG_STATUS
+- echo ': clr' >>$CONFIG_STATUS
+- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+- echo 'CEOF
+- sed -f $tmp/defines.sed $tmp/in >$tmp/out
+- rm -f $tmp/in
+- mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+- rm -f conftest.defines
+- mv conftest.tail conftest.defines
+-done
+-rm -f conftest.defines
+-echo ' fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+- # Write a limited-size here document to $tmp/undefs.sed.
+- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+- # Speed up: don't consider the non `#undef'
+- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+- # Work around the forget-to-reset-the-flag bug.
+- echo 't clr' >>$CONFIG_STATUS
+- echo ': clr' >>$CONFIG_STATUS
+- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+- echo 'CEOF
+- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+- rm -f $tmp/in
+- mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+- rm -f conftest.undefs
+- mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+- # Let's still pretend it is `configure' which instantiates (i.e., don't
+- # use $as_me), people would be surprised to read:
+- # /* config.h. Generated by config.status. */
+- if test x"$ac_file" = x-; then
+- echo "/* Generated by configure. */" >$tmp/config.h
+- else
+- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
+- fi
+- cat $tmp/in >>$tmp/config.h
+- rm -f $tmp/in
++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
++ esac \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ ;;
++ :H)
++ #
++ # CONFIG_HEADER
++ #
+ if test x"$ac_file" != x-; then
+- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+-echo "$as_me: $ac_file is unchanged" >&6;}
++ {
++ $as_echo "/* $configure_input */" \
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++ } >"$ac_tmp/config.h" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
++$as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$ac_file" : 'X\(//\)[^/]' \| \
+- X"$ac_file" : 'X\(//\)$' \| \
+- X"$ac_file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
+-
+- rm -f $ac_file
+- mv $tmp/config.h $ac_file
++ rm -f "$ac_file"
++ mv "$ac_tmp/config.h" "$ac_file" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+- cat $tmp/config.h
+- rm -f $tmp/config.h
++ $as_echo "/* $configure_input */" \
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+-# Compute $ac_file's index in $config_headers.
++# Compute "$ac_file"'s index in $config_headers.
++_am_arg="$ac_file"
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $ac_file | $ac_file:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X$ac_file : 'X\(//\)[^/]' \| \
+- X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X$ac_file |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$ac_dest" : 'X\(//\)[^/]' \| \
+- X"$ac_dest" : 'X\(//\)$' \| \
+- X"$ac_dest" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+- { (exit 1); exit 1; }; }; }
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$_am_arg" : 'X\(//\)[^/]' \| \
++ X"$_am_arg" : 'X\(//\)$' \| \
++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$_am_arg" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+
+- ac_builddir=.
++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
++$as_echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++ esac
+
+-if test "$ac_dir" != .; then
+- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
+
+-case $srcdir in
+- .) # No --srcdir option. We are building in place.
+- ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
++ case $ac_file$ac_mode in
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`$as_dirname -- "$mf" ||
++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$mf" : 'X\(//\)[^/]' \| \
++ X"$mf" : 'X\(//\)$' \| \
++ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$mf" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
+-esac
+-
+-
+- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+- case $ac_dest in
+- default-1 )
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`$as_dirname -- "$file" ||
++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$file" : 'X\(//\)[^/]' \| \
++ X"$file" : 'X\(//\)$' \| \
++ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$file" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ as_dir=$dirpart/$fdir; as_fn_mkdir_p
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
++ done
++}
++ ;;
++ "po-directories":C)
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+@@ -15875,11 +9646,12 @@
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+- # Hide the ALL_LINGUAS assigment from automake.
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+@@ -15938,106 +9710,30 @@
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ 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"
++ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
++ if test -f "$f"; then
++ case "$f" in
++ *.orig | *.bak | *~) ;;
++ *) cat "$f" >> "$ac_dir/Makefile" ;;
++ esac
++ fi
++ done
+ fi
+ ;;
+ esac
+ done ;;
+- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # So let's grep whole file.
+- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+- dirpart=`(dirname "$mf") 2>/dev/null ||
+-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$mf" : 'X\(//\)[^/]' \| \
+- X"$mf" : 'X\(//\)$' \| \
+- X"$mf" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$mf" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`(dirname "$file") 2>/dev/null ||
+-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$file" : 'X\(//\)[^/]' \| \
+- X"$file" : 'X\(//\)$' \| \
+- X"$file" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$file" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p $dirpart/$fdir
+- else
+- as_dir=$dirpart/$fdir
+- as_dirs=
+- while test ! -d "$as_dir"; do
+- as_dirs="$as_dir $as_dirs"
+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$as_dir" : 'X\(//\)[^/]' \| \
+- X"$as_dir" : 'X\(//\)$' \| \
+- X"$as_dir" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+- done
+- test ! -n "$as_dirs" || mkdir $as_dirs
+- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+- { (exit 1); exit 1; }; }; }
+
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+-done
+- ;;
+ esac
+-done
+-_ACEOF
++done # for ac_tag
+
+-cat >>$CONFIG_STATUS <<\_ACEOF
+
+-{ (exit 0); exit 0; }
++as_fn_exit 0
+ _ACEOF
+-chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+
++test $ac_write_fail = 0 ||
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
++
+
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -16057,7 +9753,10 @@
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+- $ac_cs_success || { (exit 1); exit 1; }
++ $ac_cs_success || as_fn_exit 1
++fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+
+diff -urN BUILD/abook-0.6.0pre2/configure.ac abook/configure.ac
+--- BUILD/abook-0.6.0pre2/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ abook/configure.ac 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,183 @@
++dnl abook configure.in
++
++AC_INIT
++AC_CONFIG_SRCDIR([abook.c])
++AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
++AC_CONFIG_HEADER(config.h)
++
++dnl ---------------
++dnl gettext support
++dnl ---------------
++
++AC_USE_SYSTEM_EXTENSIONS
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.18.1])
++
++AC_DEFUN([ABOOK_EXPAND_PREFIX], [
++ $1=$2
++ dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
++ dnl $datarootdir which in turn refers to $prefix
++ $1=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++ eval tmp_abook_prefix=\""[$]$1"\"
++ eval echo $tmp_abook_prefix
++ )`
++])
++
++ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
++localedir="\$(datadir)/locale"
++
++AC_ARG_WITH(localedir,
++ [ --with-localedir=PATH Where the locale files are installed ])
++if test "x$with_localedir" != "x"; then
++ abook_localedir="$with_localedir"
++ localedir="$with_localedir"
++fi
++
++AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
++AC_SUBST(localedir)
++
++AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
++
++dnl ----------------------
++dnl end of gettext support
++dnl ----------------------
++
++AC_PROG_CC
++AC_SEARCH_LIBS([strerror],[cposix])
++AM_C_PROTOTYPES
++if test "x$U" != "x"; then
++ AC_MSG_ERROR(Compiler not ANSI compliant)
++fi
++AC_C_INLINE
++AC_PROG_INSTALL
++AC_HEADER_STDC
++AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h iconv.h)
++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 ***]))
++AC_FUNC_STRCOLL
++AC_CHECK_FUNCS(setlocale)
++
++ac_widec_funcs=yes
++AC_CHECK_HEADER(wchar.h,[
++ ac_have_wchar_h=yes
++ AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
++ [ac_have_wchar_h=no])
++AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
++AC_CHECK_DECLS(wcwidth)
++AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
++
++if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then
++ ac_widec_possible=yes
++else
++ ac_widec_possible=no
++fi
++
++dnl -------------------
++dnl (n)curses detection
++dnl -------------------
++
++abook_cv_curses=/usr
++AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
++ [if test $withval != yes; then
++ abook_cv_curses=$withval
++ fi
++ if test x$abook_cv_curses != x/usr; then
++ LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
++ CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
++ fi])
++
++AC_CHECK_LIB(ncursesw, initscr,
++ [LIBS="$LIBS -lncursesw"
++ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
++ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
++ fi
++ AC_CHECK_HEADERS(ncurses.h)],[
++ ac_widec_possible=no
++ AC_CHECK_LIB(ncurses, initscr,
++ [LIBS="$LIBS -lncurses"
++ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
++ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
++ fi
++ AC_CHECK_HEADERS(ncurses.h)],
++ [CF_CURSES_LIBS])
++ ])
++
++dnl --------------------------
++dnl end of (n)curses detection
++dnl --------------------------
++
++dnl ------------------
++dnl readline detection
++dnl ------------------
++
++abook_cv_readline=/usr
++AC_ARG_WITH(readline, [ --with-readline=DIR Where readline is installed ],
++ [if test $withval != yes; then
++ abook_cv_readline=$withval
++ fi
++ if test x$abook_cv_readline != x/usr; then
++ LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
++ CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
++ fi])
++
++AC_LIB_READLINE
++
++if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
++ AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
++fi
++
++dnl -------------------------
++dnl end of readline detection
++dnl -------------------------
++
++dnl ------------------
++dnl vformat detection
++dnl ------------------
++
++AC_ARG_ENABLE(vformat, [ --enable-vformat Use libvformat is available ], [case "${enableval}" in
++ yes) vformat=true ;;
++ no) vformat=false ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-vformat) ;;
++ esac], [vformat=false])
++if test x$vformat = xtrue; then
++ AC_CHECK_HEADER([vf_iface.h], [
++ AC_CHECK_LIB([vformat], [vf_read_file], [
++ MODULES="$MODULES m_vcf"
++ AC_DEFINE(HAVE_VFORMAT,1,[Defined if the vformat library is available])
++ have_vformat=yes
++ ])
++])
++fi
++AM_CONDITIONAL(ENABLE_VFORMAT_SUPPORT,test x"$have_vformat" = "xyes")
++
++dnl -------------------------
++dnl end of vformat detection
++dnl -------------------------
++
++
++if test x$ac_widec_possible = xyes; then
++ AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
++fi
++
++AC_CHECK_FUNCS(resizeterm)
++
++AC_CHECK_FUNCS(snprintf vsnprintf)
++
++AC_CHECK_FUNCS(strcasestr, AC_DEFINE(HAVE_STRCASESTR))
++
++AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in
++ yes) debug=true ;;
++ no) debug=false ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
++ esac], [debug=false])
++
++if test x$debug = xtrue; then
++ CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
++ CFLAGS="-g $CFLAGS"
++fi
++
++if test x$GCC = xyes; then
++ CFLAGS="-Wall $CFLAGS"
++fi
++
++AC_CONFIG_FILES([Makefile abook.spec po/Makefile.in])
++AC_OUTPUT
+diff -urN BUILD/abook-0.6.0pre2/configure.in abook/configure.in
+--- BUILD/abook-0.6.0pre2/configure.in 2013-03-14 10:42:00.097531458 +0100
++++ abook/configure.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,154 +0,0 @@
+-dnl abook configure.in
+-
+-AC_INIT(abook.c)
+-AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
+-AM_CONFIG_HEADER(config.h)
+-
+-dnl ---------------
+-dnl gettext support
+-dnl ---------------
+-
+-AM_GNU_GETTEXT
+-AM_GNU_GETTEXT_VERSION(0.14.1)
+-
+-AC_DEFUN([ABOOK_EXPAND_PREFIX], [
+- $1=$2
+- dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
+- dnl $datarootdir which in turn refers to $prefix
+- $1=`( test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+- eval tmp_abook_prefix=\""[$]$1"\"
+- eval echo $tmp_abook_prefix
+- )`
+-])
+-
+-ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
+-localedir="\$(datadir)/locale"
+-
+-AC_ARG_WITH(localedir,
+- [ --with-localedir=PATH Where the locale files are installed ])
+-if test "x$with_localedir" != "x"; then
+- abook_localedir="$with_localedir"
+- localedir="$with_localedir"
+-fi
+-
+-AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
+-AC_SUBST(localedir)
+-
+-AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
+-
+-dnl ----------------------
+-dnl end of gettext support
+-dnl ----------------------
+-
+-AC_PROG_CC
+-AC_ISC_POSIX
+-AM_C_PROTOTYPES
+-if test "x$U" != "x"; then
+- AC_MSG_ERROR(Compiler not ANSI compliant)
+-fi
+-AC_C_INLINE
+-AC_PROG_INSTALL
+-AC_HEADER_STDC
+-AC_CHECK_HEADERS(unistd.h locale.h sys/ioctl.h iconv.h)
+-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 ***]))
+-AC_FUNC_STRCOLL
+-AC_CHECK_FUNCS(setlocale)
+-
+-ac_widec_funcs=yes
+-AC_CHECK_HEADER(wchar.h,[
+- ac_have_wchar_h=yes
+- AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
+- [ac_have_wchar_h=no])
+-AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
+-AC_CHECK_DECLS(wcwidth)
+-AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
+-
+-if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then
+- ac_widec_possible=yes
+-else
+- ac_widec_possible=no
+-fi
+-
+-dnl -------------------
+-dnl (n)curses detection
+-dnl -------------------
+-
+-abook_cv_curses=/usr
+-AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
+- [if test $withval != yes; then
+- abook_cv_curses=$withval
+- fi
+- if test x$abook_cv_curses != x/usr; then
+- LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
+- fi])
+-
+-AC_CHECK_LIB(ncursesw, initscr,
+- [LIBS="$LIBS -lncursesw -ltinfow"
+- if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+- fi
+- AC_CHECK_HEADERS(ncurses.h)],[
+- ac_widec_possible=no
+- AC_CHECK_LIB(ncurses, initscr,
+- [LIBS="$LIBS -lncurses -ltinfo"
+- if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+- fi
+- AC_CHECK_HEADERS(ncurses.h)],
+- [CF_CURSES_LIBS])
+- ])
+-
+-dnl --------------------------
+-dnl end of (n)curses detection
+-dnl --------------------------
+-
+-dnl ------------------
+-dnl readline detection
+-dnl ------------------
+-
+-abook_cv_readline=/usr
+-AC_ARG_WITH(readline, [ --with-readline=DIR Where readline is installed ],
+- [if test $withval != yes; then
+- abook_cv_readline=$withval
+- fi
+- if test x$abook_cv_readline != x/usr; then
+- LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
+- fi])
+-
+-AC_LIB_READLINE
+-
+-if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
+- AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
+-fi
+-
+-dnl -------------------------
+-dnl end of readline detection
+-dnl -------------------------
+-
+-if test x$ac_widec_possible = xyes; then
+- AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
+-fi
+-
+-AC_CHECK_FUNCS(resizeterm)
+-
+-AC_CHECK_FUNCS(snprintf vsnprintf)
+-
+-AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in
+- yes) debug=true ;;
+- no) debug=false ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+- esac], [debug=false])
+-
+-if test x$debug = xtrue; then
+- CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
+- CFLAGS="-g $CFLAGS"
+-fi
+-
+-if test x$GCC = xyes; then
+- CFLAGS="-Wall $CFLAGS"
+-fi
+-
+-AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/abook+vim/mail.vim abook/contrib/abook+vim/mail.vim
+--- BUILD/abook-0.6.0pre2/contrib/abook+vim/mail.vim 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/abook+vim/mail.vim 1970-01-01 01:00:00.000000000 +0100
+@@ -1,530 +0,0 @@
+-" mail FTplugin
+-"
+-" Requires vim 6.x.
+-" To install place in ~/.vim/after/ftplugin/mail.vim
+-"
+-" Author: Brian Medley
+-" Email: freesoftware@4321.tv
+-"
+-" This file was modified from Cedric Duval's version.
+-" http://cedricduval.free.fr/download/vimrc/mail
+-
+-" Only do this when not done yet for this buffer
+-if exists("b:did_mail_after_ftplugin")
+- finish
+-endif
+-let b:did_mail_after_ftplugin = 1
+-
+-if !exists ("mail_alias_program")
+- let mail_alias_program="Abook"
+-endif
+-
+-" ====================================================================
+-" Globals
+-" ====================================================================
+-
+-if !exists ("mail_quote_chars")
+- let s:quote_chars = ':!|>'
+-else
+- let s:quote_chars = mail_quote_chars
+-endif
+-
+-" This re defines a 'quote'
+-let s:quote_re = '\(\s\?\w*[' . s:quote_chars . ']\)'
+-" \s\? => 0 or one whitespace char
+-" (b/c some ppl put
+-" spaces in the quote,
+-" and others don't)
+-"
+-" \w* => maybe word chars (b/c
+-" some ppl put initals in
+-" the quotes)
+-" the rest => actual quote chars
+-" \( \) => this is a quote "level"
+-
+-" This re defines the quoting level at the *beginning* of a line
+-let s:quote_start = '^' . s:quote_re . s:quote_re . '*'
+-" ^s:quote_re => quote at beginning of
+-" line
+-" s:quote_re* => perhaps followed by
+-" more quotes
+-
+-" For debugging:
+-" let b:quote_chars = s:quote_chars
+-" let b:quote_re = s:quote_re
+-" let b:quote_start = s:quote_start
+-
+-" ====================================================================
+-" Mappings
+-" ====================================================================
+-
+-if !exists("no_plugin_maps") && !exists("no_mail_maps")
+-
+- "
+- " get alias list mappings
+- "
+- if !hasmapto('<Plug>MailAliasList', 'n')
+- nmap <buffer> <unique> <LocalLeader>al <Plug>MailAliasList
+- endif
+- if !hasmapto('<Plug>MailAliasList', 'i')
+- imap <buffer> <unique> <LocalLeader>al <Plug>MailAliasList
+- endif
+-
+- nnoremap <buffer> <unique> <script> <Plug>MailAliasList <SID>AliasList
+- inoremap <buffer> <unique> <script> <Plug>MailAliasList <SID>AliasList
+-
+- " Redraw is there b/c my screen was messed up after abook finished.
+- " The 'set paste' is in the function b/c I couldn't figure out how to put it in
+- " the mapping.
+- " The 'set nopaste' is in the mapping b/c it didn't work for me in the script.
+- 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>
+- 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>
+-
+- "
+- " get alias query mappings
+- "
+- if !hasmapto('<Plug>MailAliasQuery', 'n')
+- nmap <buffer> <unique> <LocalLeader>aq <Plug>MailAliasQuery
+- endif
+- if !hasmapto('<Plug>MailAliasQuery', 'i')
+- imap <buffer> <unique> <LocalLeader>aq <Plug>MailAliasQuery
+- endif
+-
+- nnoremap <buffer> <unique> <script> <Plug>MailAliasQuery <SID>AliasQuery
+- inoremap <buffer> <unique> <script> <Plug>MailAliasQuery <SID>AliasQuery
+-
+- nnoremap <buffer> <SID>AliasQuery :call <SID>AliasQuery{mail_alias_program}()<cr>:echo b:AliasQueryMsg<cr>
+- inoremap <buffer> <SID>AliasQuery <c-o>:call <SID>AliasQuery{mail_alias_program}()<cr><c-o>:echo b:AliasQueryMsg<cr><right>
+-
+- "
+- " mail formatting mappings
+- "
+-
+- " * <F1> to re-format a quotelvl
+- " * <F2> to format a line which is too long, and go to the next line
+- " * <F3> to merge the previous line with the current one, with a correct
+- " formatting (sometimes useful associated with <F2>)
+- " * <F4> to re-format the current paragraph correctly
+-
+- if !hasmapto('<Plug>MailFormatQuoteLvl', 'n')
+- nmap <buffer> <unique> <F1> <Plug>MailFormatQuoteLvl
+- endif
+- if !hasmapto('<Plug>MailFormatLine', 'n')
+- nmap <buffer> <unique> <F2> <Plug>MailFormatLine
+- endif
+- if !hasmapto('<Plug>MailFormatMerge', 'n')
+- nmap <buffer> <unique> <F3> <Plug>MailFormatMerge
+- endif
+- if !hasmapto('<Plug>MailFormatParagraph', 'n')
+- nmap <buffer> <unique> <F4> <Plug>MailFormatParagraph
+- endif
+-
+- if !hasmapto('<Plug>MailFormatQuoteLvl', 'i')
+- imap <buffer> <unique> <F1> <Plug>MailFormatQuoteLvl
+- endif
+- if !hasmapto('<Plug>MailFormatLine', 'i')
+- imap <buffer> <unique> <F2> <Plug>MailFormatLine
+- endif
+- if !hasmapto('<Plug>MailFormatMerge', 'i')
+- imap <buffer> <unique> <F3> <Plug>MailFormatMerge
+- endif
+- if !hasmapto('<Plug>MailFormatParagraph', 'i')
+- imap <buffer> <unique> <F4> <Plug>MailFormatParagraph
+- endif
+-
+- nnoremap <buffer> <unique> <script> <Plug>MailFormatQuoteLvl <SID>FormatQuoteLvl
+- nnoremap <buffer> <unique> <script> <Plug>MailFormatLine <SID>FormatLine
+- nnoremap <buffer> <unique> <script> <Plug>MailFormatMerge <SID>FormatMerge
+- nnoremap <buffer> <unique> <script> <Plug>MailFormatParagraph <SID>FormatParagraph
+- inoremap <buffer> <unique> <script> <Plug>MailFormatQuoteLvl <SID>FormatQuoteLvl
+- inoremap <buffer> <unique> <script> <Plug>MailFormatLine <SID>FormatLine
+- inoremap <buffer> <unique> <script> <Plug>MailFormatMerge <SID>FormatMerge
+- inoremap <buffer> <unique> <script> <Plug>MailFormatParagraph <SID>FormatParagraph
+-
+- nnoremap <buffer> <script> <SID>FormatQuoteLvl gq<SID>QuoteLvlMotion
+- nnoremap <buffer> <SID>FormatLine gqqj
+- nnoremap <buffer> <SID>FormatMerge kgqj
+- nnoremap <buffer> <SID>FormatParagraph gqap
+- inoremap <buffer> <script> <SID>FormatQuoteLvl <ESC>gq<SID>QuoteLvlMotioni
+- inoremap <buffer> <SID>FormatLine <ESC>gqqji
+- inoremap <buffer> <SID>FormatMerge <ESC>kgqji
+- inoremap <buffer> <SID>FormatParagraph <ESC>gqapi
+-
+- "
+- " sig removal mappings
+- "
+- if !hasmapto('<Plug>MailEraseQuotedSig', 'n')
+- nmap <silent> <buffer> <unique> <LocalLeader>eqs <Plug>MailEraseQuotedSig
+- endif
+- nnoremap <buffer> <unique> <script> <Plug>MailEraseQuotedSig <SID>EraseQuotedSig
+- nnoremap <buffer> <SID>EraseQuotedSig :call<SID>EraseQuotedSig()<CR>
+-
+- "
+- " Provide a motion operator for commands (so you can delete a quote
+- " segment, or format quoted segment)
+- "
+- if !hasmapto('<Plug>MailQuoteLvlMotion', 'o')
+- omap <silent> <buffer> <unique> q <Plug>MailQuoteLvlMotion
+- endif
+- onoremap <buffer> <unique> <script> <Plug>MailQuoteLvlMotion <SID>QuoteLvlMotion
+- onoremap <buffer> <script> <SID>QuoteLvlMotion :execute "normal!" . <SID>QuoteLvlMotion(line("."))<cr>
+-
+-endif
+-
+-" ====================================================================
+-" Mail Manipulation Functions
+-" ====================================================================
+-
+-" --------------------------------------------------------------------
+-" Manipulate Quotes
+-" --------------------------------------------------------------------
+-
+-"
+-" Description:
+-" This function will try and remove 'quoted' signatures.
+-"
+-" If someone responds with an email that doesn't use '>' as the
+-" quote character this will try and take care of that:
+-" | Yeah, I agree vim is cool.
+-" |
+-" | --
+-" | Some power user
+-"
+-" If there is a signature inside a 'multi-quoted' email this will try and get
+-" rid of it:
+-" > | No, I don't agree with you.
+-" >
+-" > Nonsense. You are wrong. Grow up.
+-" >
+-" > | I can't believe I'm even replying to this.
+-" > | --
+-" > | Some power user
+-" >
+-" > Yeah, believe it, brother.
+-"
+-if !exists("*s:EraseQuotedSig")
+-function s:EraseQuotedSig()
+- while 0 != search((s:quote_start . '\s*--\s*$'), 'w')
+- let motion = s:QuoteLvlMotion(line("."))
+- exe "normal! d" . motion
+- endwhile
+-endfunction
+-endif
+-
+-"
+-" Description:
+-" Replacing empty quoted lines (i.e. "> $") with empty lines
+-" (convenient to automatically reformat one paragraph)
+-"
+-if !exists("*s:DelEmptyQuoted")
+-function s:DelEmptyQuoted()
+- let empty_quote = s:quote_start . '\s*$'
+-
+- " goto start of email and jump passed headers
+- normal gg
+- if 0 == search('^$', 'W')
+- return
+- endif
+-
+- while 0 != search (empty_quote, 'W')
+- let newline = substitute(getline("."), empty_quote, '', '')
+- call setline(line("."), newline)
+- endwhile
+-endfunction
+-endif
+-
+-"
+-" Description:
+-" This function will output a motion command that operatates over a "quote
+-" level" segment. This makes it possible to perform vi commands on quotes.
+-" E.g:
+-" dq => delete an entire quote section
+-" gqq => format an entire quote section
+-"
+-if !exists("*s:QuoteLvlMotion")
+-function s:QuoteLvlMotion(line)
+- let quote = matchstr(getline(a:line), s:quote_start)
+- " abort command if no quote
+- if "" == quote
+- return "\<esc>"
+- endif
+-
+- let len = s:LenQuoteLvl(a:line, quote)
+-
+- " the 'V' makes the motion linewise
+- if 1 == len
+- return "V" . line(".") . "G"
+- else
+- return "V" . (len - 1) . "j"
+- endif
+-endfunction
+-endif
+-
+-"
+-" Description:
+-" This tries to figure out when the quoting level changes
+-"
+-if !exists("s:LenQuoteLvl")
+-function s:LenQuoteLvl(start, quote)
+- let i = a:start + 1
+- let len = 1
+- let quote = '^' . a:quote
+-
+- " find end of quote
+- while i <= line('$')
+- " check if quote level decreased
+- if -1 == match(getline(i), quote)
+- break
+- endif
+-
+- " check if quote level increased
+- if -1 != match(getline(i), (quote . s:quote_re))
+- break
+- endif
+-
+- let i = i + 1
+- let len = len + 1
+- endwhile
+-
+- return len
+-endfunction
+-endif
+-
+-" --------------------------------------------------------------------
+-" Location Manipulator Functions
+-" --------------------------------------------------------------------
+-
+-"
+-" Description:
+-" Moves the cursor to a 'sensible' position.
+-"
+-if !exists("*s:CursorStart")
+-function s:CursorStart()
+- " put cursor in known position
+- silent normal gg
+-
+- if search('^From: $', 'W')
+- silent startinsert!
+- elseif search('^To: $', 'W')
+- silent startinsert!
+- elseif search('^Subject: $', 'W')
+- silent startinsert!
+-
+- " check if we are editing a reply
+- elseif search('^On.*wrote:', 'W')
+- normal 2j
+-
+- elseif search('^$', 'W')
+- normal j
+- silent startinsert!
+- endif
+-endfunction
+-endif
+-
+-" ================================================
+-" Process Mutt Aliases
+-" ================================================
+-
+-" ------------------------------------------------
+-" Get Email List
+-" ------------------------------------------------
+-
+-"
+-" Description:
+-" This function will launch abook and spit out what the user selected from the
+-" application (by pressing 'Q'). It's always called from 'insert' mode, so
+-" the text will be inserted like it was typed.
+-"
+-" That's why 'paste' is set and reset. So that the text that we insert won't
+-" be 'mangled' by the user's settings.
+-"
+-if !exists("*s:AliasListAbook")
+-function s:AliasListAbook()
+- let b:AliasListMsg = ""
+- let f = tempname()
+-
+- set paste
+- silent exe '!abook 2> ' . f
+- exe 'let addresses=system("cat ' . f . '")'
+- if "" == addresses
+- let b:AliasListMsg = "Nothing found to lookup"
+- return ""
+- endif
+-
+- " - parses the output from abook
+- let addresses=s:ParseMuttQuery(addresses)
+- if "" == addresses
+- let b:AliasListMsg = b:ParseMuttQueryErr
+- return ""
+- endif
+-
+- " so that they will be aligned under the 'to' or 'cc' line
+- let addresses=substitute(addresses, "\n", ",\n ", "g")
+-
+- return addresses
+-endfunction
+-endif
+-
+-" ------------------------------------------------
+-" Get Email Query
+-" ------------------------------------------------
+-
+-"
+-" Description:
+-" This function assumes that user has the cursor on an alias to lookup. Based
+-" on this it:
+-" - retrieves the alias(es) from abook
+-" - parses the output from abook
+-" - actually replaces the alias with the parsed output
+-"
+-if !exists("*s:AliasQueryAbook")
+-function s:AliasQueryAbook()
+- let b:AliasQueryMsg = ""
+-
+- " - retrieves the alias(es) from abook
+- let lookup=expand("<cword>")
+- if "" == lookup
+- let b:AliasQueryMsg = "Nothing found to lookup"
+- return
+- endif
+-
+- silent exe 'let output=system("abook --mutt-query ' . lookup . '")'
+- if v:shell_error
+- let b:AliasQueryMsg = output
+- return
+- endif
+-
+- " - parses the output from abook
+- let replacement=s:ParseMuttQuery(output)
+- if "" == replacement
+- let b:AliasQueryMsg = b:ParseMuttQueryErr
+- return
+- endif
+-
+- " so that they will be aligned under the 'to' or 'cc' line
+- let replacement=substitute(replacement, "\n", ",\n ", "g")
+-
+- " - actually replaces the alias with the parsed output
+- " paste is set/unset so that the email addresses aren't "mangled" by the
+- " user's formating options
+- set paste
+- exe "normal! ciw" . replacement . "\<Esc>"
+- set nopaste
+-endfunction
+-endif
+-
+-" --------------------------------------------------------------------
+-" Utility Functions
+-" --------------------------------------------------------------------
+-
+-"
+-" Description:
+-" This function will take the output of a "mutt query" (as defined by the mutt
+-" documenation) and parses it.
+-"
+-" It returns the email addresses formatted as follows:
+-" - each address is on a line
+-"
+-if !exists("*s:ParseMuttQuery")
+-function s:ParseMuttQuery(aliases)
+- " remove first informational line
+- let aliases = substitute (a:aliases, "\n", "", "")
+- let expansion = ""
+-
+- while 1
+- " whip off the name and address
+- let line = matchstr(aliases, ".\\{-}\n")
+- let address = matchstr(line, ".\\{-}\t")
+- let address = substitute(address, "\t", "", "g")
+- if "" == address
+- let b:ParseMuttQueryErr = "Unable to parse address from ouput"
+- return ""
+- endif
+-
+- let name = matchstr(line, "\t.*\t")
+- let name = substitute(name, "\t", "", "g")
+- if "" == name
+- let b:ParseMuttQueryErr = "Unable to parse name from ouput"
+- return ""
+- endif
+-
+- " debugging:
+- " echo "line: " . line . "|"
+- " echo "address: " . address . "|"
+- " echo "name: " . name . "|"
+- " let a=input("hit enter")
+-
+- " make into valid email address
+- let needquote = match (name, '"')
+- if (-1 == needquote)
+- let name = '"' . name . '" '
+- endif
+-
+- let needquote = match (address, '<')
+- if (-1 == needquote)
+- let address = '<' . address . '>'
+- endif
+-
+- " add email address to list
+- let expansion = expansion . name
+- let expansion = expansion . address
+-
+- " debugging:
+- " echo "address: " . address . "|"
+- " echo "name: " . name . "|"
+- " let a=input("hit enter")
+-
+- " process next line (if there is one)
+- let aliases = substitute(aliases, ".\\{-}\n", "", "")
+- if "" == aliases
+- let b:ParseMuttQueryErr = ""
+- return expansion
+- endif
+-
+- let expansion = expansion . "\n"
+- endwhile
+-endfunction
+-endif
+-
+-" ====================================================================
+-" Abbreviation Manipulation
+-" ====================================================================
+-
+-"
+-" Description:
+-" This will generate vi abbreviations from your mutt alias file.
+-"
+-" Note:
+-" However, remember that the abbreviation will be replaced *everywhere*. For
+-" example, if you have the alias 'Mary', then if you try and type "Hi, Mary
+-" vim is cool", then it won't work. This is because the 'Mary' will be
+-" expanded as an alias.
+-"
+-if !exists("*s:MakeAliasAbbrev")
+-function s:MakeAliasAbbrev()
+- let aliasfile = tempname()
+- silent exe "!sed -e 's/alias/iab/' ~/.mutt/aliases > " . aliasfile
+- exe "source " . aliasfile
+-endfunction
+-endif
+-
+-
+-" ====================================================================
+-" Initializations
+-" ====================================================================
+-
+-if exists ("mail_erase_quoted_sig")
+- call s:EraseQuotedSig()
+-endif
+-
+-if exists ("mail_delete_empty_quoted")
+- call s:DelEmptyQuoted()
+-endif
+-
+-if exists ("mail_generate_abbrev")
+- call s:MakeAliasAbbrev()
+-endif
+-
+-if exists ("mail_cursor_start")
+- call s:CursorStart()
+-endif
+diff -urN BUILD/abook-0.6.0pre2/contrib/abook+vim/README abook/contrib/abook+vim/README
+--- BUILD/abook-0.6.0pre2/contrib/abook+vim/README 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/abook+vim/README 1970-01-01 01:00:00.000000000 +0100
+@@ -1,57 +0,0 @@
+-NOTE: There's no need to patch abook version 0.4.14 or later.
+-NOTE2: The command in abook is 'Q' not 'P'.
+-
+---- Original message from Brian Medley <brian.medley@verizon.net> ---
+-Hi,
+-
+-I am trying to make abook work better (for me) within vim. I am doing
+-this because I have 'autoedit' and 'edit_headers' set in mutt. This
+-means I would like to have easy access to my abook addressbook (from
+-within the editor).
+-
+-To accomplish this I have written a vim plugin (it will need vim 6.0)
+-and have patched abook. Both are included. The patch is against abook
+-0.4.13.
+-
+-Amongst other things, they allow me to obtain an address listing from
+-abook and perform a mutt query using abook. Below is an example.
+-
+-Suppose I have the following line (the cursor is at the caret):
+- To:
+- ^
+-I can now hit '\al' to lauch abook. Once inside, I can highlight the
+-people I want to email. Then I hit 'P'. Their email addresses now
+-appear. Next, suppose I have:
+- To: john
+- ^
+-My plugin allows the command '\aq' to perform an alias mutt query using
+-abook. It uses the word under the cursor, so "john" will be looked up
+-inside of abook. Next, his email address will appear.
+-
+-Summary:
+- \aq => alias query
+- \al => alias list
+-
+-Note:
+- - \ is actually LocalLeader
+- - I am aware that abook can do these things from within *mutt*, but
+- I want to do them from within vim.
+- - This plugin does other stuff, as well (like deleting signatures,
+- and positioning the cursor when you start) because I stole code
+- from Cedric Duval's mail vimrc.
+- - Improvements / comments are welcome.
+-
+-Todo:
+- - Documentation :)
+- - I tried to write this so that another alias query program could be
+- used (e.g. ldap), but I have not implemented this.
+-
+-Bugs:
+- - I had trouble getting this to work in gvim. I used vim in a
+- console.
+-
+-Basic Installation:
+- - patch and install abook
+- - place the mail.vim plugin in ~/.vim/after/ftplugin
+-
+---- ---
+diff -urN BUILD/abook-0.6.0pre2/contrib/bbdb2xx.cc abook/contrib/bbdb2xx.cc
+--- BUILD/abook-0.6.0pre2/contrib/bbdb2xx.cc 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/bbdb2xx.cc 1970-01-01 01:00:00.000000000 +0100
+@@ -1,1158 +0,0 @@
+-// ---------------------------------------------------------- -*- c++ -*-
+-// bbdb parser and converter
+-// supported output format: vcards abook gnokii csv
+-//
+-// Copyright (C) 1994-2003: Pierre Aubert pierre.aubert@free.fr
+-// Code below is dirty. Don't take model on it.
+-//
+-// V1.21 add abook format
+-// V1.20 adapt for g++-3
+-// ----------------------------------------------------------------------
+-//
+-// This library is free software; you can redistribute it and/or
+-// modify it under the terms of the GNU Library General Public
+-// License as published by the Free Software Foundation; either
+-// version 2 of the License, or (at your option) any later version.
+-//
+-// This library is distributed in the hope that it will be useful,
+-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-// Library General Public License for more details.
+-//
+-// You should have received a copy of the GNU Library General Public
+-// License along with this library; if not, write to the
+-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-// Boston, MA 02111-1307, USA.
+-//
+-// ----------------------------------------------------------------------
+-
+-#include <iostream>
+-#include <map>
+-#include <algorithm>
+-#include <fstream>
+-#include <vector>
+-#include <string>
+-
+-// horrible global variable
+-size_t counter = 0;
+-
+-// hold datas from a bbdb record
+-struct Id {
+- enum { NAME, FORNAME, AKA, COMPANY, PHONES, ADRESSES, NET, NOTES };
+- // brute force
+- typedef std::vector<std::string> storage_t;
+- storage_t my_d;
+-};
+-
+-
+-namespace trace
+-{
+- enum {
+- NONE = 0,
+- SOME = 1 ,
+- VERBOSE = 2
+- };
+-
+- void
+- print( std::string const& l, int jb, int je ) {
+- char wl[5] = { 27, '[' , '5' , 'm', 0 };
+- char wr[5] = { 27, '[' , '0' , 'm', 0 };
+- int i;
+- for( i=0 ; i<jb ; ++i )
+- std::cerr << l[i];
+- std::cerr << wl;
+- for( i=jb ; i<je ; ++i )
+- std::cerr << l[i];
+- std::cerr << wr;
+- for( i=je ; i<l.size() ; ++i )
+- std::cerr << l[i];
+-
+- std::cerr << std::endl;
+- }
+-}
+-
+-// used for translation between format
+-struct two_strings {
+- const char * const my_val;
+- const char * const my_trans;
+-};
+-
+-// parse 1 line of bbdb format, of course it is easier in elisp :)
+-Id *
+-parse( int const debug, int const tokmax, char const first_char, std::string const& line ) {
+-
+- Id * id = new Id;
+-
+- int jb=0;
+- int je=0;
+- int l=line.size();
+- int toknb=0;
+-
+- // sanity check
+- if( line[jb] == first_char )
+- ++jb;
+-
+- // loop over line
+- // invariant
+- // jb pointe sur le premier caractere du token
+- // je pointe sur le premier caractere apres la fin du token
+- while( jb < l ) {
+- // look for beginning of token
+- char c = line[jb];
+- while( jb < l && c != '(' && c != '[' && c != '"' && c != ' ' && !isalpha(c) )
+- ++jb;
+- if( jb == l )
+- break;
+- // current state
+- char state = line[jb];
+- // look for end of token
+- switch( state ) {
+- case '(':
+- {
+- int cnt_lpar = 1;
+- je = jb+1;
+- for( ; je < l ; ++je ) {
+- if( debug >= 2 )
+- trace::print(line,jb,je);
+- if( line[je] == ')' ) {
+- --cnt_lpar;
+- if( cnt_lpar == 0 ) {
+- ++je;
+- break;
+- }
+- }
+- if( line[je] == '(' )
+- ++cnt_lpar;
+- }
+- break;
+- }
+- case '[':
+- {
+- int cnt_lbra = 1;
+- je = jb+1;
+- for( ; je < l ; ++je ) {
+- if( debug >= 2 )
+- trace::print(line,jb,je);
+- if( line[je] == ']' ) {
+- --cnt_lbra;
+- if( cnt_lbra == 0 ) {
+- ++je;
+- break;
+- }
+- }
+- if( line[je] == '[' )
+- ++cnt_lbra;
+- }
+- break;
+- }
+- case '"':
+- {
+- je = jb+1;
+- while( je < l && line[je] != state )
+- ++je;
+- ++je;
+- break;
+- }
+- case ' ':
+- {
+- je = jb+1;
+- while( je < l && line[je] != state )
+- ++je;
+- ++je;
+- break;
+- }
+- case 'n': // nil && notes
+- {
+- je = jb;
+- ++je;
+- if( line[je] == 'i' )
+- while( je < l && line[je] != ' ' )
+- ++je;
+- else {
+- while( je < l && line[je] != '.' )
+- ++je;
+- ++je;
+- }
+- break;
+- }
+- case 'c': // creation-date
+- case 't': // timestamp
+- case 'h': // http
+- default:
+- {
+- je = jb;
+- while( je < l && line[je] != '.' )
+- ++je;
+- ++je;
+- break;
+- }
+- } // end case
+- if( debug >= 1 )
+- trace::print(line,jb,je);
+- // fill structure
+- if( line[jb] == '"' )
+- id->my_d.push_back( line.substr(jb+1,je-jb-2) );
+- else
+- id->my_d.push_back( line.substr(jb,je-jb) );
+- // loop
+- ++toknb;
+- jb = je + 1;
+- }
+-
+- if( toknb < tokmax )
+- {
+- delete id;
+- return NULL;
+- }
+-
+- return id;
+-}
+-
+-// ----------------------------------------------------------------------
+-// GNOKII
+-// ----------------------------------------------------------------------
+-void tognokii( std::string const& l )
+-{
+- Id * id = parse( trace::NONE, 9, '[', l);
+- if( id == NULL ) {
+- if( l.size() > 2 )
+- std::cerr << "Broken line ==>" << l << "<==" << std::endl;
+- return;
+- }
+-
+- Id::storage_t const& s = id->my_d;
+-
+- // check phone(s)
+- if( s[Id::PHONES].compare( "nil" ) != 0 ) {
+- Id * phones = new Id;
+- phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
+- if( phones == NULL ) {
+- std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- std::cout << s[Id::NAME] << '\t' << s[Id::FORNAME] << '\t';
+-
+- Id * phone = new Id;
+- for( int cur_phone = 0 ; cur_phone < phones->my_d.size() ; ++cur_phone ) {
+- phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
+-
+- if( phone != NULL ) {
+- std::cout << phone->my_d[1];
+- std::cout << '\t';
+- }
+- }
+- std::cout << std::endl;
+- delete phone;
+- delete phones;
+- }
+-
+- delete id;
+-}
+-
+-
+-
+-// ----------------------------------------------------------------------
+-// VCARD
+-// ----------------------------------------------------------------------
+-static two_strings VCARDPhoneTypes [] =
+-{
+- // PERSONAL VCARD
+- { "home", "home" },
+- { "tel", "home" },
+- { "perso", "home" },
+- { "personnel", "home" },
+- { "personel", "home" },
+- { "monchat", "home" },
+- { "msg", "msg" },
+- { "mesg", "msg" },
+- { "work", "work" },
+- { "travail", "work" },
+- { "paris", "work" },
+- { "lyon", "work" },
+- { "issy", "work" },
+- { "insa", "work" },
+- { "woo", "work" },
+- { "fac", "work" },
+- { "voice", "voice" },
+- { "voie", "voice" },
+- { "fax", "fax" },
+- { "cell", "cell" },
+- { "portable", "cell" },
+- { "gsm", "cell" },
+- { "video", "video" },
+- { "pager", "pager" },
+- { "tatoo", "pager" },
+- { "voiture", "car" },
+- { "modem", "modem" },
+- { "isdn", "isdn" },
+- { "pcs", "pcs" },
+- { 0, 0 }
+-};
+-
+-struct VCARDPhoneTypesMap {
+- static two_strings const my_default [];
+- struct ltstr {
+- inline bool
+- operator()(const char* s1, const char* s2) const {
+- return strcmp(s1, s2) < 0;
+- }
+- };
+-
+- VCARDPhoneTypesMap() {
+- unsigned short i = 0;
+- while( VCARDPhoneTypes[i].my_val != 0 ) {
+- my_h[ VCARDPhoneTypes[i].my_val ] = VCARDPhoneTypes[i].my_trans;
+- ++i;
+- }
+- }
+-
+- typedef std::map<const char*,const char*,ltstr> hash_t;
+- hash_t my_h;
+-};
+-
+-two_strings const VCARDPhoneTypesMap::my_default [] =
+- {
+- { "work", "work" },
+- { "fax", "fax" },
+- { "cell", "cell" },
+- { 0, 0 }
+- };
+-
+-static VCARDPhoneTypesMap vcard_phone_types_map;
+-
+-void tovcard( std::string const& l )
+-{
+- Id * id = parse( trace::NONE, 9,'[',l);
+- if( id == NULL ) {
+- if( l.size() > 2 )
+- std::cerr << "Broken line ==>" << l << "<==" << std::endl;
+- return;
+- }
+-
+- Id::storage_t const& s = id->my_d;
+-
+- // std::string filename( s[Id::FORNAME] + "_" + s[Id::NAME] + ".vcf" );
+- // std::ofstream os( filename.c_str() );
+-
+- std::cout << "BEGIN:VCARD" << std::endl;
+-
+- std::cout << "FN:" << s[Id::NAME] << ' ' << s[Id::FORNAME] << std::endl;
+- std::cout << "N:" << s[Id::FORNAME] << ';' << s[Id::NAME] << std::endl;
+-
+- if( s[Id::PHONES].compare( "nil" ) != 0 ) {
+- Id * phones = new Id;
+- phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
+- if( phones == NULL ) {
+- std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * phone = new Id;
+- for( int cur_phone = 0 ; cur_phone < phones->my_d.size() ; ++cur_phone ) {
+- phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
+- if( phone != NULL ) {
+- std::cout << "TEL";
+- if( phone->my_d[0].find_first_of( "0123456789 _-:;," ) == phone->my_d[0].npos ) {
+- VCARDPhoneTypesMap::hash_t::iterator it;
+- 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() ) {
+- std::cout << ";" << it->second;
+- } else {
+- std::cout << ";" << vcard_phone_types_map.my_default[0].my_trans;
+- }
+- }
+- if( phone->my_d.size() > 1 )
+- std::cout << ':' << phone->my_d[1] << std::endl;
+- else
+- std::cerr << "phone size is less than 2" << std::endl;
+- }
+- }
+- delete phone;
+- delete phones;
+- }
+-
+- if( s[Id::ADRESSES].compare( "nil" ) != 0 ) {
+- Id * adresses = new Id;
+- adresses = parse( trace::NONE, 1, '(', s[Id::ADRESSES] );
+- if( adresses == NULL ) {
+- std::cerr << "can't parse adresses ==>" << s[Id::ADRESSES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * adresse = new Id;
+- for( int cur_adresse = 0 ; cur_adresse < adresses->my_d.size() ; ++cur_adresse ) {
+- adresse = parse( trace::NONE, 1, '[', adresses->my_d[cur_adresse] );
+- if( adresse != NULL ) {
+- // split again
+- Id * fields = new Id;
+- fields = parse( trace::NONE, 1, '(' , adresse->my_d[1] );
+- if( fields != NULL ) {
+- std::string const& town = adresse->my_d[2];
+- std::string const& state = adresse->my_d[3];
+- std::string const& postal = adresse->my_d[4];
+- std::string const& country = adresse->my_d[5];
+- std::cout << "ADR";
+- if( adresse->my_d[0].size() > 0 )
+- if( adresse->my_d[0].find_first_of( "0123456789 _-:;," ) == adresse->my_d[0].npos )
+- std::cout << ";TYPE=" << adresse->my_d[0];
+- std::cout << ':' << ';' << ';' << fields->my_d[0];
+- for( int i=1 ; i<fields->my_d.size() ; ++i )
+- std::cout << ',' << fields->my_d[i] ;
+- std::cout << ';' << town << ';' << state << ';' << postal << ';' << country << ';' << std::endl;
+- }
+- else
+- std::cerr << "unknown adresse format for ==>" << adresse->my_d[1] << "<<=" << std::endl;
+-
+- delete fields;
+- }
+- }
+- delete adresse;
+- delete adresses;
+- }
+-
+- if( s[Id::NET].compare("nil") != 0 ) {
+- Id * nets = new Id;
+- nets = parse( trace::NONE, 1, '(', s[Id::NET] );
+- if( nets == NULL ) {
+- std::cerr << "can't parse nets ==>" << s[Id::NET] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- std::cout << "EMAIL;INTERNET;PREF:" << nets->my_d[0] << std::endl;
+- for( int cur_net = 1 ; cur_net < nets->my_d.size() ; ++cur_net )
+- std::cout << "EMAIL;INTERNET:" << nets->my_d[cur_net] << std::endl;
+-
+- delete nets;
+- }
+-
+- if( s[Id::COMPANY].compare("nil") != 0 )
+- std::cout << "ORG:" << s[Id::COMPANY] << std::endl;
+-
+- if( s[Id::AKA].compare("nil") != 0 ) {
+- Id * akas = new Id;
+- if( s[Id::AKA].find('(') == s[Id::AKA].npos )
+- std::cout << "NICKNAME:" << s[Id::AKA] << std::endl;
+- else
+- {
+- akas = parse( trace::NONE, 1, '(', s[Id::AKA] );
+- if( akas == NULL ) {
+- std::cerr << "can't parse akas ==>" << s[Id::AKA] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * aka = new Id;
+- for( int cur_aka = 0 ; cur_aka < akas->my_d.size() ; ++cur_aka ) {
+- aka = parse( trace::NONE, 1, '(', akas->my_d[cur_aka] );
+- if( aka != NULL )
+- std::cout << "NICKNAME:" << aka->my_d[0] << std::endl;
+- }
+- delete aka;
+- }
+- delete akas;
+- }
+-
+- if( s[Id::NOTES].compare("nil") != 0 ) {
+- Id * notes = new Id;
+- if( s[Id::NOTES].find('(') == s[Id::NOTES].npos )
+- std::cout << "NOTE:" << s[Id::NOTES] << std::endl;
+- else {
+- notes = parse( trace::NONE, 1, '(', s[Id::NOTES] );
+- if( notes == NULL ) {
+- std::cerr << "can't parse notes ==>" << s[Id::NOTES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * note = new Id;
+- for( int cur_note = 0 ; cur_note < notes->my_d.size() ; ++cur_note ) {
+- note = parse( trace::NONE, 1, '(', notes->my_d[cur_note] );
+- if( note != NULL ) {
+- std::string const& t = note->my_d[0];
+- std::string const& r = note->my_d[1];
+-
+- if( t.find("creation-date") != t.npos || t.find("timestamp") != t.npos ) {
+- ; // drop
+- } else if( t.find("www") != t.npos || t.find("http") != t.npos ) {
+- std::cout << "URL:" << r << std::endl;
+- } else if( t.find("notes") != t.npos ) {
+- std::cout << "NOTE:" << r << std::endl;
+- } else if( t.find("icq") != t.npos ) {
+- std::cout << "NOTE: ICQ #" << r << std::endl;
+- } else if( t.find("msn") != t.npos ) {
+- std::cout << "NOTE: MSN " << r << std::endl;
+- } else {
+- std::cerr << "drop notes: " << t << " for " << s[Id::NAME] << std::endl;
+- }
+- }
+- }
+- delete note;
+- }
+- delete notes;
+- }
+-
+- std::cout << "END:VCARD" << std::endl << std::endl;
+- delete id;
+- // os.close();
+-}
+-
+-
+-// ----------------------------------------------------------------------
+-// ABOOK
+-// ----------------------------------------------------------------------
+-
+-static two_strings ABOOKPhoneTypes [] =
+-{
+- { "home", "phone" },
+- { "tel", "phone" },
+- { "perso", "phone" },
+- { "personnel", "phone" },
+- { "personel", "phone" },
+- { "monchat", "phone" },
+- { "msg", "phone" },
+- { "mesg", "phone" },
+- { "work", "workphone" },
+- { "travail", "workphone" },
+- { "paris", "workphone" },
+- { "lyon", "workphone" },
+- { "issy", "workphone" },
+- { "insa", "workphone" },
+- { "woo", "workphone" },
+- { "fac", "workphone" },
+- { "voice", "phone" },
+- { "voie", "phone" },
+- { "fax", "fax" },
+- { "cell", "mobile" },
+- { "portable", "mobile" },
+- { "gsm", "mobile" },
+- { "video", "phone" },
+- { "pager", "phone" },
+- { "tatoo", "phone" },
+- { "voiture", "phone" },
+- { "modem", "phone" },
+- { "isdn", "phone" },
+- { "pcs", "phone" },
+- { 0, 0 }
+-};
+-
+-struct ABOOKPhoneTypesMap {
+- static two_strings const my_default [];
+- struct ltstr {
+- inline bool
+- operator()(const char* s1, const char* s2) const {
+- return strcmp(s1, s2) < 0;
+- }
+- };
+-
+- ABOOKPhoneTypesMap() {
+- unsigned short i = 0;
+- while( ABOOKPhoneTypes[i].my_val != 0 ) {
+- my_h[ ABOOKPhoneTypes[i].my_val ] = ABOOKPhoneTypes[i].my_trans;
+- ++i;
+- }
+- }
+-
+- typedef std::map<const char*,const char*,ltstr> hash_t;
+- hash_t my_h;
+-};
+-
+-two_strings const ABOOKPhoneTypesMap::my_default [] = {
+- // VCARD ABOOK
+- { "*", "phone" },
+- { 0, 0 }
+-};
+-
+-static ABOOKPhoneTypesMap abook_phone_types_map;
+-
+-void toabook( std::string const& l ) {
+- Id * id = parse( trace::NONE, 9,'[',l);
+- if( id == NULL ) {
+- if( l.size() > 2 )
+- std::cerr << "Broken line ==>" << l << "<==" << std::endl;
+- return;
+- }
+-
+- Id::storage_t const& s = id->my_d;
+-
+- std::cout << '[' << counter << ']' << std::endl;
+- ++counter;
+-
+- std::cout << "name=" << s[Id::FORNAME] << ' ' << s[Id::NAME] << std::endl;
+-
+- if( s[Id::NET].compare("nil") != 0 ) {
+- Id * nets = new Id;
+- nets = parse( trace::NONE, 1, '(', s[Id::NET] );
+- if( nets == NULL ) {
+- std::cerr << "can't parse nets ==>" << s[Id::NET] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- std::cout << "email=" << nets->my_d[0];
+- for( int cur_net = 1 ; cur_net < nets->my_d.size() ; ++cur_net ) {
+- std::cout << "," << nets->my_d[cur_net];
+- }
+- std::cout << std::endl;
+-
+- delete nets;
+- }
+-
+- if( s[Id::PHONES].compare( "nil" ) != 0 ) {
+- Id * phones = new Id;
+- phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
+- if( phones == NULL ) {
+- std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * phone = new Id;
+- for( int cur_phone = 0 ; cur_phone < phones->my_d.size() ; ++cur_phone ) {
+- phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
+- if( phone != NULL ) {
+- if( phone->my_d[0].find_first_of( "0123456789 _-:;," ) == phone->my_d[0].npos ) {
+- ABOOKPhoneTypesMap::hash_t::iterator it;
+- if( (it=abook_phone_types_map.my_h.find( const_cast<char*>(phone->my_d[0].c_str())))
+- != abook_phone_types_map.my_h.end() ) {
+- std::cout << it->second;
+- } else {
+- std::cout << abook_phone_types_map.my_default[0].my_trans;
+- }
+- }
+- if( phone->my_d.size() > 1 )
+- std::cout << '=' << phone->my_d[1] << std::endl;
+- else
+- std::cerr << "phone size is less than 2" << std::endl;
+- }
+- }
+- delete phone;
+- delete phones;
+- }
+-
+- if( s[Id::ADRESSES].compare( "nil" ) != 0 ) {
+- Id * adresses = new Id;
+- adresses = parse( trace::NONE, 1, '(', s[Id::ADRESSES] );
+- if( adresses == NULL ) {
+- std::cerr << "can't parse adresses ==>" << s[Id::ADRESSES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * adresse = new Id;
+- for( int cur_adresse = 0 ; cur_adresse < adresses->my_d.size() ; ++cur_adresse ) {
+- adresse = parse( trace::NONE, 1, '[', adresses->my_d[cur_adresse] );
+- if( adresse != NULL ) {
+- // split again
+- Id * fields = new Id;
+- fields = parse( trace::NONE, 1, '(' , adresse->my_d[1] );
+- if( fields != NULL ) {
+- std::string const& town = adresse->my_d[2];
+- std::string const& state = adresse->my_d[3];
+- std::string const& postal = adresse->my_d[4];
+- std::string const& country = adresse->my_d[5];
+-
+- std::cout << "address=";
+- for( int i=0 ; i<fields->my_d.size() ; ++i )
+- std::cout << fields->my_d[i] << ' ';
+- std::cout << std::endl;
+-
+- std::cout << "city=" << town << std::endl;
+- std::cout << "state=" << state << std::endl;
+- std::cout << "zip=" << postal << std::endl;
+- std::cout << "country=" << country << std::endl;
+- } else {
+- std::cerr << "unknown adresse format for ==>" << adresse->my_d[1] << "<<=" << std::endl;
+- }
+- delete fields;
+- }
+- }
+- delete adresse;
+- delete adresses;
+- }
+-
+- if( s[Id::AKA].compare("nil") != 0 )
+- {
+- Id * akas = new Id;
+- if( s[Id::AKA].find('(') == s[Id::AKA].npos )
+- {
+- std::cout << "nick=" << s[Id::AKA] << std::endl;
+- }
+- delete akas;
+- }
+-
+- if( s[Id::NOTES].compare("nil") != 0 ) {
+- Id * notes = new Id;
+- if( s[Id::NOTES].find('(') == s[Id::NOTES].npos ) {
+- std::cout << "notes=" << s[Id::NOTES] << std::endl;
+- } else {
+- notes = parse( trace::NONE, 1, '(', s[Id::NOTES] );
+- if( notes == NULL ) {
+- std::cerr << "can't parse notes ==>" << s[Id::NOTES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * note = new Id;
+- for( int cur_note = 0 ; cur_note < notes->my_d.size() ; ++cur_note ) {
+- note = parse( trace::NONE, 1, '(', notes->my_d[cur_note] );
+-
+- if( note != NULL ) {
+- std::string const& t = note->my_d[0];
+- std::string const& r = note->my_d[1];
+-
+- if( t.find("creation-date") != t.npos || t.find("timestamp") != t.npos ) {
+- ; // drop
+- } else if( t.find("www") != t.npos || t.find("http") != t.npos ) {
+- std::cout << "url=" << r << std::endl;
+- } else if( t.find("notes") != t.npos ) {
+- std::cout << "note=" << r << std::endl;
+- } else if( t.find("icq") != t.npos ) {
+- std::cout << "note=icq #" << r << std::endl;
+- } else if( t.find("msn") != t.npos ) {
+- std::cout << "note=msn" << r << std::endl;
+- } else {
+- std::cerr << "drop notes: " << t << " for " << s[Id::NAME] << std::endl;
+- }
+- }
+- }
+- delete note;
+- delete notes;
+- }
+- }
+-
+- std::cout << std::endl;
+- delete id;
+-}
+-
+-// ----------------------------------------------------------------------
+-// CSV
+-// ----------------------------------------------------------------------
+-void tocsv( std::string const& l )
+-{
+- char const sep = ',';
+- char const quo = '"';
+-
+- Id * id = parse( trace::NONE, 9,'[',l);
+- if( id == NULL )
+- {
+- if( l.size() > 2 )
+- std::cerr << "Broken line ==>" << l << "<==" << std::endl;
+- return;
+- }
+-
+- Id::storage_t const& s = id->my_d;
+-
+- // "First Name","Last Name","Display Name"
+- std::cout << quo << s[Id::NAME] << quo << sep;
+- std::cout << quo << s[Id::FORNAME] << quo << sep;
+- std::cout << quo << s[Id::FORNAME] << ' ' << s[Id::NAME] << quo << sep;
+-
+- // "Nickname Name"
+- std::string s_aka;
+- if( s[Id::AKA].compare("nil") != 0 )
+- {
+- Id * akas = new Id;
+- if( s[Id::AKA].find('(') == s[Id::AKA].npos )
+- {
+- std::cout << quo << s[Id::AKA] << quo << sep ;
+- }
+- else
+- {
+- akas = parse( trace::NONE, 1, '(', s[Id::AKA] );
+- if( akas == NULL )
+- {
+- std::cerr << "can't parse akas ==>" << s[Id::AKA] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * aka = new Id;
+- aka = parse( trace::NONE, 1, '(', akas->my_d[0] );
+- if( aka != NULL )
+- {
+- s_aka = quo + aka->my_d[0] + quo;
+- }
+- delete aka;
+- delete akas;
+- }
+- }
+- std::cout << s_aka << sep;
+-
+- // "E-mail","Secondary E-mail"
+- std::string s_email1;
+- std::string s_email2;
+- if( s[Id::NET].compare("nil") != 0 )
+- {
+- Id * nets = new Id;
+- nets = parse( trace::NONE, 1, '(', s[Id::NET] );
+- if( nets == NULL )
+- {
+- std::cerr << "can't parse nets ==>" << s[Id::NET] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- s_email1 = quo + nets->my_d[0] + quo;
+- if( nets->my_d.size() > 1 )
+- {
+- s_email2 = quo + nets->my_d[1] + quo;
+- }
+- delete nets;
+- }
+- std::cout << s_email1 << sep << s_email2 << sep;
+-
+- // "Business Phone","Home Phone","Fax Phone","Pager","Mobile Phone"
+- std::string p_business;
+- std::string p_home;
+- std::string p_fax;
+- std::string p_pager;
+- std::string p_mobile;
+-
+- if( s[Id::PHONES].compare( "nil" ) != 0 )
+- {
+- Id * phones = new Id;
+- phones = parse( trace::NONE, 1, '(', s[Id::PHONES] );
+- if( phones == NULL )
+- {
+- std::cerr << "can't parse phones ==>" << s[Id::PHONES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * phone = new Id;
+- int cur_phone;
+- for( cur_phone = 0 ; cur_phone < std::min(size_t(5),phones->my_d.size()) ; ++cur_phone )
+- {
+- phone = parse( trace::NONE, 1, '[', phones->my_d[cur_phone] );
+-
+- if( phone != NULL )
+- {
+- std::string trans;
+- if( phone->my_d[0].find_first_of( "0123456789 _-:;," ) == phone->my_d[0].npos )
+- {
+- ABOOKPhoneTypesMap::hash_t::iterator it;
+- if( (it=abook_phone_types_map.my_h.find( const_cast<char*>(phone->my_d[0].c_str())))
+- != abook_phone_types_map.my_h.end() )
+- {
+- trans = it->second;
+- }
+- else
+- {
+- trans = abook_phone_types_map.my_default[0].my_trans;
+- }
+- }
+- if( trans.find("home") != trans.npos )
+- {
+- p_home = quo + phone->my_d[1] + quo ;
+- }
+- else if( trans.find("work") != trans.npos )
+- {
+- p_business = quo + phone->my_d[1] + quo ;
+- }
+- else if( trans.find("cell") != trans.npos )
+- {
+- p_mobile = quo + phone->my_d[1] + quo ;
+- }
+- else if( trans.find("fax") != trans.npos )
+- {
+- p_fax = quo + phone->my_d[1] + quo ;
+- }
+- else if( trans.find("pager") != trans.npos )
+- {
+- p_pager = quo + phone->my_d[1] + quo ;
+- }
+- else
+- {
+- if( p_home.size() == 0 )
+- {
+- p_home = quo + phone->my_d[1] + quo ;
+- }
+- }
+- }
+- }
+- delete phone;
+- delete phones;
+- }
+- std::cout << p_business << sep
+- << p_home << sep
+- << p_fax << sep
+- << p_pager << sep
+- << p_mobile << sep;
+-
+- // "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"
+- if( s[Id::ADRESSES].compare( "nil" ) != 0 )
+- {
+- Id * adresses = new Id;
+- adresses = parse( trace::NONE, 1, '(', s[Id::ADRESSES] );
+- if( adresses == NULL )
+- {
+- std::cerr << "can't parse adresses ==>" << s[Id::ADRESSES] << "<==" << std::endl;
+- delete id;
+- return;
+- }
+-
+- Id * adresse = new Id;
+- int cur_adresse;
+- for( cur_adresse = 0 ; cur_adresse < std::min(size_t(2),adresses->my_d.size()) ; ++cur_adresse )
+- {
+- adresse = parse( trace::NONE, 1, '[', adresses->my_d[cur_adresse] );
+-
+- if( adresse != NULL )
+- {
+- // split again
+- Id * fields = new Id;
+- fields = parse( trace::NONE, 1, '(' , adresse->my_d[1] );
+- if( fields != NULL )
+- {
+- std::string const& town = adresse->my_d[2];
+- std::string const& state = adresse->my_d[3];
+- std::string const& postal = adresse->my_d[4];
+- std::string const& country = adresse->my_d[5];
+-
+-// if( adresse->my_d[0].size() > 0 )
+-// {
+-// if( adresse->my_d[0].find_first_of( "0123456789 _-:;," ) ==
+-// adresse->my_d[0].npos )
+-// {
+-// std::cout << ";TYPE=" << adresse->my_d[0];
+-// }
+-// }
+- int i;
+- for( i=0 ; i<std::min(size_t(2),fields->my_d.size()) ; ++i )
+- std::cout << quo << fields->my_d[i] << quo << sep;
+- for( i=std::min(size_t(2),fields->my_d.size()) ; i<2; ++i )
+- std::cout << sep;
+- std::cout << quo << town << quo << sep
+- << quo << state << quo << sep
+- << quo << postal << quo << sep
+- << quo << country << quo << sep;
+- }
+- else
+- {
+- std::cerr << "unknown adresse format for ==>" << adresse->my_d[1]
+- << "<<=" << std::endl;
+- }
+- delete fields;
+- }
+- }
+- for( cur_adresse = std::min(size_t(2),adresses->my_d.size()) ; cur_adresse<2; ++cur_adresse )
+- {
+- std::cout << sep << sep << sep << sep << sep << sep;
+- }
+- delete adresse;
+- delete adresses;
+- }
+- else
+- {
+- std::cout << sep << sep << sep << sep << sep << sep
+- << sep << sep << sep << sep << sep << sep;
+- }
+-
+- // "Job Title","Department","Company"
+- std::string s_title;
+- std::string s_departement;
+- std::string s_company;
+- if( s[Id::COMPANY].compare("nil") != 0 )
+- {
+- s_company = quo + s[Id::COMPANY] + quo;
+- }
+- std::cout << s_title << sep
+- << s_departement << sep
+- << s_company << sep;
+-
+- // "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::string n_web1;
+- std::string n_web2;
+- std::string n_byear;
+- std::string n_bmonth;
+- std::string n_bday;
+- std::string n_user1; // icq
+- std::string n_user2; // im
+- std::string n_user3;
+- std::string n_user4;
+- std::string n_note;
+-
+- if( s[Id::NOTES].compare("nil") != 0 )
+- {
+- Id * notes = new Id;
+- if( s[Id::NOTES].find('(') == s[Id::NOTES].npos )
+- {
+- n_note = quo + s[Id::NOTES] + quo;
+- }
+- else
+- {
+- notes = parse( trace::NONE, 1, '(', s[Id::NOTES] );
+- if( notes == NULL )
+- {
+- std::cerr << "can't parse notes ==>" << s[Id::NOTES] << "<==" ;
+- delete id;
+- return;
+- }
+-
+- Id * note = new Id;
+- int cur_note;
+- for( cur_note = 0 ; cur_note < std::min(size_t(10),notes->my_d.size()) ; ++cur_note )
+- {
+- note = parse( trace::NONE, 1, '(', notes->my_d[cur_note] );
+-
+- if( note != NULL )
+- {
+- std::string const& t = note->my_d[0];
+- std::string const& r = note->my_d[1];
+-
+- if( t.find("www") != t.npos || t.find("http") != t.npos )
+- {
+- if( n_web1.size() == 0 )
+- {
+- n_web1 = quo + r + quo;
+- }
+- else
+- {
+- n_web2 = quo + r + quo;
+- }
+- }
+- else if( t.find("icq") != t.npos )
+- {
+- n_user1 = quo + r + quo;
+- }
+- else if( t.find("notes") != t.npos )
+- {
+- n_note = quo + r + quo;
+- }
+- }
+- }
+- delete note;
+- delete notes;
+- }
+- }
+-
+- std::cout << n_web1 << sep << n_web2 << sep
+- << n_byear << sep << n_bmonth << sep << n_bday << sep
+- << n_user1 << sep << n_user2 << sep << n_user3 << sep << n_user4 << sep
+- << n_note;
+-
+- std::cout << std::endl;
+- delete id;
+-}
+-
+-
+-// ----------------------------------------------------------------------
+-// USAGE
+-// ----------------------------------------------------------------------
+-int
+-usage(int argc, char * argv[] )
+-{
+- std::cerr << argv[0] << " -t (vcard|gnokii|csv|abook) -l (fr|en) bbdb.txt" << std::endl;
+- std::cerr << "argc=" << argc << std::endl;
+-
+- return 1;
+-}
+-
+-
+-// ----------------------------------------------------------------------
+-// main
+-// ----------------------------------------------------------------------
+-int
+-main( int argc, char * argv[] )
+-{
+- if( argc < 4 )
+- {
+- return usage(argc,argv);
+- }
+-
+- char t;
+- char * lg = "en";
+- if( argc == 4 && !strcmp(argv[1],"-t") )
+- {
+- if( !strcmp(argv[2],"vcard") )
+- {
+- t = 'v';
+- }
+- else if( !strcmp(argv[2],"csv") )
+- {
+- t = 'c';
+- }
+- else if( !strcmp(argv[2],"gnokii") )
+- {
+- t = 'g';
+- }
+- else if( !strcmp(argv[2],"abook") )
+- {
+- t = 'a';
+- }
+- else
+- {
+- return usage(argc,argv);
+- }
+- }
+- else if( argc == 6 && !strcmp(argv[3],"-l") )
+- {
+- lg = argv[4];
+- if( strcmp(lg,"fr") && strcmp(argv[4],"en") )
+- {
+- return usage(argc,argv);
+- }
+- }
+- else
+- {
+- return usage(argc,argv);
+- }
+-
+- std::vector<std::string> v;
+-
+- // open file
+- std::ifstream fs;
+- fs.open( argv[argc-1], std::ios::in );
+- if( ! fs.is_open() )
+- {
+- std::cerr << "can't open " << argv[argc-1] << std::endl;
+- return 1;
+- }
+- while( ! fs.eof() )
+- {
+- char data[1024];
+- fs.getline(data,1024);
+- if( data[0] != ';' )
+- {
+- v.push_back( data );
+- }
+- }
+- fs.close();
+-
+- // parse v
+- switch( t )
+- {
+- case 'g':
+- std::for_each( v.begin(), v.end(), tognokii );
+- break;
+- case 'v':
+- std::for_each( v.begin(), v.end(), tovcard );
+- break;
+- case 'a':
+- std::for_each( v.begin(), v.end(), toabook );
+- break;
+- case 'c': {
+- if( !strcmp( lg, "en" ))
+- {
+- 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;
+- }
+- else
+- {
+- 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;
+- }
+-
+- std::for_each( v.begin(), v.end(), tocsv );
+- break;
+- }
+- } // end switch
+-
+- // open output file
+-
+- return 0;
+-}
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/CVS/Entries abook/contrib/CVS/Entries
+--- BUILD/abook-0.6.0pre2/contrib/CVS/Entries 2006-09-06 13:55:29.000000000 +0200
++++ abook/contrib/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
+@@ -1 +0,0 @@
+-D
+diff -urN BUILD/abook-0.6.0pre2/contrib/CVS/Repository abook/contrib/CVS/Repository
+--- BUILD/abook-0.6.0pre2/contrib/CVS/Repository 2006-09-06 13:55:29.000000000 +0200
++++ abook/contrib/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
+@@ -1 +0,0 @@
+-abook/contrib
+diff -urN BUILD/abook-0.6.0pre2/contrib/CVS/Root abook/contrib/CVS/Root
+--- BUILD/abook-0.6.0pre2/contrib/CVS/Root 2006-09-06 13:55:29.000000000 +0200
++++ abook/contrib/CVS/Root 1970-01-01 01:00:00.000000000 +0100
+@@ -1 +0,0 @@
+-:ext:jheinonen@abook.cvs.sourceforge.net:/cvsroot/abook
+diff -urN BUILD/abook-0.6.0pre2/contrib/epm/abook.list.in abook/contrib/epm/abook.list.in
+--- BUILD/abook-0.6.0pre2/contrib/epm/abook.list.in 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/epm/abook.list.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,51 +0,0 @@
+-# abooklist file
+-# tested with epm 3.1.0 and abook @MAJOR@.@MINOR@.@PATCHLEVEL@
+-
+-# Directories...
+-$prefix=@prefix@
+-$bindir=@prefix@/bin
+-$confdir=@sysconfdir@
+-$mandir=@mandir@
+-$srcdir=@top_srcdir@
+-$docdir=@datadir@/abook-@MAJOR@.@MINOR@.@PATCHLEVEL@
+-
+-# Product information
+-%product abook
+-%copyright GPL
+-%vendor Jaakko Heinonen <jheinonen@users.sourceforge.net>
+-%license ${srcdir}/COPYING
+-%readme ${srcdir}/README
+-%description Abook is an addressbook program with mutt mail client support.
+-%version @MAJOR@.@MINOR@.@PATCHLEVEL@
+-%packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it>
+-
+-d 0755 root sys $bindir/ -
+-f 0755 root sys $bindir/abook $srcdir/abook
+-d 0755 root sys $mandir -
+-d 0755 root sys $mandir/man1 -
+-f 0644 root sys $mandir/man1/abook.1 $srcdir/abook.1
+-d 0755 root sys $mandir/man5 -
+-f 0644 root sys $mandir/man5/abookrc.5 $srcdir/abookrc.5
+-d 0755 root sys $docdir -
+-f 0644 root sys $docdir/AUTHORS $srcdir/AUTHORS
+-f 0644 root sys $docdir/BUGS $srcdir/BUGS
+-f 0644 root sys $docdir/ChangeLog $srcdir/ChangeLog
+-f 0644 root sys $docdir/FAQ $srcdir/FAQ
+-f 0644 root sys $docdir/NEWS $srcdir/NEWS
+-f 0644 root sys $docdir/README $srcdir/README
+-f 0644 root sys $docdir/THANKS $srcdir/THANKS
+-f 0644 root sys $docdir/TODO $srcdir/TODO
+-f 0644 root sys $docdir/sample.abookrc $srcdir/sample.abookrc
+-d 0755 root sys $docdir/contrib -
+-f 0755 root sys $docdir/contrib/mail2abook.py contrib/mail2abook.py
+-f 0755 root sys $docdir/contrib/vcard2abook.pl contrib/vcard2abook.pl
+-d 0755 root sys $docdir/contrib/abook+vim -
+-f 0644 root sys $docdir/contrib/abook+vim/README contrib/abook+vim/README
+-f 0644 root sys $docdir/contrib/abook+vim/mail.vim contrib/abook+vim/mail.vim
+-d 0755 root sys $docdir/contrib/whitelist -
+-f 0644 root sys $docdir/contrib/whitelist/README contrib/whitelist/README
+-f 0755 root sys $docdir/contrib/whitelist/abook2whitelist.sh contrib/whitelist/abook2whitelist.sh
+-f 0644 root sys $docdir/contrib/whitelist/mutt.whitelist contrib/whitelist/mutt.whitelist
+-f 0644 root sys $docdir/contrib/whitelist/patch.orig.obsolete contrib/whitelist/patch.orig.obsolete
+-f 0744 root sys $docdir/contrib/whitelist/whitelist.rc contrib/whitelist/whitelist.rc
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/epm/configure.in abook/contrib/epm/configure.in
+--- BUILD/abook-0.6.0pre2/contrib/epm/configure.in 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/epm/configure.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,76 +0,0 @@
+-dnl abook configure.in
+-
+-AC_INIT(abook.c)
+-AM_INIT_AUTOMAKE(abook, 0.4.14)
+-AM_CONFIG_HEADER(config.h)
+-
+-AC_CANONICAL_HOST
+-
+-MAJOR=0
+-MINOR=4
+-PATCHLEVEL=14
+-AC_SUBST(MAJOR)
+-AC_SUBST(MINOR)
+-AC_SUBST(PATCHLEVEL)
+-
+-AC_PROG_CC
+-AC_ISC_POSIX
+-AM_C_PROTOTYPES
+-if test "x$U" != "x"; then
+- AC_MSG_ERROR(Compiler not ANSI compliant)
+-fi
+-AC_C_INLINE
+-AC_PROG_INSTALL
+-AC_HEADER_STDC
+-AC_CHECK_HEADERS(unistd.h locale.h termios.h linux/termios.h sys/ioctl.h)
+-AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
+-AC_CHECK_FUNCS(setlocale)
+-
+-dnl -------------------
+-dnl (n)curses detection
+-dnl -------------------
+-
+-abook_cv_curses=/usr
+-AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ],
+- [if test $withval != yes; then
+- abook_cv_curses=$withval
+- fi
+- if test x$abook_cv_curses != x/usr; then
+- LDFLAGS="-L${abook_cv_curses}/lib $LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
+- fi])
+-
+-AC_CHECK_LIB(ncurses, initscr,
+- [LIBS="$LIBS -lncurses"
+- if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+- fi
+- AC_CHECK_HEADERS(ncurses.h)],
+- [CF_CURSES_LIBS])
+-
+-dnl --------------------------
+-dnl end of (n)curses detection
+-dnl --------------------------
+-
+-AC_CHECK_FUNCS(resizeterm)
+-
+-AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],)
+-AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF)],)
+-
+-AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support ], [case "${enableval}" in
+- yes) debug=true ;;
+- no) debug=false ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+- esac], [debug=false])
+-
+-if test x$debug = xtrue; then
+- CPPFLAGS="-DDEBUG $CPPFLAGS"
+- CFLAGS="-g $CFLAGS"
+-fi
+-
+-if test x$GCC = xyes; then
+- CFLAGS="-Wall $CFLAGS"
+-fi
+-
+-AC_OUTPUT(Makefile abook.list)
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/epm/configure.in.patch abook/contrib/epm/configure.in.patch
+--- BUILD/abook-0.6.0pre2/contrib/epm/configure.in.patch 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/epm/configure.in.patch 1970-01-01 01:00:00.000000000 +0100
+@@ -1,29 +0,0 @@
+---- ../../configure.in Wed Oct 10 21:35:54 2001
+-+++ configure.in Wed Oct 10 04:52:33 2001
+-@@ -1,11 +1,18 @@
+- dnl abook configure.in
+-
+- AC_INIT(abook.c)
+--AM_INIT_AUTOMAKE(abook, 0.4.15pre2)
+-+AM_INIT_AUTOMAKE(abook, 0.4.14)
+- AM_CONFIG_HEADER(config.h)
+-
+- AC_CANONICAL_HOST
+-
+-+MAJOR=0
+-+MINOR=4
+-+PATCHLEVEL=14
+-+AC_SUBST(MAJOR)
+-+AC_SUBST(MINOR)
+-+AC_SUBST(PATCHLEVEL)
+-+
+- AC_PROG_CC
+- AC_ISC_POSIX
+- AM_C_PROTOTYPES
+-@@ -65,5 +72,5 @@
+- CFLAGS="-Wall $CFLAGS"
+- fi
+-
+--AC_OUTPUT(Makefile)
+-+AC_OUTPUT(Makefile abook.list)
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/epm/README abook/contrib/epm/README
+--- BUILD/abook-0.6.0pre2/contrib/epm/README 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/epm/README 1970-01-01 01:00:00.000000000 +0100
+@@ -1,14 +0,0 @@
+-Hi
+-I've written a list file (+ configure.in small mods) that can be used with
+-epm (www.easysw.com) to generate packages for almost all unixes. I find it
+-useful when switching between solaris, freebsd and linux. Hope it can be of
+-some help.
+-
+---
+- Giuseppe "Cowo" Corbelli ~\/~ My software: http://cowo.mascanc.net
+- -<! windoze: no need of an hammer to crash it! !>-
+-
+-
+-* * *
+-
+-NOTE: Please adjust version numbers in configure.in manually
+diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl abook/contrib/ldap-abook/comms.pl
+--- BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/ldap-abook/comms.pl 1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-$TMPERR="Cannot open temporary file";
+-$DESTFILEERR="Cannot open file $DESTFILE";
+-$REPORT="entries created";
+-1;
+diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-en abook/contrib/ldap-abook/comms.pl-en
+--- BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-en 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/ldap-abook/comms.pl-en 1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-$TMPERR="Cannot open temporary file";
+-$DESTFILEERR="Cannot open file $DESTFILE";
+-$REPORT="entries created";
+-1;
+diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-pl abook/contrib/ldap-abook/comms.pl-pl
+--- BUILD/abook-0.6.0pre2/contrib/ldap-abook/comms.pl-pl 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/ldap-abook/comms.pl-pl 1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-$TMPERR="Nie moglem otworzyc pliku /tmp/ldap2abook/tmp";
+-$DESTFILEERR="Nie moglem otworzyc pliku $DESTFILE";
+-$REPORT="wpisow utworzonych";
+-1;
+diff -urN BUILD/abook-0.6.0pre2/contrib/ldap-abook/ldap2abook abook/contrib/ldap-abook/ldap2abook
+--- BUILD/abook-0.6.0pre2/contrib/ldap-abook/ldap2abook 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/ldap-abook/ldap2abook 1970-01-01 01:00:00.000000000 +0100
+@@ -1,95 +0,0 @@
+-#!/usr/bin/perl
+-#
+-# This is very simple method to get data from LDAP and
+-# converts it to abook readable format.
+-# Script get only first email of any person. This is, probably,
+-# primary address.
+-# If you have better/simpler method - send me, please.
+-#
+-# You MUST have ldap-utils installed on your system to
+-# use this script. Without ldapsearch script does not work!
+-#
+-# Author: Mariusz Balewski <M.Balewski@wp.pl>
+-# 03.06.2004
+-# 29.08.2005 Tried to fix insecure tempfile handling (untested)
+-#
+-# GPL licensed
+-# Feel free to send me your comments
+-#
+-# I'm not programmer, so REMEMBER:
+-# YOU USE THIS SCRIPT ON YOUR OWN RISK!!!
+-#
+-
+-# Change this section to your local settings
+- # Your LDAP host
+- $HOST="ldaphost.com";
+-
+- # Base dn to search
+- $BASEDN="\"-b ou=example,dc=com\"";
+-
+- # dn which contains email addresses
+- $FINDDN="mail";
+-
+- # for example "-D \"cn=admin,dc=com\"" (if needed)
+- $AUTHDN="";
+-
+- # ldap password (if needed), or -w to force script
+- # to password prompting
+- $PASS="";
+-
+- # use -x if your ldaphost accept simple authentication
+- # or leave empty
+- $SIMPLEAUTH="";
+-
+- # Where you want to put results?
+- # In this example results will be putted to
+- # your home directory, to abookFromLDAP file.
+- # If you wish to use abook with this file, simply run:
+- # abook --datafile $HOME/abookFromLDAP
+- $DESTFILE="$ENV{'HOME'}/abookFromLDAP";
+-
+- # If you wish to see communiats in english or polish
+- # link comms.pl-en to comms.pl to english or
+- # comms.pl-pl to polish
+-
+-# End of configuration
+-###############################
+-###############################
+-
+-use File::Temp qw/ :mktemp /;
+-$file = mktemp("/tmp/tmpfileXXXXXXX");
+-
+-
+-require 'comms.pl';
+-
+-system("ldapsearch -h $HOST $SIMPLEAUTH $AUTHDN $PASS \"$FINDDN=*\" $BASEDN -LLL > $file");
+-
+-$i=0;
+-open(F1,"<$file") || die "$TMPERR";
+-open(F2,">$DESTFILE") || die "$DESTFILEERR";
+- flock(F1,8);
+- flock(F2,8);
+- while(<F1>){
+- if ($_ =~ m/^gecos/g){
+- s/^ //g;
+- s/^gecos: /name=/g;
+- print F2 "[$i]\n";
+- print F2 $_;
+- $i++;
+- }
+- elsif ($_ =~ m/^mail/g){
+- s/^mail: /email=/g;
+- print F2 "$_\n";
+- }
+- }
+- flock(F2,2);
+- flock(F1,2);
+-close(F2);
+-close(F1);
+-
+-unlink($file);
+-
+-print "\n$i ";
+-print "$REPORT\n\n";
+-
+-#== END
+diff -urN BUILD/abook-0.6.0pre2/contrib/mail2abook.py abook/contrib/mail2abook.py
+--- BUILD/abook-0.6.0pre2/contrib/mail2abook.py 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/mail2abook.py 1970-01-01 01:00:00.000000000 +0100
+@@ -1,438 +0,0 @@
+-#!/usr/bin/env python
+-
+-# NOTE: starting from abook version 0.4.15 it is often more convenient
+-# to use command line option "--add-email" instead of this script
+-
+-# mail2abook.py version 0.1
+-# by Jaakko Heinonen <jheinonen@users.sourceforge.net>
+-# based on Moritz Moeller-Herrmann's mail2muttalias.py
+-
+-# Description:
+-# this script reads all mail adresses from a piped mailfile and
+-# offers to write them to the ABOOKFILE specified in the script
+-# Append the following lines or similiar to your muttrc:
+-# macro pager A |'path to script'/mail2abook.py\n
+-
+-# Then press A in pager mode to add an address to your abook addressbook
+-
+-# Here's the original copyright information:
+-
+-# RELEASE 0.5
+-##
+-# Needs python 1.5 and cursesmodule 1.4 by andrich@fga.de (Oliver Andrich)
+-# available somewhere on http://www.python.org or directly from
+-# http://andrich.net/python/selfmade.html
+-#
+-# Copyright by Moritz Moeller-Herrmann <mmh@gmnx.net>
+-#
+-# Homepage (check for changes before reporting a bug)
+-# http://webrum.uni-mannheim.de/jura/moritz/mail2muttalias.html
+-#
+-# Use this any way you want. Please inform me of any error/improvement
+-# and leave the copyright notice untouched.
+-# No warranties, as this is my first program :-)
+-# Works for me on Linux with Python 1.5+
+-#
+-# Thanks to Josh Hildebrand for some improvements
+-##
+-
+-# Known bugs:
+-# If name containing @ is quoted("") before a mail adress,
+-# the program will not catch the whole name,
+-# but who would alias such an idiot?
+-# If you get a problem with "unknown variable / keyword error"
+-# with KEYUP and KEYDOWN, either get a newer pythoncurses module
+-# or change them to lowercase.
+-#
+-# Probably some more, mail me if you find one!
+-
+-import re
+-import string, sys, os
+-import curses, traceback
+-import locale
+-
+-locale.setlocale(locale.LC_ALL,os.environ["LANG"])
+-
+-ABOOKFILE=os.environ["HOME"] + "/.abook/addressbook"
+-
+-try :
+- testcurses = curses.KEY_UP
+-except NameError:
+- print "Your pythoncurses module is old. Please upgrade to 1.4 or higher."
+- print "Alternative: Modify the script. Change all 6 occurences of curses.KEY_UP"
+- print "and similiar to lowercase."
+-
+-try : testAF = ABOOKFILE #test if ALIASFILE was configured in script
+-except NameError:
+- try: ALIASFILE=os.environ["ABOOKFILE"] #test is environment MUTTALIASFILE was set
+- except KeyError:
+- print "Please specify ABOOKFILE at beginning of script \nor set environment variable ABOOKFILE"
+- print "Aborting ..."
+- sys.exit()
+-
+-
+-
+-###Thanks for the following go to Michael P. Reilly
+-if not sys.stdin.isatty(): # is it not attached to a terminal?
+- file = sys.stdin.read()
+- sys.stdin = _dev_tty = open('/dev/tty', 'w+')
+- # close the file descriptor for stdin thru the posix module
+- os.close(0)
+- # now we duplicate the opened _dev_tty file at file descriptor 0 (fd0)
+- # really, dup creates the duplicate at the lowest numbered, closed file
+- # descriptor, but since we just closed fd0, we know we will dup to fd0
+- os.dup(_dev_tty.fileno()) # on UNIX, the fileno() method returns the
+- # file object's file descriptor
+-else: # is a terminal
+- print "Please use as a pipe!"
+- print "Aborting..."
+- sys.exit()
+-# now standard input points to the terminal again, at the C level, not just
+-# at the Python level.
+-
+-
+-print "Looking for mail adresses, this may take a while..."
+-
+-
+-#### define functions
+-
+-
+-class screenC:
+- "Class to create a simple to use menu using curses"
+- def __init__(self):
+- import curses, traceback
+- self.MAXSECT = 0
+- self.LSECT = 1
+- # Initialize curses
+- self.stdscr=curses.initscr()
+- # Turn off echoing of keys, and enter cbreak mode,
+- # where no buffering is performed on keyboard input
+- curses.noecho()
+- curses.cbreak()
+-
+- # In keypad mode, escape sequences for special keys
+- # (like the cursor keys) will be interpreted and
+- # a special value like curses.KEY_LEFT will be returned
+- self.stdscr.keypad(1)
+-
+- def titel(self,TITEL="Title - test",HELP="Use up and down arrows + Return"):
+- "Draws Title and Instructions"
+- self.stdscr.addstr(0,0,TITEL,curses.A_UNDERLINE) # Title + Help
+- self.stdscr.addstr(self.Y -2 ,0,HELP,curses.A_REVERSE)
+-
+- def refresh(self):
+- self.stdscr.refresh()
+-
+- def size(self):
+- "Returns screen size and cursor position"
+- #Y, X = 0, 0
+- self.Y, self.X = self.stdscr.getmaxyx()
+- #self.y, self.x = 0, 0
+- self.y, self.x = self.stdscr.getyx()
+- #print Y, X
+- return self.Y, self.X, self.y, self.x
+-
+-
+- def showlist(self,LISTE,LSECT=1):
+- "Analyzes list, calculates screen, draws current part of list on screen "
+- s = self.Y -3 #space on screen
+- self.MAXSECT=1
+- while len(LISTE) > self.MAXSECT * s : # how many times do we need the screen?
+- self.MAXSECT = self.MAXSECT +1
+-
+- if self.LSECT > self.MAXSECT: #check for end of list
+- self.LSECT = LSECT -1
+-
+- if self.LSECT <= 0: #
+- self.LSECT =1
+-
+- if len(LISTE) <= s:
+- self.LISTPART=LISTE
+-
+- else :
+- self.LISTPART=LISTE[s * ( self.LSECT -1 ) : s * self.LSECT ] # part of the List is shown
+-
+- self.stdscr.addstr(self.Y -2, self.X -len(`self.LSECT`+`self.MAXSECT`) -5, "(" + `self.LSECT` + "/" + `self.MAXSECT` + ")")
+- #if len(LISTE) > self.Y - 3:
+- # return 1
+- for i in range (1, self.Y -2): # clear screen between title and help text
+- self.stdscr.move(i , 0)
+- self.stdscr.clrtoeol()
+- for i in range (0,len(self.LISTPART)): # print out current part of list
+- Item = self.LISTPART[i]
+- self.stdscr.addstr(i +1, 0, Item[:self.X])
+-
+- def getresult(self,HOEHE):
+- "Get Result from cursor position"
+- RESULT= self.LISTPART[(HOEHE -1)]
+- return RESULT
+-
+- def showresult(self, HOEHE, DICT={}):
+- "Look up result to show in dictionary if provided, return list member otherwise"
+- if DICT=={}:
+- return self.getresult(HOEHE)
+- else :
+- return string.join(DICT[self.getresult(HOEHE)], " || ")
+-
+-
+-
+- def menucall(self, LISTE, DICT={}, TITEL="",HELP="Use up and down arrows, Return to select"):
+- "Takes a list and offers a menu where you can choose one item, optionally, look up result in dictionary if provided"
+- REFY=1
+- self.__init__()
+- self.size()
+- self.titel(TITEL,HELP)
+- self.showlist(LISTE)
+- self.refresh()
+- self.stdscr.move(1,0)
+- while 1: # read Key events
+- c = self.stdscr.getch()
+- self.size()
+-
+- #if c == curses.KEY_LEFT and self.x > 0:
+- # self.stdscr.move(self.y, self.x -1); REFY = 1 # REFY == refresh: yes
+-
+- #if c == curses.KEY_RIGHT and self.x < self.X -1:
+- # #if x < 4 and LENGTH - ZAHLY > y - 1:
+- # self.stdscr.move(self.y, self.x + 1); REFY = 1
+-
+- if c == curses.KEY_UP or c == 107: #up arrow or k
+- if self.y > 1:
+- self.stdscr.move(self.y -1, self.x); REFY = 1
+- else :
+- self.LSECT=self.LSECT-1
+- self.showlist(LISTE,self.LSECT)
+- self.stdscr.move(len(self.LISTPART), 0)
+- REFY = 1
+-
+- if c == curses.KEY_DOWN or c == 106: #down arrow or j
+-
+- if self.y < len(self.LISTPART) :
+- self.stdscr.move(self.y +1, self.x); REFY = 1
+-
+- else :
+- self.LSECT=self.LSECT+1
+- self.showlist(LISTE,self.LSECT)
+- self.stdscr.move(1,0)
+- REFY = 1
+-
+- if c == curses.KEY_PPAGE:
+- self.LSECT=self.LSECT-1
+- self.showlist(LISTE,self.LSECT)
+- self.stdscr.move(1, 0)
+- REFY = 1
+-
+- if c == curses.KEY_NPAGE:
+- self.LSECT=self.LSECT+1
+- self.showlist(LISTE,self.LSECT)
+- self.stdscr.move(1,0)
+- REFY = 1
+-
+- if c == curses.KEY_END:
+- self.LSECT=self.MAXSECT
+- self.showlist(LISTE,self.LSECT)
+- self.stdscr.move(1,0)
+- REFY = 1
+-
+- if c == curses.KEY_HOME:
+- self.LSECT=1
+- self.showlist(LISTE,self.LSECT)
+- self.stdscr.move(1,0)
+- REFY = 1
+-
+-
+- if c == 10 : # \n (new line)
+- ERG = self.getresult(self.y )
+- self.end()
+- return ERG
+-
+- if c == 113 or c == 81: # "q or Q"
+- self.printoutnwait("Aborted by user!")
+- self.end()
+- sys.exit()
+- return 0
+-
+- if REFY == 1:
+- REFY = 0
+- self.size()
+- self.stdscr.move(self.Y -1, 0)
+- self.stdscr.clrtoeol()
+- self.stdscr.addstr(self.Y -1, 0, self.showresult(self.y,DICT)[:self.X -1 ], curses.A_BOLD)
+- self.stdscr.move(self.y, self.x)
+- self.refresh()
+-
+- def end(self):
+- "Return terminal"
+- # In the event of an error, restore the terminal
+- # to a sane state.
+- self.Y, self.X, self.y, self.x = 0, 0, 0, 0
+- self.LISTPART=[]
+- self.stdscr.keypad(0)
+- curses.echo()
+- curses.nocbreak()
+- curses.endwin()
+- #traceback.print_exc()
+-
+- def input(self, promptstr):
+- "raw_input equivalent in curses, asks for Input and returns it"
+- self.size()
+- curses.echo()
+- self.stdscr.move(0,0)
+- self.stdscr.clear()
+- self.stdscr.addstr(promptstr)
+- self.refresh()
+- INPUT=self.stdscr.getstr()
+- curses.noecho()
+- return INPUT
+-
+-
+- def printoutnwait(self, promptstr):
+- "Print out Text, wait for key"
+- curses.noecho()
+- self.stdscr.move(0,0)
+- self.stdscr.clear()
+-# The new Mutt client pauses after running the script already. No reason
+-# to pause twice. -Josh
+-# self.stdscr.addstr(promptstr+"\n\n(press key)")
+-# self.refresh()
+-# c = self.stdscr.getch()# read Key events
+-
+-
+-
+-def listrex (str, rgx): # Return a list of all regexes matched in string
+- "Search string for all occurences of regex and return a list of them."
+- result = []
+- start = 0 # set counter to zero
+- ende =len (str) #set end position
+- suchadress = re.compile(rgx,re.LOCALE)#compile regular expression, with LOCALE
+- while 1:
+- einzelerg = suchadress.search(str, start,ende) #create Match Object einzelerg
+- if einzelerg == None:#until none is found
+- break
+- result.append(einzelerg.group()) #add to result
+- start = einzelerg.end()
+- return result
+-
+-def strrex (str): # Return first occurence of regular exp as string
+- "Search string for first occurence of regular expression and return it"
+- muster = re.compile(r"<?[\w\b.ßüöä-]+\@[\w.-]+>?", re.LOCALE) #compile re
+- matobj = muster.search(str) #get Match Objekt from string
+- if muster.search(str) == None: #if none found
+- return ""
+- return matobj.group() #return string
+-
+-def stripempty (str):#Looks for all empty charcters and replaces them with a space
+- "Looks for all empty charcters and replaces them with a space,kills trailing"
+- p = re.compile( "\s+") #shorten
+- shrt = p.sub(" ", str)
+- q = re.compile("^\s+|\s+$") #strip
+- strp = q.sub("", shrt)
+- return strp
+-
+-def getmailadressfromstring(str):
+- "Takes str and gets the first word containing @ == mail adress"
+- StringSplit=string.split(str)
+- for i in range(len(StringSplit)):
+- if "@" in StringSplit[i]:
+- return StringSplit[i]
+- return None
+-
+-### main program
+-
+-OCCLIST = listrex(file, '"?[\s\w\ö\ä\ü\-\ß\_.]*"?\s*<?[\w.-]+\@[\w.-]+>?')#get list, RE gets all Email adresses + prepending words
+-
+-if OCCLIST:
+- print len(OCCLIST),"possible adresses found!."
+-else:
+- print"ERROR, no mails found"
+- sys.exit()
+-
+-
+-for i in range(len(OCCLIST)): #strip all whitespaces + trailing from each list member
+- OCCLIST[i] = string.strip(OCCLIST [i])
+-
+-
+-OCCDIC={} # Dictionary created to avoid duplicates
+-for i in range(len(OCCLIST)): # iterate over
+- d = OCCLIST[i]
+- Mail = getmailadressfromstring(OCCLIST[i])
+- #strrex(OCCLIST[i]) #Mailadresse
+- Schnitt = - len(Mail) #cut off mail adress
+- Mail = string.replace(Mail, "<", "")#remove <>
+- Mail = string.replace(Mail, ">", "")
+- Name = string.replace (stripempty (d[:Schnitt]), '"', '') #leaves name
+- if not OCCDIC.get(Mail): # if new Emailadress
+- Liste = [] # create list for names
+- Liste.append(Name) # append name
+- OCCDIC[Mail] = Liste # assign list to adress
+- else :
+- Liste = OCCDIC[Mail] # otherwise get list
+- Liste.append(Name) # append name to list of names
+- OCCDIC[Mail] = Liste # and assign
+-
+-
+-KEYS = OCCDIC.keys() #iterate over dictionary, sort names
+- #KEYS are all the adresses
+-
+-for z in range( len(KEYS) ):
+- NAMLIST = OCCDIC[KEYS[z]] # Get list of possible names
+- d = {} # sort out duplicates and
+- # remove bad names + empty strings from adresses
+- for x in NAMLIST:
+- if x in ["", "<"]: continue
+- d[x]=x
+- NAMLIST = d.values()
+- NAMLIST.sort() # sort namelist alphabetically
+- print z, KEYS[z], "had possible names:", NAMLIST # Debugging output
+- OCCDIC[KEYS[z]] = NAMLIST #
+-
+-print "\n"
+-
+-###sorting
+-
+-def Comparelength(x, y):
+- "Compare number of names in OCCDIC, if equal sort alphabetically."
+- if len(OCCDIC[y]) == len(OCCDIC[x]):
+- return cmp(x, y)
+- if len(OCCDIC[y]) < len(OCCDIC[x]):
+- return -1
+- else:
+- return 1
+-
+-KEYS.sort(Comparelength) # Keys sort
+-
+-###menu
+-
+-ScreenObject=screenC() # initialize curses menu
+-try:
+- ZIELADRESS = ScreenObject.menucall(KEYS, OCCDIC, "Choose adress to alias")
+- if OCCDIC[ZIELADRESS]:
+- LISTNAM=["***ENTER own NAME"] #add option to edit name
+- LISTNAM= LISTNAM + OCCDIC[ZIELADRESS]
+- ZIELNAME = ScreenObject.menucall(LISTNAM, {}, ZIELADRESS + " has which of the possible names?")
+- # empty Dictionary {} means show list member itself, not looked up result
+- else : ZIELNAME=""
+-except:
+- T=ScreenObject.size()
+- ScreenObject.end()
+-# traceback.print_exc() # Uncomment for curses debugging info
+-# print T
+- sys.exit()
+-
+-### enter new names/aliases
+-
+-if ZIELNAME == "***ENTER own NAME" or ZIELNAME == "":
+- ZIELNAME = ScreenObject.input(`ZIELADRESS` + " = " + `OCCDIC[ZIELADRESS]` + "\n" + `ZIELADRESS` + " gets which name? ")
+-
+-if ZIELNAME == "":
+- ZIELNAME = "No name"
+-
+-WRITEALIAS = "\n[]\nname=" + ZIELNAME + "\nemail=" + ZIELADRESS + "\n\n"
+-
+-f = open(ABOOKFILE, "a")
+-f.write(WRITEALIAS)
+-f.close()
+-
+-ScreenObject.printoutnwait("Item was added to "+ ABOOKFILE + "\nProgam terminated")
+-ScreenObject.end()
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/vcard2abook.pl abook/contrib/vcard2abook.pl
+--- BUILD/abook-0.6.0pre2/contrib/vcard2abook.pl 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/vcard2abook.pl 1970-01-01 01:00:00.000000000 +0100
+@@ -1,91 +0,0 @@
+-#!/usr/bin/perl -w
+-my $timestamp= "Time-stamp: \"vcard2abook.pl was last updated on Sun, 17 Dec 2000 10:34am\"";
+-
+-#==============================================================================*
+-# vcard2abook.pl by jeff covey <jeff.covey@pobox.com> *
+-# *
+-# this script has two main features: *
+-# *
+-# 1. it converts a file containing addressbook entries in vcard format to *
+-# one containing entries in abook format. *
+-# 2. it almost has more comments than code. *
+-# *
+-# This program is free software; you can redistribute it and/or modify *
+-# it under the terms of the GNU General Public License as published by *
+-# the Free Software Foundation; either version 2 of the License, or *
+-# (at your option) any later version. *
+-# *
+-# This program is distributed in the hope that it will be useful, *
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of *
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+-# GNU General Public License for more details. *
+-# *
+-# You should have received a copy of the GNU General Public License *
+-# along with this program; if not, write to the Free Software *
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
+-#==============================================================================*
+-
+-use strict;
+-
+-($#ARGV >= 1) or die
+- "usage: vcard2abook.pl <vcard input file> <abook output file>\noutput file will be overwritten!\n";
+-
+-my $vcards="$ARGV[0]";
+-my $abook ="$ARGV[1]";
+-my $key;
+-
+-my %conversions = (
+- "FN" => "name=",
+- "NICKNAME" => "nick=",
+- "EMAIL" => "email=",
+- "ORG" => "notes=",
+- "NOTE" => "notes=",
+- "URL" => "url=",
+-
+- "TEL;HOME" => "phone=",
+- "TEL;PREF" => "phone=",
+- "TEL;VOICE" => "phone=",
+- "TEL;MSG" => "phone=",
+- "TEL;VIDEO" => "phone=",
+- "TEL;MODEM" => "phone=",
+- "TEL;ISDN" => "phone=",
+- "TEL;WORK" => "workphone=",
+- "TEL;CELL" => "mobile=",
+- "TEL;PAGER" => "mobile=",
+- "TEL;CAR" => "mobile=",
+- "TEL;FAX" => "fax=",
+- );
+-
+-open (VCARDS,"$vcards") or quit("couldn't open $vcards");
+-open (ABOOK,">$abook") or quit("couldn't open $abook for writing");
+-
+-while (<VCARDS>) {
+- if (/^\s*$/) { }
+- elsif (/^BEGIN:VCARD/i) { print ABOOK "[]\n"; }
+- elsif (/^END:VCARD/i) { print ABOOK "\n"; }
+- else {
+- chomp; my @sections=split /:/, $_, 2;
+- if ($sections[0] =~ /^ADR/i) {
+- my @fields=split /;/, $sections[1];
+- if ($fields[2]) {print ABOOK "address=$fields[2]\n";}
+- if ($fields[3]) {print ABOOK "city=$fields[3]\n"; }
+- if ($fields[4]) {print ABOOK "state=$fields[4]\n"; }
+- if ($fields[5]) {print ABOOK "zip=$fields[5]\n"; }
+- if ($fields[6]) {print ABOOK "country=$fields[6]\n";}
+- }
+- else {
+- foreach $key (keys %conversions) {
+- if ($sections[0] =~ /^$key/i) {
+- print ABOOK "$conversions{$key}$sections[1]\n";
+- }
+- }
+- }
+- }
+-}
+-
+-close (VCARDS) or quit("couldn't close $vcards");
+-close (ABOOK) or quit("couldn't close $abook");
+-
+-sub quit {
+- print "whoops! $_[0]:\n $!\n"; die;
+-}
+diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/abook2whitelist.sh abook/contrib/whitelist/abook2whitelist.sh
+--- BUILD/abook-0.6.0pre2/contrib/whitelist/abook2whitelist.sh 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/whitelist/abook2whitelist.sh 1970-01-01 01:00:00.000000000 +0100
+@@ -1,3 +0,0 @@
+-#!/bin/sh
+-abook --mutt-query all | tail +2 | cut -f 1 > ~/.procmail/white.lst
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/mutt.whitelist abook/contrib/whitelist/mutt.whitelist
+--- BUILD/abook-0.6.0pre2/contrib/whitelist/mutt.whitelist 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/whitelist/mutt.whitelist 1970-01-01 01:00:00.000000000 +0100
+@@ -1,2 +0,0 @@
+-color index white black '! ~p'
+-color index green black '~h whitelist'
+diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/patch.orig.obsolete abook/contrib/whitelist/patch.orig.obsolete
+--- BUILD/abook-0.6.0pre2/contrib/whitelist/patch.orig.obsolete 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/whitelist/patch.orig.obsolete 1970-01-01 01:00:00.000000000 +0100
+@@ -1,61 +0,0 @@
+-54a55,56
+-> static void procmail_query(char *str);
+-> static void procmail_print_email(int item);
+-498a501,503
+-> if( !strcmp(argv[i], "--procmail-query") )
+-> procmail_query(argv[i + 1]);
+-> else
+-561a567,583
+->
+-> static void
+-> procmail_print_email(int item)
+-> {
+-> char emails[MAX_EMAILS][MAX_EMAIL_LEN];
+->
+-> split_emailstr(item, emails);
+->
+-> if( options_get_int("mutt", "return_all_emails") ) {
+-> int i;
+-> for(i=0; i<MAX_EMAILS; i++)
+-> if( *emails[i] )
+-> printf("%s\n", emails[i]);
+-> } else
+-> printf("%s\n", emails[0]);
+-> }
+->
+-571c593
+-< printf("All items\n");
+----
+-> /*printf("All items\n");*/
+-580a603,633
+-> j++;
+-> }
+-> free(tmp);
+-> }
+-> if( !j )
+-> printf("Not found\n");
+-> }
+->
+-> quit_mutt_query();
+-> exit(0);
+-> }
+->
+-> static void
+-> procmail_query(char *str)
+-> {
+-> int i, j;
+-> char *tmp;
+->
+-> init_mutt_query();
+->
+-> if( str == NULL || !strcasecmp(str, "all") ) {
+-> /*printf("All items\n");*/
+-> for(i = 0; i < items; i++)
+-> procmail_print_email(i);
+-> } else {
+-> for(i = 0, j = 0 ; i < items; i++) {
+-> tmp = strdup(database[i][NAME]);
+-> if( strstr( strupper(tmp), strupper(str) ) != NULL ) {
+-> if( !j )
+-> putchar('\n');
+-> procmail_print_email(i);
+diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/README abook/contrib/whitelist/README
+--- BUILD/abook-0.6.0pre2/contrib/whitelist/README 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/whitelist/README 1970-01-01 01:00:00.000000000 +0100
+@@ -1,41 +0,0 @@
+-
+-0.4.13 NOTE:
+-There's no need to patch abook now. -JH
+-
+-
+-Taken from message sent by "R. Shohn Trojacek" <snazzle@galvani.tamu.edu>
+-
+---
+-
+-hello,
+-
+-Here are some patches and things for abook 0.4.8
+-
+-[patching instructions removed (not needed anymore) -JH]
+-
+-anyway it allows the use of a "whitelist" which is to
+-say people that are in the address book show up with
+-a higher precedence by changing the mail to a different color.
+-
+-this is accomplished using a simple procmail filter
+-and a couple of mutt commands.
+-
+-just
+-
+-INCLUDERC=/path/whitelist.rc
+-
+-inside of your .procmailrc
+-
+-
+-and then add
+-
+-source /path/mutt.whitelist
+-to the top of your muttrc
+-
+-
+-
+-
+-abook2whitelist.sh
+-
+---
+-
+diff -urN BUILD/abook-0.6.0pre2/contrib/whitelist/whitelist.rc abook/contrib/whitelist/whitelist.rc
+--- BUILD/abook-0.6.0pre2/contrib/whitelist/whitelist.rc 2005-10-26 13:58:45.000000000 +0200
++++ abook/contrib/whitelist/whitelist.rc 1970-01-01 01:00:00.000000000 +0100
+@@ -1,9 +0,0 @@
+-# Test if the email's sender is in the whitelist
+- :0
+- * ? formail -x"From" -x"From:" -x"Sender:" \
+- -x"Reply-To:" -x"Return-Path:" -x"To:" \
+- | egrep -is -f ~/.procmail/white.lst
+-{
+- :0 fwh
+- | formail -a"X-Match: whitelist"
+-}
+diff -urN BUILD/abook-0.6.0pre2/database.c abook/database.c
+--- BUILD/abook-0.6.0pre2/database.c 2006-09-04 21:24:18.000000000 +0200
++++ abook/database.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: database.c,v 1.39 2006/09/04 18:29:25 cduval Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -58,6 +58,7 @@
+ {"url", N_("URL"), FIELD_STRING}, /* URL */
+ {"notes", N_("Notes"), FIELD_STRING}, /* NOTES */
+ {"anniversary", N_("Anniversary day"), FIELD_DATE}, /* ANNIVERSARY */
++ {"groups", N_("Groups"), FIELD_LIST}, /* GROUPS */
+ {0} /* ITEM_FIELDS */
+ };
+
+@@ -521,6 +522,68 @@
+ select_none();
+ }
+
++void merge_selected_items()
++{
++ int i, j;
++ int destitem = -1;
++
++ if((list_is_empty()) || (selected_items() < 2))
++ return;
++
++ /* Find the top item */
++ for(j=0; destitem < 0; j++)
++ if(selected[j])
++ destitem = j;
++
++ /* Merge pairwise */
++ for(j = LAST_ITEM; j > destitem; j--) {
++ if(selected[j]) {
++ item_merge(database[destitem],database[j]);
++ for(i = j; i < LAST_ITEM; i++) {
++ /* TODO: this can be done by moving pointers */
++ item_copy(database[i], database[i + 1]);
++ selected[i] = selected[i + 1];
++ }
++ item_free(&database[LAST_ITEM]);
++ items--;
++ }
++ }
++
++ if(curitem > LAST_ITEM && items > 0)
++ curitem = LAST_ITEM;
++
++ adjust_list_capacity();
++
++ select_none();
++}
++
++void remove_duplicates()
++{
++ int i,j,k;
++ char *tmpj;
++ if(list_is_empty())
++ return;
++
++ /* Scan from the last one */
++ for(j = LAST_ITEM - 1; j >= 0; j--) {
++ tmpj = db_name_get(j);
++ for(i = LAST_ITEM; i > j; i--)
++ /* Check name and merge if dups */
++ if (0 == strcmp(tmpj,db_name_get(i))) {
++ item_merge(database[j],database[i]);
++ if (curitem == i) curitem--;
++ for(k = i; k < LAST_ITEM; k++) {
++ item_copy(database[k], database[k + 1]);
++ }
++ item_free(&database[LAST_ITEM]);
++ items--;
++ }
++ }
++
++ adjust_list_capacity();
++}
++
++
+ char *
+ get_surname(char *s)
+ {
+@@ -752,6 +815,40 @@
+ for(i = 0; i < fields_count; i++)
+ dest[i] = src[i] ? xstrdup(src[i]) : NULL;
+ }
++
++/*
++ * Merging works as follows:
++ * - fields present only in source are copied over to dest
++ * - multi-fields (email, groups) are checked for dupes ad merged
++ * */
++void
++item_merge(list_item dest, list_item src)
++{
++ int i, found = 0;
++ abook_list *dfield, *sfield, *ed, *es;
++
++ for(i = 0; i < fields_count; i++)
++ if (src[i]) {
++ if (!dest[i])
++ dest[i] = xstrdup(src[i]);
++ else if((i == field_id(EMAIL)) || (i == field_id(GROUPS))) {
++ dfield = csv_to_abook_list(dest[i]);
++ sfield = csv_to_abook_list(src[i]);
++ for(es = sfield; es; es = es->next) {
++ for(found=0, ed = dfield; (!found) && ed; ed = ed->next)
++ found = (0 == strcmp(es->data,ed->data));
++ if (!found)
++ abook_list_append(&dfield, es->data);
++ }
++ xfree(dest[i]);
++ dest[i] = abook_list_to_csv(dfield);
++ abook_list_free(&dfield);
++ abook_list_free(&sfield);
++ }
++ }
++
++ item_empty(src);
++}
+
+ /*
+ * Things like item[field_id(NICK)] should never be used, since besides NAME
+diff -urN BUILD/abook-0.6.0pre2/database.h abook/database.h
+--- BUILD/abook-0.6.0pre2/database.h 2006-09-04 21:24:18.000000000 +0200
++++ abook/database.h 2013-03-13 15:07:45.000000000 +0100
+@@ -6,7 +6,7 @@
+ #define MAX_EMAILSTR_LEN (MAX_LIST_ITEMS * (MAX_EMAIL_LEN + 1) + 1)
+ #define MAX_FIELD_LEN 81
+
+-enum {
++enum field_types {
+ NAME = 0, /* important */
+ EMAIL,
+ ADDRESS,
+@@ -23,6 +23,7 @@
+ URL,
+ NOTES,
+ ANNIVERSARY,
++ GROUPS,
+ ITEM_FIELDS /* this is the last */
+ };
+
+@@ -80,6 +81,8 @@
+ int write_database(FILE *out, struct db_enumerator e);
+ int save_database();
+ void remove_selected_items();
++void merge_selected_items();
++void remove_duplicates();
+ void sort_surname();
+ void sort_by_field(char *field);
+ void close_database();
+@@ -104,6 +107,7 @@
+ void item_free(list_item *item);
+ void item_copy(list_item dest, list_item src);
+ void item_duplicate(list_item dest, list_item src);
++void item_merge(list_item dest, list_item src);
+
+ int item_fput(list_item item, int i, char *val);
+ char *item_fget(list_item item, int i);
+diff -urN BUILD/abook-0.6.0pre2/depcomp abook/depcomp
+--- BUILD/abook-0.6.0pre2/depcomp 2001-10-02 20:14:10.000000000 +0200
++++ abook/depcomp 2013-03-13 15:07:45.000000000 +0100
+@@ -1,7 +1,10 @@
+ #! /bin/sh
+-
+ # depcomp - compile a program generating dependencies as side-effects
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++scriptversion=2012-03-27.16; # UTC
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -14,9 +17,7 @@
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -25,13 +26,51 @@
+
+ # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
++case $1 in
++ '')
++ echo "$0: No command. Try '$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++ depmode Dependency tracking mode.
++ source Source file read by 'PROGRAMS ARGS'.
++ object Object file output by 'PROGRAMS ARGS'.
++ DEPDIR directory where to store dependencies.
++ depfile Dependency file to output.
++ tmpdepfile Temporary file to use when outputting dependencies.
++ libtool Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "depcomp $scriptversion"
++ exit $?
++ ;;
++esac
++
++# A tabulation character.
++tab=' '
++# A newline character.
++nl='
++'
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+ fi
+-# `libtool' can also be set to `yes' or `no'.
+
+-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+ rm -f "$tmpdepfile"
+@@ -52,12 +91,48 @@
+ depmode=dashmstdout
+ fi
+
++cygpath_u="cygpath -u -f -"
++if test "$depmode" = msvcmsys; then
++ # This is just like msvisualcpp but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvisualcpp
++fi
++
++if test "$depmode" = msvc7msys; then
++ # This is just like msvc7 but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvc7
++fi
++
++if test "$depmode" = xlc; then
++ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
++ gccflag=-qmakedep=gcc,-MF
++ depmode=gcc
++fi
++
+ case "$depmode" in
+ gcc3)
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -93,20 +168,21 @@
+ ## The second -e expression handles DOS-style file names with drive letters.
+ sed -e 's/^[^:]*: / /' \
+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+-## This next piece of magic avoids the `deleted header file' problem.
++## This next piece of magic avoids the "deleted header file" problem.
+ ## The problem is that when a header file which appears in a .P file
+ ## is deleted, the dependency causes make to die (because there is
+ ## typically no way to rebuild the header). We avoid this by adding
+ ## dummy dependencies for each header file. Too bad gcc doesn't do
+ ## this for us directly.
+- tr ' ' '
+-' < "$tmpdepfile" |
+-## Some versions of gcc put a space before the `:'. On the theory
++ tr ' ' "$nl" < "$tmpdepfile" |
++## Some versions of gcc put a space before the ':'. On the theory
+ ## that the space means something, we add a space to the output as
+-## well.
++## well. hp depmode also adds that space, but also prefixes the VPATH
++## to the object. Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++ | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -138,20 +214,17 @@
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+- # the IRIX cc adds comments like `#:fec' to the end of the
++ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+- tr ' ' '
+-' < "$tmpdepfile" \
++ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+- tr '
+-' ' ' >> $depfile
+- echo >> $depfile
++ tr "$nl" ' ' >> "$depfile"
++ echo >> "$depfile"
+
+ # The second pass generates a dummy entry for each header file.
+- tr ' ' '
+-' < "$tmpdepfile" \
++ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+- >> $depfile
++ >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -161,33 +234,51 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++xlc)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+- # in a .u file. This file always lives in the current directory.
+- # Also, the AIX compiler puts `$object:' at the start of each line;
+- # $object doesn't have directory information.
+- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+- tmpdepfile="$stripped.u"
+- outname="$stripped.o"
++ # in a .u file. In older versions, this file always lives in the
++ # current directory. Also, the AIX compiler puts '$object:' at the
++ # start of each line; $object doesn't have directory information.
++ # Version 6 uses the directory in both cases.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$base.u
++ tmpdepfile3=$dir.libs/$base.u
+ "$@" -Wc,-M
+ else
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$dir$base.u
++ tmpdepfile3=$dir$base.u
+ "$@" -M
+ fi
+-
+ stat=$?
++
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+- # Each line is of the form `foo.o: dependent.h'.
++ # Each line is of the form 'foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+- # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -197,81 +288,246 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++icc)
++ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
++ # However on
++ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++ # ICC 7.0 will fill foo.d with something like
++ # foo.o: sub/foo.c
++ # foo.o: sub/foo.h
++ # which is wrong. We want
++ # sub/foo.o: sub/foo.c
++ # sub/foo.o: sub/foo.h
++ # sub/foo.c:
++ # sub/foo.h:
++ # ICC 7.1 will output
++ # foo.o: sub/foo.c sub/foo.h
++ # and will wrap long lines using '\':
++ # foo.o: sub/foo.c ... \
++ # sub/foo.h ... \
++ # ...
++ # tcc 0.9.26 (FIXME still under development at the moment of writing)
++ # will emit a similar output, but also prepend the continuation lines
++ # with horizontal tabulation characters.
++ "$@" -MD -MF "$tmpdepfile"
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile"
++ exit $stat
++ fi
++ rm -f "$depfile"
++ # Each line is of the form 'foo.o: dependent.h',
++ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
++ # Do two passes, one to just change these to
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
++ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
++ < "$tmpdepfile" > "$depfile"
++ sed '
++ s/[ '"$tab"'][ '"$tab"']*/ /g
++ s/^ *//
++ s/ *\\*$//
++ s/^[^:]*: *//
++ /^$/d
++ /:$/d
++ s/$/ :/
++ ' < "$tmpdepfile" >> "$depfile"
++ rm -f "$tmpdepfile"
++ ;;
++
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add 'dependent.h:' lines.
++ sed -ne '2,${
++ s/^ *//
++ s/ \\*$//
++ s/$/:/
++ p
++ }' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+- # dependencies in `foo.d' instead, so we check for that too.
++ # The Tru64 compiler uses -MD to generate dependencies as a side
++ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+- tmpdepfile1="$object.d"
+- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
+ if test "$libtool" = yes; then
++ # With Tru64 cc, shared objects can also be used to make a
++ # static library. This mechanism is used in libtool 1.4 series to
++ # handle both shared and static libraries in a single compilation.
++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++ #
++ # With libtool 1.5 this exception was removed, and libtool now
++ # generates 2 separate objects for the 2 libraries. These two
++ # compilations output dependencies in $dir.libs/$base.o.d and
++ # in $dir$base.o.d. We have to check for both files, because
++ # one of the two compilations can be disabled. We should prefer
++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++ # automatically cleaned when .libs/ is deleted, while ignoring
++ # the former would cause a distcleancheck panic.
++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
++ tmpdepfile2=$dir$base.o.d # libtool 1.5
++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
++ tmpdepfile1=$dir$base.o.d
++ tmpdepfile2=$dir$base.d
++ tmpdepfile3=$dir$base.d
++ tmpdepfile4=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile1" "$tmpdepfile2"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ exit $stat
+ fi
+
+- if test -f "$tmpdepfile1"; then
+- tmpdepfile="$tmpdepfile1"
+- else
+- tmpdepfile="$tmpdepfile2"
+- fi
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a space and a tab in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
++msvc7)
++ if test "$libtool" = yes; then
++ showIncludes=-Wc,-showIncludes
++ else
++ showIncludes=-showIncludes
++ fi
++ "$@" $showIncludes > "$tmpdepfile"
++ stat=$?
++ grep -v '^Note: including file: ' "$tmpdepfile"
++ if test "$stat" = 0; then :
++ else
++ rm -f "$tmpdepfile"
++ exit $stat
++ fi
++ rm -f "$depfile"
++ echo "$object : \\" > "$depfile"
++ # The first sed program below extracts the file names and escapes
++ # backslashes for cygpath. The second sed program outputs the file
++ # name when reading, but also accumulates all include files in the
++ # hold buffer in order to output them again at the end. This only
++ # works with sed implementations that can handle large buffers.
++ sed < "$tmpdepfile" -n '
++/^Note: including file: *\(.*\)/ {
++ s//\1/
++ s/\\/\\\\/g
++ p
++}' | $cygpath_u | sort -u | sed -n '
++s/ /\\ /g
++s/\(.*\)/'"$tab"'\1 \\/p
++s/.\(.*\) \\/\1:/
++H
++$ {
++ s/.*/'"$tab"'/
++ G
++ p
++}' >> "$depfile"
++ rm -f "$tmpdepfile"
++ ;;
++
++msvc7msys)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ #nosideeffect)
+ # This comment above is used by automake to tell side-effect
+ # dependency tracking mechanisms from slower ones.
+
+ dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- test -z "$dashmflag" && dashmflag=-M
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*) # this is libtool, let us make it quiet
+- for arg
+- do # cycle over the arguments
+- case "$arg" in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout, regardless of -o.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test "X$1" != 'X--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove '-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++
++ test -z "$dashmflag" && dashmflag=-M
++ # Require at least two characters before searching for ':'
++ # in the target name. This is to cope with DOS-style filenames:
++ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
++ "$@" $dashmflag |
++ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- tr ' ' '
+-' < "$tmpdepfile" | \
++ tr ' ' "$nl" < "$tmpdepfile" | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+@@ -285,37 +541,49 @@
+ ;;
+
+ makedepend)
+- # X makedepend
+- (
+- shift
+- cleared=no
+- for arg in "$@"; do
+- case $cleared in no)
+- set ""; shift
+- cleared=yes
+- esac
+- case "$arg" in
+- -D*|-I*)
+- set fnord "$@" "$arg"; shift;;
+- -*)
+- ;;
+- *)
+- set fnord "$@" "$arg"; shift;;
+- esac
++ "$@" || exit $?
++ # Remove any Libtool call
++ if test "$libtool" = yes; then
++ while test "X$1" != 'X--mode=compile'; do
++ shift
+ done
+- obj_suffix="`echo $object | sed 's/^.*\././'`"
+- touch "$tmpdepfile"
+- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ shift
++ fi
++ # X makedepend
++ shift
++ cleared=no eat=no
++ for arg
++ do
++ case $cleared in
++ no)
++ set ""; shift
++ cleared=yes ;;
++ esac
++ if test $eat = yes; then
++ eat=no
++ continue
++ fi
++ case "$arg" in
++ -D*|-I*)
++ set fnord "$@" "$arg"; shift ;;
++ # Strip any option that makedepend may not understand. Remove
++ # the object too, otherwise makedepend will parse it as a source file.
++ -arch)
++ eat=yes ;;
++ -*|$object)
++ ;;
++ *)
++ set fnord "$@" "$arg"; shift ;;
++ esac
++ done
++ obj_suffix=`echo "$object" | sed 's/^.*\././'`
++ touch "$tmpdepfile"
++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+- cat < "$tmpdepfile" > "$depfile"
+- tail +3 "$tmpdepfile" | tr ' ' '
+-' | \
++ # makedepend may prepend the VPATH from the source file name to the object.
++ # No need to regex-escape $object, excess matching of '.' is harmless.
++ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
++ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+@@ -324,35 +592,40 @@
+
+ cpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test "X$1" != 'X--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove '-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" -E |
+- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++ done
++
++ "$@" -E |
++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+@@ -362,42 +635,56 @@
+
+ msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test "X$1" != 'X--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ IFS=" "
++ for arg
++ do
++ case "$arg" in
++ -o)
++ shift
+ ;;
++ $object)
++ shift
++ ;;
++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++ set fnord "$@"
++ shift
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift
++ shift
++ ;;
+ esac
+- "$@" -E |
+- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++ "$@" -E 2>/dev/null |
++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+- echo " " >> "$depfile"
+- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
++ echo "$tab" >> "$depfile"
++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
++msvcmsys)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ none)
+ exec "$@"
+ ;;
+@@ -409,3 +696,13 @@
+ esac
+
+ exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
+diff -urN BUILD/abook-0.6.0pre2/doc/HOWTO.translating_abook abook/doc/HOWTO.translating_abook
+--- BUILD/abook-0.6.0pre2/doc/HOWTO.translating_abook 2005-09-30 18:27:09.000000000 +0200
++++ abook/doc/HOWTO.translating_abook 2013-03-13 15:07:45.000000000 +0100
+@@ -193,7 +193,7 @@
+ contributors can contact you if they want to join you in the
+ translation team, or have remarks/typo fixes to give about the
+ translations. You can either just give your name/nick, or add an email
+- address, f ex "Last-Translator: Cédric Duval <cedricduval+abook@free.fr>\n".
++ address, f ex "Last-Translator: Cédric Duval <cedricduval+abook@free.fr>\n".
+
+ * Comments
+ Adding comments (lines begining with the '#' character) can be a good
+@@ -207,6 +207,12 @@
+ (standard length is 80 characters). Don't translate blindly, try to
+ look where your string will be displayed to adapt your translation.
+
++* Testing translations
++ To give a look at the live translations without really installing abook
++ you can install abook and its mo files in a subdirectory:
++ ./configure --prefix $(pwd)/fakeinstall/usr ; make install
++ Then, eg: LANGUAGE=sv ./fakeinstall/usr/bin/abook
++
+ * A few useful tools
+ The po-file format is very simple, and the file can be edited with a
+ standard text editor.
+@@ -214,8 +220,8 @@
+ But if you prefer, there are few specialized tools you may find
+ convenient for translating:
+ * poEdit (http://www.poedit.org/)
+- * KBabel (http://i18n.kde.org/tools/kbabel/)
+- * GTranslator (http://gtranslator.sourceforge.net/)
++ * Lokalize (http://userbase.kde.org/Lokalize/)
++ * GTranslator (http://projects.gnome.org/gtranslator/)
+ * Emacs po mode
+ * Vim po mode
+ (http://vim.sourceforge.net/scripts/script.php?script_id=695
+@@ -229,6 +235,6 @@
+ I hope you'll have fun contributing to a more internationalized world. :)
+
+ If you have any more questions, don't hesitate to contact me
+-(Cédric Duval <cedricduval+abook@free.fr>) or the abook development
++(Cédric Duval <cedricduval+abook@free.fr>) or the abook development
+ mailing list (http://lists.sourceforge.net/lists/listinfo/abook-devel).
+
+diff -urN BUILD/abook-0.6.0pre2/edit.c abook/edit.c
+--- BUILD/abook-0.6.0pre2/edit.c 2006-09-06 07:26:10.000000000 +0200
++++ abook/edit.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: edit.c,v 1.55 2006/09/06 02:46:44 cduval Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -21,9 +21,16 @@
+ #include "misc.h"
+ #include "views.h"
+ #include "xmalloc.h"
++#include "color.h"
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
++#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
++# include <locale.h>
++#endif
++
++
++static void locale_date(char *str, size_t str_len, int year, int month, int day);
+
+ /*
+ * some extern variables
+@@ -41,6 +48,7 @@
+ int x_pos = 2; /* current x pos */
+ char *tab_name;
+
++ wattrset(editw, COLOR_PAIR(CP_TAB_BORDER));
+ mvwhline(editw, TABLINE + 1, 0, UI_HLINE_CHAR, EDITW_COLS);
+
+ for(i = 0; i < views_count; i++) {
+@@ -57,7 +65,9 @@
+
+ mvwaddch(editw, TABLINE, x_pos, UI_ULCORNER_CHAR);
+ mvwaddch(editw, TABLINE, x_pos + 1, UI_LBOXLINE_CHAR);
++ wattrset(editw, COLOR_PAIR(CP_TAB_LABEL));
+ mvwaddstr(editw, TABLINE, x_pos + 2, tab_name);
++ wattrset(editw, COLOR_PAIR(CP_TAB_BORDER));
+ mvwaddch(editw, TABLINE, x_pos + width - 3, UI_RBOXLINE_CHAR);
+ mvwaddch(editw, TABLINE, x_pos + width - 2, UI_URCORNER_CHAR);
+
+@@ -94,7 +104,7 @@
+ /* This only rolls emails from the 'email' field, not emails from any
+ * field of type FIELD_EMAILS.
+ * TODO: expand to ask for which field to roll if several are present? */
+-static void
++void
+ roll_emails(int item, enum rotate_dir dir)
+ {
+ abook_list *emails = csv_to_abook_list(db_fget(item, EMAIL));
+@@ -186,6 +196,7 @@
+ else
+ snprintf(header, EDITW_COLS, "%s", db_name_get(item));
+
++ wattrset(editw, COLOR_PAIR(CP_TAB_LABEL));
+ mvwaddstr(editw, 0, (EDITW_COLS - strwidth(header)) / 2, header);
+
+ free(header);
+@@ -209,6 +220,7 @@
+ } else
+ y = FIELDS_START_Y;
+
++ wattrset(editw, COLOR_PAIR(CP_FIELD_NAME));
+ mvwprintw(editw, y, FIELDS_START_X, "%c - ",
+ (j < 10) ? '0' + j : 'A' + j - 10);
+ mvwaddnstr(editw, y, FIELDS_START_X + 4, cur->field->name,
+@@ -216,6 +228,7 @@
+ FIELDNAME_MAX_WIDTH));
+ mvwaddch(editw, y, TAB_COLON_POS, ':');
+
++ wattrset(editw, COLOR_PAIR(CP_FIELD_VALUE));
+ if((cur->field->type == FIELD_EMAILS) ||
+ (cur->field->type == FIELD_LIST)) {
+ abook_list *emails, *e;
+@@ -242,22 +255,16 @@
+ abook_list_free(&emails);
+ } else if(cur->field->type == FIELD_DATE) {
+ int day, month, year;
+- char buf[12];
++ char buf[64];
+
+ find_field_number(cur->field->key, &nb);
+- if((str = db_fget_byid(item, nb)) != NULL)
+- strncpy(buf, str, sizeof(buf));
+-
+- if(str && parse_date_string(buf, &day, &month, &year)) {
+- if(year)
+- str = strdup_printf("%04d-%02d-%02d",
+- year, month, day);
+- else
+- str = strdup_printf("--%02d-%02d",
+- month, day);
+- mvwaddnstr(editw, y, TAB_COLON_POS + 2, str,
+- bytes2width(str, FIELD_MAX_WIDTH));
+- free(str);
++ str = db_fget_byid(item, nb);
++
++ if(parse_date_string(str, &day, &month, &year)) {
++ /* put locale representation of date in buf */
++ locale_date(buf, sizeof(buf), year, month, day);
++ mvwaddnstr(editw, y, TAB_COLON_POS + 2, buf,
++ bytes2width(buf, FIELD_MAX_WIDTH));
+ }
+ } else {
+ find_field_number(cur->field->key, &nb);
+@@ -397,6 +404,67 @@
+ abook_list_free(&list);
+ }
+
++/*
++ * available %-sequences:
++ * - %y, %Y, %m, %M, %d, %D represent year, month, and day
++ * (the uppercase version telling to fill with leading zeros
++ * if necessary)
++ * - %I for ISO 8601 representation
++ */
++static size_t
++format_date(char *str, size_t str_len, char *fmt, int year, int month, int day)
++{
++ char *s = str;
++ size_t len;
++
++ while(*fmt && (s - str + 1 < str_len)) {
++ if(*fmt != '%') {
++ *s++ = *fmt++;
++ continue;
++ }
++
++ len = str_len - (str - s);
++ switch(*++fmt) {
++ case 'y': s += snprintf(s, len, "%d", year); break;
++ case 'Y': s += snprintf(s, len, "%04d", year); break;
++ case 'm': s += snprintf(s, len, "%d", month); break;
++ case 'M': s += snprintf(s, len, "%02d", month); break;
++ case 'd': s += snprintf(s, len, "%d", day); break;
++ case 'D': s += snprintf(s, len, "%02d", day); break;
++ case 'I': s += format_date(s, len,
++ year ? "%Y-%M-%D" : "--%M-%D",
++ year, month, day);
++ break;
++ case '%': *s++ = '%'; break;
++ default: *s++ = '%'; *s++ = *fmt; break;
++ }
++ fmt++;
++ }
++ *s = 0;
++ return s - str;
++}
++
++/*
++ * str is a buffer of max length str_len, which, after calling, will
++ * contain a representation of the given [y, m, d] date using the
++ * current locale (as defined by LC_TIME).
++ *
++ * In the absence of any localization, use an ISO 8601 representation.
++ */
++static void
++locale_date(char *str, size_t str_len, int year, int month, int day)
++{
++ char *fmt;
++
++#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
++ fmt = year ? dcgettext(PACKAGE, "%Y-%M-%D", LC_TIME) :
++ dcgettext(PACKAGE, "--%M-%D", LC_TIME);
++#else
++ fmt = "%I";
++#endif
++ format_date(str, str_len, fmt, year, month, day);
++}
++
+ static int is_valid_date(const int day, const int month, const int year)
+ {
+ int valid = 1;
+@@ -420,11 +488,17 @@
+ }
+
+ int
+-parse_date_string(char *s, int *day, int *month, int *year)
++parse_date_string(char *str, int *day, int *month, int *year)
+ {
+ int i = 0;
+- char *p = s;
+- assert(s && day && month && year);
++ char buf[12], *s, *p;
++
++ assert(day && month && year);
++
++ if(!str || !*str)
++ return FALSE;
++
++ p = s = strncpy(buf, str, sizeof(buf));
+
+ if(*s == '-' && *s++ == '-') { /* omitted year */
+ *year = 0;
+@@ -446,7 +520,7 @@
+ }
+ p = s;
+ } else
+- return FALSE;
++ return FALSE;
+ }
+
+ if (i != 2 || !*p)
+@@ -460,14 +534,11 @@
+ static void
+ edit_date(int item, int nb)
+ {
+- int i, date[3], old = FALSE;
+- char buf[12], *s = db_fget_byid(item, nb);
++ int i, date[3], old;
++ char *s = db_fget_byid(item, nb);
+ char *field[] = { N_("Day: "), N_("Month: "), N_("Year (optional): ") };
+
+- if(s) {
+- strncpy(buf, s, sizeof(buf));
+- old = parse_date_string(buf, &date[0], &date[1], &date[2]);
+- }
++ old = parse_date_string(s, &date[0], &date[1], &date[2]);
+
+ for(i = 0; i < 3; i++) {
+ s = (old && date[i]) ? strdup_printf("%d", date[i]) : NULL;
+@@ -517,13 +588,14 @@
+ static void
+ edit_field(int tab, char c, int item_number)
+ {
++ ui_enable_mouse(FALSE);
+ int i = 0, number, idx;
+ char *msg;
+ abook_field_list *f;
+ list_item item;
+
+ if((number = key_to_field_number(c)) < 0)
+- return;
++ goto detachfield;
+
+ edit_undo(item_number, BACKUP_ITEM);
+
+@@ -531,7 +603,7 @@
+
+ while(1) {
+ if(!f)
+- return;
++ goto detachfield;
+
+ if(i == number)
+ break;
+@@ -560,10 +632,14 @@
+ break;
+ case FIELD_DATE:
+ edit_date(item_number, idx);
+- return;
++ goto detachfield;
+ default:
+ assert(0);
+ }
++
++ detachfield:
++ if(opt_get_bool(BOOL_USE_MOUSE))
++ ui_enable_mouse(TRUE);
+ }
+
+ static int
+@@ -597,6 +673,53 @@
+
+ return item;
+ }
++ if(c == KEY_MOUSE) {
++ MEVENT event;
++ if(getmouse(&event) == OK) {
++ if(event.bstate & BUTTON1_CLICKED
++ || event.bstate & BUTTON1_DOUBLE_CLICKED) {
++ int window_y, window_x;
++ getbegyx(editw, window_y, window_x);
++ if(event.y == 0) {
++ /* if first row is selected, then go back to list */
++ return -1;
++ } else if(event.y == window_y + TABLINE
++ || event.y == window_y + TABLINE + 1) {
++ char* tab_name;
++ int mouse_x = event.x;
++ int xpos = 2 + 1; /* look at editor_tab() and try out */
++ int clicked_tab = 0;
++ while(clicked_tab < views_count) {
++ view_info(clicked_tab, &tab_name, NULL);
++ xpos += strwidth(tab_name) + 5;
++ /* fprintf(stderr, "trying tab %d\n", clicked_tab); */
++ if(xpos >= mouse_x) {
++ break; /* clicked tab was found */
++ } else {
++ /* try next tab */
++ clicked_tab++;
++ }
++ }
++ if(clicked_tab < views_count) {
++ tab = clicked_tab;
++ }
++ } else if(event.y >= window_y + FIELDS_START_Y) {
++ /* is mouse in field area? */
++ int j = 1 + event.y - window_y - FIELDS_START_Y;
++ /* field numbers start with 1, but if j='0', then char='0' */
++ /* so fix this, by adding 1 to j */
++ int field_char = (j < 10) ? '0' + j : 'A' + j - 10;
++ edit_field(tab, field_char, item);
++ }
++ } else if(event.bstate & BUTTON4_PRESSED) {
++ tab = tab == 0 ? views_count - 1 : tab - 1;
++ }
++ else if(event.bstate & BUTTON5_PRESSED) {
++ tab = tab == views_count - 1 ? 0 : tab + 1;
++ }
++ return item;
++ }
++ }
+
+ /* No uppercase nor numeric key should be used in this menu,
+ * as they are reserved for field selection */
+diff -urN BUILD/abook-0.6.0pre2/edit.h abook/edit.h
+--- BUILD/abook-0.6.0pre2/edit.h 2006-09-06 07:26:10.000000000 +0200
++++ abook/edit.h 2013-03-13 15:07:45.000000000 +0100
+@@ -1,8 +1,12 @@
+ #ifndef _EDIT_H
+ #define _EDIT_H
+
++#include "misc.h" /* for rotate_dir enum definition */
++
++
+ void edit_item(int item);
+ void get_first_email(char *str, int item);
++void roll_emails(int item, enum rotate_dir dir);
+ void add_item();
+ int parse_date_string(char *s, int *day, int *month, int *year);
+
+diff -urN BUILD/abook-0.6.0pre2/FAQ abook/FAQ
+--- BUILD/abook-0.6.0pre2/FAQ 2005-02-28 10:21:31.000000000 +0100
++++ abook/FAQ 2013-03-13 15:07:45.000000000 +0100
+@@ -66,4 +66,4 @@
+ you use UTF-8 charset the input is expected to be UTF-8 encoded.
+
+
+-last update: $Date: 2005/02/28 09:21:31 $
++last update: $Date$
+diff -urN BUILD/abook-0.6.0pre2/filter.c abook/filter.c
+--- BUILD/abook-0.6.0pre2/filter.c 2013-03-14 10:42:00.100864946 +0100
++++ abook/filter.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,12 +1,14 @@
+
+ /*
+- * $Id: filter.c,v 1.55 2006/09/06 02:46:44 cduval Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+ * Copyright (C) Jaakko Heinonen
+ */
+
++#define _GNU_SOURCE
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -27,6 +29,10 @@
+ #include "xmalloc.h"
+ #include <assert.h>
+
++#ifdef HAVE_VFORMAT
++#include "vcard.h"
++#endif
++
+ extern abook_field_list *fields_list;
+ extern int fields_count;
+
+@@ -56,13 +62,23 @@
+ static int csv_export_database(FILE *out, struct db_enumerator e);
+ static int allcsv_export_database(FILE *out, struct db_enumerator e);
+ static int palm_export_database(FILE *out, struct db_enumerator e);
+-static int gcrd_export_database(FILE *out, struct db_enumerator e);
++static int vcard_export_database(FILE *out, struct db_enumerator e);
+ static int mutt_alias_export(FILE *out, struct db_enumerator e);
++static int mutt_query_export_database(FILE *out, struct db_enumerator e);
+ static int elm_alias_export(FILE *out, struct db_enumerator e);
+ static int text_export_database(FILE *out, struct db_enumerator e);
+ static int spruce_export_database(FILE *out, struct db_enumerator e);
+ static int wl_export_database(FILE *out, struct db_enumerator e);
+ static int bsdcal_export_database(FILE *out, struct db_enumerator e);
++static int custom_export_database(FILE *out, struct db_enumerator e);
++
++/*
++ * export filter item prototypes
++ */
++
++void vcard_export_item(FILE *out, int item);
++void muttq_print_item(FILE *file, int item);
++void custom_print_item(FILE *out, int item);
+
+ /*
+ * end of function declarations
+@@ -83,10 +99,11 @@
+ struct abook_output_filter e_filters[] = {
+ { "abook", N_("abook native format"), write_database },
+ { "ldif", N_("ldif / Netscape addressbook (.4ld)"), ldif_export_database },
++ { "vcard", N_("vCard 2 file"), vcard_export_database },
+ { "mutt", N_("mutt alias"), mutt_alias_export },
++ { "muttq", N_("mutt query format (internal use)"), mutt_query_export_database },
+ { "html", N_("html document"), html_export_database },
+ { "pine", N_("pine addressbook"), pine_export_database },
+- { "gcrd", N_("GnomeCard (VCard) addressbook"), gcrd_export_database },
+ { "csv", N_("comma separated values"), csv_export_database },
+ { "allcsv", N_("comma separated values (all fields)"), allcsv_export_database },
+ { "palmcsv", N_("Palm comma separated values"), palm_export_database},
+@@ -95,9 +112,17 @@
+ { "wl", N_("Wanderlust address book"), wl_export_database },
+ { "spruce", N_("Spruce address book"), spruce_export_database },
+ { "bsdcal", N_("BSD calendar"), bsdcal_export_database },
++ { "custom", N_("Custom format"), custom_export_database },
+ { "\0", NULL, NULL }
+ };
+
++struct abook_output_item_filter u_filters[] = {
++ { "vcard", N_("vCard 2 file"), vcard_export_item },
++ { "muttq", N_("mutt alias"), muttq_print_item },
++ { "custom", N_("Custom format"), custom_print_item },
++ { "\0", NULL }
++};
++
+ /*
+ * common functions
+ */
+@@ -107,19 +132,26 @@
+ {
+ int i;
+
+- puts(_("input:"));
++ puts(_("input formats:"));
+ for(i=0; *i_filters[i].filtname ; i++)
+ printf("\t%s\t%s\n", i_filters[i].filtname,
+ gettext(i_filters[i].desc));
+
+ putchar('\n');
+
+- puts(_("output:"));
++ puts(_("output formats:"));
+ for(i=0; *e_filters[i].filtname ; i++)
+ printf("\t%s\t%s\n", e_filters[i].filtname,
+ gettext(e_filters[i].desc));
+
+ putchar('\n');
++
++ puts(_("query-compatible output formats:"));
++ for(i=0; *u_filters[i].filtname ; i++)
++ printf("\t%s\t%s\n", u_filters[i].filtname,
++ gettext(u_filters[i].desc));
++
++ putchar('\n');
+ }
+
+ static int
+@@ -265,6 +297,18 @@
+ if(i < 0)
+ return -1;
+
++#ifdef HAVE_VFORMAT
++ // this is a special case for
++ // libvformat whose API expects a filename
++ if(!strcmp(filtname, "vcard")) {
++ if(!strcmp(filename, "-"))
++ ret = vcard_parse_file_libvformat("/dev/stdin");
++ else
++ ret = vcard_parse_file_libvformat(filename);
++ }
++ else
++#endif
++
+ if(!strcmp(filename, "-")) {
+ struct stat s;
+ if((fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode))
+@@ -359,6 +403,25 @@
+ return 0;
+ }
+
++struct abook_output_item_filter select_output_item_filter(char filtname[FILTNAME_LEN]) {
++ int i;
++ for(i=0;; i++) {
++ if(!strncasecmp(u_filters[i].filtname, filtname, FILTNAME_LEN))
++ break;
++ if(!*u_filters[i].filtname) {
++ i = -1;
++ break;
++ }
++ }
++ return u_filters[i];
++}
++
++void
++e_write_item(FILE *out, int item, void (*func) (FILE *in, int item))
++{
++ (*func) (out, item);
++}
++
+ static int
+ e_write_file(char *filename, int (*func) (FILE *in, struct db_enumerator e),
+ int mode)
+@@ -440,79 +503,151 @@
+
+ #include "ldif.h"
+
+-static void ldif_fix_string(char *str);
++/* During LDIF import we need more fields than the
++ ITEM_FIELDS of a *list_item. Eg: "objectclass"
++ to test valid records, ...
++ Here we extends the existing field_types enum
++ to define new fields indexes usable during processing.
++ Newly created LDIF attr names could be associated to
++ them using ldif_conv_table[]. */
++typedef enum {
++ LDIF_OBJECTCLASS = ITEM_FIELDS + 1
++} ldif_field_types;
+
+-#define LDIF_ITEM_FIELDS 16
++#define LDIF_ITEM_FIELDS LDIF_OBJECTCLASS
+
+ typedef char *ldif_item[LDIF_ITEM_FIELDS];
+
++/* LDIF field's names *must* respect the ordering
++ defined by the field_types enum from database.h
++ This is only used to define (for export only)
++ abook standard field to LDIF attr name mappings */
+ static ldif_item ldif_field_names = {
+- "cn",
+- "mail",
+- "streetaddress",
+- "streetaddress2",
+- "locality",
+- "st",
+- "postalcode",
+- "countryname",
+- "homephone",
+- "description",
+- "homeurl",
+- "facsimiletelephonenumber",
+- "cellphone",
+- "xmozillaanyphone",
+- "xmozillanickname",
+- "objectclass", /* this must be the last entry */
++ "cn", // NAME
++ "mail", // EMAIL
++ "streetaddress", // ADDRESS
++ "streetaddress2", // ADDRESS2
++ "locality", // CITY
++ "st", // STATE
++ "postalcode", // ZIP
++ "countryname", // COUNTRY
++ "homephone", // PHONE
++ "telephonenumber", // WORKPHONE
++ "facsimiletelephonenumber", // FAX
++ "cellphone", // MOBILEPHONE
++ "xmozillanickname", // NICK
++ "homeurl", // URL
++ "description", // NOTES
++ "anniversary", // ANNIVERSARY
++ "ou", // GROUPS
+ };
+
+-static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
+- NAME, /* "cn" */
+- EMAIL, /* "mail" */
+- ADDRESS, /* "streetaddress" */
+- ADDRESS2, /* "streetaddress2" */
+- CITY, /* "locality" */
+- STATE, /* "st" */
+- ZIP, /* "postalcode" */
+- COUNTRY, /* "countryname" */
+- PHONE, /* "homephone" */
+- NOTES, /* "description" */
+- URL, /* "homeurl" */
+- FAX, /* "facsimiletelephonenumber" */
+- MOBILEPHONE, /* "cellphone" */
+- WORKPHONE, /* "xmozillaanyphone" */
+- NICK, /* "xmozillanickname" */
+- -1, /* "objectclass" */ /* this must be the last entry */
+-};
++/* Used to map LDIF attr names from input to
++ the abook restricted set of standard fields. */
++typedef struct {
++ char *key;
++ int index;
++} ldif_available_items;
++
++static ldif_available_items ldif_conv_table[] = {
++ /* initial field names respect the field_types enum
++ from database.h but this is only for readability.
++ This ldif_item struct allow use to define multiple
++ LDIF field names ("attribute names") for one abook field */
++
++ {"cn", NAME}, // 0
++ {"mail", EMAIL},
++ {"streetaddress", ADDRESS},
++ {"streetaddress2", ADDRESS2},
++ {"locality", CITY},
++ {"st", STATE},
++ {"postalcode", ZIP},
++ {"countryname", COUNTRY},
++ {"homephone", PHONE},
++ {"telephonenumber", WORKPHONE}, // workphone, according to Mozilla
++ {"facsimiletelephonenumber", FAX},
++ {"cellphone", MOBILEPHONE},
++ {"mozillanickname", NICK},
++ {"homeurl", URL},
++ {"description", NOTES},
++ {"anniversary", ANNIVERSARY},
++ {"ou", GROUPS}, // 16
++
++ // here comes a couple of aliases
++ {"mozillasecondemail", EMAIL},
++ {"homecity", CITY},
++ {"zip", ZIP},
++ {"tel", PHONE},
++ {"xmozillaanyphone", WORKPHONE}, // ever used ?
++ {"workphone", WORKPHONE},
++ {"fax", FAX},
++ {"telexnumber", FAX},
++ {"mobilephone", MOBILEPHONE},
++ {"mobile", MOBILEPHONE},
++ {"xmozillanickname", NICK},
++ {"labeledURI", URL},
++ {"notes", NOTES},
++ {"birthday", ANNIVERSARY},
++ {"category", GROUPS},
++
++ /* TODO:
++ "sn": append to lastname ?
++ "surname": append to lastname ?
++ "givenname": prepend to firstname ? */
++
++ /* here starts dummy fields:
++
++ As long as additional indexes are created
++ (using the above ldif_field_types),
++ any other LDIF attr name can be added and
++ used during ldif entry processing.
++ But obviously fields > ITEM_FIELDS (database.h) won't be
++ copied into the final *list_item. */
+
++ /* - to avoid mistake, don't use the special ITEM_FIELDS value.
++ - see also: http://mxr.mozilla.org/comm-central/source/mailnews/addrbook/src/nsAbLDIFService.cpp */
++
++ // used to check valid LDIF records:
++ {"objectclass", LDIF_OBJECTCLASS}
++};
++const int LDIF_IMPORTABLE_ITEM_FIELDS = (int)sizeof(ldif_conv_table)/sizeof(*ldif_conv_table);
+
++/*
++ Handles multi-line strings.
++ If a string starts with a space, it's the continuation
++ of the previous line. Thus we need to always read ahead.
++ But for this to work with stdin, we need to stores the next
++ line for later use in case it's not a continuation of the
++ first line.
++ */
+ static char *
+-ldif_read_line(FILE *in)
++ldif_read_line(FILE *in, char **next_line)
+ {
+ char *buf = NULL;
+ char *ptr, *tmp;
+- long pos;
+- int i;
++ char *line;
+
+- for(i = 1;;i++) {
+- char *line;
++ // buf filled with the first line
++ if(!*next_line)
++ buf = getaline(in);
++ else {
++ buf = xstrdup(*next_line);
++ xfree(*next_line);
++ }
+
+- pos = ftell(in);
++ while(!feof(in)) {
++ // if no line already read-ahead.
+ line = getaline(in);
++ if(!line) break;
+
+- if(feof(in) || !line)
+- break;
+-
+- if(i == 1) {
+- buf = line;
+- continue;
+- }
+-
++ // this is not a continuation of what is already in buf
++ // store it for the next round
+ if(*line != ' ') {
+- fseek(in, pos, SEEK_SET); /* fixme ! */
+- free(line);
++ *next_line = line;
+ break;
+ }
+
++ // starts with ' ': this is the continuation of buf
+ ptr = line;
+ while( *ptr == ' ')
+ ptr++;
+@@ -537,46 +672,90 @@
+ list_item item;
+ int i;
+
+- item = item_create();
+-
+- if(!li[LDIF_ITEM_FIELDS -1])
++ /* if there's no value for "objectclass"
++ it's probably a buggy record */
++ if(!li[LDIF_OBJECTCLASS])
+ goto bail_out;
+
+-
+- for(i=0; i < LDIF_ITEM_FIELDS; i++) {
+- if(ldif_conv_table[i] >= 0 && li[i] && *li[i])
+- item_fput(item,ldif_conv_table[i],xstrdup(li[i]));
++ /* just copy from our extended ldif_item to a regular
++ list_item,
++ TODO: API could be changed so db_fput_byid() is usable */
++ item = item_create();
++ for(i=0; i < ITEM_FIELDS; i++) {
++ if(li[i] && *li[i])
++ item[i] = xstrdup(li[i]);
+ }
+
+ add_item2database(item);
++ item_free(&item);
+
+ bail_out:
+ for(i=0; i < LDIF_ITEM_FIELDS; i++)
+ xfree(li[i]);
+- item_free(&item);
+-
+ }
+
+ static void
+ ldif_convert(ldif_item item, char *type, char *value)
+ {
+- int i;
+-
++ /* this is the first (mandatory) attribute to expected
++ from a new valid LDIF record.
++ The previous record must be added to the database before
++ we can go further with the new one */
+ if(!strcmp(type, "dn")) {
+ ldif_add_item(item);
+ return;
+ }
+
+- for(i=0; i < LDIF_ITEM_FIELDS; i++) {
+- if(!safe_strcmp(ldif_field_names[i], type) && *value) {
+- if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */
+- if(safe_strcmp("person", value))
+- break;
++ int i, index;
+
+- if(item_fget(item, i))
+- free(item_fget(item, i));
++ for( i=0; i < LDIF_IMPORTABLE_ITEM_FIELDS; i++ ) {
+
+- item_fput(item, i, xstrdup(value));
++ if( *value && // there's a value for the attr provided
++ ldif_conv_table[i].key && // there exists an ldif attr name...
++ !strcasecmp(ldif_conv_table[i].key, type)) { // ...matching that provided at input
++
++ assert((i >= 0) && (i < LDIF_ITEM_FIELDS));
++ // which abook field this attribute's name maps to ?
++ index = ldif_conv_table[i].index;
++ assert((index >= 0) && (index < LDIF_ITEM_FIELDS));
++
++ /* TODO: here must be handled multi-valued cases
++ (first or latest win, append or prepend values, ...)
++ Currently: emails are appended, for other fields the
++ first attribute found wins.
++ Eg: the value of "mobile" will be taken into
++ account if such a line comes before "cellphone". */
++
++ /* Remember: LDIF_ITEM_FIELDS > ITEM_FIELDS,
++ lower (common) indexes of *ldif_item map well to *list_item.
++ We can use item_fput()... */
++ if(index < ITEM_FIELDS) {
++ // multiple email support, but two only will stay
++ // in the final *list_item
++ if(index == EMAIL && item_fget(item, EMAIL)) {
++ item_fput(item,
++ EMAIL,
++ strconcat(item_fget(item, EMAIL), ",", value, 0));
++ }
++ else {
++ /* Don't override already initialized fields:
++ This is the rule of the "first win" */
++ if(! item_fget(item, index))
++ item_fput(item, index, xstrdup(value));
++ }
++ }
++
++ /* ... but if the ldif field's name index is higher
++ than what standards abook fields struct can hold,
++ these extra indexes must be managed manually.
++ This is the case of LDIF_OBJECTCLASS ("objectclass" attr) */
++ else {
++ item[index] = xstrdup(value);
++ }
++
++ // matching attr found and field filled:
++ // no further attr search is needed for `type`
++ break;
+ }
+ }
+ }
+@@ -585,46 +764,40 @@
+ ldif_parse_file(FILE *handle)
+ {
+ char *line = NULL;
++ char *next_line = NULL;
+ char *type, *value;
+ int vlen;
++
++ /* This is our extended fields holder to put the values from
++ successfully parsed LDIF attributes.
++ ldif_item item is temporary. When the end of an entry is reached,
++ values are copied into a regular *list_item struct, see ldif_add_item() */
+ ldif_item item;
+
+ memset(item, 0, sizeof(item));
+
+ do {
+- if( !(line = ldif_read_line(handle)) )
+- continue;
++ line = ldif_read_line(handle, &next_line);
++
++ // EOF or empty lines: continue;
++ if(!line || *line == '\0') continue;
+
+ if(-1 == (str_parse_line(line, &type, &value, &vlen))) {
+ xfree(line);
+ continue; /* just skip the errors */
+ }
+
+- ldif_fix_string(value);
+-
+ ldif_convert(item, type, value);
+
+ xfree(line);
+ } while ( !feof(handle) );
+
++ // force registration (= ldif_add_item()) of the last LDIF entry
+ ldif_convert(item, "dn", "");
+
+ return 0;
+ }
+
+-static void
+-ldif_fix_string(char *str)
+-{
+- int i, j;
+-
+- for(i = 0, j = 0; j < (int)strlen(str); i++, j++)
+- str[i] = ( str[j] == (char)0xc3 ?
+- (char) str[++j] + (char) 0x40 :
+- str[j] );
+-
+- str[i] = 0;
+-}
+-
+ /*
+ * end of ldif import
+ */
+@@ -636,10 +809,11 @@
+ #include "getname.h"
+
+ static int
+-mutt_read_line(FILE *in, char **alias, char **rest)
++mutt_read_line(FILE *in, char **groups, char **alias, char **rest)
+ {
+- char *line, *ptr, *tmp;
+- size_t alias_len;
++ char *line, *ptr;
++ char *start, *end;
++ abook_list *glist = NULL;
+
+ if( !(line = ptr = getaline(in)) )
+ return 1; /* error / EOF */
+@@ -652,27 +826,39 @@
+ }
+
+ ptr += 5;
+-
+ SKIPWS(ptr);
+
+- tmp = ptr;
+-
+- while( ! ISSPACE(*ptr) )
+- ptr++;
+-
+- alias_len = (size_t)(ptr - tmp);
+-
+- if(alias)
+- *alias = xmalloc_inc(alias_len, 1);
+-
+- strncpy(*alias, tmp, alias_len);
+- *(*alias + alias_len) = 0;
+-
++ /* If the group option is used, save the groups */
++ *groups = NULL;
++ start = ptr;
++ int n_groups;
++ for(n_groups = 0; 0 == strncmp("-group", ptr, 6); n_groups++) {
++ ptr += 6;
++ SKIPWS(ptr);
++ start = ptr;
++ SKIPNONWS(ptr);
++ end = ptr;
++ abook_list_append(&glist,xstrndup(start, end - start));
++ SKIPWS(ptr);
++ }
++
++ if(n_groups && groups)
++ *groups = abook_list_to_csv(glist);
++
++ abook_list_free(&glist);
++
++ /* alias */
++ start = ptr;
++ SKIPNONWS(ptr);
++ end = ptr;
+ SKIPWS(ptr);
++ if(alias)
++ *alias = xstrndup(start, end - start);
+
++ /* rest (email) */
+ *rest = xstrdup(ptr);
+
+- free(line);
++ xfree(line);
+ return 0;
+ }
+
+@@ -753,9 +939,9 @@
+ memset(item, 0, fields_count * sizeof(char *));
+
+ if(!mutt_read_line(in,
+- (field_id(NICK) != -1) ?
+- &item[field_id(NICK)] : NULL,
+- &item[field_id(NAME)]))
++ (field_id(GROUPS) != -1) ? &item[field_id(GROUPS)] : NULL,
++ (field_id(NICK) != -1) ? &item[field_id(NICK)] : NULL,
++ &item[field_id(NAME)]) )
+ mutt_parse_email(item);
+
+ if(feof(in)) {
+@@ -795,6 +981,7 @@
+ ldif_export_database(FILE *out, struct db_enumerator e)
+ {
+ char email[MAX_EMAILSTR_LEN];
++ abook_list *emails, *em;
+
+ fprintf(out, "version: 1\n");
+
+@@ -803,21 +990,32 @@
+ int j;
+ get_first_email(email, e.item);
+
+- tmp = strdup_printf("cn=%s,mail=%s",db_name_get(e.item),email);
++ if(*email)
++ tmp = strdup_printf("cn=%s,mail=%s",db_name_get(e.item),email);
++ /* TODO: this may not be enough for a trully "Distinguished" name
++ needed by LDAP. Appending a random uuid could do the trick */
++ else
++ tmp = strdup_printf("cn=%s",db_name_get(e.item));
+
+ ldif_fput_type_and_value(out, "dn", tmp);
+ free(tmp);
+
+- for(j = 0; j < LDIF_ITEM_FIELDS; j++) {
+- if(ldif_conv_table[j] >= 0) {
+- if(ldif_conv_table[j] == EMAIL)
+- ldif_fput_type_and_value(out,
+- ldif_field_names[j], email);
+- else if(db_fget(e.item,ldif_conv_table[j]))
+- ldif_fput_type_and_value(out,
+- ldif_field_names[j],
+- db_fget(e.item,
+- ldif_conv_table[j]));
++ for(j = 0; j < ITEM_FIELDS; j++) {
++ if(j == EMAIL) {
++ if(*email) {
++ tmp = db_email_get(e.item);
++ emails = csv_to_abook_list(tmp);
++ free(tmp);
++ for(em = emails; em; em = em->next)
++ ldif_fput_type_and_value(out,
++ ldif_field_names[EMAIL],
++ em->data);
++ }
++ }
++ else if(db_fget(e.item,j)) {
++ ldif_fput_type_and_value(out,
++ ldif_field_names[j],
++ db_fget(e.item, j));
+ }
+ }
+
+@@ -1337,10 +1535,10 @@
+ */
+
+ static char *vcard_fields[] = {
+- "FN", /* NAME */
++ "FN", /* FORMATTED NAME */
+ "EMAIL", /* EMAIL */
+ "ADR", /* ADDRESS */
+- "ADR", /* ADDRESS2 - not used */
++ "ADR", /* ADDRESS2 */
+ "ADR", /* CITY */
+ "ADR", /* STATE */
+ "ADR", /* ZIP */
+@@ -1352,23 +1550,10 @@
+ "NICKNAME", /* NICK */
+ "URL", /* URL */
+ "NOTE", /* NOTES */
++ "N", /* NAME: special case/mapping in vcard_parse_line() */
+ NULL /* not implemented: ANNIVERSARY, ITEM_FIELDS */
+ };
+
+-/*
+- * mappings between vCard ADR field and abook's ADDRESS
+- * see rfc2426 section 3.2.1
+- */
+-static int vcard_address_fields[] = {
+- -1, /* vCard(post office box) - not used */
+- -1, /* vCard(the extended address) - not used */
+- 2, /* vCard(the street address) - ADDRESS */
+- 4, /* vCard(the locality) - CITY */
+- 5, /* vCard(the region) - STATE */
+- 6, /* vCard(the postal code) - ZIP */
+- 7 /* vCard(the country name) - COUNTRY */
+-};
+-
+ enum {
+ VCARD_KEY = 0,
+ VCARD_KEY_ATTRIBUTE,
+@@ -1387,7 +1572,7 @@
+
+ line_copy = xstrdup(line);
+
+- /* make newline characters if exist end of string */
++ /* change newline characters, if present, to end of string */
+ for(i=0; line_copy[i]; i++) {
+ if(line_copy[i] == '\r' || line_copy[i] == '\n') {
+ line_copy[i] = '\0';
+@@ -1406,6 +1591,7 @@
+ }
+
+ /* separate key from key attributes */
++ /* works for vCard 2 as well (automagically) */
+ if (key) {
+ for(i=0; key[i]; i++) {
+ if(key[i] == ';') {
+@@ -1451,63 +1637,82 @@
+ }
+ }
+
++
++/*
++ * mappings between vCard ADR field and abook's ADDRESS
++ * see rfc2426 section 3.2.1
++ */
+ static void
+ vcard_parse_address(list_item item, char *line)
+ {
+- int i;
+- int k;
+ char *value;
+- char *address_field;
+
+ value = vcard_get_line_element(line, VCARD_VALUE);
+ if(!value)
+ return;
+
+- address_field = value;
+- for(i=k=0; value[i]; i++) {
+- if(value[i] == ';') {
+- value[i] = '\0';
+- if(vcard_address_fields[k] >= 0) {
+- item[vcard_address_fields[k]] = xstrdup(address_field);
+- }
+- address_field = &value[i+1];
+- k++;
+- if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields)))
+- break;
+- }
+- }
+- item[vcard_address_fields[k]] = xstrdup(address_field);
+- xfree(value);
++ // vCard(post office box) - not used
++ strsep(&value, ";");
++ // vCard(the extended address)
++ item_fput(item, ADDRESS2, xstrdup(strsep(&value, ";")));
++ // vCard(the street address)
++ item_fput(item, ADDRESS, xstrdup(strsep(&value, ";")));
++ // vCard(the locality)
++ item_fput(item, CITY, xstrdup(strsep(&value, ";")));
++ // vCard(the region)
++ item_fput(item, STATE, xstrdup(strsep(&value, ";")));
++ // vCard(the postal code)
++ item_fput(item, ZIP, xstrdup(strsep(&value, ";")));
++ // vCard(the country name)
++ item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
++
++ if(*value) xfree(value);
++}
++
++static void
++vcard_parse_name(list_item item, char *line)
++{
++ // store the "N" field into "NAME" *if* no "FN:"
++ // value has already been stored here
++ if(item[0]) return;
++
++ int i = -1;
++ item[0] = vcard_get_line_element(line, VCARD_VALUE);
++ // "N:" can be multivalued => replace ';' separators by ' '
++ while(item[0][++i]) if(item[0][i] == ';') item[0][i] = ' ';
++
++ // http://www.daniweb.com/software-development/c/code/216919
++ char *original = item[0], *p = original;
++ int trimmed = 0;
++ do {
++ if (*original != ' ' || trimmed) {
++ trimmed = 1; *p++ = *original;
++ }
++ } while(*original++);
+ }
+
+ static void
+ vcard_parse_phone(list_item item, char *line)
+ {
+- int index = 8;
+ char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE);
+ char *value = vcard_get_line_element(line, VCARD_VALUE);
+
+ /* set the standard number */
+- if (!type) {
+- item[index] = value;
+- }
++ if (!type) item_fput(item, PHONE, value);
+
+ /*
+ * see rfc2426 section 3.3.1
++ * Note: we probably support both vCard 2 and 3
+ */
+- else if (strstr(type, "TYPE=") == type){
+- if (strcasestr(type, "home")) {
+- item[index] = xstrdup(value);
+- }
+- if (strcasestr(type, "work")) {
+- item[index+1] = xstrdup(value);
+- }
+- if (strcasestr(type, "fax")) {
+- item[index+2] = xstrdup(value);
+- }
+- if (strcasestr(type, "cell")) {
+- item[index+3] = xstrdup(value);
+- }
++ else {
++ if (strcasestr(type, "home") != NULL)
++ item_fput(item, PHONE, xstrdup(value));
++ else if (strcasestr(type, "work") != NULL)
++ item_fput(item, WORKPHONE, xstrdup(value));
++ else if (strcasestr(type, "fax") != NULL)
++ item_fput(item, FAX, xstrdup(value));
++ else if (strcasestr(type, "cell") != NULL)
++ item_fput(item, MOBILEPHONE, xstrdup(value));
+
+ xfree(type);
+ xfree(value);
+@@ -1523,20 +1728,18 @@
+ for(i=0; vcard_fields[i]; i++) {
+ key = vcard_fields[i];
+
+- if(!strncmp(key, line, strlen(key))) {
+- if(i == 1) {
++ if(0 == strncmp(key, line, strlen(key))) {
++ if(0 == strcmp(key, "EMAIL"))
+ vcard_parse_email(item, line);
+- }
+- else if(i == 2) {
++ else if(i == 2)
+ vcard_parse_address(item, line);
+- }
+- else if(i == 8) {
++ else if(0 == strcmp(key, "TEL"))
+ vcard_parse_phone(item, line);
+- }
+- else {
++ else if(0 == strcmp(key, "N"))
++ vcard_parse_name(item, line);
++ else
+ item[i] = vcard_get_line_element(line, VCARD_VALUE);
+- }
+- break;
++ return;
+ }
+ }
+ }
+@@ -1670,6 +1873,7 @@
+ URL,
+ NOTES,
+ ANNIVERSARY,
++ GROUPS,
+ CSV_LAST
+ };
+
+@@ -1689,7 +1893,8 @@
+ fprintf(out, "\"NICK\",");
+ fprintf(out, "\"URL\",");
+ fprintf(out, "\"NOTES\",");
+- fprintf(out, "\"ANNIVERSARY\"\n");
++ fprintf(out, "\"ANNIVERSARY\",");
++ fprintf(out, "\"GROUPS\"\n");
+
+ csv_export_common(out, e, allcsv_export_fields, NULL);
+
+@@ -1778,83 +1983,90 @@
+ */
+
+ /*
+- * GnomeCard (VCard) addressbook export filter
++ * vCard 2 addressbook export filter
+ */
+
+ static int
+-gcrd_export_database(FILE *out, struct db_enumerator e)
++vcard_export_database(FILE *out, struct db_enumerator e)
+ {
+- int j;
++ db_enumerate_items(e)
++ vcard_export_item(out, e.item);
++ return 0;
++}
++
++void
++vcard_export_item(FILE *out, int item)
++{
++ int j, email_no;
+ char *name, *tmp;
+ abook_list *emails, *em;
++ fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
++ safe_str(db_name_get(item)));
+
+- db_enumerate_items(e) {
+- fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
+- safe_str(db_name_get(e.item)));
+-
+- name = get_surname(db_name_get(e.item));
+- for( j = strlen(db_name_get(e.item)) - 1; j >= 0; j-- ) {
+- if((db_name_get(e.item))[j] == ' ')
+- break;
+- }
+- fprintf(out, "N:%s;%.*s\r\n",
+- safe_str(name),
+- j,
+- safe_str(db_name_get(e.item))
+- );
+-
+- free(name);
+-
+- if(db_fget(e.item, ADDRESS))
+- fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
+- safe_str(db_fget(e.item, ADDRESS)),
+- safe_str(db_fget(e.item, ADDRESS2)),
+- safe_str(db_fget(e.item, CITY)),
+- safe_str(db_fget(e.item, STATE)),
+- safe_str(db_fget(e.item, ZIP)),
+- safe_str(db_fget(e.item, COUNTRY))
+- );
+-
+- if(db_fget(e.item, PHONE))
+- fprintf(out, "TEL;HOME:%s\r\n",
+- db_fget(e.item, PHONE));
+- if(db_fget(e.item, WORKPHONE))
+- fprintf(out, "TEL;WORK:%s\r\n",
+- db_fget(e.item, WORKPHONE));
+- if(db_fget(e.item, FAX))
+- fprintf(out, "TEL;FAX:%s\r\n",
+- db_fget(e.item, FAX));
+- if(db_fget(e.item, MOBILEPHONE))
+- fprintf(out, "TEL;CELL:%s\r\n",
+- db_fget(e.item, MOBILEPHONE));
+-
+- tmp = db_email_get(e.item);
+- if(*tmp) {
+- emails = csv_to_abook_list(tmp);
+-
+- for(em = emails; em; em = em->next)
+- fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
++ name = get_surname(db_name_get(item));
++ for( j = strlen(db_name_get(item)) - 1; j >= 0; j-- ) {
++ if((db_name_get(item))[j] == ' ')
++ break;
++ }
++ fprintf(out, "N:%s;%.*s\r\n",
++ safe_str(name),
++ j,
++ safe_str(db_name_get(item))
++ );
++
++ free(name);
++
++ // see rfc6350 section 6.3.1
++ if(db_fget(item, ADDRESS)) {
++ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
++ // pobox (unsupported)
++ safe_str(db_fget(item, ADDRESS2)), // ext (n°, ...)
++ safe_str(db_fget(item, ADDRESS)), // street
++ safe_str(db_fget(item, CITY)), // locality
++ safe_str(db_fget(item, STATE)), // region
++ safe_str(db_fget(item, ZIP)), // code (postal)
++ safe_str(db_fget(item, COUNTRY)) // country
++ );
++ }
++
++ if(db_fget(item, PHONE))
++ fprintf(out, "TEL;HOME:%s\r\n",
++ db_fget(item, PHONE));
++ if(db_fget(item, WORKPHONE))
++ fprintf(out, "TEL;WORK:%s\r\n",
++ db_fget(item, WORKPHONE));
++ if(db_fget(item, FAX))
++ fprintf(out, "TEL;FAX:%s\r\n",
++ db_fget(item, FAX));
++ if(db_fget(item, MOBILEPHONE))
++ fprintf(out, "TEL;CELL:%s\r\n",
++ db_fget(item, MOBILEPHONE));
++
++ tmp = db_email_get(item);
++ if(*tmp) {
++ emails = csv_to_abook_list(tmp);
++ fprintf(out, "EMAIL;PREF;INTERNET:%s\r\n", emails->data);
++ email_no = 1;
++ for(em = emails->next; em; em = em->next, email_no++ )
++ fprintf(out, "EMAIL;%d;INTERNET:%s\r\n", email_no, em->data);
+
+- abook_list_free(&emails);
+- }
+- free(tmp);
+-
+- if(db_fget(e.item, NOTES))
+- fprintf(out, "NOTE:%s\r\n",
+- db_fget(e.item, NOTES));
+- if(db_fget(e.item, URL))
+- fprintf(out, "URL:%s\r\n",
+- db_fget(e.item, URL));
++ abook_list_free(&emails);
++ }
++ free(tmp);
+
+- fprintf(out, "END:VCARD\r\n\r\n");
++ if(db_fget(item, NOTES))
++ fprintf(out, "NOTE:%s\r\n",
++ db_fget(item, NOTES));
++ if(db_fget(item, URL))
++ fprintf(out, "URL:%s\r\n",
++ db_fget(item, URL));
+
+- }
++ fprintf(out, "END:VCARD\r\n\r\n");
+
+- return 0;
+ }
+
+ /*
+- * end of GnomeCard export filter
++ * end of vCard export filter
+ */
+
+
+@@ -1880,25 +2092,128 @@
+ return tmp;
+ }
+
++/*
++ * This function is a variant of abook_list_to_csv
++ * */
++static char *
++mutt_alias_gengroups(int i)
++{
++ char *groups, *res = NULL;
++ char groupstr[7] = "-group ";
++ abook_list *list, *tmp;
++
++ groups = db_fget(i, GROUPS);
++
++ if(!groups)
++ return NULL;
++
++ list = csv_to_abook_list(groups);
++ for(tmp = list; tmp; tmp = tmp->next) {
++ if(tmp == list) {
++ res = xmalloc(strlen(groupstr)+strlen(tmp->data)+1);
++ res = strcpy(res, groupstr);
++ } else {
++ res = xrealloc(res, strlen(res)+1+strlen(groupstr)+strlen(tmp->data)+1);
++ strcat(res, " ");
++ strcat(res, groupstr);
++ }
++ strcat(res, tmp->data);
++ }
++ abook_list_free(&list);
++ xfree(groups);
++
++ return res;
++}
++
+ static int
+ mutt_alias_export(FILE *out, struct db_enumerator e)
+ {
+ char email[MAX_EMAIL_LEN];
+ char *alias = NULL;
++ char *groups = NULL;
++ int email_addresses;
++ char *ptr;
+
+ db_enumerate_items(e) {
+- alias = mutt_alias_genalias(e.item);
++ alias = (field_id(NICK) != -1) ? mutt_alias_genalias(e.item) : NULL;
++ groups = (field_id(GROUPS) != -1) ? mutt_alias_gengroups(e.item) : NULL;
+ get_first_email(email, e.item);
+- fprintf(out, *email ? "alias %s %s <%s>\n": "alias %s %s%s\n",
+- alias,
+- db_name_get(e.item),
+- email);
+- xfree(alias);
++
++ /* do not output contacts without email address */
++ /* cause this does not make sense in mutt aliases */
++ if (*email) {
++
++ /* output first email address */
++ fprintf(out,"alias ");
++ if(groups)
++ fprintf(out, "%s ", groups);
++ if(alias)
++ fprintf(out, "%s ", alias);
++ fprintf(out, "%s <%s>\n",
++ db_name_get(e.item),
++ email);
++
++ /* number of email addresses */
++ email_addresses = 1;
++ ptr = db_email_get(e.item);
++ while (*ptr != '\0') {
++ if (*ptr == ',') {
++ email_addresses++;
++ }
++ ptr++;
++ }
++
++ /* output other email addresses */
++ while (email_addresses-- > 1) {
++ roll_emails(e.item, ROTATE_RIGHT);
++ get_first_email(email, e.item);
++ fprintf(out,"alias ");
++ if( groups )
++ fprintf(out, "%s ", groups);
++ if(alias)
++ fprintf(out, "%s__%s ", alias, email);
++ else
++ fprintf(out, "%s__%s ", db_name_get(e.item), email);
++ fprintf(out, "%s <%s>\n",
++ db_name_get(e.item),
++ email);
++ }
++ roll_emails(e.item, ROTATE_RIGHT);
++ xfree(alias);
++ xfree(groups);
++ }
+ }
+
+ return 0;
+ }
+
++void muttq_print_item(FILE *file, int item)
++{
++ abook_list *emails, *e;
++ char *tmp = db_email_get(item);
++
++ emails = csv_to_abook_list(tmp);
++ free(tmp);
++
++ for(e = emails; e; e = e->next) {
++ fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
++ !db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
++ );
++ if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
++ break;
++ }
++ abook_list_free(&emails);
++}
++
++static int
++mutt_query_export_database(FILE *out, struct db_enumerator e)
++{
++ fprintf(out, "All items\n");
++ db_enumerate_items(e)
++ muttq_print_item(out, e.item);
++ return 0;
++}
++
+ /*
+ * end of mutt alias export filter
+ */
+@@ -2148,7 +2463,8 @@
+ char *anniversary = db_fget(e.item, ANNIVERSARY);
+
+ if(anniversary) {
+- parse_date_string(anniversary, &day, &month, &year);
++ if(!parse_date_string(anniversary, &day, &month, &year))
++ continue;
+
+ fprintf(out,
+ _("%02d/%02d\tAnniversary of %s\n"),
+@@ -2162,6 +2478,184 @@
+ return 0;
+ }
+
++// see also enum field_types @database.h
++extern abook_field standard_fields[];
++static int
++find_field_enum(char *s) {
++ int i = -1;
++ while(standard_fields[++i].key)
++ if(!strcmp(standard_fields[i].key, s))
++ return i;
++ return -1;
++}
++
++/* Convert a string with named placeholders to
++ a *printf() compatible string.
++ Stores the abook field values into ft. */
++void
++parse_custom_format(char *s, char *fmt_string, enum field_types *ft)
++{
++ if(! fmt_string || ! ft) {
++ fprintf(stderr, _("parse_custom_format: fmt_string or ft not allocated\n"));
++ exit(EXIT_FAILURE);
++ }
++
++ char tmp[1] = { 0 };
++ char *p, *start, *field_name = NULL;
++ p = start = s;
++
++ while(*p) {
++ if(*p == '{') {
++ start = ++p;
++
++ if(! *start) goto cannotparse;
++ p = strchr(start, '}');
++ if(! p) goto cannotparse;
++ strcat(fmt_string, "%s");
++ field_name = strndup(start, (size_t)(p-start));
++ *ft = find_field_enum(field_name);
++ if(*ft == -1) {
++ fprintf(stderr, _("parse_custom_format: invalid placeholder: {%s}\n"), field_name);
++ exit(EXIT_FAILURE);
++ }
++
++ ft++;
++ start = ++p;
++ }
++
++ else if(*p == '\\') {
++ ++p;
++ if(! *p) tmp[0] = '\\'; // last char is a '\' ?
++ else if(*p == 'n') *tmp = '\n';
++ else if(*p == 't') *tmp = '\t';
++ else if(*p == 'r') *tmp = '\r';
++ else if(*p == 'v') *tmp = '\v';
++ else if(*p == 'b') *tmp = '\b';
++ else if(*p == 'a') *tmp = '\a';
++ else *tmp = *p;
++ strncat(fmt_string, tmp, 1);
++ start = ++p;
++ }
++
++ // if no '\' following: quick mode using strchr/strncat
++ else if(! strchr(start, '\\')) {
++ p = strchr(start, '{');
++ if(p) { // copy until the next placeholder
++ strncat(fmt_string, start, (size_t)(p-start));
++ start = p;
++ }
++ else { // copy till the end
++ strncat( fmt_string,
++ start,
++ FORMAT_STRING_LEN - strlen(fmt_string) - 1 );
++ break;
++ }
++ }
++
++ // otherwise character by character
++ else {
++ strncat(fmt_string, p, 1);
++ start = ++p;
++ }
++ }
++
++ *ft = ITEM_FIELDS;
++ return;
++
++ cannotparse:
++ fprintf(stderr, _("%s: invalid format, index %ld\n"), __FUNCTION__, (start - s));
++ free(fmt_string);
++ while(*ft) free(ft--);
++ exit(EXIT_FAILURE);
++}
++
++static int
++custom_export_item(FILE *out, int item, char *s, enum field_types *ft);
++
++
++// used to store the format string from --outformatstr when "custom" format is used
++// default value overriden in export_file()
++extern char *parsed_custom_format;
++extern enum field_types *custom_format_fields;
++
++/* wrapper for custom_export_item:
++ 1) avoid messing with extern pointer
++ 2) adds \n
++ 3) follow the prototype needed for an abook_output_item_filter entry */
++void
++custom_print_item(FILE *out, int item)
++{
++
++ if(custom_export_item(out, item, parsed_custom_format, custom_format_fields) == 0)
++ fprintf(out, "\n");
++}
++
++static int
++custom_export_item(FILE *out, int item, char *fmt, enum field_types *ft)
++{
++ char *p, *q = 0;
++
++ // if the first character is '!':
++ // we first check that all fields exist before continuing
++ if(*fmt == '!') {
++ enum field_types *ftp = ft;
++ while(*ft != ITEM_FIELDS) {
++ if(! db_fget(item, *ft) )
++ return 1;
++ ft++;
++ }
++ ft = ftp;
++ fmt++;
++ }
++
++ while (*fmt) {
++ if(!strncmp(fmt, "%s", 2)) {
++ fprintf(out, "%s", safe_str(db_fget(item, *ft)));
++ ft++;
++ fmt+=2;
++ } else if (*ft == ITEM_FIELDS) {
++ fprintf(out, "%s", fmt);
++ return 0;
++ } else {
++ p = strchr(fmt, '%');
++ if(*p) {
++ q = strndup(fmt, (size_t)(p-fmt));
++ fprintf(out, "%s", q);
++ free(q);
++ fmt = p;
++ }
++ else {
++ fprintf(out, "%s", fmt);
++ return 0;
++ }
++ }
++ }
++
++ return 0;
++}
++
++// used to store the format string from --outformatstr when "custom" format is used
++// default value overriden from abook.c
++extern char custom_format[FORMAT_STRING_LEN];
++
++static int
++custom_export_database(FILE *out, struct db_enumerator e)
++{
++ char *format_string =
++ (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
++
++ enum field_types *ft =
++ (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
++
++ parse_custom_format(custom_format, format_string, ft);
++
++ db_enumerate_items(e) {
++ if(custom_export_item(out, e.item, format_string, ft) == 0)
++ fprintf(out, "\n");
++ }
++ return 0;
++}
++
+ /*
+ * end of BSD calendar export filter
+ */
+diff -urN BUILD/abook-0.6.0pre2/filter.h abook/filter.h
+--- BUILD/abook-0.6.0pre2/filter.h 2002-03-20 10:17:24.000000000 +0100
++++ abook/filter.h 2013-03-13 15:07:45.000000000 +0100
+@@ -4,6 +4,8 @@
+ #include "database.h"
+
+ #define FILTNAME_LEN 8
++#define FORMAT_STRING_LEN 128
++#define FORMAT_STRING_MAX_FIELDS 16
+
+
+ struct abook_output_filter {
+@@ -12,6 +14,12 @@
+ int (*func) (FILE *handle, struct db_enumerator e);
+ };
+
++struct abook_output_item_filter {
++ char filtname[FILTNAME_LEN];
++ char *desc;
++ void (*func) (FILE *handle, int item);
++};
++
+ struct abook_input_filter {
+ char filtname[FILTNAME_LEN];
+ char *desc;
+@@ -24,6 +32,16 @@
+
+ int export_database();
+ int export_file(char filtname[FILTNAME_LEN], char *filename);
++
++struct abook_output_item_filter
++ select_output_item_filter(char filtname[FILTNAME_LEN]);
++
++void e_write_item(FILE *out, int item, void (*func) (FILE *in, int item));
++void muttq_print_item(FILE *file, int item);
++
++void parse_custom_format(char *s, char *fmt_string, enum field_types *ft);
++void custom_print_item(FILE *out, int item);
++
+ int fexport(char filtname[FILTNAME_LEN], FILE *handle,
+ int enum_mode);
+
+diff -urN BUILD/abook-0.6.0pre2/gettext.h abook/gettext.h
+--- BUILD/abook-0.6.0pre2/gettext.h 2006-04-10 10:15:46.000000000 +0200
++++ abook/gettext.h 2013-03-13 15:07:45.000000000 +0100
+@@ -7,6 +7,7 @@
+ # include <libintl.h>
+ # else
+ # define gettext(Msgid) ((const char *) (Msgid))
++# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+ # define textdomain(Domainname) do {} while(0)
+ # define bindtextdomain(Domainname, Dirname) do {} while(0)
+ # endif /* ENABLE_NLS */
+diff -urN BUILD/abook-0.6.0pre2/.gitignore abook/.gitignore
+--- BUILD/abook-0.6.0pre2/.gitignore 1970-01-01 01:00:00.000000000 +0100
++++ abook/.gitignore 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,17 @@
++.deps
++autom4te.cache
++Makefile
++abook.spec
++config.h
++config.log
++config.status
++config.cache
++intl/Makefile
++po/Makefile
++po/Makefile.in
++po/POTFILES
++po/*.gmo
++stamp-h1
++*.o
++*~
++abook
+diff -urN BUILD/abook-0.6.0pre2/help.h abook/help.h
+--- BUILD/abook-0.6.0pre2/help.h 2006-08-31 07:07:59.000000000 +0200
++++ abook/help.h 2013-03-13 15:07:45.000000000 +0100
+@@ -18,7 +18,9 @@
+ N_(" enter view/edit item\n"),
+ N_(" a add item\n"),
+ N_(" r / del remove selected items\n"),
++N_(" M merge selected items (into top one)\n"),
+ N_(" D duplicate item\n"),
++N_(" U remove duplicates\n"),
+ "\n",
+ N_(" space select item\n"),
+ N_(" + select all\n"),
+diff -urN BUILD/abook-0.6.0pre2/INSTALL abook/INSTALL
+--- BUILD/abook-0.6.0pre2/INSTALL 2001-03-12 11:12:54.000000000 +0100
++++ abook/INSTALL 2013-03-13 15:07:45.000000000 +0100
+@@ -1,48 +1,80 @@
++Installation Instructions
++*************************
++
++Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
++Inc.
++
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
++
+ Basic Installation
+ ==================
+
+- These are generic installation instructions.
++ Briefly, the shell commands `./configure; make; make install' should
++configure, build, and install this package. The following
++more-detailed instructions are generic; see the `README' file for
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+ those values to create a `Makefile' in each directory of the package.
+ It may also create one or more `.h' files containing system-dependent
+ definitions. Finally, it creates a shell script `config.status' that
+-you can run in the future to recreate the current configuration, a file
+-`config.cache' that saves the results of its tests to speed up
+-reconfiguring, and a file `config.log' containing compiler output
+-(useful mainly for debugging `configure').
++you can run in the future to recreate the current configuration, and a
++file `config.log' containing compiler output (useful mainly for
++debugging `configure').
++
++ It can also use an optional file (typically called `config.cache'
++and enabled with `--cache-file=config.cache' or simply `-C') that saves
++the results of its tests to speed up reconfiguring. Caching is
++disabled by default to prevent problems with accidental use of stale
++cache files.
+
+ If you need to do unusual things to compile the package, please try
+ to figure out how `configure' could check whether to do them, and mail
+ diffs or instructions to the address given in the `README' so they can
+-be considered for the next release. If at some point `config.cache'
+-contains results you don't want to keep, you may remove or edit it.
+-
+- The file `configure.in' is used to create `configure' by a program
+-called `autoconf'. You only need `configure.in' if you want to change
+-it or regenerate `configure' using a newer version of `autoconf'.
++be considered for the next release. If you are using the cache, and at
++some point `config.cache' contains results you don't want to keep, you
++may remove or edit it.
++
++ The file `configure.ac' (or `configure.in') is used to create
++`configure' by a program called `autoconf'. You need `configure.ac' if
++you want to change it or regenerate `configure' using a newer version
++of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+- `./configure' to configure the package for your system. If you're
+- using `csh' on an old version of System V, you might need to type
+- `sh ./configure' instead to prevent `csh' from trying to execute
+- `configure' itself.
++ `./configure' to configure the package for your system.
+
+- Running `configure' takes awhile. While running, it prints some
+- messages telling which features it is checking for.
++ Running `configure' might take a while. While running, it prints
++ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -51,62 +83,119 @@
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
++
+ Compilers and Options
+ =====================
+
+ Some systems require unusual options for compilation or linking that
+-the `configure' script does not know about. You can give `configure'
+-initial values for variables by setting them in the environment. Using
+-a Bourne-compatible shell, you can do that on the command line like
+-this:
+- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
++the `configure' script does not know about. Run `./configure --help'
++for details on some of the pertinent environment variables.
++
++ You can give `configure' initial values for configuration parameters
++by setting variables in the command line or in the environment. Here
++is an example:
+
+-Or on systems that have the `env' program, you can do it like this:
+- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
++
++ *Note Defining Variables::, for more details.
+
+ Compiling For Multiple Architectures
+ ====================================
+
+ You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+-own directory. To do this, you must use a version of `make' that
+-supports the `VPATH' variable, such as GNU `make'. `cd' to the
++own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
++
++ With a non-GNU `make', it is safer to compile the package for one
++architecture at a time in the source code directory. After you have
++installed the package for one architecture, use `make distclean' before
++reconfiguring for another architecture.
++
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
+
+- If you have to use a `make' that does not supports the `VPATH'
+-variable, you have to compile the package for one architecture at a time
+-in the source code directory. After you have installed the package for
+-one architecture, use `make distclean' before reconfiguring for another
+-architecture.
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
+
+ Installation Names
+ ==================
+
+- By default, `make install' will install the package's files in
+-`/usr/local/bin', `/usr/local/man', etc. You can specify an
+-installation prefix other than `/usr/local' by giving `configure' the
+-option `--prefix=PATH'.
++ By default, `make install' installs the package's commands under
++`/usr/local/bin', include files under `/usr/local/include', etc. You
++can specify an installation prefix other than `/usr/local' by giving
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+-give `configure' the option `--exec-prefix=PATH', the package will use
+-PATH as the prefix for installing programs and libraries.
+-Documentation and other data files will still use the regular prefix.
++pass the option `--exec-prefix=PREFIX' to `configure', the package uses
++PREFIX as the prefix for installing programs and libraries.
++Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+-options like `--bindir=PATH' to specify different values for particular
++options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
+ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+@@ -119,25 +208,80 @@
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
++Particular systems
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ HP-UX `make' updates targets which have the same time stamps as
++their prerequisites, which makes it generally unusable when shipped
++generated files such as `configure' are involved. Use GNU `make'
++instead.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++ On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'. It is recommended to use the following options:
++
++ ./configure --prefix=/boot/common
++
+ Specifying the System Type
+ ==========================
+
+- There may be some features `configure' can not figure out
+-automatically, but needs to determine by the type of host the package
+-will run on. Usually `configure' can figure that out, but if it prints
+-a message saying it can not guess the host type, give it the
+-`--host=TYPE' option. TYPE can either be a short name for the system
+-type, such as `sun4', or a canonical name with three fields:
++ There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on. Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
++`--build=TYPE' option. TYPE can either be a short name for the system
++type, such as `sun4', or a canonical name which has the form:
++
+ CPU-COMPANY-SYSTEM
+
+-See the file `config.sub' for the possible values of each field. If
++where SYSTEM can have one of these forms:
++
++ OS
++ KERNEL-OS
++
++ See the file `config.sub' for the possible values of each field. If
+ `config.sub' isn't included in this package, then this package doesn't
+-need to know the host type.
++need to know the machine type.
+
+- If you are building compiler tools for cross-compiling, you can also
+-use the `--target=TYPE' option to select the type of system they will
+-produce code for and the `--build=TYPE' option to select the type of
+-system on which you are compiling the package.
++ If you are _building_ compiler tools for cross-compiling, you should
++use the option `--target=TYPE' to select the type of system they will
++produce code for.
++
++ If you want to _use_ a cross compiler, that generates code for a
++platform different from the build platform, you should specify the
++"host" platform (i.e., that on which the generated programs will
++eventually be run) with `--host=TYPE'.
+
+ Sharing Defaults
+ ================
+@@ -150,19 +294,55 @@
+ `CONFIG_SITE' environment variable to the location of the site script.
+ A warning: not all `configure' scripts look for a site script.
+
+-Operation Controls
++Defining Variables
+ ==================
+
++ Variables not defined in a site shell script can be set in the
++environment passed to `configure'. However, some packages may run
++configure again during the build, and the customized values of these
++variables may be lost. In order to avoid this problem, you should set
++them in the `configure' command line, using `VAR=value'. For example:
++
++ ./configure CC=/usr/local2/bin/gcc
++
++causes the specified `gcc' to be used as the C compiler (unless it is
++overridden in the site shell script).
++
++Unfortunately, this technique does not work for `CONFIG_SHELL' due to
++an Autoconf bug. Until the bug is fixed you can use this workaround:
++
++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
++
++`configure' Invocation
++======================
++
+ `configure' recognizes the following options to control how it
+ operates.
+
+-`--cache-file=FILE'
+- Use and save the results of the tests in FILE instead of
+- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
+- debugging `configure'.
+-
+ `--help'
+- Print a summary of the options to `configure', and exit.
++`-h'
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
++
++`--version'
++`-V'
++ Print the version of Autoconf used to generate the `configure'
++ script, and exit.
++
++`--cache-file=FILE'
++ Enable the cache: use and save the results of the tests in FILE,
++ traditionally `config.cache'. FILE defaults to `/dev/null' to
++ disable caching.
++
++`--config-cache'
++`-C'
++ Alias for `--cache-file=config.cache'.
+
+ `--quiet'
+ `--silent'
+@@ -175,8 +355,16 @@
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+-`--version'
+- Print the version of Autoconf used to generate the `configure'
+- script, and exit.
++`--prefix=DIR'
++ Use DIR as the installation prefix. *note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
++
++`configure' also accepts some other, not widely useful, options. Run
++`configure --help' for more details.
+
+-`configure' also accepts some other, not widely useful, options.
+diff -urN BUILD/abook-0.6.0pre2/install-sh abook/install-sh
+--- BUILD/abook-0.6.0pre2/install-sh 2001-03-12 11:13:18.000000000 +0100
++++ abook/install-sh 2013-03-13 15:07:45.000000000 +0100
+@@ -1,250 +1,527 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2011-01-19.21; # UTC
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission. M.I.T. makes no representations about the
+-# suitability of this software for any purpose. It is provided "as is"
+-# without express or implied warranty.
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
+
++nl='
++'
++IFS=" "" $nl"
+
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
+-
+-
+-# put in absolute paths if you don't have them in your path; or use env. vars.
+-
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
+-
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+-chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
+-rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+- case $1 in
+- -c) instcmd="$cpprog"
+- shift
+- continue;;
+-
+- -d) dir_arg=true
+- shift
+- continue;;
+-
+- -m) chmodcmd="$chmodprog $2"
+- shift
+- shift
+- continue;;
+-
+- -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd="$stripprog"
+- shift
+- continue;;
+-
+- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+- shift
+- continue;;
+-
+- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+- shift
+- continue;;
+-
+- *) if [ x"$src" = x ]
+- then
+- src=$1
+- else
+- # this colon is to work around a 386BSD /bin/sh bug
+- :
+- dst=$1
+- fi
+- shift
+- continue;;
+- esac
+-done
+-
+-if [ x"$src" = x ]
+-then
+- echo "install: no input file specified"
+- exit 1
++doit=${DOITPROG-}
++if test -z "$doit"; then
++ doit_exec=exec
+ else
+- true
++ doit_exec=$doit
+ fi
+
+-if [ x"$dir_arg" != x ]; then
+- dst=$src
+- src=""
+-
+- if [ -d $dst ]; then
+- instcmd=:
+- else
+- instcmd=mkdir
+- fi
+-else
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad
+-# if $src (and thus $dsttmp) contains '*'.
+-
+- if [ -f $src -o -d $src ]
+- then
+- true
+- else
+- echo "install: $src does not exist"
+- exit 1
+- fi
+-
+- if [ x"$dst" = x ]
+- then
+- echo "install: no destination specified"
+- exit 1
+- else
+- true
+- fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+- if [ -d $dst ]
+- then
+- dst="$dst"/`basename $src`
+- else
+- true
+- fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
+
+-# Make sure that the destination directory exists.
+-# this part is taken from Noah Friedman's mkinstalldirs script
++posix_mkdir=
+
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+-'
+-IFS="${IFS-${defaultIFS}}"
++# Desired mode of installed file.
++mode=0755
+
+-oIFS="${IFS}"
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS="${oIFS}"
+-
+-pathcomp=''
+-
+-while [ $# -ne 0 ] ; do
+- pathcomp="${pathcomp}${1}"
+- shift
+-
+- if [ ! -d "${pathcomp}" ] ;
+- then
+- $mkdirprog "${pathcomp}"
+- else
+- true
+- fi
++chgrpcmd=
++chmodcmd=$chmodprog
++chowncmd=
++mvcmd=$mvprog
++rmcmd="$rmprog -f"
++stripcmd=
+
+- pathcomp="${pathcomp}/"
++src=
++dst=
++dir_arg=
++dst_arg=
++
++copy_on_change=false
++no_target_directory=
++
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++ --help display this help and exit.
++ --version display version info and exit.
++
++ -c (ignored)
++ -C install only if different (preserve the last data modification time)
++ -d create directories instead of installing files.
++ -g GROUP $chgrpprog installed files to GROUP.
++ -m MODE $chmodprog installed files to MODE.
++ -o USER $chownprog installed files to USER.
++ -s $stripprog installed files.
++ -t DIRECTORY install into DIRECTORY.
++ -T report an error if DSTFILE is a directory.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
++"
++
++while test $# -ne 0; do
++ case $1 in
++ -c) ;;
++
++ -C) copy_on_change=true;;
++
++ -d) dir_arg=true;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift;;
++
++ --help) echo "$usage"; exit $?;;
++
++ -m) mode=$2
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
++
++ -o) chowncmd="$chownprog $2"
++ shift;;
++
++ -s) stripcmd=$stripprog;;
++
++ -t) dst_arg=$2
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
++ shift;;
++
++ -T) no_target_directory=true;;
++
++ --version) echo "$0 $scriptversion"; exit $?;;
++
++ --) shift
++ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
++ esac
++ shift
+ done
++
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dst_arg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dst_arg"
++ shift # fnord
++ fi
++ shift # arg
++ dst_arg=$arg
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
++ done
+ fi
+
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd $dst &&
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+-else
++if test $# -eq 0; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
++fi
+
+-# If we're going to rename the final executable, determine the name now.
++if test -z "$dir_arg"; then
++ do_exit='(exit $ret); exit $ret'
++ trap "ret=129; $do_exit" 1
++ trap "ret=130; $do_exit" 2
++ trap "ret=141; $do_exit" 13
++ trap "ret=143; $do_exit" 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
+
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename $dst`
++for src
++do
++ # Protect names problematic for `test' and other utilities.
++ case $src in
++ -* | [=\(\)!]) src=./$src;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ dstdir=$dst
++ test -d "$dstdir"
++ dstdir_status=$?
++ else
++
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dst_arg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++ dst=$dst_arg
++
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dst_arg: Is a directory" >&2
++ exit 1
++ fi
++ dstdir=$dst
++ dst=$dstdir/`basename "$src"`
++ dstdir_status=0
++ else
++ # Prefer dirname, but fall back on a substitute if dirname fails.
++ dstdir=`
++ (dirname "$dst") 2>/dev/null ||
++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$dst" : 'X\(//\)[^/]' \| \
++ X"$dst" : 'X\(//\)$' \| \
++ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
++ echo X"$dst" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
++ `
++
++ test -d "$dstdir"
++ dstdir_status=$?
++ fi
++ fi
++
++ obsolete_mkdir_used=false
++
++ if test $dstdir_status != 0; then
++ case $posix_mkdir in
++ '')
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
++
++ # With -d, create the new directory with the user-specified mode.
++ # Otherwise, rely on $mkdir_umask.
++ if test -n "$dir_arg"; then
++ mkdir_mode=-m$mode
+ else
+- dstfile=`basename $dst $transformbasename |
+- sed $transformarg`$transformbasename
++ mkdir_mode=
+ fi
+
+-# don't allow the sed command to completely eliminate the filename
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
+
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename $dst`
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
++ then :
++ else
++
++ # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # or it failed possibly due to a race condition. Create the
++ # directory the slow way, step by step, checking for races as we go.
++
++ case $dstdir in
++ /*) prefix='/';;
++ [-=\(\)!]*) prefix='./';;
++ *) prefix='';;
++ esac
++
++ eval "$initialize_posix_glob"
++
++ oIFS=$IFS
++ IFS=/
++ $posix_glob set -f
++ set fnord $dstdir
++ shift
++ $posix_glob set +f
++ IFS=$oIFS
++
++ prefixes=
++
++ for d
++ do
++ test X"$d" = X && continue
++
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
+ else
+- true
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
+ fi
++ prefix=$prefix/
++ done
+
+-# Make a temp file name in the proper directory.
+-
+- dsttmp=$dstdir/#inst.$$#
+-
+-# Move or copy the file name to the temp name
+-
+- $doit $instcmd $src $dsttmp &&
+-
+- trap "rm -f ${dsttmp}" 0 &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing. If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+-
+-# Now rename the file to the real destination.
+-
+- $doit $rmcmd -f $dstdir/$dstfile &&
+- $doit $mvcmd $dsttmp $dstdir/$dstfile
+-
+-fi &&
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
++ fi
++ fi
++ fi
++
++ if test -n "$dir_arg"; then
++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
++ else
++
++ # Make a couple of temp file names in the proper directory.
++ dsttmp=$dstdir/_inst.$$_
++ rmtmp=$dstdir/_rm.$$_
++
++ # Trap to clean up those temp files at exit.
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++
++ # Copy the file name to the temp name.
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
++
++ # and set any options; do chmod last to preserve setuid bits.
++ #
++ # If any of these fail, we abort the whole thing. If we want to
++ # ignore errors from any of these, just make sure not to ignore
++ # errors from the above "$doit $cpprog $src $dsttmp" command.
++ #
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++
++ # If -C, don't bother to copy if it wouldn't change the file.
++ if $copy_on_change &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob set +f &&
++
++ test "$old" = "$new" &&
++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++ then
++ rm -f "$dsttmp"
++ else
++ # Rename the file to the real destination.
++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
++
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++ {
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ fi || exit 1
+
++ trap '' 0
++ fi
++done
+
+-exit 0
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
+diff -urN BUILD/abook-0.6.0pre2/intl/bindtextdom.c abook/intl/bindtextdom.c
+--- BUILD/abook-0.6.0pre2/intl/bindtextdom.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/bindtextdom.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,363 +0,0 @@
+-/* Implementation of the bindtextdomain(3) function
+- Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stddef.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-#include "gettextP.h"
+-
+-#ifdef _LIBC
+-/* We have to handle multi-threaded applications. */
+-# include <bits/libc-lock.h>
+-#else
+-/* Provide dummy implementation if this is outside glibc. */
+-# define __libc_rwlock_define(CLASS, NAME)
+-# define __libc_rwlock_wrlock(NAME)
+-# define __libc_rwlock_unlock(NAME)
+-#endif
+-
+-/* The internal variables in the standalone libintl.a must have different
+- names than the internal variables in GNU libc, otherwise programs
+- using libintl.a cannot be linked statically. */
+-#if !defined _LIBC
+-# define _nl_default_dirname libintl_nl_default_dirname
+-# define _nl_domain_bindings libintl_nl_domain_bindings
+-#endif
+-
+-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
+-#ifndef offsetof
+-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Contains the default location of the message catalogs. */
+-extern const char _nl_default_dirname[];
+-#ifdef _LIBC
+-extern const char _nl_default_dirname_internal[] attribute_hidden;
+-#else
+-# define INTUSE(name) name
+-#endif
+-
+-/* List with bindings of specific domains. */
+-extern struct binding *_nl_domain_bindings;
+-
+-/* Lock variable to protect the global data in the gettext implementation. */
+-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+-
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define BINDTEXTDOMAIN __bindtextdomain
+-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
+-# ifndef strdup
+-# define strdup(str) __strdup (str)
+-# endif
+-#else
+-# define BINDTEXTDOMAIN libintl_bindtextdomain
+-# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
+-#endif
+-
+-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
+- to be used for the DOMAINNAME message catalog.
+- If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
+- modified, only the current value is returned.
+- If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
+- modified nor returned. */
+-static void
+-set_binding_values (const char *domainname,
+- const char **dirnamep, const char **codesetp)
+-{
+- struct binding *binding;
+- int modified;
+-
+- /* Some sanity checks. */
+- if (domainname == NULL || domainname[0] == '\0')
+- {
+- if (dirnamep)
+- *dirnamep = NULL;
+- if (codesetp)
+- *codesetp = NULL;
+- return;
+- }
+-
+- __libc_rwlock_wrlock (_nl_state_lock);
+-
+- modified = 0;
+-
+- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+- {
+- int compare = strcmp (domainname, binding->domainname);
+- if (compare == 0)
+- /* We found it! */
+- break;
+- if (compare < 0)
+- {
+- /* It is not in the list. */
+- binding = NULL;
+- break;
+- }
+- }
+-
+- if (binding != NULL)
+- {
+- if (dirnamep)
+- {
+- const char *dirname = *dirnamep;
+-
+- if (dirname == NULL)
+- /* The current binding has be to returned. */
+- *dirnamep = binding->dirname;
+- else
+- {
+- /* The domain is already bound. If the new value and the old
+- one are equal we simply do nothing. Otherwise replace the
+- old binding. */
+- char *result = binding->dirname;
+- if (strcmp (dirname, result) != 0)
+- {
+- if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+- result = (char *) INTUSE(_nl_default_dirname);
+- else
+- {
+-#if defined _LIBC || defined HAVE_STRDUP
+- result = strdup (dirname);
+-#else
+- size_t len = strlen (dirname) + 1;
+- result = (char *) malloc (len);
+- if (__builtin_expect (result != NULL, 1))
+- memcpy (result, dirname, len);
+-#endif
+- }
+-
+- if (__builtin_expect (result != NULL, 1))
+- {
+- if (binding->dirname != INTUSE(_nl_default_dirname))
+- free (binding->dirname);
+-
+- binding->dirname = result;
+- modified = 1;
+- }
+- }
+- *dirnamep = result;
+- }
+- }
+-
+- if (codesetp)
+- {
+- const char *codeset = *codesetp;
+-
+- if (codeset == NULL)
+- /* The current binding has be to returned. */
+- *codesetp = binding->codeset;
+- else
+- {
+- /* The domain is already bound. If the new value and the old
+- one are equal we simply do nothing. Otherwise replace the
+- old binding. */
+- char *result = binding->codeset;
+- if (result == NULL || strcmp (codeset, result) != 0)
+- {
+-#if defined _LIBC || defined HAVE_STRDUP
+- result = strdup (codeset);
+-#else
+- size_t len = strlen (codeset) + 1;
+- result = (char *) malloc (len);
+- if (__builtin_expect (result != NULL, 1))
+- memcpy (result, codeset, len);
+-#endif
+-
+- if (__builtin_expect (result != NULL, 1))
+- {
+- if (binding->codeset != NULL)
+- free (binding->codeset);
+-
+- binding->codeset = result;
+- binding->codeset_cntr++;
+- modified = 1;
+- }
+- }
+- *codesetp = result;
+- }
+- }
+- }
+- else if ((dirnamep == NULL || *dirnamep == NULL)
+- && (codesetp == NULL || *codesetp == NULL))
+- {
+- /* Simply return the default values. */
+- if (dirnamep)
+- *dirnamep = INTUSE(_nl_default_dirname);
+- if (codesetp)
+- *codesetp = NULL;
+- }
+- else
+- {
+- /* We have to create a new binding. */
+- size_t len = strlen (domainname) + 1;
+- struct binding *new_binding =
+- (struct binding *) malloc (offsetof (struct binding, domainname) + len);
+-
+- if (__builtin_expect (new_binding == NULL, 0))
+- goto failed;
+-
+- memcpy (new_binding->domainname, domainname, len);
+-
+- if (dirnamep)
+- {
+- const char *dirname = *dirnamep;
+-
+- if (dirname == NULL)
+- /* The default value. */
+- dirname = INTUSE(_nl_default_dirname);
+- else
+- {
+- if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+- dirname = INTUSE(_nl_default_dirname);
+- else
+- {
+- char *result;
+-#if defined _LIBC || defined HAVE_STRDUP
+- result = strdup (dirname);
+- if (__builtin_expect (result == NULL, 0))
+- goto failed_dirname;
+-#else
+- size_t len = strlen (dirname) + 1;
+- result = (char *) malloc (len);
+- if (__builtin_expect (result == NULL, 0))
+- goto failed_dirname;
+- memcpy (result, dirname, len);
+-#endif
+- dirname = result;
+- }
+- }
+- *dirnamep = dirname;
+- new_binding->dirname = (char *) dirname;
+- }
+- else
+- /* The default value. */
+- new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
+-
+- new_binding->codeset_cntr = 0;
+-
+- if (codesetp)
+- {
+- const char *codeset = *codesetp;
+-
+- if (codeset != NULL)
+- {
+- char *result;
+-
+-#if defined _LIBC || defined HAVE_STRDUP
+- result = strdup (codeset);
+- if (__builtin_expect (result == NULL, 0))
+- goto failed_codeset;
+-#else
+- size_t len = strlen (codeset) + 1;
+- result = (char *) malloc (len);
+- if (__builtin_expect (result == NULL, 0))
+- goto failed_codeset;
+- memcpy (result, codeset, len);
+-#endif
+- codeset = result;
+- new_binding->codeset_cntr++;
+- }
+- *codesetp = codeset;
+- new_binding->codeset = (char *) codeset;
+- }
+- else
+- new_binding->codeset = NULL;
+-
+- /* Now enqueue it. */
+- if (_nl_domain_bindings == NULL
+- || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
+- {
+- new_binding->next = _nl_domain_bindings;
+- _nl_domain_bindings = new_binding;
+- }
+- else
+- {
+- binding = _nl_domain_bindings;
+- while (binding->next != NULL
+- && strcmp (domainname, binding->next->domainname) > 0)
+- binding = binding->next;
+-
+- new_binding->next = binding->next;
+- binding->next = new_binding;
+- }
+-
+- modified = 1;
+-
+- /* Here we deal with memory allocation failures. */
+- if (0)
+- {
+- failed_codeset:
+- if (new_binding->dirname != INTUSE(_nl_default_dirname))
+- free (new_binding->dirname);
+- failed_dirname:
+- free (new_binding);
+- failed:
+- if (dirnamep)
+- *dirnamep = NULL;
+- if (codesetp)
+- *codesetp = NULL;
+- }
+- }
+-
+- /* If we modified any binding, we flush the caches. */
+- if (modified)
+- ++_nl_msg_cat_cntr;
+-
+- __libc_rwlock_unlock (_nl_state_lock);
+-}
+-
+-/* Specify that the DOMAINNAME message catalog will be found
+- in DIRNAME rather than in the system locale data base. */
+-char *
+-BINDTEXTDOMAIN (const char *domainname, const char *dirname)
+-{
+- set_binding_values (domainname, &dirname, NULL);
+- return (char *) dirname;
+-}
+-
+-/* Specify the character encoding in which the messages from the
+- DOMAINNAME message catalog will be returned. */
+-char *
+-BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
+-{
+- set_binding_values (domainname, NULL, &codeset);
+- return (char *) codeset;
+-}
+-
+-#ifdef _LIBC
+-/* Aliases for function names in GNU C Library. */
+-weak_alias (__bindtextdomain, bindtextdomain);
+-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/ChangeLog abook/intl/ChangeLog
+--- BUILD/abook-0.6.0pre2/intl/ChangeLog 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-2005-04-11 GNU <bug-gnu-gettext@gnu.org>
+-
+- * Version 0.14.4 released.
+-
+diff -urN BUILD/abook-0.6.0pre2/intl/config.charset abook/intl/config.charset
+--- BUILD/abook-0.6.0pre2/intl/config.charset 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/config.charset 1970-01-01 01:00:00.000000000 +0100
+@@ -1,638 +0,0 @@
+-#! /bin/sh
+-# Output a system dependent table of character encoding aliases.
+-#
+-# Copyright (C) 2000-2004 Free Software Foundation, Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Library General Public License as published
+-# by the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# Library General Public License for more details.
+-#
+-# You should have received a copy of the GNU Library General Public
+-# License along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
+-#
+-# The table consists of lines of the form
+-# ALIAS CANONICAL
+-#
+-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+-# ALIAS is compared in a case sensitive way.
+-#
+-# CANONICAL is the GNU canonical name for this character encoding.
+-# It must be an encoding supported by libiconv. Support by GNU libc is
+-# also desirable. CANONICAL is case insensitive. Usually an upper case
+-# MIME charset name is preferred.
+-# The current list of GNU canonical charset names is as follows.
+-#
+-# name MIME? used by which systems
+-# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
+-# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
+-# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
+-# ISO-8859-3 Y glibc solaris
+-# ISO-8859-4 Y osf solaris freebsd darwin
+-# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
+-# ISO-8859-6 Y glibc aix hpux solaris
+-# ISO-8859-7 Y glibc aix hpux irix osf solaris darwin
+-# ISO-8859-8 Y glibc aix hpux osf solaris
+-# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin
+-# ISO-8859-13 glibc darwin
+-# ISO-8859-14 glibc
+-# ISO-8859-15 glibc aix osf solaris freebsd darwin
+-# KOI8-R Y glibc solaris freebsd darwin
+-# KOI8-U Y glibc freebsd darwin
+-# KOI8-T glibc
+-# CP437 dos
+-# CP775 dos
+-# CP850 aix osf dos
+-# CP852 dos
+-# CP855 dos
+-# CP856 aix
+-# CP857 dos
+-# CP861 dos
+-# CP862 dos
+-# CP864 dos
+-# CP865 dos
+-# CP866 freebsd darwin dos
+-# CP869 dos
+-# CP874 woe32 dos
+-# CP922 aix
+-# CP932 aix woe32 dos
+-# CP943 aix
+-# CP949 osf woe32 dos
+-# CP950 woe32 dos
+-# CP1046 aix
+-# CP1124 aix
+-# CP1125 dos
+-# CP1129 aix
+-# CP1250 woe32
+-# CP1251 glibc solaris darwin woe32
+-# CP1252 aix woe32
+-# CP1253 woe32
+-# CP1254 woe32
+-# CP1255 glibc woe32
+-# CP1256 woe32
+-# CP1257 woe32
+-# GB2312 Y glibc aix hpux irix solaris freebsd darwin
+-# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
+-# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
+-# EUC-TW glibc aix hpux irix osf solaris
+-# BIG5 Y glibc aix hpux osf solaris freebsd darwin
+-# BIG5-HKSCS glibc solaris
+-# GBK glibc aix osf solaris woe32 dos
+-# GB18030 glibc solaris
+-# SHIFT_JIS Y hpux osf solaris freebsd darwin
+-# JOHAB glibc solaris woe32
+-# TIS-620 glibc aix hpux osf solaris
+-# VISCII Y glibc
+-# TCVN5712-1 glibc
+-# GEORGIAN-PS glibc
+-# HP-ROMAN8 hpux
+-# HP-ARABIC8 hpux
+-# HP-GREEK8 hpux
+-# HP-HEBREW8 hpux
+-# HP-TURKISH8 hpux
+-# HP-KANA8 hpux
+-# DEC-KANJI osf
+-# DEC-HANYU osf
+-# UTF-8 Y glibc aix hpux osf solaris darwin
+-#
+-# Note: Names which are not marked as being a MIME name should not be used in
+-# Internet protocols for information interchange (mail, news, etc.).
+-#
+-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+-# must understand both names and treat them as equivalent.
+-#
+-# The first argument passed to this file is the canonical host specification,
+-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+-# or
+-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+-
+-host="$1"
+-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+-echo "# This file contains a table of character encoding aliases,"
+-echo "# suitable for operating system '${os}'."
+-echo "# It was automatically generated from config.charset."
+-# List of references, updated during installation:
+-echo "# Packages using this file: "
+-case "$os" in
+- linux-gnulibc1*)
+- # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+- # localcharset.c falls back to using the full locale name
+- # from the environment variables.
+- echo "C ASCII"
+- echo "POSIX ASCII"
+- for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+- en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+- en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+- es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+- et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+- fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+- it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+- sv_FI sv_SE; do
+- echo "$l ISO-8859-1"
+- echo "$l.iso-8859-1 ISO-8859-1"
+- echo "$l.iso-8859-15 ISO-8859-15"
+- echo "$l.iso-8859-15@euro ISO-8859-15"
+- echo "$l@euro ISO-8859-15"
+- echo "$l.cp-437 CP437"
+- echo "$l.cp-850 CP850"
+- echo "$l.cp-1252 CP1252"
+- echo "$l.cp-1252@euro CP1252"
+- #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+- echo "$l.utf-8 UTF-8"
+- echo "$l.utf-8@euro UTF-8"
+- done
+- for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+- sl_SI sr sr_CS sr_YU; do
+- echo "$l ISO-8859-2"
+- echo "$l.iso-8859-2 ISO-8859-2"
+- echo "$l.cp-852 CP852"
+- echo "$l.cp-1250 CP1250"
+- echo "$l.utf-8 UTF-8"
+- done
+- for l in mk mk_MK ru ru_RU; do
+- echo "$l ISO-8859-5"
+- echo "$l.iso-8859-5 ISO-8859-5"
+- echo "$l.koi8-r KOI8-R"
+- echo "$l.cp-866 CP866"
+- echo "$l.cp-1251 CP1251"
+- echo "$l.utf-8 UTF-8"
+- done
+- for l in ar ar_SA; do
+- echo "$l ISO-8859-6"
+- echo "$l.iso-8859-6 ISO-8859-6"
+- echo "$l.cp-864 CP864"
+- #echo "$l.cp-868 CP868" # not a commonly used encoding
+- echo "$l.cp-1256 CP1256"
+- echo "$l.utf-8 UTF-8"
+- done
+- for l in el el_GR gr gr_GR; do
+- echo "$l ISO-8859-7"
+- echo "$l.iso-8859-7 ISO-8859-7"
+- echo "$l.cp-869 CP869"
+- echo "$l.cp-1253 CP1253"
+- echo "$l.cp-1253@euro CP1253"
+- echo "$l.utf-8 UTF-8"
+- echo "$l.utf-8@euro UTF-8"
+- done
+- for l in he he_IL iw iw_IL; do
+- echo "$l ISO-8859-8"
+- echo "$l.iso-8859-8 ISO-8859-8"
+- echo "$l.cp-862 CP862"
+- echo "$l.cp-1255 CP1255"
+- echo "$l.utf-8 UTF-8"
+- done
+- for l in tr tr_TR; do
+- echo "$l ISO-8859-9"
+- echo "$l.iso-8859-9 ISO-8859-9"
+- echo "$l.cp-857 CP857"
+- echo "$l.cp-1254 CP1254"
+- echo "$l.utf-8 UTF-8"
+- done
+- for l in lt lt_LT lv lv_LV; do
+- #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+- echo "$l ISO-8859-13"
+- done
+- for l in ru_UA uk uk_UA; do
+- echo "$l KOI8-U"
+- done
+- for l in zh zh_CN; do
+- #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+- echo "$l GB2312"
+- done
+- for l in ja ja_JP ja_JP.EUC; do
+- echo "$l EUC-JP"
+- done
+- for l in ko ko_KR; do
+- echo "$l EUC-KR"
+- done
+- for l in th th_TH; do
+- echo "$l TIS-620"
+- done
+- for l in fa fa_IR; do
+- #echo "$l ISIRI-3342" # a broken encoding
+- echo "$l.utf-8 UTF-8"
+- done
+- ;;
+- linux* | *-gnu*)
+- # With glibc-2.1 or newer, we don't need any canonicalization,
+- # because glibc has iconv and both glibc and libiconv support all
+- # GNU canonical names directly. Therefore, the Makefile does not
+- # need to install the alias file at all.
+- # The following applies only to glibc-2.0.x and older libcs.
+- echo "ISO_646.IRV:1983 ASCII"
+- ;;
+- aix*)
+- echo "ISO8859-1 ISO-8859-1"
+- echo "ISO8859-2 ISO-8859-2"
+- echo "ISO8859-5 ISO-8859-5"
+- echo "ISO8859-6 ISO-8859-6"
+- echo "ISO8859-7 ISO-8859-7"
+- echo "ISO8859-8 ISO-8859-8"
+- echo "ISO8859-9 ISO-8859-9"
+- echo "ISO8859-15 ISO-8859-15"
+- echo "IBM-850 CP850"
+- echo "IBM-856 CP856"
+- echo "IBM-921 ISO-8859-13"
+- echo "IBM-922 CP922"
+- echo "IBM-932 CP932"
+- echo "IBM-943 CP943"
+- echo "IBM-1046 CP1046"
+- echo "IBM-1124 CP1124"
+- echo "IBM-1129 CP1129"
+- echo "IBM-1252 CP1252"
+- echo "IBM-eucCN GB2312"
+- echo "IBM-eucJP EUC-JP"
+- echo "IBM-eucKR EUC-KR"
+- echo "IBM-eucTW EUC-TW"
+- echo "big5 BIG5"
+- echo "GBK GBK"
+- echo "TIS-620 TIS-620"
+- echo "UTF-8 UTF-8"
+- ;;
+- hpux*)
+- echo "iso88591 ISO-8859-1"
+- echo "iso88592 ISO-8859-2"
+- echo "iso88595 ISO-8859-5"
+- echo "iso88596 ISO-8859-6"
+- echo "iso88597 ISO-8859-7"
+- echo "iso88598 ISO-8859-8"
+- echo "iso88599 ISO-8859-9"
+- echo "iso885915 ISO-8859-15"
+- echo "roman8 HP-ROMAN8"
+- echo "arabic8 HP-ARABIC8"
+- echo "greek8 HP-GREEK8"
+- echo "hebrew8 HP-HEBREW8"
+- echo "turkish8 HP-TURKISH8"
+- echo "kana8 HP-KANA8"
+- echo "tis620 TIS-620"
+- echo "big5 BIG5"
+- echo "eucJP EUC-JP"
+- echo "eucKR EUC-KR"
+- echo "eucTW EUC-TW"
+- echo "hp15CN GB2312"
+- #echo "ccdc ?" # what is this?
+- echo "SJIS SHIFT_JIS"
+- echo "utf8 UTF-8"
+- ;;
+- irix*)
+- echo "ISO8859-1 ISO-8859-1"
+- echo "ISO8859-2 ISO-8859-2"
+- echo "ISO8859-5 ISO-8859-5"
+- echo "ISO8859-7 ISO-8859-7"
+- echo "ISO8859-9 ISO-8859-9"
+- echo "eucCN GB2312"
+- echo "eucJP EUC-JP"
+- echo "eucKR EUC-KR"
+- echo "eucTW EUC-TW"
+- ;;
+- osf*)
+- echo "ISO8859-1 ISO-8859-1"
+- echo "ISO8859-2 ISO-8859-2"
+- echo "ISO8859-4 ISO-8859-4"
+- echo "ISO8859-5 ISO-8859-5"
+- echo "ISO8859-7 ISO-8859-7"
+- echo "ISO8859-8 ISO-8859-8"
+- echo "ISO8859-9 ISO-8859-9"
+- echo "ISO8859-15 ISO-8859-15"
+- echo "cp850 CP850"
+- echo "big5 BIG5"
+- echo "dechanyu DEC-HANYU"
+- echo "dechanzi GB2312"
+- echo "deckanji DEC-KANJI"
+- echo "deckorean EUC-KR"
+- echo "eucJP EUC-JP"
+- echo "eucKR EUC-KR"
+- echo "eucTW EUC-TW"
+- echo "GBK GBK"
+- echo "KSC5601 CP949"
+- echo "sdeckanji EUC-JP"
+- echo "SJIS SHIFT_JIS"
+- echo "TACTIS TIS-620"
+- echo "UTF-8 UTF-8"
+- ;;
+- solaris*)
+- echo "646 ASCII"
+- echo "ISO8859-1 ISO-8859-1"
+- echo "ISO8859-2 ISO-8859-2"
+- echo "ISO8859-3 ISO-8859-3"
+- echo "ISO8859-4 ISO-8859-4"
+- echo "ISO8859-5 ISO-8859-5"
+- echo "ISO8859-6 ISO-8859-6"
+- echo "ISO8859-7 ISO-8859-7"
+- echo "ISO8859-8 ISO-8859-8"
+- echo "ISO8859-9 ISO-8859-9"
+- echo "ISO8859-15 ISO-8859-15"
+- echo "koi8-r KOI8-R"
+- echo "ansi-1251 CP1251"
+- echo "BIG5 BIG5"
+- echo "Big5-HKSCS BIG5-HKSCS"
+- echo "gb2312 GB2312"
+- echo "GBK GBK"
+- echo "GB18030 GB18030"
+- echo "cns11643 EUC-TW"
+- echo "5601 EUC-KR"
+- echo "ko_KR.johap92 JOHAB"
+- echo "eucJP EUC-JP"
+- echo "PCK SHIFT_JIS"
+- echo "TIS620.2533 TIS-620"
+- #echo "sun_eu_greek ?" # what is this?
+- echo "UTF-8 UTF-8"
+- ;;
+- freebsd* | os2*)
+- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+- # localcharset.c falls back to using the full locale name
+- # from the environment variables.
+- # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+- # reuse FreeBSD's locale data for OS/2.
+- echo "C ASCII"
+- echo "US-ASCII ASCII"
+- for l in la_LN lt_LN; do
+- echo "$l.ASCII ASCII"
+- done
+- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+- lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+- echo "$l.ISO_8859-1 ISO-8859-1"
+- echo "$l.DIS_8859-15 ISO-8859-15"
+- done
+- for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+- echo "$l.ISO_8859-2 ISO-8859-2"
+- done
+- for l in la_LN lt_LT; do
+- echo "$l.ISO_8859-4 ISO-8859-4"
+- done
+- for l in ru_RU ru_SU; do
+- echo "$l.KOI8-R KOI8-R"
+- echo "$l.ISO_8859-5 ISO-8859-5"
+- echo "$l.CP866 CP866"
+- done
+- echo "uk_UA.KOI8-U KOI8-U"
+- echo "zh_TW.BIG5 BIG5"
+- echo "zh_TW.Big5 BIG5"
+- echo "zh_CN.EUC GB2312"
+- echo "ja_JP.EUC EUC-JP"
+- echo "ja_JP.SJIS SHIFT_JIS"
+- echo "ja_JP.Shift_JIS SHIFT_JIS"
+- echo "ko_KR.EUC EUC-KR"
+- ;;
+- netbsd*)
+- echo "646 ASCII"
+- echo "ISO8859-1 ISO-8859-1"
+- echo "ISO8859-2 ISO-8859-2"
+- echo "ISO8859-4 ISO-8859-4"
+- echo "ISO8859-5 ISO-8859-5"
+- echo "ISO8859-15 ISO-8859-15"
+- echo "eucCN GB2312"
+- echo "eucJP EUC-JP"
+- echo "eucKR EUC-KR"
+- echo "eucTW EUC-TW"
+- echo "BIG5 BIG5"
+- echo "SJIS SHIFT_JIS"
+- ;;
+- darwin[56]*)
+- # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+- # localcharset.c falls back to using the full locale name
+- # from the environment variables.
+- echo "C ASCII"
+- for l in en_AU en_CA en_GB en_US la_LN; do
+- echo "$l.US-ASCII ASCII"
+- done
+- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+- nl_NL no_NO pt_PT sv_SE; do
+- echo "$l ISO-8859-1"
+- echo "$l.ISO8859-1 ISO-8859-1"
+- echo "$l.ISO8859-15 ISO-8859-15"
+- done
+- for l in la_LN; do
+- echo "$l.ISO8859-1 ISO-8859-1"
+- echo "$l.ISO8859-15 ISO-8859-15"
+- done
+- for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+- echo "$l.ISO8859-2 ISO-8859-2"
+- done
+- for l in la_LN lt_LT; do
+- echo "$l.ISO8859-4 ISO-8859-4"
+- done
+- for l in ru_RU; do
+- echo "$l.KOI8-R KOI8-R"
+- echo "$l.ISO8859-5 ISO-8859-5"
+- echo "$l.CP866 CP866"
+- done
+- for l in bg_BG; do
+- echo "$l.CP1251 CP1251"
+- done
+- echo "uk_UA.KOI8-U KOI8-U"
+- echo "zh_TW.BIG5 BIG5"
+- echo "zh_TW.Big5 BIG5"
+- echo "zh_CN.EUC GB2312"
+- echo "ja_JP.EUC EUC-JP"
+- echo "ja_JP.SJIS SHIFT_JIS"
+- echo "ko_KR.EUC EUC-KR"
+- ;;
+- darwin*)
+- # Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
+- # - It returns the empty string when LANG is set to a locale of the
+- # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+- # LC_CTYPE file.
+- # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+- # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+- # - The documentation says:
+- # "... all code that calls BSD system routines should ensure
+- # that the const *char parameters of these routines are in UTF-8
+- # encoding. All BSD system functions expect their string
+- # parameters to be in UTF-8 encoding and nothing else."
+- # It also says
+- # "An additional caveat is that string parameters for files,
+- # paths, and other file-system entities must be in canonical
+- # UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+- # characters are decomposed ..."
+- # but this is not true: You can pass non-decomposed UTF-8 strings
+- # to file system functions, and it is the OS which will convert
+- # them to decomposed UTF-8 before accessing the file system.
+- # - The Apple Terminal application displays UTF-8 by default.
+- # - However, other applications are free to use different encodings:
+- # - xterm uses ISO-8859-1 by default.
+- # - TextEdit uses MacRoman by default.
+- # We prefer UTF-8 over decomposed UTF-8-MAC because one should
+- # minimize the use of decomposed Unicode. Unfortunately, through the
+- # Darwin file system, decomposed UTF-8 strings are leaked into user
+- # space nevertheless.
+- echo "* UTF-8"
+- ;;
+- beos*)
+- # BeOS has a single locale, and it has UTF-8 encoding.
+- echo "* UTF-8"
+- ;;
+- msdosdjgpp*)
+- # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+- # localcharset.c falls back to using the full locale name
+- # from the environment variables.
+- echo "#"
+- echo "# The encodings given here may not all be correct."
+- echo "# If you find that the encoding given for your language and"
+- echo "# country is not the one your DOS machine actually uses, just"
+- echo "# correct it in this file, and send a mail to"
+- echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+- echo "# and Bruno Haible <bruno@clisp.org>."
+- echo "#"
+- echo "C ASCII"
+- # ISO-8859-1 languages
+- echo "ca CP850"
+- echo "ca_ES CP850"
+- echo "da CP865" # not CP850 ??
+- echo "da_DK CP865" # not CP850 ??
+- echo "de CP850"
+- echo "de_AT CP850"
+- echo "de_CH CP850"
+- echo "de_DE CP850"
+- echo "en CP850"
+- echo "en_AU CP850" # not CP437 ??
+- echo "en_CA CP850"
+- echo "en_GB CP850"
+- echo "en_NZ CP437"
+- echo "en_US CP437"
+- echo "en_ZA CP850" # not CP437 ??
+- echo "es CP850"
+- echo "es_AR CP850"
+- echo "es_BO CP850"
+- echo "es_CL CP850"
+- echo "es_CO CP850"
+- echo "es_CR CP850"
+- echo "es_CU CP850"
+- echo "es_DO CP850"
+- echo "es_EC CP850"
+- echo "es_ES CP850"
+- echo "es_GT CP850"
+- echo "es_HN CP850"
+- echo "es_MX CP850"
+- echo "es_NI CP850"
+- echo "es_PA CP850"
+- echo "es_PY CP850"
+- echo "es_PE CP850"
+- echo "es_SV CP850"
+- echo "es_UY CP850"
+- echo "es_VE CP850"
+- echo "et CP850"
+- echo "et_EE CP850"
+- echo "eu CP850"
+- echo "eu_ES CP850"
+- echo "fi CP850"
+- echo "fi_FI CP850"
+- echo "fr CP850"
+- echo "fr_BE CP850"
+- echo "fr_CA CP850"
+- echo "fr_CH CP850"
+- echo "fr_FR CP850"
+- echo "ga CP850"
+- echo "ga_IE CP850"
+- echo "gd CP850"
+- echo "gd_GB CP850"
+- echo "gl CP850"
+- echo "gl_ES CP850"
+- echo "id CP850" # not CP437 ??
+- echo "id_ID CP850" # not CP437 ??
+- echo "is CP861" # not CP850 ??
+- echo "is_IS CP861" # not CP850 ??
+- echo "it CP850"
+- echo "it_CH CP850"
+- echo "it_IT CP850"
+- echo "lt CP775"
+- echo "lt_LT CP775"
+- echo "lv CP775"
+- echo "lv_LV CP775"
+- echo "nb CP865" # not CP850 ??
+- echo "nb_NO CP865" # not CP850 ??
+- echo "nl CP850"
+- echo "nl_BE CP850"
+- echo "nl_NL CP850"
+- echo "nn CP865" # not CP850 ??
+- echo "nn_NO CP865" # not CP850 ??
+- echo "no CP865" # not CP850 ??
+- echo "no_NO CP865" # not CP850 ??
+- echo "pt CP850"
+- echo "pt_BR CP850"
+- echo "pt_PT CP850"
+- echo "sv CP850"
+- echo "sv_SE CP850"
+- # ISO-8859-2 languages
+- echo "cs CP852"
+- echo "cs_CZ CP852"
+- echo "hr CP852"
+- echo "hr_HR CP852"
+- echo "hu CP852"
+- echo "hu_HU CP852"
+- echo "pl CP852"
+- echo "pl_PL CP852"
+- echo "ro CP852"
+- echo "ro_RO CP852"
+- echo "sk CP852"
+- echo "sk_SK CP852"
+- echo "sl CP852"
+- echo "sl_SI CP852"
+- echo "sq CP852"
+- echo "sq_AL CP852"
+- echo "sr CP852" # CP852 or CP866 or CP855 ??
+- echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
+- echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+- # ISO-8859-3 languages
+- echo "mt CP850"
+- echo "mt_MT CP850"
+- # ISO-8859-5 languages
+- echo "be CP866"
+- echo "be_BE CP866"
+- echo "bg CP866" # not CP855 ??
+- echo "bg_BG CP866" # not CP855 ??
+- echo "mk CP866" # not CP855 ??
+- echo "mk_MK CP866" # not CP855 ??
+- echo "ru CP866"
+- echo "ru_RU CP866"
+- echo "uk CP1125"
+- echo "uk_UA CP1125"
+- # ISO-8859-6 languages
+- echo "ar CP864"
+- echo "ar_AE CP864"
+- echo "ar_DZ CP864"
+- echo "ar_EG CP864"
+- echo "ar_IQ CP864"
+- echo "ar_IR CP864"
+- echo "ar_JO CP864"
+- echo "ar_KW CP864"
+- echo "ar_MA CP864"
+- echo "ar_OM CP864"
+- echo "ar_QA CP864"
+- echo "ar_SA CP864"
+- echo "ar_SY CP864"
+- # ISO-8859-7 languages
+- echo "el CP869"
+- echo "el_GR CP869"
+- # ISO-8859-8 languages
+- echo "he CP862"
+- echo "he_IL CP862"
+- # ISO-8859-9 languages
+- echo "tr CP857"
+- echo "tr_TR CP857"
+- # Japanese
+- echo "ja CP932"
+- echo "ja_JP CP932"
+- # Chinese
+- echo "zh_CN GBK"
+- echo "zh_TW CP950" # not CP938 ??
+- # Korean
+- echo "kr CP949" # not CP934 ??
+- echo "kr_KR CP949" # not CP934 ??
+- # Thai
+- echo "th CP874"
+- echo "th_TH CP874"
+- # Other
+- echo "eo CP850"
+- echo "eo_EO CP850"
+- ;;
+-esac
+diff -urN BUILD/abook-0.6.0pre2/intl/dcgettext.c abook/intl/dcgettext.c
+--- BUILD/abook-0.6.0pre2/intl/dcgettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/dcgettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,56 +0,0 @@
+-/* Implementation of the dcgettext(3) function.
+- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include "gettextP.h"
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define DCGETTEXT __dcgettext
+-# define DCIGETTEXT __dcigettext
+-#else
+-# define DCGETTEXT libintl_dcgettext
+-# define DCIGETTEXT libintl_dcigettext
+-#endif
+-
+-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+- locale. */
+-char *
+-DCGETTEXT (const char *domainname, const char *msgid, int category)
+-{
+- return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-INTDEF(__dcgettext)
+-weak_alias (__dcgettext, dcgettext);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/dcigettext.c abook/intl/dcigettext.c
+--- BUILD/abook-0.6.0pre2/intl/dcigettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/dcigettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,1258 +0,0 @@
+-/* Implementation of the internal dcigettext function.
+- Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+- This must come before <config.h> because <config.h> may include
+- <features.h>, and once <features.h> has been included, it's too late. */
+-#ifndef _GNU_SOURCE
+-# define _GNU_SOURCE 1
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <sys/types.h>
+-
+-#ifdef __GNUC__
+-# define alloca __builtin_alloca
+-# define HAVE_ALLOCA 1
+-#else
+-# ifdef _MSC_VER
+-# include <malloc.h>
+-# define alloca _alloca
+-# else
+-# if defined HAVE_ALLOCA_H || defined _LIBC
+-# include <alloca.h>
+-# else
+-# ifdef _AIX
+- #pragma alloca
+-# else
+-# ifndef alloca
+-char *alloca ();
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#include <errno.h>
+-#ifndef errno
+-extern int errno;
+-#endif
+-#ifndef __set_errno
+-# define __set_errno(val) errno = (val)
+-#endif
+-
+-#include <stddef.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#if defined HAVE_UNISTD_H || defined _LIBC
+-# include <unistd.h>
+-#endif
+-
+-#include <locale.h>
+-
+-#ifdef _LIBC
+- /* Guess whether integer division by zero raises signal SIGFPE.
+- Set to 1 only if you know for sure. In case of doubt, set to 0. */
+-# if defined __alpha__ || defined __arm__ || defined __i386__ \
+- || defined __m68k__ || defined __s390__
+-# define INTDIV0_RAISES_SIGFPE 1
+-# else
+-# define INTDIV0_RAISES_SIGFPE 0
+-# endif
+-#endif
+-#if !INTDIV0_RAISES_SIGFPE
+-# include <signal.h>
+-#endif
+-
+-#if defined HAVE_SYS_PARAM_H || defined _LIBC
+-# include <sys/param.h>
+-#endif
+-
+-#include "gettextP.h"
+-#include "plural-exp.h"
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-#include "hash-string.h"
+-
+-/* Thread safetyness. */
+-#ifdef _LIBC
+-# include <bits/libc-lock.h>
+-#else
+-/* Provide dummy implementation if this is outside glibc. */
+-# define __libc_lock_define_initialized(CLASS, NAME)
+-# define __libc_lock_lock(NAME)
+-# define __libc_lock_unlock(NAME)
+-# define __libc_rwlock_define_initialized(CLASS, NAME)
+-# define __libc_rwlock_rdlock(NAME)
+-# define __libc_rwlock_unlock(NAME)
+-#endif
+-
+-/* Alignment of types. */
+-#if defined __GNUC__ && __GNUC__ >= 2
+-# define alignof(TYPE) __alignof__ (TYPE)
+-#else
+-# define alignof(TYPE) \
+- ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
+-#endif
+-
+-/* The internal variables in the standalone libintl.a must have different
+- names than the internal variables in GNU libc, otherwise programs
+- using libintl.a cannot be linked statically. */
+-#if !defined _LIBC
+-# define _nl_default_default_domain libintl_nl_default_default_domain
+-# define _nl_current_default_domain libintl_nl_current_default_domain
+-# define _nl_default_dirname libintl_nl_default_dirname
+-# define _nl_domain_bindings libintl_nl_domain_bindings
+-#endif
+-
+-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
+-#ifndef offsetof
+-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-#ifdef _LIBC
+-/* Rename the non ANSI C functions. This is required by the standard
+- because some ANSI C functions will require linking with this object
+- file and the name space must not be polluted. */
+-# define getcwd __getcwd
+-# ifndef stpcpy
+-# define stpcpy __stpcpy
+-# endif
+-# define tfind __tfind
+-#else
+-# if !defined HAVE_GETCWD
+-char *getwd ();
+-# define getcwd(buf, max) getwd (buf)
+-# else
+-# if VMS
+-# define getcwd(buf, max) (getcwd) (buf, max, 0)
+-# else
+-char *getcwd ();
+-# endif
+-# endif
+-# ifndef HAVE_STPCPY
+-static char *stpcpy (char *dest, const char *src);
+-# endif
+-# ifndef HAVE_MEMPCPY
+-static void *mempcpy (void *dest, const void *src, size_t n);
+-# endif
+-#endif
+-
+-/* Amount to increase buffer size by in each try. */
+-#define PATH_INCR 32
+-
+-/* The following is from pathmax.h. */
+-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
+- PATH_MAX but might cause redefinition warnings when sys/param.h is
+- later included (as on MORE/BSD 4.3). */
+-#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
+-# include <limits.h>
+-#endif
+-
+-#ifndef _POSIX_PATH_MAX
+-# define _POSIX_PATH_MAX 255
+-#endif
+-
+-#if !defined PATH_MAX && defined _PC_PATH_MAX
+-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
+-#endif
+-
+-/* Don't include sys/param.h if it already has been. */
+-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
+-# include <sys/param.h>
+-#endif
+-
+-#if !defined PATH_MAX && defined MAXPATHLEN
+-# define PATH_MAX MAXPATHLEN
+-#endif
+-
+-#ifndef PATH_MAX
+-# define PATH_MAX _POSIX_PATH_MAX
+-#endif
+-
+-/* Pathname support.
+- ISSLASH(C) tests whether C is a directory separator character.
+- IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
+- it may be concatenated to a directory pathname.
+- IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
+- */
+-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+- /* Win32, Cygwin, OS/2, DOS */
+-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+-# define HAS_DEVICE(P) \
+- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+- && (P)[1] == ':')
+-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+-# define IS_PATH_WITH_DIR(P) \
+- (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+-#else
+- /* Unix */
+-# define ISSLASH(C) ((C) == '/')
+-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+-#endif
+-
+-/* This is the type used for the search tree where known translations
+- are stored. */
+-struct known_translation_t
+-{
+- /* Domain in which to search. */
+- char *domainname;
+-
+- /* The category. */
+- int category;
+-
+- /* State of the catalog counter at the point the string was found. */
+- int counter;
+-
+- /* Catalog where the string was found. */
+- struct loaded_l10nfile *domain;
+-
+- /* And finally the translation. */
+- const char *translation;
+- size_t translation_length;
+-
+- /* Pointer to the string in question. */
+- char msgid[ZERO];
+-};
+-
+-/* Root of the search tree with known translations. We can use this
+- only if the system provides the `tsearch' function family. */
+-#if defined HAVE_TSEARCH || defined _LIBC
+-# include <search.h>
+-
+-static void *root;
+-
+-# ifdef _LIBC
+-# define tsearch __tsearch
+-# endif
+-
+-/* Function to compare two entries in the table of known translations. */
+-static int
+-transcmp (const void *p1, const void *p2)
+-{
+- const struct known_translation_t *s1;
+- const struct known_translation_t *s2;
+- int result;
+-
+- s1 = (const struct known_translation_t *) p1;
+- s2 = (const struct known_translation_t *) p2;
+-
+- result = strcmp (s1->msgid, s2->msgid);
+- if (result == 0)
+- {
+- result = strcmp (s1->domainname, s2->domainname);
+- if (result == 0)
+- /* We compare the category last (though this is the cheapest
+- operation) since it is hopefully always the same (namely
+- LC_MESSAGES). */
+- result = s1->category - s2->category;
+- }
+-
+- return result;
+-}
+-#endif
+-
+-#ifndef INTVARDEF
+-# define INTVARDEF(name)
+-#endif
+-#ifndef INTUSE
+-# define INTUSE(name) name
+-#endif
+-
+-/* Name of the default domain used for gettext(3) prior any call to
+- textdomain(3). The default value for this is "messages". */
+-const char _nl_default_default_domain[] attribute_hidden = "messages";
+-
+-/* Value used as the default domain for gettext(3). */
+-const char *_nl_current_default_domain attribute_hidden
+- = _nl_default_default_domain;
+-
+-/* Contains the default location of the message catalogs. */
+-#if defined __EMX__
+-extern const char _nl_default_dirname[];
+-#else
+-const char _nl_default_dirname[] = LOCALEDIR;
+-INTVARDEF (_nl_default_dirname)
+-#endif
+-
+-/* List with bindings of specific domains created by bindtextdomain()
+- calls. */
+-struct binding *_nl_domain_bindings;
+-
+-/* Prototypes for local functions. */
+-static char *plural_lookup (struct loaded_l10nfile *domain,
+- unsigned long int n,
+- const char *translation, size_t translation_len)
+- internal_function;
+-static const char *guess_category_value (int category,
+- const char *categoryname)
+- internal_function;
+-#ifdef _LIBC
+-# include "../locale/localeinfo.h"
+-# define category_to_name(category) _nl_category_names[category]
+-#else
+-static const char *category_to_name (int category) internal_function;
+-#endif
+-
+-
+-/* For those loosing systems which don't have `alloca' we have to add
+- some additional code emulating it. */
+-#ifdef HAVE_ALLOCA
+-/* Nothing has to be done. */
+-# define freea(p) /* nothing */
+-# define ADD_BLOCK(list, address) /* nothing */
+-# define FREE_BLOCKS(list) /* nothing */
+-#else
+-struct block_list
+-{
+- void *address;
+- struct block_list *next;
+-};
+-# define ADD_BLOCK(list, addr) \
+- do { \
+- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
+- /* If we cannot get a free block we cannot add the new element to \
+- the list. */ \
+- if (newp != NULL) { \
+- newp->address = (addr); \
+- newp->next = (list); \
+- (list) = newp; \
+- } \
+- } while (0)
+-# define FREE_BLOCKS(list) \
+- do { \
+- while (list != NULL) { \
+- struct block_list *old = list; \
+- list = list->next; \
+- free (old->address); \
+- free (old); \
+- } \
+- } while (0)
+-# undef alloca
+-# define alloca(size) (malloc (size))
+-# define freea(p) free (p)
+-#endif /* have alloca */
+-
+-
+-#ifdef _LIBC
+-/* List of blocks allocated for translations. */
+-typedef struct transmem_list
+-{
+- struct transmem_list *next;
+- char data[ZERO];
+-} transmem_block_t;
+-static struct transmem_list *transmem_list;
+-#else
+-typedef unsigned char transmem_block_t;
+-#endif
+-
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define DCIGETTEXT __dcigettext
+-#else
+-# define DCIGETTEXT libintl_dcigettext
+-#endif
+-
+-/* Lock variable to protect the global data in the gettext implementation. */
+-#ifdef _LIBC
+-__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
+-#endif
+-
+-/* Checking whether the binaries runs SUID must be done and glibc provides
+- easier methods therefore we make a difference here. */
+-#ifdef _LIBC
+-# define ENABLE_SECURE __libc_enable_secure
+-# define DETERMINE_SECURE
+-#else
+-# ifndef HAVE_GETUID
+-# define getuid() 0
+-# endif
+-# ifndef HAVE_GETGID
+-# define getgid() 0
+-# endif
+-# ifndef HAVE_GETEUID
+-# define geteuid() getuid()
+-# endif
+-# ifndef HAVE_GETEGID
+-# define getegid() getgid()
+-# endif
+-static int enable_secure;
+-# define ENABLE_SECURE (enable_secure == 1)
+-# define DETERMINE_SECURE \
+- if (enable_secure == 0) \
+- { \
+- if (getuid () != geteuid () || getgid () != getegid ()) \
+- enable_secure = 1; \
+- else \
+- enable_secure = -1; \
+- }
+-#endif
+-
+-/* Get the function to evaluate the plural expression. */
+-#include "eval-plural.h"
+-
+-/* Look up MSGID in the DOMAINNAME message catalog for the current
+- CATEGORY locale and, if PLURAL is nonzero, search over string
+- depending on the plural form determined by N. */
+-char *
+-DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
+- int plural, unsigned long int n, int category)
+-{
+-#ifndef HAVE_ALLOCA
+- struct block_list *block_list = NULL;
+-#endif
+- struct loaded_l10nfile *domain;
+- struct binding *binding;
+- const char *categoryname;
+- const char *categoryvalue;
+- char *dirname, *xdomainname;
+- char *single_locale;
+- char *retval;
+- size_t retlen;
+- int saved_errno;
+-#if defined HAVE_TSEARCH || defined _LIBC
+- struct known_translation_t *search;
+- struct known_translation_t **foundp = NULL;
+- size_t msgid_len;
+-#endif
+- size_t domainname_len;
+-
+- /* If no real MSGID is given return NULL. */
+- if (msgid1 == NULL)
+- return NULL;
+-
+-#ifdef _LIBC
+- if (category < 0 || category >= __LC_LAST || category == LC_ALL)
+- /* Bogus. */
+- return (plural == 0
+- ? (char *) msgid1
+- /* Use the Germanic plural rule. */
+- : n == 1 ? (char *) msgid1 : (char *) msgid2);
+-#endif
+-
+- __libc_rwlock_rdlock (_nl_state_lock);
+-
+- /* If DOMAINNAME is NULL, we are interested in the default domain. If
+- CATEGORY is not LC_MESSAGES this might not make much sense but the
+- definition left this undefined. */
+- if (domainname == NULL)
+- domainname = _nl_current_default_domain;
+-
+- /* OS/2 specific: backward compatibility with older libintl versions */
+-#ifdef LC_MESSAGES_COMPAT
+- if (category == LC_MESSAGES_COMPAT)
+- category = LC_MESSAGES;
+-#endif
+-
+-#if defined HAVE_TSEARCH || defined _LIBC
+- msgid_len = strlen (msgid1) + 1;
+-
+- /* Try to find the translation among those which we found at
+- some time. */
+- search = (struct known_translation_t *)
+- alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
+- memcpy (search->msgid, msgid1, msgid_len);
+- search->domainname = (char *) domainname;
+- search->category = category;
+-
+- foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
+- freea (search);
+- if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
+- {
+- /* Now deal with plural. */
+- if (plural)
+- retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
+- (*foundp)->translation_length);
+- else
+- retval = (char *) (*foundp)->translation;
+-
+- __libc_rwlock_unlock (_nl_state_lock);
+- return retval;
+- }
+-#endif
+-
+- /* Preserve the `errno' value. */
+- saved_errno = errno;
+-
+- /* See whether this is a SUID binary or not. */
+- DETERMINE_SECURE;
+-
+- /* First find matching binding. */
+- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+- {
+- int compare = strcmp (domainname, binding->domainname);
+- if (compare == 0)
+- /* We found it! */
+- break;
+- if (compare < 0)
+- {
+- /* It is not in the list. */
+- binding = NULL;
+- break;
+- }
+- }
+-
+- if (binding == NULL)
+- dirname = (char *) INTUSE(_nl_default_dirname);
+- else if (IS_ABSOLUTE_PATH (binding->dirname))
+- dirname = binding->dirname;
+- else
+- {
+- /* We have a relative path. Make it absolute now. */
+- size_t dirname_len = strlen (binding->dirname) + 1;
+- size_t path_max;
+- char *ret;
+-
+- path_max = (unsigned int) PATH_MAX;
+- path_max += 2; /* The getcwd docs say to do this. */
+-
+- for (;;)
+- {
+- dirname = (char *) alloca (path_max + dirname_len);
+- ADD_BLOCK (block_list, dirname);
+-
+- __set_errno (0);
+- ret = getcwd (dirname, path_max);
+- if (ret != NULL || errno != ERANGE)
+- break;
+-
+- path_max += path_max / 2;
+- path_max += PATH_INCR;
+- }
+-
+- if (ret == NULL)
+- /* We cannot get the current working directory. Don't signal an
+- error but simply return the default string. */
+- goto return_untranslated;
+-
+- stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+- }
+-
+- /* Now determine the symbolic name of CATEGORY and its value. */
+- categoryname = category_to_name (category);
+- categoryvalue = guess_category_value (category, categoryname);
+-
+- domainname_len = strlen (domainname);
+- xdomainname = (char *) alloca (strlen (categoryname)
+- + domainname_len + 5);
+- ADD_BLOCK (block_list, xdomainname);
+-
+- stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
+- domainname, domainname_len),
+- ".mo");
+-
+- /* Creating working area. */
+- single_locale = (char *) alloca (strlen (categoryvalue) + 1);
+- ADD_BLOCK (block_list, single_locale);
+-
+-
+- /* Search for the given string. This is a loop because we perhaps
+- got an ordered list of languages to consider for the translation. */
+- while (1)
+- {
+- /* Make CATEGORYVALUE point to the next element of the list. */
+- while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
+- ++categoryvalue;
+- if (categoryvalue[0] == '\0')
+- {
+- /* The whole contents of CATEGORYVALUE has been searched but
+- no valid entry has been found. We solve this situation
+- by implicitly appending a "C" entry, i.e. no translation
+- will take place. */
+- single_locale[0] = 'C';
+- single_locale[1] = '\0';
+- }
+- else
+- {
+- char *cp = single_locale;
+- while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
+- *cp++ = *categoryvalue++;
+- *cp = '\0';
+-
+- /* When this is a SUID binary we must not allow accessing files
+- outside the dedicated directories. */
+- if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
+- /* Ingore this entry. */
+- continue;
+- }
+-
+- /* If the current locale value is C (or POSIX) we don't load a
+- domain. Return the MSGID. */
+- if (strcmp (single_locale, "C") == 0
+- || strcmp (single_locale, "POSIX") == 0)
+- break;
+-
+- /* Find structure describing the message catalog matching the
+- DOMAINNAME and CATEGORY. */
+- domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
+-
+- if (domain != NULL)
+- {
+- retval = _nl_find_msg (domain, binding, msgid1, &retlen);
+-
+- if (retval == NULL)
+- {
+- int cnt;
+-
+- for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
+- {
+- retval = _nl_find_msg (domain->successor[cnt], binding,
+- msgid1, &retlen);
+-
+- if (retval != NULL)
+- {
+- domain = domain->successor[cnt];
+- break;
+- }
+- }
+- }
+-
+- if (retval != NULL)
+- {
+- /* Found the translation of MSGID1 in domain DOMAIN:
+- starting at RETVAL, RETLEN bytes. */
+- FREE_BLOCKS (block_list);
+-#if defined HAVE_TSEARCH || defined _LIBC
+- if (foundp == NULL)
+- {
+- /* Create a new entry and add it to the search tree. */
+- struct known_translation_t *newp;
+-
+- newp = (struct known_translation_t *)
+- malloc (offsetof (struct known_translation_t, msgid)
+- + msgid_len + domainname_len + 1);
+- if (newp != NULL)
+- {
+- newp->domainname =
+- mempcpy (newp->msgid, msgid1, msgid_len);
+- memcpy (newp->domainname, domainname, domainname_len + 1);
+- newp->category = category;
+- newp->counter = _nl_msg_cat_cntr;
+- newp->domain = domain;
+- newp->translation = retval;
+- newp->translation_length = retlen;
+-
+- /* Insert the entry in the search tree. */
+- foundp = (struct known_translation_t **)
+- tsearch (newp, &root, transcmp);
+- if (foundp == NULL
+- || __builtin_expect (*foundp != newp, 0))
+- /* The insert failed. */
+- free (newp);
+- }
+- }
+- else
+- {
+- /* We can update the existing entry. */
+- (*foundp)->counter = _nl_msg_cat_cntr;
+- (*foundp)->domain = domain;
+- (*foundp)->translation = retval;
+- (*foundp)->translation_length = retlen;
+- }
+-#endif
+- __set_errno (saved_errno);
+-
+- /* Now deal with plural. */
+- if (plural)
+- retval = plural_lookup (domain, n, retval, retlen);
+-
+- __libc_rwlock_unlock (_nl_state_lock);
+- return retval;
+- }
+- }
+- }
+-
+- return_untranslated:
+- /* Return the untranslated MSGID. */
+- FREE_BLOCKS (block_list);
+- __libc_rwlock_unlock (_nl_state_lock);
+-#ifndef _LIBC
+- if (!ENABLE_SECURE)
+- {
+- extern void _nl_log_untranslated (const char *logfilename,
+- const char *domainname,
+- const char *msgid1, const char *msgid2,
+- int plural);
+- const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
+-
+- if (logfilename != NULL && logfilename[0] != '\0')
+- _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
+- }
+-#endif
+- __set_errno (saved_errno);
+- return (plural == 0
+- ? (char *) msgid1
+- /* Use the Germanic plural rule. */
+- : n == 1 ? (char *) msgid1 : (char *) msgid2);
+-}
+-
+-
+-char *
+-internal_function
+-_nl_find_msg (struct loaded_l10nfile *domain_file,
+- struct binding *domainbinding, const char *msgid,
+- size_t *lengthp)
+-{
+- struct loaded_domain *domain;
+- nls_uint32 nstrings;
+- size_t act;
+- char *result;
+- size_t resultlen;
+-
+- if (domain_file->decided == 0)
+- _nl_load_domain (domain_file, domainbinding);
+-
+- if (domain_file->data == NULL)
+- return NULL;
+-
+- domain = (struct loaded_domain *) domain_file->data;
+-
+- nstrings = domain->nstrings;
+-
+- /* Locate the MSGID and its translation. */
+- if (domain->hash_tab != NULL)
+- {
+- /* Use the hashing table. */
+- nls_uint32 len = strlen (msgid);
+- nls_uint32 hash_val = hash_string (msgid);
+- nls_uint32 idx = hash_val % domain->hash_size;
+- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+-
+- while (1)
+- {
+- nls_uint32 nstr =
+- W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
+-
+- if (nstr == 0)
+- /* Hash table entry is empty. */
+- return NULL;
+-
+- nstr--;
+-
+- /* Compare msgid with the original string at index nstr.
+- We compare the lengths with >=, not ==, because plural entries
+- are represented by strings with an embedded NUL. */
+- if (nstr < nstrings
+- ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
+- && (strcmp (msgid,
+- domain->data + W (domain->must_swap,
+- domain->orig_tab[nstr].offset))
+- == 0)
+- : domain->orig_sysdep_tab[nstr - nstrings].length > len
+- && (strcmp (msgid,
+- domain->orig_sysdep_tab[nstr - nstrings].pointer)
+- == 0))
+- {
+- act = nstr;
+- goto found;
+- }
+-
+- if (idx >= domain->hash_size - incr)
+- idx -= domain->hash_size - incr;
+- else
+- idx += incr;
+- }
+- /* NOTREACHED */
+- }
+- else
+- {
+- /* Try the default method: binary search in the sorted array of
+- messages. */
+- size_t top, bottom;
+-
+- bottom = 0;
+- top = nstrings;
+- while (bottom < top)
+- {
+- int cmp_val;
+-
+- act = (bottom + top) / 2;
+- cmp_val = strcmp (msgid, (domain->data
+- + W (domain->must_swap,
+- domain->orig_tab[act].offset)));
+- if (cmp_val < 0)
+- top = act;
+- else if (cmp_val > 0)
+- bottom = act + 1;
+- else
+- goto found;
+- }
+- /* No translation was found. */
+- return NULL;
+- }
+-
+- found:
+- /* The translation was found at index ACT. If we have to convert the
+- string to use a different character set, this is the time. */
+- if (act < nstrings)
+- {
+- result = (char *)
+- (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
+- resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
+- }
+- else
+- {
+- result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
+- resultlen = domain->trans_sysdep_tab[act - nstrings].length;
+- }
+-
+-#if defined _LIBC || HAVE_ICONV
+- if (domain->codeset_cntr
+- != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
+- {
+- /* The domain's codeset has changed through bind_textdomain_codeset()
+- since the message catalog was initialized or last accessed. We
+- have to reinitialize the converter. */
+- _nl_free_domain_conv (domain);
+- _nl_init_domain_conv (domain_file, domain, domainbinding);
+- }
+-
+- if (
+-# ifdef _LIBC
+- domain->conv != (__gconv_t) -1
+-# else
+-# if HAVE_ICONV
+- domain->conv != (iconv_t) -1
+-# endif
+-# endif
+- )
+- {
+- /* We are supposed to do a conversion. First allocate an
+- appropriate table with the same structure as the table
+- of translations in the file, where we can put the pointers
+- to the converted strings in.
+- There is a slight complication with plural entries. They
+- are represented by consecutive NUL terminated strings. We
+- handle this case by converting RESULTLEN bytes, including
+- NULs. */
+-
+- if (domain->conv_tab == NULL
+- && ((domain->conv_tab =
+- (char **) calloc (nstrings + domain->n_sysdep_strings,
+- sizeof (char *)))
+- == NULL))
+- /* Mark that we didn't succeed allocating a table. */
+- domain->conv_tab = (char **) -1;
+-
+- if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
+- /* Nothing we can do, no more memory. */
+- goto converted;
+-
+- if (domain->conv_tab[act] == NULL)
+- {
+- /* We haven't used this string so far, so it is not
+- translated yet. Do this now. */
+- /* We use a bit more efficient memory handling.
+- We allocate always larger blocks which get used over
+- time. This is faster than many small allocations. */
+- __libc_lock_define_initialized (static, lock)
+-# define INITIAL_BLOCK_SIZE 4080
+- static unsigned char *freemem;
+- static size_t freemem_size;
+-
+- const unsigned char *inbuf;
+- unsigned char *outbuf;
+- int malloc_count;
+-# ifndef _LIBC
+- transmem_block_t *transmem_list = NULL;
+-# endif
+-
+- __libc_lock_lock (lock);
+-
+- inbuf = (const unsigned char *) result;
+- outbuf = freemem + sizeof (size_t);
+-
+- malloc_count = 0;
+- while (1)
+- {
+- transmem_block_t *newmem;
+-# ifdef _LIBC
+- size_t non_reversible;
+- int res;
+-
+- if (freemem_size < sizeof (size_t))
+- goto resize_freemem;
+-
+- res = __gconv (domain->conv,
+- &inbuf, inbuf + resultlen,
+- &outbuf,
+- outbuf + freemem_size - sizeof (size_t),
+- &non_reversible);
+-
+- if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
+- break;
+-
+- if (res != __GCONV_FULL_OUTPUT)
+- {
+- __libc_lock_unlock (lock);
+- goto converted;
+- }
+-
+- inbuf = result;
+-# else
+-# if HAVE_ICONV
+- const char *inptr = (const char *) inbuf;
+- size_t inleft = resultlen;
+- char *outptr = (char *) outbuf;
+- size_t outleft;
+-
+- if (freemem_size < sizeof (size_t))
+- goto resize_freemem;
+-
+- outleft = freemem_size - sizeof (size_t);
+- if (iconv (domain->conv,
+- (ICONV_CONST char **) &inptr, &inleft,
+- &outptr, &outleft)
+- != (size_t) (-1))
+- {
+- outbuf = (unsigned char *) outptr;
+- break;
+- }
+- if (errno != E2BIG)
+- {
+- __libc_lock_unlock (lock);
+- goto converted;
+- }
+-# endif
+-# endif
+-
+- resize_freemem:
+- /* We must allocate a new buffer or resize the old one. */
+- if (malloc_count > 0)
+- {
+- ++malloc_count;
+- freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
+- newmem = (transmem_block_t *) realloc (transmem_list,
+- freemem_size);
+-# ifdef _LIBC
+- if (newmem != NULL)
+- transmem_list = transmem_list->next;
+- else
+- {
+- struct transmem_list *old = transmem_list;
+-
+- transmem_list = transmem_list->next;
+- free (old);
+- }
+-# endif
+- }
+- else
+- {
+- malloc_count = 1;
+- freemem_size = INITIAL_BLOCK_SIZE;
+- newmem = (transmem_block_t *) malloc (freemem_size);
+- }
+- if (__builtin_expect (newmem == NULL, 0))
+- {
+- freemem = NULL;
+- freemem_size = 0;
+- __libc_lock_unlock (lock);
+- goto converted;
+- }
+-
+-# ifdef _LIBC
+- /* Add the block to the list of blocks we have to free
+- at some point. */
+- newmem->next = transmem_list;
+- transmem_list = newmem;
+-
+- freemem = newmem->data;
+- freemem_size -= offsetof (struct transmem_list, data);
+-# else
+- transmem_list = newmem;
+- freemem = newmem;
+-# endif
+-
+- outbuf = freemem + sizeof (size_t);
+- }
+-
+- /* We have now in our buffer a converted string. Put this
+- into the table of conversions. */
+- *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
+- domain->conv_tab[act] = (char *) freemem;
+- /* Shrink freemem, but keep it aligned. */
+- freemem_size -= outbuf - freemem;
+- freemem = outbuf;
+- freemem += freemem_size & (alignof (size_t) - 1);
+- freemem_size = freemem_size & ~ (alignof (size_t) - 1);
+-
+- __libc_lock_unlock (lock);
+- }
+-
+- /* Now domain->conv_tab[act] contains the translation of all
+- the plural variants. */
+- result = domain->conv_tab[act] + sizeof (size_t);
+- resultlen = *(size_t *) domain->conv_tab[act];
+- }
+-
+- converted:
+- /* The result string is converted. */
+-
+-#endif /* _LIBC || HAVE_ICONV */
+-
+- *lengthp = resultlen;
+- return result;
+-}
+-
+-
+-/* Look up a plural variant. */
+-static char *
+-internal_function
+-plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
+- const char *translation, size_t translation_len)
+-{
+- struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
+- unsigned long int index;
+- const char *p;
+-
+- index = plural_eval (domaindata->plural, n);
+- if (index >= domaindata->nplurals)
+- /* This should never happen. It means the plural expression and the
+- given maximum value do not match. */
+- index = 0;
+-
+- /* Skip INDEX strings at TRANSLATION. */
+- p = translation;
+- while (index-- > 0)
+- {
+-#ifdef _LIBC
+- p = __rawmemchr (p, '\0');
+-#else
+- p = strchr (p, '\0');
+-#endif
+- /* And skip over the NUL byte. */
+- p++;
+-
+- if (p >= translation + translation_len)
+- /* This should never happen. It means the plural expression
+- evaluated to a value larger than the number of variants
+- available for MSGID1. */
+- return (char *) translation;
+- }
+- return (char *) p;
+-}
+-
+-#ifndef _LIBC
+-/* Return string representation of locale CATEGORY. */
+-static const char *
+-internal_function
+-category_to_name (int category)
+-{
+- const char *retval;
+-
+- switch (category)
+- {
+-#ifdef LC_COLLATE
+- case LC_COLLATE:
+- retval = "LC_COLLATE";
+- break;
+-#endif
+-#ifdef LC_CTYPE
+- case LC_CTYPE:
+- retval = "LC_CTYPE";
+- break;
+-#endif
+-#ifdef LC_MONETARY
+- case LC_MONETARY:
+- retval = "LC_MONETARY";
+- break;
+-#endif
+-#ifdef LC_NUMERIC
+- case LC_NUMERIC:
+- retval = "LC_NUMERIC";
+- break;
+-#endif
+-#ifdef LC_TIME
+- case LC_TIME:
+- retval = "LC_TIME";
+- break;
+-#endif
+-#ifdef LC_MESSAGES
+- case LC_MESSAGES:
+- retval = "LC_MESSAGES";
+- break;
+-#endif
+-#ifdef LC_RESPONSE
+- case LC_RESPONSE:
+- retval = "LC_RESPONSE";
+- break;
+-#endif
+-#ifdef LC_ALL
+- case LC_ALL:
+- /* This might not make sense but is perhaps better than any other
+- value. */
+- retval = "LC_ALL";
+- break;
+-#endif
+- default:
+- /* If you have a better idea for a default value let me know. */
+- retval = "LC_XXX";
+- }
+-
+- return retval;
+-}
+-#endif
+-
+-/* Guess value of current locale from value of the environment variables
+- or system-dependent defaults. */
+-static const char *
+-internal_function
+-guess_category_value (int category, const char *categoryname)
+-{
+- const char *language;
+- const char *locale;
+-#ifndef _LIBC
+- const char *language_default;
+- int locale_defaulted;
+-#endif
+-
+- /* We use the settings in the following order:
+- 1. The value of the environment variable 'LANGUAGE'. This is a GNU
+- extension. Its value can be a colon-separated list of locale names.
+- 2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
+- More precisely, the first among these that is set to a non-empty value.
+- This is how POSIX specifies it. The value is a single locale name.
+- 3. A system-dependent preference list of languages. Its value can be a
+- colon-separated list of locale names.
+- 4. A system-dependent default locale name.
+- This way:
+- - System-dependent settings can be overridden by environment variables.
+- - If the system provides both a list of languages and a default locale,
+- the former is used. */
+-
+- /* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
+- `LC_xxx', and `LANG'. On some systems this can be done by the
+- `setlocale' function itself. */
+-#ifdef _LIBC
+- locale = __current_locale_name (category);
+-#else
+- locale = _nl_locale_name_posix (category, categoryname);
+- locale_defaulted = 0;
+- if (locale == NULL)
+- {
+- locale = _nl_locale_name_default ();
+- locale_defaulted = 1;
+- }
+-#endif
+-
+- /* Ignore LANGUAGE and its system-dependent analogon if the locale is set
+- to "C" because
+- 1. "C" locale usually uses the ASCII encoding, and most international
+- messages use non-ASCII characters. These characters get displayed
+- as question marks (if using glibc's iconv()) or as invalid 8-bit
+- characters (because other iconv()s refuse to convert most non-ASCII
+- characters to ASCII). In any case, the output is ugly.
+- 2. The precise output of some programs in the "C" locale is specified
+- by POSIX and should not depend on environment variables like
+- "LANGUAGE" or system-dependent information. We allow such programs
+- to use gettext(). */
+- if (strcmp (locale, "C") == 0)
+- return locale;
+-
+- /* The highest priority value is the value of the 'LANGUAGE' environment
+- variable. */
+- language = getenv ("LANGUAGE");
+- if (language != NULL && language[0] != '\0')
+- return language;
+-#ifndef _LIBC
+- /* The next priority value is the locale name, if not defaulted. */
+- if (locale_defaulted)
+- {
+- /* The next priority value is the default language preferences list. */
+- language_default = _nl_language_preferences_default ();
+- if (language_default != NULL)
+- return language_default;
+- }
+- /* The least priority value is the locale name, if defaulted. */
+-#endif
+- return locale;
+-}
+-
+-/* @@ begin of epilog @@ */
+-
+-/* We don't want libintl.a to depend on any other library. So we
+- avoid the non-standard function stpcpy. In GNU C Library this
+- function is available, though. Also allow the symbol HAVE_STPCPY
+- to be defined. */
+-#if !_LIBC && !HAVE_STPCPY
+-static char *
+-stpcpy (char *dest, const char *src)
+-{
+- while ((*dest++ = *src++) != '\0')
+- /* Do nothing. */ ;
+- return dest - 1;
+-}
+-#endif
+-
+-#if !_LIBC && !HAVE_MEMPCPY
+-static void *
+-mempcpy (void *dest, const void *src, size_t n)
+-{
+- return (void *) ((char *) memcpy (dest, src, n) + n);
+-}
+-#endif
+-
+-
+-#ifdef _LIBC
+-/* If we want to free all resources we have to do some work at
+- program's end. */
+-libc_freeres_fn (free_mem)
+-{
+- void *old;
+-
+- while (_nl_domain_bindings != NULL)
+- {
+- struct binding *oldp = _nl_domain_bindings;
+- _nl_domain_bindings = _nl_domain_bindings->next;
+- if (oldp->dirname != INTUSE(_nl_default_dirname))
+- /* Yes, this is a pointer comparison. */
+- free (oldp->dirname);
+- free (oldp->codeset);
+- free (oldp);
+- }
+-
+- if (_nl_current_default_domain != _nl_default_default_domain)
+- /* Yes, again a pointer comparison. */
+- free ((char *) _nl_current_default_domain);
+-
+- /* Remove the search tree with the known translations. */
+- __tdestroy (root, free);
+- root = NULL;
+-
+- while (transmem_list != NULL)
+- {
+- old = transmem_list;
+- transmem_list = transmem_list->next;
+- free (old);
+- }
+-}
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/dcngettext.c abook/intl/dcngettext.c
+--- BUILD/abook-0.6.0pre2/intl/dcngettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/dcngettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,57 +0,0 @@
+-/* Implementation of the dcngettext(3) function.
+- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include "gettextP.h"
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define DCNGETTEXT __dcngettext
+-# define DCIGETTEXT __dcigettext
+-#else
+-# define DCNGETTEXT libintl_dcngettext
+-# define DCIGETTEXT libintl_dcigettext
+-#endif
+-
+-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+- locale. */
+-char *
+-DCNGETTEXT (const char *domainname,
+- const char *msgid1, const char *msgid2, unsigned long int n,
+- int category)
+-{
+- return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-weak_alias (__dcngettext, dcngettext);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/dgettext.c abook/intl/dgettext.c
+--- BUILD/abook-0.6.0pre2/intl/dgettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/dgettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,58 +0,0 @@
+-/* Implementation of the dgettext(3) function.
+- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include "gettextP.h"
+-
+-#include <locale.h>
+-
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define DGETTEXT __dgettext
+-# define DCGETTEXT INTUSE(__dcgettext)
+-#else
+-# define DGETTEXT libintl_dgettext
+-# define DCGETTEXT libintl_dcgettext
+-#endif
+-
+-/* Look up MSGID in the DOMAINNAME message catalog of the current
+- LC_MESSAGES locale. */
+-char *
+-DGETTEXT (const char *domainname, const char *msgid)
+-{
+- return DCGETTEXT (domainname, msgid, LC_MESSAGES);
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-weak_alias (__dgettext, dgettext);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/dngettext.c abook/intl/dngettext.c
+--- BUILD/abook-0.6.0pre2/intl/dngettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/dngettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,59 +0,0 @@
+-/* Implementation of the dngettext(3) function.
+- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include "gettextP.h"
+-
+-#include <locale.h>
+-
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define DNGETTEXT __dngettext
+-# define DCNGETTEXT __dcngettext
+-#else
+-# define DNGETTEXT libintl_dngettext
+-# define DCNGETTEXT libintl_dcngettext
+-#endif
+-
+-/* Look up MSGID in the DOMAINNAME message catalog of the current
+- LC_MESSAGES locale and skip message according to the plural form. */
+-char *
+-DNGETTEXT (const char *domainname,
+- const char *msgid1, const char *msgid2, unsigned long int n)
+-{
+- return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-weak_alias (__dngettext, dngettext);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/eval-plural.h abook/intl/eval-plural.h
+--- BUILD/abook-0.6.0pre2/intl/eval-plural.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/eval-plural.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,108 +0,0 @@
+-/* Plural expression evaluation.
+- Copyright (C) 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef STATIC
+-#define STATIC static
+-#endif
+-
+-/* Evaluate the plural expression and return an index value. */
+-STATIC
+-unsigned long int
+-internal_function
+-plural_eval (struct expression *pexp, unsigned long int n)
+-{
+- switch (pexp->nargs)
+- {
+- case 0:
+- switch (pexp->operation)
+- {
+- case var:
+- return n;
+- case num:
+- return pexp->val.num;
+- default:
+- break;
+- }
+- /* NOTREACHED */
+- break;
+- case 1:
+- {
+- /* pexp->operation must be lnot. */
+- unsigned long int arg = plural_eval (pexp->val.args[0], n);
+- return ! arg;
+- }
+- case 2:
+- {
+- unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
+- if (pexp->operation == lor)
+- return leftarg || plural_eval (pexp->val.args[1], n);
+- else if (pexp->operation == land)
+- return leftarg && plural_eval (pexp->val.args[1], n);
+- else
+- {
+- unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
+-
+- switch (pexp->operation)
+- {
+- case mult:
+- return leftarg * rightarg;
+- case divide:
+-#if !INTDIV0_RAISES_SIGFPE
+- if (rightarg == 0)
+- raise (SIGFPE);
+-#endif
+- return leftarg / rightarg;
+- case module:
+-#if !INTDIV0_RAISES_SIGFPE
+- if (rightarg == 0)
+- raise (SIGFPE);
+-#endif
+- return leftarg % rightarg;
+- case plus:
+- return leftarg + rightarg;
+- case minus:
+- return leftarg - rightarg;
+- case less_than:
+- return leftarg < rightarg;
+- case greater_than:
+- return leftarg > rightarg;
+- case less_or_equal:
+- return leftarg <= rightarg;
+- case greater_or_equal:
+- return leftarg >= rightarg;
+- case equal:
+- return leftarg == rightarg;
+- case not_equal:
+- return leftarg != rightarg;
+- default:
+- break;
+- }
+- }
+- /* NOTREACHED */
+- break;
+- }
+- case 3:
+- {
+- /* pexp->operation must be qmop. */
+- unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
+- return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
+- }
+- }
+- /* NOTREACHED */
+- return 0;
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/explodename.c abook/intl/explodename.c
+--- BUILD/abook-0.6.0pre2/intl/explodename.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/explodename.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,185 +0,0 @@
+-/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
+- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdlib.h>
+-#include <string.h>
+-#include <sys/types.h>
+-
+-#include "loadinfo.h"
+-
+-/* On some strange systems still no definition of NULL is found. Sigh! */
+-#ifndef NULL
+-# if defined __STDC__ && __STDC__
+-# define NULL ((void *) 0)
+-# else
+-# define NULL 0
+-# endif
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-char *
+-_nl_find_language (const char *name)
+-{
+- while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
+- && name[0] != '+' && name[0] != ',')
+- ++name;
+-
+- return (char *) name;
+-}
+-
+-
+-int
+-_nl_explode_name (char *name,
+- const char **language, const char **modifier,
+- const char **territory, const char **codeset,
+- const char **normalized_codeset, const char **special,
+- const char **sponsor, const char **revision)
+-{
+- enum { undecided, xpg, cen } syntax;
+- char *cp;
+- int mask;
+-
+- *modifier = NULL;
+- *territory = NULL;
+- *codeset = NULL;
+- *normalized_codeset = NULL;
+- *special = NULL;
+- *sponsor = NULL;
+- *revision = NULL;
+-
+- /* Now we determine the single parts of the locale name. First
+- look for the language. Termination symbols are `_' and `@' if
+- we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
+- mask = 0;
+- syntax = undecided;
+- *language = cp = name;
+- cp = _nl_find_language (*language);
+-
+- if (*language == cp)
+- /* This does not make sense: language has to be specified. Use
+- this entry as it is without exploding. Perhaps it is an alias. */
+- cp = strchr (*language, '\0');
+- else if (cp[0] == '_')
+- {
+- /* Next is the territory. */
+- cp[0] = '\0';
+- *territory = ++cp;
+-
+- while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
+- && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
+- ++cp;
+-
+- mask |= TERRITORY;
+-
+- if (cp[0] == '.')
+- {
+- /* Next is the codeset. */
+- syntax = xpg;
+- cp[0] = '\0';
+- *codeset = ++cp;
+-
+- while (cp[0] != '\0' && cp[0] != '@')
+- ++cp;
+-
+- mask |= XPG_CODESET;
+-
+- if (*codeset != cp && (*codeset)[0] != '\0')
+- {
+- *normalized_codeset = _nl_normalize_codeset (*codeset,
+- cp - *codeset);
+- if (strcmp (*codeset, *normalized_codeset) == 0)
+- free ((char *) *normalized_codeset);
+- else
+- mask |= XPG_NORM_CODESET;
+- }
+- }
+- }
+-
+- if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
+- {
+- /* Next is the modifier. */
+- syntax = cp[0] == '@' ? xpg : cen;
+- cp[0] = '\0';
+- *modifier = ++cp;
+-
+- while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
+- && cp[0] != ',' && cp[0] != '_')
+- ++cp;
+-
+- mask |= XPG_MODIFIER | CEN_AUDIENCE;
+- }
+-
+- if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
+- {
+- syntax = cen;
+-
+- if (cp[0] == '+')
+- {
+- /* Next is special application (CEN syntax). */
+- cp[0] = '\0';
+- *special = ++cp;
+-
+- while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
+- ++cp;
+-
+- mask |= CEN_SPECIAL;
+- }
+-
+- if (cp[0] == ',')
+- {
+- /* Next is sponsor (CEN syntax). */
+- cp[0] = '\0';
+- *sponsor = ++cp;
+-
+- while (cp[0] != '\0' && cp[0] != '_')
+- ++cp;
+-
+- mask |= CEN_SPONSOR;
+- }
+-
+- if (cp[0] == '_')
+- {
+- /* Next is revision (CEN syntax). */
+- cp[0] = '\0';
+- *revision = ++cp;
+-
+- mask |= CEN_REVISION;
+- }
+- }
+-
+- /* For CEN syntax values it might be important to have the
+- separator character in the file name, not for XPG syntax. */
+- if (syntax == xpg)
+- {
+- if (*territory != NULL && (*territory)[0] == '\0')
+- mask &= ~TERRITORY;
+-
+- if (*codeset != NULL && (*codeset)[0] == '\0')
+- mask &= ~XPG_CODESET;
+-
+- if (*modifier != NULL && (*modifier)[0] == '\0')
+- mask &= ~XPG_MODIFIER;
+- }
+-
+- return mask;
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/finddomain.c abook/intl/finddomain.c
+--- BUILD/abook-0.6.0pre2/intl/finddomain.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/finddomain.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,192 +0,0 @@
+-/* Handle list of needed message catalogs
+- Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
+- Written by Ulrich Drepper <drepper@gnu.org>, 1995.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#if defined HAVE_UNISTD_H || defined _LIBC
+-# include <unistd.h>
+-#endif
+-
+-#include "gettextP.h"
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-/* @@ end of prolog @@ */
+-/* List of already loaded domains. */
+-static struct loaded_l10nfile *_nl_loaded_domains;
+-
+-
+-/* Return a data structure describing the message catalog described by
+- the DOMAINNAME and CATEGORY parameters with respect to the currently
+- established bindings. */
+-struct loaded_l10nfile *
+-internal_function
+-_nl_find_domain (const char *dirname, char *locale,
+- const char *domainname, struct binding *domainbinding)
+-{
+- struct loaded_l10nfile *retval;
+- const char *language;
+- const char *modifier;
+- const char *territory;
+- const char *codeset;
+- const char *normalized_codeset;
+- const char *special;
+- const char *sponsor;
+- const char *revision;
+- const char *alias_value;
+- int mask;
+-
+- /* LOCALE can consist of up to four recognized parts for the XPG syntax:
+-
+- language[_territory[.codeset]][@modifier]
+-
+- and six parts for the CEN syntax:
+-
+- language[_territory][+audience][+special][,[sponsor][_revision]]
+-
+- Beside the first part all of them are allowed to be missing. If
+- the full specified locale is not found, the less specific one are
+- looked for. The various parts will be stripped off according to
+- the following order:
+- (1) revision
+- (2) sponsor
+- (3) special
+- (4) codeset
+- (5) normalized codeset
+- (6) territory
+- (7) audience/modifier
+- */
+-
+- /* If we have already tested for this locale entry there has to
+- be one data set in the list of loaded domains. */
+- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
+- strlen (dirname) + 1, 0, locale, NULL, NULL,
+- NULL, NULL, NULL, NULL, NULL, domainname, 0);
+- if (retval != NULL)
+- {
+- /* We know something about this locale. */
+- int cnt;
+-
+- if (retval->decided == 0)
+- _nl_load_domain (retval, domainbinding);
+-
+- if (retval->data != NULL)
+- return retval;
+-
+- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
+- {
+- if (retval->successor[cnt]->decided == 0)
+- _nl_load_domain (retval->successor[cnt], domainbinding);
+-
+- if (retval->successor[cnt]->data != NULL)
+- break;
+- }
+- return cnt >= 0 ? retval : NULL;
+- /* NOTREACHED */
+- }
+-
+- /* See whether the locale value is an alias. If yes its value
+- *overwrites* the alias name. No test for the original value is
+- done. */
+- alias_value = _nl_expand_alias (locale);
+- if (alias_value != NULL)
+- {
+-#if defined _LIBC || defined HAVE_STRDUP
+- locale = strdup (alias_value);
+- if (locale == NULL)
+- return NULL;
+-#else
+- size_t len = strlen (alias_value) + 1;
+- locale = (char *) malloc (len);
+- if (locale == NULL)
+- return NULL;
+-
+- memcpy (locale, alias_value, len);
+-#endif
+- }
+-
+- /* Now we determine the single parts of the locale name. First
+- look for the language. Termination symbols are `_' and `@' if
+- we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
+- mask = _nl_explode_name (locale, &language, &modifier, &territory,
+- &codeset, &normalized_codeset, &special,
+- &sponsor, &revision);
+-
+- /* Create all possible locale entries which might be interested in
+- generalization. */
+- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
+- strlen (dirname) + 1, mask, language, territory,
+- codeset, normalized_codeset, modifier, special,
+- sponsor, revision, domainname, 1);
+- if (retval == NULL)
+- /* This means we are out of core. */
+- return NULL;
+-
+- if (retval->decided == 0)
+- _nl_load_domain (retval, domainbinding);
+- if (retval->data == NULL)
+- {
+- int cnt;
+- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
+- {
+- if (retval->successor[cnt]->decided == 0)
+- _nl_load_domain (retval->successor[cnt], domainbinding);
+- if (retval->successor[cnt]->data != NULL)
+- break;
+- }
+- }
+-
+- /* The room for an alias was dynamically allocated. Free it now. */
+- if (alias_value != NULL)
+- free (locale);
+-
+- /* The space for normalized_codeset is dynamically allocated. Free it. */
+- if (mask & XPG_NORM_CODESET)
+- free ((void *) normalized_codeset);
+-
+- return retval;
+-}
+-
+-
+-#ifdef _LIBC
+-libc_freeres_fn (free_mem)
+-{
+- struct loaded_l10nfile *runp = _nl_loaded_domains;
+-
+- while (runp != NULL)
+- {
+- struct loaded_l10nfile *here = runp;
+- if (runp->data != NULL)
+- _nl_unload_domain ((struct loaded_domain *) runp->data);
+- runp = runp->next;
+- free ((char *) here->filename);
+- free (here);
+- }
+-}
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/gettext.c abook/intl/gettext.c
+--- BUILD/abook-0.6.0pre2/intl/gettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/gettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,63 +0,0 @@
+-/* Implementation of gettext(3) function.
+- Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#ifdef _LIBC
+-# define __need_NULL
+-# include <stddef.h>
+-#else
+-# include <stdlib.h> /* Just for NULL. */
+-#endif
+-
+-#include "gettextP.h"
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define GETTEXT __gettext
+-# define DCGETTEXT INTUSE(__dcgettext)
+-#else
+-# define GETTEXT libintl_gettext
+-# define DCGETTEXT libintl_dcgettext
+-#endif
+-
+-/* Look up MSGID in the current default message catalog for the current
+- LC_MESSAGES locale. If not found, returns MSGID itself (the default
+- text). */
+-char *
+-GETTEXT (const char *msgid)
+-{
+- return DCGETTEXT (NULL, msgid, LC_MESSAGES);
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-weak_alias (__gettext, gettext);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/gettextP.h abook/intl/gettextP.h
+--- BUILD/abook-0.6.0pre2/intl/gettextP.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/gettextP.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,218 +0,0 @@
+-/* Header describing internals of libintl library.
+- Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
+- Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _GETTEXTP_H
+-#define _GETTEXTP_H
+-
+-#include <stddef.h> /* Get size_t. */
+-
+-#ifdef _LIBC
+-# include "../iconv/gconv_int.h"
+-#else
+-# if HAVE_ICONV
+-# include <iconv.h>
+-# endif
+-#endif
+-
+-#include "loadinfo.h"
+-
+-#include "gmo.h" /* Get nls_uint32. */
+-
+-/* @@ end of prolog @@ */
+-
+-#ifndef internal_function
+-# define internal_function
+-#endif
+-
+-#ifndef attribute_hidden
+-# define attribute_hidden
+-#endif
+-
+-/* Tell the compiler when a conditional or integer expression is
+- almost always true or almost always false. */
+-#ifndef HAVE_BUILTIN_EXPECT
+-# define __builtin_expect(expr, val) (expr)
+-#endif
+-
+-#ifndef W
+-# define W(flag, data) ((flag) ? SWAP (data) : (data))
+-#endif
+-
+-
+-#ifdef _LIBC
+-# include <byteswap.h>
+-# define SWAP(i) bswap_32 (i)
+-#else
+-static inline nls_uint32
+-SWAP (i)
+- nls_uint32 i;
+-{
+- return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
+-}
+-#endif
+-
+-
+-/* In-memory representation of system dependent string. */
+-struct sysdep_string_desc
+-{
+- /* Length of addressed string, including the trailing NUL. */
+- size_t length;
+- /* Pointer to addressed string. */
+- const char *pointer;
+-};
+-
+-/* The representation of an opened message catalog. */
+-struct loaded_domain
+-{
+- /* Pointer to memory containing the .mo file. */
+- const char *data;
+- /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
+- int use_mmap;
+- /* Size of mmap()ed memory. */
+- size_t mmap_size;
+- /* 1 if the .mo file uses a different endianness than this machine. */
+- int must_swap;
+- /* Pointer to additional malloc()ed memory. */
+- void *malloced;
+-
+- /* Number of static strings pairs. */
+- nls_uint32 nstrings;
+- /* Pointer to descriptors of original strings in the file. */
+- const struct string_desc *orig_tab;
+- /* Pointer to descriptors of translated strings in the file. */
+- const struct string_desc *trans_tab;
+-
+- /* Number of system dependent strings pairs. */
+- nls_uint32 n_sysdep_strings;
+- /* Pointer to descriptors of original sysdep strings. */
+- const struct sysdep_string_desc *orig_sysdep_tab;
+- /* Pointer to descriptors of translated sysdep strings. */
+- const struct sysdep_string_desc *trans_sysdep_tab;
+-
+- /* Size of hash table. */
+- nls_uint32 hash_size;
+- /* Pointer to hash table. */
+- const nls_uint32 *hash_tab;
+- /* 1 if the hash table uses a different endianness than this machine. */
+- int must_swap_hash_tab;
+-
+- int codeset_cntr;
+-#ifdef _LIBC
+- __gconv_t conv;
+-#else
+-# if HAVE_ICONV
+- iconv_t conv;
+-# endif
+-#endif
+- char **conv_tab;
+-
+- struct expression *plural;
+- unsigned long int nplurals;
+-};
+-
+-/* We want to allocate a string at the end of the struct. But ISO C
+- doesn't allow zero sized arrays. */
+-#ifdef __GNUC__
+-# define ZERO 0
+-#else
+-# define ZERO 1
+-#endif
+-
+-/* A set of settings bound to a message domain. Used to store settings
+- from bindtextdomain() and bind_textdomain_codeset(). */
+-struct binding
+-{
+- struct binding *next;
+- char *dirname;
+- int codeset_cntr; /* Incremented each time codeset changes. */
+- char *codeset;
+- char domainname[ZERO];
+-};
+-
+-/* A counter which is incremented each time some previous translations
+- become invalid.
+- This variable is part of the external ABI of the GNU libintl. */
+-extern int _nl_msg_cat_cntr;
+-
+-#ifndef _LIBC
+-const char *_nl_language_preferences_default (void);
+-const char *_nl_locale_name_posix (int category, const char *categoryname);
+-const char *_nl_locale_name_default (void);
+-const char *_nl_locale_name (int category, const char *categoryname);
+-#endif
+-
+-struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
+- const char *__domainname,
+- struct binding *__domainbinding)
+- internal_function;
+-void _nl_load_domain (struct loaded_l10nfile *__domain,
+- struct binding *__domainbinding)
+- internal_function;
+-void _nl_unload_domain (struct loaded_domain *__domain)
+- internal_function;
+-const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
+- struct loaded_domain *__domain,
+- struct binding *__domainbinding)
+- internal_function;
+-void _nl_free_domain_conv (struct loaded_domain *__domain)
+- internal_function;
+-
+-char *_nl_find_msg (struct loaded_l10nfile *domain_file,
+- struct binding *domainbinding, const char *msgid,
+- size_t *lengthp)
+- internal_function;
+-
+-#ifdef _LIBC
+-extern char *__gettext (const char *__msgid);
+-extern char *__dgettext (const char *__domainname, const char *__msgid);
+-extern char *__dcgettext (const char *__domainname, const char *__msgid,
+- int __category);
+-extern char *__ngettext (const char *__msgid1, const char *__msgid2,
+- unsigned long int __n);
+-extern char *__dngettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- unsigned long int n);
+-extern char *__dcngettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- unsigned long int __n, int __category);
+-extern char *__dcigettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- int __plural, unsigned long int __n,
+- int __category);
+-extern char *__textdomain (const char *__domainname);
+-extern char *__bindtextdomain (const char *__domainname,
+- const char *__dirname);
+-extern char *__bind_textdomain_codeset (const char *__domainname,
+- const char *__codeset);
+-#else
+-/* Declare the exported libintl_* functions, in a way that allows us to
+- call them under their real name. */
+-# undef _INTL_REDIRECT_INLINE
+-# undef _INTL_REDIRECT_MACROS
+-# define _INTL_REDIRECT_MACROS
+-# include "libgnuintl.h"
+-extern char *libintl_dcigettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- int __plural, unsigned long int __n,
+- int __category);
+-#endif
+-
+-/* @@ begin of epilog @@ */
+-
+-#endif /* gettextP.h */
+diff -urN BUILD/abook-0.6.0pre2/intl/gmo.h abook/intl/gmo.h
+--- BUILD/abook-0.6.0pre2/intl/gmo.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/gmo.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,149 +0,0 @@
+-/* Description of GNU message catalog format: general file layout.
+- Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _GETTEXT_H
+-#define _GETTEXT_H 1
+-
+-#include <limits.h>
+-
+-/* @@ end of prolog @@ */
+-
+-/* The magic number of the GNU message catalog format. */
+-#define _MAGIC 0x950412de
+-#define _MAGIC_SWAPPED 0xde120495
+-
+-/* Revision number of the currently used .mo (binary) file format. */
+-#define MO_REVISION_NUMBER 0
+-#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
+-
+-/* The following contortions are an attempt to use the C preprocessor
+- to determine an unsigned integral type that is 32 bits wide. An
+- alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+- as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
+- when cross-compiling. */
+-
+-#if __STDC__
+-# define UINT_MAX_32_BITS 4294967295U
+-#else
+-# define UINT_MAX_32_BITS 0xFFFFFFFF
+-#endif
+-
+-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+- This should be valid for all systems GNU cares about because
+- that doesn't include 16-bit systems, and only modern systems
+- (that certainly have <limits.h>) have 64+-bit integral types. */
+-
+-#ifndef UINT_MAX
+-# define UINT_MAX UINT_MAX_32_BITS
+-#endif
+-
+-#if UINT_MAX == UINT_MAX_32_BITS
+-typedef unsigned nls_uint32;
+-#else
+-# if USHRT_MAX == UINT_MAX_32_BITS
+-typedef unsigned short nls_uint32;
+-# else
+-# if ULONG_MAX == UINT_MAX_32_BITS
+-typedef unsigned long nls_uint32;
+-# else
+- /* The following line is intended to throw an error. Using #error is
+- not portable enough. */
+- "Cannot determine unsigned 32-bit data type."
+-# endif
+-# endif
+-#endif
+-
+-
+-/* Header for binary .mo file format. */
+-struct mo_file_header
+-{
+- /* The magic number. */
+- nls_uint32 magic;
+- /* The revision number of the file format. */
+- nls_uint32 revision;
+-
+- /* The following are only used in .mo files with major revision 0 or 1. */
+-
+- /* The number of strings pairs. */
+- nls_uint32 nstrings;
+- /* Offset of table with start offsets of original strings. */
+- nls_uint32 orig_tab_offset;
+- /* Offset of table with start offsets of translated strings. */
+- nls_uint32 trans_tab_offset;
+- /* Size of hash table. */
+- nls_uint32 hash_tab_size;
+- /* Offset of first hash table entry. */
+- nls_uint32 hash_tab_offset;
+-
+- /* The following are only used in .mo files with minor revision >= 1. */
+-
+- /* The number of system dependent segments. */
+- nls_uint32 n_sysdep_segments;
+- /* Offset of table describing system dependent segments. */
+- nls_uint32 sysdep_segments_offset;
+- /* The number of system dependent strings pairs. */
+- nls_uint32 n_sysdep_strings;
+- /* Offset of table with start offsets of original sysdep strings. */
+- nls_uint32 orig_sysdep_tab_offset;
+- /* Offset of table with start offsets of translated sysdep strings. */
+- nls_uint32 trans_sysdep_tab_offset;
+-};
+-
+-/* Descriptor for static string contained in the binary .mo file. */
+-struct string_desc
+-{
+- /* Length of addressed string, not including the trailing NUL. */
+- nls_uint32 length;
+- /* Offset of string in file. */
+- nls_uint32 offset;
+-};
+-
+-/* The following are only used in .mo files with minor revision >= 1. */
+-
+-/* Descriptor for system dependent string segment. */
+-struct sysdep_segment
+-{
+- /* Length of addressed string, including the trailing NUL. */
+- nls_uint32 length;
+- /* Offset of string in file. */
+- nls_uint32 offset;
+-};
+-
+-/* Descriptor for system dependent string. */
+-struct sysdep_string
+-{
+- /* Offset of static string segments in file. */
+- nls_uint32 offset;
+- /* Alternating sequence of static and system dependent segments.
+- The last segment is a static segment, including the trailing NUL. */
+- struct segment_pair
+- {
+- /* Size of static segment. */
+- nls_uint32 segsize;
+- /* Reference to system dependent string segment, or ~0 at the end. */
+- nls_uint32 sysdepref;
+- } segments[1];
+-};
+-
+-/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
+- regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
+-#define SEGMENTS_END ((nls_uint32) ~0)
+-
+-/* @@ begin of epilog @@ */
+-
+-#endif /* gettext.h */
+diff -urN BUILD/abook-0.6.0pre2/intl/hash-string.h abook/intl/hash-string.h
+--- BUILD/abook-0.6.0pre2/intl/hash-string.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/hash-string.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,48 +0,0 @@
+-/* Description of GNU message catalog format: string hashing function.
+- Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* @@ end of prolog @@ */
+-
+-/* We assume to have `unsigned long int' value with at least 32 bits. */
+-#define HASHWORDBITS 32
+-
+-
+-/* Defines the so called `hashpjw' function by P.J. Weinberger
+- [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
+- 1986, 1987 Bell Telephone Laboratories, Inc.] */
+-static inline unsigned long int
+-hash_string (const char *str_param)
+-{
+- unsigned long int hval, g;
+- const char *str = str_param;
+-
+- /* Compute the hash value for the given string. */
+- hval = 0;
+- while (*str != '\0')
+- {
+- hval <<= 4;
+- hval += (unsigned char) *str++;
+- g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
+- if (g != 0)
+- {
+- hval ^= g >> (HASHWORDBITS - 8);
+- hval ^= g;
+- }
+- }
+- return hval;
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/intl-compat.c abook/intl/intl-compat.c
+--- BUILD/abook-0.6.0pre2/intl/intl-compat.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/intl-compat.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,131 +0,0 @@
+-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
+- Library.
+- Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include "gettextP.h"
+-
+-/* @@ end of prolog @@ */
+-
+-/* This file redirects the gettext functions (without prefix) to those
+- defined in the included GNU libintl library (with "libintl_" prefix).
+- It is compiled into libintl in order to make the AM_GNU_GETTEXT test
+- of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
+- has the redirections primarily in the <libintl.h> include file.
+- It is also compiled into libgnuintl so that libgnuintl.so can be used
+- as LD_PRELOADable library on glibc systems, to provide the extra
+- features that the functions in the libc don't have (namely, logging). */
+-
+-
+-#undef gettext
+-#undef dgettext
+-#undef dcgettext
+-#undef ngettext
+-#undef dngettext
+-#undef dcngettext
+-#undef textdomain
+-#undef bindtextdomain
+-#undef bind_textdomain_codeset
+-
+-
+-/* When building a DLL, we must export some functions. Note that because
+- the functions are only defined for binary backward compatibility, we
+- don't need to use __declspec(dllimport) in any case. */
+-#if defined _MSC_VER && BUILDING_DLL
+-# define DLL_EXPORTED __declspec(dllexport)
+-#else
+-# define DLL_EXPORTED
+-#endif
+-
+-
+-DLL_EXPORTED
+-char *
+-gettext (const char *msgid)
+-{
+- return libintl_gettext (msgid);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-dgettext (const char *domainname, const char *msgid)
+-{
+- return libintl_dgettext (domainname, msgid);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-dcgettext (const char *domainname, const char *msgid, int category)
+-{
+- return libintl_dcgettext (domainname, msgid, category);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
+-{
+- return libintl_ngettext (msgid1, msgid2, n);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-dngettext (const char *domainname,
+- const char *msgid1, const char *msgid2, unsigned long int n)
+-{
+- return libintl_dngettext (domainname, msgid1, msgid2, n);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-dcngettext (const char *domainname,
+- const char *msgid1, const char *msgid2, unsigned long int n,
+- int category)
+-{
+- return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-textdomain (const char *domainname)
+-{
+- return libintl_textdomain (domainname);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-bindtextdomain (const char *domainname, const char *dirname)
+-{
+- return libintl_bindtextdomain (domainname, dirname);
+-}
+-
+-
+-DLL_EXPORTED
+-char *
+-bind_textdomain_codeset (const char *domainname, const char *codeset)
+-{
+- return libintl_bind_textdomain_codeset (domainname, codeset);
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/l10nflist.c abook/intl/l10nflist.c
+--- BUILD/abook-0.6.0pre2/intl/l10nflist.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/l10nflist.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,421 +0,0 @@
+-/* Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
+- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
+- This must come before <config.h> because <config.h> may include
+- <features.h>, and once <features.h> has been included, it's too late. */
+-#ifndef _GNU_SOURCE
+-# define _GNU_SOURCE 1
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <string.h>
+-
+-#if defined _LIBC || defined HAVE_ARGZ_H
+-# include <argz.h>
+-#endif
+-#include <ctype.h>
+-#include <sys/types.h>
+-#include <stdlib.h>
+-
+-#include "loadinfo.h"
+-
+-/* On some strange systems still no definition of NULL is found. Sigh! */
+-#ifndef NULL
+-# if defined __STDC__ && __STDC__
+-# define NULL ((void *) 0)
+-# else
+-# define NULL 0
+-# endif
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-#ifdef _LIBC
+-/* Rename the non ANSI C functions. This is required by the standard
+- because some ANSI C functions will require linking with this object
+- file and the name space must not be polluted. */
+-# ifndef stpcpy
+-# define stpcpy(dest, src) __stpcpy(dest, src)
+-# endif
+-#else
+-# ifndef HAVE_STPCPY
+-static char *stpcpy (char *dest, const char *src);
+-# endif
+-#endif
+-
+-/* Pathname support.
+- ISSLASH(C) tests whether C is a directory separator character.
+- IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
+- it may be concatenated to a directory pathname.
+- */
+-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+- /* Win32, Cygwin, OS/2, DOS */
+-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+-# define HAS_DEVICE(P) \
+- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+- && (P)[1] == ':')
+-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+-#else
+- /* Unix */
+-# define ISSLASH(C) ((C) == '/')
+-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+-#endif
+-
+-/* Define function which are usually not available. */
+-
+-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
+-/* Returns the number of strings in ARGZ. */
+-static size_t
+-argz_count__ (const char *argz, size_t len)
+-{
+- size_t count = 0;
+- while (len > 0)
+- {
+- size_t part_len = strlen (argz);
+- argz += part_len + 1;
+- len -= part_len + 1;
+- count++;
+- }
+- return count;
+-}
+-# undef __argz_count
+-# define __argz_count(argz, len) argz_count__ (argz, len)
+-#else
+-# ifdef _LIBC
+-# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+-# endif
+-#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
+-
+-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
+-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
+- except the last into the character SEP. */
+-static void
+-argz_stringify__ (char *argz, size_t len, int sep)
+-{
+- while (len > 0)
+- {
+- size_t part_len = strlen (argz);
+- argz += part_len;
+- len -= part_len + 1;
+- if (len > 0)
+- *argz++ = sep;
+- }
+-}
+-# undef __argz_stringify
+-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+-#else
+-# ifdef _LIBC
+-# define __argz_stringify(argz, len, sep) \
+- INTUSE(__argz_stringify) (argz, len, sep)
+-# endif
+-#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
+-
+-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
+-static char *
+-argz_next__ (char *argz, size_t argz_len, const char *entry)
+-{
+- if (entry)
+- {
+- if (entry < argz + argz_len)
+- entry = strchr (entry, '\0') + 1;
+-
+- return entry >= argz + argz_len ? NULL : (char *) entry;
+- }
+- else
+- if (argz_len > 0)
+- return argz;
+- else
+- return 0;
+-}
+-# undef __argz_next
+-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
+-#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
+-
+-
+-/* Return number of bits set in X. */
+-static inline int
+-pop (int x)
+-{
+- /* We assume that no more than 16 bits are used. */
+- x = ((x & ~0x5555) >> 1) + (x & 0x5555);
+- x = ((x & ~0x3333) >> 2) + (x & 0x3333);
+- x = ((x >> 4) + x) & 0x0f0f;
+- x = ((x >> 8) + x) & 0xff;
+-
+- return x;
+-}
+-
+-\f
+-struct loaded_l10nfile *
+-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
+- const char *dirlist, size_t dirlist_len,
+- int mask, const char *language, const char *territory,
+- const char *codeset, const char *normalized_codeset,
+- const char *modifier, const char *special,
+- const char *sponsor, const char *revision,
+- const char *filename, int do_allocate)
+-{
+- char *abs_filename;
+- struct loaded_l10nfile **lastp;
+- struct loaded_l10nfile *retval;
+- char *cp;
+- size_t dirlist_count;
+- size_t entries;
+- int cnt;
+-
+- /* If LANGUAGE contains an absolute directory specification, we ignore
+- DIRLIST. */
+- if (IS_ABSOLUTE_PATH (language))
+- dirlist_len = 0;
+-
+- /* Allocate room for the full file name. */
+- abs_filename = (char *) malloc (dirlist_len
+- + strlen (language)
+- + ((mask & TERRITORY) != 0
+- ? strlen (territory) + 1 : 0)
+- + ((mask & XPG_CODESET) != 0
+- ? strlen (codeset) + 1 : 0)
+- + ((mask & XPG_NORM_CODESET) != 0
+- ? strlen (normalized_codeset) + 1 : 0)
+- + (((mask & XPG_MODIFIER) != 0
+- || (mask & CEN_AUDIENCE) != 0)
+- ? strlen (modifier) + 1 : 0)
+- + ((mask & CEN_SPECIAL) != 0
+- ? strlen (special) + 1 : 0)
+- + (((mask & CEN_SPONSOR) != 0
+- || (mask & CEN_REVISION) != 0)
+- ? (1 + ((mask & CEN_SPONSOR) != 0
+- ? strlen (sponsor) : 0)
+- + ((mask & CEN_REVISION) != 0
+- ? strlen (revision) + 1 : 0)) : 0)
+- + 1 + strlen (filename) + 1);
+-
+- if (abs_filename == NULL)
+- return NULL;
+-
+- /* Construct file name. */
+- cp = abs_filename;
+- if (dirlist_len > 0)
+- {
+- memcpy (cp, dirlist, dirlist_len);
+- __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
+- cp += dirlist_len;
+- cp[-1] = '/';
+- }
+-
+- cp = stpcpy (cp, language);
+-
+- if ((mask & TERRITORY) != 0)
+- {
+- *cp++ = '_';
+- cp = stpcpy (cp, territory);
+- }
+- if ((mask & XPG_CODESET) != 0)
+- {
+- *cp++ = '.';
+- cp = stpcpy (cp, codeset);
+- }
+- if ((mask & XPG_NORM_CODESET) != 0)
+- {
+- *cp++ = '.';
+- cp = stpcpy (cp, normalized_codeset);
+- }
+- if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
+- {
+- /* This component can be part of both syntaces but has different
+- leading characters. For CEN we use `+', else `@'. */
+- *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
+- cp = stpcpy (cp, modifier);
+- }
+- if ((mask & CEN_SPECIAL) != 0)
+- {
+- *cp++ = '+';
+- cp = stpcpy (cp, special);
+- }
+- if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
+- {
+- *cp++ = ',';
+- if ((mask & CEN_SPONSOR) != 0)
+- cp = stpcpy (cp, sponsor);
+- if ((mask & CEN_REVISION) != 0)
+- {
+- *cp++ = '_';
+- cp = stpcpy (cp, revision);
+- }
+- }
+-
+- *cp++ = '/';
+- stpcpy (cp, filename);
+-
+- /* Look in list of already loaded domains whether it is already
+- available. */
+- lastp = l10nfile_list;
+- for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
+- if (retval->filename != NULL)
+- {
+- int compare = strcmp (retval->filename, abs_filename);
+- if (compare == 0)
+- /* We found it! */
+- break;
+- if (compare < 0)
+- {
+- /* It's not in the list. */
+- retval = NULL;
+- break;
+- }
+-
+- lastp = &retval->next;
+- }
+-
+- if (retval != NULL || do_allocate == 0)
+- {
+- free (abs_filename);
+- return retval;
+- }
+-
+- dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
+-
+- /* Allocate a new loaded_l10nfile. */
+- retval =
+- (struct loaded_l10nfile *)
+- malloc (sizeof (*retval)
+- + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
+- * sizeof (struct loaded_l10nfile *)));
+- if (retval == NULL)
+- return NULL;
+-
+- retval->filename = abs_filename;
+-
+- /* We set retval->data to NULL here; it is filled in later.
+- Setting retval->decided to 1 here means that retval does not
+- correspond to a real file (dirlist_count > 1) or is not worth
+- looking up (if an unnormalized codeset was specified). */
+- retval->decided = (dirlist_count > 1
+- || ((mask & XPG_CODESET) != 0
+- && (mask & XPG_NORM_CODESET) != 0));
+- retval->data = NULL;
+-
+- retval->next = *lastp;
+- *lastp = retval;
+-
+- entries = 0;
+- /* Recurse to fill the inheritance list of RETVAL.
+- If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
+- entry does not correspond to a real file; retval->filename contains
+- colons. In this case we loop across all elements of DIRLIST and
+- across all bit patterns dominated by MASK.
+- If the DIRLIST is a single directory or entirely redundant (i.e.
+- DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
+- MASK, excluding MASK itself.
+- In either case, we loop down from MASK to 0. This has the effect
+- that the extra bits in the locale name are dropped in this order:
+- first the modifier, then the territory, then the codeset, then the
+- normalized_codeset. */
+- for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
+- if ((cnt & ~mask) == 0
+- && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
+- && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
+- {
+- if (dirlist_count > 1)
+- {
+- /* Iterate over all elements of the DIRLIST. */
+- char *dir = NULL;
+-
+- while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
+- != NULL)
+- retval->successor[entries++]
+- = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
+- cnt, language, territory, codeset,
+- normalized_codeset, modifier, special,
+- sponsor, revision, filename, 1);
+- }
+- else
+- retval->successor[entries++]
+- = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
+- cnt, language, territory, codeset,
+- normalized_codeset, modifier, special,
+- sponsor, revision, filename, 1);
+- }
+- retval->successor[entries] = NULL;
+-
+- return retval;
+-}
+-\f
+-/* Normalize codeset name. There is no standard for the codeset
+- names. Normalization allows the user to use any of the common
+- names. The return value is dynamically allocated and has to be
+- freed by the caller. */
+-const char *
+-_nl_normalize_codeset (const char *codeset, size_t name_len)
+-{
+- int len = 0;
+- int only_digit = 1;
+- char *retval;
+- char *wp;
+- size_t cnt;
+-
+- for (cnt = 0; cnt < name_len; ++cnt)
+- if (isalnum ((unsigned char) codeset[cnt]))
+- {
+- ++len;
+-
+- if (isalpha ((unsigned char) codeset[cnt]))
+- only_digit = 0;
+- }
+-
+- retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
+-
+- if (retval != NULL)
+- {
+- if (only_digit)
+- wp = stpcpy (retval, "iso");
+- else
+- wp = retval;
+-
+- for (cnt = 0; cnt < name_len; ++cnt)
+- if (isalpha ((unsigned char) codeset[cnt]))
+- *wp++ = tolower ((unsigned char) codeset[cnt]);
+- else if (isdigit ((unsigned char) codeset[cnt]))
+- *wp++ = codeset[cnt];
+-
+- *wp = '\0';
+- }
+-
+- return (const char *) retval;
+-}
+-
+-
+-/* @@ begin of epilog @@ */
+-
+-/* We don't want libintl.a to depend on any other library. So we
+- avoid the non-standard function stpcpy. In GNU C Library this
+- function is available, though. Also allow the symbol HAVE_STPCPY
+- to be defined. */
+-#if !_LIBC && !HAVE_STPCPY
+-static char *
+-stpcpy (char *dest, const char *src)
+-{
+- while ((*dest++ = *src++) != '\0')
+- /* Do nothing. */ ;
+- return dest - 1;
+-}
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/langprefs.c abook/intl/langprefs.c
+--- BUILD/abook-0.6.0pre2/intl/langprefs.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/langprefs.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,130 +0,0 @@
+-/* Determine the user's language preferences.
+- Copyright (C) 2004-2005 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Written by Bruno Haible <bruno@clisp.org>. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdlib.h>
+-
+-#if HAVE_CFPREFERENCESCOPYAPPVALUE
+-# include <string.h>
+-# include <CFPreferences.h>
+-# include <CFPropertyList.h>
+-# include <CFArray.h>
+-# include <CFString.h>
+-extern void _nl_locale_name_canonicalize (char *name);
+-#endif
+-
+-/* Determine the user's language preferences, as a colon separated list of
+- locale names in XPG syntax
+- language[_territory[.codeset]][@modifier]
+- The result must not be freed; it is statically allocated.
+- The LANGUAGE environment variable does not need to be considered; it is
+- already taken into account by the caller. */
+-
+-const char *
+-_nl_language_preferences_default (void)
+-{
+-#if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
+- {
+- /* Cache the preferences list, since CoreFoundation calls are expensive. */
+- static const char *cached_languages;
+- static int cache_initialized;
+-
+- if (!cache_initialized)
+- {
+- CFTypeRef preferences =
+- CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"),
+- kCFPreferencesCurrentApplication);
+- if (preferences != NULL
+- && CFGetTypeID (preferences) == CFArrayGetTypeID ())
+- {
+- CFArrayRef prefArray = (CFArrayRef)preferences;
+- int n = CFArrayGetCount (prefArray);
+- char buf[256];
+- size_t size = 0;
+- int i;
+-
+- for (i = 0; i < n; i++)
+- {
+- CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i);
+- if (element != NULL
+- && CFGetTypeID (element) == CFStringGetTypeID ()
+- && CFStringGetCString ((CFStringRef)element,
+- buf, sizeof (buf),
+- kCFStringEncodingASCII))
+- {
+- _nl_locale_name_canonicalize (buf);
+- size += strlen (buf) + 1;
+- /* Most GNU programs use msgids in English and don't ship
+- an en.mo message catalog. Therefore when we see "en"
+- in the preferences list, arrange for gettext() to
+- return the msgid, and ignore all further elements of
+- the preferences list. */
+- if (strcmp (buf, "en") == 0)
+- break;
+- }
+- else
+- break;
+- }
+- if (size > 0)
+- {
+- char *languages = (char *) malloc (size);
+-
+- if (languages != NULL)
+- {
+- char *p = languages;
+-
+- for (i = 0; i < n; i++)
+- {
+- CFTypeRef element =
+- CFArrayGetValueAtIndex (prefArray, i);
+- if (element != NULL
+- && CFGetTypeID (element) == CFStringGetTypeID ()
+- && CFStringGetCString ((CFStringRef)element,
+- buf, sizeof (buf),
+- kCFStringEncodingASCII))
+- {
+- _nl_locale_name_canonicalize (buf);
+- strcpy (p, buf);
+- p += strlen (buf);
+- *p++ = ':';
+- if (strcmp (buf, "en") == 0)
+- break;
+- }
+- else
+- break;
+- }
+- *--p = '\0';
+-
+- cached_languages = languages;
+- }
+- }
+- }
+- cache_initialized = 1;
+- }
+- if (cached_languages != NULL)
+- return cached_languages;
+- }
+-#endif
+-
+- return NULL;
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/libgnuintl.h.in abook/intl/libgnuintl.h.in
+--- BUILD/abook-0.6.0pre2/intl/libgnuintl.h.in 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/libgnuintl.h.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,383 +0,0 @@
+-/* Message catalogs for internationalization.
+- Copyright (C) 1995-1997, 2000-2004 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _LIBINTL_H
+-#define _LIBINTL_H 1
+-
+-#include <locale.h>
+-
+-/* The LC_MESSAGES locale category is the category used by the functions
+- gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
+- On systems that don't define it, use an arbitrary value instead.
+- On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+- then includes <libintl.h> (i.e. this file!) and then only defines
+- LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
+- in this case. */
+-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
+-# define LC_MESSAGES 1729
+-#endif
+-
+-/* We define an additional symbol to signal that we use the GNU
+- implementation of gettext. */
+-#define __USE_GNU_GETTEXT 1
+-
+-/* Provide information about the supported file formats. Returns the
+- maximum minor revision number supported for a given major revision. */
+-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
+- ((major) == 0 || (major) == 1 ? 1 : -1)
+-
+-/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
+- precedence over _conio_gettext. */
+-#ifdef __DJGPP__
+-# undef gettext
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-
+-/* We redirect the functions to those prefixed with "libintl_". This is
+- necessary, because some systems define gettext/textdomain/... in the C
+- library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
+- If we used the unprefixed names, there would be cases where the
+- definition in the C library would override the one in the libintl.so
+- shared library. Recall that on ELF systems, the symbols are looked
+- up in the following order:
+- 1. in the executable,
+- 2. in the shared libraries specified on the link command line, in order,
+- 3. in the dependencies of the shared libraries specified on the link
+- command line,
+- 4. in the dlopen()ed shared libraries, in the order in which they were
+- dlopen()ed.
+- The definition in the C library would override the one in libintl.so if
+- either
+- * -lc is given on the link command line and -lintl isn't, or
+- * -lc is given on the link command line before -lintl, or
+- * libintl.so is a dependency of a dlopen()ed shared library but not
+- linked to the executable at link time.
+- Since Solaris gettext() behaves differently than GNU gettext(), this
+- would be unacceptable.
+-
+- The redirection happens by default through macros in C, so that &gettext
+- is independent of the compilation unit, but through inline functions in
+- C++, in order not to interfere with the name mangling of class fields or
+- class methods called 'gettext'. */
+-
+-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
+- If he doesn't, we choose the method. A third possible method is
+- _INTL_REDIRECT_ASM, supported only by GCC. */
+-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+-# define _INTL_REDIRECT_ASM
+-# else
+-# ifdef __cplusplus
+-# define _INTL_REDIRECT_INLINE
+-# else
+-# define _INTL_REDIRECT_MACROS
+-# endif
+-# endif
+-#endif
+-/* Auxiliary macros. */
+-#ifdef _INTL_REDIRECT_ASM
+-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
+-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
+-# define _INTL_STRINGIFY(prefix) #prefix
+-#else
+-# define _INTL_ASM(cname)
+-#endif
+-
+-/* Look up MSGID in the current default message catalog for the current
+- LC_MESSAGES locale. If not found, returns MSGID itself (the default
+- text). */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_gettext (const char *__msgid);
+-static inline char *gettext (const char *__msgid)
+-{
+- return libintl_gettext (__msgid);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define gettext libintl_gettext
+-#endif
+-extern char *gettext (const char *__msgid)
+- _INTL_ASM (libintl_gettext);
+-#endif
+-
+-/* Look up MSGID in the DOMAINNAME message catalog for the current
+- LC_MESSAGES locale. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
+-static inline char *dgettext (const char *__domainname, const char *__msgid)
+-{
+- return libintl_dgettext (__domainname, __msgid);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define dgettext libintl_dgettext
+-#endif
+-extern char *dgettext (const char *__domainname, const char *__msgid)
+- _INTL_ASM (libintl_dgettext);
+-#endif
+-
+-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+- locale. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
+- int __category);
+-static inline char *dcgettext (const char *__domainname, const char *__msgid,
+- int __category)
+-{
+- return libintl_dcgettext (__domainname, __msgid, __category);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define dcgettext libintl_dcgettext
+-#endif
+-extern char *dcgettext (const char *__domainname, const char *__msgid,
+- int __category)
+- _INTL_ASM (libintl_dcgettext);
+-#endif
+-
+-
+-/* Similar to `gettext' but select the plural form corresponding to the
+- number N. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
+- unsigned long int __n);
+-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
+- unsigned long int __n)
+-{
+- return libintl_ngettext (__msgid1, __msgid2, __n);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define ngettext libintl_ngettext
+-#endif
+-extern char *ngettext (const char *__msgid1, const char *__msgid2,
+- unsigned long int __n)
+- _INTL_ASM (libintl_ngettext);
+-#endif
+-
+-/* Similar to `dgettext' but select the plural form corresponding to the
+- number N. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
+- const char *__msgid2, unsigned long int __n);
+-static inline char *dngettext (const char *__domainname, const char *__msgid1,
+- const char *__msgid2, unsigned long int __n)
+-{
+- return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define dngettext libintl_dngettext
+-#endif
+-extern char *dngettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- unsigned long int __n)
+- _INTL_ASM (libintl_dngettext);
+-#endif
+-
+-/* Similar to `dcgettext' but select the plural form corresponding to the
+- number N. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_dcngettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- unsigned long int __n, int __category);
+-static inline char *dcngettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- unsigned long int __n, int __category)
+-{
+- return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define dcngettext libintl_dcngettext
+-#endif
+-extern char *dcngettext (const char *__domainname,
+- const char *__msgid1, const char *__msgid2,
+- unsigned long int __n, int __category)
+- _INTL_ASM (libintl_dcngettext);
+-#endif
+-
+-
+-/* Set the current default message catalog to DOMAINNAME.
+- If DOMAINNAME is null, return the current default.
+- If DOMAINNAME is "", reset to the default of "messages". */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_textdomain (const char *__domainname);
+-static inline char *textdomain (const char *__domainname)
+-{
+- return libintl_textdomain (__domainname);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define textdomain libintl_textdomain
+-#endif
+-extern char *textdomain (const char *__domainname)
+- _INTL_ASM (libintl_textdomain);
+-#endif
+-
+-/* Specify that the DOMAINNAME message catalog will be found
+- in DIRNAME rather than in the system locale data base. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_bindtextdomain (const char *__domainname,
+- const char *__dirname);
+-static inline char *bindtextdomain (const char *__domainname,
+- const char *__dirname)
+-{
+- return libintl_bindtextdomain (__domainname, __dirname);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define bindtextdomain libintl_bindtextdomain
+-#endif
+-extern char *bindtextdomain (const char *__domainname, const char *__dirname)
+- _INTL_ASM (libintl_bindtextdomain);
+-#endif
+-
+-/* Specify the character encoding in which the messages from the
+- DOMAINNAME message catalog will be returned. */
+-#ifdef _INTL_REDIRECT_INLINE
+-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
+- const char *__codeset);
+-static inline char *bind_textdomain_codeset (const char *__domainname,
+- const char *__codeset)
+-{
+- return libintl_bind_textdomain_codeset (__domainname, __codeset);
+-}
+-#else
+-#ifdef _INTL_REDIRECT_MACROS
+-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
+-#endif
+-extern char *bind_textdomain_codeset (const char *__domainname,
+- const char *__codeset)
+- _INTL_ASM (libintl_bind_textdomain_codeset);
+-#endif
+-
+-
+-/* Support for format strings with positions in *printf(), following the
+- POSIX/XSI specification.
+- Note: These replacements for the *printf() functions are visible only
+- in source files that #include <libintl.h> or #include "gettext.h".
+- Packages that use *printf() in source files that don't refer to _()
+- or gettext() but for which the format string could be the return value
+- of _() or gettext() need to add this #include. Oh well. */
+-
+-#if !@HAVE_POSIX_PRINTF@
+-
+-#include <stdio.h>
+-#include <stddef.h>
+-
+-/* Get va_list. */
+-#if __STDC__ || defined __cplusplus || defined _MSC_VER
+-# include <stdarg.h>
+-#else
+-# include <varargs.h>
+-#endif
+-
+-#undef fprintf
+-#define fprintf libintl_fprintf
+-extern int fprintf (FILE *, const char *, ...);
+-#undef vfprintf
+-#define vfprintf libintl_vfprintf
+-extern int vfprintf (FILE *, const char *, va_list);
+-
+-#undef printf
+-#define printf libintl_printf
+-extern int printf (const char *, ...);
+-#undef vprintf
+-#define vprintf libintl_vprintf
+-extern int vprintf (const char *, va_list);
+-
+-#undef sprintf
+-#define sprintf libintl_sprintf
+-extern int sprintf (char *, const char *, ...);
+-#undef vsprintf
+-#define vsprintf libintl_vsprintf
+-extern int vsprintf (char *, const char *, va_list);
+-
+-#if @HAVE_SNPRINTF@
+-
+-#undef snprintf
+-#define snprintf libintl_snprintf
+-extern int snprintf (char *, size_t, const char *, ...);
+-#undef vsnprintf
+-#define vsnprintf libintl_vsnprintf
+-extern int vsnprintf (char *, size_t, const char *, va_list);
+-
+-#endif
+-
+-#if @HAVE_ASPRINTF@
+-
+-#undef asprintf
+-#define asprintf libintl_asprintf
+-extern int asprintf (char **, const char *, ...);
+-#undef vasprintf
+-#define vasprintf libintl_vasprintf
+-extern int vasprintf (char **, const char *, va_list);
+-
+-#endif
+-
+-#if @HAVE_WPRINTF@
+-
+-#undef fwprintf
+-#define fwprintf libintl_fwprintf
+-extern int fwprintf (FILE *, const wchar_t *, ...);
+-#undef vfwprintf
+-#define vfwprintf libintl_vfwprintf
+-extern int vfwprintf (FILE *, const wchar_t *, va_list);
+-
+-#undef wprintf
+-#define wprintf libintl_wprintf
+-extern int wprintf (const wchar_t *, ...);
+-#undef vwprintf
+-#define vwprintf libintl_vwprintf
+-extern int vwprintf (const wchar_t *, va_list);
+-
+-#undef swprintf
+-#define swprintf libintl_swprintf
+-extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
+-#undef vswprintf
+-#define vswprintf libintl_vswprintf
+-extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
+-
+-#endif
+-
+-#endif
+-
+-
+-/* Support for relocatable packages. */
+-
+-/* Sets the original and the current installation prefix of the package.
+- Relocation simply replaces a pathname starting with the original prefix
+- by the corresponding pathname with the current prefix instead. Both
+- prefixes should be directory names without trailing slash (i.e. use ""
+- instead of "/"). */
+-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
+-extern void
+- libintl_set_relocation_prefix (const char *orig_prefix,
+- const char *curr_prefix);
+-
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* libintl.h */
+diff -urN BUILD/abook-0.6.0pre2/intl/loadinfo.h abook/intl/loadinfo.h
+--- BUILD/abook-0.6.0pre2/intl/loadinfo.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/loadinfo.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,145 +0,0 @@
+-/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _LOADINFO_H
+-#define _LOADINFO_H 1
+-
+-/* Declarations of locale dependent catalog lookup functions.
+- Implemented in
+-
+- localealias.c Possibly replace a locale name by another.
+- explodename.c Split a locale name into its various fields.
+- l10nflist.c Generate a list of filenames of possible message catalogs.
+- finddomain.c Find and open the relevant message catalogs.
+-
+- The main function _nl_find_domain() in finddomain.c is declared
+- in gettextP.h.
+- */
+-
+-#ifndef internal_function
+-# define internal_function
+-#endif
+-
+-/* Tell the compiler when a conditional or integer expression is
+- almost always true or almost always false. */
+-#ifndef HAVE_BUILTIN_EXPECT
+-# define __builtin_expect(expr, val) (expr)
+-#endif
+-
+-/* Separator in PATH like lists of pathnames. */
+-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+- /* Win32, OS/2, DOS */
+-# define PATH_SEPARATOR ';'
+-#else
+- /* Unix */
+-# define PATH_SEPARATOR ':'
+-#endif
+-
+-/* Encoding of locale name parts. */
+-#define CEN_REVISION 1
+-#define CEN_SPONSOR 2
+-#define CEN_SPECIAL 4
+-#define XPG_NORM_CODESET 8
+-#define XPG_CODESET 16
+-#define TERRITORY 32
+-#define CEN_AUDIENCE 64
+-#define XPG_MODIFIER 128
+-
+-#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
+-#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
+-
+-
+-struct loaded_l10nfile
+-{
+- const char *filename;
+- int decided;
+-
+- const void *data;
+-
+- struct loaded_l10nfile *next;
+- struct loaded_l10nfile *successor[1];
+-};
+-
+-
+-/* Normalize codeset name. There is no standard for the codeset
+- names. Normalization allows the user to use any of the common
+- names. The return value is dynamically allocated and has to be
+- freed by the caller. */
+-extern const char *_nl_normalize_codeset (const char *codeset,
+- size_t name_len);
+-
+-/* Lookup a locale dependent file.
+- *L10NFILE_LIST denotes a pool of lookup results of locale dependent
+- files of the same kind, sorted in decreasing order of ->filename.
+- DIRLIST and DIRLIST_LEN are an argz list of directories in which to
+- look, containing at least one directory (i.e. DIRLIST_LEN > 0).
+- MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
+- SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
+- produced by _nl_explode_name(). FILENAME is the filename suffix.
+- The return value is the lookup result, either found in *L10NFILE_LIST,
+- or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
+- If the return value is non-NULL, it is added to *L10NFILE_LIST, and
+- its ->next field denotes the chaining inside *L10NFILE_LIST, and
+- furthermore its ->successor[] field contains a list of other lookup
+- results from which this lookup result inherits. */
+-extern struct loaded_l10nfile *
+-_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
+- const char *dirlist, size_t dirlist_len, int mask,
+- const char *language, const char *territory,
+- const char *codeset, const char *normalized_codeset,
+- const char *modifier, const char *special,
+- const char *sponsor, const char *revision,
+- const char *filename, int do_allocate);
+-
+-/* Lookup the real locale name for a locale alias NAME, or NULL if
+- NAME is not a locale alias (but possibly a real locale name).
+- The return value is statically allocated and must not be freed. */
+-extern const char *_nl_expand_alias (const char *name);
+-
+-/* Split a locale name NAME into its pieces: language, modifier,
+- territory, codeset, special, sponsor, revision.
+- NAME gets destructively modified: NUL bytes are inserted here and
+- there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
+- *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
+- pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
+- gets assigned the expanded *CODESET, if it is different from *CODESET;
+- this one is dynamically allocated and has to be freed by the caller.
+- The return value is a bitmask, where each bit corresponds to one
+- filled-in value:
+- XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
+- TERRITORY for *TERRITORY,
+- XPG_CODESET for *CODESET,
+- XPG_NORM_CODESET for *NORMALIZED_CODESET,
+- CEN_SPECIAL for *SPECIAL,
+- CEN_SPONSOR for *SPONSOR,
+- CEN_REVISION for *REVISION.
+- */
+-extern int _nl_explode_name (char *name, const char **language,
+- const char **modifier, const char **territory,
+- const char **codeset,
+- const char **normalized_codeset,
+- const char **special, const char **sponsor,
+- const char **revision);
+-
+-/* Split a locale name NAME into a leading language part and all the
+- rest. Return a pointer to the first character after the language,
+- i.e. to the first byte of the rest. */
+-extern char *_nl_find_language (const char *name);
+-
+-#endif /* loadinfo.h */
+diff -urN BUILD/abook-0.6.0pre2/intl/loadmsgcat.c abook/intl/loadmsgcat.c
+--- BUILD/abook-0.6.0pre2/intl/loadmsgcat.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/loadmsgcat.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,1420 +0,0 @@
+-/* Load needed message catalogs.
+- Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+- This must come before <config.h> because <config.h> may include
+- <features.h>, and once <features.h> has been included, it's too late. */
+-#ifndef _GNU_SOURCE
+-# define _GNU_SOURCE 1
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <ctype.h>
+-#include <errno.h>
+-#include <fcntl.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-
+-#ifdef __GNUC__
+-# undef alloca
+-# define alloca __builtin_alloca
+-# define HAVE_ALLOCA 1
+-#else
+-# ifdef _MSC_VER
+-# include <malloc.h>
+-# define alloca _alloca
+-# else
+-# if defined HAVE_ALLOCA_H || defined _LIBC
+-# include <alloca.h>
+-# else
+-# ifdef _AIX
+- #pragma alloca
+-# else
+-# ifndef alloca
+-char *alloca ();
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#if defined HAVE_UNISTD_H || defined _LIBC
+-# include <unistd.h>
+-#endif
+-
+-#ifdef _LIBC
+-# include <langinfo.h>
+-# include <locale.h>
+-#endif
+-
+-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+- || (defined _LIBC && defined _POSIX_MAPPED_FILES)
+-# include <sys/mman.h>
+-# undef HAVE_MMAP
+-# define HAVE_MMAP 1
+-#else
+-# undef HAVE_MMAP
+-#endif
+-
+-#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
+-# include <stdint.h>
+-#endif
+-#if defined HAVE_INTTYPES_H || defined _LIBC
+-# include <inttypes.h>
+-#endif
+-
+-#include "gmo.h"
+-#include "gettextP.h"
+-#include "hash-string.h"
+-#include "plural-exp.h"
+-
+-#ifdef _LIBC
+-# include "../locale/localeinfo.h"
+-#endif
+-
+-/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
+- Note that our fallback values need not be literal strings, because we don't
+- use them with preprocessor string concatenation. */
+-#if !defined PRId8 || PRI_MACROS_BROKEN
+-# undef PRId8
+-# define PRId8 "d"
+-#endif
+-#if !defined PRIi8 || PRI_MACROS_BROKEN
+-# undef PRIi8
+-# define PRIi8 "i"
+-#endif
+-#if !defined PRIo8 || PRI_MACROS_BROKEN
+-# undef PRIo8
+-# define PRIo8 "o"
+-#endif
+-#if !defined PRIu8 || PRI_MACROS_BROKEN
+-# undef PRIu8
+-# define PRIu8 "u"
+-#endif
+-#if !defined PRIx8 || PRI_MACROS_BROKEN
+-# undef PRIx8
+-# define PRIx8 "x"
+-#endif
+-#if !defined PRIX8 || PRI_MACROS_BROKEN
+-# undef PRIX8
+-# define PRIX8 "X"
+-#endif
+-#if !defined PRId16 || PRI_MACROS_BROKEN
+-# undef PRId16
+-# define PRId16 "d"
+-#endif
+-#if !defined PRIi16 || PRI_MACROS_BROKEN
+-# undef PRIi16
+-# define PRIi16 "i"
+-#endif
+-#if !defined PRIo16 || PRI_MACROS_BROKEN
+-# undef PRIo16
+-# define PRIo16 "o"
+-#endif
+-#if !defined PRIu16 || PRI_MACROS_BROKEN
+-# undef PRIu16
+-# define PRIu16 "u"
+-#endif
+-#if !defined PRIx16 || PRI_MACROS_BROKEN
+-# undef PRIx16
+-# define PRIx16 "x"
+-#endif
+-#if !defined PRIX16 || PRI_MACROS_BROKEN
+-# undef PRIX16
+-# define PRIX16 "X"
+-#endif
+-#if !defined PRId32 || PRI_MACROS_BROKEN
+-# undef PRId32
+-# define PRId32 "d"
+-#endif
+-#if !defined PRIi32 || PRI_MACROS_BROKEN
+-# undef PRIi32
+-# define PRIi32 "i"
+-#endif
+-#if !defined PRIo32 || PRI_MACROS_BROKEN
+-# undef PRIo32
+-# define PRIo32 "o"
+-#endif
+-#if !defined PRIu32 || PRI_MACROS_BROKEN
+-# undef PRIu32
+-# define PRIu32 "u"
+-#endif
+-#if !defined PRIx32 || PRI_MACROS_BROKEN
+-# undef PRIx32
+-# define PRIx32 "x"
+-#endif
+-#if !defined PRIX32 || PRI_MACROS_BROKEN
+-# undef PRIX32
+-# define PRIX32 "X"
+-#endif
+-#if !defined PRId64 || PRI_MACROS_BROKEN
+-# undef PRId64
+-# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
+-#endif
+-#if !defined PRIi64 || PRI_MACROS_BROKEN
+-# undef PRIi64
+-# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
+-#endif
+-#if !defined PRIo64 || PRI_MACROS_BROKEN
+-# undef PRIo64
+-# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
+-#endif
+-#if !defined PRIu64 || PRI_MACROS_BROKEN
+-# undef PRIu64
+-# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
+-#endif
+-#if !defined PRIx64 || PRI_MACROS_BROKEN
+-# undef PRIx64
+-# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
+-#endif
+-#if !defined PRIX64 || PRI_MACROS_BROKEN
+-# undef PRIX64
+-# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
+-#endif
+-#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
+-# undef PRIdLEAST8
+-# define PRIdLEAST8 "d"
+-#endif
+-#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
+-# undef PRIiLEAST8
+-# define PRIiLEAST8 "i"
+-#endif
+-#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
+-# undef PRIoLEAST8
+-# define PRIoLEAST8 "o"
+-#endif
+-#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
+-# undef PRIuLEAST8
+-# define PRIuLEAST8 "u"
+-#endif
+-#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
+-# undef PRIxLEAST8
+-# define PRIxLEAST8 "x"
+-#endif
+-#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
+-# undef PRIXLEAST8
+-# define PRIXLEAST8 "X"
+-#endif
+-#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
+-# undef PRIdLEAST16
+-# define PRIdLEAST16 "d"
+-#endif
+-#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
+-# undef PRIiLEAST16
+-# define PRIiLEAST16 "i"
+-#endif
+-#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
+-# undef PRIoLEAST16
+-# define PRIoLEAST16 "o"
+-#endif
+-#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
+-# undef PRIuLEAST16
+-# define PRIuLEAST16 "u"
+-#endif
+-#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
+-# undef PRIxLEAST16
+-# define PRIxLEAST16 "x"
+-#endif
+-#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
+-# undef PRIXLEAST16
+-# define PRIXLEAST16 "X"
+-#endif
+-#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
+-# undef PRIdLEAST32
+-# define PRIdLEAST32 "d"
+-#endif
+-#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
+-# undef PRIiLEAST32
+-# define PRIiLEAST32 "i"
+-#endif
+-#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
+-# undef PRIoLEAST32
+-# define PRIoLEAST32 "o"
+-#endif
+-#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
+-# undef PRIuLEAST32
+-# define PRIuLEAST32 "u"
+-#endif
+-#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
+-# undef PRIxLEAST32
+-# define PRIxLEAST32 "x"
+-#endif
+-#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
+-# undef PRIXLEAST32
+-# define PRIXLEAST32 "X"
+-#endif
+-#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
+-# undef PRIdLEAST64
+-# define PRIdLEAST64 PRId64
+-#endif
+-#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
+-# undef PRIiLEAST64
+-# define PRIiLEAST64 PRIi64
+-#endif
+-#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
+-# undef PRIoLEAST64
+-# define PRIoLEAST64 PRIo64
+-#endif
+-#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
+-# undef PRIuLEAST64
+-# define PRIuLEAST64 PRIu64
+-#endif
+-#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
+-# undef PRIxLEAST64
+-# define PRIxLEAST64 PRIx64
+-#endif
+-#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
+-# undef PRIXLEAST64
+-# define PRIXLEAST64 PRIX64
+-#endif
+-#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
+-# undef PRIdFAST8
+-# define PRIdFAST8 "d"
+-#endif
+-#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
+-# undef PRIiFAST8
+-# define PRIiFAST8 "i"
+-#endif
+-#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
+-# undef PRIoFAST8
+-# define PRIoFAST8 "o"
+-#endif
+-#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
+-# undef PRIuFAST8
+-# define PRIuFAST8 "u"
+-#endif
+-#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
+-# undef PRIxFAST8
+-# define PRIxFAST8 "x"
+-#endif
+-#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
+-# undef PRIXFAST8
+-# define PRIXFAST8 "X"
+-#endif
+-#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
+-# undef PRIdFAST16
+-# define PRIdFAST16 "d"
+-#endif
+-#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
+-# undef PRIiFAST16
+-# define PRIiFAST16 "i"
+-#endif
+-#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
+-# undef PRIoFAST16
+-# define PRIoFAST16 "o"
+-#endif
+-#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
+-# undef PRIuFAST16
+-# define PRIuFAST16 "u"
+-#endif
+-#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
+-# undef PRIxFAST16
+-# define PRIxFAST16 "x"
+-#endif
+-#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
+-# undef PRIXFAST16
+-# define PRIXFAST16 "X"
+-#endif
+-#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
+-# undef PRIdFAST32
+-# define PRIdFAST32 "d"
+-#endif
+-#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
+-# undef PRIiFAST32
+-# define PRIiFAST32 "i"
+-#endif
+-#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
+-# undef PRIoFAST32
+-# define PRIoFAST32 "o"
+-#endif
+-#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
+-# undef PRIuFAST32
+-# define PRIuFAST32 "u"
+-#endif
+-#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
+-# undef PRIxFAST32
+-# define PRIxFAST32 "x"
+-#endif
+-#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
+-# undef PRIXFAST32
+-# define PRIXFAST32 "X"
+-#endif
+-#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
+-# undef PRIdFAST64
+-# define PRIdFAST64 PRId64
+-#endif
+-#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
+-# undef PRIiFAST64
+-# define PRIiFAST64 PRIi64
+-#endif
+-#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
+-# undef PRIoFAST64
+-# define PRIoFAST64 PRIo64
+-#endif
+-#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
+-# undef PRIuFAST64
+-# define PRIuFAST64 PRIu64
+-#endif
+-#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
+-# undef PRIxFAST64
+-# define PRIxFAST64 PRIx64
+-#endif
+-#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
+-# undef PRIXFAST64
+-# define PRIXFAST64 PRIX64
+-#endif
+-#if !defined PRIdMAX || PRI_MACROS_BROKEN
+-# undef PRIdMAX
+-# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
+-#endif
+-#if !defined PRIiMAX || PRI_MACROS_BROKEN
+-# undef PRIiMAX
+-# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
+-#endif
+-#if !defined PRIoMAX || PRI_MACROS_BROKEN
+-# undef PRIoMAX
+-# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
+-#endif
+-#if !defined PRIuMAX || PRI_MACROS_BROKEN
+-# undef PRIuMAX
+-# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
+-#endif
+-#if !defined PRIxMAX || PRI_MACROS_BROKEN
+-# undef PRIxMAX
+-# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
+-#endif
+-#if !defined PRIXMAX || PRI_MACROS_BROKEN
+-# undef PRIXMAX
+-# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
+-#endif
+-#if !defined PRIdPTR || PRI_MACROS_BROKEN
+-# undef PRIdPTR
+-# define PRIdPTR \
+- (sizeof (void *) == sizeof (long) ? "ld" : \
+- sizeof (void *) == sizeof (int) ? "d" : \
+- "lld")
+-#endif
+-#if !defined PRIiPTR || PRI_MACROS_BROKEN
+-# undef PRIiPTR
+-# define PRIiPTR \
+- (sizeof (void *) == sizeof (long) ? "li" : \
+- sizeof (void *) == sizeof (int) ? "i" : \
+- "lli")
+-#endif
+-#if !defined PRIoPTR || PRI_MACROS_BROKEN
+-# undef PRIoPTR
+-# define PRIoPTR \
+- (sizeof (void *) == sizeof (long) ? "lo" : \
+- sizeof (void *) == sizeof (int) ? "o" : \
+- "llo")
+-#endif
+-#if !defined PRIuPTR || PRI_MACROS_BROKEN
+-# undef PRIuPTR
+-# define PRIuPTR \
+- (sizeof (void *) == sizeof (long) ? "lu" : \
+- sizeof (void *) == sizeof (int) ? "u" : \
+- "llu")
+-#endif
+-#if !defined PRIxPTR || PRI_MACROS_BROKEN
+-# undef PRIxPTR
+-# define PRIxPTR \
+- (sizeof (void *) == sizeof (long) ? "lx" : \
+- sizeof (void *) == sizeof (int) ? "x" : \
+- "llx")
+-#endif
+-#if !defined PRIXPTR || PRI_MACROS_BROKEN
+-# undef PRIXPTR
+-# define PRIXPTR \
+- (sizeof (void *) == sizeof (long) ? "lX" : \
+- sizeof (void *) == sizeof (int) ? "X" : \
+- "llX")
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-#ifdef _LIBC
+-/* Rename the non ISO C functions. This is required by the standard
+- because some ISO C functions will require linking with this object
+- file and the name space must not be polluted. */
+-# define open __open
+-# define close __close
+-# define read __read
+-# define mmap __mmap
+-# define munmap __munmap
+-#endif
+-
+-/* For those losing systems which don't have `alloca' we have to add
+- some additional code emulating it. */
+-#ifdef HAVE_ALLOCA
+-# define freea(p) /* nothing */
+-#else
+-# define alloca(n) malloc (n)
+-# define freea(p) free (p)
+-#endif
+-
+-/* For systems that distinguish between text and binary I/O.
+- O_BINARY is usually declared in <fcntl.h>. */
+-#if !defined O_BINARY && defined _O_BINARY
+- /* For MSC-compatible compilers. */
+-# define O_BINARY _O_BINARY
+-# define O_TEXT _O_TEXT
+-#endif
+-#ifdef __BEOS__
+- /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
+-# undef O_BINARY
+-# undef O_TEXT
+-#endif
+-/* On reasonable systems, binary I/O is the default. */
+-#ifndef O_BINARY
+-# define O_BINARY 0
+-#endif
+-
+-
+-/* We need a sign, whether a new catalog was loaded, which can be associated
+- with all translations. This is important if the translations are
+- cached by one of GCC's features. */
+-int _nl_msg_cat_cntr;
+-
+-
+-/* Expand a system dependent string segment. Return NULL if unsupported. */
+-static const char *
+-get_sysdep_segment_value (const char *name)
+-{
+- /* Test for an ISO C 99 section 7.8.1 format string directive.
+- Syntax:
+- P R I { d | i | o | u | x | X }
+- { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
+- /* We don't use a table of 14 times 6 'const char *' strings here, because
+- data relocations cost startup time. */
+- if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
+- {
+- if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
+- || name[3] == 'x' || name[3] == 'X')
+- {
+- if (name[4] == '8' && name[5] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRId8;
+- if (name[3] == 'i')
+- return PRIi8;
+- if (name[3] == 'o')
+- return PRIo8;
+- if (name[3] == 'u')
+- return PRIu8;
+- if (name[3] == 'x')
+- return PRIx8;
+- if (name[3] == 'X')
+- return PRIX8;
+- abort ();
+- }
+- if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRId16;
+- if (name[3] == 'i')
+- return PRIi16;
+- if (name[3] == 'o')
+- return PRIo16;
+- if (name[3] == 'u')
+- return PRIu16;
+- if (name[3] == 'x')
+- return PRIx16;
+- if (name[3] == 'X')
+- return PRIX16;
+- abort ();
+- }
+- if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRId32;
+- if (name[3] == 'i')
+- return PRIi32;
+- if (name[3] == 'o')
+- return PRIo32;
+- if (name[3] == 'u')
+- return PRIu32;
+- if (name[3] == 'x')
+- return PRIx32;
+- if (name[3] == 'X')
+- return PRIX32;
+- abort ();
+- }
+- if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRId64;
+- if (name[3] == 'i')
+- return PRIi64;
+- if (name[3] == 'o')
+- return PRIo64;
+- if (name[3] == 'u')
+- return PRIu64;
+- if (name[3] == 'x')
+- return PRIx64;
+- if (name[3] == 'X')
+- return PRIX64;
+- abort ();
+- }
+- if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
+- && name[7] == 'S' && name[8] == 'T')
+- {
+- if (name[9] == '8' && name[10] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdLEAST8;
+- if (name[3] == 'i')
+- return PRIiLEAST8;
+- if (name[3] == 'o')
+- return PRIoLEAST8;
+- if (name[3] == 'u')
+- return PRIuLEAST8;
+- if (name[3] == 'x')
+- return PRIxLEAST8;
+- if (name[3] == 'X')
+- return PRIXLEAST8;
+- abort ();
+- }
+- if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdLEAST16;
+- if (name[3] == 'i')
+- return PRIiLEAST16;
+- if (name[3] == 'o')
+- return PRIoLEAST16;
+- if (name[3] == 'u')
+- return PRIuLEAST16;
+- if (name[3] == 'x')
+- return PRIxLEAST16;
+- if (name[3] == 'X')
+- return PRIXLEAST16;
+- abort ();
+- }
+- if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdLEAST32;
+- if (name[3] == 'i')
+- return PRIiLEAST32;
+- if (name[3] == 'o')
+- return PRIoLEAST32;
+- if (name[3] == 'u')
+- return PRIuLEAST32;
+- if (name[3] == 'x')
+- return PRIxLEAST32;
+- if (name[3] == 'X')
+- return PRIXLEAST32;
+- abort ();
+- }
+- if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdLEAST64;
+- if (name[3] == 'i')
+- return PRIiLEAST64;
+- if (name[3] == 'o')
+- return PRIoLEAST64;
+- if (name[3] == 'u')
+- return PRIuLEAST64;
+- if (name[3] == 'x')
+- return PRIxLEAST64;
+- if (name[3] == 'X')
+- return PRIXLEAST64;
+- abort ();
+- }
+- }
+- if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
+- && name[7] == 'T')
+- {
+- if (name[8] == '8' && name[9] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdFAST8;
+- if (name[3] == 'i')
+- return PRIiFAST8;
+- if (name[3] == 'o')
+- return PRIoFAST8;
+- if (name[3] == 'u')
+- return PRIuFAST8;
+- if (name[3] == 'x')
+- return PRIxFAST8;
+- if (name[3] == 'X')
+- return PRIXFAST8;
+- abort ();
+- }
+- if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdFAST16;
+- if (name[3] == 'i')
+- return PRIiFAST16;
+- if (name[3] == 'o')
+- return PRIoFAST16;
+- if (name[3] == 'u')
+- return PRIuFAST16;
+- if (name[3] == 'x')
+- return PRIxFAST16;
+- if (name[3] == 'X')
+- return PRIXFAST16;
+- abort ();
+- }
+- if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdFAST32;
+- if (name[3] == 'i')
+- return PRIiFAST32;
+- if (name[3] == 'o')
+- return PRIoFAST32;
+- if (name[3] == 'u')
+- return PRIuFAST32;
+- if (name[3] == 'x')
+- return PRIxFAST32;
+- if (name[3] == 'X')
+- return PRIXFAST32;
+- abort ();
+- }
+- if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdFAST64;
+- if (name[3] == 'i')
+- return PRIiFAST64;
+- if (name[3] == 'o')
+- return PRIoFAST64;
+- if (name[3] == 'u')
+- return PRIuFAST64;
+- if (name[3] == 'x')
+- return PRIxFAST64;
+- if (name[3] == 'X')
+- return PRIXFAST64;
+- abort ();
+- }
+- }
+- if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
+- && name[7] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdMAX;
+- if (name[3] == 'i')
+- return PRIiMAX;
+- if (name[3] == 'o')
+- return PRIoMAX;
+- if (name[3] == 'u')
+- return PRIuMAX;
+- if (name[3] == 'x')
+- return PRIxMAX;
+- if (name[3] == 'X')
+- return PRIXMAX;
+- abort ();
+- }
+- if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
+- && name[7] == '\0')
+- {
+- if (name[3] == 'd')
+- return PRIdPTR;
+- if (name[3] == 'i')
+- return PRIiPTR;
+- if (name[3] == 'o')
+- return PRIoPTR;
+- if (name[3] == 'u')
+- return PRIuPTR;
+- if (name[3] == 'x')
+- return PRIxPTR;
+- if (name[3] == 'X')
+- return PRIXPTR;
+- abort ();
+- }
+- }
+- }
+- /* Test for a glibc specific printf() format directive flag. */
+- if (name[0] == 'I' && name[1] == '\0')
+- {
+-#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
+- /* The 'I' flag, in numeric format directives, replaces ASCII digits
+- with the 'outdigits' defined in the LC_CTYPE locale facet. This is
+- used for Farsi (Persian) and maybe Arabic. */
+- return "I";
+-#else
+- return "";
+-#endif
+- }
+- /* Other system dependent strings are not valid. */
+- return NULL;
+-}
+-
+-/* Initialize the codeset dependent parts of an opened message catalog.
+- Return the header entry. */
+-const char *
+-internal_function
+-_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
+- struct loaded_domain *domain,
+- struct binding *domainbinding)
+-{
+- /* Find out about the character set the file is encoded with.
+- This can be found (in textual form) in the entry "". If this
+- entry does not exist or if this does not contain the `charset='
+- information, we will assume the charset matches the one the
+- current locale and we don't have to perform any conversion. */
+- char *nullentry;
+- size_t nullentrylen;
+-
+- /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
+- domain->codeset_cntr =
+- (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
+-#ifdef _LIBC
+- domain->conv = (__gconv_t) -1;
+-#else
+-# if HAVE_ICONV
+- domain->conv = (iconv_t) -1;
+-# endif
+-#endif
+- domain->conv_tab = NULL;
+-
+- /* Get the header entry. */
+- nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
+-
+- if (nullentry != NULL)
+- {
+-#if defined _LIBC || HAVE_ICONV
+- const char *charsetstr;
+-
+- charsetstr = strstr (nullentry, "charset=");
+- if (charsetstr != NULL)
+- {
+- size_t len;
+- char *charset;
+- const char *outcharset;
+-
+- charsetstr += strlen ("charset=");
+- len = strcspn (charsetstr, " \t\n");
+-
+- charset = (char *) alloca (len + 1);
+-# if defined _LIBC || HAVE_MEMPCPY
+- *((char *) mempcpy (charset, charsetstr, len)) = '\0';
+-# else
+- memcpy (charset, charsetstr, len);
+- charset[len] = '\0';
+-# endif
+-
+- /* The output charset should normally be determined by the
+- locale. But sometimes the locale is not used or not correctly
+- set up, so we provide a possibility for the user to override
+- this. Moreover, the value specified through
+- bind_textdomain_codeset overrides both. */
+- if (domainbinding != NULL && domainbinding->codeset != NULL)
+- outcharset = domainbinding->codeset;
+- else
+- {
+- outcharset = getenv ("OUTPUT_CHARSET");
+- if (outcharset == NULL || outcharset[0] == '\0')
+- {
+-# ifdef _LIBC
+- outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
+-# else
+-# if HAVE_ICONV
+- extern const char *locale_charset (void);
+- outcharset = locale_charset ();
+-# endif
+-# endif
+- }
+- }
+-
+-# ifdef _LIBC
+- /* We always want to use transliteration. */
+- outcharset = norm_add_slashes (outcharset, "TRANSLIT");
+- charset = norm_add_slashes (charset, NULL);
+- if (__gconv_open (outcharset, charset, &domain->conv,
+- GCONV_AVOID_NOCONV)
+- != __GCONV_OK)
+- domain->conv = (__gconv_t) -1;
+-# else
+-# if HAVE_ICONV
+- /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
+- we want to use transliteration. */
+-# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+- || _LIBICONV_VERSION >= 0x0105
+- if (strchr (outcharset, '/') == NULL)
+- {
+- char *tmp;
+-
+- len = strlen (outcharset);
+- tmp = (char *) alloca (len + 10 + 1);
+- memcpy (tmp, outcharset, len);
+- memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+- outcharset = tmp;
+-
+- domain->conv = iconv_open (outcharset, charset);
+-
+- freea (outcharset);
+- }
+- else
+-# endif
+- domain->conv = iconv_open (outcharset, charset);
+-# endif
+-# endif
+-
+- freea (charset);
+- }
+-#endif /* _LIBC || HAVE_ICONV */
+- }
+-
+- return nullentry;
+-}
+-
+-/* Frees the codeset dependent parts of an opened message catalog. */
+-void
+-internal_function
+-_nl_free_domain_conv (struct loaded_domain *domain)
+-{
+- if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
+- free (domain->conv_tab);
+-
+-#ifdef _LIBC
+- if (domain->conv != (__gconv_t) -1)
+- __gconv_close (domain->conv);
+-#else
+-# if HAVE_ICONV
+- if (domain->conv != (iconv_t) -1)
+- iconv_close (domain->conv);
+-# endif
+-#endif
+-}
+-
+-/* Load the message catalogs specified by FILENAME. If it is no valid
+- message catalog do nothing. */
+-void
+-internal_function
+-_nl_load_domain (struct loaded_l10nfile *domain_file,
+- struct binding *domainbinding)
+-{
+- int fd;
+- size_t size;
+-#ifdef _LIBC
+- struct stat64 st;
+-#else
+- struct stat st;
+-#endif
+- struct mo_file_header *data = (struct mo_file_header *) -1;
+- int use_mmap = 0;
+- struct loaded_domain *domain;
+- int revision;
+- const char *nullentry;
+-
+- domain_file->decided = 1;
+- domain_file->data = NULL;
+-
+- /* Note that it would be useless to store domainbinding in domain_file
+- because domainbinding might be == NULL now but != NULL later (after
+- a call to bind_textdomain_codeset). */
+-
+- /* If the record does not represent a valid locale the FILENAME
+- might be NULL. This can happen when according to the given
+- specification the locale file name is different for XPG and CEN
+- syntax. */
+- if (domain_file->filename == NULL)
+- return;
+-
+- /* Try to open the addressed file. */
+- fd = open (domain_file->filename, O_RDONLY | O_BINARY);
+- if (fd == -1)
+- return;
+-
+- /* We must know about the size of the file. */
+- if (
+-#ifdef _LIBC
+- __builtin_expect (fstat64 (fd, &st) != 0, 0)
+-#else
+- __builtin_expect (fstat (fd, &st) != 0, 0)
+-#endif
+- || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
+- || __builtin_expect (size < sizeof (struct mo_file_header), 0))
+- {
+- /* Something went wrong. */
+- close (fd);
+- return;
+- }
+-
+-#ifdef HAVE_MMAP
+- /* Now we are ready to load the file. If mmap() is available we try
+- this first. If not available or it failed we try to load it. */
+- data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
+- MAP_PRIVATE, fd, 0);
+-
+- if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
+- {
+- /* mmap() call was successful. */
+- close (fd);
+- use_mmap = 1;
+- }
+-#endif
+-
+- /* If the data is not yet available (i.e. mmap'ed) we try to load
+- it manually. */
+- if (data == (struct mo_file_header *) -1)
+- {
+- size_t to_read;
+- char *read_ptr;
+-
+- data = (struct mo_file_header *) malloc (size);
+- if (data == NULL)
+- return;
+-
+- to_read = size;
+- read_ptr = (char *) data;
+- do
+- {
+- long int nb = (long int) read (fd, read_ptr, to_read);
+- if (nb <= 0)
+- {
+-#ifdef EINTR
+- if (nb == -1 && errno == EINTR)
+- continue;
+-#endif
+- close (fd);
+- return;
+- }
+- read_ptr += nb;
+- to_read -= nb;
+- }
+- while (to_read > 0);
+-
+- close (fd);
+- }
+-
+- /* Using the magic number we can test whether it really is a message
+- catalog file. */
+- if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
+- 0))
+- {
+- /* The magic number is wrong: not a message catalog file. */
+-#ifdef HAVE_MMAP
+- if (use_mmap)
+- munmap ((caddr_t) data, size);
+- else
+-#endif
+- free (data);
+- return;
+- }
+-
+- domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+- if (domain == NULL)
+- return;
+- domain_file->data = domain;
+-
+- domain->data = (char *) data;
+- domain->use_mmap = use_mmap;
+- domain->mmap_size = size;
+- domain->must_swap = data->magic != _MAGIC;
+- domain->malloced = NULL;
+-
+- /* Fill in the information about the available tables. */
+- revision = W (domain->must_swap, data->revision);
+- /* We support only the major revisions 0 and 1. */
+- switch (revision >> 16)
+- {
+- case 0:
+- case 1:
+- domain->nstrings = W (domain->must_swap, data->nstrings);
+- domain->orig_tab = (const struct string_desc *)
+- ((char *) data + W (domain->must_swap, data->orig_tab_offset));
+- domain->trans_tab = (const struct string_desc *)
+- ((char *) data + W (domain->must_swap, data->trans_tab_offset));
+- domain->hash_size = W (domain->must_swap, data->hash_tab_size);
+- domain->hash_tab =
+- (domain->hash_size > 2
+- ? (const nls_uint32 *)
+- ((char *) data + W (domain->must_swap, data->hash_tab_offset))
+- : NULL);
+- domain->must_swap_hash_tab = domain->must_swap;
+-
+- /* Now dispatch on the minor revision. */
+- switch (revision & 0xffff)
+- {
+- case 0:
+- domain->n_sysdep_strings = 0;
+- domain->orig_sysdep_tab = NULL;
+- domain->trans_sysdep_tab = NULL;
+- break;
+- case 1:
+- default:
+- {
+- nls_uint32 n_sysdep_strings;
+-
+- if (domain->hash_tab == NULL)
+- /* This is invalid. These minor revisions need a hash table. */
+- goto invalid;
+-
+- n_sysdep_strings =
+- W (domain->must_swap, data->n_sysdep_strings);
+- if (n_sysdep_strings > 0)
+- {
+- nls_uint32 n_sysdep_segments;
+- const struct sysdep_segment *sysdep_segments;
+- const char **sysdep_segment_values;
+- const nls_uint32 *orig_sysdep_tab;
+- const nls_uint32 *trans_sysdep_tab;
+- nls_uint32 n_inmem_sysdep_strings;
+- size_t memneed;
+- char *mem;
+- struct sysdep_string_desc *inmem_orig_sysdep_tab;
+- struct sysdep_string_desc *inmem_trans_sysdep_tab;
+- nls_uint32 *inmem_hash_tab;
+- unsigned int i, j;
+-
+- /* Get the values of the system dependent segments. */
+- n_sysdep_segments =
+- W (domain->must_swap, data->n_sysdep_segments);
+- sysdep_segments = (const struct sysdep_segment *)
+- ((char *) data
+- + W (domain->must_swap, data->sysdep_segments_offset));
+- sysdep_segment_values =
+- alloca (n_sysdep_segments * sizeof (const char *));
+- for (i = 0; i < n_sysdep_segments; i++)
+- {
+- const char *name =
+- (char *) data
+- + W (domain->must_swap, sysdep_segments[i].offset);
+- nls_uint32 namelen =
+- W (domain->must_swap, sysdep_segments[i].length);
+-
+- if (!(namelen > 0 && name[namelen - 1] == '\0'))
+- {
+- freea (sysdep_segment_values);
+- goto invalid;
+- }
+-
+- sysdep_segment_values[i] = get_sysdep_segment_value (name);
+- }
+-
+- orig_sysdep_tab = (const nls_uint32 *)
+- ((char *) data
+- + W (domain->must_swap, data->orig_sysdep_tab_offset));
+- trans_sysdep_tab = (const nls_uint32 *)
+- ((char *) data
+- + W (domain->must_swap, data->trans_sysdep_tab_offset));
+-
+- /* Compute the amount of additional memory needed for the
+- system dependent strings and the augmented hash table.
+- At the same time, also drop string pairs which refer to
+- an undefined system dependent segment. */
+- n_inmem_sysdep_strings = 0;
+- memneed = domain->hash_size * sizeof (nls_uint32);
+- for (i = 0; i < n_sysdep_strings; i++)
+- {
+- int valid = 1;
+- size_t needs[2];
+-
+- for (j = 0; j < 2; j++)
+- {
+- const struct sysdep_string *sysdep_string =
+- (const struct sysdep_string *)
+- ((char *) data
+- + W (domain->must_swap,
+- j == 0
+- ? orig_sysdep_tab[i]
+- : trans_sysdep_tab[i]));
+- size_t need = 0;
+- const struct segment_pair *p = sysdep_string->segments;
+-
+- if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
+- for (p = sysdep_string->segments;; p++)
+- {
+- nls_uint32 sysdepref;
+-
+- need += W (domain->must_swap, p->segsize);
+-
+- sysdepref = W (domain->must_swap, p->sysdepref);
+- if (sysdepref == SEGMENTS_END)
+- break;
+-
+- if (sysdepref >= n_sysdep_segments)
+- {
+- /* Invalid. */
+- freea (sysdep_segment_values);
+- goto invalid;
+- }
+-
+- if (sysdep_segment_values[sysdepref] == NULL)
+- {
+- /* This particular string pair is invalid. */
+- valid = 0;
+- break;
+- }
+-
+- need += strlen (sysdep_segment_values[sysdepref]);
+- }
+-
+- needs[j] = need;
+- if (!valid)
+- break;
+- }
+-
+- if (valid)
+- {
+- n_inmem_sysdep_strings++;
+- memneed += needs[0] + needs[1];
+- }
+- }
+- memneed += 2 * n_inmem_sysdep_strings
+- * sizeof (struct sysdep_string_desc);
+-
+- if (n_inmem_sysdep_strings > 0)
+- {
+- unsigned int k;
+-
+- /* Allocate additional memory. */
+- mem = (char *) malloc (memneed);
+- if (mem == NULL)
+- goto invalid;
+-
+- domain->malloced = mem;
+- inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
+- mem += n_inmem_sysdep_strings
+- * sizeof (struct sysdep_string_desc);
+- inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
+- mem += n_inmem_sysdep_strings
+- * sizeof (struct sysdep_string_desc);
+- inmem_hash_tab = (nls_uint32 *) mem;
+- mem += domain->hash_size * sizeof (nls_uint32);
+-
+- /* Compute the system dependent strings. */
+- k = 0;
+- for (i = 0; i < n_sysdep_strings; i++)
+- {
+- int valid = 1;
+-
+- for (j = 0; j < 2; j++)
+- {
+- const struct sysdep_string *sysdep_string =
+- (const struct sysdep_string *)
+- ((char *) data
+- + W (domain->must_swap,
+- j == 0
+- ? orig_sysdep_tab[i]
+- : trans_sysdep_tab[i]));
+- const struct segment_pair *p =
+- sysdep_string->segments;
+-
+- if (W (domain->must_swap, p->sysdepref)
+- != SEGMENTS_END)
+- for (p = sysdep_string->segments;; p++)
+- {
+- nls_uint32 sysdepref;
+-
+- sysdepref =
+- W (domain->must_swap, p->sysdepref);
+- if (sysdepref == SEGMENTS_END)
+- break;
+-
+- if (sysdep_segment_values[sysdepref] == NULL)
+- {
+- /* This particular string pair is
+- invalid. */
+- valid = 0;
+- break;
+- }
+- }
+-
+- if (!valid)
+- break;
+- }
+-
+- if (valid)
+- {
+- for (j = 0; j < 2; j++)
+- {
+- const struct sysdep_string *sysdep_string =
+- (const struct sysdep_string *)
+- ((char *) data
+- + W (domain->must_swap,
+- j == 0
+- ? orig_sysdep_tab[i]
+- : trans_sysdep_tab[i]));
+- const char *static_segments =
+- (char *) data
+- + W (domain->must_swap, sysdep_string->offset);
+- const struct segment_pair *p =
+- sysdep_string->segments;
+-
+- /* Concatenate the segments, and fill
+- inmem_orig_sysdep_tab[k] (for j == 0) and
+- inmem_trans_sysdep_tab[k] (for j == 1). */
+-
+- struct sysdep_string_desc *inmem_tab_entry =
+- (j == 0
+- ? inmem_orig_sysdep_tab
+- : inmem_trans_sysdep_tab)
+- + k;
+-
+- if (W (domain->must_swap, p->sysdepref)
+- == SEGMENTS_END)
+- {
+- /* Only one static segment. */
+- inmem_tab_entry->length =
+- W (domain->must_swap, p->segsize);
+- inmem_tab_entry->pointer = static_segments;
+- }
+- else
+- {
+- inmem_tab_entry->pointer = mem;
+-
+- for (p = sysdep_string->segments;; p++)
+- {
+- nls_uint32 segsize =
+- W (domain->must_swap, p->segsize);
+- nls_uint32 sysdepref =
+- W (domain->must_swap, p->sysdepref);
+- size_t n;
+-
+- if (segsize > 0)
+- {
+- memcpy (mem, static_segments, segsize);
+- mem += segsize;
+- static_segments += segsize;
+- }
+-
+- if (sysdepref == SEGMENTS_END)
+- break;
+-
+- n = strlen (sysdep_segment_values[sysdepref]);
+- memcpy (mem, sysdep_segment_values[sysdepref], n);
+- mem += n;
+- }
+-
+- inmem_tab_entry->length =
+- mem - inmem_tab_entry->pointer;
+- }
+- }
+-
+- k++;
+- }
+- }
+- if (k != n_inmem_sysdep_strings)
+- abort ();
+-
+- /* Compute the augmented hash table. */
+- for (i = 0; i < domain->hash_size; i++)
+- inmem_hash_tab[i] =
+- W (domain->must_swap_hash_tab, domain->hash_tab[i]);
+- for (i = 0; i < n_inmem_sysdep_strings; i++)
+- {
+- const char *msgid = inmem_orig_sysdep_tab[i].pointer;
+- nls_uint32 hash_val = hash_string (msgid);
+- nls_uint32 idx = hash_val % domain->hash_size;
+- nls_uint32 incr =
+- 1 + (hash_val % (domain->hash_size - 2));
+-
+- for (;;)
+- {
+- if (inmem_hash_tab[idx] == 0)
+- {
+- /* Hash table entry is empty. Use it. */
+- inmem_hash_tab[idx] = 1 + domain->nstrings + i;
+- break;
+- }
+-
+- if (idx >= domain->hash_size - incr)
+- idx -= domain->hash_size - incr;
+- else
+- idx += incr;
+- }
+- }
+-
+- domain->n_sysdep_strings = n_inmem_sysdep_strings;
+- domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
+- domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
+-
+- domain->hash_tab = inmem_hash_tab;
+- domain->must_swap_hash_tab = 0;
+- }
+- else
+- {
+- domain->n_sysdep_strings = 0;
+- domain->orig_sysdep_tab = NULL;
+- domain->trans_sysdep_tab = NULL;
+- }
+-
+- freea (sysdep_segment_values);
+- }
+- else
+- {
+- domain->n_sysdep_strings = 0;
+- domain->orig_sysdep_tab = NULL;
+- domain->trans_sysdep_tab = NULL;
+- }
+- }
+- break;
+- }
+- break;
+- default:
+- /* This is an invalid revision. */
+- invalid:
+- /* This is an invalid .mo file. */
+- if (domain->malloced)
+- free (domain->malloced);
+-#ifdef HAVE_MMAP
+- if (use_mmap)
+- munmap ((caddr_t) data, size);
+- else
+-#endif
+- free (data);
+- free (domain);
+- domain_file->data = NULL;
+- return;
+- }
+-
+- /* Now initialize the character set converter from the character set
+- the file is encoded with (found in the header entry) to the domain's
+- specified character set or the locale's character set. */
+- nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
+-
+- /* Also look for a plural specification. */
+- EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
+-}
+-
+-
+-#ifdef _LIBC
+-void
+-internal_function
+-_nl_unload_domain (struct loaded_domain *domain)
+-{
+- if (domain->plural != &__gettext_germanic_plural)
+- __gettext_free_exp (domain->plural);
+-
+- _nl_free_domain_conv (domain);
+-
+- if (domain->malloced)
+- free (domain->malloced);
+-
+-# ifdef _POSIX_MAPPED_FILES
+- if (domain->use_mmap)
+- munmap ((caddr_t) domain->data, domain->mmap_size);
+- else
+-# endif /* _POSIX_MAPPED_FILES */
+- free ((void *) domain->data);
+-
+- free (domain);
+-}
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/localcharset.c abook/intl/localcharset.c
+--- BUILD/abook-0.6.0pre2/intl/localcharset.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/localcharset.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,409 +0,0 @@
+-/* Determine a canonical name for the current locale's character encoding.
+-
+- Copyright (C) 2000-2004 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Written by Bruno Haible <bruno@clisp.org>. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-/* Specification. */
+-#include "localcharset.h"
+-
+-#if HAVE_STDDEF_H
+-# include <stddef.h>
+-#endif
+-
+-#include <stdio.h>
+-#if HAVE_STRING_H
+-# include <string.h>
+-#else
+-# include <strings.h>
+-#endif
+-#if HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
+-
+-#if defined _WIN32 || defined __WIN32__
+-# undef WIN32 /* avoid warning on mingw32 */
+-# define WIN32
+-#endif
+-
+-#if defined __EMX__
+-/* Assume EMX program runs on OS/2, even if compiled under DOS. */
+-# define OS2
+-#endif
+-
+-#if !defined WIN32
+-# if HAVE_LANGINFO_CODESET
+-# include <langinfo.h>
+-# else
+-# if HAVE_SETLOCALE
+-# include <locale.h>
+-# endif
+-# endif
+-#elif defined WIN32
+-# define WIN32_LEAN_AND_MEAN
+-# include <windows.h>
+-#endif
+-#if defined OS2
+-# define INCL_DOS
+-# include <os2.h>
+-#endif
+-
+-#if ENABLE_RELOCATABLE
+-# include "relocatable.h"
+-#else
+-# define relocate(pathname) (pathname)
+-#endif
+-
+-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+- /* Win32, Cygwin, OS/2, DOS */
+-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+-#endif
+-
+-#ifndef DIRECTORY_SEPARATOR
+-# define DIRECTORY_SEPARATOR '/'
+-#endif
+-
+-#ifndef ISSLASH
+-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+-#endif
+-
+-#if HAVE_DECL_GETC_UNLOCKED
+-# undef getc
+-# define getc getc_unlocked
+-#endif
+-
+-/* The following static variable is declared 'volatile' to avoid a
+- possible multithread problem in the function get_charset_aliases. If we
+- are running in a threaded environment, and if two threads initialize
+- 'charset_aliases' simultaneously, both will produce the same value,
+- and everything will be ok if the two assignments to 'charset_aliases'
+- are atomic. But I don't know what will happen if the two assignments mix. */
+-#if __STDC__ != 1
+-# define volatile /* empty */
+-#endif
+-/* Pointer to the contents of the charset.alias file, if it has already been
+- read, else NULL. Its format is:
+- ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
+-static const char * volatile charset_aliases;
+-
+-/* Return a pointer to the contents of the charset.alias file. */
+-static const char *
+-get_charset_aliases ()
+-{
+- const char *cp;
+-
+- cp = charset_aliases;
+- if (cp == NULL)
+- {
+-#if !(defined VMS || defined WIN32)
+- FILE *fp;
+- const char *dir;
+- const char *base = "charset.alias";
+- char *file_name;
+-
+- /* Make it possible to override the charset.alias location. This is
+- necessary for running the testsuite before "make install". */
+- dir = getenv ("CHARSETALIASDIR");
+- if (dir == NULL || dir[0] == '\0')
+- dir = relocate (LIBDIR);
+-
+- /* Concatenate dir and base into freshly allocated file_name. */
+- {
+- size_t dir_len = strlen (dir);
+- size_t base_len = strlen (base);
+- int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+- file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+- if (file_name != NULL)
+- {
+- memcpy (file_name, dir, dir_len);
+- if (add_slash)
+- file_name[dir_len] = DIRECTORY_SEPARATOR;
+- memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+- }
+- }
+-
+- if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+- /* Out of memory or file not found, treat it as empty. */
+- cp = "";
+- else
+- {
+- /* Parse the file's contents. */
+- char *res_ptr = NULL;
+- size_t res_size = 0;
+-
+- for (;;)
+- {
+- int c;
+- char buf1[50+1];
+- char buf2[50+1];
+- size_t l1, l2;
+- char *old_res_ptr;
+-
+- c = getc (fp);
+- if (c == EOF)
+- break;
+- if (c == '\n' || c == ' ' || c == '\t')
+- continue;
+- if (c == '#')
+- {
+- /* Skip comment, to end of line. */
+- do
+- c = getc (fp);
+- while (!(c == EOF || c == '\n'));
+- if (c == EOF)
+- break;
+- continue;
+- }
+- ungetc (c, fp);
+- if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
+- break;
+- l1 = strlen (buf1);
+- l2 = strlen (buf2);
+- old_res_ptr = res_ptr;
+- if (res_size == 0)
+- {
+- res_size = l1 + 1 + l2 + 1;
+- res_ptr = (char *) malloc (res_size + 1);
+- }
+- else
+- {
+- res_size += l1 + 1 + l2 + 1;
+- res_ptr = (char *) realloc (res_ptr, res_size + 1);
+- }
+- if (res_ptr == NULL)
+- {
+- /* Out of memory. */
+- res_size = 0;
+- if (old_res_ptr != NULL)
+- free (old_res_ptr);
+- break;
+- }
+- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+- strcpy (res_ptr + res_size - (l2 + 1), buf2);
+- }
+- fclose (fp);
+- if (res_size == 0)
+- cp = "";
+- else
+- {
+- *(res_ptr + res_size) = '\0';
+- cp = res_ptr;
+- }
+- }
+-
+- if (file_name != NULL)
+- free (file_name);
+-
+-#else
+-
+-# if defined VMS
+- /* To avoid the troubles of an extra file charset.alias_vms in the
+- sources of many GNU packages, simply inline the aliases here. */
+- /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+- "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+- section 10.7 "Handling Different Character Sets". */
+- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+- "ISO8859-2" "\0" "ISO-8859-2" "\0"
+- "ISO8859-5" "\0" "ISO-8859-5" "\0"
+- "ISO8859-7" "\0" "ISO-8859-7" "\0"
+- "ISO8859-8" "\0" "ISO-8859-8" "\0"
+- "ISO8859-9" "\0" "ISO-8859-9" "\0"
+- /* Japanese */
+- "eucJP" "\0" "EUC-JP" "\0"
+- "SJIS" "\0" "SHIFT_JIS" "\0"
+- "DECKANJI" "\0" "DEC-KANJI" "\0"
+- "SDECKANJI" "\0" "EUC-JP" "\0"
+- /* Chinese */
+- "eucTW" "\0" "EUC-TW" "\0"
+- "DECHANYU" "\0" "DEC-HANYU" "\0"
+- "DECHANZI" "\0" "GB2312" "\0"
+- /* Korean */
+- "DECKOREAN" "\0" "EUC-KR" "\0";
+-# endif
+-
+-# if defined WIN32
+- /* To avoid the troubles of installing a separate file in the same
+- directory as the DLL and of retrieving the DLL's directory at
+- runtime, simply inline the aliases here. */
+-
+- cp = "CP936" "\0" "GBK" "\0"
+- "CP1361" "\0" "JOHAB" "\0"
+- "CP20127" "\0" "ASCII" "\0"
+- "CP20866" "\0" "KOI8-R" "\0"
+- "CP21866" "\0" "KOI8-RU" "\0"
+- "CP28591" "\0" "ISO-8859-1" "\0"
+- "CP28592" "\0" "ISO-8859-2" "\0"
+- "CP28593" "\0" "ISO-8859-3" "\0"
+- "CP28594" "\0" "ISO-8859-4" "\0"
+- "CP28595" "\0" "ISO-8859-5" "\0"
+- "CP28596" "\0" "ISO-8859-6" "\0"
+- "CP28597" "\0" "ISO-8859-7" "\0"
+- "CP28598" "\0" "ISO-8859-8" "\0"
+- "CP28599" "\0" "ISO-8859-9" "\0"
+- "CP28605" "\0" "ISO-8859-15" "\0";
+-# endif
+-#endif
+-
+- charset_aliases = cp;
+- }
+-
+- return cp;
+-}
+-
+-/* Determine the current locale's character encoding, and canonicalize it
+- into one of the canonical names listed in config.charset.
+- The result must not be freed; it is statically allocated.
+- If the canonical name cannot be determined, the result is a non-canonical
+- name. */
+-
+-#ifdef STATIC
+-STATIC
+-#endif
+-const char *
+-locale_charset ()
+-{
+- const char *codeset;
+- const char *aliases;
+-
+-#if !(defined WIN32 || defined OS2)
+-
+-# if HAVE_LANGINFO_CODESET
+-
+- /* Most systems support nl_langinfo (CODESET) nowadays. */
+- codeset = nl_langinfo (CODESET);
+-
+-# else
+-
+- /* On old systems which lack it, use setlocale or getenv. */
+- const char *locale = NULL;
+-
+- /* But most old systems don't have a complete set of locales. Some
+- (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
+- use setlocale here; it would return "C" when it doesn't support the
+- locale name the user has set. */
+-# if HAVE_SETLOCALE && 0
+- locale = setlocale (LC_CTYPE, NULL);
+-# endif
+- if (locale == NULL || locale[0] == '\0')
+- {
+- locale = getenv ("LC_ALL");
+- if (locale == NULL || locale[0] == '\0')
+- {
+- locale = getenv ("LC_CTYPE");
+- if (locale == NULL || locale[0] == '\0')
+- locale = getenv ("LANG");
+- }
+- }
+-
+- /* On some old systems, one used to set locale = "iso8859_1". On others,
+- you set it to "language_COUNTRY.charset". In any case, we resolve it
+- through the charset.alias file. */
+- codeset = locale;
+-
+-# endif
+-
+-#elif defined WIN32
+-
+- static char buf[2 + 10 + 1];
+-
+- /* Woe32 has a function returning the locale's codepage as a number. */
+- sprintf (buf, "CP%u", GetACP ());
+- codeset = buf;
+-
+-#elif defined OS2
+-
+- const char *locale;
+- static char buf[2 + 10 + 1];
+- ULONG cp[3];
+- ULONG cplen;
+-
+- /* Allow user to override the codeset, as set in the operating system,
+- with standard language environment variables. */
+- locale = getenv ("LC_ALL");
+- if (locale == NULL || locale[0] == '\0')
+- {
+- locale = getenv ("LC_CTYPE");
+- if (locale == NULL || locale[0] == '\0')
+- locale = getenv ("LANG");
+- }
+- if (locale != NULL && locale[0] != '\0')
+- {
+- /* If the locale name contains an encoding after the dot, return it. */
+- const char *dot = strchr (locale, '.');
+-
+- if (dot != NULL)
+- {
+- const char *modifier;
+-
+- dot++;
+- /* Look for the possible @... trailer and remove it, if any. */
+- modifier = strchr (dot, '@');
+- if (modifier == NULL)
+- return dot;
+- if (modifier - dot < sizeof (buf))
+- {
+- memcpy (buf, dot, modifier - dot);
+- buf [modifier - dot] = '\0';
+- return buf;
+- }
+- }
+-
+- /* Resolve through the charset.alias file. */
+- codeset = locale;
+- }
+- else
+- {
+- /* OS/2 has a function returning the locale's codepage as a number. */
+- if (DosQueryCp (sizeof (cp), cp, &cplen))
+- codeset = "";
+- else
+- {
+- sprintf (buf, "CP%u", cp[0]);
+- codeset = buf;
+- }
+- }
+-
+-#endif
+-
+- if (codeset == NULL)
+- /* The canonical name cannot be determined. */
+- codeset = "";
+-
+- /* Resolve alias. */
+- for (aliases = get_charset_aliases ();
+- *aliases != '\0';
+- aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+- if (strcmp (codeset, aliases) == 0
+- || (aliases[0] == '*' && aliases[1] == '\0'))
+- {
+- codeset = aliases + strlen (aliases) + 1;
+- break;
+- }
+-
+- /* Don't return an empty string. GNU libc and GNU libiconv interpret
+- the empty string as denoting "the locale's character encoding",
+- thus GNU libiconv would call this function a second time. */
+- if (codeset[0] == '\0')
+- codeset = "ASCII";
+-
+- return codeset;
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/localcharset.h abook/intl/localcharset.h
+--- BUILD/abook-0.6.0pre2/intl/localcharset.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/localcharset.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,42 +0,0 @@
+-/* Determine a canonical name for the current locale's character encoding.
+- Copyright (C) 2000-2003 Free Software Foundation, Inc.
+- This file is part of the GNU CHARSET Library.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _LOCALCHARSET_H
+-#define _LOCALCHARSET_H
+-
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-
+-/* Determine the current locale's character encoding, and canonicalize it
+- into one of the canonical names listed in config.charset.
+- The result must not be freed; it is statically allocated.
+- If the canonical name cannot be determined, the result is a non-canonical
+- name. */
+-extern const char * locale_charset (void);
+-
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-
+-#endif /* _LOCALCHARSET_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/locale.alias abook/intl/locale.alias
+--- BUILD/abook-0.6.0pre2/intl/locale.alias 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/locale.alias 1970-01-01 01:00:00.000000000 +0100
+@@ -1,78 +0,0 @@
+-# Locale name alias data base.
+-# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Library General Public License as published
+-# by the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# Library General Public License for more details.
+-#
+-# You should have received a copy of the GNU Library General Public
+-# License along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
+-
+-# The format of this file is the same as for the corresponding file of
+-# the X Window System, which normally can be found in
+-# /usr/lib/X11/locale/locale.alias
+-# A single line contains two fields: an alias and a substitution value.
+-# All entries are case independent.
+-
+-# Note: This file is far from being complete. If you have a value for
+-# your own site which you think might be useful for others too, share
+-# it with the rest of us. Send it using the `glibcbug' script to
+-# bugs@gnu.org.
+-
+-# Packages using this file:
+-
+-bokmal nb_NO.ISO-8859-1
+-bokmål nb_NO.ISO-8859-1
+-catalan ca_ES.ISO-8859-1
+-croatian hr_HR.ISO-8859-2
+-czech cs_CZ.ISO-8859-2
+-danish da_DK.ISO-8859-1
+-dansk da_DK.ISO-8859-1
+-deutsch de_DE.ISO-8859-1
+-dutch nl_NL.ISO-8859-1
+-eesti et_EE.ISO-8859-1
+-estonian et_EE.ISO-8859-1
+-finnish fi_FI.ISO-8859-1
+-français fr_FR.ISO-8859-1
+-french fr_FR.ISO-8859-1
+-galego gl_ES.ISO-8859-1
+-galician gl_ES.ISO-8859-1
+-german de_DE.ISO-8859-1
+-greek el_GR.ISO-8859-7
+-hebrew he_IL.ISO-8859-8
+-hrvatski hr_HR.ISO-8859-2
+-hungarian hu_HU.ISO-8859-2
+-icelandic is_IS.ISO-8859-1
+-italian it_IT.ISO-8859-1
+-japanese ja_JP.eucJP
+-japanese.euc ja_JP.eucJP
+-ja_JP ja_JP.eucJP
+-ja_JP.ujis ja_JP.eucJP
+-japanese.sjis ja_JP.SJIS
+-korean ko_KR.eucKR
+-korean.euc ko_KR.eucKR
+-ko_KR ko_KR.eucKR
+-lithuanian lt_LT.ISO-8859-13
+-no_NO nb_NO.ISO-8859-1
+-no_NO.ISO-8859-1 nb_NO.ISO-8859-1
+-norwegian nb_NO.ISO-8859-1
+-nynorsk nn_NO.ISO-8859-1
+-polish pl_PL.ISO-8859-2
+-portuguese pt_PT.ISO-8859-1
+-romanian ro_RO.ISO-8859-2
+-russian ru_RU.ISO-8859-5
+-slovak sk_SK.ISO-8859-2
+-slovene sl_SI.ISO-8859-2
+-slovenian sl_SI.ISO-8859-2
+-spanish es_ES.ISO-8859-1
+-swedish sv_SE.ISO-8859-1
+-thai th_TH.TIS-620
+-turkish tr_TR.ISO-8859-9
+diff -urN BUILD/abook-0.6.0pre2/intl/localealias.c abook/intl/localealias.c
+--- BUILD/abook-0.6.0pre2/intl/localealias.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/localealias.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,414 +0,0 @@
+-/* Handle aliases for locale names.
+- Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+- This must come before <config.h> because <config.h> may include
+- <features.h>, and once <features.h> has been included, it's too late. */
+-#ifndef _GNU_SOURCE
+-# define _GNU_SOURCE 1
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <ctype.h>
+-#include <stdio.h>
+-#if defined _LIBC || defined HAVE___FSETLOCKING
+-# include <stdio_ext.h>
+-#endif
+-#include <sys/types.h>
+-
+-#ifdef __GNUC__
+-# undef alloca
+-# define alloca __builtin_alloca
+-# define HAVE_ALLOCA 1
+-#else
+-# ifdef _MSC_VER
+-# include <malloc.h>
+-# define alloca _alloca
+-# else
+-# if defined HAVE_ALLOCA_H || defined _LIBC
+-# include <alloca.h>
+-# else
+-# ifdef _AIX
+- #pragma alloca
+-# else
+-# ifndef alloca
+-char *alloca ();
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#include "gettextP.h"
+-
+-#if ENABLE_RELOCATABLE
+-# include "relocatable.h"
+-#else
+-# define relocate(pathname) (pathname)
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-#ifdef _LIBC
+-/* Rename the non ANSI C functions. This is required by the standard
+- because some ANSI C functions will require linking with this object
+- file and the name space must not be polluted. */
+-# define strcasecmp __strcasecmp
+-
+-# ifndef mempcpy
+-# define mempcpy __mempcpy
+-# endif
+-# define HAVE_MEMPCPY 1
+-# define HAVE___FSETLOCKING 1
+-
+-/* We need locking here since we can be called from different places. */
+-# include <bits/libc-lock.h>
+-
+-__libc_lock_define_initialized (static, lock);
+-#endif
+-
+-#ifndef internal_function
+-# define internal_function
+-#endif
+-
+-/* Some optimizations for glibc. */
+-#ifdef _LIBC
+-# define FEOF(fp) feof_unlocked (fp)
+-# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
+-#else
+-# define FEOF(fp) feof (fp)
+-# define FGETS(buf, n, fp) fgets (buf, n, fp)
+-#endif
+-
+-/* For those losing systems which don't have `alloca' we have to add
+- some additional code emulating it. */
+-#ifdef HAVE_ALLOCA
+-# define freea(p) /* nothing */
+-#else
+-# define alloca(n) malloc (n)
+-# define freea(p) free (p)
+-#endif
+-
+-#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
+-# undef fgets
+-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
+-#endif
+-#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
+-# undef feof
+-# define feof(s) feof_unlocked (s)
+-#endif
+-
+-
+-struct alias_map
+-{
+- const char *alias;
+- const char *value;
+-};
+-
+-
+-#ifndef _LIBC
+-# define libc_freeres_ptr(decl) decl
+-#endif
+-
+-libc_freeres_ptr (static char *string_space);
+-static size_t string_space_act;
+-static size_t string_space_max;
+-libc_freeres_ptr (static struct alias_map *map);
+-static size_t nmap;
+-static size_t maxmap;
+-
+-
+-/* Prototypes for local functions. */
+-static size_t read_alias_file (const char *fname, int fname_len)
+- internal_function;
+-static int extend_alias_table (void);
+-static int alias_compare (const struct alias_map *map1,
+- const struct alias_map *map2);
+-
+-
+-const char *
+-_nl_expand_alias (const char *name)
+-{
+- static const char *locale_alias_path;
+- struct alias_map *retval;
+- const char *result = NULL;
+- size_t added;
+-
+-#ifdef _LIBC
+- __libc_lock_lock (lock);
+-#endif
+-
+- if (locale_alias_path == NULL)
+- locale_alias_path = LOCALE_ALIAS_PATH;
+-
+- do
+- {
+- struct alias_map item;
+-
+- item.alias = name;
+-
+- if (nmap > 0)
+- retval = (struct alias_map *) bsearch (&item, map, nmap,
+- sizeof (struct alias_map),
+- (int (*) (const void *,
+- const void *)
+- ) alias_compare);
+- else
+- retval = NULL;
+-
+- /* We really found an alias. Return the value. */
+- if (retval != NULL)
+- {
+- result = retval->value;
+- break;
+- }
+-
+- /* Perhaps we can find another alias file. */
+- added = 0;
+- while (added == 0 && locale_alias_path[0] != '\0')
+- {
+- const char *start;
+-
+- while (locale_alias_path[0] == PATH_SEPARATOR)
+- ++locale_alias_path;
+- start = locale_alias_path;
+-
+- while (locale_alias_path[0] != '\0'
+- && locale_alias_path[0] != PATH_SEPARATOR)
+- ++locale_alias_path;
+-
+- if (start < locale_alias_path)
+- added = read_alias_file (start, locale_alias_path - start);
+- }
+- }
+- while (added != 0);
+-
+-#ifdef _LIBC
+- __libc_lock_unlock (lock);
+-#endif
+-
+- return result;
+-}
+-
+-
+-static size_t
+-internal_function
+-read_alias_file (const char *fname, int fname_len)
+-{
+- FILE *fp;
+- char *full_fname;
+- size_t added;
+- static const char aliasfile[] = "/locale.alias";
+-
+- full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+-#ifdef HAVE_MEMPCPY
+- mempcpy (mempcpy (full_fname, fname, fname_len),
+- aliasfile, sizeof aliasfile);
+-#else
+- memcpy (full_fname, fname, fname_len);
+- memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
+-#endif
+-
+- fp = fopen (relocate (full_fname), "r");
+- freea (full_fname);
+- if (fp == NULL)
+- return 0;
+-
+-#ifdef HAVE___FSETLOCKING
+- /* No threads present. */
+- __fsetlocking (fp, FSETLOCKING_BYCALLER);
+-#endif
+-
+- added = 0;
+- while (!FEOF (fp))
+- {
+- /* It is a reasonable approach to use a fix buffer here because
+- a) we are only interested in the first two fields
+- b) these fields must be usable as file names and so must not
+- be that long
+- We avoid a multi-kilobyte buffer here since this would use up
+- stack space which we might not have if the program ran out of
+- memory. */
+- char buf[400];
+- char *alias;
+- char *value;
+- char *cp;
+-
+- if (FGETS (buf, sizeof buf, fp) == NULL)
+- /* EOF reached. */
+- break;
+-
+- cp = buf;
+- /* Ignore leading white space. */
+- while (isspace ((unsigned char) cp[0]))
+- ++cp;
+-
+- /* A leading '#' signals a comment line. */
+- if (cp[0] != '\0' && cp[0] != '#')
+- {
+- alias = cp++;
+- while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
+- ++cp;
+- /* Terminate alias name. */
+- if (cp[0] != '\0')
+- *cp++ = '\0';
+-
+- /* Now look for the beginning of the value. */
+- while (isspace ((unsigned char) cp[0]))
+- ++cp;
+-
+- if (cp[0] != '\0')
+- {
+- size_t alias_len;
+- size_t value_len;
+-
+- value = cp++;
+- while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
+- ++cp;
+- /* Terminate value. */
+- if (cp[0] == '\n')
+- {
+- /* This has to be done to make the following test
+- for the end of line possible. We are looking for
+- the terminating '\n' which do not overwrite here. */
+- *cp++ = '\0';
+- *cp = '\n';
+- }
+- else if (cp[0] != '\0')
+- *cp++ = '\0';
+-
+- if (nmap >= maxmap)
+- if (__builtin_expect (extend_alias_table (), 0))
+- return added;
+-
+- alias_len = strlen (alias) + 1;
+- value_len = strlen (value) + 1;
+-
+- if (string_space_act + alias_len + value_len > string_space_max)
+- {
+- /* Increase size of memory pool. */
+- size_t new_size = (string_space_max
+- + (alias_len + value_len > 1024
+- ? alias_len + value_len : 1024));
+- char *new_pool = (char *) realloc (string_space, new_size);
+- if (new_pool == NULL)
+- return added;
+-
+- if (__builtin_expect (string_space != new_pool, 0))
+- {
+- size_t i;
+-
+- for (i = 0; i < nmap; i++)
+- {
+- map[i].alias += new_pool - string_space;
+- map[i].value += new_pool - string_space;
+- }
+- }
+-
+- string_space = new_pool;
+- string_space_max = new_size;
+- }
+-
+- map[nmap].alias = memcpy (&string_space[string_space_act],
+- alias, alias_len);
+- string_space_act += alias_len;
+-
+- map[nmap].value = memcpy (&string_space[string_space_act],
+- value, value_len);
+- string_space_act += value_len;
+-
+- ++nmap;
+- ++added;
+- }
+- }
+-
+- /* Possibly not the whole line fits into the buffer. Ignore
+- the rest of the line. */
+- while (strchr (buf, '\n') == NULL)
+- if (FGETS (buf, sizeof buf, fp) == NULL)
+- /* Make sure the inner loop will be left. The outer loop
+- will exit at the `feof' test. */
+- break;
+- }
+-
+- /* Should we test for ferror()? I think we have to silently ignore
+- errors. --drepper */
+- fclose (fp);
+-
+- if (added > 0)
+- qsort (map, nmap, sizeof (struct alias_map),
+- (int (*) (const void *, const void *)) alias_compare);
+-
+- return added;
+-}
+-
+-
+-static int
+-extend_alias_table ()
+-{
+- size_t new_size;
+- struct alias_map *new_map;
+-
+- new_size = maxmap == 0 ? 100 : 2 * maxmap;
+- new_map = (struct alias_map *) realloc (map, (new_size
+- * sizeof (struct alias_map)));
+- if (new_map == NULL)
+- /* Simply don't extend: we don't have any more core. */
+- return -1;
+-
+- map = new_map;
+- maxmap = new_size;
+- return 0;
+-}
+-
+-
+-static int
+-alias_compare (const struct alias_map *map1, const struct alias_map *map2)
+-{
+-#if defined _LIBC || defined HAVE_STRCASECMP
+- return strcasecmp (map1->alias, map2->alias);
+-#else
+- const unsigned char *p1 = (const unsigned char *) map1->alias;
+- const unsigned char *p2 = (const unsigned char *) map2->alias;
+- unsigned char c1, c2;
+-
+- if (p1 == p2)
+- return 0;
+-
+- do
+- {
+- /* I know this seems to be odd but the tolower() function in
+- some systems libc cannot handle nonalpha characters. */
+- c1 = isupper (*p1) ? tolower (*p1) : *p1;
+- c2 = isupper (*p2) ? tolower (*p2) : *p2;
+- if (c1 == '\0')
+- break;
+- ++p1;
+- ++p2;
+- }
+- while (c1 == c2);
+-
+- return c1 - c2;
+-#endif
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/localename.c abook/intl/localename.c
+--- BUILD/abook-0.6.0pre2/intl/localename.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/localename.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,1500 +0,0 @@
+-/* Determine the current selected locale.
+- Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
+-/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
+-/* MacOS X code written by Bruno Haible <bruno@clisp.org>. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdlib.h>
+-#include <locale.h>
+-
+-#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+-# include <string.h>
+-# include <CFString.h>
+-# if HAVE_CFLOCALECOPYCURRENT
+-# include <CFLocale.h>
+-# elif HAVE_CFPREFERENCESCOPYAPPVALUE
+-# include <CFPreferences.h>
+-# endif
+-#endif
+-
+-#if defined _WIN32 || defined __WIN32__
+-# undef WIN32 /* avoid warning on mingw32 */
+-# define WIN32
+-#endif
+-
+-#ifdef WIN32
+-# define WIN32_LEAN_AND_MEAN
+-# include <windows.h>
+-/* List of language codes, sorted by value:
+- 0x01 LANG_ARABIC
+- 0x02 LANG_BULGARIAN
+- 0x03 LANG_CATALAN
+- 0x04 LANG_CHINESE
+- 0x05 LANG_CZECH
+- 0x06 LANG_DANISH
+- 0x07 LANG_GERMAN
+- 0x08 LANG_GREEK
+- 0x09 LANG_ENGLISH
+- 0x0a LANG_SPANISH
+- 0x0b LANG_FINNISH
+- 0x0c LANG_FRENCH
+- 0x0d LANG_HEBREW
+- 0x0e LANG_HUNGARIAN
+- 0x0f LANG_ICELANDIC
+- 0x10 LANG_ITALIAN
+- 0x11 LANG_JAPANESE
+- 0x12 LANG_KOREAN
+- 0x13 LANG_DUTCH
+- 0x14 LANG_NORWEGIAN
+- 0x15 LANG_POLISH
+- 0x16 LANG_PORTUGUESE
+- 0x17 LANG_RHAETO_ROMANCE
+- 0x18 LANG_ROMANIAN
+- 0x19 LANG_RUSSIAN
+- 0x1a LANG_CROATIAN == LANG_SERBIAN
+- 0x1b LANG_SLOVAK
+- 0x1c LANG_ALBANIAN
+- 0x1d LANG_SWEDISH
+- 0x1e LANG_THAI
+- 0x1f LANG_TURKISH
+- 0x20 LANG_URDU
+- 0x21 LANG_INDONESIAN
+- 0x22 LANG_UKRAINIAN
+- 0x23 LANG_BELARUSIAN
+- 0x24 LANG_SLOVENIAN
+- 0x25 LANG_ESTONIAN
+- 0x26 LANG_LATVIAN
+- 0x27 LANG_LITHUANIAN
+- 0x28 LANG_TAJIK
+- 0x29 LANG_FARSI
+- 0x2a LANG_VIETNAMESE
+- 0x2b LANG_ARMENIAN
+- 0x2c LANG_AZERI
+- 0x2d LANG_BASQUE
+- 0x2e LANG_SORBIAN
+- 0x2f LANG_MACEDONIAN
+- 0x30 LANG_SUTU
+- 0x31 LANG_TSONGA
+- 0x32 LANG_TSWANA
+- 0x33 LANG_VENDA
+- 0x34 LANG_XHOSA
+- 0x35 LANG_ZULU
+- 0x36 LANG_AFRIKAANS
+- 0x37 LANG_GEORGIAN
+- 0x38 LANG_FAEROESE
+- 0x39 LANG_HINDI
+- 0x3a LANG_MALTESE
+- 0x3b LANG_SAAMI
+- 0x3c LANG_GAELIC
+- 0x3d LANG_YIDDISH
+- 0x3e LANG_MALAY
+- 0x3f LANG_KAZAK
+- 0x40 LANG_KYRGYZ
+- 0x41 LANG_SWAHILI
+- 0x42 LANG_TURKMEN
+- 0x43 LANG_UZBEK
+- 0x44 LANG_TATAR
+- 0x45 LANG_BENGALI
+- 0x46 LANG_PUNJABI
+- 0x47 LANG_GUJARATI
+- 0x48 LANG_ORIYA
+- 0x49 LANG_TAMIL
+- 0x4a LANG_TELUGU
+- 0x4b LANG_KANNADA
+- 0x4c LANG_MALAYALAM
+- 0x4d LANG_ASSAMESE
+- 0x4e LANG_MARATHI
+- 0x4f LANG_SANSKRIT
+- 0x50 LANG_MONGOLIAN
+- 0x51 LANG_TIBETAN
+- 0x52 LANG_WELSH
+- 0x53 LANG_CAMBODIAN
+- 0x54 LANG_LAO
+- 0x55 LANG_BURMESE
+- 0x56 LANG_GALICIAN
+- 0x57 LANG_KONKANI
+- 0x58 LANG_MANIPURI
+- 0x59 LANG_SINDHI
+- 0x5a LANG_SYRIAC
+- 0x5b LANG_SINHALESE
+- 0x5c LANG_CHEROKEE
+- 0x5d LANG_INUKTITUT
+- 0x5e LANG_AMHARIC
+- 0x5f LANG_TAMAZIGHT
+- 0x60 LANG_KASHMIRI
+- 0x61 LANG_NEPALI
+- 0x62 LANG_FRISIAN
+- 0x63 LANG_PASHTO
+- 0x64 LANG_TAGALOG
+- 0x65 LANG_DIVEHI
+- 0x66 LANG_EDO
+- 0x67 LANG_FULFULDE
+- 0x68 LANG_HAUSA
+- 0x69 LANG_IBIBIO
+- 0x6a LANG_YORUBA
+- 0x70 LANG_IGBO
+- 0x71 LANG_KANURI
+- 0x72 LANG_OROMO
+- 0x73 LANG_TIGRINYA
+- 0x74 LANG_GUARANI
+- 0x75 LANG_HAWAIIAN
+- 0x76 LANG_LATIN
+- 0x77 LANG_SOMALI
+- 0x78 LANG_YI
+- 0x79 LANG_PAPIAMENTU
+-*/
+-/* Mingw headers don't have latest language and sublanguage codes. */
+-# ifndef LANG_AFRIKAANS
+-# define LANG_AFRIKAANS 0x36
+-# endif
+-# ifndef LANG_ALBANIAN
+-# define LANG_ALBANIAN 0x1c
+-# endif
+-# ifndef LANG_AMHARIC
+-# define LANG_AMHARIC 0x5e
+-# endif
+-# ifndef LANG_ARABIC
+-# define LANG_ARABIC 0x01
+-# endif
+-# ifndef LANG_ARMENIAN
+-# define LANG_ARMENIAN 0x2b
+-# endif
+-# ifndef LANG_ASSAMESE
+-# define LANG_ASSAMESE 0x4d
+-# endif
+-# ifndef LANG_AZERI
+-# define LANG_AZERI 0x2c
+-# endif
+-# ifndef LANG_BASQUE
+-# define LANG_BASQUE 0x2d
+-# endif
+-# ifndef LANG_BELARUSIAN
+-# define LANG_BELARUSIAN 0x23
+-# endif
+-# ifndef LANG_BENGALI
+-# define LANG_BENGALI 0x45
+-# endif
+-# ifndef LANG_BURMESE
+-# define LANG_BURMESE 0x55
+-# endif
+-# ifndef LANG_CAMBODIAN
+-# define LANG_CAMBODIAN 0x53
+-# endif
+-# ifndef LANG_CATALAN
+-# define LANG_CATALAN 0x03
+-# endif
+-# ifndef LANG_CHEROKEE
+-# define LANG_CHEROKEE 0x5c
+-# endif
+-# ifndef LANG_DIVEHI
+-# define LANG_DIVEHI 0x65
+-# endif
+-# ifndef LANG_EDO
+-# define LANG_EDO 0x66
+-# endif
+-# ifndef LANG_ESTONIAN
+-# define LANG_ESTONIAN 0x25
+-# endif
+-# ifndef LANG_FAEROESE
+-# define LANG_FAEROESE 0x38
+-# endif
+-# ifndef LANG_FARSI
+-# define LANG_FARSI 0x29
+-# endif
+-# ifndef LANG_FRISIAN
+-# define LANG_FRISIAN 0x62
+-# endif
+-# ifndef LANG_FULFULDE
+-# define LANG_FULFULDE 0x67
+-# endif
+-# ifndef LANG_GAELIC
+-# define LANG_GAELIC 0x3c
+-# endif
+-# ifndef LANG_GALICIAN
+-# define LANG_GALICIAN 0x56
+-# endif
+-# ifndef LANG_GEORGIAN
+-# define LANG_GEORGIAN 0x37
+-# endif
+-# ifndef LANG_GUARANI
+-# define LANG_GUARANI 0x74
+-# endif
+-# ifndef LANG_GUJARATI
+-# define LANG_GUJARATI 0x47
+-# endif
+-# ifndef LANG_HAUSA
+-# define LANG_HAUSA 0x68
+-# endif
+-# ifndef LANG_HAWAIIAN
+-# define LANG_HAWAIIAN 0x75
+-# endif
+-# ifndef LANG_HEBREW
+-# define LANG_HEBREW 0x0d
+-# endif
+-# ifndef LANG_HINDI
+-# define LANG_HINDI 0x39
+-# endif
+-# ifndef LANG_IBIBIO
+-# define LANG_IBIBIO 0x69
+-# endif
+-# ifndef LANG_IGBO
+-# define LANG_IGBO 0x70
+-# endif
+-# ifndef LANG_INDONESIAN
+-# define LANG_INDONESIAN 0x21
+-# endif
+-# ifndef LANG_INUKTITUT
+-# define LANG_INUKTITUT 0x5d
+-# endif
+-# ifndef LANG_KANNADA
+-# define LANG_KANNADA 0x4b
+-# endif
+-# ifndef LANG_KANURI
+-# define LANG_KANURI 0x71
+-# endif
+-# ifndef LANG_KASHMIRI
+-# define LANG_KASHMIRI 0x60
+-# endif
+-# ifndef LANG_KAZAK
+-# define LANG_KAZAK 0x3f
+-# endif
+-# ifndef LANG_KONKANI
+-# define LANG_KONKANI 0x57
+-# endif
+-# ifndef LANG_KYRGYZ
+-# define LANG_KYRGYZ 0x40
+-# endif
+-# ifndef LANG_LAO
+-# define LANG_LAO 0x54
+-# endif
+-# ifndef LANG_LATIN
+-# define LANG_LATIN 0x76
+-# endif
+-# ifndef LANG_LATVIAN
+-# define LANG_LATVIAN 0x26
+-# endif
+-# ifndef LANG_LITHUANIAN
+-# define LANG_LITHUANIAN 0x27
+-# endif
+-# ifndef LANG_MACEDONIAN
+-# define LANG_MACEDONIAN 0x2f
+-# endif
+-# ifndef LANG_MALAY
+-# define LANG_MALAY 0x3e
+-# endif
+-# ifndef LANG_MALAYALAM
+-# define LANG_MALAYALAM 0x4c
+-# endif
+-# ifndef LANG_MALTESE
+-# define LANG_MALTESE 0x3a
+-# endif
+-# ifndef LANG_MANIPURI
+-# define LANG_MANIPURI 0x58
+-# endif
+-# ifndef LANG_MARATHI
+-# define LANG_MARATHI 0x4e
+-# endif
+-# ifndef LANG_MONGOLIAN
+-# define LANG_MONGOLIAN 0x50
+-# endif
+-# ifndef LANG_NEPALI
+-# define LANG_NEPALI 0x61
+-# endif
+-# ifndef LANG_ORIYA
+-# define LANG_ORIYA 0x48
+-# endif
+-# ifndef LANG_OROMO
+-# define LANG_OROMO 0x72
+-# endif
+-# ifndef LANG_PAPIAMENTU
+-# define LANG_PAPIAMENTU 0x79
+-# endif
+-# ifndef LANG_PASHTO
+-# define LANG_PASHTO 0x63
+-# endif
+-# ifndef LANG_PUNJABI
+-# define LANG_PUNJABI 0x46
+-# endif
+-# ifndef LANG_RHAETO_ROMANCE
+-# define LANG_RHAETO_ROMANCE 0x17
+-# endif
+-# ifndef LANG_SAAMI
+-# define LANG_SAAMI 0x3b
+-# endif
+-# ifndef LANG_SANSKRIT
+-# define LANG_SANSKRIT 0x4f
+-# endif
+-# ifndef LANG_SERBIAN
+-# define LANG_SERBIAN 0x1a
+-# endif
+-# ifndef LANG_SINDHI
+-# define LANG_SINDHI 0x59
+-# endif
+-# ifndef LANG_SINHALESE
+-# define LANG_SINHALESE 0x5b
+-# endif
+-# ifndef LANG_SLOVAK
+-# define LANG_SLOVAK 0x1b
+-# endif
+-# ifndef LANG_SOMALI
+-# define LANG_SOMALI 0x77
+-# endif
+-# ifndef LANG_SORBIAN
+-# define LANG_SORBIAN 0x2e
+-# endif
+-# ifndef LANG_SUTU
+-# define LANG_SUTU 0x30
+-# endif
+-# ifndef LANG_SWAHILI
+-# define LANG_SWAHILI 0x41
+-# endif
+-# ifndef LANG_SYRIAC
+-# define LANG_SYRIAC 0x5a
+-# endif
+-# ifndef LANG_TAGALOG
+-# define LANG_TAGALOG 0x64
+-# endif
+-# ifndef LANG_TAJIK
+-# define LANG_TAJIK 0x28
+-# endif
+-# ifndef LANG_TAMAZIGHT
+-# define LANG_TAMAZIGHT 0x5f
+-# endif
+-# ifndef LANG_TAMIL
+-# define LANG_TAMIL 0x49
+-# endif
+-# ifndef LANG_TATAR
+-# define LANG_TATAR 0x44
+-# endif
+-# ifndef LANG_TELUGU
+-# define LANG_TELUGU 0x4a
+-# endif
+-# ifndef LANG_THAI
+-# define LANG_THAI 0x1e
+-# endif
+-# ifndef LANG_TIBETAN
+-# define LANG_TIBETAN 0x51
+-# endif
+-# ifndef LANG_TIGRINYA
+-# define LANG_TIGRINYA 0x73
+-# endif
+-# ifndef LANG_TSONGA
+-# define LANG_TSONGA 0x31
+-# endif
+-# ifndef LANG_TSWANA
+-# define LANG_TSWANA 0x32
+-# endif
+-# ifndef LANG_TURKMEN
+-# define LANG_TURKMEN 0x42
+-# endif
+-# ifndef LANG_UKRAINIAN
+-# define LANG_UKRAINIAN 0x22
+-# endif
+-# ifndef LANG_URDU
+-# define LANG_URDU 0x20
+-# endif
+-# ifndef LANG_UZBEK
+-# define LANG_UZBEK 0x43
+-# endif
+-# ifndef LANG_VENDA
+-# define LANG_VENDA 0x33
+-# endif
+-# ifndef LANG_VIETNAMESE
+-# define LANG_VIETNAMESE 0x2a
+-# endif
+-# ifndef LANG_WELSH
+-# define LANG_WELSH 0x52
+-# endif
+-# ifndef LANG_XHOSA
+-# define LANG_XHOSA 0x34
+-# endif
+-# ifndef LANG_YI
+-# define LANG_YI 0x78
+-# endif
+-# ifndef LANG_YIDDISH
+-# define LANG_YIDDISH 0x3d
+-# endif
+-# ifndef LANG_YORUBA
+-# define LANG_YORUBA 0x6a
+-# endif
+-# ifndef LANG_ZULU
+-# define LANG_ZULU 0x35
+-# endif
+-# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
+-# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
+-# endif
+-# ifndef SUBLANG_ARABIC_IRAQ
+-# define SUBLANG_ARABIC_IRAQ 0x02
+-# endif
+-# ifndef SUBLANG_ARABIC_EGYPT
+-# define SUBLANG_ARABIC_EGYPT 0x03
+-# endif
+-# ifndef SUBLANG_ARABIC_LIBYA
+-# define SUBLANG_ARABIC_LIBYA 0x04
+-# endif
+-# ifndef SUBLANG_ARABIC_ALGERIA
+-# define SUBLANG_ARABIC_ALGERIA 0x05
+-# endif
+-# ifndef SUBLANG_ARABIC_MOROCCO
+-# define SUBLANG_ARABIC_MOROCCO 0x06
+-# endif
+-# ifndef SUBLANG_ARABIC_TUNISIA
+-# define SUBLANG_ARABIC_TUNISIA 0x07
+-# endif
+-# ifndef SUBLANG_ARABIC_OMAN
+-# define SUBLANG_ARABIC_OMAN 0x08
+-# endif
+-# ifndef SUBLANG_ARABIC_YEMEN
+-# define SUBLANG_ARABIC_YEMEN 0x09
+-# endif
+-# ifndef SUBLANG_ARABIC_SYRIA
+-# define SUBLANG_ARABIC_SYRIA 0x0a
+-# endif
+-# ifndef SUBLANG_ARABIC_JORDAN
+-# define SUBLANG_ARABIC_JORDAN 0x0b
+-# endif
+-# ifndef SUBLANG_ARABIC_LEBANON
+-# define SUBLANG_ARABIC_LEBANON 0x0c
+-# endif
+-# ifndef SUBLANG_ARABIC_KUWAIT
+-# define SUBLANG_ARABIC_KUWAIT 0x0d
+-# endif
+-# ifndef SUBLANG_ARABIC_UAE
+-# define SUBLANG_ARABIC_UAE 0x0e
+-# endif
+-# ifndef SUBLANG_ARABIC_BAHRAIN
+-# define SUBLANG_ARABIC_BAHRAIN 0x0f
+-# endif
+-# ifndef SUBLANG_ARABIC_QATAR
+-# define SUBLANG_ARABIC_QATAR 0x10
+-# endif
+-# ifndef SUBLANG_AZERI_LATIN
+-# define SUBLANG_AZERI_LATIN 0x01
+-# endif
+-# ifndef SUBLANG_AZERI_CYRILLIC
+-# define SUBLANG_AZERI_CYRILLIC 0x02
+-# endif
+-# ifndef SUBLANG_BENGALI_INDIA
+-# define SUBLANG_BENGALI_INDIA 0x00
+-# endif
+-# ifndef SUBLANG_BENGALI_BANGLADESH
+-# define SUBLANG_BENGALI_BANGLADESH 0x01
+-# endif
+-# ifndef SUBLANG_CHINESE_MACAU
+-# define SUBLANG_CHINESE_MACAU 0x05
+-# endif
+-# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
+-# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
+-# endif
+-# ifndef SUBLANG_ENGLISH_JAMAICA
+-# define SUBLANG_ENGLISH_JAMAICA 0x08
+-# endif
+-# ifndef SUBLANG_ENGLISH_CARIBBEAN
+-# define SUBLANG_ENGLISH_CARIBBEAN 0x09
+-# endif
+-# ifndef SUBLANG_ENGLISH_BELIZE
+-# define SUBLANG_ENGLISH_BELIZE 0x0a
+-# endif
+-# ifndef SUBLANG_ENGLISH_TRINIDAD
+-# define SUBLANG_ENGLISH_TRINIDAD 0x0b
+-# endif
+-# ifndef SUBLANG_ENGLISH_ZIMBABWE
+-# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
+-# endif
+-# ifndef SUBLANG_ENGLISH_PHILIPPINES
+-# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
+-# endif
+-# ifndef SUBLANG_ENGLISH_INDONESIA
+-# define SUBLANG_ENGLISH_INDONESIA 0x0e
+-# endif
+-# ifndef SUBLANG_ENGLISH_HONGKONG
+-# define SUBLANG_ENGLISH_HONGKONG 0x0f
+-# endif
+-# ifndef SUBLANG_ENGLISH_INDIA
+-# define SUBLANG_ENGLISH_INDIA 0x10
+-# endif
+-# ifndef SUBLANG_ENGLISH_MALAYSIA
+-# define SUBLANG_ENGLISH_MALAYSIA 0x11
+-# endif
+-# ifndef SUBLANG_ENGLISH_SINGAPORE
+-# define SUBLANG_ENGLISH_SINGAPORE 0x12
+-# endif
+-# ifndef SUBLANG_FRENCH_LUXEMBOURG
+-# define SUBLANG_FRENCH_LUXEMBOURG 0x05
+-# endif
+-# ifndef SUBLANG_FRENCH_MONACO
+-# define SUBLANG_FRENCH_MONACO 0x06
+-# endif
+-# ifndef SUBLANG_FRENCH_WESTINDIES
+-# define SUBLANG_FRENCH_WESTINDIES 0x07
+-# endif
+-# ifndef SUBLANG_FRENCH_REUNION
+-# define SUBLANG_FRENCH_REUNION 0x08
+-# endif
+-# ifndef SUBLANG_FRENCH_CONGO
+-# define SUBLANG_FRENCH_CONGO 0x09
+-# endif
+-# ifndef SUBLANG_FRENCH_SENEGAL
+-# define SUBLANG_FRENCH_SENEGAL 0x0a
+-# endif
+-# ifndef SUBLANG_FRENCH_CAMEROON
+-# define SUBLANG_FRENCH_CAMEROON 0x0b
+-# endif
+-# ifndef SUBLANG_FRENCH_COTEDIVOIRE
+-# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
+-# endif
+-# ifndef SUBLANG_FRENCH_MALI
+-# define SUBLANG_FRENCH_MALI 0x0d
+-# endif
+-# ifndef SUBLANG_FRENCH_MOROCCO
+-# define SUBLANG_FRENCH_MOROCCO 0x0e
+-# endif
+-# ifndef SUBLANG_FRENCH_HAITI
+-# define SUBLANG_FRENCH_HAITI 0x0f
+-# endif
+-# ifndef SUBLANG_GERMAN_LUXEMBOURG
+-# define SUBLANG_GERMAN_LUXEMBOURG 0x04
+-# endif
+-# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
+-# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
+-# endif
+-# ifndef SUBLANG_KASHMIRI_INDIA
+-# define SUBLANG_KASHMIRI_INDIA 0x02
+-# endif
+-# ifndef SUBLANG_MALAY_MALAYSIA
+-# define SUBLANG_MALAY_MALAYSIA 0x01
+-# endif
+-# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
+-# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
+-# endif
+-# ifndef SUBLANG_NEPALI_INDIA
+-# define SUBLANG_NEPALI_INDIA 0x02
+-# endif
+-# ifndef SUBLANG_PUNJABI_INDIA
+-# define SUBLANG_PUNJABI_INDIA 0x00
+-# endif
+-# ifndef SUBLANG_PUNJABI_PAKISTAN
+-# define SUBLANG_PUNJABI_PAKISTAN 0x01
+-# endif
+-# ifndef SUBLANG_ROMANIAN_ROMANIA
+-# define SUBLANG_ROMANIAN_ROMANIA 0x00
+-# endif
+-# ifndef SUBLANG_ROMANIAN_MOLDOVA
+-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
+-# endif
+-# ifndef SUBLANG_SERBIAN_LATIN
+-# define SUBLANG_SERBIAN_LATIN 0x02
+-# endif
+-# ifndef SUBLANG_SERBIAN_CYRILLIC
+-# define SUBLANG_SERBIAN_CYRILLIC 0x03
+-# endif
+-# ifndef SUBLANG_SINDHI_INDIA
+-# define SUBLANG_SINDHI_INDIA 0x00
+-# endif
+-# ifndef SUBLANG_SINDHI_PAKISTAN
+-# define SUBLANG_SINDHI_PAKISTAN 0x01
+-# endif
+-# ifndef SUBLANG_SPANISH_GUATEMALA
+-# define SUBLANG_SPANISH_GUATEMALA 0x04
+-# endif
+-# ifndef SUBLANG_SPANISH_COSTA_RICA
+-# define SUBLANG_SPANISH_COSTA_RICA 0x05
+-# endif
+-# ifndef SUBLANG_SPANISH_PANAMA
+-# define SUBLANG_SPANISH_PANAMA 0x06
+-# endif
+-# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
+-# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
+-# endif
+-# ifndef SUBLANG_SPANISH_VENEZUELA
+-# define SUBLANG_SPANISH_VENEZUELA 0x08
+-# endif
+-# ifndef SUBLANG_SPANISH_COLOMBIA
+-# define SUBLANG_SPANISH_COLOMBIA 0x09
+-# endif
+-# ifndef SUBLANG_SPANISH_PERU
+-# define SUBLANG_SPANISH_PERU 0x0a
+-# endif
+-# ifndef SUBLANG_SPANISH_ARGENTINA
+-# define SUBLANG_SPANISH_ARGENTINA 0x0b
+-# endif
+-# ifndef SUBLANG_SPANISH_ECUADOR
+-# define SUBLANG_SPANISH_ECUADOR 0x0c
+-# endif
+-# ifndef SUBLANG_SPANISH_CHILE
+-# define SUBLANG_SPANISH_CHILE 0x0d
+-# endif
+-# ifndef SUBLANG_SPANISH_URUGUAY
+-# define SUBLANG_SPANISH_URUGUAY 0x0e
+-# endif
+-# ifndef SUBLANG_SPANISH_PARAGUAY
+-# define SUBLANG_SPANISH_PARAGUAY 0x0f
+-# endif
+-# ifndef SUBLANG_SPANISH_BOLIVIA
+-# define SUBLANG_SPANISH_BOLIVIA 0x10
+-# endif
+-# ifndef SUBLANG_SPANISH_EL_SALVADOR
+-# define SUBLANG_SPANISH_EL_SALVADOR 0x11
+-# endif
+-# ifndef SUBLANG_SPANISH_HONDURAS
+-# define SUBLANG_SPANISH_HONDURAS 0x12
+-# endif
+-# ifndef SUBLANG_SPANISH_NICARAGUA
+-# define SUBLANG_SPANISH_NICARAGUA 0x13
+-# endif
+-# ifndef SUBLANG_SPANISH_PUERTO_RICO
+-# define SUBLANG_SPANISH_PUERTO_RICO 0x14
+-# endif
+-# ifndef SUBLANG_SWEDISH_FINLAND
+-# define SUBLANG_SWEDISH_FINLAND 0x02
+-# endif
+-# ifndef SUBLANG_TAMAZIGHT_ARABIC
+-# define SUBLANG_TAMAZIGHT_ARABIC 0x01
+-# endif
+-# ifndef SUBLANG_TAMAZIGHT_LATIN
+-# define SUBLANG_TAMAZIGHT_LATIN 0x02
+-# endif
+-# ifndef SUBLANG_TIGRINYA_ETHIOPIA
+-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
+-# endif
+-# ifndef SUBLANG_TIGRINYA_ERITREA
+-# define SUBLANG_TIGRINYA_ERITREA 0x01
+-# endif
+-# ifndef SUBLANG_URDU_PAKISTAN
+-# define SUBLANG_URDU_PAKISTAN 0x01
+-# endif
+-# ifndef SUBLANG_URDU_INDIA
+-# define SUBLANG_URDU_INDIA 0x02
+-# endif
+-# ifndef SUBLANG_UZBEK_LATIN
+-# define SUBLANG_UZBEK_LATIN 0x01
+-# endif
+-# ifndef SUBLANG_UZBEK_CYRILLIC
+-# define SUBLANG_UZBEK_CYRILLIC 0x02
+-# endif
+-#endif
+-
+-# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+-/* MacOS X 10.2 or newer */
+-
+-/* Canonicalize a MacOS X locale name to a Unix locale name.
+- NAME is a sufficiently large buffer.
+- On input, it contains the MacOS X locale name.
+- On output, it contains the Unix locale name. */
+-void
+-_nl_locale_name_canonicalize (char *name)
+-{
+- /* This conversion is based on a posting by
+- Deborah GoldSmith <goldsmit@apple.com> on 2005-03-08,
+- http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
+-
+- /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
+- ISO 3166) names. Prior to MacOS X 10.3, there is no API for doing this.
+- Therefore we do it ourselves, using a table based on the results of the
+- MacOS X 10.3.8 function
+- CFLocaleCreateCanonicalLocaleIdentifierFromString(). */
+- typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
+- legacy_entry;
+- static const legacy_entry legacy_table[] = {
+- { "Afrikaans", "af" },
+- { "Albanian", "sq" },
+- { "Amharic", "am" },
+- { "Arabic", "ar" },
+- { "Armenian", "hy" },
+- { "Assamese", "as" },
+- { "Aymara", "ay" },
+- { "Azerbaijani", "az" },
+- { "Basque", "eu" },
+- { "Belarusian", "be" },
+- { "Belorussian", "be" },
+- { "Bengali", "bn" },
+- { "Brazilian Portugese", "pt_BR" },
+- { "Brazilian Portuguese", "pt_BR" },
+- { "Breton", "br" },
+- { "Bulgarian", "bg" },
+- { "Burmese", "my" },
+- { "Byelorussian", "be" },
+- { "Catalan", "ca" },
+- { "Chewa", "ny" },
+- { "Chichewa", "ny" },
+- { "Chinese", "zh" },
+- { "Chinese, Simplified", "zh_CN" },
+- { "Chinese, Traditional", "zh_TW" },
+- { "Chinese, Tradtional", "zh_TW" },
+- { "Croatian", "hr" },
+- { "Czech", "cs" },
+- { "Danish", "da" },
+- { "Dutch", "nl" },
+- { "Dzongkha", "dz" },
+- { "English", "en" },
+- { "Esperanto", "eo" },
+- { "Estonian", "et" },
+- { "Faroese", "fo" },
+- { "Farsi", "fa" },
+- { "Finnish", "fi" },
+- { "Flemish", "nl_BE" },
+- { "French", "fr" },
+- { "Galician", "gl" },
+- { "Gallegan", "gl" },
+- { "Georgian", "ka" },
+- { "German", "de" },
+- { "Greek", "el" },
+- { "Greenlandic", "kl" },
+- { "Guarani", "gn" },
+- { "Gujarati", "gu" },
+- { "Hawaiian", "haw" }, /* Yes, "haw", not "cpe". */
+- { "Hebrew", "he" },
+- { "Hindi", "hi" },
+- { "Hungarian", "hu" },
+- { "Icelandic", "is" },
+- { "Indonesian", "id" },
+- { "Inuktitut", "iu" },
+- { "Irish", "ga" },
+- { "Italian", "it" },
+- { "Japanese", "ja" },
+- { "Javanese", "jv" },
+- { "Kalaallisut", "kl" },
+- { "Kannada", "kn" },
+- { "Kashmiri", "ks" },
+- { "Kazakh", "kk" },
+- { "Khmer", "km" },
+- { "Kinyarwanda", "rw" },
+- { "Kirghiz", "ky" },
+- { "Korean", "ko" },
+- { "Kurdish", "ku" },
+- { "Latin", "la" },
+- { "Latvian", "lv" },
+- { "Lithuanian", "lt" },
+- { "Macedonian", "mk" },
+- { "Malagasy", "mg" },
+- { "Malay", "ms" },
+- { "Malayalam", "ml" },
+- { "Maltese", "mt" },
+- { "Manx", "gv" },
+- { "Marathi", "mr" },
+- { "Moldavian", "mo" },
+- { "Mongolian", "mn" },
+- { "Nepali", "ne" },
+- { "Norwegian", "nb" }, /* Yes, "nb", not the obsolete "no". */
+- { "Nyanja", "ny" },
+- { "Nynorsk", "nn" },
+- { "Oriya", "or" },
+- { "Oromo", "om" },
+- { "Panjabi", "pa" },
+- { "Pashto", "ps" },
+- { "Persian", "fa" },
+- { "Polish", "pl" },
+- { "Portuguese", "pt" },
+- { "Portuguese, Brazilian", "pt_BR" },
+- { "Punjabi", "pa" },
+- { "Pushto", "ps" },
+- { "Quechua", "qu" },
+- { "Romanian", "ro" },
+- { "Ruanda", "rw" },
+- { "Rundi", "rn" },
+- { "Russian", "ru" },
+- { "Sami", "se_NO" }, /* Not just "se". */
+- { "Sanskrit", "sa" },
+- { "Scottish", "gd" },
+- { "Serbian", "sr" },
+- { "Simplified Chinese", "zh_CN" },
+- { "Sindhi", "sd" },
+- { "Sinhalese", "si" },
+- { "Slovak", "sk" },
+- { "Slovenian", "sl" },
+- { "Somali", "so" },
+- { "Spanish", "es" },
+- { "Sundanese", "su" },
+- { "Swahili", "sw" },
+- { "Swedish", "sv" },
+- { "Tagalog", "tl" },
+- { "Tajik", "tg" },
+- { "Tajiki", "tg" },
+- { "Tamil", "ta" },
+- { "Tatar", "tt" },
+- { "Telugu", "te" },
+- { "Thai", "th" },
+- { "Tibetan", "bo" },
+- { "Tigrinya", "ti" },
+- { "Tongan", "to" },
+- { "Traditional Chinese", "zh_TW" },
+- { "Turkish", "tr" },
+- { "Turkmen", "tk" },
+- { "Uighur", "ug" },
+- { "Ukrainian", "uk" },
+- { "Urdu", "ur" },
+- { "Uzbek", "uz" },
+- { "Vietnamese", "vi" },
+- { "Welsh", "cy" },
+- { "Yiddish", "yi" }
+- };
+-
+- /* Convert new-style locale names with language tags (ISO 639 and ISO 15924)
+- to Unix (ISO 639 and ISO 3166) names. */
+- typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
+- langtag_entry;
+- static const langtag_entry langtag_table[] = {
+- /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
+- The default script for az on Unix is Latin. */
+- { "az-Latn", "az" },
+- /* MacOS X has "ga-dots". Does not yet exist on Unix. */
+- { "ga-dots", "ga" },
+- /* MacOS X has "kk-Cyrl". Does not yet exist on Unix. */
+- /* MacOS X has "mn-Cyrl", "mn-Mong".
+- The default script for mn on Unix is Cyrillic. */
+- { "mn-Cyrl", "mn" },
+- /* MacOS X has "ms-Arab", "ms-Latn".
+- The default script for ms on Unix is Latin. */
+- { "ms-Latn", "ms" },
+- /* MacOS X has "tg-Cyrl".
+- The default script for tg on Unix is Cyrillic. */
+- { "tg-Cyrl", "tg" },
+- /* MacOS X has "tk-Cyrl". Does not yet exist on Unix. */
+- /* MacOS X has "tt-Cyrl".
+- The default script for tt on Unix is Cyrillic. */
+- { "tt-Cyrl", "tt" },
+- /* MacOS X has "zh-Hans", "zh-Hant".
+- Country codes are used to distinguish these on Unix. */
+- { "zh-Hans", "zh_CN" },
+- { "zh-Hant", "zh_TW" }
+- };
+-
+- /* Convert script names (ISO 15924) to Unix conventions.
+- See http://www.unicode.org/iso15924/iso15924-codes.html */
+- typedef struct { const char script[4+1]; const char unixy[9+1]; }
+- script_entry;
+- static const script_entry script_table[] = {
+- { "Arab", "arabic" },
+- { "Cyrl", "cyrillic" },
+- { "Mong", "mongolian" }
+- };
+-
+- /* Step 1: Convert using legacy_table. */
+- if (name[0] >= 'A' && name[0] <= 'Z')
+- {
+- unsigned int i1, i2;
+- i1 = 0;
+- i2 = sizeof (legacy_table) / sizeof (legacy_entry);
+- while (i2 - i1 > 1)
+- {
+- /* At this point we know that if name occurs in legacy_table,
+- its index must be >= i1 and < i2. */
+- unsigned int i = (i1 + i2) >> 1;
+- const legacy_entry *p = &legacy_table[i];
+- if (strcmp (name, p->legacy) < 0)
+- i2 = i;
+- else
+- i1 = i;
+- }
+- if (strcmp (name, legacy_table[i1].legacy) == 0)
+- {
+- strcpy (name, legacy_table[i1].unixy);
+- return;
+- }
+- }
+-
+- /* Step 2: Convert using langtag_table and script_table. */
+- if (strlen (name) == 7 && name[2] == '-')
+- {
+- unsigned int i1, i2;
+- i1 = 0;
+- i2 = sizeof (langtag_table) / sizeof (langtag_entry);
+- while (i2 - i1 > 1)
+- {
+- /* At this point we know that if name occurs in langtag_table,
+- its index must be >= i1 and < i2. */
+- unsigned int i = (i1 + i2) >> 1;
+- const langtag_entry *p = &langtag_table[i];
+- if (strcmp (name, p->langtag) < 0)
+- i2 = i;
+- else
+- i1 = i;
+- }
+- if (strcmp (name, langtag_table[i1].langtag) == 0)
+- {
+- strcpy (name, langtag_table[i1].unixy);
+- return;
+- }
+-
+- i1 = 0;
+- i2 = sizeof (script_table) / sizeof (script_entry);
+- while (i2 - i1 > 1)
+- {
+- /* At this point we know that if (name + 3) occurs in script_table,
+- its index must be >= i1 and < i2. */
+- unsigned int i = (i1 + i2) >> 1;
+- const script_entry *p = &script_table[i];
+- if (strcmp (name + 3, p->script) < 0)
+- i2 = i;
+- else
+- i1 = i;
+- }
+- if (strcmp (name + 3, script_table[i1].script) == 0)
+- {
+- name[2] = '@';
+- strcpy (name + 3, script_table[i1].unixy);
+- return;
+- }
+- }
+-
+- /* Step 3: Convert new-style dash to Unix underscore. */
+- {
+- char *p;
+- for (p = name; *p != '\0'; p++)
+- if (*p == '-')
+- *p = '_';
+- }
+-}
+-
+-#endif
+-
+-/* XPG3 defines the result of 'setlocale (category, NULL)' as:
+- "Directs 'setlocale()' to query 'category' and return the current
+- setting of 'local'."
+- However it does not specify the exact format. Neither do SUSV2 and
+- ISO C 99. So we can use this feature only on selected systems (e.g.
+- those using GNU C Library). */
+-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+-# define HAVE_LOCALE_NULL
+-#endif
+-
+-/* Determine the current locale's name, and canonicalize it into XPG syntax
+- language[_territory[.codeset]][@modifier]
+- The codeset part in the result is not reliable; the locale_charset()
+- should be used for codeset information instead.
+- The result must not be freed; it is statically allocated. */
+-
+-const char *
+-_nl_locale_name_posix (int category, const char *categoryname)
+-{
+- /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
+- On some systems this can be done by the 'setlocale' function itself. */
+-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+- return setlocale (category, NULL);
+-#else
+- const char *retval;
+-
+- /* Setting of LC_ALL overrides all other. */
+- retval = getenv ("LC_ALL");
+- if (retval != NULL && retval[0] != '\0')
+- return retval;
+- /* Next comes the name of the desired category. */
+- retval = getenv (categoryname);
+- if (retval != NULL && retval[0] != '\0')
+- return retval;
+- /* Last possibility is the LANG environment variable. */
+- retval = getenv ("LANG");
+- if (retval != NULL && retval[0] != '\0')
+- return retval;
+-
+- return NULL;
+-#endif
+-}
+-
+-const char *
+-_nl_locale_name_default (void)
+-{
+- /* POSIX:2001 says:
+- "All implementations shall define a locale as the default locale, to be
+- invoked when no environment variables are set, or set to the empty
+- string. This default locale can be the POSIX locale or any other
+- implementation-defined locale. Some implementations may provide
+- facilities for local installation administrators to set the default
+- locale, customizing it for each location. POSIX:2001 does not require
+- such a facility. */
+-
+-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined(WIN32))
+-
+- /* The system does not have a way of setting the locale, other than the
+- POSIX specified environment variables. We use C as default locale. */
+- return "C";
+-
+-#else
+-
+- /* Return an XPG style locale name language[_territory][@modifier].
+- Don't even bother determining the codeset; it's not useful in this
+- context, because message catalogs are not specific to a single
+- codeset. */
+-
+-# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+- /* MacOS X 10.2 or newer */
+- {
+- /* Cache the locale name, since CoreFoundation calls are expensive. */
+- static const char *cached_localename;
+-
+- if (cached_localename == NULL)
+- {
+- char namebuf[256];
+-# if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
+- CFLocaleRef locale = CFLocaleCopyCurrent ();
+- CFStringRef name = CFLocaleGetIdentifier (locale);
+-
+- if (CFStringGetCString (name, namebuf, sizeof(namebuf),
+- kCFStringEncodingASCII))
+- {
+- _nl_locale_name_canonicalize (namebuf);
+- cached_localename = strdup (namebuf);
+- }
+- CFRelease (locale);
+-# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
+- CFTypeRef value =
+- CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
+- kCFPreferencesCurrentApplication);
+- if (value != NULL
+- && CFGetTypeID (value) == CFStringGetTypeID ()
+- && CFStringGetCString ((CFStringRef)value, namebuf, sizeof(namebuf),
+- kCFStringEncodingASCII))
+- {
+- _nl_locale_name_canonicalize (namebuf);
+- cached_localename = strdup (namebuf);
+- }
+-# endif
+- if (cached_localename == NULL)
+- cached_localename = "C";
+- }
+- return cached_localename;
+- }
+-
+-# endif
+-
+-# if defined(WIN32) /* WIN32 */
+- {
+- LCID lcid;
+- LANGID langid;
+- int primary, sub;
+-
+- /* Use native Win32 API locale ID. */
+- lcid = GetThreadLocale ();
+-
+- /* Strip off the sorting rules, keep only the language part. */
+- langid = LANGIDFROMLCID (lcid);
+-
+- /* Split into language and territory part. */
+- primary = PRIMARYLANGID (langid);
+- sub = SUBLANGID (langid);
+-
+- /* Dispatch on language.
+- See also http://www.unicode.org/unicode/onlinedat/languages.html .
+- For details about languages, see http://www.ethnologue.com/ . */
+- switch (primary)
+- {
+- case LANG_AFRIKAANS: return "af_ZA";
+- case LANG_ALBANIAN: return "sq_AL";
+- case LANG_AMHARIC: return "am_ET";
+- case LANG_ARABIC:
+- switch (sub)
+- {
+- case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
+- case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
+- case SUBLANG_ARABIC_EGYPT: return "ar_EG";
+- case SUBLANG_ARABIC_LIBYA: return "ar_LY";
+- case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
+- case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
+- case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
+- case SUBLANG_ARABIC_OMAN: return "ar_OM";
+- case SUBLANG_ARABIC_YEMEN: return "ar_YE";
+- case SUBLANG_ARABIC_SYRIA: return "ar_SY";
+- case SUBLANG_ARABIC_JORDAN: return "ar_JO";
+- case SUBLANG_ARABIC_LEBANON: return "ar_LB";
+- case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
+- case SUBLANG_ARABIC_UAE: return "ar_AE";
+- case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
+- case SUBLANG_ARABIC_QATAR: return "ar_QA";
+- }
+- return "ar";
+- case LANG_ARMENIAN: return "hy_AM";
+- case LANG_ASSAMESE: return "as_IN";
+- case LANG_AZERI:
+- switch (sub)
+- {
+- /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
+- case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
+- case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
+- }
+- return "az";
+- case LANG_BASQUE:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "eu_ES";
+- }
+- return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
+- case LANG_BELARUSIAN: return "be_BY";
+- case LANG_BENGALI:
+- switch (sub)
+- {
+- case SUBLANG_BENGALI_INDIA: return "bn_IN";
+- case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+- }
+- return "bn";
+- case LANG_BULGARIAN: return "bg_BG";
+- case LANG_BURMESE: return "my_MM";
+- case LANG_CAMBODIAN: return "km_KH";
+- case LANG_CATALAN: return "ca_ES";
+- case LANG_CHEROKEE: return "chr_US";
+- case LANG_CHINESE:
+- switch (sub)
+- {
+- case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
+- case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
+- case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
+- case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
+- case SUBLANG_CHINESE_MACAU: return "zh_MO";
+- }
+- return "zh";
+- case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
+- * What used to be called Serbo-Croatian
+- * should really now be two separate
+- * languages because of political reasons.
+- * (Says tml, who knows nothing about Serbian
+- * or Croatian.)
+- * (I can feel those flames coming already.)
+- */
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "hr_HR";
+- case SUBLANG_SERBIAN_LATIN: return "sr_CS";
+- case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
+- }
+- return "hr";
+- case LANG_CZECH: return "cs_CZ";
+- case LANG_DANISH: return "da_DK";
+- case LANG_DIVEHI: return "dv_MV";
+- case LANG_DUTCH:
+- switch (sub)
+- {
+- case SUBLANG_DUTCH: return "nl_NL";
+- case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
+- }
+- return "nl";
+- case LANG_EDO: return "bin_NG";
+- case LANG_ENGLISH:
+- switch (sub)
+- {
+- /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
+- * English was the language spoken in England.
+- * Oh well.
+- */
+- case SUBLANG_ENGLISH_US: return "en_US";
+- case SUBLANG_ENGLISH_UK: return "en_GB";
+- case SUBLANG_ENGLISH_AUS: return "en_AU";
+- case SUBLANG_ENGLISH_CAN: return "en_CA";
+- case SUBLANG_ENGLISH_NZ: return "en_NZ";
+- case SUBLANG_ENGLISH_EIRE: return "en_IE";
+- case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
+- case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
+- case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
+- case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
+- case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
+- case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
+- case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
+- case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
+- case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
+- case SUBLANG_ENGLISH_INDIA: return "en_IN";
+- case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
+- case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
+- }
+- return "en";
+- case LANG_ESTONIAN: return "et_EE";
+- case LANG_FAEROESE: return "fo_FO";
+- case LANG_FARSI: return "fa_IR";
+- case LANG_FINNISH: return "fi_FI";
+- case LANG_FRENCH:
+- switch (sub)
+- {
+- case SUBLANG_FRENCH: return "fr_FR";
+- case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
+- case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
+- case SUBLANG_FRENCH_SWISS: return "fr_CH";
+- case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
+- case SUBLANG_FRENCH_MONACO: return "fr_MC";
+- case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
+- case SUBLANG_FRENCH_REUNION: return "fr_RE";
+- case SUBLANG_FRENCH_CONGO: return "fr_CG";
+- case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
+- case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
+- case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
+- case SUBLANG_FRENCH_MALI: return "fr_ML";
+- case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
+- case SUBLANG_FRENCH_HAITI: return "fr_HT";
+- }
+- return "fr";
+- case LANG_FRISIAN: return "fy_NL";
+- case LANG_FULFULDE:
+- /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
+- return "ff_NG";
+- case LANG_GAELIC:
+- switch (sub)
+- {
+- case 0x01: /* SCOTTISH */ return "gd_GB";
+- case 0x02: /* IRISH */ return "ga_IE";
+- }
+- return "C";
+- case LANG_GALICIAN: return "gl_ES";
+- case LANG_GEORGIAN: return "ka_GE";
+- case LANG_GERMAN:
+- switch (sub)
+- {
+- case SUBLANG_GERMAN: return "de_DE";
+- case SUBLANG_GERMAN_SWISS: return "de_CH";
+- case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
+- case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
+- case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
+- }
+- return "de";
+- case LANG_GREEK: return "el_GR";
+- case LANG_GUARANI: return "gn_PY";
+- case LANG_GUJARATI: return "gu_IN";
+- case LANG_HAUSA: return "ha_NG";
+- case LANG_HAWAIIAN:
+- /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
+- or Hawaii Creole English ("cpe_US", 600000 speakers)? */
+- return "cpe_US";
+- case LANG_HEBREW: return "he_IL";
+- case LANG_HINDI: return "hi_IN";
+- case LANG_HUNGARIAN: return "hu_HU";
+- case LANG_IBIBIO: return "nic_NG";
+- case LANG_ICELANDIC: return "is_IS";
+- case LANG_IGBO: return "ig_NG";
+- case LANG_INDONESIAN: return "id_ID";
+- case LANG_INUKTITUT: return "iu_CA";
+- case LANG_ITALIAN:
+- switch (sub)
+- {
+- case SUBLANG_ITALIAN: return "it_IT";
+- case SUBLANG_ITALIAN_SWISS: return "it_CH";
+- }
+- return "it";
+- case LANG_JAPANESE: return "ja_JP";
+- case LANG_KANNADA: return "kn_IN";
+- case LANG_KANURI: return "kr_NG";
+- case LANG_KASHMIRI:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "ks_PK";
+- case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
+- }
+- return "ks";
+- case LANG_KAZAK: return "kk_KZ";
+- case LANG_KONKANI:
+- /* FIXME: Adjust this when such locales appear on Unix. */
+- return "kok_IN";
+- case LANG_KOREAN: return "ko_KR";
+- case LANG_KYRGYZ: return "ky_KG";
+- case LANG_LAO: return "lo_LA";
+- case LANG_LATIN: return "la_VA";
+- case LANG_LATVIAN: return "lv_LV";
+- case LANG_LITHUANIAN: return "lt_LT";
+- case LANG_MACEDONIAN: return "mk_MK";
+- case LANG_MALAY:
+- switch (sub)
+- {
+- case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
+- case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
+- }
+- return "ms";
+- case LANG_MALAYALAM: return "ml_IN";
+- case LANG_MALTESE: return "mt_MT";
+- case LANG_MANIPURI:
+- /* FIXME: Adjust this when such locales appear on Unix. */
+- return "mni_IN";
+- case LANG_MARATHI: return "mr_IN";
+- case LANG_MONGOLIAN:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "mn_MN";
+- }
+- return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
+- case LANG_NEPALI:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "ne_NP";
+- case SUBLANG_NEPALI_INDIA: return "ne_IN";
+- }
+- return "ne";
+- case LANG_NORWEGIAN:
+- switch (sub)
+- {
+- case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
+- case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
+- }
+- return "no";
+- case LANG_ORIYA: return "or_IN";
+- case LANG_OROMO: return "om_ET";
+- case LANG_PAPIAMENTU: return "pap_AN";
+- case LANG_PASHTO:
+- return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
+- case LANG_POLISH: return "pl_PL";
+- case LANG_PORTUGUESE:
+- switch (sub)
+- {
+- case SUBLANG_PORTUGUESE: return "pt_PT";
+- /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
+- Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
+- case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
+- }
+- return "pt";
+- case LANG_PUNJABI:
+- switch (sub)
+- {
+- case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
+- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+- }
+- return "pa";
+- case LANG_RHAETO_ROMANCE: return "rm_CH";
+- case LANG_ROMANIAN:
+- switch (sub)
+- {
+- case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
+- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+- }
+- return "ro";
+- case LANG_RUSSIAN:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "ru_RU";
+- }
+- return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
+- case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
+- case LANG_SANSKRIT: return "sa_IN";
+- case LANG_SINDHI:
+- switch (sub)
+- {
+- case SUBLANG_SINDHI_INDIA: return "sd_IN";
+- case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
+- }
+- return "sd";
+- case LANG_SINHALESE: return "si_LK";
+- case LANG_SLOVAK: return "sk_SK";
+- case LANG_SLOVENIAN: return "sl_SI";
+- case LANG_SOMALI: return "so_SO";
+- case LANG_SORBIAN:
+- /* FIXME: Adjust this when such locales appear on Unix. */
+- return "wen_DE";
+- case LANG_SPANISH:
+- switch (sub)
+- {
+- case SUBLANG_SPANISH: return "es_ES";
+- case SUBLANG_SPANISH_MEXICAN: return "es_MX";
+- case SUBLANG_SPANISH_MODERN:
+- return "es_ES@modern"; /* not seen on Unix */
+- case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
+- case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
+- case SUBLANG_SPANISH_PANAMA: return "es_PA";
+- case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
+- case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
+- case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
+- case SUBLANG_SPANISH_PERU: return "es_PE";
+- case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
+- case SUBLANG_SPANISH_ECUADOR: return "es_EC";
+- case SUBLANG_SPANISH_CHILE: return "es_CL";
+- case SUBLANG_SPANISH_URUGUAY: return "es_UY";
+- case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
+- case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
+- case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
+- case SUBLANG_SPANISH_HONDURAS: return "es_HN";
+- case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
+- case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
+- }
+- return "es";
+- case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
+- case LANG_SWAHILI: return "sw_KE";
+- case LANG_SWEDISH:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "sv_SE";
+- case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
+- }
+- return "sv";
+- case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
+- case LANG_TAGALOG: return "tl_PH";
+- case LANG_TAJIK: return "tg_TJ";
+- case LANG_TAMAZIGHT:
+- switch (sub)
+- {
+- /* FIXME: Adjust this when Tamazight locales appear on Unix. */
+- case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
+- case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
+- }
+- return "ber_MA";
+- case LANG_TAMIL:
+- switch (sub)
+- {
+- case SUBLANG_DEFAULT: return "ta_IN";
+- }
+- return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
+- case LANG_TATAR: return "tt_RU";
+- case LANG_TELUGU: return "te_IN";
+- case LANG_THAI: return "th_TH";
+- case LANG_TIBETAN: return "bo_CN";
+- case LANG_TIGRINYA:
+- switch (sub)
+- {
+- case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
+- case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
+- }
+- return "ti";
+- case LANG_TSONGA: return "ts_ZA";
+- case LANG_TSWANA: return "tn_BW";
+- case LANG_TURKISH: return "tr_TR";
+- case LANG_TURKMEN: return "tk_TM";
+- case LANG_UKRAINIAN: return "uk_UA";
+- case LANG_URDU:
+- switch (sub)
+- {
+- case SUBLANG_URDU_PAKISTAN: return "ur_PK";
+- case SUBLANG_URDU_INDIA: return "ur_IN";
+- }
+- return "ur";
+- case LANG_UZBEK:
+- switch (sub)
+- {
+- case SUBLANG_UZBEK_LATIN: return "uz_UZ";
+- case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
+- }
+- return "uz";
+- case LANG_VENDA: return "ve_ZA";
+- case LANG_VIETNAMESE: return "vi_VN";
+- case LANG_WELSH: return "cy_GB";
+- case LANG_XHOSA: return "xh_ZA";
+- case LANG_YI: return "sit_CN";
+- case LANG_YIDDISH: return "yi_IL";
+- case LANG_YORUBA: return "yo_NG";
+- case LANG_ZULU: return "zu_ZA";
+- default: return "C";
+- }
+- }
+-# endif
+-#endif
+-}
+-
+-const char *
+-_nl_locale_name (int category, const char *categoryname)
+-{
+- const char *retval;
+-
+- retval = _nl_locale_name_posix (category, categoryname);
+- if (retval != NULL)
+- return retval;
+-
+- return _nl_locale_name_default ();
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/log.c abook/intl/log.c
+--- BUILD/abook-0.6.0pre2/intl/log.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/log.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,98 +0,0 @@
+-/* Log file output.
+- Copyright (C) 2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Written by Bruno Haible <bruno@clisp.org>. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-/* Print an ASCII string with quotes and escape sequences where needed. */
+-static void
+-print_escaped (FILE *stream, const char *str)
+-{
+- putc ('"', stream);
+- for (; *str != '\0'; str++)
+- if (*str == '\n')
+- {
+- fputs ("\\n\"", stream);
+- if (str[1] == '\0')
+- return;
+- fputs ("\n\"", stream);
+- }
+- else
+- {
+- if (*str == '"' || *str == '\\')
+- putc ('\\', stream);
+- putc (*str, stream);
+- }
+- putc ('"', stream);
+-}
+-
+-/* Add to the log file an entry denoting a failed translation. */
+-void
+-_nl_log_untranslated (const char *logfilename, const char *domainname,
+- const char *msgid1, const char *msgid2, int plural)
+-{
+- static char *last_logfilename = NULL;
+- static FILE *last_logfile = NULL;
+- FILE *logfile;
+-
+- /* Can we reuse the last opened logfile? */
+- if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
+- {
+- /* Close the last used logfile. */
+- if (last_logfilename != NULL)
+- {
+- if (last_logfile != NULL)
+- {
+- fclose (last_logfile);
+- last_logfile = NULL;
+- }
+- free (last_logfilename);
+- last_logfilename = NULL;
+- }
+- /* Open the logfile. */
+- last_logfilename = (char *) malloc (strlen (logfilename) + 1);
+- if (last_logfilename == NULL)
+- return;
+- strcpy (last_logfilename, logfilename);
+- last_logfile = fopen (logfilename, "a");
+- if (last_logfile == NULL)
+- return;
+- }
+- logfile = last_logfile;
+-
+- fprintf (logfile, "domain ");
+- print_escaped (logfile, domainname);
+- fprintf (logfile, "\nmsgid ");
+- print_escaped (logfile, msgid1);
+- if (plural)
+- {
+- fprintf (logfile, "\nmsgid_plural ");
+- print_escaped (logfile, msgid2);
+- fprintf (logfile, "\nmsgstr[0] \"\"\n");
+- }
+- else
+- fprintf (logfile, "\nmsgstr \"\"\n");
+- putc ('\n', logfile);
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/Makefile.in abook/intl/Makefile.in
+--- BUILD/abook-0.6.0pre2/intl/Makefile.in 2006-08-04 22:30:07.000000000 +0200
++++ abook/intl/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,501 +0,0 @@
+-# Makefile for directory with message catalog handling library of GNU gettext
+-# Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Library General Public License as published
+-# by the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# Library General Public License for more details.
+-#
+-# You should have received a copy of the GNU Library General Public
+-# License along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
+-
+-PACKAGE = @PACKAGE@
+-VERSION = @VERSION@
+-
+-SHELL = /bin/sh
+-
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+-top_builddir = ..
+-VPATH = $(srcdir)
+-
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-transform = @program_transform_name@
+-libdir = @libdir@
+-includedir = @includedir@
+-datadir = @datadir@
+-datarootdir = @datarootdir@
+-localedir = $(datadir)/locale
+-gettextsrcdir = $(datadir)/gettext/intl
+-aliaspath = $(localedir)
+-subdir = intl
+-
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+-
+-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+-
+-AR = ar
+-CC = @CC@
+-LIBTOOL = @LIBTOOL@
+-RANLIB = @RANLIB@
+-YACC = @INTLBISON@ -y -d
+-YFLAGS = --name-prefix=__gettext
+-
+-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
+--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+--Dset_relocation_prefix=libintl_set_relocation_prefix \
+--Drelocate=libintl_relocate \
+--DDEPENDS_ON_LIBICONV=1 @DEFS@
+-CPPFLAGS = @CPPFLAGS@
+-CFLAGS = @CFLAGS@
+-LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
+-
+-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+-
+-HEADERS = \
+- gmo.h \
+- gettextP.h \
+- hash-string.h \
+- loadinfo.h \
+- plural-exp.h \
+- eval-plural.h \
+- localcharset.h \
+- relocatable.h \
+- xsize.h \
+- printf-args.h printf-args.c \
+- printf-parse.h wprintf-parse.h printf-parse.c \
+- vasnprintf.h vasnwprintf.h vasnprintf.c \
+- os2compat.h \
+- libgnuintl.h.in
+-SOURCES = \
+- bindtextdom.c \
+- dcgettext.c \
+- dgettext.c \
+- gettext.c \
+- finddomain.c \
+- loadmsgcat.c \
+- localealias.c \
+- textdomain.c \
+- l10nflist.c \
+- explodename.c \
+- dcigettext.c \
+- dcngettext.c \
+- dngettext.c \
+- ngettext.c \
+- plural.y \
+- plural-exp.c \
+- localcharset.c \
+- relocatable.c \
+- langprefs.c \
+- localename.c \
+- log.c \
+- printf.c \
+- osdep.c \
+- os2compat.c \
+- intl-compat.c
+-OBJECTS = \
+- bindtextdom.$lo \
+- dcgettext.$lo \
+- dgettext.$lo \
+- gettext.$lo \
+- finddomain.$lo \
+- loadmsgcat.$lo \
+- localealias.$lo \
+- textdomain.$lo \
+- l10nflist.$lo \
+- explodename.$lo \
+- dcigettext.$lo \
+- dcngettext.$lo \
+- dngettext.$lo \
+- ngettext.$lo \
+- plural.$lo \
+- plural-exp.$lo \
+- localcharset.$lo \
+- relocatable.$lo \
+- langprefs.$lo \
+- localename.$lo \
+- log.$lo \
+- printf.$lo \
+- osdep.$lo \
+- intl-compat.$lo
+-DISTFILES.common = Makefile.in \
+-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+-DISTFILES.generated = plural.c
+-DISTFILES.normal = VERSION
+-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
+-libgnuintl.h_vms Makefile.vms \
+-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
+-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
+-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
+-
+-all: all-@USE_INCLUDED_LIBINTL@
+-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+-all-no-yes: libgnuintl.$la
+-all-no-no:
+-
+-libintl.a libgnuintl.a: $(OBJECTS)
+- rm -f $@
+- $(AR) cru $@ $(OBJECTS)
+- $(RANLIB) $@
+-
+-libintl.la libgnuintl.la: $(OBJECTS)
+- $(LIBTOOL) --mode=link \
+- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+- $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
+- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+- -rpath $(libdir) \
+- -no-undefined
+-
+-# Libtool's library version information for libintl.
+-# Before making a gettext release, the gettext maintainer must change this
+-# according to the libtool documentation, section "Library interface versions".
+-# Maintainers of other packages that include the intl directory must *not*
+-# change these values.
+-LTV_CURRENT=7
+-LTV_REVISION=3
+-LTV_AGE=4
+-
+-.SUFFIXES:
+-.SUFFIXES: .c .y .o .lo .sin .sed
+-
+-.c.o:
+- $(COMPILE) $<
+-
+-.y.c:
+- $(YACC) $(YFLAGS) --output $@ $<
+- rm -f $*.h
+-
+-bindtextdom.lo: $(srcdir)/bindtextdom.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
+-dcgettext.lo: $(srcdir)/dcgettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
+-dgettext.lo: $(srcdir)/dgettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
+-gettext.lo: $(srcdir)/gettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
+-finddomain.lo: $(srcdir)/finddomain.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+-loadmsgcat.lo: $(srcdir)/loadmsgcat.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
+-localealias.lo: $(srcdir)/localealias.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
+-textdomain.lo: $(srcdir)/textdomain.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
+-l10nflist.lo: $(srcdir)/l10nflist.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
+-explodename.lo: $(srcdir)/explodename.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
+-dcigettext.lo: $(srcdir)/dcigettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
+-dcngettext.lo: $(srcdir)/dcngettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
+-dngettext.lo: $(srcdir)/dngettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
+-ngettext.lo: $(srcdir)/ngettext.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
+-plural.lo: $(srcdir)/plural.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
+-plural-exp.lo: $(srcdir)/plural-exp.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
+-localcharset.lo: $(srcdir)/localcharset.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+-relocatable.lo: $(srcdir)/relocatable.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+-langprefs.lo: $(srcdir)/langprefs.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
+-localename.lo: $(srcdir)/localename.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
+-log.lo: $(srcdir)/log.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
+-printf.lo: $(srcdir)/printf.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+-osdep.lo: $(srcdir)/osdep.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
+-intl-compat.lo: $(srcdir)/intl-compat.c
+- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
+-
+-ref-add.sed: $(srcdir)/ref-add.sin
+- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+- mv t-ref-add.sed ref-add.sed
+-ref-del.sed: $(srcdir)/ref-del.sin
+- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+- mv t-ref-del.sed ref-del.sed
+-
+-INCLUDES = -I. -I$(srcdir) -I..
+-
+-libgnuintl.h: $(srcdir)/libgnuintl.h.in
+- sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+- < $(srcdir)/libgnuintl.h.in > libgnuintl.h
+-
+-libintl.h: libgnuintl.h
+- cp libgnuintl.h libintl.h
+-
+-charset.alias: $(srcdir)/config.charset
+- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+- mv t-$@ $@
+-
+-check: all
+-
+-# We must not install the libintl.h/libintl.a files if we are on a
+-# system which has the GNU gettext() function in its C library or in a
+-# separate library.
+-# If you want to use the one which comes with this version of the
+-# package, you have to use `configure --with-included-gettext'.
+-install: install-exec install-data
+-install-exec: all
+- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
+- $(LIBTOOL) --mode=install \
+- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+- if test "@RELOCATABLE@" = yes; then \
+- dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+- if test -n "$$dependencies"; then \
+- rm -f $(DESTDIR)$(libdir)/libintl.la; \
+- fi; \
+- fi; \
+- else \
+- : ; \
+- fi
+- if test "$(PACKAGE)" = "gettext-tools" \
+- && test '@USE_INCLUDED_LIBINTL@' = no \
+- && test @GLIBC2@ != no; then \
+- $(mkinstalldirs) $(DESTDIR)$(libdir); \
+- $(LIBTOOL) --mode=install \
+- $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
+- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+- $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+- $(LIBTOOL) --mode=uninstall \
+- rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
+- else \
+- : ; \
+- fi
+- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+- dest=$(DESTDIR)$(libdir)/charset.alias; \
+- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+- orig=$(DESTDIR)$(libdir)/charset.alias; \
+- sed -f ref-add.sed $$orig > $$temp; \
+- $(INSTALL_DATA) $$temp $$dest; \
+- rm -f $$temp; \
+- else \
+- if test @GLIBC21@ = no; then \
+- orig=charset.alias; \
+- sed -f ref-add.sed $$orig > $$temp; \
+- $(INSTALL_DATA) $$temp $$dest; \
+- rm -f $$temp; \
+- fi; \
+- fi; \
+- $(mkinstalldirs) $(DESTDIR)$(localedir); \
+- test -f $(DESTDIR)$(localedir)/locale.alias \
+- && orig=$(DESTDIR)$(localedir)/locale.alias \
+- || orig=$(srcdir)/locale.alias; \
+- temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+- dest=$(DESTDIR)$(localedir)/locale.alias; \
+- sed -f ref-add.sed $$orig > $$temp; \
+- $(INSTALL_DATA) $$temp $$dest; \
+- rm -f $$temp; \
+- else \
+- : ; \
+- fi
+-install-data: all
+- if test "$(PACKAGE)" = "gettext-tools"; then \
+- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+- $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+- $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+- dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
+- for file in $$dists; do \
+- $(INSTALL_DATA) $(srcdir)/$$file \
+- $(DESTDIR)$(gettextsrcdir)/$$file; \
+- done; \
+- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+- dists="$(DISTFILES.generated)"; \
+- for file in $$dists; do \
+- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+- $(INSTALL_DATA) $$dir/$$file \
+- $(DESTDIR)$(gettextsrcdir)/$$file; \
+- done; \
+- dists="$(DISTFILES.obsolete)"; \
+- for file in $$dists; do \
+- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+- done; \
+- else \
+- : ; \
+- fi
+-
+-install-strip: install
+-
+-installdirs:
+- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+- else \
+- : ; \
+- fi
+- if test "$(PACKAGE)" = "gettext-tools" \
+- && test '@USE_INCLUDED_LIBINTL@' = no \
+- && test @GLIBC2@ != no; then \
+- $(mkinstalldirs) $(DESTDIR)$(libdir); \
+- else \
+- : ; \
+- fi
+- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+- $(mkinstalldirs) $(DESTDIR)$(localedir); \
+- else \
+- : ; \
+- fi
+- if test "$(PACKAGE)" = "gettext-tools"; then \
+- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+- else \
+- : ; \
+- fi
+-
+-# Define this as empty until I found a useful application.
+-installcheck:
+-
+-uninstall:
+- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- rm -f $(DESTDIR)$(includedir)/libintl.h; \
+- $(LIBTOOL) --mode=uninstall \
+- rm -f $(DESTDIR)$(libdir)/libintl.$la; \
+- else \
+- : ; \
+- fi
+- if test "$(PACKAGE)" = "gettext-tools" \
+- && test '@USE_INCLUDED_LIBINTL@' = no \
+- && test @GLIBC2@ != no; then \
+- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+- else \
+- : ; \
+- fi
+- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+- dest=$(DESTDIR)$(libdir)/charset.alias; \
+- sed -f ref-del.sed $$dest > $$temp; \
+- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+- rm -f $$dest; \
+- else \
+- $(INSTALL_DATA) $$temp $$dest; \
+- fi; \
+- rm -f $$temp; \
+- fi; \
+- if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+- temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+- dest=$(DESTDIR)$(localedir)/locale.alias; \
+- sed -f ref-del.sed $$dest > $$temp; \
+- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+- rm -f $$dest; \
+- else \
+- $(INSTALL_DATA) $$temp $$dest; \
+- fi; \
+- rm -f $$temp; \
+- fi; \
+- else \
+- : ; \
+- fi
+- if test "$(PACKAGE)" = "gettext-tools"; then \
+- for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
+- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+- done; \
+- else \
+- : ; \
+- fi
+-
+-info dvi ps pdf html:
+-
+-$(OBJECTS): ../config.h libgnuintl.h
+-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
+-dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
+-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
+-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
+-dcigettext.$lo: $(srcdir)/eval-plural.h
+-localcharset.$lo: $(srcdir)/localcharset.h
+-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
+-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
+-
+-tags: TAGS
+-
+-TAGS: $(HEADERS) $(SOURCES)
+- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
+-
+-ctags: CTAGS
+-
+-CTAGS: $(HEADERS) $(SOURCES)
+- here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+-
+-id: ID
+-
+-ID: $(HEADERS) $(SOURCES)
+- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
+-
+-
+-mostlyclean:
+- rm -f *.a *.la *.o *.obj *.lo core core.*
+- rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
+- rm -f -r .libs _libs
+-
+-clean: mostlyclean
+-
+-distclean: clean
+- rm -f Makefile ID TAGS
+- if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
+- rm -f ChangeLog.inst $(DISTFILES.normal); \
+- else \
+- : ; \
+- fi
+-
+-maintainer-clean: distclean
+- @echo "This command is intended for maintainers to use;"
+- @echo "it deletes files that may require special tools to rebuild."
+-
+-
+-# GNU gettext needs not contain the file `VERSION' but contains some
+-# other files which should not be distributed in other packages.
+-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+-dist distdir: Makefile
+- if test "$(PACKAGE)" = "gettext-tools"; then \
+- : ; \
+- else \
+- if test "$(PACKAGE)" = "gettext-runtime"; then \
+- additional="$(DISTFILES.gettext)"; \
+- else \
+- additional="$(DISTFILES.normal)"; \
+- fi; \
+- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+- for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+- cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
+- done; \
+- fi
+-
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status
+-# This would be more efficient, but doesn't work any more with autoconf-2.57,
+-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
+-# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-# Tell versions [3.59,3.63) of GNU make not to export all variables.
+-# Otherwise a system limit (for SysV at least) may be exceeded.
+-.NOEXPORT:
+diff -urN BUILD/abook-0.6.0pre2/intl/ngettext.c abook/intl/ngettext.c
+--- BUILD/abook-0.6.0pre2/intl/ngettext.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/ngettext.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,65 +0,0 @@
+-/* Implementation of ngettext(3) function.
+- Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#ifdef _LIBC
+-# define __need_NULL
+-# include <stddef.h>
+-#else
+-# include <stdlib.h> /* Just for NULL. */
+-#endif
+-
+-#include "gettextP.h"
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-
+-#include <locale.h>
+-
+-/* @@ end of prolog @@ */
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define NGETTEXT __ngettext
+-# define DCNGETTEXT __dcngettext
+-#else
+-# define NGETTEXT libintl_ngettext
+-# define DCNGETTEXT libintl_dcngettext
+-#endif
+-
+-/* Look up MSGID in the current default message catalog for the current
+- LC_MESSAGES locale. If not found, returns MSGID itself (the default
+- text). */
+-char *
+-NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
+-{
+- return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-weak_alias (__ngettext, ngettext);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/os2compat.c abook/intl/os2compat.c
+--- BUILD/abook-0.6.0pre2/intl/os2compat.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/os2compat.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,98 +0,0 @@
+-/* OS/2 compatibility functions.
+- Copyright (C) 2001-2002 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#define OS2_AWARE
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#include <stdlib.h>
+-#include <string.h>
+-#include <sys/param.h>
+-
+-/* A version of getenv() that works from DLLs */
+-extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
+-
+-char *
+-_nl_getenv (const char *name)
+-{
+- unsigned char *value;
+- if (DosScanEnv (name, &value))
+- return NULL;
+- else
+- return value;
+-}
+-
+-/* A fixed size buffer. */
+-char libintl_nl_default_dirname[MAXPATHLEN+1];
+-
+-char *_nlos2_libdir = NULL;
+-char *_nlos2_localealiaspath = NULL;
+-char *_nlos2_localedir = NULL;
+-
+-static __attribute__((constructor)) void
+-nlos2_initialize ()
+-{
+- char *root = getenv ("UNIXROOT");
+- char *gnulocaledir = getenv ("GNULOCALEDIR");
+-
+- _nlos2_libdir = gnulocaledir;
+- if (!_nlos2_libdir)
+- {
+- if (root)
+- {
+- size_t sl = strlen (root);
+- _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
+- memcpy (_nlos2_libdir, root, sl);
+- memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
+- }
+- else
+- _nlos2_libdir = LIBDIR;
+- }
+-
+- _nlos2_localealiaspath = gnulocaledir;
+- if (!_nlos2_localealiaspath)
+- {
+- if (root)
+- {
+- size_t sl = strlen (root);
+- _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
+- memcpy (_nlos2_localealiaspath, root, sl);
+- memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
+- }
+- else
+- _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
+- }
+-
+- _nlos2_localedir = gnulocaledir;
+- if (!_nlos2_localedir)
+- {
+- if (root)
+- {
+- size_t sl = strlen (root);
+- _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
+- memcpy (_nlos2_localedir, root, sl);
+- memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
+- }
+- else
+- _nlos2_localedir = LOCALEDIR;
+- }
+-
+- if (strlen (_nlos2_localedir) <= MAXPATHLEN)
+- strcpy (libintl_nl_default_dirname, _nlos2_localedir);
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/os2compat.h abook/intl/os2compat.h
+--- BUILD/abook-0.6.0pre2/intl/os2compat.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/os2compat.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,46 +0,0 @@
+-/* OS/2 compatibility defines.
+- This file is intended to be included from config.h
+- Copyright (C) 2001-2002 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* When included from os2compat.h we need all the original definitions */
+-#ifndef OS2_AWARE
+-
+-#undef LIBDIR
+-#define LIBDIR _nlos2_libdir
+-extern char *_nlos2_libdir;
+-
+-#undef LOCALEDIR
+-#define LOCALEDIR _nlos2_localedir
+-extern char *_nlos2_localedir;
+-
+-#undef LOCALE_ALIAS_PATH
+-#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
+-extern char *_nlos2_localealiaspath;
+-
+-#endif
+-
+-#undef HAVE_STRCASECMP
+-#define HAVE_STRCASECMP 1
+-#define strcasecmp stricmp
+-#define strncasecmp strnicmp
+-
+-/* We have our own getenv() which works even if library is compiled as DLL */
+-#define getenv _nl_getenv
+-
+-/* Older versions of gettext used -1 as the value of LC_MESSAGES */
+-#define LC_MESSAGES_COMPAT (-1)
+diff -urN BUILD/abook-0.6.0pre2/intl/osdep.c abook/intl/osdep.c
+--- BUILD/abook-0.6.0pre2/intl/osdep.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/osdep.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,24 +0,0 @@
+-/* OS dependent parts of libintl.
+- Copyright (C) 2001-2002 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#if defined __EMX__
+-# include "os2compat.c"
+-#else
+-/* Avoid AIX compiler warning. */
+-typedef int dummy;
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/plural.c abook/intl/plural.c
+--- BUILD/abook-0.6.0pre2/intl/plural.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/plural.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,1490 +0,0 @@
+-/* A Bison parser, made from plural.y
+- by GNU bison 1.35. */
+-
+-#define YYBISON 1 /* Identify Bison output. */
+-
+-#define yyparse __gettextparse
+-#define yylex __gettextlex
+-#define yyerror __gettexterror
+-#define yylval __gettextlval
+-#define yychar __gettextchar
+-#define yydebug __gettextdebug
+-#define yynerrs __gettextnerrs
+-# define EQUOP2 257
+-# define CMPOP2 258
+-# define ADDOP2 259
+-# define MULOP2 260
+-# define NUMBER 261
+-
+-#line 1 "plural.y"
+-
+-/* Expression parsing for plural form selection.
+- Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
+- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* The bison generated parser uses alloca. AIX 3 forces us to put this
+- declaration at the beginning of the file. The declaration in bison's
+- skeleton file comes too late. This must come before <config.h>
+- because <config.h> may include arbitrary system headers. */
+-#if defined _AIX && !defined __GNUC__
+- #pragma alloca
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stddef.h>
+-#include <stdlib.h>
+-#include "plural-exp.h"
+-
+-/* The main function generated by the parser is called __gettextparse,
+- but we want it to be called PLURAL_PARSE. */
+-#ifndef _LIBC
+-# define __gettextparse PLURAL_PARSE
+-#endif
+-
+-#define YYLEX_PARAM &((struct parse_args *) arg)->cp
+-#define YYPARSE_PARAM arg
+-
+-#line 49 "plural.y"
+-#ifndef YYSTYPE
+-typedef union {
+- unsigned long int num;
+- enum operator op;
+- struct expression *exp;
+-} yystype;
+-# define YYSTYPE yystype
+-# define YYSTYPE_IS_TRIVIAL 1
+-#endif
+-#line 55 "plural.y"
+-
+-/* Prototypes for local functions. */
+-static int yylex (YYSTYPE *lval, const char **pexp);
+-static void yyerror (const char *str);
+-
+-/* Allocation of expressions. */
+-
+-static struct expression *
+-new_exp (int nargs, enum operator op, struct expression * const *args)
+-{
+- int i;
+- struct expression *newp;
+-
+- /* If any of the argument could not be malloc'ed, just return NULL. */
+- for (i = nargs - 1; i >= 0; i--)
+- if (args[i] == NULL)
+- goto fail;
+-
+- /* Allocate a new expression. */
+- newp = (struct expression *) malloc (sizeof (*newp));
+- if (newp != NULL)
+- {
+- newp->nargs = nargs;
+- newp->operation = op;
+- for (i = nargs - 1; i >= 0; i--)
+- newp->val.args[i] = args[i];
+- return newp;
+- }
+-
+- fail:
+- for (i = nargs - 1; i >= 0; i--)
+- FREE_EXPRESSION (args[i]);
+-
+- return NULL;
+-}
+-
+-static inline struct expression *
+-new_exp_0 (enum operator op)
+-{
+- return new_exp (0, op, NULL);
+-}
+-
+-static inline struct expression *
+-new_exp_1 (enum operator op, struct expression *right)
+-{
+- struct expression *args[1];
+-
+- args[0] = right;
+- return new_exp (1, op, args);
+-}
+-
+-static struct expression *
+-new_exp_2 (enum operator op, struct expression *left, struct expression *right)
+-{
+- struct expression *args[2];
+-
+- args[0] = left;
+- args[1] = right;
+- return new_exp (2, op, args);
+-}
+-
+-static inline struct expression *
+-new_exp_3 (enum operator op, struct expression *bexp,
+- struct expression *tbranch, struct expression *fbranch)
+-{
+- struct expression *args[3];
+-
+- args[0] = bexp;
+- args[1] = tbranch;
+- args[2] = fbranch;
+- return new_exp (3, op, args);
+-}
+-
+-#ifndef YYDEBUG
+-# define YYDEBUG 0
+-#endif
+-
+-
+-
+-#define YYFINAL 27
+-#define YYFLAG -32768
+-#define YYNTBASE 16
+-
+-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
+-#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
+-
+-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+-static const char yytranslate[] =
+-{
+- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
+- 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
+- 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
+- 9, 11
+-};
+-
+-#if YYDEBUG
+-static const short yyprhs[] =
+-{
+- 0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
+- 35, 37, 39
+-};
+-static const short yyrhs[] =
+-{
+- 17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
+- 17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
+- 17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
+- 17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
+- 17, 15, 0
+-};
+-
+-#endif
+-
+-#if YYDEBUG
+-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+-static const short yyrline[] =
+-{
+- 0, 150, 158, 162, 166, 170, 174, 178, 182, 186,
+- 190, 194, 199
+-};
+-#endif
+-
+-
+-#if (YYDEBUG) || defined YYERROR_VERBOSE
+-
+-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
+-static const char *const yytname[] =
+-{
+- "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
+- "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
+- "start", "exp", 0
+-};
+-#endif
+-
+-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+-static const short yyr1[] =
+-{
+- 0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
+- 17, 17, 17
+-};
+-
+-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+-static const short yyr2[] =
+-{
+- 0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
+- 1, 1, 3
+-};
+-
+-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+- doesn't specify something else to do. Zero means the default is an
+- error. */
+-static const short yydefact[] =
+-{
+- 0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
+- 0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
+- 6, 7, 8, 0, 2, 0, 0, 0
+-};
+-
+-static const short yydefgoto[] =
+-{
+- 25, 5
+-};
+-
+-static const short yypact[] =
+-{
+- -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
+- -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
+- 26, -3,-32768, -9, 34, 21, 53,-32768
+-};
+-
+-static const short yypgoto[] =
+-{
+- -32768, -1
+-};
+-
+-
+-#define YYLAST 53
+-
+-
+-static const short yytable[] =
+-{
+- 6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
+- 19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
+- 14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
+- 11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
+- 11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
+- 12, 13, 14, 27
+-};
+-
+-static const short yycheck[] =
+-{
+- 1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
+- 11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
+- 9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
+- 6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
+- 6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
+- 7, 8, 9, 0
+-};
+-#define YYPURE 1
+-
+-/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
+-#line 3 "/usr/local/share/bison/bison.simple"
+-
+-/* Skeleton output parser for bison,
+-
+- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
+- Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
+-
+-/* As a special exception, when this file is copied by Bison into a
+- Bison output file, you may use that output file without restriction.
+- This special exception was added by the Free Software Foundation
+- in version 1.24 of Bison. */
+-
+-/* This is the parser code that is written into each bison parser when
+- the %semantic_parser declaration is not specified in the grammar.
+- It was written by Richard Stallman by simplifying the hairy parser
+- used when %semantic_parser is specified. */
+-
+-/* All symbols defined below should begin with yy or YY, to avoid
+- infringing on user name space. This should be done even for local
+- variables, as they might otherwise be expanded by user macros.
+- There are some unavoidable exceptions within include files to
+- define necessary library symbols; they are noted "INFRINGES ON
+- USER NAME SPACE" below. */
+-
+-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+-
+-/* The parser invokes alloca or malloc; define the necessary symbols. */
+-
+-# if YYSTACK_USE_ALLOCA
+-# define YYSTACK_ALLOC alloca
+-# else
+-# ifndef YYSTACK_USE_ALLOCA
+-# if defined (alloca) || defined (_ALLOCA_H)
+-# define YYSTACK_ALLOC alloca
+-# else
+-# ifdef __GNUC__
+-# define YYSTACK_ALLOC __builtin_alloca
+-# endif
+-# endif
+-# endif
+-# endif
+-
+-# ifdef YYSTACK_ALLOC
+- /* Pacify GCC's `empty if-body' warning. */
+-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+-# else
+-# if defined (__STDC__) || defined (__cplusplus)
+-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+-# define YYSIZE_T size_t
+-# endif
+-# define YYSTACK_ALLOC malloc
+-# define YYSTACK_FREE free
+-# endif
+-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+-
+-
+-#if (! defined (yyoverflow) \
+- && (! defined (__cplusplus) \
+- || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+-
+-/* A type that is properly aligned for any stack member. */
+-union yyalloc
+-{
+- short yyss;
+- YYSTYPE yyvs;
+-# if YYLSP_NEEDED
+- YYLTYPE yyls;
+-# endif
+-};
+-
+-/* The size of the maximum gap between one aligned stack and the next. */
+-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+-
+-/* The size of an array large to enough to hold all stacks, each with
+- N elements. */
+-# if YYLSP_NEEDED
+-# define YYSTACK_BYTES(N) \
+- ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+- + 2 * YYSTACK_GAP_MAX)
+-# else
+-# define YYSTACK_BYTES(N) \
+- ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
+- + YYSTACK_GAP_MAX)
+-# endif
+-
+-/* Copy COUNT objects from FROM to TO. The source and destination do
+- not overlap. */
+-# ifndef YYCOPY
+-# if 1 < __GNUC__
+-# define YYCOPY(To, From, Count) \
+- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+-# else
+-# define YYCOPY(To, From, Count) \
+- do \
+- { \
+- register YYSIZE_T yyi; \
+- for (yyi = 0; yyi < (Count); yyi++) \
+- (To)[yyi] = (From)[yyi]; \
+- } \
+- while (0)
+-# endif
+-# endif
+-
+-/* Relocate STACK from its old location to the new one. The
+- local variables YYSIZE and YYSTACKSIZE give the old and new number of
+- elements in the stack, and YYPTR gives the new location of the
+- stack. Advance YYPTR to a properly aligned location for the next
+- stack. */
+-# define YYSTACK_RELOCATE(Stack) \
+- do \
+- { \
+- YYSIZE_T yynewbytes; \
+- YYCOPY (&yyptr->Stack, Stack, yysize); \
+- Stack = &yyptr->Stack; \
+- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
+- yyptr += yynewbytes / sizeof (*yyptr); \
+- } \
+- while (0)
+-
+-#endif
+-
+-
+-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+-# define YYSIZE_T __SIZE_TYPE__
+-#endif
+-#if ! defined (YYSIZE_T) && defined (size_t)
+-# define YYSIZE_T size_t
+-#endif
+-#if ! defined (YYSIZE_T)
+-# if defined (__STDC__) || defined (__cplusplus)
+-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+-# define YYSIZE_T size_t
+-# endif
+-#endif
+-#if ! defined (YYSIZE_T)
+-# define YYSIZE_T unsigned int
+-#endif
+-
+-#define yyerrok (yyerrstatus = 0)
+-#define yyclearin (yychar = YYEMPTY)
+-#define YYEMPTY -2
+-#define YYEOF 0
+-#define YYACCEPT goto yyacceptlab
+-#define YYABORT goto yyabortlab
+-#define YYERROR goto yyerrlab1
+-/* Like YYERROR except do call yyerror. This remains here temporarily
+- to ease the transition to the new meaning of YYERROR, for GCC.
+- Once GCC version 2 has supplanted version 1, this can go. */
+-#define YYFAIL goto yyerrlab
+-#define YYRECOVERING() (!!yyerrstatus)
+-#define YYBACKUP(Token, Value) \
+-do \
+- if (yychar == YYEMPTY && yylen == 1) \
+- { \
+- yychar = (Token); \
+- yylval = (Value); \
+- yychar1 = YYTRANSLATE (yychar); \
+- YYPOPSTACK; \
+- goto yybackup; \
+- } \
+- else \
+- { \
+- yyerror ("syntax error: cannot back up"); \
+- YYERROR; \
+- } \
+-while (0)
+-
+-#define YYTERROR 1
+-#define YYERRCODE 256
+-
+-
+-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+- are run).
+-
+- When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+- first token. By default, to implement support for ranges, extend
+- its range to the last symbol. */
+-
+-#ifndef YYLLOC_DEFAULT
+-# define YYLLOC_DEFAULT(Current, Rhs, N) \
+- Current.last_line = Rhs[N].last_line; \
+- Current.last_column = Rhs[N].last_column;
+-#endif
+-
+-
+-/* YYLEX -- calling `yylex' with the right arguments. */
+-
+-#if YYPURE
+-# if YYLSP_NEEDED
+-# ifdef YYLEX_PARAM
+-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
+-# else
+-# define YYLEX yylex (&yylval, &yylloc)
+-# endif
+-# else /* !YYLSP_NEEDED */
+-# ifdef YYLEX_PARAM
+-# define YYLEX yylex (&yylval, YYLEX_PARAM)
+-# else
+-# define YYLEX yylex (&yylval)
+-# endif
+-# endif /* !YYLSP_NEEDED */
+-#else /* !YYPURE */
+-# define YYLEX yylex ()
+-#endif /* !YYPURE */
+-
+-
+-/* Enable debugging if requested. */
+-#if YYDEBUG
+-
+-# ifndef YYFPRINTF
+-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+-# define YYFPRINTF fprintf
+-# endif
+-
+-# define YYDPRINTF(Args) \
+-do { \
+- if (yydebug) \
+- YYFPRINTF Args; \
+-} while (0)
+-/* Nonzero means print parse trace. It is left uninitialized so that
+- multiple parsers can coexist. */
+-int yydebug;
+-#else /* !YYDEBUG */
+-# define YYDPRINTF(Args)
+-#endif /* !YYDEBUG */
+-
+-/* YYINITDEPTH -- initial size of the parser's stacks. */
+-#ifndef YYINITDEPTH
+-# define YYINITDEPTH 200
+-#endif
+-
+-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+- if the built-in stack extension method is used).
+-
+- Do not make this value too large; the results are undefined if
+- SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+- evaluated with infinite-precision integer arithmetic. */
+-
+-#if YYMAXDEPTH == 0
+-# undef YYMAXDEPTH
+-#endif
+-
+-#ifndef YYMAXDEPTH
+-# define YYMAXDEPTH 10000
+-#endif
+-\f
+-#ifdef YYERROR_VERBOSE
+-
+-# ifndef yystrlen
+-# if defined (__GLIBC__) && defined (_STRING_H)
+-# define yystrlen strlen
+-# else
+-/* Return the length of YYSTR. */
+-static YYSIZE_T
+-# if defined (__STDC__) || defined (__cplusplus)
+-yystrlen (const char *yystr)
+-# else
+-yystrlen (yystr)
+- const char *yystr;
+-# endif
+-{
+- register const char *yys = yystr;
+-
+- while (*yys++ != '\0')
+- continue;
+-
+- return yys - yystr - 1;
+-}
+-# endif
+-# endif
+-
+-# ifndef yystpcpy
+-# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+-# define yystpcpy stpcpy
+-# else
+-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+- YYDEST. */
+-static char *
+-# if defined (__STDC__) || defined (__cplusplus)
+-yystpcpy (char *yydest, const char *yysrc)
+-# else
+-yystpcpy (yydest, yysrc)
+- char *yydest;
+- const char *yysrc;
+-# endif
+-{
+- register char *yyd = yydest;
+- register const char *yys = yysrc;
+-
+- while ((*yyd++ = *yys++) != '\0')
+- continue;
+-
+- return yyd - 1;
+-}
+-# endif
+-# endif
+-#endif
+-\f
+-#line 315 "/usr/local/share/bison/bison.simple"
+-
+-
+-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+- into yyparse. The argument should have type void *.
+- It should actually point to an object.
+- Grammar actions can access the variable by casting it
+- to the proper pointer type. */
+-
+-#ifdef YYPARSE_PARAM
+-# if defined (__STDC__) || defined (__cplusplus)
+-# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+-# define YYPARSE_PARAM_DECL
+-# else
+-# define YYPARSE_PARAM_ARG YYPARSE_PARAM
+-# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+-# endif
+-#else /* !YYPARSE_PARAM */
+-# define YYPARSE_PARAM_ARG
+-# define YYPARSE_PARAM_DECL
+-#endif /* !YYPARSE_PARAM */
+-
+-/* Prevent warning if -Wstrict-prototypes. */
+-#ifdef __GNUC__
+-# ifdef YYPARSE_PARAM
+-int yyparse (void *);
+-# else
+-int yyparse (void);
+-# endif
+-#endif
+-
+-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+- variables are global, or local to YYPARSE. */
+-
+-#define YY_DECL_NON_LSP_VARIABLES \
+-/* The lookahead symbol. */ \
+-int yychar; \
+- \
+-/* The semantic value of the lookahead symbol. */ \
+-YYSTYPE yylval; \
+- \
+-/* Number of parse errors so far. */ \
+-int yynerrs;
+-
+-#if YYLSP_NEEDED
+-# define YY_DECL_VARIABLES \
+-YY_DECL_NON_LSP_VARIABLES \
+- \
+-/* Location data for the lookahead symbol. */ \
+-YYLTYPE yylloc;
+-#else
+-# define YY_DECL_VARIABLES \
+-YY_DECL_NON_LSP_VARIABLES
+-#endif
+-
+-
+-/* If nonreentrant, generate the variables here. */
+-
+-#if !YYPURE
+-YY_DECL_VARIABLES
+-#endif /* !YYPURE */
+-
+-int
+-yyparse (YYPARSE_PARAM_ARG)
+- YYPARSE_PARAM_DECL
+-{
+- /* If reentrant, generate the variables here. */
+-#if YYPURE
+- YY_DECL_VARIABLES
+-#endif /* !YYPURE */
+-
+- register int yystate;
+- register int yyn;
+- int yyresult;
+- /* Number of tokens to shift before error messages enabled. */
+- int yyerrstatus;
+- /* Lookahead token as an internal (translated) token number. */
+- int yychar1 = 0;
+-
+- /* Three stacks and their tools:
+- `yyss': related to states,
+- `yyvs': related to semantic values,
+- `yyls': related to locations.
+-
+- Refer to the stacks thru separate pointers, to allow yyoverflow
+- to reallocate them elsewhere. */
+-
+- /* The state stack. */
+- short yyssa[YYINITDEPTH];
+- short *yyss = yyssa;
+- register short *yyssp;
+-
+- /* The semantic value stack. */
+- YYSTYPE yyvsa[YYINITDEPTH];
+- YYSTYPE *yyvs = yyvsa;
+- register YYSTYPE *yyvsp;
+-
+-#if YYLSP_NEEDED
+- /* The location stack. */
+- YYLTYPE yylsa[YYINITDEPTH];
+- YYLTYPE *yyls = yylsa;
+- YYLTYPE *yylsp;
+-#endif
+-
+-#if YYLSP_NEEDED
+-# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
+-#else
+-# define YYPOPSTACK (yyvsp--, yyssp--)
+-#endif
+-
+- YYSIZE_T yystacksize = YYINITDEPTH;
+-
+-
+- /* The variables used to return semantic value and location from the
+- action routines. */
+- YYSTYPE yyval;
+-#if YYLSP_NEEDED
+- YYLTYPE yyloc;
+-#endif
+-
+- /* When reducing, the number of symbols on the RHS of the reduced
+- rule. */
+- int yylen;
+-
+- YYDPRINTF ((stderr, "Starting parse\n"));
+-
+- yystate = 0;
+- yyerrstatus = 0;
+- yynerrs = 0;
+- yychar = YYEMPTY; /* Cause a token to be read. */
+-
+- /* Initialize stack pointers.
+- Waste one element of value and location stack
+- so that they stay on the same level as the state stack.
+- The wasted elements are never initialized. */
+-
+- yyssp = yyss;
+- yyvsp = yyvs;
+-#if YYLSP_NEEDED
+- yylsp = yyls;
+-#endif
+- goto yysetstate;
+-
+-/*------------------------------------------------------------.
+-| yynewstate -- Push a new state, which is found in yystate. |
+-`------------------------------------------------------------*/
+- yynewstate:
+- /* In all cases, when you get here, the value and location stacks
+- have just been pushed. so pushing a state here evens the stacks.
+- */
+- yyssp++;
+-
+- yysetstate:
+- *yyssp = yystate;
+-
+- if (yyssp >= yyss + yystacksize - 1)
+- {
+- /* Get the current used size of the three stacks, in elements. */
+- YYSIZE_T yysize = yyssp - yyss + 1;
+-
+-#ifdef yyoverflow
+- {
+- /* Give user a chance to reallocate the stack. Use copies of
+- these so that the &'s don't force the real ones into
+- memory. */
+- YYSTYPE *yyvs1 = yyvs;
+- short *yyss1 = yyss;
+-
+- /* Each stack pointer address is followed by the size of the
+- data in use in that stack, in bytes. */
+-# if YYLSP_NEEDED
+- YYLTYPE *yyls1 = yyls;
+- /* This used to be a conditional around just the two extra args,
+- but that might be undefined if yyoverflow is a macro. */
+- yyoverflow ("parser stack overflow",
+- &yyss1, yysize * sizeof (*yyssp),
+- &yyvs1, yysize * sizeof (*yyvsp),
+- &yyls1, yysize * sizeof (*yylsp),
+- &yystacksize);
+- yyls = yyls1;
+-# else
+- yyoverflow ("parser stack overflow",
+- &yyss1, yysize * sizeof (*yyssp),
+- &yyvs1, yysize * sizeof (*yyvsp),
+- &yystacksize);
+-# endif
+- yyss = yyss1;
+- yyvs = yyvs1;
+- }
+-#else /* no yyoverflow */
+-# ifndef YYSTACK_RELOCATE
+- goto yyoverflowlab;
+-# else
+- /* Extend the stack our own way. */
+- if (yystacksize >= YYMAXDEPTH)
+- goto yyoverflowlab;
+- yystacksize *= 2;
+- if (yystacksize > YYMAXDEPTH)
+- yystacksize = YYMAXDEPTH;
+-
+- {
+- short *yyss1 = yyss;
+- union yyalloc *yyptr =
+- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+- if (! yyptr)
+- goto yyoverflowlab;
+- YYSTACK_RELOCATE (yyss);
+- YYSTACK_RELOCATE (yyvs);
+-# if YYLSP_NEEDED
+- YYSTACK_RELOCATE (yyls);
+-# endif
+-# undef YYSTACK_RELOCATE
+- if (yyss1 != yyssa)
+- YYSTACK_FREE (yyss1);
+- }
+-# endif
+-#endif /* no yyoverflow */
+-
+- yyssp = yyss + yysize - 1;
+- yyvsp = yyvs + yysize - 1;
+-#if YYLSP_NEEDED
+- yylsp = yyls + yysize - 1;
+-#endif
+-
+- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+- (unsigned long int) yystacksize));
+-
+- if (yyssp >= yyss + yystacksize - 1)
+- YYABORT;
+- }
+-
+- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+-
+- goto yybackup;
+-
+-
+-/*-----------.
+-| yybackup. |
+-`-----------*/
+-yybackup:
+-
+-/* Do appropriate processing given the current state. */
+-/* Read a lookahead token if we need one and don't already have one. */
+-/* yyresume: */
+-
+- /* First try to decide what to do without reference to lookahead token. */
+-
+- yyn = yypact[yystate];
+- if (yyn == YYFLAG)
+- goto yydefault;
+-
+- /* Not known => get a lookahead token if don't already have one. */
+-
+- /* yychar is either YYEMPTY or YYEOF
+- or a valid token in external form. */
+-
+- if (yychar == YYEMPTY)
+- {
+- YYDPRINTF ((stderr, "Reading a token: "));
+- yychar = YYLEX;
+- }
+-
+- /* Convert token to internal form (in yychar1) for indexing tables with */
+-
+- if (yychar <= 0) /* This means end of input. */
+- {
+- yychar1 = 0;
+- yychar = YYEOF; /* Don't call YYLEX any more */
+-
+- YYDPRINTF ((stderr, "Now at end of input.\n"));
+- }
+- else
+- {
+- yychar1 = YYTRANSLATE (yychar);
+-
+-#if YYDEBUG
+- /* We have to keep this `#if YYDEBUG', since we use variables
+- which are defined only if `YYDEBUG' is set. */
+- if (yydebug)
+- {
+- YYFPRINTF (stderr, "Next token is %d (%s",
+- yychar, yytname[yychar1]);
+- /* Give the individual parser a way to print the precise
+- meaning of a token, for further debugging info. */
+-# ifdef YYPRINT
+- YYPRINT (stderr, yychar, yylval);
+-# endif
+- YYFPRINTF (stderr, ")\n");
+- }
+-#endif
+- }
+-
+- yyn += yychar1;
+- if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+- goto yydefault;
+-
+- yyn = yytable[yyn];
+-
+- /* yyn is what to do for this token type in this state.
+- Negative => reduce, -yyn is rule number.
+- Positive => shift, yyn is new state.
+- New state is final state => don't bother to shift,
+- just return success.
+- 0, or most negative number => error. */
+-
+- if (yyn < 0)
+- {
+- if (yyn == YYFLAG)
+- goto yyerrlab;
+- yyn = -yyn;
+- goto yyreduce;
+- }
+- else if (yyn == 0)
+- goto yyerrlab;
+-
+- if (yyn == YYFINAL)
+- YYACCEPT;
+-
+- /* Shift the lookahead token. */
+- YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+- yychar, yytname[yychar1]));
+-
+- /* Discard the token being shifted unless it is eof. */
+- if (yychar != YYEOF)
+- yychar = YYEMPTY;
+-
+- *++yyvsp = yylval;
+-#if YYLSP_NEEDED
+- *++yylsp = yylloc;
+-#endif
+-
+- /* Count tokens shifted since error; after three, turn off error
+- status. */
+- if (yyerrstatus)
+- yyerrstatus--;
+-
+- yystate = yyn;
+- goto yynewstate;
+-
+-
+-/*-----------------------------------------------------------.
+-| yydefault -- do the default action for the current state. |
+-`-----------------------------------------------------------*/
+-yydefault:
+- yyn = yydefact[yystate];
+- if (yyn == 0)
+- goto yyerrlab;
+- goto yyreduce;
+-
+-
+-/*-----------------------------.
+-| yyreduce -- Do a reduction. |
+-`-----------------------------*/
+-yyreduce:
+- /* yyn is the number of a rule to reduce with. */
+- yylen = yyr2[yyn];
+-
+- /* If YYLEN is nonzero, implement the default value of the action:
+- `$$ = $1'.
+-
+- Otherwise, the following line sets YYVAL to the semantic value of
+- the lookahead token. This behavior is undocumented and Bison
+- users should not rely upon it. Assigning to YYVAL
+- unconditionally makes the parser a bit smaller, and it avoids a
+- GCC warning that YYVAL may be used uninitialized. */
+- yyval = yyvsp[1-yylen];
+-
+-#if YYLSP_NEEDED
+- /* Similarly for the default location. Let the user run additional
+- commands if for instance locations are ranges. */
+- yyloc = yylsp[1-yylen];
+- YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+-#endif
+-
+-#if YYDEBUG
+- /* We have to keep this `#if YYDEBUG', since we use variables which
+- are defined only if `YYDEBUG' is set. */
+- if (yydebug)
+- {
+- int yyi;
+-
+- YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+- yyn, yyrline[yyn]);
+-
+- /* Print the symbols being reduced, and their result. */
+- for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+- YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+- YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+- }
+-#endif
+-
+- switch (yyn) {
+-
+-case 1:
+-#line 151 "plural.y"
+-{
+- if (yyvsp[0].exp == NULL)
+- YYABORT;
+- ((struct parse_args *) arg)->res = yyvsp[0].exp;
+- }
+- break;
+-case 2:
+-#line 159 "plural.y"
+-{
+- yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 3:
+-#line 163 "plural.y"
+-{
+- yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 4:
+-#line 167 "plural.y"
+-{
+- yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 5:
+-#line 171 "plural.y"
+-{
+- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 6:
+-#line 175 "plural.y"
+-{
+- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 7:
+-#line 179 "plural.y"
+-{
+- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 8:
+-#line 183 "plural.y"
+-{
+- yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+- }
+- break;
+-case 9:
+-#line 187 "plural.y"
+-{
+- yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
+- }
+- break;
+-case 10:
+-#line 191 "plural.y"
+-{
+- yyval.exp = new_exp_0 (var);
+- }
+- break;
+-case 11:
+-#line 195 "plural.y"
+-{
+- if ((yyval.exp = new_exp_0 (num)) != NULL)
+- yyval.exp->val.num = yyvsp[0].num;
+- }
+- break;
+-case 12:
+-#line 200 "plural.y"
+-{
+- yyval.exp = yyvsp[-1].exp;
+- }
+- break;
+-}
+-
+-#line 705 "/usr/local/share/bison/bison.simple"
+-
+-\f
+- yyvsp -= yylen;
+- yyssp -= yylen;
+-#if YYLSP_NEEDED
+- yylsp -= yylen;
+-#endif
+-
+-#if YYDEBUG
+- if (yydebug)
+- {
+- short *yyssp1 = yyss - 1;
+- YYFPRINTF (stderr, "state stack now");
+- while (yyssp1 != yyssp)
+- YYFPRINTF (stderr, " %d", *++yyssp1);
+- YYFPRINTF (stderr, "\n");
+- }
+-#endif
+-
+- *++yyvsp = yyval;
+-#if YYLSP_NEEDED
+- *++yylsp = yyloc;
+-#endif
+-
+- /* Now `shift' the result of the reduction. Determine what state
+- that goes to, based on the state we popped back to and the rule
+- number reduced by. */
+-
+- yyn = yyr1[yyn];
+-
+- yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+- if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+- yystate = yytable[yystate];
+- else
+- yystate = yydefgoto[yyn - YYNTBASE];
+-
+- goto yynewstate;
+-
+-
+-/*------------------------------------.
+-| yyerrlab -- here on detecting error |
+-`------------------------------------*/
+-yyerrlab:
+- /* If not already recovering from an error, report this error. */
+- if (!yyerrstatus)
+- {
+- ++yynerrs;
+-
+-#ifdef YYERROR_VERBOSE
+- yyn = yypact[yystate];
+-
+- if (yyn > YYFLAG && yyn < YYLAST)
+- {
+- YYSIZE_T yysize = 0;
+- char *yymsg;
+- int yyx, yycount;
+-
+- yycount = 0;
+- /* Start YYX at -YYN if negative to avoid negative indexes in
+- YYCHECK. */
+- for (yyx = yyn < 0 ? -yyn : 0;
+- yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+- if (yycheck[yyx + yyn] == yyx)
+- yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+- yysize += yystrlen ("parse error, unexpected ") + 1;
+- yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+- yymsg = (char *) YYSTACK_ALLOC (yysize);
+- if (yymsg != 0)
+- {
+- char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+- yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
+-
+- if (yycount < 5)
+- {
+- yycount = 0;
+- for (yyx = yyn < 0 ? -yyn : 0;
+- yyx < (int) (sizeof (yytname) / sizeof (char *));
+- yyx++)
+- if (yycheck[yyx + yyn] == yyx)
+- {
+- const char *yyq = ! yycount ? ", expecting " : " or ";
+- yyp = yystpcpy (yyp, yyq);
+- yyp = yystpcpy (yyp, yytname[yyx]);
+- yycount++;
+- }
+- }
+- yyerror (yymsg);
+- YYSTACK_FREE (yymsg);
+- }
+- else
+- yyerror ("parse error; also virtual memory exhausted");
+- }
+- else
+-#endif /* defined (YYERROR_VERBOSE) */
+- yyerror ("parse error");
+- }
+- goto yyerrlab1;
+-
+-
+-/*--------------------------------------------------.
+-| yyerrlab1 -- error raised explicitly by an action |
+-`--------------------------------------------------*/
+-yyerrlab1:
+- if (yyerrstatus == 3)
+- {
+- /* If just tried and failed to reuse lookahead token after an
+- error, discard it. */
+-
+- /* return failure if at end of input */
+- if (yychar == YYEOF)
+- YYABORT;
+- YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+- yychar, yytname[yychar1]));
+- yychar = YYEMPTY;
+- }
+-
+- /* Else will try to reuse lookahead token after shifting the error
+- token. */
+-
+- yyerrstatus = 3; /* Each real token shifted decrements this */
+-
+- goto yyerrhandle;
+-
+-
+-/*-------------------------------------------------------------------.
+-| yyerrdefault -- current state does not do anything special for the |
+-| error token. |
+-`-------------------------------------------------------------------*/
+-yyerrdefault:
+-#if 0
+- /* This is wrong; only states that explicitly want error tokens
+- should shift them. */
+-
+- /* If its default is to accept any token, ok. Otherwise pop it. */
+- yyn = yydefact[yystate];
+- if (yyn)
+- goto yydefault;
+-#endif
+-
+-
+-/*---------------------------------------------------------------.
+-| yyerrpop -- pop the current state because it cannot handle the |
+-| error token |
+-`---------------------------------------------------------------*/
+-yyerrpop:
+- if (yyssp == yyss)
+- YYABORT;
+- yyvsp--;
+- yystate = *--yyssp;
+-#if YYLSP_NEEDED
+- yylsp--;
+-#endif
+-
+-#if YYDEBUG
+- if (yydebug)
+- {
+- short *yyssp1 = yyss - 1;
+- YYFPRINTF (stderr, "Error: state stack now");
+- while (yyssp1 != yyssp)
+- YYFPRINTF (stderr, " %d", *++yyssp1);
+- YYFPRINTF (stderr, "\n");
+- }
+-#endif
+-
+-/*--------------.
+-| yyerrhandle. |
+-`--------------*/
+-yyerrhandle:
+- yyn = yypact[yystate];
+- if (yyn == YYFLAG)
+- goto yyerrdefault;
+-
+- yyn += YYTERROR;
+- if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+- goto yyerrdefault;
+-
+- yyn = yytable[yyn];
+- if (yyn < 0)
+- {
+- if (yyn == YYFLAG)
+- goto yyerrpop;
+- yyn = -yyn;
+- goto yyreduce;
+- }
+- else if (yyn == 0)
+- goto yyerrpop;
+-
+- if (yyn == YYFINAL)
+- YYACCEPT;
+-
+- YYDPRINTF ((stderr, "Shifting error token, "));
+-
+- *++yyvsp = yylval;
+-#if YYLSP_NEEDED
+- *++yylsp = yylloc;
+-#endif
+-
+- yystate = yyn;
+- goto yynewstate;
+-
+-
+-/*-------------------------------------.
+-| yyacceptlab -- YYACCEPT comes here. |
+-`-------------------------------------*/
+-yyacceptlab:
+- yyresult = 0;
+- goto yyreturn;
+-
+-/*-----------------------------------.
+-| yyabortlab -- YYABORT comes here. |
+-`-----------------------------------*/
+-yyabortlab:
+- yyresult = 1;
+- goto yyreturn;
+-
+-/*---------------------------------------------.
+-| yyoverflowab -- parser overflow comes here. |
+-`---------------------------------------------*/
+-yyoverflowlab:
+- yyerror ("parser stack overflow");
+- yyresult = 2;
+- /* Fall through. */
+-
+-yyreturn:
+-#ifndef yyoverflow
+- if (yyss != yyssa)
+- YYSTACK_FREE (yyss);
+-#endif
+- return yyresult;
+-}
+-#line 205 "plural.y"
+-
+-
+-void
+-internal_function
+-FREE_EXPRESSION (struct expression *exp)
+-{
+- if (exp == NULL)
+- return;
+-
+- /* Handle the recursive case. */
+- switch (exp->nargs)
+- {
+- case 3:
+- FREE_EXPRESSION (exp->val.args[2]);
+- /* FALLTHROUGH */
+- case 2:
+- FREE_EXPRESSION (exp->val.args[1]);
+- /* FALLTHROUGH */
+- case 1:
+- FREE_EXPRESSION (exp->val.args[0]);
+- /* FALLTHROUGH */
+- default:
+- break;
+- }
+-
+- free (exp);
+-}
+-
+-
+-static int
+-yylex (YYSTYPE *lval, const char **pexp)
+-{
+- const char *exp = *pexp;
+- int result;
+-
+- while (1)
+- {
+- if (exp[0] == '\0')
+- {
+- *pexp = exp;
+- return YYEOF;
+- }
+-
+- if (exp[0] != ' ' && exp[0] != '\t')
+- break;
+-
+- ++exp;
+- }
+-
+- result = *exp++;
+- switch (result)
+- {
+- case '0': case '1': case '2': case '3': case '4':
+- case '5': case '6': case '7': case '8': case '9':
+- {
+- unsigned long int n = result - '0';
+- while (exp[0] >= '0' && exp[0] <= '9')
+- {
+- n *= 10;
+- n += exp[0] - '0';
+- ++exp;
+- }
+- lval->num = n;
+- result = NUMBER;
+- }
+- break;
+-
+- case '=':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = equal;
+- result = EQUOP2;
+- }
+- else
+- result = YYERRCODE;
+- break;
+-
+- case '!':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = not_equal;
+- result = EQUOP2;
+- }
+- break;
+-
+- case '&':
+- case '|':
+- if (exp[0] == result)
+- ++exp;
+- else
+- result = YYERRCODE;
+- break;
+-
+- case '<':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = less_or_equal;
+- }
+- else
+- lval->op = less_than;
+- result = CMPOP2;
+- break;
+-
+- case '>':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = greater_or_equal;
+- }
+- else
+- lval->op = greater_than;
+- result = CMPOP2;
+- break;
+-
+- case '*':
+- lval->op = mult;
+- result = MULOP2;
+- break;
+-
+- case '/':
+- lval->op = divide;
+- result = MULOP2;
+- break;
+-
+- case '%':
+- lval->op = module;
+- result = MULOP2;
+- break;
+-
+- case '+':
+- lval->op = plus;
+- result = ADDOP2;
+- break;
+-
+- case '-':
+- lval->op = minus;
+- result = ADDOP2;
+- break;
+-
+- case 'n':
+- case '?':
+- case ':':
+- case '(':
+- case ')':
+- /* Nothing, just return the character. */
+- break;
+-
+- case ';':
+- case '\n':
+- case '\0':
+- /* Be safe and let the user call this function again. */
+- --exp;
+- result = YYEOF;
+- break;
+-
+- default:
+- result = YYERRCODE;
+-#if YYDEBUG != 0
+- --exp;
+-#endif
+- break;
+- }
+-
+- *pexp = exp;
+-
+- return result;
+-}
+-
+-
+-static void
+-yyerror (const char *str)
+-{
+- /* Do nothing. We don't print error messages here. */
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/plural-exp.c abook/intl/plural-exp.c
+--- BUILD/abook-0.6.0pre2/intl/plural-exp.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/plural-exp.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,154 +0,0 @@
+-/* Expression parsing for plural form selection.
+- Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
+- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <ctype.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#include "plural-exp.h"
+-
+-#if (defined __GNUC__ && !defined __APPLE_CC__) \
+- || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+-
+-/* These structs are the constant expression for the germanic plural
+- form determination. It represents the expression "n != 1". */
+-static const struct expression plvar =
+-{
+- .nargs = 0,
+- .operation = var,
+-};
+-static const struct expression plone =
+-{
+- .nargs = 0,
+- .operation = num,
+- .val =
+- {
+- .num = 1
+- }
+-};
+-struct expression GERMANIC_PLURAL =
+-{
+- .nargs = 2,
+- .operation = not_equal,
+- .val =
+- {
+- .args =
+- {
+- [0] = (struct expression *) &plvar,
+- [1] = (struct expression *) &plone
+- }
+- }
+-};
+-
+-# define INIT_GERMANIC_PLURAL()
+-
+-#else
+-
+-/* For compilers without support for ISO C 99 struct/union initializers:
+- Initialization at run-time. */
+-
+-static struct expression plvar;
+-static struct expression plone;
+-struct expression GERMANIC_PLURAL;
+-
+-static void
+-init_germanic_plural ()
+-{
+- if (plone.val.num == 0)
+- {
+- plvar.nargs = 0;
+- plvar.operation = var;
+-
+- plone.nargs = 0;
+- plone.operation = num;
+- plone.val.num = 1;
+-
+- GERMANIC_PLURAL.nargs = 2;
+- GERMANIC_PLURAL.operation = not_equal;
+- GERMANIC_PLURAL.val.args[0] = &plvar;
+- GERMANIC_PLURAL.val.args[1] = &plone;
+- }
+-}
+-
+-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
+-
+-#endif
+-
+-void
+-internal_function
+-EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
+- unsigned long int *npluralsp)
+-{
+- if (nullentry != NULL)
+- {
+- const char *plural;
+- const char *nplurals;
+-
+- plural = strstr (nullentry, "plural=");
+- nplurals = strstr (nullentry, "nplurals=");
+- if (plural == NULL || nplurals == NULL)
+- goto no_plural;
+- else
+- {
+- char *endp;
+- unsigned long int n;
+- struct parse_args args;
+-
+- /* First get the number. */
+- nplurals += 9;
+- while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
+- ++nplurals;
+- if (!(*nplurals >= '0' && *nplurals <= '9'))
+- goto no_plural;
+-#if defined HAVE_STRTOUL || defined _LIBC
+- n = strtoul (nplurals, &endp, 10);
+-#else
+- for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
+- n = n * 10 + (*endp - '0');
+-#endif
+- if (nplurals == endp)
+- goto no_plural;
+- *npluralsp = n;
+-
+- /* Due to the restrictions bison imposes onto the interface of the
+- scanner function we have to put the input string and the result
+- passed up from the parser into the same structure which address
+- is passed down to the parser. */
+- plural += 7;
+- args.cp = plural;
+- if (PLURAL_PARSE (&args) != 0)
+- goto no_plural;
+- *pluralp = args.res;
+- }
+- }
+- else
+- {
+- /* By default we are using the Germanic form: singular form only
+- for `one', the plural form otherwise. Yes, this is also what
+- English is using since English is a Germanic language. */
+- no_plural:
+- INIT_GERMANIC_PLURAL ();
+- *pluralp = &GERMANIC_PLURAL;
+- *npluralsp = 2;
+- }
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/plural-exp.h abook/intl/plural-exp.h
+--- BUILD/abook-0.6.0pre2/intl/plural-exp.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/plural-exp.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,118 +0,0 @@
+-/* Expression parsing and evaluation for plural form selection.
+- Copyright (C) 2000-2003 Free Software Foundation, Inc.
+- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _PLURAL_EXP_H
+-#define _PLURAL_EXP_H
+-
+-#ifndef internal_function
+-# define internal_function
+-#endif
+-
+-#ifndef attribute_hidden
+-# define attribute_hidden
+-#endif
+-
+-
+-/* This is the representation of the expressions to determine the
+- plural form. */
+-struct expression
+-{
+- int nargs; /* Number of arguments. */
+- enum operator
+- {
+- /* Without arguments: */
+- var, /* The variable "n". */
+- num, /* Decimal number. */
+- /* Unary operators: */
+- lnot, /* Logical NOT. */
+- /* Binary operators: */
+- mult, /* Multiplication. */
+- divide, /* Division. */
+- module, /* Modulo operation. */
+- plus, /* Addition. */
+- minus, /* Subtraction. */
+- less_than, /* Comparison. */
+- greater_than, /* Comparison. */
+- less_or_equal, /* Comparison. */
+- greater_or_equal, /* Comparison. */
+- equal, /* Comparison for equality. */
+- not_equal, /* Comparison for inequality. */
+- land, /* Logical AND. */
+- lor, /* Logical OR. */
+- /* Ternary operators: */
+- qmop /* Question mark operator. */
+- } operation;
+- union
+- {
+- unsigned long int num; /* Number value for `num'. */
+- struct expression *args[3]; /* Up to three arguments. */
+- } val;
+-};
+-
+-/* This is the data structure to pass information to the parser and get
+- the result in a thread-safe way. */
+-struct parse_args
+-{
+- const char *cp;
+- struct expression *res;
+-};
+-
+-
+-/* Names for the libintl functions are a problem. This source code is used
+- 1. in the GNU C Library library,
+- 2. in the GNU libintl library,
+- 3. in the GNU gettext tools.
+- The function names in each situation must be different, to allow for
+- binary incompatible changes in 'struct expression'. Furthermore,
+- 1. in the GNU C Library library, the names have a __ prefix,
+- 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
+- must follow ANSI C and not start with __.
+- So we have to distinguish the three cases. */
+-#ifdef _LIBC
+-# define FREE_EXPRESSION __gettext_free_exp
+-# define PLURAL_PARSE __gettextparse
+-# define GERMANIC_PLURAL __gettext_germanic_plural
+-# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
+-#elif defined (IN_LIBINTL)
+-# define FREE_EXPRESSION libintl_gettext_free_exp
+-# define PLURAL_PARSE libintl_gettextparse
+-# define GERMANIC_PLURAL libintl_gettext_germanic_plural
+-# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
+-#else
+-# define FREE_EXPRESSION free_plural_expression
+-# define PLURAL_PARSE parse_plural_expression
+-# define GERMANIC_PLURAL germanic_plural
+-# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
+-#endif
+-
+-extern void FREE_EXPRESSION (struct expression *exp)
+- internal_function;
+-extern int PLURAL_PARSE (void *arg);
+-extern struct expression GERMANIC_PLURAL attribute_hidden;
+-extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
+- struct expression **pluralp,
+- unsigned long int *npluralsp)
+- internal_function;
+-
+-#if !defined (_LIBC) && !defined (IN_LIBINTL)
+-extern unsigned long int plural_eval (struct expression *pexp,
+- unsigned long int n);
+-#endif
+-
+-#endif /* _PLURAL_EXP_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/plural.y abook/intl/plural.y
+--- BUILD/abook-0.6.0pre2/intl/plural.y 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/plural.y 1970-01-01 01:00:00.000000000 +0100
+@@ -1,381 +0,0 @@
+-%{
+-/* Expression parsing for plural form selection.
+- Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
+- Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* The bison generated parser uses alloca. AIX 3 forces us to put this
+- declaration at the beginning of the file. The declaration in bison's
+- skeleton file comes too late. This must come before <config.h>
+- because <config.h> may include arbitrary system headers. */
+-#if defined _AIX && !defined __GNUC__
+- #pragma alloca
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stddef.h>
+-#include <stdlib.h>
+-#include "plural-exp.h"
+-
+-/* The main function generated by the parser is called __gettextparse,
+- but we want it to be called PLURAL_PARSE. */
+-#ifndef _LIBC
+-# define __gettextparse PLURAL_PARSE
+-#endif
+-
+-#define YYLEX_PARAM &((struct parse_args *) arg)->cp
+-#define YYPARSE_PARAM arg
+-%}
+-%pure_parser
+-%expect 7
+-
+-%union {
+- unsigned long int num;
+- enum operator op;
+- struct expression *exp;
+-}
+-
+-%{
+-/* Prototypes for local functions. */
+-static int yylex (YYSTYPE *lval, const char **pexp);
+-static void yyerror (const char *str);
+-
+-/* Allocation of expressions. */
+-
+-static struct expression *
+-new_exp (int nargs, enum operator op, struct expression * const *args)
+-{
+- int i;
+- struct expression *newp;
+-
+- /* If any of the argument could not be malloc'ed, just return NULL. */
+- for (i = nargs - 1; i >= 0; i--)
+- if (args[i] == NULL)
+- goto fail;
+-
+- /* Allocate a new expression. */
+- newp = (struct expression *) malloc (sizeof (*newp));
+- if (newp != NULL)
+- {
+- newp->nargs = nargs;
+- newp->operation = op;
+- for (i = nargs - 1; i >= 0; i--)
+- newp->val.args[i] = args[i];
+- return newp;
+- }
+-
+- fail:
+- for (i = nargs - 1; i >= 0; i--)
+- FREE_EXPRESSION (args[i]);
+-
+- return NULL;
+-}
+-
+-static inline struct expression *
+-new_exp_0 (enum operator op)
+-{
+- return new_exp (0, op, NULL);
+-}
+-
+-static inline struct expression *
+-new_exp_1 (enum operator op, struct expression *right)
+-{
+- struct expression *args[1];
+-
+- args[0] = right;
+- return new_exp (1, op, args);
+-}
+-
+-static struct expression *
+-new_exp_2 (enum operator op, struct expression *left, struct expression *right)
+-{
+- struct expression *args[2];
+-
+- args[0] = left;
+- args[1] = right;
+- return new_exp (2, op, args);
+-}
+-
+-static inline struct expression *
+-new_exp_3 (enum operator op, struct expression *bexp,
+- struct expression *tbranch, struct expression *fbranch)
+-{
+- struct expression *args[3];
+-
+- args[0] = bexp;
+- args[1] = tbranch;
+- args[2] = fbranch;
+- return new_exp (3, op, args);
+-}
+-
+-%}
+-
+-/* This declares that all operators have the same associativity and the
+- precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
+- There is no unary minus and no bitwise operators.
+- Operators with the same syntactic behaviour have been merged into a single
+- token, to save space in the array generated by bison. */
+-%right '?' /* ? */
+-%left '|' /* || */
+-%left '&' /* && */
+-%left EQUOP2 /* == != */
+-%left CMPOP2 /* < > <= >= */
+-%left ADDOP2 /* + - */
+-%left MULOP2 /* * / % */
+-%right '!' /* ! */
+-
+-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
+-%token <num> NUMBER
+-%type <exp> exp
+-
+-%%
+-
+-start: exp
+- {
+- if ($1 == NULL)
+- YYABORT;
+- ((struct parse_args *) arg)->res = $1;
+- }
+- ;
+-
+-exp: exp '?' exp ':' exp
+- {
+- $$ = new_exp_3 (qmop, $1, $3, $5);
+- }
+- | exp '|' exp
+- {
+- $$ = new_exp_2 (lor, $1, $3);
+- }
+- | exp '&' exp
+- {
+- $$ = new_exp_2 (land, $1, $3);
+- }
+- | exp EQUOP2 exp
+- {
+- $$ = new_exp_2 ($2, $1, $3);
+- }
+- | exp CMPOP2 exp
+- {
+- $$ = new_exp_2 ($2, $1, $3);
+- }
+- | exp ADDOP2 exp
+- {
+- $$ = new_exp_2 ($2, $1, $3);
+- }
+- | exp MULOP2 exp
+- {
+- $$ = new_exp_2 ($2, $1, $3);
+- }
+- | '!' exp
+- {
+- $$ = new_exp_1 (lnot, $2);
+- }
+- | 'n'
+- {
+- $$ = new_exp_0 (var);
+- }
+- | NUMBER
+- {
+- if (($$ = new_exp_0 (num)) != NULL)
+- $$->val.num = $1;
+- }
+- | '(' exp ')'
+- {
+- $$ = $2;
+- }
+- ;
+-
+-%%
+-
+-void
+-internal_function
+-FREE_EXPRESSION (struct expression *exp)
+-{
+- if (exp == NULL)
+- return;
+-
+- /* Handle the recursive case. */
+- switch (exp->nargs)
+- {
+- case 3:
+- FREE_EXPRESSION (exp->val.args[2]);
+- /* FALLTHROUGH */
+- case 2:
+- FREE_EXPRESSION (exp->val.args[1]);
+- /* FALLTHROUGH */
+- case 1:
+- FREE_EXPRESSION (exp->val.args[0]);
+- /* FALLTHROUGH */
+- default:
+- break;
+- }
+-
+- free (exp);
+-}
+-
+-
+-static int
+-yylex (YYSTYPE *lval, const char **pexp)
+-{
+- const char *exp = *pexp;
+- int result;
+-
+- while (1)
+- {
+- if (exp[0] == '\0')
+- {
+- *pexp = exp;
+- return YYEOF;
+- }
+-
+- if (exp[0] != ' ' && exp[0] != '\t')
+- break;
+-
+- ++exp;
+- }
+-
+- result = *exp++;
+- switch (result)
+- {
+- case '0': case '1': case '2': case '3': case '4':
+- case '5': case '6': case '7': case '8': case '9':
+- {
+- unsigned long int n = result - '0';
+- while (exp[0] >= '0' && exp[0] <= '9')
+- {
+- n *= 10;
+- n += exp[0] - '0';
+- ++exp;
+- }
+- lval->num = n;
+- result = NUMBER;
+- }
+- break;
+-
+- case '=':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = equal;
+- result = EQUOP2;
+- }
+- else
+- result = YYERRCODE;
+- break;
+-
+- case '!':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = not_equal;
+- result = EQUOP2;
+- }
+- break;
+-
+- case '&':
+- case '|':
+- if (exp[0] == result)
+- ++exp;
+- else
+- result = YYERRCODE;
+- break;
+-
+- case '<':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = less_or_equal;
+- }
+- else
+- lval->op = less_than;
+- result = CMPOP2;
+- break;
+-
+- case '>':
+- if (exp[0] == '=')
+- {
+- ++exp;
+- lval->op = greater_or_equal;
+- }
+- else
+- lval->op = greater_than;
+- result = CMPOP2;
+- break;
+-
+- case '*':
+- lval->op = mult;
+- result = MULOP2;
+- break;
+-
+- case '/':
+- lval->op = divide;
+- result = MULOP2;
+- break;
+-
+- case '%':
+- lval->op = module;
+- result = MULOP2;
+- break;
+-
+- case '+':
+- lval->op = plus;
+- result = ADDOP2;
+- break;
+-
+- case '-':
+- lval->op = minus;
+- result = ADDOP2;
+- break;
+-
+- case 'n':
+- case '?':
+- case ':':
+- case '(':
+- case ')':
+- /* Nothing, just return the character. */
+- break;
+-
+- case ';':
+- case '\n':
+- case '\0':
+- /* Be safe and let the user call this function again. */
+- --exp;
+- result = YYEOF;
+- break;
+-
+- default:
+- result = YYERRCODE;
+-#if YYDEBUG != 0
+- --exp;
+-#endif
+- break;
+- }
+-
+- *pexp = exp;
+-
+- return result;
+-}
+-
+-
+-static void
+-yyerror (const char *str)
+-{
+- /* Do nothing. We don't print error messages here. */
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/printf-args.c abook/intl/printf-args.c
+--- BUILD/abook-0.6.0pre2/intl/printf-args.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/printf-args.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,119 +0,0 @@
+-/* Decomposed printf argument list.
+- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-/* Specification. */
+-#include "printf-args.h"
+-
+-#ifdef STATIC
+-STATIC
+-#endif
+-int
+-printf_fetchargs (va_list args, arguments *a)
+-{
+- size_t i;
+- argument *ap;
+-
+- for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
+- switch (ap->type)
+- {
+- case TYPE_SCHAR:
+- ap->a.a_schar = va_arg (args, /*signed char*/ int);
+- break;
+- case TYPE_UCHAR:
+- ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
+- break;
+- case TYPE_SHORT:
+- ap->a.a_short = va_arg (args, /*short*/ int);
+- break;
+- case TYPE_USHORT:
+- ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
+- break;
+- case TYPE_INT:
+- ap->a.a_int = va_arg (args, int);
+- break;
+- case TYPE_UINT:
+- ap->a.a_uint = va_arg (args, unsigned int);
+- break;
+- case TYPE_LONGINT:
+- ap->a.a_longint = va_arg (args, long int);
+- break;
+- case TYPE_ULONGINT:
+- ap->a.a_ulongint = va_arg (args, unsigned long int);
+- break;
+-#ifdef HAVE_LONG_LONG
+- case TYPE_LONGLONGINT:
+- ap->a.a_longlongint = va_arg (args, long long int);
+- break;
+- case TYPE_ULONGLONGINT:
+- ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
+- break;
+-#endif
+- case TYPE_DOUBLE:
+- ap->a.a_double = va_arg (args, double);
+- break;
+-#ifdef HAVE_LONG_DOUBLE
+- case TYPE_LONGDOUBLE:
+- ap->a.a_longdouble = va_arg (args, long double);
+- break;
+-#endif
+- case TYPE_CHAR:
+- ap->a.a_char = va_arg (args, int);
+- break;
+-#ifdef HAVE_WINT_T
+- case TYPE_WIDE_CHAR:
+- ap->a.a_wide_char = va_arg (args, wint_t);
+- break;
+-#endif
+- case TYPE_STRING:
+- ap->a.a_string = va_arg (args, const char *);
+- break;
+-#ifdef HAVE_WCHAR_T
+- case TYPE_WIDE_STRING:
+- ap->a.a_wide_string = va_arg (args, const wchar_t *);
+- break;
+-#endif
+- case TYPE_POINTER:
+- ap->a.a_pointer = va_arg (args, void *);
+- break;
+- case TYPE_COUNT_SCHAR_POINTER:
+- ap->a.a_count_schar_pointer = va_arg (args, signed char *);
+- break;
+- case TYPE_COUNT_SHORT_POINTER:
+- ap->a.a_count_short_pointer = va_arg (args, short *);
+- break;
+- case TYPE_COUNT_INT_POINTER:
+- ap->a.a_count_int_pointer = va_arg (args, int *);
+- break;
+- case TYPE_COUNT_LONGINT_POINTER:
+- ap->a.a_count_longint_pointer = va_arg (args, long int *);
+- break;
+-#ifdef HAVE_LONG_LONG
+- case TYPE_COUNT_LONGLONGINT_POINTER:
+- ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
+- break;
+-#endif
+- default:
+- /* Unknown type. */
+- return -1;
+- }
+- return 0;
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/printf-args.h abook/intl/printf-args.h
+--- BUILD/abook-0.6.0pre2/intl/printf-args.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/printf-args.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,137 +0,0 @@
+-/* Decomposed printf argument list.
+- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _PRINTF_ARGS_H
+-#define _PRINTF_ARGS_H
+-
+-/* Get size_t. */
+-#include <stddef.h>
+-
+-/* Get wchar_t. */
+-#ifdef HAVE_WCHAR_T
+-# include <stddef.h>
+-#endif
+-
+-/* Get wint_t. */
+-#ifdef HAVE_WINT_T
+-# include <wchar.h>
+-#endif
+-
+-/* Get va_list. */
+-#include <stdarg.h>
+-
+-
+-/* Argument types */
+-typedef enum
+-{
+- TYPE_NONE,
+- TYPE_SCHAR,
+- TYPE_UCHAR,
+- TYPE_SHORT,
+- TYPE_USHORT,
+- TYPE_INT,
+- TYPE_UINT,
+- TYPE_LONGINT,
+- TYPE_ULONGINT,
+-#ifdef HAVE_LONG_LONG
+- TYPE_LONGLONGINT,
+- TYPE_ULONGLONGINT,
+-#endif
+- TYPE_DOUBLE,
+-#ifdef HAVE_LONG_DOUBLE
+- TYPE_LONGDOUBLE,
+-#endif
+- TYPE_CHAR,
+-#ifdef HAVE_WINT_T
+- TYPE_WIDE_CHAR,
+-#endif
+- TYPE_STRING,
+-#ifdef HAVE_WCHAR_T
+- TYPE_WIDE_STRING,
+-#endif
+- TYPE_POINTER,
+- TYPE_COUNT_SCHAR_POINTER,
+- TYPE_COUNT_SHORT_POINTER,
+- TYPE_COUNT_INT_POINTER,
+- TYPE_COUNT_LONGINT_POINTER
+-#ifdef HAVE_LONG_LONG
+-, TYPE_COUNT_LONGLONGINT_POINTER
+-#endif
+-} arg_type;
+-
+-/* Polymorphic argument */
+-typedef struct
+-{
+- arg_type type;
+- union
+- {
+- signed char a_schar;
+- unsigned char a_uchar;
+- short a_short;
+- unsigned short a_ushort;
+- int a_int;
+- unsigned int a_uint;
+- long int a_longint;
+- unsigned long int a_ulongint;
+-#ifdef HAVE_LONG_LONG
+- long long int a_longlongint;
+- unsigned long long int a_ulonglongint;
+-#endif
+- float a_float;
+- double a_double;
+-#ifdef HAVE_LONG_DOUBLE
+- long double a_longdouble;
+-#endif
+- int a_char;
+-#ifdef HAVE_WINT_T
+- wint_t a_wide_char;
+-#endif
+- const char* a_string;
+-#ifdef HAVE_WCHAR_T
+- const wchar_t* a_wide_string;
+-#endif
+- void* a_pointer;
+- signed char * a_count_schar_pointer;
+- short * a_count_short_pointer;
+- int * a_count_int_pointer;
+- long int * a_count_longint_pointer;
+-#ifdef HAVE_LONG_LONG
+- long long int * a_count_longlongint_pointer;
+-#endif
+- }
+- a;
+-}
+-argument;
+-
+-typedef struct
+-{
+- size_t count;
+- argument *arg;
+-}
+-arguments;
+-
+-
+-/* Fetch the arguments, putting them into a. */
+-#ifdef STATIC
+-STATIC
+-#else
+-extern
+-#endif
+-int printf_fetchargs (va_list args, arguments *a);
+-
+-#endif /* _PRINTF_ARGS_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/printf.c abook/intl/printf.c
+--- BUILD/abook-0.6.0pre2/intl/printf.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/printf.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,371 +0,0 @@
+-/* Formatted output to strings, using POSIX/XSI format strings with positions.
+- Copyright (C) 2003 Free Software Foundation, Inc.
+- Written by Bruno Haible <bruno@clisp.org>, 2003.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#ifdef __GNUC__
+-# define alloca __builtin_alloca
+-# define HAVE_ALLOCA 1
+-#else
+-# ifdef _MSC_VER
+-# include <malloc.h>
+-# define alloca _alloca
+-# else
+-# if defined HAVE_ALLOCA_H || defined _LIBC
+-# include <alloca.h>
+-# else
+-# ifdef _AIX
+- #pragma alloca
+-# else
+-# ifndef alloca
+-char *alloca ();
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#include <stdio.h>
+-
+-#if !HAVE_POSIX_PRINTF
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-/* When building a DLL, we must export some functions. Note that because
+- the functions are only defined for binary backward compatibility, we
+- don't need to use __declspec(dllimport) in any case. */
+-#if defined _MSC_VER && BUILDING_DLL
+-# define DLL_EXPORTED __declspec(dllexport)
+-#else
+-# define DLL_EXPORTED
+-#endif
+-
+-#define STATIC static
+-
+-/* Define auxiliary functions declared in "printf-args.h". */
+-#include "printf-args.c"
+-
+-/* Define auxiliary functions declared in "printf-parse.h". */
+-#include "printf-parse.c"
+-
+-/* Define functions declared in "vasnprintf.h". */
+-#define vasnprintf libintl_vasnprintf
+-#include "vasnprintf.c"
+-#if 0 /* not needed */
+-#define asnprintf libintl_asnprintf
+-#include "asnprintf.c"
+-#endif
+-
+-DLL_EXPORTED
+-int
+-libintl_vfprintf (FILE *stream, const char *format, va_list args)
+-{
+- if (strchr (format, '$') == NULL)
+- return vfprintf (stream, format, args);
+- else
+- {
+- size_t length;
+- char *result = libintl_vasnprintf (NULL, &length, format, args);
+- int retval = -1;
+- if (result != NULL)
+- {
+- if (fwrite (result, 1, length, stream) == length)
+- retval = length;
+- free (result);
+- }
+- return retval;
+- }
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_fprintf (FILE *stream, const char *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vfprintf (stream, format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_vprintf (const char *format, va_list args)
+-{
+- return libintl_vfprintf (stdout, format, args);
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_printf (const char *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vprintf (format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_vsprintf (char *resultbuf, const char *format, va_list args)
+-{
+- if (strchr (format, '$') == NULL)
+- return vsprintf (resultbuf, format, args);
+- else
+- {
+- size_t length = (size_t) ~0 / (4 * sizeof (char));
+- char *result = libintl_vasnprintf (resultbuf, &length, format, args);
+- if (result != resultbuf)
+- {
+- free (result);
+- return -1;
+- }
+- else
+- return length;
+- }
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_sprintf (char *resultbuf, const char *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vsprintf (resultbuf, format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-#if HAVE_SNPRINTF
+-
+-# if HAVE_DECL__SNPRINTF
+- /* Windows. */
+-# define system_vsnprintf _vsnprintf
+-# else
+- /* Unix. */
+-# define system_vsnprintf vsnprintf
+-# endif
+-
+-DLL_EXPORTED
+-int
+-libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
+-{
+- if (strchr (format, '$') == NULL)
+- return system_vsnprintf (resultbuf, length, format, args);
+- else
+- {
+- size_t maxlength = length;
+- char *result = libintl_vasnprintf (resultbuf, &length, format, args);
+- if (result != resultbuf)
+- {
+- if (maxlength > 0)
+- {
+- if (length < maxlength)
+- abort ();
+- memcpy (resultbuf, result, maxlength - 1);
+- resultbuf[maxlength - 1] = '\0';
+- }
+- free (result);
+- return -1;
+- }
+- else
+- return length;
+- }
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vsnprintf (resultbuf, length, format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-#endif
+-
+-#if HAVE_ASPRINTF
+-
+-DLL_EXPORTED
+-int
+-libintl_vasprintf (char **resultp, const char *format, va_list args)
+-{
+- size_t length;
+- char *result = libintl_vasnprintf (NULL, &length, format, args);
+- if (result == NULL)
+- return -1;
+- *resultp = result;
+- return length;
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_asprintf (char **resultp, const char *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vasprintf (resultp, format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-#endif
+-
+-#if HAVE_FWPRINTF
+-
+-#include <wchar.h>
+-
+-#define WIDE_CHAR_VERSION 1
+-
+-/* Define auxiliary functions declared in "wprintf-parse.h". */
+-#include "printf-parse.c"
+-
+-/* Define functions declared in "vasnprintf.h". */
+-#define vasnwprintf libintl_vasnwprintf
+-#include "vasnprintf.c"
+-#if 0 /* not needed */
+-#define asnwprintf libintl_asnwprintf
+-#include "asnprintf.c"
+-#endif
+-
+-# if HAVE_DECL__SNWPRINTF
+- /* Windows. */
+-# define system_vswprintf _vsnwprintf
+-# else
+- /* Unix. */
+-# define system_vswprintf vswprintf
+-# endif
+-
+-DLL_EXPORTED
+-int
+-libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
+-{
+- if (wcschr (format, '$') == NULL)
+- return vfwprintf (stream, format, args);
+- else
+- {
+- size_t length;
+- wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
+- int retval = -1;
+- if (result != NULL)
+- {
+- size_t i;
+- for (i = 0; i < length; i++)
+- if (fputwc (result[i], stream) == WEOF)
+- break;
+- if (i == length)
+- retval = length;
+- free (result);
+- }
+- return retval;
+- }
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vfwprintf (stream, format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_vwprintf (const wchar_t *format, va_list args)
+-{
+- return libintl_vfwprintf (stdout, format, args);
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_wprintf (const wchar_t *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vwprintf (format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
+-{
+- if (wcschr (format, '$') == NULL)
+- return system_vswprintf (resultbuf, length, format, args);
+- else
+- {
+- size_t maxlength = length;
+- wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
+- if (result != resultbuf)
+- {
+- if (maxlength > 0)
+- {
+- if (length < maxlength)
+- abort ();
+- memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
+- resultbuf[maxlength - 1] = 0;
+- }
+- free (result);
+- return -1;
+- }
+- else
+- return length;
+- }
+-}
+-
+-DLL_EXPORTED
+-int
+-libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
+-{
+- va_list args;
+- int retval;
+-
+- va_start (args, format);
+- retval = libintl_vswprintf (resultbuf, length, format, args);
+- va_end (args);
+- return retval;
+-}
+-
+-#endif
+-
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/printf-parse.c abook/intl/printf-parse.c
+--- BUILD/abook-0.6.0pre2/intl/printf-parse.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/printf-parse.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,537 +0,0 @@
+-/* Formatted output to strings.
+- Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-/* Specification. */
+-#if WIDE_CHAR_VERSION
+-# include "wprintf-parse.h"
+-#else
+-# include "printf-parse.h"
+-#endif
+-
+-/* Get size_t, NULL. */
+-#include <stddef.h>
+-
+-/* Get intmax_t. */
+-#if HAVE_STDINT_H_WITH_UINTMAX
+-# include <stdint.h>
+-#endif
+-#if HAVE_INTTYPES_H_WITH_UINTMAX
+-# include <inttypes.h>
+-#endif
+-
+-/* malloc(), realloc(), free(). */
+-#include <stdlib.h>
+-
+-/* Checked size_t computations. */
+-#include "xsize.h"
+-
+-#if WIDE_CHAR_VERSION
+-# define PRINTF_PARSE wprintf_parse
+-# define CHAR_T wchar_t
+-# define DIRECTIVE wchar_t_directive
+-# define DIRECTIVES wchar_t_directives
+-#else
+-# define PRINTF_PARSE printf_parse
+-# define CHAR_T char
+-# define DIRECTIVE char_directive
+-# define DIRECTIVES char_directives
+-#endif
+-
+-#ifdef STATIC
+-STATIC
+-#endif
+-int
+-PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
+-{
+- const CHAR_T *cp = format; /* pointer into format */
+- size_t arg_posn = 0; /* number of regular arguments consumed */
+- size_t d_allocated; /* allocated elements of d->dir */
+- size_t a_allocated; /* allocated elements of a->arg */
+- size_t max_width_length = 0;
+- size_t max_precision_length = 0;
+-
+- d->count = 0;
+- d_allocated = 1;
+- d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
+- if (d->dir == NULL)
+- /* Out of memory. */
+- return -1;
+-
+- a->count = 0;
+- a_allocated = 0;
+- a->arg = NULL;
+-
+-#define REGISTER_ARG(_index_,_type_) \
+- { \
+- size_t n = (_index_); \
+- if (n >= a_allocated) \
+- { \
+- size_t memory_size; \
+- argument *memory; \
+- \
+- a_allocated = xtimes (a_allocated, 2); \
+- if (a_allocated <= n) \
+- a_allocated = xsum (n, 1); \
+- memory_size = xtimes (a_allocated, sizeof (argument)); \
+- if (size_overflow_p (memory_size)) \
+- /* Overflow, would lead to out of memory. */ \
+- goto error; \
+- memory = (a->arg \
+- ? realloc (a->arg, memory_size) \
+- : malloc (memory_size)); \
+- if (memory == NULL) \
+- /* Out of memory. */ \
+- goto error; \
+- a->arg = memory; \
+- } \
+- while (a->count <= n) \
+- a->arg[a->count++].type = TYPE_NONE; \
+- if (a->arg[n].type == TYPE_NONE) \
+- a->arg[n].type = (_type_); \
+- else if (a->arg[n].type != (_type_)) \
+- /* Ambiguous type for positional argument. */ \
+- goto error; \
+- }
+-
+- while (*cp != '\0')
+- {
+- CHAR_T c = *cp++;
+- if (c == '%')
+- {
+- size_t arg_index = ARG_NONE;
+- DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
+-
+- /* Initialize the next directive. */
+- dp->dir_start = cp - 1;
+- dp->flags = 0;
+- dp->width_start = NULL;
+- dp->width_end = NULL;
+- dp->width_arg_index = ARG_NONE;
+- dp->precision_start = NULL;
+- dp->precision_end = NULL;
+- dp->precision_arg_index = ARG_NONE;
+- dp->arg_index = ARG_NONE;
+-
+- /* Test for positional argument. */
+- if (*cp >= '0' && *cp <= '9')
+- {
+- const CHAR_T *np;
+-
+- for (np = cp; *np >= '0' && *np <= '9'; np++)
+- ;
+- if (*np == '$')
+- {
+- size_t n = 0;
+-
+- for (np = cp; *np >= '0' && *np <= '9'; np++)
+- n = xsum (xtimes (n, 10), *np - '0');
+- if (n == 0)
+- /* Positional argument 0. */
+- goto error;
+- if (size_overflow_p (n))
+- /* n too large, would lead to out of memory later. */
+- goto error;
+- arg_index = n - 1;
+- cp = np + 1;
+- }
+- }
+-
+- /* Read the flags. */
+- for (;;)
+- {
+- if (*cp == '\'')
+- {
+- dp->flags |= FLAG_GROUP;
+- cp++;
+- }
+- else if (*cp == '-')
+- {
+- dp->flags |= FLAG_LEFT;
+- cp++;
+- }
+- else if (*cp == '+')
+- {
+- dp->flags |= FLAG_SHOWSIGN;
+- cp++;
+- }
+- else if (*cp == ' ')
+- {
+- dp->flags |= FLAG_SPACE;
+- cp++;
+- }
+- else if (*cp == '#')
+- {
+- dp->flags |= FLAG_ALT;
+- cp++;
+- }
+- else if (*cp == '0')
+- {
+- dp->flags |= FLAG_ZERO;
+- cp++;
+- }
+- else
+- break;
+- }
+-
+- /* Parse the field width. */
+- if (*cp == '*')
+- {
+- dp->width_start = cp;
+- cp++;
+- dp->width_end = cp;
+- if (max_width_length < 1)
+- max_width_length = 1;
+-
+- /* Test for positional argument. */
+- if (*cp >= '0' && *cp <= '9')
+- {
+- const CHAR_T *np;
+-
+- for (np = cp; *np >= '0' && *np <= '9'; np++)
+- ;
+- if (*np == '$')
+- {
+- size_t n = 0;
+-
+- for (np = cp; *np >= '0' && *np <= '9'; np++)
+- n = xsum (xtimes (n, 10), *np - '0');
+- if (n == 0)
+- /* Positional argument 0. */
+- goto error;
+- if (size_overflow_p (n))
+- /* n too large, would lead to out of memory later. */
+- goto error;
+- dp->width_arg_index = n - 1;
+- cp = np + 1;
+- }
+- }
+- if (dp->width_arg_index == ARG_NONE)
+- {
+- dp->width_arg_index = arg_posn++;
+- if (dp->width_arg_index == ARG_NONE)
+- /* arg_posn wrapped around. */
+- goto error;
+- }
+- REGISTER_ARG (dp->width_arg_index, TYPE_INT);
+- }
+- else if (*cp >= '0' && *cp <= '9')
+- {
+- size_t width_length;
+-
+- dp->width_start = cp;
+- for (; *cp >= '0' && *cp <= '9'; cp++)
+- ;
+- dp->width_end = cp;
+- width_length = dp->width_end - dp->width_start;
+- if (max_width_length < width_length)
+- max_width_length = width_length;
+- }
+-
+- /* Parse the precision. */
+- if (*cp == '.')
+- {
+- cp++;
+- if (*cp == '*')
+- {
+- dp->precision_start = cp - 1;
+- cp++;
+- dp->precision_end = cp;
+- if (max_precision_length < 2)
+- max_precision_length = 2;
+-
+- /* Test for positional argument. */
+- if (*cp >= '0' && *cp <= '9')
+- {
+- const CHAR_T *np;
+-
+- for (np = cp; *np >= '0' && *np <= '9'; np++)
+- ;
+- if (*np == '$')
+- {
+- size_t n = 0;
+-
+- for (np = cp; *np >= '0' && *np <= '9'; np++)
+- n = xsum (xtimes (n, 10), *np - '0');
+- if (n == 0)
+- /* Positional argument 0. */
+- goto error;
+- if (size_overflow_p (n))
+- /* n too large, would lead to out of memory
+- later. */
+- goto error;
+- dp->precision_arg_index = n - 1;
+- cp = np + 1;
+- }
+- }
+- if (dp->precision_arg_index == ARG_NONE)
+- {
+- dp->precision_arg_index = arg_posn++;
+- if (dp->precision_arg_index == ARG_NONE)
+- /* arg_posn wrapped around. */
+- goto error;
+- }
+- REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
+- }
+- else
+- {
+- size_t precision_length;
+-
+- dp->precision_start = cp - 1;
+- for (; *cp >= '0' && *cp <= '9'; cp++)
+- ;
+- dp->precision_end = cp;
+- precision_length = dp->precision_end - dp->precision_start;
+- if (max_precision_length < precision_length)
+- max_precision_length = precision_length;
+- }
+- }
+-
+- {
+- arg_type type;
+-
+- /* Parse argument type/size specifiers. */
+- {
+- int flags = 0;
+-
+- for (;;)
+- {
+- if (*cp == 'h')
+- {
+- flags |= (1 << (flags & 1));
+- cp++;
+- }
+- else if (*cp == 'L')
+- {
+- flags |= 4;
+- cp++;
+- }
+- else if (*cp == 'l')
+- {
+- flags += 8;
+- cp++;
+- }
+-#ifdef HAVE_INTMAX_T
+- else if (*cp == 'j')
+- {
+- if (sizeof (intmax_t) > sizeof (long))
+- {
+- /* intmax_t = long long */
+- flags += 16;
+- }
+- else if (sizeof (intmax_t) > sizeof (int))
+- {
+- /* intmax_t = long */
+- flags += 8;
+- }
+- cp++;
+- }
+-#endif
+- else if (*cp == 'z' || *cp == 'Z')
+- {
+- /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
+- because the warning facility in gcc-2.95.2 understands
+- only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */
+- if (sizeof (size_t) > sizeof (long))
+- {
+- /* size_t = long long */
+- flags += 16;
+- }
+- else if (sizeof (size_t) > sizeof (int))
+- {
+- /* size_t = long */
+- flags += 8;
+- }
+- cp++;
+- }
+- else if (*cp == 't')
+- {
+- if (sizeof (ptrdiff_t) > sizeof (long))
+- {
+- /* ptrdiff_t = long long */
+- flags += 16;
+- }
+- else if (sizeof (ptrdiff_t) > sizeof (int))
+- {
+- /* ptrdiff_t = long */
+- flags += 8;
+- }
+- cp++;
+- }
+- else
+- break;
+- }
+-
+- /* Read the conversion character. */
+- c = *cp++;
+- switch (c)
+- {
+- case 'd': case 'i':
+-#ifdef HAVE_LONG_LONG
+- if (flags >= 16 || (flags & 4))
+- type = TYPE_LONGLONGINT;
+- else
+-#endif
+- if (flags >= 8)
+- type = TYPE_LONGINT;
+- else if (flags & 2)
+- type = TYPE_SCHAR;
+- else if (flags & 1)
+- type = TYPE_SHORT;
+- else
+- type = TYPE_INT;
+- break;
+- case 'o': case 'u': case 'x': case 'X':
+-#ifdef HAVE_LONG_LONG
+- if (flags >= 16 || (flags & 4))
+- type = TYPE_ULONGLONGINT;
+- else
+-#endif
+- if (flags >= 8)
+- type = TYPE_ULONGINT;
+- else if (flags & 2)
+- type = TYPE_UCHAR;
+- else if (flags & 1)
+- type = TYPE_USHORT;
+- else
+- type = TYPE_UINT;
+- break;
+- case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
+- case 'a': case 'A':
+-#ifdef HAVE_LONG_DOUBLE
+- if (flags >= 16 || (flags & 4))
+- type = TYPE_LONGDOUBLE;
+- else
+-#endif
+- type = TYPE_DOUBLE;
+- break;
+- case 'c':
+- if (flags >= 8)
+-#ifdef HAVE_WINT_T
+- type = TYPE_WIDE_CHAR;
+-#else
+- goto error;
+-#endif
+- else
+- type = TYPE_CHAR;
+- break;
+-#ifdef HAVE_WINT_T
+- case 'C':
+- type = TYPE_WIDE_CHAR;
+- c = 'c';
+- break;
+-#endif
+- case 's':
+- if (flags >= 8)
+-#ifdef HAVE_WCHAR_T
+- type = TYPE_WIDE_STRING;
+-#else
+- goto error;
+-#endif
+- else
+- type = TYPE_STRING;
+- break;
+-#ifdef HAVE_WCHAR_T
+- case 'S':
+- type = TYPE_WIDE_STRING;
+- c = 's';
+- break;
+-#endif
+- case 'p':
+- type = TYPE_POINTER;
+- break;
+- case 'n':
+-#ifdef HAVE_LONG_LONG
+- if (flags >= 16 || (flags & 4))
+- type = TYPE_COUNT_LONGLONGINT_POINTER;
+- else
+-#endif
+- if (flags >= 8)
+- type = TYPE_COUNT_LONGINT_POINTER;
+- else if (flags & 2)
+- type = TYPE_COUNT_SCHAR_POINTER;
+- else if (flags & 1)
+- type = TYPE_COUNT_SHORT_POINTER;
+- else
+- type = TYPE_COUNT_INT_POINTER;
+- break;
+- case '%':
+- type = TYPE_NONE;
+- break;
+- default:
+- /* Unknown conversion character. */
+- goto error;
+- }
+- }
+-
+- if (type != TYPE_NONE)
+- {
+- dp->arg_index = arg_index;
+- if (dp->arg_index == ARG_NONE)
+- {
+- dp->arg_index = arg_posn++;
+- if (dp->arg_index == ARG_NONE)
+- /* arg_posn wrapped around. */
+- goto error;
+- }
+- REGISTER_ARG (dp->arg_index, type);
+- }
+- dp->conversion = c;
+- dp->dir_end = cp;
+- }
+-
+- d->count++;
+- if (d->count >= d_allocated)
+- {
+- size_t memory_size;
+- DIRECTIVE *memory;
+-
+- d_allocated = xtimes (d_allocated, 2);
+- memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
+- if (size_overflow_p (memory_size))
+- /* Overflow, would lead to out of memory. */
+- goto error;
+- memory = realloc (d->dir, memory_size);
+- if (memory == NULL)
+- /* Out of memory. */
+- goto error;
+- d->dir = memory;
+- }
+- }
+- }
+- d->dir[d->count].dir_start = cp;
+-
+- d->max_width_length = max_width_length;
+- d->max_precision_length = max_precision_length;
+- return 0;
+-
+-error:
+- if (a->arg)
+- free (a->arg);
+- if (d->dir)
+- free (d->dir);
+- return -1;
+-}
+-
+-#undef DIRECTIVES
+-#undef DIRECTIVE
+-#undef CHAR_T
+-#undef PRINTF_PARSE
+diff -urN BUILD/abook-0.6.0pre2/intl/printf-parse.h abook/intl/printf-parse.h
+--- BUILD/abook-0.6.0pre2/intl/printf-parse.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/printf-parse.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,75 +0,0 @@
+-/* Parse printf format string.
+- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _PRINTF_PARSE_H
+-#define _PRINTF_PARSE_H
+-
+-#include "printf-args.h"
+-
+-
+-/* Flags */
+-#define FLAG_GROUP 1 /* ' flag */
+-#define FLAG_LEFT 2 /* - flag */
+-#define FLAG_SHOWSIGN 4 /* + flag */
+-#define FLAG_SPACE 8 /* space flag */
+-#define FLAG_ALT 16 /* # flag */
+-#define FLAG_ZERO 32
+-
+-/* arg_index value indicating that no argument is consumed. */
+-#define ARG_NONE (~(size_t)0)
+-
+-/* A parsed directive. */
+-typedef struct
+-{
+- const char* dir_start;
+- const char* dir_end;
+- int flags;
+- const char* width_start;
+- const char* width_end;
+- size_t width_arg_index;
+- const char* precision_start;
+- const char* precision_end;
+- size_t precision_arg_index;
+- char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
+- size_t arg_index;
+-}
+-char_directive;
+-
+-/* A parsed format string. */
+-typedef struct
+-{
+- size_t count;
+- char_directive *dir;
+- size_t max_width_length;
+- size_t max_precision_length;
+-}
+-char_directives;
+-
+-
+-/* Parses the format string. Fills in the number N of directives, and fills
+- in directives[0], ..., directives[N-1], and sets directives[N].dir_start
+- to the end of the format string. Also fills in the arg_type fields of the
+- arguments and the needed count of arguments. */
+-#ifdef STATIC
+-STATIC
+-#else
+-extern
+-#endif
+-int printf_parse (const char *format, char_directives *d, arguments *a);
+-
+-#endif /* _PRINTF_PARSE_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/ref-add.sin abook/intl/ref-add.sin
+--- BUILD/abook-0.6.0pre2/intl/ref-add.sin 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/ref-add.sin 1970-01-01 01:00:00.000000000 +0100
+@@ -1,31 +0,0 @@
+-# Add this package to a list of references stored in a text file.
+-#
+-# Copyright (C) 2000 Free Software Foundation, Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Library General Public License as published
+-# by the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# Library General Public License for more details.
+-#
+-# You should have received a copy of the GNU Library General Public
+-# License along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
+-#
+-# Written by Bruno Haible <haible@clisp.cons.org>.
+-#
+-/^# Packages using this file: / {
+- s/# Packages using this file://
+- ta
+- :a
+- s/ @PACKAGE@ / @PACKAGE@ /
+- tb
+- s/ $/ @PACKAGE@ /
+- :b
+- s/^/# Packages using this file:/
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/ref-del.sin abook/intl/ref-del.sin
+--- BUILD/abook-0.6.0pre2/intl/ref-del.sin 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/ref-del.sin 1970-01-01 01:00:00.000000000 +0100
+@@ -1,26 +0,0 @@
+-# Remove this package from a list of references stored in a text file.
+-#
+-# Copyright (C) 2000 Free Software Foundation, Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Library General Public License as published
+-# by the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# Library General Public License for more details.
+-#
+-# You should have received a copy of the GNU Library General Public
+-# License along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
+-#
+-# Written by Bruno Haible <haible@clisp.cons.org>.
+-#
+-/^# Packages using this file: / {
+- s/# Packages using this file://
+- s/ @PACKAGE@ / /
+- s/^/# Packages using this file:/
+-}
+diff -urN BUILD/abook-0.6.0pre2/intl/relocatable.c abook/intl/relocatable.c
+--- BUILD/abook-0.6.0pre2/intl/relocatable.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/relocatable.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,449 +0,0 @@
+-/* Provide relocatable packages.
+- Copyright (C) 2003-2004 Free Software Foundation, Inc.
+- Written by Bruno Haible <bruno@clisp.org>, 2003.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-
+-/* Tell glibc's <stdio.h> to provide a prototype for getline().
+- This must come before <config.h> because <config.h> may include
+- <features.h>, and once <features.h> has been included, it's too late. */
+-#ifndef _GNU_SOURCE
+-# define _GNU_SOURCE 1
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
+-
+-/* Specification. */
+-#include "relocatable.h"
+-
+-#if ENABLE_RELOCATABLE
+-
+-#include <stddef.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#ifdef NO_XMALLOC
+-# define xmalloc malloc
+-#else
+-# include "xalloc.h"
+-#endif
+-
+-#if defined _WIN32 || defined __WIN32__
+-# define WIN32_LEAN_AND_MEAN
+-# include <windows.h>
+-#endif
+-
+-#if DEPENDS_ON_LIBCHARSET
+-# include <libcharset.h>
+-#endif
+-#if DEPENDS_ON_LIBICONV && HAVE_ICONV
+-# include <iconv.h>
+-#endif
+-#if DEPENDS_ON_LIBINTL && ENABLE_NLS
+-# include <libintl.h>
+-#endif
+-
+-/* Faked cheap 'bool'. */
+-#undef bool
+-#undef false
+-#undef true
+-#define bool int
+-#define false 0
+-#define true 1
+-
+-/* Pathname support.
+- ISSLASH(C) tests whether C is a directory separator character.
+- IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
+- */
+-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+- /* Win32, Cygwin, OS/2, DOS */
+-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+-# define HAS_DEVICE(P) \
+- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+- && (P)[1] == ':')
+-# define IS_PATH_WITH_DIR(P) \
+- (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+-# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+-#else
+- /* Unix */
+-# define ISSLASH(C) ((C) == '/')
+-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+-# define FILE_SYSTEM_PREFIX_LEN(P) 0
+-#endif
+-
+-/* Original installation prefix. */
+-static char *orig_prefix;
+-static size_t orig_prefix_len;
+-/* Current installation prefix. */
+-static char *curr_prefix;
+-static size_t curr_prefix_len;
+-/* These prefixes do not end in a slash. Anything that will be concatenated
+- to them must start with a slash. */
+-
+-/* Sets the original and the current installation prefix of this module.
+- Relocation simply replaces a pathname starting with the original prefix
+- by the corresponding pathname with the current prefix instead. Both
+- prefixes should be directory names without trailing slash (i.e. use ""
+- instead of "/"). */
+-static void
+-set_this_relocation_prefix (const char *orig_prefix_arg,
+- const char *curr_prefix_arg)
+-{
+- if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
+- /* Optimization: if orig_prefix and curr_prefix are equal, the
+- relocation is a nop. */
+- && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
+- {
+- /* Duplicate the argument strings. */
+- char *memory;
+-
+- orig_prefix_len = strlen (orig_prefix_arg);
+- curr_prefix_len = strlen (curr_prefix_arg);
+- memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
+-#ifdef NO_XMALLOC
+- if (memory != NULL)
+-#endif
+- {
+- memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
+- orig_prefix = memory;
+- memory += orig_prefix_len + 1;
+- memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
+- curr_prefix = memory;
+- return;
+- }
+- }
+- orig_prefix = NULL;
+- curr_prefix = NULL;
+- /* Don't worry about wasted memory here - this function is usually only
+- called once. */
+-}
+-
+-/* Sets the original and the current installation prefix of the package.
+- Relocation simply replaces a pathname starting with the original prefix
+- by the corresponding pathname with the current prefix instead. Both
+- prefixes should be directory names without trailing slash (i.e. use ""
+- instead of "/"). */
+-void
+-set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
+-{
+- set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+-
+- /* Now notify all dependent libraries. */
+-#if DEPENDS_ON_LIBCHARSET
+- libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+-#endif
+-#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
+- libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+-#endif
+-#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
+- libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+-#endif
+-}
+-
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
+-
+-/* Convenience function:
+- Computes the current installation prefix, based on the original
+- installation prefix, the original installation directory of a particular
+- file, and the current pathname of this file. Returns NULL upon failure. */
+-#ifdef IN_LIBRARY
+-#define compute_curr_prefix local_compute_curr_prefix
+-static
+-#endif
+-const char *
+-compute_curr_prefix (const char *orig_installprefix,
+- const char *orig_installdir,
+- const char *curr_pathname)
+-{
+- const char *curr_installdir;
+- const char *rel_installdir;
+-
+- if (curr_pathname == NULL)
+- return NULL;
+-
+- /* Determine the relative installation directory, relative to the prefix.
+- This is simply the difference between orig_installprefix and
+- orig_installdir. */
+- if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
+- != 0)
+- /* Shouldn't happen - nothing should be installed outside $(prefix). */
+- return NULL;
+- rel_installdir = orig_installdir + strlen (orig_installprefix);
+-
+- /* Determine the current installation directory. */
+- {
+- const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname);
+- const char *p = curr_pathname + strlen (curr_pathname);
+- char *q;
+-
+- while (p > p_base)
+- {
+- p--;
+- if (ISSLASH (*p))
+- break;
+- }
+-
+- q = (char *) xmalloc (p - curr_pathname + 1);
+-#ifdef NO_XMALLOC
+- if (q == NULL)
+- return NULL;
+-#endif
+- memcpy (q, curr_pathname, p - curr_pathname);
+- q[p - curr_pathname] = '\0';
+- curr_installdir = q;
+- }
+-
+- /* Compute the current installation prefix by removing the trailing
+- rel_installdir from it. */
+- {
+- const char *rp = rel_installdir + strlen (rel_installdir);
+- const char *cp = curr_installdir + strlen (curr_installdir);
+- const char *cp_base =
+- curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
+-
+- while (rp > rel_installdir && cp > cp_base)
+- {
+- bool same = false;
+- const char *rpi = rp;
+- const char *cpi = cp;
+-
+- while (rpi > rel_installdir && cpi > cp_base)
+- {
+- rpi--;
+- cpi--;
+- if (ISSLASH (*rpi) || ISSLASH (*cpi))
+- {
+- if (ISSLASH (*rpi) && ISSLASH (*cpi))
+- same = true;
+- break;
+- }
+-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+- /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
+- if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
+- != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
+- break;
+-#else
+- if (*rpi != *cpi)
+- break;
+-#endif
+- }
+- if (!same)
+- break;
+- /* The last pathname component was the same. opi and cpi now point
+- to the slash before it. */
+- rp = rpi;
+- cp = cpi;
+- }
+-
+- if (rp > rel_installdir)
+- /* Unexpected: The curr_installdir does not end with rel_installdir. */
+- return NULL;
+-
+- {
+- size_t curr_prefix_len = cp - curr_installdir;
+- char *curr_prefix;
+-
+- curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
+-#ifdef NO_XMALLOC
+- if (curr_prefix == NULL)
+- return NULL;
+-#endif
+- memcpy (curr_prefix, curr_installdir, curr_prefix_len);
+- curr_prefix[curr_prefix_len] = '\0';
+-
+- return curr_prefix;
+- }
+- }
+-}
+-
+-#endif /* !IN_LIBRARY || PIC */
+-
+-#if defined PIC && defined INSTALLDIR
+-
+-/* Full pathname of shared library, or NULL. */
+-static char *shared_library_fullname;
+-
+-#if defined _WIN32 || defined __WIN32__
+-
+-/* Determine the full pathname of the shared library when it is loaded. */
+-
+-BOOL WINAPI
+-DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
+-{
+- (void) reserved;
+-
+- if (event == DLL_PROCESS_ATTACH)
+- {
+- /* The DLL is being loaded into an application's address range. */
+- static char location[MAX_PATH];
+-
+- if (!GetModuleFileName (module_handle, location, sizeof (location)))
+- /* Shouldn't happen. */
+- return FALSE;
+-
+- if (!IS_PATH_WITH_DIR (location))
+- /* Shouldn't happen. */
+- return FALSE;
+-
+- shared_library_fullname = strdup (location);
+- }
+-
+- return TRUE;
+-}
+-
+-#else /* Unix */
+-
+-static void
+-find_shared_library_fullname ()
+-{
+-#if defined __linux__ && __GLIBC__ >= 2
+- /* Linux has /proc/self/maps. glibc 2 has the getline() function. */
+- FILE *fp;
+-
+- /* Open the current process' maps file. It describes one VMA per line. */
+- fp = fopen ("/proc/self/maps", "r");
+- if (fp)
+- {
+- unsigned long address = (unsigned long) &find_shared_library_fullname;
+- for (;;)
+- {
+- unsigned long start, end;
+- int c;
+-
+- if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
+- break;
+- if (address >= start && address <= end - 1)
+- {
+- /* Found it. Now see if this line contains a filename. */
+- while (c = getc (fp), c != EOF && c != '\n' && c != '/')
+- continue;
+- if (c == '/')
+- {
+- size_t size;
+- int len;
+-
+- ungetc (c, fp);
+- shared_library_fullname = NULL; size = 0;
+- len = getline (&shared_library_fullname, &size, fp);
+- if (len >= 0)
+- {
+- /* Success: filled shared_library_fullname. */
+- if (len > 0 && shared_library_fullname[len - 1] == '\n')
+- shared_library_fullname[len - 1] = '\0';
+- }
+- }
+- break;
+- }
+- while (c = getc (fp), c != EOF && c != '\n')
+- continue;
+- }
+- fclose (fp);
+- }
+-#endif
+-}
+-
+-#endif /* WIN32 / Unix */
+-
+-/* Return the full pathname of the current shared library.
+- Return NULL if unknown.
+- Guaranteed to work only on Linux and Woe32. */
+-static char *
+-get_shared_library_fullname ()
+-{
+-#if !(defined _WIN32 || defined __WIN32__)
+- static bool tried_find_shared_library_fullname;
+- if (!tried_find_shared_library_fullname)
+- {
+- find_shared_library_fullname ();
+- tried_find_shared_library_fullname = true;
+- }
+-#endif
+- return shared_library_fullname;
+-}
+-
+-#endif /* PIC */
+-
+-/* Returns the pathname, relocated according to the current installation
+- directory. */
+-const char *
+-relocate (const char *pathname)
+-{
+-#if defined PIC && defined INSTALLDIR
+- static int initialized;
+-
+- /* Initialization code for a shared library. */
+- if (!initialized)
+- {
+- /* At this point, orig_prefix and curr_prefix likely have already been
+- set through the main program's set_program_name_and_installdir
+- function. This is sufficient in the case that the library has
+- initially been installed in the same orig_prefix. But we can do
+- better, to also cover the cases that 1. it has been installed
+- in a different prefix before being moved to orig_prefix and (later)
+- to curr_prefix, 2. unlike the program, it has not moved away from
+- orig_prefix. */
+- const char *orig_installprefix = INSTALLPREFIX;
+- const char *orig_installdir = INSTALLDIR;
+- const char *curr_prefix_better;
+-
+- curr_prefix_better =
+- compute_curr_prefix (orig_installprefix, orig_installdir,
+- get_shared_library_fullname ());
+- if (curr_prefix_better == NULL)
+- curr_prefix_better = curr_prefix;
+-
+- set_relocation_prefix (orig_installprefix, curr_prefix_better);
+-
+- initialized = 1;
+- }
+-#endif
+-
+- /* Note: It is not necessary to perform case insensitive comparison here,
+- even for DOS-like filesystems, because the pathname argument was
+- typically created from the same Makefile variable as orig_prefix came
+- from. */
+- if (orig_prefix != NULL && curr_prefix != NULL
+- && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
+- {
+- if (pathname[orig_prefix_len] == '\0')
+- /* pathname equals orig_prefix. */
+- return curr_prefix;
+- if (ISSLASH (pathname[orig_prefix_len]))
+- {
+- /* pathname starts with orig_prefix. */
+- const char *pathname_tail = &pathname[orig_prefix_len];
+- char *result =
+- (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
+-
+-#ifdef NO_XMALLOC
+- if (result != NULL)
+-#endif
+- {
+- memcpy (result, curr_prefix, curr_prefix_len);
+- strcpy (result + curr_prefix_len, pathname_tail);
+- return result;
+- }
+- }
+- }
+- /* Nothing to relocate. */
+- return pathname;
+-}
+-
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/relocatable.h abook/intl/relocatable.h
+--- BUILD/abook-0.6.0pre2/intl/relocatable.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/relocatable.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,77 +0,0 @@
+-/* Provide relocatable packages.
+- Copyright (C) 2003 Free Software Foundation, Inc.
+- Written by Bruno Haible <bruno@clisp.org>, 2003.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _RELOCATABLE_H
+-#define _RELOCATABLE_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-
+-/* This can be enabled through the configure --enable-relocatable option. */
+-#if ENABLE_RELOCATABLE
+-
+-/* When building a DLL, we must export some functions. Note that because
+- this is a private .h file, we don't need to use __declspec(dllimport)
+- in any case. */
+-#if defined _MSC_VER && BUILDING_DLL
+-# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
+-#else
+-# define RELOCATABLE_DLL_EXPORTED
+-#endif
+-
+-/* Sets the original and the current installation prefix of the package.
+- Relocation simply replaces a pathname starting with the original prefix
+- by the corresponding pathname with the current prefix instead. Both
+- prefixes should be directory names without trailing slash (i.e. use ""
+- instead of "/"). */
+-extern RELOCATABLE_DLL_EXPORTED void
+- set_relocation_prefix (const char *orig_prefix,
+- const char *curr_prefix);
+-
+-/* Returns the pathname, relocated according to the current installation
+- directory. */
+-extern const char * relocate (const char *pathname);
+-
+-/* Memory management: relocate() leaks memory, because it has to construct
+- a fresh pathname. If this is a problem because your program calls
+- relocate() frequently, think about caching the result. */
+-
+-/* Convenience function:
+- Computes the current installation prefix, based on the original
+- installation prefix, the original installation directory of a particular
+- file, and the current pathname of this file. Returns NULL upon failure. */
+-extern const char * compute_curr_prefix (const char *orig_installprefix,
+- const char *orig_installdir,
+- const char *curr_pathname);
+-
+-#else
+-
+-/* By default, we use the hardwired pathnames. */
+-#define relocate(pathname) (pathname)
+-
+-#endif
+-
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _RELOCATABLE_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/textdomain.c abook/intl/textdomain.c
+--- BUILD/abook-0.6.0pre2/intl/textdomain.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/textdomain.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,141 +0,0 @@
+-/* Implementation of the textdomain(3) function.
+- Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "libgnuintl.h"
+-#endif
+-#include "gettextP.h"
+-
+-#ifdef _LIBC
+-/* We have to handle multi-threaded applications. */
+-# include <bits/libc-lock.h>
+-#else
+-/* Provide dummy implementation if this is outside glibc. */
+-# define __libc_rwlock_define(CLASS, NAME)
+-# define __libc_rwlock_wrlock(NAME)
+-# define __libc_rwlock_unlock(NAME)
+-#endif
+-
+-/* The internal variables in the standalone libintl.a must have different
+- names than the internal variables in GNU libc, otherwise programs
+- using libintl.a cannot be linked statically. */
+-#if !defined _LIBC
+-# define _nl_default_default_domain libintl_nl_default_default_domain
+-# define _nl_current_default_domain libintl_nl_current_default_domain
+-#endif
+-
+-/* @@ end of prolog @@ */
+-
+-/* Name of the default text domain. */
+-extern const char _nl_default_default_domain[] attribute_hidden;
+-
+-/* Default text domain in which entries for gettext(3) are to be found. */
+-extern const char *_nl_current_default_domain attribute_hidden;
+-
+-
+-/* Names for the libintl functions are a problem. They must not clash
+- with existing names and they should follow ANSI C. But this source
+- code is also used in GNU C Library where the names have a __
+- prefix. So we have to make a difference here. */
+-#ifdef _LIBC
+-# define TEXTDOMAIN __textdomain
+-# ifndef strdup
+-# define strdup(str) __strdup (str)
+-# endif
+-#else
+-# define TEXTDOMAIN libintl_textdomain
+-#endif
+-
+-/* Lock variable to protect the global data in the gettext implementation. */
+-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+-
+-/* Set the current default message catalog to DOMAINNAME.
+- If DOMAINNAME is null, return the current default.
+- If DOMAINNAME is "", reset to the default of "messages". */
+-char *
+-TEXTDOMAIN (const char *domainname)
+-{
+- char *new_domain;
+- char *old_domain;
+-
+- /* A NULL pointer requests the current setting. */
+- if (domainname == NULL)
+- return (char *) _nl_current_default_domain;
+-
+- __libc_rwlock_wrlock (_nl_state_lock);
+-
+- old_domain = (char *) _nl_current_default_domain;
+-
+- /* If domain name is the null string set to default domain "messages". */
+- if (domainname[0] == '\0'
+- || strcmp (domainname, _nl_default_default_domain) == 0)
+- {
+- _nl_current_default_domain = _nl_default_default_domain;
+- new_domain = (char *) _nl_current_default_domain;
+- }
+- else if (strcmp (domainname, old_domain) == 0)
+- /* This can happen and people will use it to signal that some
+- environment variable changed. */
+- new_domain = old_domain;
+- else
+- {
+- /* If the following malloc fails `_nl_current_default_domain'
+- will be NULL. This value will be returned and so signals we
+- are out of core. */
+-#if defined _LIBC || defined HAVE_STRDUP
+- new_domain = strdup (domainname);
+-#else
+- size_t len = strlen (domainname) + 1;
+- new_domain = (char *) malloc (len);
+- if (new_domain != NULL)
+- memcpy (new_domain, domainname, len);
+-#endif
+-
+- if (new_domain != NULL)
+- _nl_current_default_domain = new_domain;
+- }
+-
+- /* We use this possibility to signal a change of the loaded catalogs
+- since this is most likely the case and there is no other easy we
+- to do it. Do it only when the call was successful. */
+- if (new_domain != NULL)
+- {
+- ++_nl_msg_cat_cntr;
+-
+- if (old_domain != new_domain && old_domain != _nl_default_default_domain)
+- free (old_domain);
+- }
+-
+- __libc_rwlock_unlock (_nl_state_lock);
+-
+- return new_domain;
+-}
+-
+-#ifdef _LIBC
+-/* Alias for function name in GNU C Library. */
+-weak_alias (__textdomain, textdomain);
+-#endif
+diff -urN BUILD/abook-0.6.0pre2/intl/vasnprintf.c abook/intl/vasnprintf.c
+--- BUILD/abook-0.6.0pre2/intl/vasnprintf.c 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/vasnprintf.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,902 +0,0 @@
+-/* vsprintf with automatic memory allocation.
+- Copyright (C) 1999, 2002-2005 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+- This must come before <config.h> because <config.h> may include
+- <features.h>, and once <features.h> has been included, it's too late. */
+-#ifndef _GNU_SOURCE
+-# define _GNU_SOURCE 1
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-#ifndef IN_LIBINTL
+-# include <alloca.h>
+-#endif
+-
+-/* Specification. */
+-#if WIDE_CHAR_VERSION
+-# include "vasnwprintf.h"
+-#else
+-# include "vasnprintf.h"
+-#endif
+-
+-#include <stdio.h> /* snprintf(), sprintf() */
+-#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
+-#include <string.h> /* memcpy(), strlen() */
+-#include <errno.h> /* errno */
+-#include <limits.h> /* CHAR_BIT, INT_MAX */
+-#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
+-#if WIDE_CHAR_VERSION
+-# include "wprintf-parse.h"
+-#else
+-# include "printf-parse.h"
+-#endif
+-
+-/* Checked size_t computations. */
+-#include "xsize.h"
+-
+-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
+-#ifndef EOVERFLOW
+-# define EOVERFLOW E2BIG
+-#endif
+-
+-#ifdef HAVE_WCHAR_T
+-# ifdef HAVE_WCSLEN
+-# define local_wcslen wcslen
+-# else
+- /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+- a dependency towards this library, here is a local substitute.
+- Define this substitute only once, even if this file is included
+- twice in the same compilation unit. */
+-# ifndef local_wcslen_defined
+-# define local_wcslen_defined 1
+-static size_t
+-local_wcslen (const wchar_t *s)
+-{
+- const wchar_t *ptr;
+-
+- for (ptr = s; *ptr != (wchar_t) 0; ptr++)
+- ;
+- return ptr - s;
+-}
+-# endif
+-# endif
+-#endif
+-
+-#if WIDE_CHAR_VERSION
+-# define VASNPRINTF vasnwprintf
+-# define CHAR_T wchar_t
+-# define DIRECTIVE wchar_t_directive
+-# define DIRECTIVES wchar_t_directives
+-# define PRINTF_PARSE wprintf_parse
+-# define USE_SNPRINTF 1
+-# if HAVE_DECL__SNWPRINTF
+- /* On Windows, the function swprintf() has a different signature than
+- on Unix; we use the _snwprintf() function instead. */
+-# define SNPRINTF _snwprintf
+-# else
+- /* Unix. */
+-# define SNPRINTF swprintf
+-# endif
+-#else
+-# define VASNPRINTF vasnprintf
+-# define CHAR_T char
+-# define DIRECTIVE char_directive
+-# define DIRECTIVES char_directives
+-# define PRINTF_PARSE printf_parse
+-# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
+-# if HAVE_DECL__SNPRINTF
+- /* Windows. */
+-# define SNPRINTF _snprintf
+-# else
+- /* Unix. */
+-# define SNPRINTF snprintf
+-# endif
+-#endif
+-
+-CHAR_T *
+-VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
+-{
+- DIRECTIVES d;
+- arguments a;
+-
+- if (PRINTF_PARSE (format, &d, &a) < 0)
+- {
+- errno = EINVAL;
+- return NULL;
+- }
+-
+-#define CLEANUP() \
+- free (d.dir); \
+- if (a.arg) \
+- free (a.arg);
+-
+- if (printf_fetchargs (args, &a) < 0)
+- {
+- CLEANUP ();
+- errno = EINVAL;
+- return NULL;
+- }
+-
+- {
+- size_t buf_neededlength;
+- CHAR_T *buf;
+- CHAR_T *buf_malloced;
+- const CHAR_T *cp;
+- size_t i;
+- DIRECTIVE *dp;
+- /* Output string accumulator. */
+- CHAR_T *result;
+- size_t allocated;
+- size_t length;
+-
+- /* Allocate a small buffer that will hold a directive passed to
+- sprintf or snprintf. */
+- buf_neededlength =
+- xsum4 (7, d.max_width_length, d.max_precision_length, 6);
+-#if HAVE_ALLOCA
+- if (buf_neededlength < 4000 / sizeof (CHAR_T))
+- {
+- buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
+- buf_malloced = NULL;
+- }
+- else
+-#endif
+- {
+- size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
+- if (size_overflow_p (buf_memsize))
+- goto out_of_memory_1;
+- buf = (CHAR_T *) malloc (buf_memsize);
+- if (buf == NULL)
+- goto out_of_memory_1;
+- buf_malloced = buf;
+- }
+-
+- if (resultbuf != NULL)
+- {
+- result = resultbuf;
+- allocated = *lengthp;
+- }
+- else
+- {
+- result = NULL;
+- allocated = 0;
+- }
+- length = 0;
+- /* Invariants:
+- result is either == resultbuf or == NULL or malloc-allocated.
+- If length > 0, then result != NULL. */
+-
+- /* Ensures that allocated >= needed. Aborts through a jump to
+- out_of_memory if needed is SIZE_MAX or otherwise too big. */
+-#define ENSURE_ALLOCATION(needed) \
+- if ((needed) > allocated) \
+- { \
+- size_t memory_size; \
+- CHAR_T *memory; \
+- \
+- allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \
+- if ((needed) > allocated) \
+- allocated = (needed); \
+- memory_size = xtimes (allocated, sizeof (CHAR_T)); \
+- if (size_overflow_p (memory_size)) \
+- goto out_of_memory; \
+- if (result == resultbuf || result == NULL) \
+- memory = (CHAR_T *) malloc (memory_size); \
+- else \
+- memory = (CHAR_T *) realloc (result, memory_size); \
+- if (memory == NULL) \
+- goto out_of_memory; \
+- if (result == resultbuf && length > 0) \
+- memcpy (memory, result, length * sizeof (CHAR_T)); \
+- result = memory; \
+- }
+-
+- for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
+- {
+- if (cp != dp->dir_start)
+- {
+- size_t n = dp->dir_start - cp;
+- size_t augmented_length = xsum (length, n);
+-
+- ENSURE_ALLOCATION (augmented_length);
+- memcpy (result + length, cp, n * sizeof (CHAR_T));
+- length = augmented_length;
+- }
+- if (i == d.count)
+- break;
+-
+- /* Execute a single directive. */
+- if (dp->conversion == '%')
+- {
+- size_t augmented_length;
+-
+- if (!(dp->arg_index == ARG_NONE))
+- abort ();
+- augmented_length = xsum (length, 1);
+- ENSURE_ALLOCATION (augmented_length);
+- result[length] = '%';
+- length = augmented_length;
+- }
+- else
+- {
+- if (!(dp->arg_index != ARG_NONE))
+- abort ();
+-
+- if (dp->conversion == 'n')
+- {
+- switch (a.arg[dp->arg_index].type)
+- {
+- case TYPE_COUNT_SCHAR_POINTER:
+- *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
+- break;
+- case TYPE_COUNT_SHORT_POINTER:
+- *a.arg[dp->arg_index].a.a_count_short_pointer = length;
+- break;
+- case TYPE_COUNT_INT_POINTER:
+- *a.arg[dp->arg_index].a.a_count_int_pointer = length;
+- break;
+- case TYPE_COUNT_LONGINT_POINTER:
+- *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
+- break;
+-#ifdef HAVE_LONG_LONG
+- case TYPE_COUNT_LONGLONGINT_POINTER:
+- *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
+- break;
+-#endif
+- default:
+- abort ();
+- }
+- }
+- else
+- {
+- arg_type type = a.arg[dp->arg_index].type;
+- CHAR_T *p;
+- unsigned int prefix_count;
+- int prefixes[2];
+-#if !USE_SNPRINTF
+- size_t tmp_length;
+- CHAR_T tmpbuf[700];
+- CHAR_T *tmp;
+-
+- /* Allocate a temporary buffer of sufficient size for calling
+- sprintf. */
+- {
+- size_t width;
+- size_t precision;
+-
+- width = 0;
+- if (dp->width_start != dp->width_end)
+- {
+- if (dp->width_arg_index != ARG_NONE)
+- {
+- int arg;
+-
+- if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+- abort ();
+- arg = a.arg[dp->width_arg_index].a.a_int;
+- width = (arg < 0 ? (unsigned int) (-arg) : arg);
+- }
+- else
+- {
+- const CHAR_T *digitp = dp->width_start;
+-
+- do
+- width = xsum (xtimes (width, 10), *digitp++ - '0');
+- while (digitp != dp->width_end);
+- }
+- }
+-
+- precision = 6;
+- if (dp->precision_start != dp->precision_end)
+- {
+- if (dp->precision_arg_index != ARG_NONE)
+- {
+- int arg;
+-
+- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+- abort ();
+- arg = a.arg[dp->precision_arg_index].a.a_int;
+- precision = (arg < 0 ? 0 : arg);
+- }
+- else
+- {
+- const CHAR_T *digitp = dp->precision_start + 1;
+-
+- precision = 0;
+- while (digitp != dp->precision_end)
+- precision = xsum (xtimes (precision, 10), *digitp++ - '0');
+- }
+- }
+-
+- switch (dp->conversion)
+- {
+-
+- case 'd': case 'i': case 'u':
+-# ifdef HAVE_LONG_LONG
+- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+- tmp_length =
+- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+- * 0.30103 /* binary -> decimal */
+- * 2 /* estimate for FLAG_GROUP */
+- )
+- + 1 /* turn floor into ceil */
+- + 1; /* account for leading sign */
+- else
+-# endif
+- if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+- tmp_length =
+- (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+- * 0.30103 /* binary -> decimal */
+- * 2 /* estimate for FLAG_GROUP */
+- )
+- + 1 /* turn floor into ceil */
+- + 1; /* account for leading sign */
+- else
+- tmp_length =
+- (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+- * 0.30103 /* binary -> decimal */
+- * 2 /* estimate for FLAG_GROUP */
+- )
+- + 1 /* turn floor into ceil */
+- + 1; /* account for leading sign */
+- break;
+-
+- case 'o':
+-# ifdef HAVE_LONG_LONG
+- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+- tmp_length =
+- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+- * 0.333334 /* binary -> octal */
+- )
+- + 1 /* turn floor into ceil */
+- + 1; /* account for leading sign */
+- else
+-# endif
+- if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+- tmp_length =
+- (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+- * 0.333334 /* binary -> octal */
+- )
+- + 1 /* turn floor into ceil */
+- + 1; /* account for leading sign */
+- else
+- tmp_length =
+- (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+- * 0.333334 /* binary -> octal */
+- )
+- + 1 /* turn floor into ceil */
+- + 1; /* account for leading sign */
+- break;
+-
+- case 'x': case 'X':
+-# ifdef HAVE_LONG_LONG
+- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+- tmp_length =
+- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+- * 0.25 /* binary -> hexadecimal */
+- )
+- + 1 /* turn floor into ceil */
+- + 2; /* account for leading sign or alternate form */
+- else
+-# endif
+- if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+- tmp_length =
+- (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+- * 0.25 /* binary -> hexadecimal */
+- )
+- + 1 /* turn floor into ceil */
+- + 2; /* account for leading sign or alternate form */
+- else
+- tmp_length =
+- (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+- * 0.25 /* binary -> hexadecimal */
+- )
+- + 1 /* turn floor into ceil */
+- + 2; /* account for leading sign or alternate form */
+- break;
+-
+- case 'f': case 'F':
+-# ifdef HAVE_LONG_DOUBLE
+- if (type == TYPE_LONGDOUBLE)
+- tmp_length =
+- (unsigned int) (LDBL_MAX_EXP
+- * 0.30103 /* binary -> decimal */
+- * 2 /* estimate for FLAG_GROUP */
+- )
+- + 1 /* turn floor into ceil */
+- + 10; /* sign, decimal point etc. */
+- else
+-# endif
+- tmp_length =
+- (unsigned int) (DBL_MAX_EXP
+- * 0.30103 /* binary -> decimal */
+- * 2 /* estimate for FLAG_GROUP */
+- )
+- + 1 /* turn floor into ceil */
+- + 10; /* sign, decimal point etc. */
+- tmp_length = xsum (tmp_length, precision);
+- break;
+-
+- case 'e': case 'E': case 'g': case 'G':
+- case 'a': case 'A':
+- tmp_length =
+- 12; /* sign, decimal point, exponent etc. */
+- tmp_length = xsum (tmp_length, precision);
+- break;
+-
+- case 'c':
+-# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
+- if (type == TYPE_WIDE_CHAR)
+- tmp_length = MB_CUR_MAX;
+- else
+-# endif
+- tmp_length = 1;
+- break;
+-
+- case 's':
+-# ifdef HAVE_WCHAR_T
+- if (type == TYPE_WIDE_STRING)
+- {
+- tmp_length =
+- local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
+-
+-# if !WIDE_CHAR_VERSION
+- tmp_length = xtimes (tmp_length, MB_CUR_MAX);
+-# endif
+- }
+- else
+-# endif
+- tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
+- break;
+-
+- case 'p':
+- tmp_length =
+- (unsigned int) (sizeof (void *) * CHAR_BIT
+- * 0.25 /* binary -> hexadecimal */
+- )
+- + 1 /* turn floor into ceil */
+- + 2; /* account for leading 0x */
+- break;
+-
+- default:
+- abort ();
+- }
+-
+- if (tmp_length < width)
+- tmp_length = width;
+-
+- tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
+- }
+-
+- if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
+- tmp = tmpbuf;
+- else
+- {
+- size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
+-
+- if (size_overflow_p (tmp_memsize))
+- /* Overflow, would lead to out of memory. */
+- goto out_of_memory;
+- tmp = (CHAR_T *) malloc (tmp_memsize);
+- if (tmp == NULL)
+- /* Out of memory. */
+- goto out_of_memory;
+- }
+-#endif
+-
+- /* Construct the format string for calling snprintf or
+- sprintf. */
+- p = buf;
+- *p++ = '%';
+- if (dp->flags & FLAG_GROUP)
+- *p++ = '\'';
+- if (dp->flags & FLAG_LEFT)
+- *p++ = '-';
+- if (dp->flags & FLAG_SHOWSIGN)
+- *p++ = '+';
+- if (dp->flags & FLAG_SPACE)
+- *p++ = ' ';
+- if (dp->flags & FLAG_ALT)
+- *p++ = '#';
+- if (dp->flags & FLAG_ZERO)
+- *p++ = '0';
+- if (dp->width_start != dp->width_end)
+- {
+- size_t n = dp->width_end - dp->width_start;
+- memcpy (p, dp->width_start, n * sizeof (CHAR_T));
+- p += n;
+- }
+- if (dp->precision_start != dp->precision_end)
+- {
+- size_t n = dp->precision_end - dp->precision_start;
+- memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
+- p += n;
+- }
+-
+- switch (type)
+- {
+-#ifdef HAVE_LONG_LONG
+- case TYPE_LONGLONGINT:
+- case TYPE_ULONGLONGINT:
+- *p++ = 'l';
+- /*FALLTHROUGH*/
+-#endif
+- case TYPE_LONGINT:
+- case TYPE_ULONGINT:
+-#ifdef HAVE_WINT_T
+- case TYPE_WIDE_CHAR:
+-#endif
+-#ifdef HAVE_WCHAR_T
+- case TYPE_WIDE_STRING:
+-#endif
+- *p++ = 'l';
+- break;
+-#ifdef HAVE_LONG_DOUBLE
+- case TYPE_LONGDOUBLE:
+- *p++ = 'L';
+- break;
+-#endif
+- default:
+- break;
+- }
+- *p = dp->conversion;
+-#if USE_SNPRINTF
+- p[1] = '%';
+- p[2] = 'n';
+- p[3] = '\0';
+-#else
+- p[1] = '\0';
+-#endif
+-
+- /* Construct the arguments for calling snprintf or sprintf. */
+- prefix_count = 0;
+- if (dp->width_arg_index != ARG_NONE)
+- {
+- if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+- abort ();
+- prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
+- }
+- if (dp->precision_arg_index != ARG_NONE)
+- {
+- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+- abort ();
+- prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
+- }
+-
+-#if USE_SNPRINTF
+- /* Prepare checking whether snprintf returns the count
+- via %n. */
+- ENSURE_ALLOCATION (xsum (length, 1));
+- result[length] = '\0';
+-#endif
+-
+- for (;;)
+- {
+- size_t maxlen;
+- int count;
+- int retcount;
+-
+- maxlen = allocated - length;
+- count = -1;
+- retcount = 0;
+-
+-#if USE_SNPRINTF
+-# define SNPRINTF_BUF(arg) \
+- switch (prefix_count) \
+- { \
+- case 0: \
+- retcount = SNPRINTF (result + length, maxlen, buf, \
+- arg, &count); \
+- break; \
+- case 1: \
+- retcount = SNPRINTF (result + length, maxlen, buf, \
+- prefixes[0], arg, &count); \
+- break; \
+- case 2: \
+- retcount = SNPRINTF (result + length, maxlen, buf, \
+- prefixes[0], prefixes[1], arg, \
+- &count); \
+- break; \
+- default: \
+- abort (); \
+- }
+-#else
+-# define SNPRINTF_BUF(arg) \
+- switch (prefix_count) \
+- { \
+- case 0: \
+- count = sprintf (tmp, buf, arg); \
+- break; \
+- case 1: \
+- count = sprintf (tmp, buf, prefixes[0], arg); \
+- break; \
+- case 2: \
+- count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
+- arg); \
+- break; \
+- default: \
+- abort (); \
+- }
+-#endif
+-
+- switch (type)
+- {
+- case TYPE_SCHAR:
+- {
+- int arg = a.arg[dp->arg_index].a.a_schar;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_UCHAR:
+- {
+- unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_SHORT:
+- {
+- int arg = a.arg[dp->arg_index].a.a_short;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_USHORT:
+- {
+- unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_INT:
+- {
+- int arg = a.arg[dp->arg_index].a.a_int;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_UINT:
+- {
+- unsigned int arg = a.arg[dp->arg_index].a.a_uint;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_LONGINT:
+- {
+- long int arg = a.arg[dp->arg_index].a.a_longint;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_ULONGINT:
+- {
+- unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#ifdef HAVE_LONG_LONG
+- case TYPE_LONGLONGINT:
+- {
+- long long int arg = a.arg[dp->arg_index].a.a_longlongint;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- case TYPE_ULONGLONGINT:
+- {
+- unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#endif
+- case TYPE_DOUBLE:
+- {
+- double arg = a.arg[dp->arg_index].a.a_double;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#ifdef HAVE_LONG_DOUBLE
+- case TYPE_LONGDOUBLE:
+- {
+- long double arg = a.arg[dp->arg_index].a.a_longdouble;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#endif
+- case TYPE_CHAR:
+- {
+- int arg = a.arg[dp->arg_index].a.a_char;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#ifdef HAVE_WINT_T
+- case TYPE_WIDE_CHAR:
+- {
+- wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#endif
+- case TYPE_STRING:
+- {
+- const char *arg = a.arg[dp->arg_index].a.a_string;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#ifdef HAVE_WCHAR_T
+- case TYPE_WIDE_STRING:
+- {
+- const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+-#endif
+- case TYPE_POINTER:
+- {
+- void *arg = a.arg[dp->arg_index].a.a_pointer;
+- SNPRINTF_BUF (arg);
+- }
+- break;
+- default:
+- abort ();
+- }
+-
+-#if USE_SNPRINTF
+- /* Portability: Not all implementations of snprintf()
+- are ISO C 99 compliant. Determine the number of
+- bytes that snprintf() has produced or would have
+- produced. */
+- if (count >= 0)
+- {
+- /* Verify that snprintf() has NUL-terminated its
+- result. */
+- if (count < maxlen && result[length + count] != '\0')
+- abort ();
+- /* Portability hack. */
+- if (retcount > count)
+- count = retcount;
+- }
+- else
+- {
+- /* snprintf() doesn't understand the '%n'
+- directive. */
+- if (p[1] != '\0')
+- {
+- /* Don't use the '%n' directive; instead, look
+- at the snprintf() return value. */
+- p[1] = '\0';
+- continue;
+- }
+- else
+- {
+- /* Look at the snprintf() return value. */
+- if (retcount < 0)
+- {
+- /* HP-UX 10.20 snprintf() is doubly deficient:
+- It doesn't understand the '%n' directive,
+- *and* it returns -1 (rather than the length
+- that would have been required) when the
+- buffer is too small. */
+- size_t bigger_need =
+- xsum (xtimes (allocated, 2), 12);
+- ENSURE_ALLOCATION (bigger_need);
+- continue;
+- }
+- else
+- count = retcount;
+- }
+- }
+-#endif
+-
+- /* Attempt to handle failure. */
+- if (count < 0)
+- {
+- if (!(result == resultbuf || result == NULL))
+- free (result);
+- if (buf_malloced != NULL)
+- free (buf_malloced);
+- CLEANUP ();
+- errno = EINVAL;
+- return NULL;
+- }
+-
+-#if !USE_SNPRINTF
+- if (count >= tmp_length)
+- /* tmp_length was incorrectly calculated - fix the
+- code above! */
+- abort ();
+-#endif
+-
+- /* Make room for the result. */
+- if (count >= maxlen)
+- {
+- /* Need at least count bytes. But allocate
+- proportionally, to avoid looping eternally if
+- snprintf() reports a too small count. */
+- size_t n =
+- xmax (xsum (length, count), xtimes (allocated, 2));
+-
+- ENSURE_ALLOCATION (n);
+-#if USE_SNPRINTF
+- continue;
+-#endif
+- }
+-
+-#if USE_SNPRINTF
+- /* The snprintf() result did fit. */
+-#else
+- /* Append the sprintf() result. */
+- memcpy (result + length, tmp, count * sizeof (CHAR_T));
+- if (tmp != tmpbuf)
+- free (tmp);
+-#endif
+-
+- length += count;
+- break;
+- }
+- }
+- }
+- }
+-
+- /* Add the final NUL. */
+- ENSURE_ALLOCATION (xsum (length, 1));
+- result[length] = '\0';
+-
+- if (result != resultbuf && length + 1 < allocated)
+- {
+- /* Shrink the allocated memory if possible. */
+- CHAR_T *memory;
+-
+- memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
+- if (memory != NULL)
+- result = memory;
+- }
+-
+- if (buf_malloced != NULL)
+- free (buf_malloced);
+- CLEANUP ();
+- *lengthp = length;
+- if (length > INT_MAX)
+- goto length_overflow;
+- return result;
+-
+- length_overflow:
+- /* We could produce such a big string, but its length doesn't fit into
+- an 'int'. POSIX says that snprintf() fails with errno = EOVERFLOW in
+- this case. */
+- if (result != resultbuf)
+- free (result);
+- errno = EOVERFLOW;
+- return NULL;
+-
+- out_of_memory:
+- if (!(result == resultbuf || result == NULL))
+- free (result);
+- if (buf_malloced != NULL)
+- free (buf_malloced);
+- out_of_memory_1:
+- CLEANUP ();
+- errno = ENOMEM;
+- return NULL;
+- }
+-}
+-
+-#undef SNPRINTF
+-#undef USE_SNPRINTF
+-#undef PRINTF_PARSE
+-#undef DIRECTIVES
+-#undef DIRECTIVE
+-#undef CHAR_T
+-#undef VASNPRINTF
+diff -urN BUILD/abook-0.6.0pre2/intl/vasnprintf.h abook/intl/vasnprintf.h
+--- BUILD/abook-0.6.0pre2/intl/vasnprintf.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/vasnprintf.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,78 +0,0 @@
+-/* vsprintf with automatic memory allocation.
+- Copyright (C) 2002-2004 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _VASNPRINTF_H
+-#define _VASNPRINTF_H
+-
+-/* Get va_list. */
+-#include <stdarg.h>
+-
+-/* Get size_t. */
+-#include <stddef.h>
+-
+-#ifndef __attribute__
+-/* This feature is available in gcc versions 2.5 and later. */
+-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+-# define __attribute__(Spec) /* empty */
+-# endif
+-/* The __-protected variants of `format' and `printf' attributes
+- are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
+-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+-# define __format__ format
+-# define __printf__ printf
+-# endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/* Write formatted output to a string dynamically allocated with malloc().
+- You can pass a preallocated buffer for the result in RESULTBUF and its
+- size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
+- If successful, return the address of the string (this may be = RESULTBUF
+- if no dynamic memory allocation was necessary) and set *LENGTHP to the
+- number of resulting bytes, excluding the trailing NUL. Upon error, set
+- errno and return NULL.
+-
+- When dynamic memory allocation occurs, the preallocated buffer is left
+- alone (with possibly modified contents). This makes it possible to use
+- a statically allocated or stack-allocated buffer, like this:
+-
+- char buf[100];
+- size_t len = sizeof (buf);
+- char *output = vasnprintf (buf, &len, format, args);
+- if (output == NULL)
+- ... error handling ...;
+- else
+- {
+- ... use the output string ...;
+- if (output != buf)
+- free (output);
+- }
+- */
+-extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
+- __attribute__ ((__format__ (__printf__, 3, 4)));
+-extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
+- __attribute__ ((__format__ (__printf__, 3, 0)));
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _VASNPRINTF_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/vasnwprintf.h abook/intl/vasnwprintf.h
+--- BUILD/abook-0.6.0pre2/intl/vasnwprintf.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/vasnwprintf.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,46 +0,0 @@
+-/* vswprintf with automatic memory allocation.
+- Copyright (C) 2002-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _VASNWPRINTF_H
+-#define _VASNWPRINTF_H
+-
+-/* Get va_list. */
+-#include <stdarg.h>
+-
+-/* Get wchar_t, size_t. */
+-#include <stddef.h>
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/* Write formatted output to a string dynamically allocated with malloc().
+- You can pass a preallocated buffer for the result in RESULTBUF and its
+- size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
+- If successful, return the address of the string (this may be = RESULTBUF
+- if no dynamic memory allocation was necessary) and set *LENGTHP to the
+- number of resulting bytes, excluding the trailing NUL. Upon error, set
+- errno and return NULL. */
+-extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
+-extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _VASNWPRINTF_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/VERSION abook/intl/VERSION
+--- BUILD/abook-0.6.0pre2/intl/VERSION 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/VERSION 1970-01-01 01:00:00.000000000 +0100
+@@ -1 +0,0 @@
+-GNU gettext library from gettext-0.14.4
+diff -urN BUILD/abook-0.6.0pre2/intl/wprintf-parse.h abook/intl/wprintf-parse.h
+--- BUILD/abook-0.6.0pre2/intl/wprintf-parse.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/wprintf-parse.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,75 +0,0 @@
+-/* Parse printf format string.
+- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _WPRINTF_PARSE_H
+-#define _WPRINTF_PARSE_H
+-
+-#include "printf-args.h"
+-
+-
+-/* Flags */
+-#define FLAG_GROUP 1 /* ' flag */
+-#define FLAG_LEFT 2 /* - flag */
+-#define FLAG_SHOWSIGN 4 /* + flag */
+-#define FLAG_SPACE 8 /* space flag */
+-#define FLAG_ALT 16 /* # flag */
+-#define FLAG_ZERO 32
+-
+-/* arg_index value indicating that no argument is consumed. */
+-#define ARG_NONE (~(size_t)0)
+-
+-/* A parsed directive. */
+-typedef struct
+-{
+- const wchar_t* dir_start;
+- const wchar_t* dir_end;
+- int flags;
+- const wchar_t* width_start;
+- const wchar_t* width_end;
+- size_t width_arg_index;
+- const wchar_t* precision_start;
+- const wchar_t* precision_end;
+- size_t precision_arg_index;
+- wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
+- size_t arg_index;
+-}
+-wchar_t_directive;
+-
+-/* A parsed format string. */
+-typedef struct
+-{
+- size_t count;
+- wchar_t_directive *dir;
+- size_t max_width_length;
+- size_t max_precision_length;
+-}
+-wchar_t_directives;
+-
+-
+-/* Parses the format string. Fills in the number N of directives, and fills
+- in directives[0], ..., directives[N-1], and sets directives[N].dir_start
+- to the end of the format string. Also fills in the arg_type fields of the
+- arguments and the needed count of arguments. */
+-#ifdef STATIC
+-STATIC
+-#else
+-extern
+-#endif
+-int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
+-
+-#endif /* _WPRINTF_PARSE_H */
+diff -urN BUILD/abook-0.6.0pre2/intl/xsize.h abook/intl/xsize.h
+--- BUILD/abook-0.6.0pre2/intl/xsize.h 2005-09-17 12:10:26.000000000 +0200
++++ abook/intl/xsize.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,109 +0,0 @@
+-/* xsize.h -- Checked size_t computations.
+-
+- Copyright (C) 2003 Free Software Foundation, Inc.
+-
+- This program is free software; you can redistribute it and/or modify it
+- under the terms of the GNU Library General Public License as published
+- by the Free Software Foundation; either version 2, or (at your option)
+- any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public
+- License along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+- USA. */
+-
+-#ifndef _XSIZE_H
+-#define _XSIZE_H
+-
+-/* Get size_t. */
+-#include <stddef.h>
+-
+-/* Get SIZE_MAX. */
+-#include <limits.h>
+-#if HAVE_STDINT_H
+-# include <stdint.h>
+-#endif
+-
+-/* The size of memory objects is often computed through expressions of
+- type size_t. Example:
+- void* p = malloc (header_size + n * element_size).
+- These computations can lead to overflow. When this happens, malloc()
+- returns a piece of memory that is way too small, and the program then
+- crashes while attempting to fill the memory.
+- To avoid this, the functions and macros in this file check for overflow.
+- The convention is that SIZE_MAX represents overflow.
+- malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
+- implementation that uses mmap --, it's recommended to use size_overflow_p()
+- or size_in_bounds_p() before invoking malloc().
+- The example thus becomes:
+- size_t size = xsum (header_size, xtimes (n, element_size));
+- void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
+-*/
+-
+-/* Convert an arbitrary value >= 0 to type size_t. */
+-#define xcast_size_t(N) \
+- ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
+-
+-/* Sum of two sizes, with overflow check. */
+-static inline size_t
+-#if __GNUC__ >= 3
+-__attribute__ ((__pure__))
+-#endif
+-xsum (size_t size1, size_t size2)
+-{
+- size_t sum = size1 + size2;
+- return (sum >= size1 ? sum : SIZE_MAX);
+-}
+-
+-/* Sum of three sizes, with overflow check. */
+-static inline size_t
+-#if __GNUC__ >= 3
+-__attribute__ ((__pure__))
+-#endif
+-xsum3 (size_t size1, size_t size2, size_t size3)
+-{
+- return xsum (xsum (size1, size2), size3);
+-}
+-
+-/* Sum of four sizes, with overflow check. */
+-static inline size_t
+-#if __GNUC__ >= 3
+-__attribute__ ((__pure__))
+-#endif
+-xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
+-{
+- return xsum (xsum (xsum (size1, size2), size3), size4);
+-}
+-
+-/* Maximum of two sizes, with overflow check. */
+-static inline size_t
+-#if __GNUC__ >= 3
+-__attribute__ ((__pure__))
+-#endif
+-xmax (size_t size1, size_t size2)
+-{
+- /* No explicit check is needed here, because for any n:
+- max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
+- return (size1 >= size2 ? size1 : size2);
+-}
+-
+-/* Multiplication of a count with an element size, with overflow check.
+- The count must be >= 0 and the element size must be > 0.
+- This is a macro, not an inline function, so that it works correctly even
+- when N is of a wider tupe and N > SIZE_MAX. */
+-#define xtimes(N, ELSIZE) \
+- ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
+-
+-/* Check for overflow. */
+-#define size_overflow_p(SIZE) \
+- ((SIZE) == SIZE_MAX)
+-/* Check against overflow. */
+-#define size_in_bounds_p(SIZE) \
+- ((SIZE) != SIZE_MAX)
+-
+-#endif /* _XSIZE_H */
+diff -urN BUILD/abook-0.6.0pre2/ldif.c abook/ldif.c
+--- BUILD/abook-0.6.0pre2/ldif.c 2005-07-29 08:28:55.000000000 +0200
++++ abook/ldif.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: ldif.c,v 1.5 2005/07/29 06:28:55 jheinonen Exp $
++ * $Id$
+ * adapted to use with abook by JH <jheinonen@users.sourceforge.net>
+ */
+
+diff -urN BUILD/abook-0.6.0pre2/list.c abook/list.c
+--- BUILD/abook-0.6.0pre2/list.c 2006-09-05 10:21:35.000000000 +0200
++++ abook/list.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: list.c,v 1.33 2006/09/05 08:21:35 jheinonen Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -19,6 +19,7 @@
+ #include "misc.h"
+ #include "options.h"
+ #include "xmalloc.h"
++#include "color.h"
+
+
+ int curitem = -1;
+@@ -180,7 +181,7 @@
+ width = len ? bytes2width(s, len) : strwidth(s);
+ x_start = *x_pos + ((e->d.field.len < 0) ? len - width : 0);
+ if(width + x_start >= COLS)
+- width = COLS - x_start;
++ width = bytes2width(s, COLS - x_start);
+
+ if(width)
+ mvwaddnstr(list, line, x_start, s, width);
+@@ -194,7 +195,10 @@
+ static void
+ highlight_line(WINDOW *win, int line)
+ {
+- wstandout(win);
++ wattrset(win, COLOR_PAIR(CP_LIST_HIGHLIGHT));
++ if(!opt_get_bool(BOOL_USE_COLORS)) {
++ wstandout(win);
++ }
+
+ /*
+ * this is a tricky one
+@@ -224,6 +228,10 @@
+ struct index_elem *cur;
+ int x_pos = 1;
+
++ if(item % 2 == 0)
++ wattrset(list, COLOR_PAIR(CP_LIST_EVEN));
++ else
++ wattrset(list, COLOR_PAIR(CP_LIST_ODD));
+ scrollok(list, FALSE);
+ if(highlight)
+ highlight_line(list, line);
+@@ -300,13 +308,18 @@
+ #if defined(A_BOLD) && defined(A_NORMAL)
+ attrset(A_BOLD);
+ #endif
++ attrset(COLOR_PAIR(CP_LIST_HEADER));
++ mvhline(2, 0, ' ', COLS);
+
+ for(e = index_elements; e; e = e->next)
+ if(e->type == INDEX_TEXT)
+ x_pos += strwidth(e->d.text);
+ else if(e->type == INDEX_FIELD) {
+ get_field_info(e->d.field.id, NULL, &str, NULL);
+- width = e->d.field.len ? abs(e->d.field.len) : strwidth(str);
++ width = e->d.field.len ?
++ abs(e->d.field.len) : strwidth(str);
++ if(width + x_pos > COLS)
++ width = bytes2width(str, COLS - x_pos);
+ mvaddnstr(2, x_pos, str, width);
+ x_pos += width;
+ } else
+@@ -485,6 +498,12 @@
+ return curitem;
+ }
+
++int
++list_get_firstitem()
++{
++ return first_list_item;
++}
++
+ void
+ list_set_curitem(int i)
+ {
+diff -urN BUILD/abook-0.6.0pre2/list.h abook/list.h
+--- BUILD/abook-0.6.0pre2/list.h 2006-09-05 10:13:33.000000000 +0200
++++ abook/list.h 2013-03-13 15:07:45.000000000 +0100
+@@ -47,6 +47,7 @@
+ void invert_selection();
+ int list_is_empty();
+ int list_get_curitem();
++int list_get_firstitem();
+ void list_set_curitem(int i);
+ int duplicate_item();
+
+diff -urN BUILD/abook-0.6.0pre2/m4/codeset.m4 abook/m4/codeset.m4
+--- BUILD/abook-0.6.0pre2/m4/codeset.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/codeset.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# codeset.m4 serial AM1 (gettext-0.10.40)
+-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
++# codeset.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -8,14 +8,14 @@
+
+ AC_DEFUN([AM_LANGINFO_CODESET],
+ [
+- AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
++ AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+ [AC_TRY_LINK([#include <langinfo.h>],
+- [char* cs = nl_langinfo(CODESET);],
+- am_cv_langinfo_codeset=yes,
+- am_cv_langinfo_codeset=no)
++ [char* cs = nl_langinfo(CODESET); return !cs;],
++ [am_cv_langinfo_codeset=yes],
++ [am_cv_langinfo_codeset=no])
+ ])
+ if test $am_cv_langinfo_codeset = yes; then
+- AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
++ AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/fcntl-o.m4 abook/m4/fcntl-o.m4
+--- BUILD/abook-0.6.0pre2/m4/fcntl-o.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/fcntl-o.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,81 @@
++# fcntl-o.m4 serial 1
++dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl Written by Paul Eggert.
++
++# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
++# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
++# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
++AC_DEFUN([gl_FCNTL_O_FLAGS],
++[
++ dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
++ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
++ AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
++ [AC_RUN_IFELSE(
++ [AC_LANG_PROGRAM(
++ [[#include <sys/types.h>
++ #include <sys/stat.h>
++ #include <unistd.h>
++ #include <fcntl.h>
++ #ifndef O_NOATIME
++ #define O_NOATIME 0
++ #endif
++ #ifndef O_NOFOLLOW
++ #define O_NOFOLLOW 0
++ #endif
++ static int const constants[] =
++ {
++ O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
++ O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
++ };
++ ]],
++ [[
++ int status = !constants;
++ {
++ static char const sym[] = "conftest.sym";
++ if (symlink (".", sym) != 0
++ || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
++ status |= 32;
++ unlink (sym);
++ }
++ {
++ static char const file[] = "confdefs.h";
++ int fd = open (file, O_RDONLY | O_NOATIME);
++ char c;
++ struct stat st0, st1;
++ if (fd < 0
++ || fstat (fd, &st0) != 0
++ || sleep (1) != 0
++ || read (fd, &c, 1) != 1
++ || close (fd) != 0
++ || stat (file, &st1) != 0
++ || st0.st_atime != st1.st_atime)
++ status |= 64;
++ }
++ return status;]])],
++ [gl_cv_header_working_fcntl_h=yes],
++ [case $? in #(
++ 32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
++ 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
++ 96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
++ *) gl_cv_header_working_fcntl_h='no';;
++ esac],
++ [gl_cv_header_working_fcntl_h=cross-compiling])])
++
++ case $gl_cv_header_working_fcntl_h in #(
++ *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
++ *) ac_val=1;;
++ esac
++ AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
++ [Define to 1 if O_NOATIME works.])
++
++ case $gl_cv_header_working_fcntl_h in #(
++ *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
++ *) ac_val=1;;
++ esac
++ AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
++ [Define to 1 if O_NOFOLLOW works.])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/gettext.m4 abook/m4/gettext.m4
+--- BUILD/abook-0.6.0pre2/m4/gettext.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/gettext.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# gettext.m4 serial 37 (gettext-0.14.4)
+-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
++# gettext.m4 serial 63 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -15,7 +15,7 @@
+
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+ dnl Macro to add for using GNU gettext.
+
+@@ -60,11 +60,18 @@
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+ ])])])])])
++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+ ])])])])
+- define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
++ define([gt_included_intl],
++ ifelse([$1], [external],
++ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
++ [yes]))
+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
++ gt_NEEDS_INIT
++ AM_GNU_GETTEXT_NEED([$2])
+
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
+ ifelse(gt_included_intl, yes, [
+@@ -78,7 +85,7 @@
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ dnl Ideally we would do this search only after the
+ dnl if test "$USE_NLS" = "yes"; then
+- dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
++ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl the configure script would need to contain the same shell code
+ dnl again, outside any 'if'. There are two solutions:
+@@ -94,7 +101,7 @@
+ gt_INTL_MACOSX
+
+ dnl Set USE_NLS.
+- AM_NLS
++ AC_REQUIRE([AM_NLS])
+
+ ifelse(gt_included_intl, yes, [
+ BUILD_INCLUDED_LIBINTL=no
+@@ -104,16 +111,25 @@
+ LTLIBINTL=
+ POSUB=
+
++ dnl Add a version number to the cache macros.
++ case " $gt_needs " in
++ *" need-formatstring-macros "*) gt_api_version=3 ;;
++ *" need-ngettext "*) gt_api_version=2 ;;
++ *) gt_api_version=1 ;;
++ esac
++ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
++ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
++
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+- AC_ARG_WITH(included-gettext,
++ AC_ARG_WITH([included-gettext],
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+@@ -122,28 +138,35 @@
+ dnl to use. If GNU gettext is available we use this. Else we have
+ dnl to fall back to GNU NLS library.
+
+- dnl Add a version number to the cache macros.
+- define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+- define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+- define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+-
+- AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+- [AC_TRY_LINK([#include <libintl.h>
+-]ifelse([$2], [need-formatstring-macros],
+-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
++ if test $gt_api_version -ge 3; then
++ gt_revision_test_code='
++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+ #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+ #endif
+ changequote(,)dnl
+ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+ changequote([,])dnl
+-], [])[extern int _nl_msg_cat_cntr;
++'
++ else
++ gt_revision_test_code=
++ fi
++ if test $gt_api_version -ge 2; then
++ gt_expression_test_code=' + * ngettext ("", "", 0)'
++ else
++ gt_expression_test_code=
++ fi
++
++ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
++ [AC_TRY_LINK([#include <libintl.h>
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
+ extern int *_nl_domain_bindings;],
+ [bindtextdomain ("", "");
+-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+- gt_cv_func_gnugettext_libc=yes,
+- gt_cv_func_gnugettext_libc=no)])
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
++ [eval "$gt_func_gnugettext_libc=yes"],
++ [eval "$gt_func_gnugettext_libc=no"])])
+
+- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ ifelse(gt_included_intl, yes, , [
+ AM_ICONV_LINK
+@@ -154,52 +177,40 @@
+ dnl even if libiconv doesn't exist.
+ AC_LIB_LINKFLAGS_BODY([intl])
+ AC_CACHE_CHECK([for GNU gettext in libintl],
+- gt_cv_func_gnugettext_libintl,
++ [$gt_func_gnugettext_libintl],
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ dnl Now see whether libintl exists and does not depend on libiconv.
+ AC_TRY_LINK([#include <libintl.h>
+-]ifelse([$2], [need-formatstring-macros],
+-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+-#endif
+-changequote(,)dnl
+-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+-changequote([,])dnl
+-], [])[extern int _nl_msg_cat_cntr;
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
+ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+ const char *_nl_expand_alias (const char *);],
+ [bindtextdomain ("", "");
+-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+- gt_cv_func_gnugettext_libintl=yes,
+- gt_cv_func_gnugettext_libintl=no)
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
++ [eval "$gt_func_gnugettext_libintl=yes"],
++ [eval "$gt_func_gnugettext_libintl=no"])
+ dnl Now see whether libintl exists and depends on libiconv.
+- if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ AC_TRY_LINK([#include <libintl.h>
+-]ifelse([$2], [need-formatstring-macros],
+-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+-#endif
+-changequote(,)dnl
+-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+-changequote([,])dnl
+-], [])[extern int _nl_msg_cat_cntr;
++$gt_revision_test_code
++extern int _nl_msg_cat_cntr;
+ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+ const char *_nl_expand_alias (const char *);],
+ [bindtextdomain ("", "");
+-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+ [LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+- gt_cv_func_gnugettext_libintl=yes
++ eval "$gt_func_gnugettext_libintl=yes"
+ ])
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+@@ -210,8 +221,8 @@
+ dnl use it. But if this macro is used in GNU gettext, and GNU
+ dnl gettext is already preinstalled in libintl, we update this
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
+- if test "$gt_cv_func_gnugettext_libc" = "yes" \
+- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
++ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
++ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+@@ -234,8 +245,8 @@
+ dnl Mark actions used to generate GNU NLS library.
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
++ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
++ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ fi
+
+@@ -258,7 +269,7 @@
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- AC_DEFINE(ENABLE_NLS, 1,
++ AC_DEFINE([ENABLE_NLS], [1],
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+@@ -271,7 +282,7 @@
+ if test "$USE_NLS" = "yes"; then
+ AC_MSG_CHECKING([where the gettext function comes from])
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+@@ -285,16 +296,16 @@
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
++ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ AC_MSG_CHECKING([how to link with libintl])
+ AC_MSG_RESULT([$LIBINTL])
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+- AC_DEFINE(HAVE_GETTEXT, 1,
++ AC_DEFINE([HAVE_GETTEXT], [1],
+ [Define if the GNU gettext() function is already present or preinstalled.])
+- AC_DEFINE(HAVE_DCGETTEXT, 1,
++ AC_DEFINE([HAVE_DCGETTEXT], [1],
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
+ fi
+
+@@ -310,9 +321,9 @@
+ fi
+
+ dnl Make all variables we use known to autoconf.
+- AC_SUBST(BUILD_INCLUDED_LIBINTL)
+- AC_SUBST(USE_INCLUDED_LIBINTL)
+- AC_SUBST(CATOBJEXT)
++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
++ AC_SUBST([USE_INCLUDED_LIBINTL])
++ AC_SUBST([CATOBJEXT])
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+@@ -320,228 +331,51 @@
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+- AC_SUBST(DATADIRNAME)
++ AC_SUBST([DATADIRNAME])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+- AC_SUBST(INSTOBJEXT)
++ AC_SUBST([INSTOBJEXT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+- AC_SUBST(GENCAT)
++ AC_SUBST([GENCAT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+- AC_SUBST(INTLOBJS)
++ AC_SUBST([INTLOBJS])
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+- AC_SUBST(INTLLIBS)
++ AC_SUBST([INTLLIBS])
+
+ dnl Make all documented variables known to autoconf.
+- AC_SUBST(LIBINTL)
+- AC_SUBST(LTLIBINTL)
+- AC_SUBST(POSUB)
+-])
+-
+-
+-dnl Checks for all prerequisites of the intl subdirectory,
+-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+-dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+-AC_DEFUN([AM_INTL_SUBDIR],
+-[
+- AC_REQUIRE([AC_PROG_INSTALL])dnl
+- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+- AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_CANONICAL_HOST])dnl
+- AC_REQUIRE([gt_GLIBC2])dnl
+- AC_REQUIRE([AC_PROG_RANLIB])dnl
+- AC_REQUIRE([AC_ISC_POSIX])dnl
+- AC_REQUIRE([AC_HEADER_STDC])dnl
+- AC_REQUIRE([AC_C_CONST])dnl
+- AC_REQUIRE([bh_C_SIGNED])dnl
+- AC_REQUIRE([AC_C_INLINE])dnl
+- AC_REQUIRE([AC_TYPE_OFF_T])dnl
+- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
+- AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+- AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+- AC_REQUIRE([gt_TYPE_WINT_T])dnl
+- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+- AC_REQUIRE([gt_TYPE_INTMAX_T])
+- AC_REQUIRE([gt_PRINTF_POSIX])
+- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+- AC_REQUIRE([AC_FUNC_MMAP])dnl
+- AC_REQUIRE([gl_GLIBC21])dnl
+- AC_REQUIRE([gt_INTDIV0])dnl
+- AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+- AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+- AC_REQUIRE([gt_INTTYPES_PRI])dnl
+- AC_REQUIRE([gl_XSIZE])dnl
+- AC_REQUIRE([gt_INTL_MACOSX])dnl
+-
+- AC_CHECK_TYPE([ptrdiff_t], ,
+- [AC_DEFINE([ptrdiff_t], [long],
+- [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+- ])
+- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+-stdlib.h string.h unistd.h sys/param.h])
+- AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+-__fsetlocking])
+-
+- dnl Use the _snprintf function only if it is declared (because on NetBSD it
+- dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+- gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+- gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+-
+- dnl Use the *_unlocked functions only if they are declared.
+- dnl (because some of them were defined without being declared in Solaris
+- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+- dnl on Solaris 2.5.1 to run on Solaris 2.6).
+- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+- gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+- gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+- gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+-
+- case $gt_cv_func_printf_posix in
+- *yes) HAVE_POSIX_PRINTF=1 ;;
+- *) HAVE_POSIX_PRINTF=0 ;;
+- esac
+- AC_SUBST([HAVE_POSIX_PRINTF])
+- if test "$ac_cv_func_asprintf" = yes; then
+- HAVE_ASPRINTF=1
+- else
+- HAVE_ASPRINTF=0
+- fi
+- AC_SUBST([HAVE_ASPRINTF])
+- if test "$ac_cv_func_snprintf" = yes; then
+- HAVE_SNPRINTF=1
+- else
+- HAVE_SNPRINTF=0
+- fi
+- AC_SUBST([HAVE_SNPRINTF])
+- if test "$ac_cv_func_wprintf" = yes; then
+- HAVE_WPRINTF=1
+- else
+- HAVE_WPRINTF=0
+- fi
+- AC_SUBST([HAVE_WPRINTF])
+-
+- AM_ICONV
+- AM_LANGINFO_CODESET
+- if test $ac_cv_header_locale_h = yes; then
+- gt_LC_MESSAGES
+- fi
+-
+- if test -n "$INTL_MACOSX_LIBS"; then
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- fi
+-
+- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+- dnl because plural.y uses bison specific features. It requires at least
+- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+- dnl compile.
+- dnl bison is only needed for the maintainer (who touches plural.y). But in
+- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+- dnl the rule in general Makefile. Now, some people carelessly touch the
+- dnl files or have a broken "make" program, hence the plural.c rule will
+- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+- dnl present or too old.
+- AC_CHECK_PROGS([INTLBISON], [bison])
+- if test -z "$INTLBISON"; then
+- ac_verc_fail=yes
+- else
+- dnl Found it, now check the version.
+- AC_MSG_CHECKING([version of bison])
+-changequote(<<,>>)dnl
+- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+- case $ac_prog_version in
+- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+-changequote([,])dnl
+- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+- esac
+- AC_MSG_RESULT([$ac_prog_version])
+- fi
+- if test $ac_verc_fail = yes; then
+- INTLBISON=:
+- fi
++ AC_SUBST([LIBINTL])
++ AC_SUBST([LTLIBINTL])
++ AC_SUBST([POSUB])
+ ])
+
+
+-dnl Checks for special options needed on MacOS X.
+-dnl Defines INTL_MACOSX_LIBS.
+-AC_DEFUN([gt_INTL_MACOSX],
++dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
++m4_define([gt_NEEDS_INIT],
+ [
+- dnl Check for API introduced in MacOS X 10.2.
+- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+- gt_cv_func_CFPreferencesCopyAppValue,
+- [gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -framework CoreFoundation"
+- AC_TRY_LINK([#include <CFPreferences.h>],
+- [CFPreferencesCopyAppValue(NULL, NULL)],
+- [gt_cv_func_CFPreferencesCopyAppValue=yes],
+- [gt_cv_func_CFPreferencesCopyAppValue=no])
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"])
+- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+- fi
+- dnl Check for API introduced in MacOS X 10.3.
+- AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+- [gt_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+- gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -framework CoreFoundation"
+- AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+- [gt_cv_func_CFLocaleCopyCurrent=yes],
+- [gt_cv_func_CFLocaleCopyCurrent=no])
+- CPPFLAGS="$gt_save_CPPFLAGS"
+- LIBS="$gt_save_LIBS"])
+- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+- fi
+- INTL_MACOSX_LIBS=
+- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+- fi
+- AC_SUBST([INTL_MACOSX_LIBS])
++ m4_divert_text([DEFAULTS], [gt_needs=])
++ m4_define([gt_NEEDS_INIT], [])
+ ])
+
+
+-dnl gt_CHECK_DECL(FUNC, INCLUDES)
+-dnl Check whether a function is declared.
+-AC_DEFUN([gt_CHECK_DECL],
++dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
++AC_DEFUN([AM_GNU_GETTEXT_NEED],
+ [
+- AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+- [AC_TRY_COMPILE([$2], [
+-#ifndef $1
+- char *p = (char *) $1;
+-#endif
+-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+- if test $ac_cv_have_decl_$1 = yes; then
+- gt_value=1
+- else
+- gt_value=0
+- fi
+- AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+- [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
++ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+ ])
+
+
+diff -urN BUILD/abook-0.6.0pre2/m4/glibc21.m4 abook/m4/glibc21.m4
+--- BUILD/abook-0.6.0pre2/m4/glibc21.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/glibc21.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# glibc21.m4 serial 3
+-dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
++# glibc21.m4 serial 4
++dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -9,22 +9,22 @@
+
+ AC_DEFUN([gl_GLIBC21],
+ [
+- AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+- ac_cv_gnu_library_2_1,
++ AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
++ [ac_cv_gnu_library_2_1],
+ [AC_EGREP_CPP([Lucky GNU user],
+- [
++ [
+ #include <features.h>
+ #ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+ Lucky GNU user
+ #endif
+ #endif
+- ],
+- ac_cv_gnu_library_2_1=yes,
+- ac_cv_gnu_library_2_1=no)
++ ],
++ [ac_cv_gnu_library_2_1=yes],
++ [ac_cv_gnu_library_2_1=no])
+ ]
+ )
+- AC_SUBST(GLIBC21)
++ AC_SUBST([GLIBC21])
+ GLIBC21="$ac_cv_gnu_library_2_1"
+ ]
+ )
+diff -urN BUILD/abook-0.6.0pre2/m4/glibc2.m4 abook/m4/glibc2.m4
+--- BUILD/abook-0.6.0pre2/m4/glibc2.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/glibc2.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# glibc2.m4 serial 1
+-dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
++# glibc2.m4 serial 2
++dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -9,22 +9,22 @@
+
+ AC_DEFUN([gt_GLIBC2],
+ [
+- AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+- ac_cv_gnu_library_2,
++ AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
++ [ac_cv_gnu_library_2],
+ [AC_EGREP_CPP([Lucky GNU user],
+- [
++ [
+ #include <features.h>
+ #ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+ Lucky GNU user
+ #endif
+ #endif
+- ],
+- ac_cv_gnu_library_2=yes,
+- ac_cv_gnu_library_2=no)
++ ],
++ [ac_cv_gnu_library_2=yes],
++ [ac_cv_gnu_library_2=no])
+ ]
+ )
+- AC_SUBST(GLIBC2)
++ AC_SUBST([GLIBC2])
+ GLIBC2="$ac_cv_gnu_library_2"
+ ]
+ )
+diff -urN BUILD/abook-0.6.0pre2/m4/iconv.m4 abook/m4/iconv.m4
+--- BUILD/abook-0.6.0pre2/m4/iconv.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/iconv.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# iconv.m4 serial AM4 (gettext-0.11.3)
+-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
++# iconv.m4 serial 11 (gettext-0.18.1)
++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -21,6 +21,7 @@
+ [
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+ dnl those with the standalone portable GNU libiconv installed).
++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+@@ -33,7 +34,7 @@
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+- AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+@@ -41,7 +42,7 @@
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_func_iconv=yes)
++ [am_cv_func_iconv=yes])
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+@@ -50,13 +51,110 @@
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes)
++ [am_cv_lib_iconv=yes]
++ [am_cv_func_iconv=yes])
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+- AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
++ am_save_LIBS="$LIBS"
++ if test $am_cv_lib_iconv = yes; then
++ LIBS="$LIBS $LIBICONV"
++ fi
++ AC_TRY_RUN([
++#include <iconv.h>
++#include <string.h>
++int main ()
++{
++ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
++ returns. */
++ {
++ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
++ if (cd_utf8_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\342\202\254"; /* EURO SIGN */
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_utf8_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
++#if 0 /* This bug could be worked around by the caller. */
++ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
++ {
++ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
++ if (cd_88591_to_utf8 != (iconv_t)(-1))
++ {
++ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
++ char buf[50];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_88591_to_utf8,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if ((int)res > 0)
++ return 1;
++ }
++ }
++#endif
++ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
++ provided. */
++ if (/* Try standardized names. */
++ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
++ /* Try IRIX, OSF/1 names. */
++ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
++ /* Try AIX names. */
++ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
++ /* Try HP-UX names. */
++ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
++ return 1;
++ return 0;
++}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
++ [case "$host_os" in
++ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
++ *) am_cv_func_iconv_works="guessing yes" ;;
++ esac])
++ LIBS="$am_save_LIBS"
++ ])
++ case "$am_cv_func_iconv_works" in
++ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
++ *) am_func_iconv=yes ;;
++ esac
++ else
++ am_func_iconv=no am_cv_lib_iconv=no
++ fi
++ if test "$am_func_iconv" = yes; then
++ AC_DEFINE([HAVE_ICONV], [1],
++ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ AC_MSG_CHECKING([how to link with libiconv])
+@@ -68,16 +166,31 @@
+ LIBICONV=
+ LTLIBICONV=
+ fi
+- AC_SUBST(LIBICONV)
+- AC_SUBST(LTLIBICONV)
++ AC_SUBST([LIBICONV])
++ AC_SUBST([LTLIBICONV])
+ ])
+
+-AC_DEFUN([AM_ICONV],
++dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
++dnl avoid warnings like
++dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
++dnl This is tricky because of the way 'aclocal' is implemented:
++dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
++dnl Otherwise aclocal's initial scan pass would miss the macro definition.
++dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
++dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
++dnl warnings.
++m4_define([gl_iconv_AC_DEFUN],
++ m4_version_prereq([2.64],
++ [[AC_DEFUN_ONCE(
++ [$1], [$2])]],
++ [[AC_DEFUN(
++ [$1], [$2])]]))
++gl_iconv_AC_DEFUN([AM_ICONV],
+ [
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+- AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_CACHE_VAL([am_cv_proto_iconv], [
+ AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -90,12 +203,12 @@
+ #else
+ size_t iconv();
+ #endif
+-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ 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);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- AC_MSG_RESULT([$]{ac_t:-
+- }[$]am_cv_proto_iconv)
+- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ AC_MSG_RESULT([
++ $am_cv_proto_iconv])
++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/intdiv0.m4 abook/m4/intdiv0.m4
+--- BUILD/abook-0.6.0pre2/m4/intdiv0.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/intdiv0.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# intdiv0.m4 serial 1 (gettext-0.11.3)
+-dnl Copyright (C) 2002 Free Software Foundation, Inc.
++# intdiv0.m4 serial 3 (gettext-0.18)
++dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -14,16 +14,27 @@
+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+ gt_cv_int_divbyzero_sigfpe,
+ [
+- AC_TRY_RUN([
++ gt_cv_int_divbyzero_sigfpe=
++changequote(,)dnl
++ case "$host_os" in
++ macos* | darwin[6-9]* | darwin[1-9][0-9]*)
++ # On MacOS X 10.2 or newer, just assume the same as when cross-
++ # compiling. If we were to perform the real test, 1 Crash Report
++ # dialog window would pop up.
++ case "$host_cpu" in
++ i[34567]86 | x86_64)
++ gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
++ esac
++ ;;
++ esac
++changequote([,])dnl
++ if test -z "$gt_cv_int_divbyzero_sigfpe"; then
++ AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <signal.h>
+
+ static void
+-#ifdef __cplusplus
+ sigfpe_handler (int sig)
+-#else
+-sigfpe_handler (sig) int sig;
+-#endif
+ {
+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
+ exit (sig != SIGFPE);
+@@ -50,21 +61,24 @@
+ nan = y / y;
+ exit (1);
+ }
+-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+- [
+- # Guess based on the CPU.
+- case "$host_cpu" in
+- alpha* | i[34567]86 | m68k | s390*)
+- gt_cv_int_divbyzero_sigfpe="guessing yes";;
+- *)
+- gt_cv_int_divbyzero_sigfpe="guessing no";;
+- esac
+- ])
++], [gt_cv_int_divbyzero_sigfpe=yes], [gt_cv_int_divbyzero_sigfpe=no],
++ [
++ # Guess based on the CPU.
++changequote(,)dnl
++ case "$host_cpu" in
++ alpha* | i[34567]86 | x86_64 | m68k | s390*)
++ gt_cv_int_divbyzero_sigfpe="guessing yes";;
++ *)
++ gt_cv_int_divbyzero_sigfpe="guessing no";;
++ esac
++changequote([,])dnl
++ ])
++ fi
+ ])
+ case "$gt_cv_int_divbyzero_sigfpe" in
+ *yes) value=1;;
+ *) value=0;;
+ esac
+- AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
++ AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
+ [Define if integer division by zero raises signal SIGFPE.])
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/intldir.m4 abook/m4/intldir.m4
+--- BUILD/abook-0.6.0pre2/m4/intldir.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/intldir.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,19 @@
++# intldir.m4 serial 2 (gettext-0.18)
++dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++AC_PREREQ([2.52])
++
++dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
++AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
+diff -urN BUILD/abook-0.6.0pre2/m4/intl.m4 abook/m4/intl.m4
+--- BUILD/abook-0.6.0pre2/m4/intl.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/intl.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,294 @@
++# intl.m4 serial 17 (gettext-0.18)
++dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009.
++
++AC_PREREQ([2.52])
++
++dnl Checks for all prerequisites of the intl subdirectory,
++dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
++dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
++AC_DEFUN([AM_INTL_SUBDIR],
++[
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++ AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ AC_REQUIRE([gt_GLIBC2])dnl
++ AC_REQUIRE([AC_PROG_RANLIB])dnl
++ AC_REQUIRE([gl_VISIBILITY])dnl
++ AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
++ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
++ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
++ AC_REQUIRE([gt_TYPE_WINT_T])dnl
++ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
++ AC_REQUIRE([gt_TYPE_INTMAX_T])
++ AC_REQUIRE([gt_PRINTF_POSIX])
++ AC_REQUIRE([gl_GLIBC21])dnl
++ AC_REQUIRE([gl_XSIZE])dnl
++ AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
++ AC_REQUIRE([gt_INTL_MACOSX])dnl
++
++ dnl Support for automake's --enable-silent-rules.
++ case "$enable_silent_rules" in
++ yes) INTL_DEFAULT_VERBOSITY=0;;
++ no) INTL_DEFAULT_VERBOSITY=1;;
++ *) INTL_DEFAULT_VERBOSITY=1;;
++ esac
++ AC_SUBST([INTL_DEFAULT_VERBOSITY])
++
++ AC_CHECK_TYPE([ptrdiff_t], ,
++ [AC_DEFINE([ptrdiff_t], [long],
++ [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
++ ])
++ AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
++ AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
++ snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
++
++ dnl Use the _snprintf function only if it is declared (because on NetBSD it
++ dnl is defined as a weak alias of snprintf; we prefer to use the latter).
++ gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
++ gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
++
++ dnl Use the *_unlocked functions only if they are declared.
++ dnl (because some of them were defined without being declared in Solaris
++ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
++ dnl on Solaris 2.5.1 to run on Solaris 2.6).
++ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
++ gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
++
++ case $gt_cv_func_printf_posix in
++ *yes) HAVE_POSIX_PRINTF=1 ;;
++ *) HAVE_POSIX_PRINTF=0 ;;
++ esac
++ AC_SUBST([HAVE_POSIX_PRINTF])
++ if test "$ac_cv_func_asprintf" = yes; then
++ HAVE_ASPRINTF=1
++ else
++ HAVE_ASPRINTF=0
++ fi
++ AC_SUBST([HAVE_ASPRINTF])
++ if test "$ac_cv_func_snprintf" = yes; then
++ HAVE_SNPRINTF=1
++ else
++ HAVE_SNPRINTF=0
++ fi
++ AC_SUBST([HAVE_SNPRINTF])
++ if test "$ac_cv_func_newlocale" = yes; then
++ HAVE_NEWLOCALE=1
++ else
++ HAVE_NEWLOCALE=0
++ fi
++ AC_SUBST([HAVE_NEWLOCALE])
++ if test "$ac_cv_func_wprintf" = yes; then
++ HAVE_WPRINTF=1
++ else
++ HAVE_WPRINTF=0
++ fi
++ AC_SUBST([HAVE_WPRINTF])
++
++ AM_LANGINFO_CODESET
++ gt_LC_MESSAGES
++
++ dnl Compilation on mingw and Cygwin needs special Makefile rules, because
++ dnl 1. when we install a shared library, we must arrange to export
++ dnl auxiliary pointer variables for every exported variable,
++ dnl 2. when we install a shared library and a static library simultaneously,
++ dnl the include file specifies __declspec(dllimport) and therefore we
++ dnl must arrange to define the auxiliary pointer variables for the
++ dnl exported variables _also_ in the static library.
++ if test "$enable_shared" = yes; then
++ case "$host_os" in
++ mingw* | cygwin*) is_woe32dll=yes ;;
++ *) is_woe32dll=no ;;
++ esac
++ else
++ is_woe32dll=no
++ fi
++ WOE32DLL=$is_woe32dll
++ AC_SUBST([WOE32DLL])
++
++ dnl On mingw and Cygwin, we can activate special Makefile rules which add
++ dnl version information to the shared libraries and executables.
++ case "$host_os" in
++ mingw* | cygwin*) is_woe32=yes ;;
++ *) is_woe32=no ;;
++ esac
++ WOE32=$is_woe32
++ AC_SUBST([WOE32])
++ if test $WOE32 = yes; then
++ dnl Check for a program that compiles Windows resource files.
++ AC_CHECK_TOOL([WINDRES], [windres])
++ fi
++
++ dnl Determine whether when creating a library, "-lc" should be passed to
++ dnl libtool or not. On many platforms, it is required for the libtool option
++ dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
++ dnl in the *.la files - makes it impossible to create multithreaded programs,
++ dnl because libtool also reorders the -lc to come before the -pthread, and
++ dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
++ case "$host_os" in
++ hpux*) LTLIBC="" ;;
++ *) LTLIBC="-lc" ;;
++ esac
++ AC_SUBST([LTLIBC])
++
++ dnl Rename some macros and functions used for locking.
++ AH_BOTTOM([
++#define __libc_lock_t gl_lock_t
++#define __libc_lock_define gl_lock_define
++#define __libc_lock_define_initialized gl_lock_define_initialized
++#define __libc_lock_init gl_lock_init
++#define __libc_lock_lock gl_lock_lock
++#define __libc_lock_unlock gl_lock_unlock
++#define __libc_lock_recursive_t gl_recursive_lock_t
++#define __libc_lock_define_recursive gl_recursive_lock_define
++#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
++#define __libc_lock_init_recursive gl_recursive_lock_init
++#define __libc_lock_lock_recursive gl_recursive_lock_lock
++#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
++#define glthread_in_use libintl_thread_in_use
++#define glthread_lock_init_func libintl_lock_init_func
++#define glthread_lock_lock_func libintl_lock_lock_func
++#define glthread_lock_unlock_func libintl_lock_unlock_func
++#define glthread_lock_destroy_func libintl_lock_destroy_func
++#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded
++#define glthread_rwlock_init_func libintl_rwlock_init_func
++#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded
++#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func
++#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded
++#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func
++#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded
++#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func
++#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded
++#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func
++#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded
++#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func
++#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded
++#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func
++#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded
++#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func
++#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded
++#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func
++#define glthread_once_func libintl_once_func
++#define glthread_once_singlethreaded libintl_once_singlethreaded
++#define glthread_once_multithreaded libintl_once_multithreaded
++])
++])
++
++
++dnl Checks for the core files of the intl subdirectory:
++dnl dcigettext.c
++dnl eval-plural.h
++dnl explodename.c
++dnl finddomain.c
++dnl gettextP.h
++dnl gmo.h
++dnl hash-string.h hash-string.c
++dnl l10nflist.c
++dnl libgnuintl.h.in (except the *printf stuff)
++dnl loadinfo.h
++dnl loadmsgcat.c
++dnl localealias.c
++dnl log.c
++dnl plural-exp.h plural-exp.c
++dnl plural.y
++dnl Used by libglocale.
++AC_DEFUN([gt_INTL_SUBDIR_CORE],
++[
++ AC_REQUIRE([AC_C_INLINE])dnl
++ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
++ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
++ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
++ AC_REQUIRE([AC_FUNC_MMAP])dnl
++ AC_REQUIRE([gt_INTDIV0])dnl
++ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
++ AC_REQUIRE([gt_INTTYPES_PRI])dnl
++ AC_REQUIRE([gl_LOCK])dnl
++
++ AC_TRY_LINK(
++ [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
++ [],
++ [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
++ [Define to 1 if the compiler understands __builtin_expect.])])
++
++ AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
++ AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
++ stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
++ argz_stringify argz_next __fsetlocking])
++
++ dnl Use the *_unlocked functions only if they are declared.
++ dnl (because some of them were defined without being declared in Solaris
++ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
++ dnl on Solaris 2.5.1 to run on Solaris 2.6).
++ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
++ gt_CHECK_DECL([feof_unlocked], [#include <stdio.h>])
++ gt_CHECK_DECL([fgets_unlocked], [#include <stdio.h>])
++
++ AM_ICONV
++
++ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
++ dnl because plural.y uses bison specific features. It requires at least
++ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
++ dnl compile.
++ dnl bison is only needed for the maintainer (who touches plural.y). But in
++ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
++ dnl the rule in general Makefile. Now, some people carelessly touch the
++ dnl files or have a broken "make" program, hence the plural.c rule will
++ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
++ dnl present or too old.
++ AC_CHECK_PROGS([INTLBISON], [bison])
++ if test -z "$INTLBISON"; then
++ ac_verc_fail=yes
++ else
++ dnl Found it, now check the version.
++ AC_MSG_CHECKING([version of bison])
++changequote(<<,>>)dnl
++ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
++ case $ac_prog_version in
++ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
++ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
++changequote([,])dnl
++ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
++ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
++ esac
++ AC_MSG_RESULT([$ac_prog_version])
++ fi
++ if test $ac_verc_fail = yes; then
++ INTLBISON=:
++ fi
++])
++
++
++dnl gt_CHECK_DECL(FUNC, INCLUDES)
++dnl Check whether a function is declared.
++AC_DEFUN([gt_CHECK_DECL],
++[
++ AC_CACHE_CHECK([whether $1 is declared], [ac_cv_have_decl_$1],
++ [AC_TRY_COMPILE([$2], [
++#ifndef $1
++ char *p = (char *) $1;
++#endif
++], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
++ if test $ac_cv_have_decl_$1 = yes; then
++ gt_value=1
++ else
++ gt_value=0
++ fi
++ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
++ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/intlmacosx.m4 abook/m4/intlmacosx.m4
+--- BUILD/abook-0.6.0pre2/m4/intlmacosx.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/intlmacosx.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,51 @@
++# intlmacosx.m4 serial 3 (gettext-0.18)
++dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Checks for special options needed on MacOS X.
++dnl Defines INTL_MACOSX_LIBS.
++AC_DEFUN([gt_INTL_MACOSX],
++[
++ dnl Check for API introduced in MacOS X 10.2.
++ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
++ [gt_cv_func_CFPreferencesCopyAppValue],
++ [gt_save_LIBS="$LIBS"
++ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
++ AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
++ [CFPreferencesCopyAppValue(NULL, NULL)],
++ [gt_cv_func_CFPreferencesCopyAppValue=yes],
++ [gt_cv_func_CFPreferencesCopyAppValue=no])
++ LIBS="$gt_save_LIBS"])
++ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
++ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
++ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
++ fi
++ dnl Check for API introduced in MacOS X 10.3.
++ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
++ [gt_save_LIBS="$LIBS"
++ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
++ AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
++ [gt_cv_func_CFLocaleCopyCurrent=yes],
++ [gt_cv_func_CFLocaleCopyCurrent=no])
++ LIBS="$gt_save_LIBS"])
++ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
++ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
++ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
++ fi
++ INTL_MACOSX_LIBS=
++ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
++ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
++ fi
++ AC_SUBST([INTL_MACOSX_LIBS])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/intmax.m4 abook/m4/intmax.m4
+--- BUILD/abook-0.6.0pre2/m4/intmax.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/intmax.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# intmax.m4 serial 2 (gettext-0.14.2)
+-dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
++# intmax.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 2002-2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -12,7 +12,7 @@
+ [
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+- AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
++ AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
+ [AC_TRY_COMPILE([
+ #include <stddef.h>
+ #include <stdlib.h>
+@@ -22,9 +22,12 @@
+ #if HAVE_INTTYPES_H_WITH_UINTMAX
+ #include <inttypes.h>
+ #endif
+-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
++], [intmax_t x = -1;
++ return !x;],
++ [gt_cv_c_intmax_t=yes],
++ [gt_cv_c_intmax_t=no])])
+ if test $gt_cv_c_intmax_t = yes; then
+- AC_DEFINE(HAVE_INTMAX_T, 1,
++ AC_DEFINE([HAVE_INTMAX_T], [1],
+ [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/inttypes_h.m4 abook/m4/inttypes_h.m4
+--- BUILD/abook-0.6.0pre2/m4/inttypes_h.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/inttypes_h.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# inttypes_h.m4 serial 6
+-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
++# inttypes_h.m4 serial 9
++dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -11,15 +11,15 @@
+
+ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+ [
+- AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
++ AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
+ [AC_TRY_COMPILE(
+ [#include <sys/types.h>
+ #include <inttypes.h>],
+- [uintmax_t i = (uintmax_t) -1;],
+- gl_cv_header_inttypes_h=yes,
+- gl_cv_header_inttypes_h=no)])
++ [uintmax_t i = (uintmax_t) -1; return !i;],
++ [gl_cv_header_inttypes_h=yes],
++ [gl_cv_header_inttypes_h=no])])
+ if test $gl_cv_header_inttypes_h = yes; then
+- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
++ AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
+ [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
+ fi
+diff -urN BUILD/abook-0.6.0pre2/m4/inttypes.m4 abook/m4/inttypes.m4
+--- BUILD/abook-0.6.0pre2/m4/inttypes.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/inttypes.m4 1970-01-01 01:00:00.000000000 +0100
+@@ -1,25 +0,0 @@
+-# inttypes.m4 serial 1 (gettext-0.11.4)
+-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl From Paul Eggert.
+-
+-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+-# <sys/types.h>.
+-
+-AC_DEFUN([gt_HEADER_INTTYPES_H],
+-[
+- AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+- [
+- AC_TRY_COMPILE(
+- [#include <sys/types.h>
+-#include <inttypes.h>],
+- [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+- ])
+- if test $gt_cv_header_inttypes_h = yes; then
+- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+- [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+- fi
+-])
+diff -urN BUILD/abook-0.6.0pre2/m4/inttypes-pri.m4 abook/m4/inttypes-pri.m4
+--- BUILD/abook-0.6.0pre2/m4/inttypes-pri.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/inttypes-pri.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,30 +1,36 @@
+-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++# inttypes-pri.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
++AC_PREREQ([2.52])
++
+ # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+ # macros to non-string values. This is the case on AIX 4.3.3.
+
+ AC_DEFUN([gt_INTTYPES_PRI],
+ [
+- AC_REQUIRE([gt_HEADER_INTTYPES_H])
+- if test $gt_cv_header_inttypes_h = yes; then
++ AC_CHECK_HEADERS([inttypes.h])
++ if test $ac_cv_header_inttypes_h = yes; then
+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+- gt_cv_inttypes_pri_broken,
++ [gt_cv_inttypes_pri_broken],
+ [
+ AC_TRY_COMPILE([#include <inttypes.h>
+ #ifdef PRId32
+ char *p = PRId32;
+ #endif
+-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
++], [], [gt_cv_inttypes_pri_broken=no], [gt_cv_inttypes_pri_broken=yes])
+ ])
+ fi
+ if test "$gt_cv_inttypes_pri_broken" = yes; then
+- AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
++ AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
++ PRI_MACROS_BROKEN=1
++ else
++ PRI_MACROS_BROKEN=0
+ fi
++ AC_SUBST([PRI_MACROS_BROKEN])
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/lcmessage.m4 abook/m4/lcmessage.m4
+--- BUILD/abook-0.6.0pre2/m4/lcmessage.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/lcmessage.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,6 @@
+-# lcmessage.m4 serial 4 (gettext-0.14.2)
+-dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
++# lcmessage.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1995-2002, 2004-2005, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -20,11 +21,11 @@
+
+ AC_DEFUN([gt_LC_MESSAGES],
+ [
+- AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
++ AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+- gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
++ [gt_cv_val_LC_MESSAGES=yes], [gt_cv_val_LC_MESSAGES=no])])
+ if test $gt_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE(HAVE_LC_MESSAGES, 1,
++ AC_DEFINE([HAVE_LC_MESSAGES], [1],
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/lib-ld.m4 abook/m4/lib-ld.m4
+--- BUILD/abook-0.6.0pre2/m4/lib-ld.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/lib-ld.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# lib-ld.m4 serial 3 (gettext-0.13)
+-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
++# lib-ld.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,7 +10,7 @@
+
+ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+ AC_DEFUN([AC_LIB_PROG_LD_GNU],
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -23,7 +23,7 @@
+
+ dnl From libtool-1.4. Sets the variable LD.
+ AC_DEFUN([AC_LIB_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
++[AC_ARG_WITH([gnu-ld],
+ [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+ AC_REQUIRE([AC_PROG_CC])dnl
+@@ -59,7 +59,7 @@
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+@@ -77,7 +77,7 @@
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(acl_cv_path_LD,
++AC_CACHE_VAL([acl_cv_path_LD],
+ [if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+@@ -89,9 +89,9 @@
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
++ test "$with_gnu_ld" != no && break ;;
+ *)
+- test "$with_gnu_ld" != yes && break ;;
++ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+@@ -101,9 +101,9 @@
+ fi])
+ LD="$acl_cv_path_LD"
+ if test -n "$LD"; then
+- AC_MSG_RESULT($LD)
++ AC_MSG_RESULT([$LD])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_LIB_PROG_LD_GNU
+diff -urN BUILD/abook-0.6.0pre2/m4/lib-link.m4 abook/m4/lib-link.m4
+--- BUILD/abook-0.6.0pre2/m4/lib-link.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/lib-link.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,58 +1,66 @@
+-# lib-link.m4 serial 6 (gettext-0.14.3)
+-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++# lib-link.m4 serial 21 (gettext-0.18)
++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.54])
+
+ dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+ dnl augments the CPPFLAGS variable.
++dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
++dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
++ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
++ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
++ AC_SUBST([LIB]NAME[_PREFIX])
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+ dnl searches for libname and the libraries corresponding to explicit and
+ dnl implicit dependencies, together with the specified include files and
+-dnl the ability to compile and link the specified testcode. If found, it
+-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl the ability to compile and link the specified testcode. The missing-message
++dnl defaults to 'no' and may contain additional hints for the user.
++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+ dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+ dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
++dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
++dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+@@ -66,13 +74,25 @@
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIB[]NAME"
+- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
++ dnl because these -l options might require -L options that are present in
++ dnl LIBS. -l options benefit only from the -L options listed before it.
++ dnl Otherwise, add it to the front of LIBS, because it may be a static
++ dnl library that depends on another static library that is present in LIBS.
++ dnl Static libraries benefit only from the static libraries listed after
++ dnl it.
++ case " $LIB[]NAME" in
++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
++ *) LIBS="$LIB[]NAME $LIBS" ;;
++ esac
++ AC_TRY_LINK([$3], [$4],
++ [ac_cv_lib[]Name=yes],
++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+@@ -82,17 +102,23 @@
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
++ LIB[]NAME[]_PREFIX=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+- undefine([Name])
+- undefine([NAME])
++ AC_SUBST([LIB]NAME[_PREFIX])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+ dnl Determine the platform dependent parameters needed to use rpath:
+-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+-dnl hardcode_direct, hardcode_minus_L.
++dnl acl_libext,
++dnl acl_shlibext,
++dnl acl_hardcode_libdir_flag_spec,
++dnl acl_hardcode_libdir_separator,
++dnl acl_hardcode_direct,
++dnl acl_hardcode_minus_L.
+ AC_DEFUN([AC_LIB_RPATH],
+ [
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+@@ -101,7 +127,7 @@
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+@@ -109,34 +135,66 @@
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+- libext="$acl_cv_libext"
+- shlibext="$acl_cv_shlibext"
+- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+- hardcode_direct="$acl_cv_hardcode_direct"
+- hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ acl_libext="$acl_cv_libext"
++ acl_shlibext="$acl_cv_shlibext"
++ acl_libname_spec="$acl_cv_libname_spec"
++ acl_library_names_spec="$acl_cv_library_names_spec"
++ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ acl_hardcode_direct="$acl_cv_hardcode_direct"
++ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+- AC_ARG_ENABLE(rpath,
++ AC_ARG_ENABLE([rpath],
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+ ])
+
++dnl AC_LIB_FROMPACKAGE(name, package)
++dnl declares that libname comes from the given package. The configure file
++dnl will then not have a --with-libname-prefix option but a
++dnl --with-package-prefix option. Several libraries can come from the same
++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
++dnl macro call that searches for libname.
++AC_DEFUN([AC_LIB_FROMPACKAGE],
++[
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_frompackage_]NAME, [$2])
++ popdef([NAME])
++ pushdef([PACK],[$2])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_libsinpackage_]PACKUP,
++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
++ popdef([PACKUP])
++ popdef([PACK])
++])
++
+ dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
++dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
++dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ [
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
++ dnl Autoconf >= 2.61 supports dots in --with options.
++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+- AC_LIB_ARG_WITH([lib$1-prefix],
+-[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+- --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
++ AC_ARG_WITH(P_A_C_K[-prefix],
++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+ [
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+@@ -148,7 +206,11 @@
+ ])
+ else
+ additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
++ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
+ fi
+ fi
+ ])
+@@ -157,6 +219,10 @@
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
++ LIB[]NAME[]_PREFIX=
++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
++ dnl computed. So it has to be reset here.
++ HAVE_LIB[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -196,22 +262,55 @@
+ found_la=
+ found_so=
+ found_a=
++ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
++ if test -n "$acl_shlibext"; then
++ shrext=".$acl_shlibext" # typically: shrext=.so
++ else
++ shrext=
++ fi
+ if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
++ dir="$additional_libdir"
++ dnl The same code as in the loop below:
++ dnl First look for a shared library.
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
+ fi
+ fi
+ fi
++ dnl Then look for a static library.
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+@@ -219,21 +318,46 @@
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
++ dnl First look for a shared library.
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
+ fi
+ fi
+ fi
++ dnl Then look for a static library.
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+@@ -248,7 +372,9 @@
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+@@ -267,12 +393,12 @@
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+- if test "$hardcode_direct" = yes; then
++ if test "$acl_hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+@@ -303,13 +429,13 @@
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+- if test "$hardcode_minus_L" != no; then
++ if test "$acl_hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
++ dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+@@ -334,8 +460,18 @@
+ dnl Assume the include files are nearby.
+ additional_includedir=
+ case "$found_dir" in
+- */lib | */lib/)
+- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ */$acl_libdirstem | */$acl_libdirstem/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -396,9 +532,11 @@
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+- if test "X$additional_libdir" != "X/usr/lib"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -497,18 +635,18 @@
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+- if test -n "$hardcode_libdir_separator"; then
++ if test -n "$acl_hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user must
+ dnl pass all path elements in one option. We can arrange that for a
+ dnl single library, but not when more than one $LIBNAMEs are used.
+ alldirs=
+ for found_dir in $rpathdirs; do
+- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+- dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
++ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+- eval flag=\"$hardcode_libdir_flag_spec\"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ else
+@@ -516,7 +654,7 @@
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+- eval flag=\"$hardcode_libdir_flag_spec\"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ done
+@@ -529,6 +667,11 @@
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
++ popdef([P_A_C_K])
++ popdef([PACKLIBS])
++ popdef([PACKUP])
++ popdef([PACK])
++ popdef([NAME])
+ ])
+
+ dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+@@ -551,3 +694,81 @@
+ fi
+ done
+ ])
++
++dnl For those cases where a variable contains several -L and -l options
++dnl referring to unknown libraries and directories, this macro determines the
++dnl necessary additional linker options for the runtime path.
++dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
++dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
++dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
++dnl otherwise linking without libtool is assumed.
++AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
++[
++ AC_REQUIRE([AC_LIB_RPATH])
++ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
++ $1=
++ if test "$enable_rpath" != no; then
++ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
++ dnl Use an explicit option to hardcode directories into the resulting
++ dnl binary.
++ rpathdirs=
++ next=
++ for opt in $2; do
++ if test -n "$next"; then
++ dir="$next"
++ dnl No need to hardcode the standard /usr/lib.
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ next=
++ else
++ case $opt in
++ -L) next=yes ;;
++ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
++ dnl No need to hardcode the standard /usr/lib.
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ next= ;;
++ *) next= ;;
++ esac
++ fi
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n ""$3""; then
++ dnl libtool is used for linking. Use -R options.
++ for dir in $rpathdirs; do
++ $1="${$1}${$1:+ }-R$dir"
++ done
++ else
++ dnl The linker is used for linking directly.
++ if test -n "$acl_hardcode_libdir_separator"; then
++ dnl Weird platform: only the last -rpath option counts, the user
++ dnl must pass all path elements in one option.
++ alldirs=
++ for dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
++ done
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ $1="$flag"
++ else
++ dnl The -rpath options are cumulative.
++ for dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$dir"
++ eval flag=\"$acl_hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ $1="${$1}${$1:+ }$flag"
++ done
++ fi
++ fi
++ fi
++ fi
++ fi
++ AC_SUBST([$1])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/lib-prefix.m4 abook/m4/lib-prefix.m4
+--- BUILD/abook-0.6.0pre2/m4/lib-prefix.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/lib-prefix.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# lib-prefix.m4 serial 4 (gettext-0.14.2)
+-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++# lib-prefix.m4 serial 7 (gettext-0.18)
++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -24,6 +24,7 @@
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
++ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+@@ -45,7 +46,7 @@
+ ])
+ else
+ additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
++ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+ ])
+@@ -87,7 +88,7 @@
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+- if test "X$additional_libdir" != "X/usr/lib"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+@@ -97,7 +98,7 @@
+ fi
+ done
+ if test -z "$haveit"; then
+- if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+@@ -151,3 +152,73 @@
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+ ])
++
++dnl AC_LIB_PREPARE_MULTILIB creates
++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
++dnl "lib" or "lib64" or "lib/64",
++dnl - a variable acl_libdirstem2, as a secondary possible value for
++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
++dnl "lib/amd64".
++AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
++[
++ dnl There is no formal standard regarding lib and lib64.
++ dnl On glibc systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
++ dnl the compiler's default mode by looking at the compiler's library search
++ dnl path. If at least one of its elements ends in /lib64 or points to a
++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
++ dnl Otherwise we use the default, namely "lib".
++ dnl On Solaris systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
++ AC_REQUIRE([AC_CANONICAL_HOST])
++ acl_libdirstem=lib
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
++ dnl symlink is missing, so we set acl_libdirstem2 too.
++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
++ [AC_EGREP_CPP([sixtyfour bits], [
++#ifdef _LP64
++sixtyfour bits
++#endif
++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
++ ])
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
++ esac
++ fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
++ ;;
++ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/lock.m4 abook/m4/lock.m4
+--- BUILD/abook-0.6.0pre2/m4/lock.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/lock.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,37 @@
++# lock.m4 serial 10 (gettext-0.18)
++dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl From Bruno Haible.
++
++AC_DEFUN([gl_LOCK],
++[
++ AC_REQUIRE([gl_THREADLIB])
++ if test "$gl_threads_api" = posix; then
++ # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
++ # pthread_rwlock_* functions.
++ AC_CHECK_TYPE([pthread_rwlock_t],
++ [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
++ [Define if the POSIX multithreading library has read/write locks.])],
++ [],
++ [#include <pthread.h>])
++ # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
++ AC_TRY_COMPILE([#include <pthread.h>],
++ [#if __FreeBSD__ == 4
++error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
++#else
++int x = (int)PTHREAD_MUTEX_RECURSIVE;
++return !x;
++#endif],
++ [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
++ [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
++ fi
++ gl_PREREQ_LOCK
++])
++
++# Prerequisites of lib/lock.c.
++AC_DEFUN([gl_PREREQ_LOCK], [
++ AC_REQUIRE([AC_C_INLINE])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/longdouble.m4 abook/m4/longdouble.m4
+--- BUILD/abook-0.6.0pre2/m4/longdouble.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/longdouble.m4 1970-01-01 01:00:00.000000000 +0100
+@@ -1,28 +0,0 @@
+-# longdouble.m4 serial 1 (gettext-0.12)
+-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl From Bruno Haible.
+-dnl Test whether the compiler supports the 'long double' type.
+-dnl Prerequisite: AC_PROG_CC
+-
+-AC_DEFUN([gt_TYPE_LONGDOUBLE],
+-[
+- AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+- [if test "$GCC" = yes; then
+- gt_cv_c_long_double=yes
+- else
+- AC_TRY_COMPILE([
+- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
+- long double foo = 0.0;
+- /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
+- int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+- ], ,
+- gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+- fi])
+- if test $gt_cv_c_long_double = yes; then
+- AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+- fi
+-])
+diff -urN BUILD/abook-0.6.0pre2/m4/longlong.m4 abook/m4/longlong.m4
+--- BUILD/abook-0.6.0pre2/m4/longlong.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/longlong.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,23 +1,106 @@
+-# longlong.m4 serial 5
+-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
++# longlong.m4 serial 14
++dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Paul Eggert.
+
+-# Define HAVE_LONG_LONG if 'long long' works.
++# Define HAVE_LONG_LONG_INT if 'long long int' works.
++# This fixes a bug in Autoconf 2.61, but can be removed once we
++# assume 2.62 everywhere.
+
+-AC_DEFUN([gl_AC_TYPE_LONG_LONG],
++# Note: If the type 'long long int' exists but is only 32 bits large
++# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
++# defined. In this case you can treat 'long long int' like 'long int'.
++
++AC_DEFUN([AC_TYPE_LONG_LONG_INT],
++[
++ AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
++ [AC_LINK_IFELSE(
++ [_AC_TYPE_LONG_LONG_SNIPPET],
++ [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
++ dnl If cross compiling, assume the bug isn't important, since
++ dnl nobody cross compiles for this platform as far as we know.
++ AC_RUN_IFELSE(
++ [AC_LANG_PROGRAM(
++ [[@%:@include <limits.h>
++ @%:@ifndef LLONG_MAX
++ @%:@ define HALF \
++ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
++ @%:@ define LLONG_MAX (HALF - 1 + HALF)
++ @%:@endif]],
++ [[long long int n = 1;
++ int i;
++ for (i = 0; ; i++)
++ {
++ long long int m = n << i;
++ if (m >> i != n)
++ return 1;
++ if (LLONG_MAX / 2 < m)
++ break;
++ }
++ return 0;]])],
++ [ac_cv_type_long_long_int=yes],
++ [ac_cv_type_long_long_int=no],
++ [ac_cv_type_long_long_int=yes])],
++ [ac_cv_type_long_long_int=no])])
++ if test $ac_cv_type_long_long_int = yes; then
++ AC_DEFINE([HAVE_LONG_LONG_INT], [1],
++ [Define to 1 if the system has the type `long long int'.])
++ fi
++])
++
++# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
++# This fixes a bug in Autoconf 2.61, but can be removed once we
++# assume 2.62 everywhere.
++
++# Note: If the type 'unsigned long long int' exists but is only 32 bits
++# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
++# will not be defined. In this case you can treat 'unsigned long long int'
++# like 'unsigned long int'.
++
++AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+ [
+- AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+- [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+- [long long llmax = (long long) -1;
+- return ll << i | ll >> i | llmax / ll | llmax % ll;],
+- ac_cv_type_long_long=yes,
+- ac_cv_type_long_long=no)])
+- if test $ac_cv_type_long_long = yes; then
+- AC_DEFINE(HAVE_LONG_LONG, 1,
+- [Define if you have the 'long long' type.])
++ AC_CACHE_CHECK([for unsigned long long int],
++ [ac_cv_type_unsigned_long_long_int],
++ [AC_LINK_IFELSE(
++ [_AC_TYPE_LONG_LONG_SNIPPET],
++ [ac_cv_type_unsigned_long_long_int=yes],
++ [ac_cv_type_unsigned_long_long_int=no])])
++ if test $ac_cv_type_unsigned_long_long_int = yes; then
++ AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
++ [Define to 1 if the system has the type `unsigned long long int'.])
+ fi
+ ])
++
++# Expands to a C program that can be used to test for simultaneous support
++# of 'long long' and 'unsigned long long'. We don't want to say that
++# 'long long' is available if 'unsigned long long' is not, or vice versa,
++# because too many programs rely on the symmetry between signed and unsigned
++# integer types (excluding 'bool').
++AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
++[
++ AC_LANG_PROGRAM(
++ [[/* For now, do not test the preprocessor; as of 2007 there are too many
++ implementations with broken preprocessors. Perhaps this can
++ be revisited in 2012. In the meantime, code should not expect
++ #if to work with literals wider than 32 bits. */
++ /* Test literals. */
++ long long int ll = 9223372036854775807ll;
++ long long int nll = -9223372036854775807LL;
++ unsigned long long int ull = 18446744073709551615ULL;
++ /* Test constant expressions. */
++ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
++ ? 1 : -1)];
++ typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
++ ? 1 : -1)];
++ int i = 63;]],
++ [[/* Test availability of runtime routines for shift and division. */
++ long long int llmax = 9223372036854775807ll;
++ unsigned long long int ullmax = 18446744073709551615ull;
++ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
++ | (llmax / ll) | (llmax % ll)
++ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
++ | (ullmax / ull) | (ullmax % ull));]])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/nls.m4 abook/m4/nls.m4
+--- BUILD/abook-0.6.0pre2/m4/nls.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/nls.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,6 @@
+-# nls.m4 serial 2 (gettext-0.14.3)
+-dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,35 +18,15 @@
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
+-])
+-
+-AC_DEFUN([AM_MKINSTALLDIRS],
+-[
+- dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
+- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+- dnl Try to locate it.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- case "$ac_aux_dir" in
+- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+- esac
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/po.m4 abook/m4/po.m4
+--- BUILD/abook-0.6.0pre2/m4/po.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/po.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# po.m4 serial 7 (gettext-0.14.3)
+-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
++# po.m4 serial 17 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,16 +17,20 @@
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ dnl Checks for all prerequisites of the po subdirectory.
+ AC_DEFUN([AM_PO_SUBDIRS],
+ [
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
++ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
++ dnl Release version of the gettext macros. This is used to ensure that
++ dnl the gettext macros and po/Makefile.in.in are in sync.
++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
++
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+
+@@ -37,7 +41,23 @@
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
++
++ dnl Test whether it is GNU msgfmt >= 0.15.
++changequote(,)dnl
++ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
++ *) MSGFMT_015=$MSGFMT ;;
++ esac
++changequote([,])dnl
++ AC_SUBST([MSGFMT_015])
++changequote(,)dnl
++ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
++ *) GMSGFMT_015=$GMSGFMT ;;
++ esac
++changequote([,])dnl
++ AC_SUBST([GMSGFMT_015])
+
+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+@@ -49,44 +69,30 @@
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+
++ dnl Test whether it is GNU xgettext >= 0.15.
++changequote(,)dnl
++ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
++ *) XGETTEXT_015=$XGETTEXT ;;
++ esac
++changequote([,])dnl
++ AC_SUBST([XGETTEXT_015])
++
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+- dnl Test whether we really found GNU msgfmt.
+- if test "$GMSGFMT" != ":"; then
+- dnl If it is no GNU msgfmt we define it as : so that the
+- dnl Makefiles still can work.
+- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+- : ;
+- else
+- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+- AC_MSG_RESULT(
+- [found $GMSGFMT program is not GNU msgfmt; ignore it])
+- GMSGFMT=":"
+- fi
+- fi
++ dnl Installation directories.
++ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
++ dnl have to define it here, so that it can be used in po/Makefile.
++ test -n "$localedir" || localedir='${datadir}/locale'
++ AC_SUBST([localedir])
++
++ dnl Support for AM_XGETTEXT_OPTION.
++ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
++ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+- dnl Test whether we really found GNU xgettext.
+- if test "$XGETTEXT" != ":"; then
+- dnl If it is no GNU xgettext we define it as : so that the
+- dnl Makefiles still can work.
+- if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+- (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
+- : ;
+- else
+- AC_MSG_RESULT(
+- [found xgettext program is not GNU xgettext; ignore it])
+- XGETTEXT=":"
+- fi
+- dnl Remove leftover from FreeBSD xgettext call.
+- rm -f messages.po
+- fi
+-
+- AC_OUTPUT_COMMANDS([
++ AC_CONFIG_COMMANDS([po-directories], [[
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+@@ -123,11 +129,12 @@
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+- # Hide the ALL_LINGUAS assigment from automake.
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+@@ -186,13 +193,21 @@
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ 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"
++ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
++ if test -f "$f"; then
++ case "$f" in
++ *.orig | *.bak | *~) ;;
++ *) cat "$f" >> "$ac_dir/Makefile" ;;
++ esac
++ fi
++ done
+ fi
+ ;;
+ esac
+- done],
++ done]],
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+- # from automake.
++ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+@@ -278,7 +293,7 @@
+ changequote([,])dnl
+
+ # Set POTFILES to the value of the Makefile variable POTFILES.
+- sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
++ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+ # Compute POTFILES_DEPS as
+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+@@ -297,10 +312,10 @@
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+- sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
++ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ fi
+- # Hide the ALL_LINGUAS assigment from automake.
++ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+@@ -419,3 +434,16 @@
+ fi
+ mv "$ac_file.tmp" "$ac_file"
+ ])
++
++dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
++AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
++[
++ XGETTEXT_EXTRA_OPTIONS=
++])
++
++dnl Registers an option to be passed to xgettext in the po subdirectory.
++AC_DEFUN([AM_XGETTEXT_OPTION],
++[
++ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
++ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/printf-posix.m4 abook/m4/printf-posix.m4
+--- BUILD/abook-0.6.0pre2/m4/printf-posix.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/printf-posix.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# printf-posix.m4 serial 2 (gettext-0.13.1)
+-dnl Copyright (C) 2003 Free Software Foundation, Inc.
++# printf-posix.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 2003, 2007, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -27,17 +27,18 @@
+ return (strcmp (buf, "55 33") != 0);
+ }], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+ [
+- AC_EGREP_CPP(notposix, [
+-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
++ AC_EGREP_CPP([notposix], [
++#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+ notposix
+ #endif
+- ], gt_cv_func_printf_posix="guessing no",
+- gt_cv_func_printf_posix="guessing yes")
++ ],
++ [gt_cv_func_printf_posix="guessing no"],
++ [gt_cv_func_printf_posix="guessing yes"])
+ ])
+ ])
+ case $gt_cv_func_printf_posix in
+ *yes)
+- AC_DEFINE(HAVE_POSIX_PRINTF, 1,
++ AC_DEFINE([HAVE_POSIX_PRINTF], [1],
+ [Define if your printf() function supports format strings with positions.])
+ ;;
+ esac
+diff -urN BUILD/abook-0.6.0pre2/m4/progtest.m4 abook/m4/progtest.m4
+--- BUILD/abook-0.6.0pre2/m4/progtest.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/progtest.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# progtest.m4 serial 4 (gettext-0.14.2)
+-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
++# progtest.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -16,7 +16,7 @@
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ # Search path for a program which passes the given test.
+
+@@ -55,7 +55,7 @@
+ # Extract the first word of "$2", so it can be a program name with args.
+ set dummy $2; ac_word=[$]2
+ AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
++AC_CACHE_VAL([ac_cv_path_$1],
+ [case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+@@ -84,9 +84,9 @@
+ esac])dnl
+ $1="$ac_cv_path_$1"
+ if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
++ AC_MSG_RESULT([$][$1])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+-AC_SUBST($1)dnl
++AC_SUBST([$1])dnl
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/signed.m4 abook/m4/signed.m4
+--- BUILD/abook-0.6.0pre2/m4/signed.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/signed.m4 1970-01-01 01:00:00.000000000 +0100
+@@ -1,17 +0,0 @@
+-# signed.m4 serial 1 (gettext-0.10.40)
+-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl From Bruno Haible.
+-
+-AC_DEFUN([bh_C_SIGNED],
+-[
+- AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+- [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+- if test $bh_cv_c_signed = no; then
+- AC_DEFINE(signed, ,
+- [Define to empty if the C compiler doesn't support this keyword.])
+- fi
+-])
+diff -urN BUILD/abook-0.6.0pre2/m4/size_max.m4 abook/m4/size_max.m4
+--- BUILD/abook-0.6.0pre2/m4/size_max.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/size_max.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# size_max.m4 serial 2
+-dnl Copyright (C) 2003 Free Software Foundation, Inc.
++# size_max.m4 serial 9
++dnl Copyright (C) 2003, 2005-2006, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -8,11 +8,11 @@
+
+ AC_DEFUN([gl_SIZE_MAX],
+ [
+- AC_CHECK_HEADERS(stdint.h)
++ AC_CHECK_HEADERS([stdint.h])
+ dnl First test whether the system already has SIZE_MAX.
+- AC_MSG_CHECKING([for SIZE_MAX])
+- result=
+- AC_EGREP_CPP([Found it], [
++ AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [
++ gl_cv_size_max=
++ AC_EGREP_CPP([Found it], [
+ #include <limits.h>
+ #if HAVE_STDINT_H
+ #include <stdint.h>
+@@ -20,40 +20,56 @@
+ #ifdef SIZE_MAX
+ Found it
+ #endif
+-], result=yes)
+- if test -z "$result"; then
+- dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+- dnl than the type 'unsigned long'.
+- dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+- dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+- _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+- [#include <stddef.h>], result=?)
+- _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+- [#include <stddef.h>], result=?)
+- _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+- [#include <stddef.h>], result=?)
+- if test "$fits_in_uint" = 1; then
+- dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+- dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+- AC_TRY_COMPILE([#include <stddef.h>
+- extern size_t foo;
+- extern unsigned long foo;
+- ], [], fits_in_uint=0)
+- fi
+- if test -z "$result"; then
+- if test "$fits_in_uint" = 1; then
+- result="$res_hi$res_lo"U
++], [gl_cv_size_max=yes])
++ if test -z "$gl_cv_size_max"; then
++ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
++ dnl than the type 'unsigned long'. Try hard to find a definition that can
++ dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
++ AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],
++ [#include <stddef.h>
++#include <limits.h>], [size_t_bits_minus_1=])
++ AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)],
++ [#include <stddef.h>], [fits_in_uint=])
++ if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
++ if test $fits_in_uint = 1; then
++ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
++ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
++ AC_TRY_COMPILE([#include <stddef.h>
++ extern size_t foo;
++ extern unsigned long foo;
++ ], [], [fits_in_uint=0])
++ fi
++ dnl We cannot use 'expr' to simplify this expression, because 'expr'
++ dnl works only with 'long' integers in the host environment, while we
++ dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
++ if test $fits_in_uint = 1; then
++ gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
++ else
++ gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
++ fi
+ else
+- result="$res_hi$res_lo"UL
++ dnl Shouldn't happen, but who knows...
++ gl_cv_size_max='((size_t)~(size_t)0)'
+ fi
+- else
+- dnl Shouldn't happen, but who knows...
+- result='~(size_t)0'
+ fi
+- fi
+- AC_MSG_RESULT([$result])
+- if test "$result" != yes; then
+- AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
++ ])
++ if test "$gl_cv_size_max" != yes; then
++ AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
+ [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+ fi
++ dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
++ dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
++ dnl #define by AC_DEFINE_UNQUOTED.
++ AH_VERBATIM([SIZE_MAX],
++[/* Define as the maximum value of type 'size_t', if the system doesn't define
++ it. */
++#ifndef SIZE_MAX
++# undef SIZE_MAX
++#endif])
++])
++
++dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
++dnl Remove this when we can assume autoconf >= 2.61.
++m4_ifdef([AC_COMPUTE_INT], [], [
++ AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/stdint_h.m4 abook/m4/stdint_h.m4
+--- BUILD/abook-0.6.0pre2/m4/stdint_h.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/stdint_h.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# stdint_h.m4 serial 5
+-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
++# stdint_h.m4 serial 8
++dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -11,15 +11,15 @@
+
+ AC_DEFUN([gl_AC_HEADER_STDINT_H],
+ [
+- AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
++ AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
+ [AC_TRY_COMPILE(
+ [#include <sys/types.h>
+ #include <stdint.h>],
+- [uintmax_t i = (uintmax_t) -1;],
+- gl_cv_header_stdint_h=yes,
+- gl_cv_header_stdint_h=no)])
++ [uintmax_t i = (uintmax_t) -1; return !i;],
++ [gl_cv_header_stdint_h=yes],
++ [gl_cv_header_stdint_h=no])])
+ if test $gl_cv_header_stdint_h = yes; then
+- AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
++ AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
+ [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
+ fi
+diff -urN BUILD/abook-0.6.0pre2/m4/threadlib.m4 abook/m4/threadlib.m4
+--- BUILD/abook-0.6.0pre2/m4/threadlib.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/threadlib.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,347 @@
++# threadlib.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl From Bruno Haible.
++
++dnl gl_THREADLIB
++dnl ------------
++dnl Tests for a multithreading library to be used.
++dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
++dnl USE_PTH_THREADS, USE_WIN32_THREADS
++dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
++dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
++dnl libtool).
++dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
++dnl programs that really need multithread functionality. The difference
++dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
++dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
++dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
++dnl multithread-safe programs.
++
++AC_DEFUN([gl_THREADLIB_EARLY],
++[
++ AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
++])
++
++dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
++
++AC_DEFUN([gl_THREADLIB_EARLY_BODY],
++[
++ dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
++ dnl influences the result of the autoconf tests that test for *_unlocked
++ dnl declarations, on AIX 5 at least. Therefore it must come early.
++ AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
++ AC_BEFORE([$0], [gl_ARGP])dnl
++
++ AC_REQUIRE([AC_CANONICAL_HOST])
++ dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
++ dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
++ dnl AC_GNU_SOURCE.
++ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
++ [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
++ [AC_REQUIRE([AC_GNU_SOURCE])])
++ dnl Check for multithreading.
++ m4_divert_text([DEFAULTS], [gl_use_threads_default=])
++ AC_ARG_ENABLE([threads],
++AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
++AC_HELP_STRING([--disable-threads], [build without multithread safety]),
++ [gl_use_threads=$enableval],
++ [if test -n "$gl_use_threads_default"; then
++ gl_use_threads="$gl_use_threads_default"
++ else
++changequote(,)dnl
++ case "$host_os" in
++ dnl Disable multithreading by default on OSF/1, because it interferes
++ dnl with fork()/exec(): When msgexec is linked with -lpthread, its
++ dnl child process gets an endless segmentation fault inside execvp().
++ dnl Disable multithreading by default on Cygwin 1.5.x, because it has
++ dnl bugs that lead to endless loops or crashes. See
++ dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
++ osf*) gl_use_threads=no ;;
++ cygwin*)
++ case `uname -r` in
++ 1.[0-5].*) gl_use_threads=no ;;
++ *) gl_use_threads=yes ;;
++ esac
++ ;;
++ *) gl_use_threads=yes ;;
++ esac
++changequote([,])dnl
++ fi
++ ])
++ if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
++ # For using <pthread.h>:
++ case "$host_os" in
++ osf*)
++ # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
++ # groks <pthread.h>. cc also understands the flag -pthread, but
++ # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
++ # 2. putting a flag into CPPFLAGS that has an effect on the linker
++ # causes the AC_TRY_LINK test below to succeed unexpectedly,
++ # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
++ CPPFLAGS="$CPPFLAGS -D_REENTRANT"
++ ;;
++ esac
++ # Some systems optimize for single-threaded programs by default, and
++ # need special flags to disable these optimizations. For example, the
++ # definition of 'errno' in <errno.h>.
++ case "$host_os" in
++ aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
++ solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
++ esac
++ fi
++])
++
++dnl The guts of gl_THREADLIB. Needs to be expanded only once.
++
++AC_DEFUN([gl_THREADLIB_BODY],
++[
++ AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
++ gl_threads_api=none
++ LIBTHREAD=
++ LTLIBTHREAD=
++ LIBMULTITHREAD=
++ LTLIBMULTITHREAD=
++ if test "$gl_use_threads" != no; then
++ dnl Check whether the compiler and linker support weak declarations.
++ AC_CACHE_CHECK([whether imported symbols can be declared weak],
++ [gl_cv_have_weak],
++ [gl_cv_have_weak=no
++ dnl First, test whether the compiler accepts it syntactically.
++ AC_TRY_LINK([extern void xyzzy ();
++#pragma weak xyzzy], [xyzzy();], [gl_cv_have_weak=maybe])
++ if test $gl_cv_have_weak = maybe; then
++ dnl Second, test whether it actually works. On Cygwin 1.7.2, with
++ dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
++ AC_TRY_RUN([
++#include <stdio.h>
++#pragma weak fputs
++int main ()
++{
++ return (fputs == NULL);
++}], [gl_cv_have_weak=yes], [gl_cv_have_weak=no],
++ [dnl When cross-compiling, assume that only ELF platforms support
++ dnl weak symbols.
++ AC_EGREP_CPP([Extensible Linking Format],
++ [#ifdef __ELF__
++ Extensible Linking Format
++ #endif
++ ],
++ [gl_cv_have_weak="guessing yes"],
++ [gl_cv_have_weak="guessing no"])
++ ])
++ fi
++ ])
++ if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
++ # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
++ # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
++ AC_CHECK_HEADER([pthread.h],
++ [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
++ if test "$gl_have_pthread_h" = yes; then
++ # Other possible tests:
++ # -lpthreads (FSU threads, PCthreads)
++ # -lgthreads
++ gl_have_pthread=
++ # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
++ # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
++ # the second one only in libpthread, and lock.c needs it.
++ AC_TRY_LINK([#include <pthread.h>],
++ [pthread_mutex_lock((pthread_mutex_t*)0);
++ pthread_mutexattr_init((pthread_mutexattr_t*)0);],
++ [gl_have_pthread=yes])
++ # Test for libpthread by looking for pthread_kill. (Not pthread_self,
++ # since it is defined as a macro on OSF/1.)
++ if test -n "$gl_have_pthread"; then
++ # The program links fine without libpthread. But it may actually
++ # need to link with libpthread in order to create multiple threads.
++ AC_CHECK_LIB([pthread], [pthread_kill],
++ [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
++ # On Solaris and HP-UX, most pthread functions exist also in libc.
++ # Therefore pthread_in_use() needs to actually try to create a
++ # thread: pthread_create from libc will fail, whereas
++ # pthread_create will actually create a thread.
++ case "$host_os" in
++ solaris* | hpux*)
++ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
++ [Define if the pthread_in_use() detection is hard.])
++ esac
++ ])
++ else
++ # Some library is needed. Try libpthread and libc_r.
++ AC_CHECK_LIB([pthread], [pthread_kill],
++ [gl_have_pthread=yes
++ LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
++ LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
++ if test -z "$gl_have_pthread"; then
++ # For FreeBSD 4.
++ AC_CHECK_LIB([c_r], [pthread_kill],
++ [gl_have_pthread=yes
++ LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
++ LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
++ fi
++ fi
++ if test -n "$gl_have_pthread"; then
++ gl_threads_api=posix
++ AC_DEFINE([USE_POSIX_THREADS], [1],
++ [Define if the POSIX multithreading library can be used.])
++ if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
++ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
++ AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
++ [Define if references to the POSIX multithreading library should be made weak.])
++ LIBTHREAD=
++ LTLIBTHREAD=
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test -z "$gl_have_pthread"; then
++ if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
++ gl_have_solaristhread=
++ gl_save_LIBS="$LIBS"
++ LIBS="$LIBS -lthread"
++ AC_TRY_LINK([#include <thread.h>
++#include <synch.h>],
++ [thr_self();],
++ [gl_have_solaristhread=yes])
++ LIBS="$gl_save_LIBS"
++ if test -n "$gl_have_solaristhread"; then
++ gl_threads_api=solaris
++ LIBTHREAD=-lthread
++ LTLIBTHREAD=-lthread
++ LIBMULTITHREAD="$LIBTHREAD"
++ LTLIBMULTITHREAD="$LTLIBTHREAD"
++ AC_DEFINE([USE_SOLARIS_THREADS], [1],
++ [Define if the old Solaris multithreading library can be used.])
++ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
++ AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
++ [Define if references to the old Solaris multithreading library should be made weak.])
++ LIBTHREAD=
++ LTLIBTHREAD=
++ fi
++ fi
++ fi
++ fi
++ if test "$gl_use_threads" = pth; then
++ gl_save_CPPFLAGS="$CPPFLAGS"
++ AC_LIB_LINKFLAGS([pth])
++ gl_have_pth=
++ gl_save_LIBS="$LIBS"
++ LIBS="$LIBS -lpth"
++ AC_TRY_LINK([#include <pth.h>], [pth_self();], [gl_have_pth=yes])
++ LIBS="$gl_save_LIBS"
++ if test -n "$gl_have_pth"; then
++ gl_threads_api=pth
++ LIBTHREAD="$LIBPTH"
++ LTLIBTHREAD="$LTLIBPTH"
++ LIBMULTITHREAD="$LIBTHREAD"
++ LTLIBMULTITHREAD="$LTLIBTHREAD"
++ AC_DEFINE([USE_PTH_THREADS], [1],
++ [Define if the GNU Pth multithreading library can be used.])
++ if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
++ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
++ AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
++ [Define if references to the GNU Pth multithreading library should be made weak.])
++ LIBTHREAD=
++ LTLIBTHREAD=
++ fi
++ fi
++ else
++ CPPFLAGS="$gl_save_CPPFLAGS"
++ fi
++ fi
++ if test -z "$gl_have_pthread"; then
++ if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
++ if { case "$host_os" in
++ mingw*) true;;
++ *) false;;
++ esac
++ }; then
++ gl_threads_api=win32
++ AC_DEFINE([USE_WIN32_THREADS], [1],
++ [Define if the Win32 multithreading API can be used.])
++ fi
++ fi
++ fi
++ fi
++ AC_MSG_CHECKING([for multithread API to use])
++ AC_MSG_RESULT([$gl_threads_api])
++ AC_SUBST([LIBTHREAD])
++ AC_SUBST([LTLIBTHREAD])
++ AC_SUBST([LIBMULTITHREAD])
++ AC_SUBST([LTLIBMULTITHREAD])
++])
++
++AC_DEFUN([gl_THREADLIB],
++[
++ AC_REQUIRE([gl_THREADLIB_EARLY])
++ AC_REQUIRE([gl_THREADLIB_BODY])
++])
++
++
++dnl gl_DISABLE_THREADS
++dnl ------------------
++dnl Sets the gl_THREADLIB default so that threads are not used by default.
++dnl The user can still override it at installation time, by using the
++dnl configure option '--enable-threads'.
++
++AC_DEFUN([gl_DISABLE_THREADS], [
++ m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
++])
++
++
++dnl Survey of platforms:
++dnl
++dnl Platform Available Compiler Supports test-lock
++dnl flavours option weak result
++dnl --------------- --------- --------- -------- ---------
++dnl Linux 2.4/glibc posix -lpthread Y OK
++dnl
++dnl GNU Hurd/glibc posix
++dnl
++dnl FreeBSD 5.3 posix -lc_r Y
++dnl posix -lkse ? Y
++dnl posix -lpthread ? Y
++dnl posix -lthr Y
++dnl
++dnl FreeBSD 5.2 posix -lc_r Y
++dnl posix -lkse Y
++dnl posix -lthr Y
++dnl
++dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
++dnl
++dnl NetBSD 1.6 --
++dnl
++dnl OpenBSD 3.4 posix -lpthread Y OK
++dnl
++dnl MacOS X 10.[123] posix -lpthread Y OK
++dnl
++dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
++dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
++dnl
++dnl HP-UX 11 posix -lpthread N (cc) OK
++dnl Y (gcc)
++dnl
++dnl IRIX 6.5 posix -lpthread Y 0.5
++dnl
++dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
++dnl
++dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
++dnl -lpthread (gcc) Y
++dnl
++dnl Cygwin posix -lpthread Y OK
++dnl
++dnl Any of the above pth -lpth 0.0
++dnl
++dnl Mingw win32 N OK
++dnl
++dnl BeOS 5 --
++dnl
++dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
++dnl turned off:
++dnl OK if all three tests terminate OK,
++dnl 0.5 if the first test terminates OK but the second one loops endlessly,
++dnl 0.0 if the first test already loops endlessly.
+diff -urN BUILD/abook-0.6.0pre2/m4/uintmax_t.m4 abook/m4/uintmax_t.m4
+--- BUILD/abook-0.6.0pre2/m4/uintmax_t.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/uintmax_t.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,12 +1,12 @@
+-# uintmax_t.m4 serial 9
+-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
++# uintmax_t.m4 serial 12
++dnl Copyright (C) 1997-2004, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Paul Eggert.
+
+-AC_PREREQ(2.13)
++AC_PREREQ([2.13])
+
+ # Define uintmax_t to 'unsigned long' or 'unsigned long long'
+ # if it is not already defined in <stdint.h> or <inttypes.h>.
+@@ -16,15 +16,15 @@
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+ if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+- AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+- test $ac_cv_type_unsigned_long_long = yes \
++ AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
++ test $ac_cv_type_unsigned_long_long_int = yes \
+ && ac_type='unsigned long long' \
+ || ac_type='unsigned long'
+- AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
++ AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
+ [Define to unsigned long or unsigned long long
+ if <stdint.h> and <inttypes.h> don't define.])
+ else
+- AC_DEFINE(HAVE_UINTMAX_T, 1,
++ AC_DEFINE([HAVE_UINTMAX_T], [1],
+ [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/ulonglong.m4 abook/m4/ulonglong.m4
+--- BUILD/abook-0.6.0pre2/m4/ulonglong.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/ulonglong.m4 1970-01-01 01:00:00.000000000 +0100
+@@ -1,23 +0,0 @@
+-# ulonglong.m4 serial 4
+-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl From Paul Eggert.
+-
+-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+-
+-AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
+-[
+- AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+- [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+- [unsigned long long ullmax = (unsigned long long) -1;
+- return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+- ac_cv_type_unsigned_long_long=yes,
+- ac_cv_type_unsigned_long_long=no)])
+- if test $ac_cv_type_unsigned_long_long = yes; then
+- AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+- [Define if you have the 'unsigned long long' type.])
+- fi
+-])
+diff -urN BUILD/abook-0.6.0pre2/m4/visibility.m4 abook/m4/visibility.m4
+--- BUILD/abook-0.6.0pre2/m4/visibility.m4 1970-01-01 01:00:00.000000000 +0100
++++ abook/m4/visibility.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,74 @@
++# visibility.m4 serial 3 (gettext-0.18)
++dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl From Bruno Haible.
++
++dnl Tests whether the compiler supports the command-line option
++dnl -fvisibility=hidden and the function and variable attributes
++dnl __attribute__((__visibility__("hidden"))) and
++dnl __attribute__((__visibility__("default"))).
++dnl Does *not* test for __visibility__("protected") - which has tricky
++dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
++dnl MacOS X.
++dnl Does *not* test for __visibility__("internal") - which has processor
++dnl dependent semantics.
++dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
++dnl "really only recommended for legacy code".
++dnl Set the variable CFLAG_VISIBILITY.
++dnl Defines and sets the variable HAVE_VISIBILITY.
++
++AC_DEFUN([gl_VISIBILITY],
++[
++ AC_REQUIRE([AC_PROG_CC])
++ CFLAG_VISIBILITY=
++ HAVE_VISIBILITY=0
++ if test -n "$GCC"; then
++ dnl First, check whether -Werror can be added to the command line, or
++ dnl whether it leads to an error because of some other option that the
++ dnl user has put into $CC $CFLAGS $CPPFLAGS.
++ AC_MSG_CHECKING([whether the -Werror option is usable])
++ AC_CACHE_VAL([gl_cv_cc_vis_werror], [
++ gl_save_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -Werror"
++ AC_TRY_COMPILE([], [],
++ [gl_cv_cc_vis_werror=yes],
++ [gl_cv_cc_vis_werror=no])
++ CFLAGS="$gl_save_CFLAGS"])
++ AC_MSG_RESULT([$gl_cv_cc_vis_werror])
++ dnl Now check whether visibility declarations are supported.
++ AC_MSG_CHECKING([for simple visibility declarations])
++ AC_CACHE_VAL([gl_cv_cc_visibility], [
++ gl_save_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -fvisibility=hidden"
++ dnl We use the option -Werror and a function dummyfunc, because on some
++ dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
++ dnl "visibility attribute not supported in this configuration; ignored"
++ dnl at the first function definition in every compilation unit, and we
++ dnl don't want to use the option in this case.
++ if test $gl_cv_cc_vis_werror = yes; then
++ CFLAGS="$CFLAGS -Werror"
++ fi
++ AC_TRY_COMPILE(
++ [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
++ extern __attribute__((__visibility__("default"))) int exportedvar;
++ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
++ extern __attribute__((__visibility__("default"))) int exportedfunc (void);
++ void dummyfunc (void) {}],
++ [],
++ [gl_cv_cc_visibility=yes],
++ [gl_cv_cc_visibility=no])
++ CFLAGS="$gl_save_CFLAGS"])
++ AC_MSG_RESULT([$gl_cv_cc_visibility])
++ if test $gl_cv_cc_visibility = yes; then
++ CFLAG_VISIBILITY="-fvisibility=hidden"
++ HAVE_VISIBILITY=1
++ fi
++ fi
++ AC_SUBST([CFLAG_VISIBILITY])
++ AC_SUBST([HAVE_VISIBILITY])
++ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
++ [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
++])
+diff -urN BUILD/abook-0.6.0pre2/m4/wchar_t.m4 abook/m4/wchar_t.m4
+--- BUILD/abook-0.6.0pre2/m4/wchar_t.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/wchar_t.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# wchar_t.m4 serial 1 (gettext-0.12)
+-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
++# wchar_t.m4 serial 3 (gettext-0.18)
++dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,11 +10,11 @@
+
+ AC_DEFUN([gt_TYPE_WCHAR_T],
+ [
+- AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
++ AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+ [AC_TRY_COMPILE([#include <stddef.h>
+ wchar_t foo = (wchar_t)'\0';], ,
+- gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
++ [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
+ if test $gt_cv_c_wchar_t = yes; then
+- AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
++ AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/wint_t.m4 abook/m4/wint_t.m4
+--- BUILD/abook-0.6.0pre2/m4/wint_t.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/wint_t.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# wint_t.m4 serial 1 (gettext-0.12)
+-dnl Copyright (C) 2003 Free Software Foundation, Inc.
++# wint_t.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,11 +10,19 @@
+
+ AC_DEFUN([gt_TYPE_WINT_T],
+ [
+- AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+- [AC_TRY_COMPILE([#include <wchar.h>
++ AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
++ [AC_TRY_COMPILE([
++/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
++ <wchar.h>.
++ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
++ before <wchar.h>. */
++#include <stddef.h>
++#include <stdio.h>
++#include <time.h>
++#include <wchar.h>
+ wint_t foo = (wchar_t)'\0';], ,
+- gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
++ [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])])
+ if test $gt_cv_c_wint_t = yes; then
+- AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
++ AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+ fi
+ ])
+diff -urN BUILD/abook-0.6.0pre2/m4/xsize.m4 abook/m4/xsize.m4
+--- BUILD/abook-0.6.0pre2/m4/xsize.m4 2005-09-17 12:10:26.000000000 +0200
++++ abook/m4/xsize.m4 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+-# xsize.m4 serial 3
+-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
++# xsize.m4 serial 4
++dnl Copyright (C) 2003-2004, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -9,5 +9,5 @@
+ dnl Prerequisites of lib/xsize.h.
+ AC_REQUIRE([gl_SIZE_MAX])
+ AC_REQUIRE([AC_C_INLINE])
+- AC_CHECK_HEADERS(stdint.h)
++ AC_CHECK_HEADERS([stdint.h])
+ ])
+diff -urN BUILD/abook-0.6.0pre2/Makefile.am abook/Makefile.am
+--- BUILD/abook-0.6.0pre2/Makefile.am 2006-09-05 09:55:19.000000000 +0200
++++ abook/Makefile.am 2013-03-13 15:07:45.000000000 +0100
+@@ -1,15 +1,23 @@
+
+ bin_PROGRAMS = abook
+
++if ENABLE_VFORMAT_SUPPORT
++vformat_SOURCE = vcard.c vcard.h
++AM_LDFLAGS = -lvformat
++else
++vformat_SOURCE =
++endif
++
+ abook_SOURCES = abook.c abook_rl.c database.c edit.c \
+ filter.c getname.c getopt.c getopt1.c gettext.c \
+ ldif.c list.c mbswidth.c misc.c options.c \
+ ui.c views.c xmalloc.c \
+ \
+- abook.h abook_curses.h abook_rl.h database.h edit.h \
++ abook.h abook_curses.h abook_rl.h database.h edit.h \
+ filter.h getname.h getopt.h gettext.h \
+ help.h list.h ldif.h mbswidth.h misc.h options.h \
+- ui.h views.h xmalloc.h
++ ui.h views.h xmalloc.h \
++ $(vformat_SOURCE)
+
+ EXTRA_DIST = config.rpath ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
+ abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
+@@ -27,7 +35,7 @@
+ -rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
+
+
+-SUBDIRS = intl po
++SUBDIRS = po
+
+ ACLOCAL_AMFLAGS = -I m4
+
+diff -urN BUILD/abook-0.6.0pre2/Makefile.in abook/Makefile.in
+--- BUILD/abook-0.6.0pre2/Makefile.in 2006-09-05 10:19:36.000000000 +0200
++++ abook/Makefile.in 2013-03-13 15:07:45.000000000 +0100
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,17 +15,29 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(abook_SOURCES)
+-
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++am__make_dryrun = \
++ { \
++ am__dry=no; \
++ case $$MAKEFLAGS in \
++ *\\[\ \ ]*) \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
++ esac; \
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -39,63 +52,73 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ bin_PROGRAMS = abook$(EXEEXT)
++subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/abook.spec.in \
+- $(srcdir)/config.h.in $(top_srcdir)/configure \
+- $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
+- ChangeLog INSTALL NEWS THANKS TODO config.guess config.rpath \
+- config.sub depcomp install-sh missing mkinstalldirs
+-subdir = .
++ $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
++ AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \
++ config.guess config.rpath config.sub depcomp install-sh \
++ missing mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+- $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
++ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \
+- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
+- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
+- $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+- $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+- $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+- $(top_srcdir)/configure.in
++ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
++ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
++ configure.lineno config.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = abook.spec intl/Makefile
++CONFIG_CLEAN_FILES = abook.spec
++CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
++am__abook_SOURCES_DIST = abook.c abook_rl.c database.c edit.c filter.c \
++ getname.c getopt.c getopt1.c gettext.c ldif.c list.c \
++ mbswidth.c misc.c options.c ui.c views.c xmalloc.c abook.h \
++ abook_curses.h abook_rl.h database.h edit.h filter.h getname.h \
++ getopt.h gettext.h help.h list.h ldif.h mbswidth.h misc.h \
++ options.h ui.h views.h xmalloc.h vcard.c vcard.h
++@ENABLE_VFORMAT_SUPPORT_TRUE@am__objects_1 = vcard.$(OBJEXT)
+ am_abook_OBJECTS = abook.$(OBJEXT) abook_rl.$(OBJEXT) \
+ database.$(OBJEXT) edit.$(OBJEXT) filter.$(OBJEXT) \
+ getname.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \
+ gettext.$(OBJEXT) ldif.$(OBJEXT) list.$(OBJEXT) \
+ mbswidth.$(OBJEXT) misc.$(OBJEXT) options.$(OBJEXT) \
+- ui.$(OBJEXT) views.$(OBJEXT) xmalloc.$(OBJEXT)
++ ui.$(OBJEXT) views.$(OBJEXT) xmalloc.$(OBJEXT) \
++ $(am__objects_1)
+ abook_OBJECTS = $(am_abook_OBJECTS)
+ abook_DEPENDENCIES =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
++DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
++am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(abook_SOURCES)
+-DIST_SOURCES = $(abook_SOURCES)
++DIST_SOURCES = $(am__abook_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++am__can_run_installinfo = \
++ case $$AM_UPDATE_INFO_DIR in \
++ n|no|NO) false;; \
++ *) (install-info --version) >/dev/null 2>&1;; \
++ esac
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
++ distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -103,31 +126,54 @@
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+- { test ! -d $(distdir) \
+- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr $(distdir); }; }
++ if test -d "$(distdir)"; then \
++ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -rf "$(distdir)" \
++ || { sleep 5 && rm -rf "$(distdir)"; }; \
++ else :; fi
++am__relativize = \
++ dir0=`pwd`; \
++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
++ sed_rest='s,^[^/]*/*,,'; \
++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
++ sed_butlast='s,/*[^/]*$$,,'; \
++ while test -n "$$dir1"; do \
++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
++ if test "$$first" != "."; then \
++ if test "$$first" = ".."; then \
++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
++ else \
++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
++ if test "$$first2" = "$$first"; then \
++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
++ else \
++ dir2="../$$dir2"; \
++ fi; \
++ dir0="$$dir0"/"$$first"; \
++ fi; \
++ fi; \
++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
++ done; \
++ reldir="$$dir2"
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
++ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+-CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+@@ -135,23 +181,16 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+-GENCAT = @GENCAT@
+-GLIBC2 = @GLIBC2@
+-GLIBC21 = @GLIBC21@
++GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+ GMSGFMT = @GMSGFMT@
+-HAVE_ASPRINTF = @HAVE_ASPRINTF@
+-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+-HAVE_SNPRINTF = @HAVE_SNPRINTF@
+-HAVE_WPRINTF = @HAVE_WPRINTF@
++GMSGFMT_015 = @GMSGFMT_015@
++GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-INSTOBJEXT = @INSTOBJEXT@
+-INTLBISON = @INTLBISON@
+ INTLLIBS = @INTLLIBS@
+-INTLOBJS = @INTLOBJS@
+-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBICONV = @LIBICONV@
+@@ -162,8 +201,9 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
++MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+@@ -171,25 +211,24 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POSUB = @POSUB@
+-RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ U = @U@
+-USE_INCLUDED_INTL_H_FALSE = @USE_INCLUDED_INTL_H_FALSE@
+-USE_INCLUDED_INTL_H_TRUE = @USE_INCLUDED_INTL_H_TRUE@
+-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
++XGETTEXT_015 = @XGETTEXT_015@
++XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -201,13 +240,18 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+@@ -218,27 +262,37 @@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++@ENABLE_VFORMAT_SUPPORT_FALSE@vformat_SOURCE =
++@ENABLE_VFORMAT_SUPPORT_TRUE@vformat_SOURCE = vcard.c vcard.h
++@ENABLE_VFORMAT_SUPPORT_TRUE@AM_LDFLAGS = -lvformat
+ abook_SOURCES = abook.c abook_rl.c database.c edit.c \
+ filter.c getname.c getopt.c getopt1.c gettext.c \
+ ldif.c list.c mbswidth.c misc.c options.c \
+ ui.c views.c xmalloc.c \
+ \
+- abook.h abook_curses.h abook_rl.h database.h edit.h \
++ abook.h abook_curses.h abook_rl.h database.h edit.h \
+ filter.h getname.h getopt.h gettext.h \
+ help.h list.h ldif.h mbswidth.h misc.h options.h \
+- ui.h views.h xmalloc.h
++ ui.h views.h xmalloc.h \
++ $(vformat_SOURCE)
+
+ EXTRA_DIST = config.rpath ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
+ abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
+
+ abook_LDADD = @LIBINTL@
+-SUBDIRS = intl po
++SUBDIRS = po
+ ACLOCAL_AMFLAGS = -I m4
+ @USE_INCLUDED_INTL_H_TRUE@AM_CPPFLAGS = -Iintl
+ all: config.h
+@@ -246,21 +300,21 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .c .o .obj
+-am--refresh:
++am--refresh: Makefile
+ @:
+ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+- cd $(srcdir) && $(AUTOMAKE) --gnu \
++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -276,21 +330,20 @@
+ $(SHELL) ./config.status --recheck
+
+ $(top_srcdir)/configure: $(am__configure_deps)
+- cd $(srcdir) && $(AUTOCONF)
++ $(am__cd) $(srcdir) && $(AUTOCONF)
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++$(am__aclocal_m4_deps):
+
+ config.h: stamp-h1
+- @if test ! -f $@; then \
+- rm -f stamp-h1; \
+- $(MAKE) stamp-h1; \
+- else :; fi
++ @if test ! -f $@; then rm -f stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(srcdir)/config.h.in: $(am__configure_deps)
+- cd $(top_srcdir) && $(AUTOHEADER)
++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
+
+@@ -298,34 +351,49 @@
+ -rm -f config.h stamp-h1
+ abook.spec: $(top_builddir)/config.status $(srcdir)/abook.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+- if test -f $$p \
+- ; then \
+- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+- else :; fi; \
+- done
++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
++ fi; \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed 's/$(EXEEXT)$$//' | \
++ while read p p1; do if test -f $$p; \
++ then echo "$$p"; echo "$$p"; else :; fi; \
++ done | \
++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
++ sed 'N;N;N;s,\n, ,g' | \
++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
++ if ($$2 == $$4) files[d] = files[d] " " $$1; \
++ else { print "f", $$3 "/" $$4, $$1; } } \
++ END { for (d in files) print "f", d, files[d] }' | \
++ while read type dir files; do \
++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
++ test -z "$$files" || { \
++ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
++ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
++ } \
++ ; done
+
+ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(bin_PROGRAMS)'; for p in $$list; do \
+- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+- rm -f "$(DESTDIR)$(bindir)/$$f"; \
+- done
++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
++ files=`for p in $$list; do echo "$$p"; done | \
++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
++ -e 's/$$/$(EXEEXT)/' `; \
++ test -n "$$list" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-abook$(EXEEXT): $(abook_OBJECTS) $(abook_DEPENDENCIES)
++abook$(EXEEXT): $(abook_OBJECTS) $(abook_DEPENDENCIES) $(EXTRA_abook_DEPENDENCIES)
+ @rm -f abook$(EXEEXT)
+- $(LINK) $(abook_LDFLAGS) $(abook_OBJECTS) $(abook_LDADD) $(LIBS)
++ $(LINK) $(abook_OBJECTS) $(abook_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -348,23 +416,23 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcard.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/views.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+-uninstall-info-am:
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -373,7 +441,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @fail= failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -384,16 +458,21 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++$(RECURSIVE_CLEAN_TARGETS):
++ @fail= failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -413,16 +492,16 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -430,14 +509,14 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
++ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+@@ -449,99 +528,129 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
+ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
++ $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+- mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/intl $(distdir)/m4 $(distdir)/po
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ test -d "$(distdir)" || mkdir "$(distdir)"
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
+- || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+- (cd $$subdir && \
++ $(am__make_dryrun) \
++ || test -d "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || exit 1; \
++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
++ $(am__relativize); \
++ new_distdir=$$reldir; \
++ dir1=$$subdir; dir2="$(top_distdir)"; \
++ $(am__relativize); \
++ new_top_distdir=$$reldir; \
++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
++ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$$new_top_distdir" \
++ distdir="$$new_distdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
++ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ -test -n "$(am__skip_mode_fix)" \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+- || chmod -R a+r $(distdir)
++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
++ || chmod -R a+r "$(distdir)"
+ dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
++ $(am__remove_distdir)
++
++dist-lzip: distdir
++ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
++ $(am__remove_distdir)
++
++dist-lzma: distdir
++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++ $(am__remove_distdir)
++
++dist-xz: distdir
++ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+@@ -567,25 +676,33 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.lzma*) \
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
++ *.tar.lz*) \
++ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
++ *.tar.xz*) \
++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+- chmod -R a-w $(distdir); chmod a+w $(distdir)
++ chmod -R a-w $(distdir); chmod u+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
++ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+- && cd $(distdir)/_build \
++ && am__cwd=`pwd` \
++ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+- --with-included-gettext \
++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+@@ -606,14 +723,24 @@
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
++ && cd "$$am__cwd" \
++ || exit 1
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+- @cd $(distuninstallcheck_dir) \
+- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++ @test -n '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: trying to run $@ with an empty' \
++ '$$(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ $(am__cd) '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+@@ -635,7 +762,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -647,16 +774,22 @@
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -678,18 +811,38 @@
+
+ html: html-recursive
+
++html-am:
++
+ info: info-recursive
+
+ info-am:
+
+ install-data-am: install-data-local
+
++install-dvi: install-dvi-recursive
++
++install-dvi-am:
++
+ install-exec-am: install-binPROGRAMS
+
++install-html: install-html-recursive
++
++install-html-am:
++
+ install-info: install-info-recursive
+
++install-info-am:
++
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-pdf-am:
++
++install-ps: install-ps-recursive
++
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -711,26 +864,28 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local
++uninstall-am: uninstall-binPROGRAMS uninstall-local
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
++ ctags-recursive install-am install-strip tags-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+- check-am clean clean-binPROGRAMS clean-generic clean-recursive \
+- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-shar dist-tarZ dist-zip distcheck distclean \
+- distclean-compile distclean-generic distclean-hdr \
+- distclean-recursive distclean-tags distcleancheck distdir \
+- distuninstallcheck dvi dvi-am html html-am info info-am \
+- install install-am install-binPROGRAMS install-data \
+- install-data-am install-data-local install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am am--refresh check check-am clean clean-binPROGRAMS \
++ clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
++ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
++ dist-zip distcheck distclean distclean-compile \
++ distclean-generic distclean-hdr distclean-tags distcleancheck \
++ distdir distuninstallcheck dvi dvi-am html html-am info \
++ info-am install install-am install-binPROGRAMS install-data \
++ install-data-am install-data-local install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-info-am uninstall-local
++ uninstall-binPROGRAMS uninstall-local
+
+
+ install-data-local:
+@@ -741,6 +896,7 @@
+ uninstall-local:
+ -rm -f $(DESTDIR)$(mandir)/man1/abook.1
+ -rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -urN BUILD/abook-0.6.0pre2/misc.c abook/misc.c
+--- BUILD/abook-0.6.0pre2/misc.c 2013-03-14 10:42:00.100864946 +0100
++++ abook/misc.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: misc.c,v 1.23 2006/09/04 18:29:25 cduval Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -77,8 +77,9 @@
+ return 1;
+ }
+
++#ifndef HAVE_STRCASESTR
+ char *
+-strcasestr(char *haystack, char *needle)
++strcasestr(const char *haystack, const char *needle)
+ {
+ int i;
+ int k;
+@@ -97,7 +98,7 @@
+
+ return NULL;
+ }
+-
++#endif
+
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+diff -urN BUILD/abook-0.6.0pre2/misc.h abook/misc.h
+--- BUILD/abook-0.6.0pre2/misc.h 2013-03-14 10:42:00.100864946 +0100
++++ abook/misc.h 2013-03-13 15:07:45.000000000 +0100
+@@ -18,8 +18,6 @@
+
+ int is_number(char *s);
+
+-char *strcasestr(char *haystack, char *needle);
+-
+ char *strdup_printf(const char *format, ... );
+ char *strconcat(const char *str, ...);
+
+@@ -56,8 +54,8 @@
+ #ifndef HAVE_VSNPRINTF
+ int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
+ #endif
+-
++#ifndef HAVE_STRCASESTR
++char *strcasestr(const char *, const char *);
+ #endif
+
+-
+-
++#endif
+diff -urN BUILD/abook-0.6.0pre2/missing abook/missing
+--- BUILD/abook-0.6.0pre2/missing 2001-10-02 20:15:53.000000000 +0200
++++ abook/missing 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
++
++scriptversion=2012-01-06.13; # UTC
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
++# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -14,9 +18,7 @@
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -29,6 +31,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -38,18 +42,24 @@
+ configure_ac=configure.in
+ fi
+
+-case "$1" in
++msg="missing on your system"
++
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
++ # Exit code 63 means version mismatch. This often happens
++ # when the user try to use an ancient version of a tool on
++ # a file that requires a minimum version. In this case we
++ # we should proceed has if the program had been absent, or
++ # if --run hadn't been passed.
++ if test $? = 63; then
++ run=:
++ msg="probably too old"
++ fi
+ ;;
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -67,18 +77,25 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+- tar try tar, gnutar, gtar, then tar without non-portable flags
+- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
++ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
++\`g' are ignored when checking the name.
++
++Send bug reports to <bug-automake@gnu.org>."
++ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+- echo "missing 0.3 - GNU automake"
++ echo "missing $scriptversion (GNU Automake)"
++ exit $?
+ ;;
+
+ -*)
+@@ -87,27 +104,60 @@
+ exit 1
+ ;;
+
+- aclocal)
++esac
++
++# normalize program name to check for.
++program=`echo "$1" | sed '
++ s/^gnu-//; t
++ s/^gnu//; t
++ s/^g//; t'`
++
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program). This is about non-GNU programs, so use $1 not
++# $program.
++case $1 in
++ lex*|yacc*)
++ # Not GNU programs, they don't have --version.
++ ;;
++
++ *)
++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++ # We have it, but it failed.
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running `$TOOL --version' or `$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
++ fi
++ ;;
++esac
++
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case $program in
++ aclocal*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+- autoconf)
++ autoconf*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+- autoheader)
++ autoheader*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+@@ -115,7 +165,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -124,9 +174,9 @@
+ touch $touch_files
+ ;;
+
+- automake)
++ automake*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+@@ -135,145 +185,135 @@
+ while read f; do touch "$f"; done
+ ;;
+
+- bison|yacc)
++ autom4te*)
++ echo 1>&2 "\
++WARNING: \`$1' is needed, but is $msg.
++ You might have modified some files without having the
++ proper tools for further handling them.
++ You can get \`$1' as part of \`Autoconf' from any GNU
++ archive site."
++
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
++ touch $file
++ else
++ test -z "$file" || exec >$file
++ echo "#! /bin/sh"
++ echo "# Created by GNU Automake missing as a replacement of"
++ echo "# $ $@"
++ echo "exit 0"
++ chmod +x $file
++ exit 1
++ fi
++ ;;
++
++ bison*|yacc*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
+- eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ if test $# -ne 1; then
++ eval LASTARG=\${$#}
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+- lex|flex)
++ lex*|flex*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
+- eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ if test $# -ne 1; then
++ eval LASTARG=\${$#}
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+- help2man)
++ help2man*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+- exit 1
++ exit $?
+ fi
+ ;;
+
+- makeinfo)
+- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+- # We have makeinfo, but it failed.
+- exit 1
+- fi
+-
++ makeinfo*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ # The file to touch is that specified with -o ...
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+- fi
++ # ... or it is the one specified with @setfilename ...
++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
++ # ... or it is derived from the source name (dir/f.texi becomes f.info)
++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++ fi
++ # If the file does not exist, the user really needs makeinfo;
++ # let's fail without touching anything.
++ test -f $file || exit 1
+ touch $file
+ ;;
+
+- tar)
+- shift
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- fi
+-
+- # We have already tried tar in the generic part.
+- # Look for gnutar/gtar before invocation to avoid ugly error
+- # messages.
+- if (gnutar --version > /dev/null 2>&1); then
+- gnutar ${1+"$@"} && exit 0
+- fi
+- if (gtar --version > /dev/null 2>&1); then
+- gtar ${1+"$@"} && exit 0
+- fi
+- firstarg="$1"
+- if shift; then
+- case "$firstarg" in
+- *o*)
+- firstarg=`echo "$firstarg" | sed s/o//`
+- tar "$firstarg" ${1+"$@"} && exit 0
+- ;;
+- esac
+- case "$firstarg" in
+- *h*)
+- firstarg=`echo "$firstarg" | sed s/h//`
+- tar "$firstarg" ${1+"$@"} && exit 0
+- ;;
+- esac
+- fi
+-
+- echo 1>&2 "\
+-WARNING: I can't seem to be able to run \`tar' with the given arguments.
+- You may want to install GNU tar or Free paxutils, or check the
+- command line arguments."
+- exit 1
+- ;;
+-
+ *)
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+- it often tells you about the needed prerequirements for installing
++ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+@@ -281,3 +321,11 @@
+ esac
+
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
+diff -urN BUILD/abook-0.6.0pre2/mkinstalldirs abook/mkinstalldirs
+--- BUILD/abook-0.6.0pre2/mkinstalldirs 2001-03-12 11:13:19.000000000 +0100
++++ abook/mkinstalldirs 2013-03-13 15:07:45.000000000 +0100
+@@ -1,40 +1,162 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+-# Created: 1993-05-16
+-# Public domain
+
+-# $Id: mkinstalldirs,v 1.1.1.1 2001/03/12 10:13:19 jheinonen Exp $
++scriptversion=2009-04-28.21; # UTC
+
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
++dirmode=
++
++usage="\
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
++
++# process command line arguments
++while test $# -gt 0 ; do
++ case $1 in
++ -h | --help | --h*) # -h for help
++ echo "$usage"
++ exit $?
++ ;;
++ -m) # -m PERM arg
++ shift
++ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
++ dirmode=$1
++ shift
++ ;;
++ --version)
++ echo "$0 $scriptversion"
++ exit $?
++ ;;
++ --) # stop option processing
++ shift
++ break
++ ;;
++ -*) # unknown option
++ echo "$usage" 1>&2
++ exit 1
++ ;;
++ *) # first non-opt arg
++ break
++ ;;
++ esac
++done
+
+ for file
+ do
+- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+- shift
++ if test -d "$file"; then
++ shift
++ else
++ break
++ fi
++done
++
++case $# in
++ 0) exit 0 ;;
++esac
++
++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error. This is a problem when calling mkinstalldirs
++# from a parallel make. We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
++case $dirmode in
++ '')
++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++ echo "mkdir -p -- $*"
++ exec mkdir -p -- "$@"
++ else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ test -d ./-p && rmdir ./-p
++ test -d ./--version && rmdir ./--version
++ fi
++ ;;
++ *)
++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++ test ! -d ./--version; then
++ echo "mkdir -m $dirmode -p -- $*"
++ exec mkdir -m "$dirmode" -p -- "$@"
++ else
++ # Clean up after NextStep and OpenStep mkdir.
++ for d in ./-m ./-p ./--version "./$dirmode";
++ do
++ test -d $d && rmdir $d
++ done
++ fi
++ ;;
++esac
+
+- pathcomp=
+- for d
+- do
+- pathcomp="$pathcomp$d"
+- case "$pathcomp" in
+- -* ) pathcomp=./$pathcomp ;;
+- esac
+-
+- if test ! -d "$pathcomp"; then
+- echo "mkdir $pathcomp" 1>&2
+-
+- mkdir "$pathcomp" || lasterr=$?
+-
+- if test ! -d "$pathcomp"; then
+- errstatus=$lasterr
+- fi
+- fi
++for file
++do
++ case $file in
++ /*) pathcomp=/ ;;
++ *) pathcomp= ;;
++ esac
++ oIFS=$IFS
++ IFS=/
++ set fnord $file
++ shift
++ IFS=$oIFS
++
++ for d
++ do
++ test "x$d" = x && continue
++
++ pathcomp=$pathcomp$d
++ case $pathcomp in
++ -*) pathcomp=./$pathcomp ;;
++ esac
++
++ if test ! -d "$pathcomp"; then
++ echo "mkdir $pathcomp"
++
++ mkdir "$pathcomp" || lasterr=$?
++
++ if test ! -d "$pathcomp"; then
++ errstatus=$lasterr
++ else
++ if test ! -z "$dirmode"; then
++ echo "chmod $dirmode $pathcomp"
++ lasterr=
++ chmod "$dirmode" "$pathcomp" || lasterr=$?
++
++ if test ! -z "$lasterr"; then
++ errstatus=$lasterr
++ fi
++ fi
++ fi
++ fi
+
+- pathcomp="$pathcomp/"
+- done
++ pathcomp=$pathcomp/
++ done
+ done
+
+ exit $errstatus
+
+-# mkinstalldirs ends here
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
+diff -urN BUILD/abook-0.6.0pre2/options.c abook/options.c
+--- BUILD/abook-0.6.0pre2/options.c 2006-09-06 10:48:33.000000000 +0200
++++ abook/options.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: options.c,v 1.33 2006/09/06 08:48:33 jheinonen Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -67,7 +67,29 @@
+ { "preserve_fields", OT_STR, STR_PRESERVE_FIELDS, UL "standard" },
+ { "sort_field", OT_STR, STR_SORT_FIELD, UL "nick" },
+ { "show_cursor", OT_BOOL, BOOL_SHOW_CURSOR, FALSE },
+-
++ { "use_mouse", OT_BOOL, BOOL_USE_MOUSE, FALSE },
++ { "use_colors", OT_BOOL, BOOL_USE_COLORS, FALSE },
++ { "color_header_fg", OT_STR, STR_COLOR_HEADER_FG, UL "blue" },
++ { "color_header_fg", OT_STR, STR_COLOR_HEADER_FG, UL "blue" },
++ { "color_header_bg", OT_STR, STR_COLOR_HEADER_BG, UL "red" },
++ { "color_footer_fg", OT_STR, STR_COLOR_FOOTER_FG, UL "red" },
++ { "color_footer_bg", OT_STR, STR_COLOR_FOOTER_BG, UL "default" },
++ { "color_list_even_fg", OT_STR, STR_COLOR_LIST_EVEN_FG, UL "yellow" },
++ { "color_list_even_bg", OT_STR, STR_COLOR_LIST_EVEN_BG, UL "default" },
++ { "color_list_odd_fg", OT_STR, STR_COLOR_LIST_ODD_FG, UL "default" },
++ { "color_list_odd_bg", OT_STR, STR_COLOR_LIST_ODD_BG, UL "default" },
++ { "color_list_header_fg", OT_STR, STR_COLOR_LIST_HEADER_FG, UL "white" },
++ { "color_list_header_bg", OT_STR, STR_COLOR_LIST_HEADER_BG, UL "blue" },
++ { "color_list_highlight_fg", OT_STR, STR_COLOR_LIST_HIGHLIGHT_FG, UL "black" },
++ { "color_list_highlight_bg", OT_STR, STR_COLOR_LIST_HIGHLIGHT_BG, UL "green" },
++ { "color_tab_border_fg", OT_STR, STR_COLOR_TAB_BORDER_FG, UL "cyan" },
++ { "color_tab_border_bg", OT_STR, STR_COLOR_TAB_BORDER_BG, UL "default" },
++ { "color_tab_label_fg", OT_STR, STR_COLOR_TAB_LABEL_FG, UL "magenta" },
++ { "color_tab_label_bg", OT_STR, STR_COLOR_TAB_LABEL_BG, UL "default" },
++ { "color_field_name_fg", OT_STR, STR_COLOR_FIELD_NAME_FG, UL "yellow" },
++ { "color_field_name_bg", OT_STR, STR_COLOR_FIELD_NAME_BG, UL "default" },
++ { "color_field_value_fg", OT_STR, STR_COLOR_FIELD_VALUE_FG, UL "green" },
++ { "color_field_value_bg", OT_STR, STR_COLOR_FIELD_VALUE_BG, UL "default" },
+ { NULL }
+ };
+
+diff -urN BUILD/abook-0.6.0pre2/options.h abook/options.h
+--- BUILD/abook-0.6.0pre2/options.h 2006-09-04 21:24:18.000000000 +0200
++++ abook/options.h 2013-03-13 15:07:45.000000000 +0100
+@@ -26,6 +26,8 @@
+ BOOL_USE_ASCII_ONLY,
+ BOOL_ADD_EMAIL_PREVENT_DUPLICATES,
+ BOOL_SHOW_CURSOR,
++ BOOL_USE_COLORS,
++ BOOL_USE_MOUSE,
+ BOOL_MAX
+ };
+
+@@ -53,6 +55,26 @@
+ STR_ADDRESS_STYLE,
+ STR_PRESERVE_FIELDS,
+ STR_SORT_FIELD,
++ STR_COLOR_HEADER_FG,
++ STR_COLOR_HEADER_BG,
++ STR_COLOR_FOOTER_FG,
++ STR_COLOR_FOOTER_BG,
++ STR_COLOR_LIST_EVEN_FG,
++ STR_COLOR_LIST_EVEN_BG,
++ STR_COLOR_LIST_ODD_FG,
++ STR_COLOR_LIST_ODD_BG,
++ STR_COLOR_LIST_HEADER_FG,
++ STR_COLOR_LIST_HEADER_BG,
++ STR_COLOR_LIST_HIGHLIGHT_FG,
++ STR_COLOR_LIST_HIGHLIGHT_BG,
++ STR_COLOR_TAB_BORDER_FG,
++ STR_COLOR_TAB_BORDER_BG,
++ STR_COLOR_TAB_LABEL_FG,
++ STR_COLOR_TAB_LABEL_BG,
++ STR_COLOR_FIELD_NAME_FG,
++ STR_COLOR_FIELD_NAME_BG,
++ STR_COLOR_FIELD_VALUE_FG,
++ STR_COLOR_FIELD_VALUE_BG,
+ STR_MAX
+ };
+
+diff -urN BUILD/abook-0.6.0pre2/po/abook.pot abook/po/abook.pot
+--- BUILD/abook-0.6.0pre2/po/abook.pot 2006-09-06 16:14:38.000000000 +0200
++++ abook/po/abook.pot 2013-03-13 15:07:45.000000000 +0100
+@@ -6,229 +6,248 @@
+ #, fuzzy
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: abook 0.6.0pre2\n"
+ "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
+-"POT-Creation-Date: 2006-09-06 17:14+0300\n"
++"POT-Creation-Date: 2013-01-17 14:44+0100\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: abook.c:93
++#: abook.c:99
+ #, c-format
+ msgid "Cannot create directory %s\n"
+ msgstr ""
+
+-#: abook.c:99
++#: abook.c:105
+ #, c-format
+ msgid "%s is not a directory\n"
+ msgstr ""
+
+-#: abook.c:117
++#: abook.c:123
+ #, c-format
+ msgid "Memory allocation failure: %s\n"
+ msgstr ""
+
+-#: abook.c:128
++#: abook.c:134
+ #, c-format
+ msgid "Press enter to continue...\n"
+ msgstr ""
+
+-#: abook.c:143
++#: abook.c:149
+ #, c-format
+ msgid "File %s is not writeable"
+ msgstr ""
+
+-#: abook.c:148
++#: abook.c:154
+ msgid "If you continue all changes will be lost. Do you want to continue?"
+ msgstr ""
+
+-#: abook.c:167
++#: abook.c:173
+ msgid "Save database"
+ msgstr ""
+
+-#: abook.c:169
++#: abook.c:175
+ msgid "Quit without saving"
+ msgstr ""
+
+-#: abook.c:225
++#: abook.c:233
+ #, c-format
+ msgid "%s is not a valid HOME directory\n"
+ msgstr ""
+
+-#: abook.c:256
++#: abook.c:264
+ #, c-format
+ msgid ""
+ "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
+ "quiet\n"
+ msgstr ""
+
+-#: abook.c:287
++#: abook.c:295
+ #, c-format
+ msgid "please use option --%s after --convert option\n"
+ msgstr ""
+
+-#: abook.c:386
++#: abook.c:382
++#, c-format
++msgid "please use option --outformat after --convert or --mutt-query option\n"
++msgstr ""
++
++#: abook.c:420
++#, c-format
++msgid "Invalid custom format string\n"
++msgstr ""
++
++#: abook.c:428
+ #, c-format
+ msgid "%s: unrecognized arguments on command line\n"
+ msgstr ""
+
+-#: abook.c:408
++#: abook.c:450
+ msgid " -h\t--help\t\t\t\tshow usage"
+ msgstr ""
+
+-#: abook.c:409
++#: abook.c:451
+ msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
+ msgstr ""
+
+-#: abook.c:410
++#: abook.c:452
+ msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
+ msgstr ""
+
+-#: abook.c:411
++#: abook.c:453
+ msgid "\t--mutt-query\t<string>\tmake a query for mutt"
+ msgstr ""
+
+-#: abook.c:412
++#: abook.c:454
+ msgid ""
+ "\t--add-email\t\t\tread an e-mail message from stdin and\n"
+ "\t\t\t\t\tadd the sender to the addressbook"
+ msgstr ""
+
+-#: abook.c:416
++#: abook.c:458
+ msgid ""
+ "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
+ "\t\t\t\t\trequire to confirm adding"
+ msgstr ""
+
+-#: abook.c:420
++#: abook.c:462
+ msgid "\t--convert\t\t\tconvert address book files"
+ msgstr ""
+
+-#: abook.c:421
++#: abook.c:463
+ msgid "\toptions to use with --convert:"
+ msgstr ""
+
+-#: abook.c:422
++#: abook.c:464
+ msgid "\t--informat\t<format>\tformat for input file"
+ msgstr ""
+
+-#: abook.c:423
++#: abook.c:465
+ msgid "\t\t\t\t\t(default: abook)"
+ msgstr ""
+
+-#: abook.c:424
++#: abook.c:466
+ msgid "\t--infile\t<file>\t\tsource file"
+ msgstr ""
+
+-#: abook.c:425
++#: abook.c:467
+ msgid "\t\t\t\t\t(default: stdin)"
+ msgstr ""
+
+-#: abook.c:426
++#: abook.c:468
+ msgid "\t--outformat\t<format>\tformat for output file"
+ msgstr ""
+
+-#: abook.c:427
++#: abook.c:469
+ msgid "\t\t\t\t\t(default: text)"
+ msgstr ""
+
+-#: abook.c:428
++#: abook.c:470
+ msgid "\t--outfile\t<file>\t\tdestination file"
+ msgstr ""
+
+-#: abook.c:429
++#: abook.c:471
+ msgid "\t\t\t\t\t(default: stdout)"
+ msgstr ""
+
+-#: abook.c:430
++#: abook.c:472
++msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
++msgstr ""
++
++#: abook.c:473
++msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
++msgstr ""
++
++#: abook.c:474
+ msgid "\t--formats\t\t\tlist available formats"
+ msgstr ""
+
+-#: abook.c:501
++#: abook.c:528
+ #, c-format
+ msgid "Cannot open database\n"
+ msgstr ""
+
+-#: abook.c:627
++#: abook.c:654
+ #, c-format
+ msgid "too few arguments to make conversion\n"
+ msgstr ""
+
+-#: abook.c:628
++#: abook.c:655
+ #, c-format
+ msgid "try --help\n"
+ msgstr ""
+
+-#: abook.c:633
++#: abook.c:660
+ #, c-format
+ msgid ""
+ "input and output formats are the same\n"
+ "exiting...\n"
+ msgstr ""
+
+-#: abook.c:647
++#: abook.c:674
+ #, c-format
+ msgid "input format %s not supported\n"
+ msgstr ""
+
+-#: abook.c:651
++#: abook.c:678
+ #, c-format
+ msgid "cannot read file %s\n"
+ msgstr ""
+
+-#: abook.c:660
++#: abook.c:687
+ #, c-format
+ msgid "output format %s not supported\n"
+ msgstr ""
+
+-#: abook.c:666
++#: abook.c:693
+ #, c-format
+ msgid "cannot write file %s\n"
+ msgstr ""
+
+-#: abook.c:687
++#: abook.c:714
+ #, c-format
+ msgid "cannot open %s\n"
+ msgstr ""
+
+-#: abook.c:690
++#: abook.c:717
+ #, c-format
+ msgid "%d item(s) added to %s\n"
+ msgstr ""
+
+-#: abook.c:692
++#: abook.c:719
+ msgid "Valid sender address not found"
+ msgstr ""
+
+-#: abook.c:732
++#: abook.c:760
+ #, c-format
+ msgid "Address %s already in addressbook\n"
+ msgstr ""
+
+-#: abook.c:742
++#: abook.c:770
+ #, c-format
+ msgid ""
+ "cannot open /dev/tty\n"
+ "you may want to use --add-email-quiet\n"
+ msgstr ""
+
+-#: abook.c:748
++#: abook.c:776
+ #, c-format
+ msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
+ msgstr ""
+
+-#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
++#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
+ msgid "keybinding for yes|y"
+ msgstr ""
+
+-#: abook.c:753 abook.c:755 ui.c:341
++#: abook.c:781 abook.c:783 ui.c:432
+ msgid "keybinding for no|n"
+ msgstr ""
+
+-#: abook.c:780
++#: abook.c:808
+ #, c-format
+ msgid "stdin is a directory or cannot stat stdin\n"
+ msgstr ""
+@@ -301,196 +320,239 @@
+ msgid "Anniversary day"
+ msgstr ""
+
+-#: database.c:166
++#: database.c:61
++msgid "Groups"
++msgstr ""
++
++#: database.c:167
+ msgid "field already defined"
+ msgstr ""
+
+-#: database.c:170
++#: database.c:171
+ msgid "standard field does not need to be declared"
+ msgstr ""
+
+-#: database.c:185
++#: database.c:186
+ msgid "unknown type"
+ msgstr ""
+
+-#: database.c:585
++#: database.c:648
+ msgid "Invalid field value defined in configuration"
+ msgstr ""
+
+-#: database.c:588
++#: database.c:651
+ msgid "Invalid field value for sorting"
+ msgstr ""
+
+-#: edit.c:51
++#: edit.c:59
+ msgid "Tab name too wide for screen"
+ msgstr ""
+
+-#: edit.c:353
++#: edit.c:360
+ msgid "keybindings_new_123456789|n123456789"
+ msgstr ""
+
+-#: edit.c:355
++#: edit.c:362
+ #, c-format
+ msgid "Choose %s to modify (<1>%s%c%s%s."
+ msgstr ""
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "email"
+ msgstr ""
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "item"
+ msgstr ""
+
+-#: edit.c:361
++#: edit.c:368
+ msgid " or <n>ew"
+ msgstr ""
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "E-mail: "
+ msgstr ""
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "Item: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:460
++msgid "%Y-%M-%D"
++msgstr ""
++
++#: edit.c:461
++msgid "--%M-%D"
++msgstr ""
++
++#: edit.c:539
+ msgid "Day: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Month: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Year (optional): "
+ msgstr ""
+
+-#: edit.c:498
++#: edit.c:569
+ msgid "Invalid date"
+ msgstr ""
+
+-#: edit.c:653
++#: edit.c:776
+ msgid "Name: "
+ msgstr ""
+
+-#: edit.h:14
++#: edit.h:18
+ msgid "?:help q:quit editor"
+ msgstr ""
+
+-#: filter.c:71 filter.c:82
++#: filter.c:88 filter.c:100
+ msgid "abook native format"
+ msgstr ""
+
+-#: filter.c:72
++#: filter.c:89
+ msgid "ldif / Netscape addressbook"
+ msgstr ""
+
+-#: filter.c:73 filter.c:84
++#: filter.c:90 filter.c:103 filter.c:121
+ msgid "mutt alias"
+ msgstr ""
+
+-#: filter.c:74 filter.c:86
++#: filter.c:91 filter.c:106
+ msgid "pine addressbook"
+ msgstr ""
+
+-#: filter.c:75 filter.c:88
++#: filter.c:92 filter.c:107
+ msgid "comma separated values"
+ msgstr ""
+
+-#: filter.c:76 filter.c:89
++#: filter.c:93 filter.c:108
+ msgid "comma separated values (all fields)"
+ msgstr ""
+
+-#: filter.c:77 filter.c:90
++#: filter.c:94 filter.c:109
+ msgid "Palm comma separated values"
+ msgstr ""
+
+-#: filter.c:83
++#: filter.c:95
++msgid "vCard file"
++msgstr ""
++
++#: filter.c:101
+ msgid "ldif / Netscape addressbook (.4ld)"
+ msgstr ""
+
+-#: filter.c:85
+-msgid "html document"
++#: filter.c:102 filter.c:120
++msgid "vCard 2 file"
+ msgstr ""
+
+-#: filter.c:87
+-msgid "GnomeCard (VCard) addressbook"
++#: filter.c:104
++msgid "mutt query format (internal use)"
+ msgstr ""
+
+-#: filter.c:91
++#: filter.c:105
++msgid "html document"
++msgstr ""
++
++#: filter.c:110
+ msgid "elm alias"
+ msgstr ""
+
+-#: filter.c:92
++#: filter.c:111
+ msgid "plain text"
+ msgstr ""
+
+-#: filter.c:93
++#: filter.c:112
+ msgid "Wanderlust address book"
+ msgstr ""
+
+-#: filter.c:94
++#: filter.c:113
+ msgid "Spruce address book"
+ msgstr ""
+
+-#: filter.c:95
++#: filter.c:114
+ msgid "BSD calendar"
+ msgstr ""
+
+-#: filter.c:108
+-msgid "input:"
++#: filter.c:115 filter.c:122
++msgid "Custom format"
++msgstr ""
++
++#: filter.c:135
++msgid "input formats:"
+ msgstr ""
+
+-#: filter.c:115
+-msgid "output:"
++#: filter.c:142
++msgid "output formats:"
+ msgstr ""
+
+-#: filter.c:180
++#: filter.c:149
++msgid "query-compatible output formats:"
++msgstr ""
++
++#: filter.c:214
+ msgid "import database"
+ msgstr ""
+
+-#: filter.c:182 filter.c:299
++#: filter.c:216 filter.c:345
+ msgid "please select a filter"
+ msgstr ""
+
+-#: filter.c:190 filter.c:307
++#: filter.c:224 filter.c:353
+ msgid "x -\tcancel"
+ msgstr ""
+
+-#: filter.c:211 filter.c:345
++#: filter.c:245 filter.c:391
+ msgid "Filename: "
+ msgstr ""
+
+-#: filter.c:218
++#: filter.c:252
+ msgid "Error occured while opening the file"
+ msgstr ""
+
+-#: filter.c:220
++#: filter.c:254
+ msgid "File does not seem to be a valid addressbook"
+ msgstr ""
+
+-#: filter.c:297
++#: filter.c:343
+ msgid "export database"
+ msgstr ""
+
+-#: filter.c:330
++#: filter.c:376
+ msgid "Export <a>ll, export <s>elected, or <c>ancel?"
+ msgstr ""
+
+-#: filter.c:331 ui.c:632
++#: filter.c:377 ui.c:769
+ msgid "keybindings:all/selected/cancel|asc"
+ msgstr ""
+
+-#: filter.c:352
++#: filter.c:398
+ msgid "Error occured while exporting"
+ msgstr ""
+
+-#: filter.c:1896
++#: filter.c:2469
+ #, c-format
+ msgid "%02d/%02d\tAnniversary of %s\n"
+ msgstr ""
+
++#: filter.c:2498
++#, c-format
++msgid "parse_custom_format: fmt_string or ft not allocated\n"
++msgstr ""
++
++#: filter.c:2517
++#, c-format
++msgid "parse_custom_format: invalid placeholder: {%s}\n"
++msgstr ""
++
++#: filter.c:2565
++#, c-format
++msgid "%s: invalid format, index %ld\n"
++msgstr ""
++
+ #: help.h:11
+ msgid "\t?\t\thelp\n"
+ msgstr ""
+@@ -528,255 +590,271 @@
+ msgstr ""
+
+ #: help.h:21
++msgid "\tM\t\tmerge selected items (into top one)\n"
++msgstr ""
++
++#: help.h:22
+ msgid "\tD\t\tduplicate item\n"
+ msgstr ""
+
+ #: help.h:23
++msgid "\tU\t\tremove duplicates\n"
++msgstr ""
++
++#: help.h:25
+ msgid "\tspace\t\tselect item\n"
+ msgstr ""
+
+-#: help.h:24
++#: help.h:26
+ msgid "\t+\t\tselect all\n"
+ msgstr ""
+
+-#: help.h:25
++#: help.h:27
+ msgid "\t-\t\tunselect all\n"
+ msgstr ""
+
+-#: help.h:26
++#: help.h:28
+ msgid "\t*\t\tinvert selection\n"
+ msgstr ""
+
+-#: help.h:28
++#: help.h:30
+ msgid "\tw\t\twrite database to disk\n"
+ msgstr ""
+
+-#: help.h:29
++#: help.h:31
+ msgid "\tl\t\tread database from disk\n"
+ msgstr ""
+
+-#: help.h:30
++#: help.h:32
+ msgid "\tC\t\tclear whole database\n"
+ msgstr ""
+
+-#: help.h:31
++#: help.h:33
+ msgid "\ti\t\timport database\n"
+ msgstr ""
+
+-#: help.h:32
++#: help.h:34
+ msgid "\te\t\texport database\n"
+ msgstr ""
+
+-#: help.h:33
++#: help.h:35
+ msgid "\tp\t\tprint database\n"
+ msgstr ""
+
+-#: help.h:34
++#: help.h:36
+ msgid "\to\t\topen database\n"
+ msgstr ""
+
+-#: help.h:36
++#: help.h:38
+ msgid "\ts\t\tsort database\n"
+ msgstr ""
+
+-#: help.h:37
++#: help.h:39
+ msgid "\tS\t\t\"surname sort\"\n"
+ msgstr ""
+
+-#: help.h:38
++#: help.h:40
+ msgid "\tF\t\tsort by field (defined in configuration file)\n"
+ msgstr ""
+
+-#: help.h:40
++#: help.h:42
+ msgid "\t/\t\tsearch\n"
+ msgstr ""
+
+-#: help.h:41
++#: help.h:43
+ msgid "\t\\\t\tsearch next occurrence\n"
+ msgstr ""
+
+-#: help.h:43
++#: help.h:45
+ msgid "\tA\t\tmove current item up\n"
+ msgstr ""
+
+-#: help.h:44
++#: help.h:46
+ msgid "\tZ\t\tmove current item down\n"
+ msgstr ""
+
+-#: help.h:46
++#: help.h:48
+ msgid "\tm\t\tsend mail with mutt\n"
+ msgstr ""
+
+-#: help.h:47
++#: help.h:49
+ msgid "\tv\t\tview URL with web browser\n"
+ msgstr ""
+
+-#: help.h:55
++#: help.h:57
+ msgid "\tarrows/h,l\t\tchange tab\n"
+ msgstr ""
+
+-#: help.h:57
++#: help.h:59
+ msgid "\tq\t\t\tquit to main screen\n"
+ msgstr ""
+
+-#: help.h:59
++#: help.h:61
+ msgid "\t1 - 5 A - Z\t\tedit fields\n"
+ msgstr ""
+
+-#: help.h:61
++#: help.h:63
+ msgid "\tk or <\t\t\tprevious item\n"
+ msgstr ""
+
+-#: help.h:62
++#: help.h:64
+ msgid "\tj or >\t\t\tnext item\n"
+ msgstr ""
+
+-#: help.h:64
++#: help.h:66
+ msgid "\tr\t\t\troll e-mail addresses up\n"
+ msgstr ""
+
+-#: help.h:65
++#: help.h:67
+ msgid "\tESC-r\t\t\troll e-mail addresses down\n"
+ msgstr ""
+
+-#: help.h:67
++#: help.h:69
+ msgid "\tu\t\t\tundo\n"
+ msgstr ""
+
+-#: help.h:69
++#: help.h:71
+ msgid "\tm\t\t\tsend mail with mutt\n"
+ msgstr ""
+
+-#: help.h:70
++#: help.h:72
+ msgid "\tv\t\t\tview url with web browser\n"
+ msgstr ""
+
+-#: options.c:250
++#: options.c:272
+ msgid "quote mismatch"
+ msgstr ""
+
+-#: options.c:256
++#: options.c:278
+ msgid "no assignment character found"
+ msgstr ""
+
+-#: options.c:259
++#: options.c:281
+ msgid "error in comma separated list"
+ msgstr ""
+
+-#: options.c:289 options.c:308
++#: options.c:311 options.c:330
+ msgid "invalid value"
+ msgstr ""
+
+-#: options.c:329
++#: options.c:351
+ msgid "unknown option"
+ msgstr ""
+
+-#: options.c:341
++#: options.c:363
+ #, c-format
+ msgid ""
+ "valid values for the 'preserve_fields' option are 'all', "
+ "'standard' (default), and 'none'\n"
+ msgstr ""
+
+-#: options.c:350
++#: options.c:372
+ #, c-format
+ msgid ""
+ "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
+ "'us'\n"
+ msgstr ""
+
+-#: options.c:372
++#: options.c:394
+ msgid "invalid value assignment"
+ msgstr ""
+
+-#: options.c:380
++#: options.c:402
+ msgid ""
+ "customfield: obsolete command - please use the 'field' and 'view' commands "
+ "instead"
+ msgstr ""
+
+-#: options.c:398
++#: options.c:420
+ msgid "no view name provided"
+ msgstr ""
+
+-#: options.c:428
++#: options.c:450
+ msgid "no field identifier provided"
+ msgstr ""
+
+-#: options.c:434
++#: options.c:456
+ msgid "no field name provided"
+ msgstr ""
+
+-#: options.c:490
++#: options.c:512
+ #, c-format
+ msgid "%s: parse error at line %d: "
+ msgstr ""
+
+-#: options.c:494
++#: options.c:516
+ #, c-format
+ msgid "unknown token %s\n"
+ msgstr ""
+
+-#: ui.c:145
++#: ui.c:234
+ #, c-format
+ msgid "Your terminal size is %dx%d\n"
+ msgstr ""
+
+-#: ui.c:146
++#: ui.c:235
+ #, c-format
+ msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
+ msgstr ""
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (Y/n)?"
+ msgstr ""
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (y/N)?"
+ msgstr ""
+
+-#: ui.c:410
++#: ui.c:502
+ msgid "help"
+ msgstr ""
+
+-#: ui.c:419
++#: ui.c:511
+ msgid "Press any key to continue..."
+ msgstr ""
+
+-#: ui.c:539
++#: ui.c:656
+ msgid "Remove selected item(s)"
+ msgstr ""
+
+-#: ui.c:549
++#: ui.c:666
++msgid "Merge selected items"
++msgstr ""
++
++#: ui.c:675
++msgid "Remove duplicates"
++msgstr ""
++
++#: ui.c:685
+ msgid "Clear WHOLE database"
+ msgstr ""
+
+-#: ui.c:582
++#: ui.c:718
+ msgid "Search hit bottom, continuing at top"
+ msgstr ""
+
+-#: ui.c:607
++#: ui.c:744
+ #, c-format
+ msgid "Your current data will be lost - Press '%c' to continue"
+ msgstr ""
+
+-#: ui.c:632
++#: ui.c:769
+ msgid "Print <a>ll, print <s>elected, or <c>ancel?"
+ msgstr ""
+
+-#: ui.c:638
++#: ui.c:775
+ msgid "No selected items"
+ msgstr ""
+
+-#: ui.c:664
++#: ui.c:801
+ msgid "File to open: "
+ msgstr ""
+
+-#: ui.c:674
++#: ui.c:811
+ msgid "Save current database"
+ msgstr ""
+
+-#: ui.c:682
++#: ui.c:819
+ msgid "Sorry, the specified file appears not to be a valid abook addressbook"
+ msgstr ""
+
+diff -urN BUILD/abook-0.6.0pre2/po/boldquot.sed abook/po/boldquot.sed
+--- BUILD/abook-0.6.0pre2/po/boldquot.sed 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/boldquot.sed 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,10 @@
++s/"\([^"]*\)"/“\1”/g
++s/`\([^`']*\)'/‘\1’/g
++s/ '\([^`']*\)' / ‘\1’ /g
++s/ '\([^`']*\)'$/ ‘\1’/g
++s/^'\([^`']*\)' /‘\1’ /g
++s/“”/""/g
++s/“/“\e[1m/g
++s/”/\e[0m”/g
++s/‘/‘\e[1m/g
++s/’/\e[0m’/g
+Binarne pliki BUILD/abook-0.6.0pre2/po/de.gmo i abook/po/de.gmo różnią się
+diff -urN BUILD/abook-0.6.0pre2/po/de.po abook/po/de.po
+--- BUILD/abook-0.6.0pre2/po/de.po 2006-09-06 16:14:38.000000000 +0200
++++ abook/po/de.po 2013-03-13 15:07:45.000000000 +0100
+@@ -1,66 +1,67 @@
+ # German translations for abook package.
+-# Copyright (C) 2005 Free Software Foundation, Inc.
++# Copyright (C) 2005 Jaakko Heinonen
+ # This file is distributed under the same license as the abook package.
+ # Johannes Weißl <jargon@molb.org>, 2005.
+-# Gerfried Fuchs <alfie@ist.org>, 2006.
++# Gerfried Fuchs <rhonda@deb.at>, 2007-2010.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: abook 0.5.5pre1\n"
+ "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
+-"POT-Creation-Date: 2006-09-06 17:14+0300\n"
+-"PO-Revision-Date: 2006-09-04 21:00+0200\n"
+-"Last-Translator: Johannes Weißl <jargon@molb.org>\n"
++"POT-Creation-Date: 2013-01-17 14:44+0100\n"
++"PO-Revision-Date: 2010-02-15 18:10+0100\n"
++"Last-Translator: Gerfried Fuchs <rhonda@deb.at>\n"
+ "Language-Team: German <de@li.org>\n"
++"Language: de\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+ # Difficulties: how to translate tab, item, custom, comma separated values
+-#: abook.c:93
++#: abook.c:99
+ #, c-format
+ msgid "Cannot create directory %s\n"
+ msgstr "Kann Verzeichnis %s nicht anlegen\n"
+
+-#: abook.c:99
++#: abook.c:105
+ #, c-format
+ msgid "%s is not a directory\n"
+ msgstr "%s ist kein Verzeichnis\n"
+
+-#: abook.c:117
++#: abook.c:123
+ #, c-format
+ msgid "Memory allocation failure: %s\n"
+ msgstr "Fehler beim Anfordern von Hauptspeicher: %s\n"
+
+-#: abook.c:128
++#: abook.c:134
+ #, c-format
+ msgid "Press enter to continue...\n"
+ msgstr "Eingabetaste drücken, um fortzufahren...\n"
+
+-#: abook.c:143
++#: abook.c:149
+ #, c-format
+ msgid "File %s is not writeable"
+ msgstr "Datei %s ist nicht beschreibbar"
+
+-#: abook.c:148
++#: abook.c:154
+ msgid "If you continue all changes will be lost. Do you want to continue?"
+ msgstr "Beim Fortfahren gehen alle Änderungen verloren. Fortfahren?"
+
+-#: abook.c:167
++#: abook.c:173
+ msgid "Save database"
+ msgstr "Speichere Datenbank"
+
+-#: abook.c:169
++#: abook.c:175
+ msgid "Quit without saving"
+ msgstr "Beenden ohne zu speichern"
+
+-#: abook.c:225
++#: abook.c:233
+ #, c-format
+ msgid "%s is not a valid HOME directory\n"
+ msgstr "%s ist kein gültiges HOME Verzeichnis\n"
+
+-#: abook.c:256
++#: abook.c:264
+ #, c-format
+ msgid ""
+ "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
+@@ -69,33 +70,43 @@
+ "Die Optionen --mutt-query, --convert, --add-email und --add-email-"
+ "quietkönnen nicht kombiniert werden\n"
+
+-#: abook.c:287
++#: abook.c:295
+ #, c-format
+ msgid "please use option --%s after --convert option\n"
+ msgstr "Bitte die Option --%s nach der Option --convert angeben\n"
+
+-#: abook.c:386
++#: abook.c:382
++#, fuzzy, c-format
++msgid "please use option --outformat after --convert or --mutt-query option\n"
++msgstr "Bitte die Option --%s nach der Option --convert angeben\n"
++
++#: abook.c:420
++#, fuzzy, c-format
++msgid "Invalid custom format string\n"
++msgstr "Ungültiger Feld-Wert für die Sortierung"
++
++#: abook.c:428
+ #, c-format
+ msgid "%s: unrecognized arguments on command line\n"
+ msgstr "%s: unbekannte Argumente auf der Kommandozeile\n"
+
+-#: abook.c:408
++#: abook.c:450
+ msgid " -h\t--help\t\t\t\tshow usage"
+ msgstr " -h\t--help\t\t\t\tHilfe anzeigen"
+
+-#: abook.c:409
++#: abook.c:451
+ msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
+ msgstr " -C\t--config\t<datei>\t\tAlternative Config-Datei verwenden"
+
+-#: abook.c:410
++#: abook.c:452
+ msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
+ msgstr "\t--datafile\t<datei>\t\tAlternative Adressbuch-Datei verwenden"
+
+-#: abook.c:411
++#: abook.c:453
+ msgid "\t--mutt-query\t<string>\tmake a query for mutt"
+ msgstr "\t--mutt-query\t<string>\tMutt-Anfrage durchführen"
+
+-#: abook.c:412
++#: abook.c:454
+ msgid ""
+ "\t--add-email\t\t\tread an e-mail message from stdin and\n"
+ "\t\t\t\t\tadd the sender to the addressbook"
+@@ -103,7 +114,7 @@
+ "\t--add-email\t\t\tE-Mail-Adresse von stdin lesen und\n"
+ "\t\t\t\t\tAbsender zum Adressbuch hinzufügen"
+
+-#: abook.c:416
++#: abook.c:458
+ msgid ""
+ "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
+ "\t\t\t\t\trequire to confirm adding"
+@@ -111,67 +122,76 @@
+ "\t--add-email-quiet\t\twie --add-email, aber man muss\n"
+ "\t\t\t\t\tdas Hinzufügen nicht bestätigen"
+
+-#: abook.c:420
++#: abook.c:462
+ msgid "\t--convert\t\t\tconvert address book files"
+ msgstr "\t--convert\t\t\tAdressbuch-Dateien konvertieren"
+
+-#: abook.c:421
++#: abook.c:463
+ msgid "\toptions to use with --convert:"
+ msgstr "\tOptionen in Verbindung mit --convert:"
+
+-#: abook.c:422
++#: abook.c:464
+ msgid "\t--informat\t<format>\tformat for input file"
+ msgstr "\t--informat\t<format>\tFormat für Eingabedatei"
+
+-#: abook.c:423
++#: abook.c:465
+ msgid "\t\t\t\t\t(default: abook)"
+ msgstr "\t\t\t\t\t(Standard: abook)"
+
+-#: abook.c:424
++#: abook.c:466
+ msgid "\t--infile\t<file>\t\tsource file"
+ msgstr "\t--infile\t<datei>\t\tQuelldatei"
+
+-#: abook.c:425
++#: abook.c:467
+ msgid "\t\t\t\t\t(default: stdin)"
+ msgstr "\t\t\t\t\t(Standard: stdin)"
+
+-#: abook.c:426
++#: abook.c:468
+ msgid "\t--outformat\t<format>\tformat for output file"
+ msgstr "\t--outformat\t<format>\tFormat für Ausgabedatei"
+
+-#: abook.c:427
++#: abook.c:469
+ msgid "\t\t\t\t\t(default: text)"
+ msgstr "\t\t\t\t\t(Standard: text)"
+
+-#: abook.c:428
++#: abook.c:470
+ msgid "\t--outfile\t<file>\t\tdestination file"
+ msgstr "\t--outfile\t<datei>\t\tZieldatei"
+
+-#: abook.c:429
++#: abook.c:471
+ msgid "\t\t\t\t\t(default: stdout)"
+ msgstr "\t\t\t\t\t(Standard: stdout)"
+
+-#: abook.c:430
++#: abook.c:472
++#, fuzzy
++msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
++msgstr "\t--outformat\t<format>\tFormat für Ausgabedatei"
++
++#: abook.c:473
++msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
++msgstr ""
++
++#: abook.c:474
+ msgid "\t--formats\t\t\tlist available formats"
+ msgstr "\t--formats\t\t\tVerfügbare Formate auflisten"
+
+-#: abook.c:501
++#: abook.c:528
+ #, c-format
+ msgid "Cannot open database\n"
+ msgstr "Kann die Datenbank nicht öffnen\n"
+
+-#: abook.c:627
++#: abook.c:654
+ #, c-format
+ msgid "too few arguments to make conversion\n"
+ msgstr "zu wenig Argumente um die Konvertierung durchzuführen\n"
+
+-#: abook.c:628
++#: abook.c:655
+ #, c-format
+ msgid "try --help\n"
+ msgstr "versuche einmal --help\n"
+
+ # I think "Abbruch" is better than e.g. "Beenden"
+-#: abook.c:633
++#: abook.c:660
+ #, c-format
+ msgid ""
+ "input and output formats are the same\n"
+@@ -180,47 +200,47 @@
+ "Eingabe- und Ausgabedatei sind identisch\n"
+ "Abbruch...\n"
+
+-#: abook.c:647
++#: abook.c:674
+ #, c-format
+ msgid "input format %s not supported\n"
+ msgstr "Eingabeformat %s wird nicht unterstützt\n"
+
+-#: abook.c:651
++#: abook.c:678
+ #, c-format
+ msgid "cannot read file %s\n"
+ msgstr "kann die Datei %s nicht lesen\n"
+
+-#: abook.c:660
++#: abook.c:687
+ #, c-format
+ msgid "output format %s not supported\n"
+ msgstr "Ausgabeformat %s wird nicht unterstützt\n"
+
+-#: abook.c:666
++#: abook.c:693
+ #, c-format
+ msgid "cannot write file %s\n"
+ msgstr "kann die Datei %s nicht schreiben\n"
+
+-#: abook.c:687
++#: abook.c:714
+ #, c-format
+ msgid "cannot open %s\n"
+ msgstr "kann %s nicht öffnen\n"
+
+-#: abook.c:690
++#: abook.c:717
+ #, c-format
+ msgid "%d item(s) added to %s\n"
+ msgstr "%d Element(e) zu %s hinzugefügt\n"
+
+-#: abook.c:692
++#: abook.c:719
+ msgid "Valid sender address not found"
+ msgstr "Keine gültige Absender-Adresse gefunden"
+
+-#: abook.c:732
++#: abook.c:760
+ #, c-format
+ msgid "Address %s already in addressbook\n"
+ msgstr "Adresse %s befindet sich bereits im Adressbuch\n"
+
+ # I don't want to translate 'you' with 'du'
+-#: abook.c:742
++#: abook.c:770
+ #, c-format
+ msgid ""
+ "cannot open /dev/tty\n"
+@@ -229,20 +249,20 @@
+ "kann /dev/tty nicht öffnen\n"
+ "versuche es einmal mit --add-email-quiet\n"
+
+-#: abook.c:748
++#: abook.c:776
+ #, c-format
+ msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
+ msgstr "Füge \"%s <%s>\" zu %s hinzu? (%c/%c)\n"
+
+-#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
++#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
+ msgid "keybinding for yes|y"
+ msgstr "j"
+
+-#: abook.c:753 abook.c:755 ui.c:341
++#: abook.c:781 abook.c:783 ui.c:432
+ msgid "keybinding for no|n"
+ msgstr "n"
+
+-#: abook.c:780
++#: abook.c:808
+ #, c-format
+ msgid "stdin is a directory or cannot stat stdin\n"
+ msgstr ""
+@@ -316,202 +336,246 @@
+ msgid "Notes"
+ msgstr "Bemerkung"
+
++# Anniversary already _means_ day!
+ #: database.c:60
+ msgid "Anniversary day"
++msgstr "Jahrestag"
++
++#: database.c:61
++msgid "Groups"
+ msgstr ""
+
+-#: database.c:166
++#: database.c:167
+ msgid "field already defined"
+ msgstr "Feld bereits definiert"
+
+-#: database.c:170
++#: database.c:171
+ msgid "standard field does not need to be declared"
+-msgstr ""
++msgstr "Standardfeld muss nicht deklariert werden"
+
+-#: database.c:185
++#: database.c:186
+ msgid "unknown type"
+ msgstr "unbekannter Typ"
+
+-#: database.c:585
++#: database.c:648
+ msgid "Invalid field value defined in configuration"
+ msgstr "Ungültiger Feld-Wert in der Konfiguration festgelegt"
+
+-#: database.c:588
+-#, fuzzy
++#: database.c:651
+ msgid "Invalid field value for sorting"
+-msgstr "Ungültiger Feld-Wert in der Konfiguration festgelegt"
++msgstr "Ungültiger Feld-Wert für die Sortierung"
+
+-#: edit.c:51
++#: edit.c:59
+ msgid "Tab name too wide for screen"
+ msgstr "Kartei-Name zu breit für den Bildschirm"
+
+-#: edit.c:353
++#: edit.c:360
+ msgid "keybindings_new_123456789|n123456789"
+ msgstr "n123456789"
+
+-#: edit.c:355
++#: edit.c:362
+ #, c-format
+ msgid "Choose %s to modify (<1>%s%c%s%s."
+-msgstr ""
++msgstr "%s zum Ändern wählen (<1>%s%c%s%s."
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "email"
+ msgstr "E-Mail"
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "item"
+ msgstr "Element"
+
+-#: edit.c:361
++#: edit.c:368
+ msgid " or <n>ew"
+ msgstr " oder <n>eu"
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "E-mail: "
+ msgstr "E-Mails: "
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "Item: "
+ msgstr "Element: "
+
+-#: edit.c:465
++#: edit.c:460
++msgid "%Y-%M-%D"
++msgstr "%Y-%M-%D"
++
++#: edit.c:461
++msgid "--%M-%D"
++msgstr "--%M-%D"
++
++#: edit.c:539
+ msgid "Day: "
+-msgstr ""
++msgstr "Tag: "
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Month: "
+-msgstr ""
++msgstr "Monat: "
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Year (optional): "
+-msgstr ""
++msgstr "Jahr (optional): "
+
+-#: edit.c:498
+-#, fuzzy
++#: edit.c:569
+ msgid "Invalid date"
+-msgstr "ungültiger Wert"
++msgstr "ungültiges Datum"
+
+-#: edit.c:653
++#: edit.c:776
+ msgid "Name: "
+ msgstr "Name: "
+
+-#: edit.h:14
++#: edit.h:18
+ msgid "?:help q:quit editor"
+ msgstr "?:Hilfe q:Editor beenden"
+
+-#: filter.c:71 filter.c:82
++#: filter.c:88 filter.c:100
+ msgid "abook native format"
+-msgstr "abooks eigenes Format"
++msgstr "abook-eigenes Format"
+
+-#: filter.c:72
++#: filter.c:89
+ msgid "ldif / Netscape addressbook"
+ msgstr "ldif / Netscape Adressbuch"
+
+-#: filter.c:73 filter.c:84
++#: filter.c:90 filter.c:103 filter.c:121
+ msgid "mutt alias"
+-msgstr "mutt alias"
++msgstr "mutt-Alias"
+
+-#: filter.c:74 filter.c:86
++#: filter.c:91 filter.c:106
+ msgid "pine addressbook"
+-msgstr "pine Adressbuch"
++msgstr "pine-Adressbuch"
+
+-#: filter.c:75 filter.c:88
++#: filter.c:92 filter.c:107
+ msgid "comma separated values"
+ msgstr "komma-separierte Werte"
+
+-#: filter.c:76 filter.c:89
++#: filter.c:93 filter.c:108
+ msgid "comma separated values (all fields)"
+ msgstr "komma-separierte Werte (alle Felder)"
+
+-#: filter.c:77 filter.c:90
++#: filter.c:94 filter.c:109
+ msgid "Palm comma separated values"
+ msgstr "Palm komma-separierte Werte"
+
+-#: filter.c:83
++#: filter.c:95
++msgid "vCard file"
++msgstr ""
++
++#: filter.c:101
+ msgid "ldif / Netscape addressbook (.4ld)"
+ msgstr "ldif / Netscape Adressbuch (.4ld)"
+
+-#: filter.c:85
+-msgid "html document"
+-msgstr "HTML Dokument"
++#: filter.c:102 filter.c:120
++msgid "vCard 2 file"
++msgstr ""
++
++#: filter.c:104
++msgid "mutt query format (internal use)"
++msgstr ""
+
+-#: filter.c:87
+-msgid "GnomeCard (VCard) addressbook"
+-msgstr "GnomeCard (VCard) Adressbuch"
++#: filter.c:105
++msgid "html document"
++msgstr "HTML-Dokument"
+
+-#: filter.c:91
++#: filter.c:110
+ msgid "elm alias"
+ msgstr "elm alias"
+
+-#: filter.c:92
++#: filter.c:111
+ msgid "plain text"
+ msgstr "Klartext"
+
+-#: filter.c:93
+-#, fuzzy
++#: filter.c:112
+ msgid "Wanderlust address book"
+-msgstr "pine Adressbuch"
++msgstr "Wanderlust-Adressbuch"
+
+-#: filter.c:94
++#: filter.c:113
+ msgid "Spruce address book"
+-msgstr "Spruce Adressbuch"
++msgstr "Spruce-Adressbuch"
+
+-#: filter.c:95
++#: filter.c:114
+ msgid "BSD calendar"
+-msgstr ""
++msgstr "BSD-Kalender"
++
++#: filter.c:115 filter.c:122
++#, fuzzy
++msgid "Custom format"
++msgstr "Benutzer1"
+
+-#: filter.c:108
+-msgid "input:"
++#: filter.c:135
++#, fuzzy
++msgid "input formats:"
+ msgstr "Eingabe:"
+
+-#: filter.c:115
+-msgid "output:"
++#: filter.c:142
++#, fuzzy
++msgid "output formats:"
+ msgstr "Ausgabe:"
+
+-#: filter.c:180
++#: filter.c:149
++msgid "query-compatible output formats:"
++msgstr ""
++
++#: filter.c:214
+ msgid "import database"
+ msgstr "importiere Datenbank"
+
+-#: filter.c:182 filter.c:299
++#: filter.c:216 filter.c:345
+ msgid "please select a filter"
+ msgstr "Bitte Filter auswählen"
+
+-#: filter.c:190 filter.c:307
++#: filter.c:224 filter.c:353
+ msgid "x -\tcancel"
+ msgstr "x -\tabbrechen"
+
+-#: filter.c:211 filter.c:345
++#: filter.c:245 filter.c:391
+ msgid "Filename: "
+ msgstr "Dateiname: "
+
+-#: filter.c:218
++#: filter.c:252
+ msgid "Error occured while opening the file"
+ msgstr "Fehler beim Öffnen der Datei"
+
+-#: filter.c:220
++#: filter.c:254
+ msgid "File does not seem to be a valid addressbook"
+ msgstr "Die Datei scheint kein gültiges Adressbuch zu sein"
+
+-#: filter.c:297
++#: filter.c:343
+ msgid "export database"
+ msgstr "exportiere Datenbank"
+
+ # instead: Exportiere alle (a), exportiere ausgewählte (s), oder abbrechen (c)?
+-#: filter.c:330
++#: filter.c:376
+ msgid "Export <a>ll, export <s>elected, or <c>ancel?"
+ msgstr "Exportiere <a>lle, exportiere au<s>gewählte, oder bri<c>h ab?"
+
+-#: filter.c:331 ui.c:632
++#: filter.c:377 ui.c:769
+ msgid "keybindings:all/selected/cancel|asc"
+-msgstr ""
++msgstr "asc"
+
+-#: filter.c:352
++#: filter.c:398
+ msgid "Error occured while exporting"
+ msgstr "Fehler beim Exportieren aufgetreten"
+
+-#: filter.c:1896
++#: filter.c:2469
+ #, c-format
+ msgid "%02d/%02d\tAnniversary of %s\n"
++msgstr "%02d/%02d\tJahrestag von %s\n"
++
++#: filter.c:2498
++#, c-format
++msgid "parse_custom_format: fmt_string or ft not allocated\n"
++msgstr ""
++
++#: filter.c:2517
++#, c-format
++msgid "parse_custom_format: invalid placeholder: {%s}\n"
++msgstr ""
++
++#: filter.c:2565
++#, c-format
++msgid "%s: invalid format, index %ld\n"
+ msgstr ""
+
+ #: help.h:11
+@@ -554,281 +618,302 @@
+ msgstr "\tr / Entf.\tAusgewählte Elemente entfernen\n"
+
+ #: help.h:21
++msgid "\tM\t\tmerge selected items (into top one)\n"
++msgstr ""
++
++#: help.h:22
+ msgid "\tD\t\tduplicate item\n"
+ msgstr "\tD\t\tElement verdoppeln\n"
+
+ #: help.h:23
++#, fuzzy
++msgid "\tU\t\tremove duplicates\n"
++msgstr "\tD\t\tElement verdoppeln\n"
++
++#: help.h:25
+ msgid "\tspace\t\tselect item\n"
+ msgstr "\tLeertaste\tElement auswählen\n"
+
+-#: help.h:24
++#: help.h:26
+ msgid "\t+\t\tselect all\n"
+ msgstr "\t+\t\tAlle auswählen\n"
+
+-#: help.h:25
++#: help.h:27
+ msgid "\t-\t\tunselect all\n"
+ msgstr "\t-\t\tAuswahl aufheben\n"
+
+-#: help.h:26
++#: help.h:28
+ msgid "\t*\t\tinvert selection\n"
+ msgstr "\t*\t\tAuswahl umkehren\n"
+
+-#: help.h:28
++#: help.h:30
+ msgid "\tw\t\twrite database to disk\n"
+ msgstr "\tw\t\tDatenbank auf die Festplatte speichern\n"
+
+-#: help.h:29
++#: help.h:31
+ msgid "\tl\t\tread database from disk\n"
+ msgstr "\tl\t\tDatenbank von der Festplatte lesen\n"
+
+-#: help.h:30
++#: help.h:32
+ msgid "\tC\t\tclear whole database\n"
+ msgstr "\tC\t\tGesamte Datenbank löschen\n"
+
+-#: help.h:31
++#: help.h:33
+ msgid "\ti\t\timport database\n"
+ msgstr "\ti\t\tDatenbank importieren\n"
+
+-#: help.h:32
++#: help.h:34
+ msgid "\te\t\texport database\n"
+ msgstr "\te\t\tDatenbank exportieren\n"
+
+-#: help.h:33
++#: help.h:35
+ msgid "\tp\t\tprint database\n"
+ msgstr "\tp\t\tDatenbank ausdrucken\n"
+
+-#: help.h:34
++#: help.h:36
+ msgid "\to\t\topen database\n"
+ msgstr "\to\t\tDatenbank öffnen\n"
+
+-#: help.h:36
++#: help.h:38
+ msgid "\ts\t\tsort database\n"
+ msgstr "\ts\t\tDatenbank sortieren\n"
+
+-#: help.h:37
++#: help.h:39
+ msgid "\tS\t\t\"surname sort\"\n"
+ msgstr "\tS\t\t\"Nachnamen-Sortierung\"\n"
+
+-#: help.h:38
++#: help.h:40
+ msgid "\tF\t\tsort by field (defined in configuration file)\n"
+ msgstr ""
+ "\tF\t\tNach Feld sortieren\n"
+ "\t\t\t(wie in der Konfigurationsdatei festgelegt)\n"
+
+-#: help.h:40
++#: help.h:42
+ msgid "\t/\t\tsearch\n"
+ msgstr "\t/\t\tSuchen\n"
+
+-#: help.h:41
++#: help.h:43
+ msgid "\t\\\t\tsearch next occurrence\n"
+ msgstr "\t\\\t\tNach nächstem Eintrag suchen\n"
+
+-#: help.h:43
++#: help.h:45
+ msgid "\tA\t\tmove current item up\n"
+ msgstr "\tA\t\tAktuelles Element nach oben verschieben\n"
+
+-#: help.h:44
++#: help.h:46
+ msgid "\tZ\t\tmove current item down\n"
+ msgstr "\tZ\t\tAktuelles Element nach unten verschieben\n"
+
+-#: help.h:46
++#: help.h:48
+ msgid "\tm\t\tsend mail with mutt\n"
+ msgstr "\tm\t\tE-Mail mit Mutt senden\n"
+
+-#: help.h:47
++#: help.h:49
+ msgid "\tv\t\tview URL with web browser\n"
+ msgstr "\tv\t\tURL mit Web-Browser anzeigen\n"
+
+-#: help.h:55
+-#, fuzzy
++#: help.h:57
+ msgid "\tarrows/h,l\t\tchange tab\n"
+-msgstr "\ta,c,p,o,C/Pfeilt./h,l\tTab wechseln\n"
++msgstr "\tPfeilt./h,l\t\tTab wechseln\n"
+
+-#: help.h:57
+-#, fuzzy
++#: help.h:59
+ msgid "\tq\t\t\tquit to main screen\n"
+-msgstr "\tQ\t\tBeenden ohne zu speichern\n"
++msgstr "\tq\t\t\tZum Hauptschirm zurück kehren\n"
+
+-#: help.h:59
+-#, fuzzy
++#: help.h:61
+ msgid "\t1 - 5 A - Z\t\tedit fields\n"
+-msgstr "\t1 - 5\t\t\tFelder bearbeiten\n"
++msgstr "\t1 - 5 A - Z\t\tFelder bearbeiten\n"
+
+-#: help.h:61
++#: help.h:63
+ msgid "\tk or <\t\t\tprevious item\n"
+ msgstr "\tk or <\t\t\tVorheriges Element\n"
+
+-#: help.h:62
++#: help.h:64
+ msgid "\tj or >\t\t\tnext item\n"
+ msgstr "\tj or >\t\t\tNächstes Element\n"
+
+-#: help.h:64
+-#, fuzzy
++#: help.h:66
+ msgid "\tr\t\t\troll e-mail addresses up\n"
+-msgstr "\tr\t\t\tE-Mail-Adressen rotieren\n"
++msgstr "\tr\t\t\tE-Mail-Adressen nach oben rotieren\n"
+
+-#: help.h:65
+-#, fuzzy
++#: help.h:67
+ msgid "\tESC-r\t\t\troll e-mail addresses down\n"
+-msgstr "\tr\t\t\tE-Mail-Adressen rotieren\n"
++msgstr "\tESC-r\t\t\tE-Mail-Adressen nach unten rotieren\n"
+
+-#: help.h:67
++#: help.h:69
+ msgid "\tu\t\t\tundo\n"
+ msgstr "\tu\t\t\tRückgängig\n"
+
+-#: help.h:69
++#: help.h:71
+ msgid "\tm\t\t\tsend mail with mutt\n"
+ msgstr "\tm\t\t\tE-Mail mit Mutt senden\n"
+
+-#: help.h:70
++#: help.h:72
+ msgid "\tv\t\t\tview url with web browser\n"
+ msgstr "\tv\t\t\tURL mit Web-Browser anzeigen\n"
+
+-#: options.c:250
++#: options.c:272
+ msgid "quote mismatch"
+-msgstr ""
++msgstr "fehlendes Hochkomma"
+
+-#: options.c:256
++#: options.c:278
+ msgid "no assignment character found"
+-msgstr ""
++msgstr "kein Zuweisungszeichen gefunden"
+
+-#: options.c:259
++#: options.c:281
+ msgid "error in comma separated list"
+ msgstr "Fehler in komma-separierter Liste"
+
+-#: options.c:289 options.c:308
++#: options.c:311 options.c:330
+ msgid "invalid value"
+ msgstr "ungültiger Wert"
+
+-#: options.c:329
++#: options.c:351
+ msgid "unknown option"
+ msgstr "unbekannte Option"
+
+-#: options.c:341
++#: options.c:363
+ #, c-format
+ msgid ""
+ "valid values for the 'preserve_fields' option are 'all', "
+ "'standard' (default), and 'none'\n"
+ msgstr ""
++"gültige Werte für die Option »preserve_fields« sind »all«, "
++"»standard« (Voreinstellung) und »none«\n"
+
+-#: options.c:350
++#: options.c:372
+ #, c-format
+ msgid ""
+ "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
+ "'us'\n"
+ msgstr ""
++"gültige Werte für die Option »address_style« sind »eu« (Voreinstellung), "
++"»uk« und »us«\n"
+
+-#: options.c:372
++#: options.c:394
+ msgid "invalid value assignment"
+ msgstr "ungültige Wertzuweisung"
+
+-#: options.c:380
++#: options.c:402
+ msgid ""
+ "customfield: obsolete command - please use the 'field' and 'view' commands "
+ "instead"
+ msgstr ""
++"customfield: veralteter Befehl - verwenden Sie bitte die Befehle »field« und "
++"»view«"
+
+-#: options.c:398
++#: options.c:420
+ msgid "no view name provided"
+-msgstr ""
++msgstr "kein Name für Ansicht angegeben"
+
+-#: options.c:428
++#: options.c:450
+ msgid "no field identifier provided"
+-msgstr ""
++msgstr "keine Feldkennzeichnung angegeben"
+
+-#: options.c:434
++#: options.c:456
+ msgid "no field name provided"
+-msgstr ""
++msgstr "kein Feldname angegeben"
+
+-#: options.c:490
++#: options.c:512
+ #, c-format
+ msgid "%s: parse error at line %d: "
+ msgstr "%s: Fehler beim Parsen in Zeile %d: "
+
+-#: options.c:494
++#: options.c:516
+ #, c-format
+ msgid "unknown token %s\n"
+ msgstr "unbekanntes Symbol %s\n"
+
+-#: ui.c:145
++#: ui.c:234
+ #, c-format
+ msgid "Your terminal size is %dx%d\n"
+ msgstr "Die Größe des Terminals ist %dx%d.\n"
+
+-#: ui.c:146
++#: ui.c:235
+ #, c-format
+ msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
+ msgstr "Das Terminal ist zu klein. Die minimale Größe für abook ist %dx%d.\n"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (Y/n)?"
+ msgstr " (J/n)?"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (y/N)?"
+ msgstr " (j/N)?"
+
+-#: ui.c:410
++#: ui.c:502
+ msgid "help"
+ msgstr "Hilfe"
+
+-#: ui.c:419
++#: ui.c:511
+ msgid "Press any key to continue..."
+ msgstr "Taste drücken, um fortzufahren..."
+
+ # "Lösche ausgewählte(s) Element(e)" sounds silly ... plural form is ok.
+-#: ui.c:539
++#: ui.c:656
+ msgid "Remove selected item(s)"
+ msgstr "Lösche ausgewählte Elemente"
+
+-#: ui.c:549
++#: ui.c:666
++#, fuzzy
++msgid "Merge selected items"
++msgstr "Keine Elemente ausgewählt"
++
++# "Lösche ausgewählte(s) Element(e)" sounds silly ... plural form is ok.
++#: ui.c:675
++#, fuzzy
++msgid "Remove duplicates"
++msgstr "Lösche ausgewählte Elemente"
++
++#: ui.c:685
+ msgid "Clear WHOLE database"
+ msgstr "Lösche GESAMTE Datenbank"
+
+-#: ui.c:582
++#: ui.c:718
+ msgid "Search hit bottom, continuing at top"
+ msgstr "Suche hat das Ende erreicht, weiter am Anfang"
+
+ # Why 'y', and not 'j'?
+ # c-format
+-#: ui.c:607
++#: ui.c:744
+ #, c-format
+ msgid "Your current data will be lost - Press '%c' to continue"
+ msgstr "Die aktuellen Daten sind verloren - Drücke '%c' um fortzufahren"
+
+ # instead: Drucke alle (a), drucke ausgewählte (s), oder abbrechen (c)?
+-#: ui.c:632
++#: ui.c:769
+ msgid "Print <a>ll, print <s>elected, or <c>ancel?"
+ msgstr "Drucke <a>lle, drucke au<s>gewählte oder bri<c>h ab?"
+
+-#: ui.c:638
++#: ui.c:775
+ msgid "No selected items"
+ msgstr "Keine Elemente ausgewählt"
+
+-#: ui.c:664
++#: ui.c:801
+ msgid "File to open: "
+ msgstr "Öffne Datei: "
+
+-#: ui.c:674
++#: ui.c:811
+ msgid "Save current database"
+ msgstr "Speichere aktuelle Datenbank"
+
+-#: ui.c:682
++#: ui.c:819
+ msgid "Sorry, the specified file appears not to be a valid abook addressbook"
+ msgstr ""
+ "Die angegebene Datei scheint leider kein gültiges abook Adressbuch zu sein"
+
+ #: views.c:87
+ msgid "undeclared field"
+-msgstr ""
++msgstr "undefiniertes Feld"
+
+ #: views.c:92
+ msgid "maximal number of fields per view reached"
+-msgstr ""
++msgstr "maximale Anzahl von Feldern für Ansicht erreicht"
+
+ #: views.c:95
+ msgid "field already in this view"
+-msgstr ""
++msgstr "Feld in dieser Ansicht bereits vorhanden"
+
+ #: views.c:139
+ msgid "CONTACT"
+@@ -869,3 +954,6 @@
+ #: views.c:169
+ msgid "Custom5"
+ msgstr "Benutzer5"
++
++#~ msgid "GnomeCard (VCard) addressbook"
++#~ msgstr "GnomeCard (VCard) Adressbuch"
+diff -urN BUILD/abook-0.6.0pre2/po/en@boldquot.header abook/po/en@boldquot.header
+--- BUILD/abook-0.6.0pre2/po/en@boldquot.header 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/en@boldquot.header 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,25 @@
++# All this catalog "translates" are quotation characters.
++# The msgids must be ASCII and therefore cannot contain real quotation
++# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
++# and double quote (0x22). These substitutes look strange; see
++# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
++#
++# This catalog translates grave accent (0x60) and apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019).
++# It also translates pairs of apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019)
++# and pairs of quotation mark (0x22) to
++# left double quotation mark (U+201C) and right double quotation mark (U+201D).
++#
++# When output to an UTF-8 terminal, the quotation characters appear perfectly.
++# When output to an ISO-8859-1 terminal, the single quotation marks are
++# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
++# grave/acute accent (by libiconv), and the double quotation marks are
++# transliterated to 0x22.
++# When output to an ASCII terminal, the single quotation marks are
++# transliterated to apostrophes, and the double quotation marks are
++# transliterated to 0x22.
++#
++# This catalog furthermore displays the text between the quotation marks in
++# bold face, assuming the VT100/XTerm escape sequences.
++#
+diff -urN BUILD/abook-0.6.0pre2/po/en@quot.header abook/po/en@quot.header
+--- BUILD/abook-0.6.0pre2/po/en@quot.header 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/en@quot.header 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,22 @@
++# All this catalog "translates" are quotation characters.
++# The msgids must be ASCII and therefore cannot contain real quotation
++# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
++# and double quote (0x22). These substitutes look strange; see
++# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
++#
++# This catalog translates grave accent (0x60) and apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019).
++# It also translates pairs of apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019)
++# and pairs of quotation mark (0x22) to
++# left double quotation mark (U+201C) and right double quotation mark (U+201D).
++#
++# When output to an UTF-8 terminal, the quotation characters appear perfectly.
++# When output to an ISO-8859-1 terminal, the single quotation marks are
++# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
++# grave/acute accent (by libiconv), and the double quotation marks are
++# transliterated to 0x22.
++# When output to an ASCII terminal, the single quotation marks are
++# transliterated to apostrophes, and the double quotation marks are
++# transliterated to 0x22.
++#
+Binarne pliki BUILD/abook-0.6.0pre2/po/fr.gmo i abook/po/fr.gmo różnią się
+diff -urN BUILD/abook-0.6.0pre2/po/fr.po abook/po/fr.po
+--- BUILD/abook-0.6.0pre2/po/fr.po 2006-09-06 16:14:38.000000000 +0200
++++ abook/po/fr.po 2013-03-13 15:07:45.000000000 +0100
+@@ -1,64 +1,66 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# This file is distributed under the same license as the PACKAGE package.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++# French translation for abook package.
++# Copyright (C) 2005 Free Software Foundation, Inc.
++# This file is distributed under the same license as the abook package.
++# Cedric Duval <cedricduval+abook@free.fr>, 2005-2006.
++# Michèle Garoche <michele.garoche@easyconnect.fr>, 2006.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: abook\n"
+ "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
+-"POT-Creation-Date: 2006-09-06 17:14+0300\n"
+-"PO-Revision-Date: 2006-09-05 11:42+0200\n"
+-"Last-Translator: Cedric Duval <cedricduval+abook@free.fr>\n"
++"POT-Creation-Date: 2013-01-17 14:44+0100\n"
++"PO-Revision-Date: 2006-09-08 14:37+0200\n"
++"Last-Translator: Michèle Garoche <michele.garoche@easyconnect.fr>\n"
+ "Language-Team: french\n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: abook.c:93
++#: abook.c:99
+ #, c-format
+ msgid "Cannot create directory %s\n"
+ msgstr "Impossible de créer le répertoire %s\n"
+
+-#: abook.c:99
++#: abook.c:105
+ #, c-format
+ msgid "%s is not a directory\n"
+ msgstr "%s n'est pas un répertoire\n"
+
+-#: abook.c:117
++#: abook.c:123
+ #, c-format
+ msgid "Memory allocation failure: %s\n"
+ msgstr "Erreur d'allocation mémoire: %s\n"
+
+-#: abook.c:128
++#: abook.c:134
+ #, c-format
+ msgid "Press enter to continue...\n"
+ msgstr "Appuyez sur entrée pour continuer...\n"
+
+-#: abook.c:143
++#: abook.c:149
+ #, c-format
+ msgid "File %s is not writeable"
+ msgstr "Impossible d'écrire dans le fichier %s"
+
+-#: abook.c:148
++#: abook.c:154
+ msgid "If you continue all changes will be lost. Do you want to continue?"
+ msgstr ""
+ "Si vous continuez, vos modifications seront perdues. Voulez-vous continuer ?"
+
+-#: abook.c:167
++#: abook.c:173
+ msgid "Save database"
+ msgstr "Sauvegarder la base de données"
+
+-#: abook.c:169
++#: abook.c:175
+ msgid "Quit without saving"
+ msgstr "Quitter sans sauvegarder"
+
+-#: abook.c:225
++#: abook.c:233
+ #, c-format
+ msgid "%s is not a valid HOME directory\n"
+ msgstr "%s n'est pas un répertoire personnel (HOME) valide\n"
+
+-#: abook.c:256
++#: abook.c:264
+ #, c-format
+ msgid ""
+ "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
+@@ -67,34 +69,44 @@
+ "Impossible de combiner les options --mutt-query, --convert, --add-email ou --"
+ "add-email-quiet\n"
+
+-#: abook.c:287
++#: abook.c:295
+ #, c-format
+ msgid "please use option --%s after --convert option\n"
+ msgstr "Veuillez utiliser l'option --%s après l'option --convert\n"
+
+-#: abook.c:386
++#: abook.c:382
++#, fuzzy, c-format
++msgid "please use option --outformat after --convert or --mutt-query option\n"
++msgstr "Veuillez utiliser l'option --%s après l'option --convert\n"
++
++#: abook.c:420
++#, fuzzy, c-format
++msgid "Invalid custom format string\n"
++msgstr "Valeur de champ invalide pour le classement"
++
++#: abook.c:428
+ #, c-format
+ msgid "%s: unrecognized arguments on command line\n"
+ msgstr "%s: paramètres de ligne de commande non reconnus\n"
+
+-#: abook.c:408
++#: abook.c:450
+ msgid " -h\t--help\t\t\t\tshow usage"
+ msgstr " -h\t--help\t\t\t\tafficher l'aide"
+
+-#: abook.c:409
++#: abook.c:451
+ msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
+ msgstr ""
+ " -C\t--config\t<fichier>\tutiliser un autre fichier de configuration"
+
+-#: abook.c:410
++#: abook.c:452
+ msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
+ msgstr "\t--datafile\t<fichier>\tutiliser un autre carnet d'adresses"
+
+-#: abook.c:411
++#: abook.c:453
+ msgid "\t--mutt-query\t<string>\tmake a query for mutt"
+ msgstr "\t--mutt-query\t<chaine>\teffectuer une requête pour mutt"
+
+-#: abook.c:412
++#: abook.c:454
+ msgid ""
+ "\t--add-email\t\t\tread an e-mail message from stdin and\n"
+ "\t\t\t\t\tadd the sender to the addressbook"
+@@ -103,7 +115,7 @@
+ "\t\t\t\t\tl'entrée standard et ajouter\n"
+ "\t\t\t\t\tl'expéditeur au carnet d'adresses"
+
+-#: abook.c:416
++#: abook.c:458
+ msgid ""
+ "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
+ "\t\t\t\t\trequire to confirm adding"
+@@ -111,66 +123,75 @@
+ "\t--add-email-quiet\t\tcomme --add-email mais sans nécessité de confirmer\n"
+ "\t\t\t\t\tl'ajout"
+
+-#: abook.c:420
++#: abook.c:462
+ msgid "\t--convert\t\t\tconvert address book files"
+ msgstr "\t--convert\t\t\tconvertir des carnets d'adresses"
+
+-#: abook.c:421
++#: abook.c:463
+ msgid "\toptions to use with --convert:"
+ msgstr "\toptions à utiliser avec --convert:"
+
+-#: abook.c:422
++#: abook.c:464
+ msgid "\t--informat\t<format>\tformat for input file"
+ msgstr "\t--informat\t<format>\tformat du fichier source"
+
+-#: abook.c:423
++#: abook.c:465
+ msgid "\t\t\t\t\t(default: abook)"
+ msgstr "\t\t\t\t\t(défaut: abook)"
+
+-#: abook.c:424
++#: abook.c:466
+ msgid "\t--infile\t<file>\t\tsource file"
+ msgstr "\t--infile\t<file>\t\tfichier source"
+
+-#: abook.c:425
++#: abook.c:467
+ msgid "\t\t\t\t\t(default: stdin)"
+ msgstr "\t\t\t\t\t(défaut: entrée standard)"
+
+-#: abook.c:426
++#: abook.c:468
+ msgid "\t--outformat\t<format>\tformat for output file"
+ msgstr "\t--outformat\t<format>\tformat du fichier de destination"
+
+-#: abook.c:427
++#: abook.c:469
+ msgid "\t\t\t\t\t(default: text)"
+ msgstr "\t\t\t\t\t(défaut: texte)"
+
+-#: abook.c:428
++#: abook.c:470
+ msgid "\t--outfile\t<file>\t\tdestination file"
+ msgstr "\t--outfile\t<file>\t\tfichier de destination"
+
+-#: abook.c:429
++#: abook.c:471
+ msgid "\t\t\t\t\t(default: stdout)"
+ msgstr "\t\t\t\t\t(défaut: sortie standard)"
+
+-#: abook.c:430
++#: abook.c:472
++#, fuzzy
++msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
++msgstr "\t--outformat\t<format>\tformat du fichier de destination"
++
++#: abook.c:473
++msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
++msgstr ""
++
++#: abook.c:474
+ msgid "\t--formats\t\t\tlist available formats"
+ msgstr "\t--formats\t\t\tlister les formats disponibles"
+
+-#: abook.c:501
++#: abook.c:528
+ #, c-format
+ msgid "Cannot open database\n"
+ msgstr "Impossible d'ouvrir la base de données\n"
+
+-#: abook.c:627
++#: abook.c:654
+ #, c-format
+ msgid "too few arguments to make conversion\n"
+ msgstr "trop peu de paramètres pour effectuer la conversion\n"
+
+-#: abook.c:628
++#: abook.c:655
+ #, c-format
+ msgid "try --help\n"
+ msgstr "essayez --help\n"
+
+-#: abook.c:633
++#: abook.c:660
+ #, c-format
+ msgid ""
+ "input and output formats are the same\n"
+@@ -179,46 +200,46 @@
+ "la source et la destination sont identiques\n"
+ "arrêt...\n"
+
+-#: abook.c:647
++#: abook.c:674
+ #, c-format
+ msgid "input format %s not supported\n"
+-msgstr "le format source %s n'est pas supporté\n"
++msgstr "le format source %s n'est pas géré\n"
+
+-#: abook.c:651
++#: abook.c:678
+ #, c-format
+ msgid "cannot read file %s\n"
+ msgstr "Impossible de lire le fichier %s\n"
+
+-#: abook.c:660
++#: abook.c:687
+ #, c-format
+ msgid "output format %s not supported\n"
+-msgstr "le format de destination %s n'est pas supporté\n"
++msgstr "le format de destination %s n'est pas géré\n"
+
+-#: abook.c:666
++#: abook.c:693
+ #, c-format
+ msgid "cannot write file %s\n"
+ msgstr "impossible d'écrire le fichier %s\n"
+
+-#: abook.c:687
++#: abook.c:714
+ #, c-format
+ msgid "cannot open %s\n"
+ msgstr "impossible d'ouvrir %s\n"
+
+-#: abook.c:690
++#: abook.c:717
+ #, c-format
+ msgid "%d item(s) added to %s\n"
+ msgstr "%d entrées ajoutées à %s\n"
+
+-#: abook.c:692
++#: abook.c:719
+ msgid "Valid sender address not found"
+ msgstr "Aucune adresse d'expéditeur valide trouvée"
+
+-#: abook.c:732
++#: abook.c:760
+ #, c-format
+ msgid "Address %s already in addressbook\n"
+ msgstr "L'adresse %s figure déjà dans le carnet d'adresses\n"
+
+-#: abook.c:742
++#: abook.c:770
+ #, c-format
+ msgid ""
+ "cannot open /dev/tty\n"
+@@ -227,27 +248,27 @@
+ "impossible d'ouvrir /dev/tty\n"
+ "peut-être souhaitez-vous utiliser --add-email-quiet\n"
+
+-#: abook.c:748
++#: abook.c:776
+ #, c-format
+ msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
+ msgstr "Ajouter \"%s <%s>\" à %s ? (%c/%c)\n"
+
+-#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
++#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
+ msgid "keybinding for yes|y"
+ msgstr "o"
+
+-#: abook.c:753 abook.c:755 ui.c:341
++#: abook.c:781 abook.c:783 ui.c:432
+ msgid "keybinding for no|n"
+ msgstr "n"
+
+-#: abook.c:780
++#: abook.c:808
+ #, c-format
+ msgid "stdin is a directory or cannot stat stdin\n"
+ msgstr "stdin est un répertoire, ou impossible d'en quérir son état\n"
+
+ #: abook.h:16
+ msgid "q:quit ?:help a:add r:remove"
+-msgstr "q:quitter ?:aide a:ajouter r:supprimer"
++msgstr "q:quitter ?:aide a:ajouter r:supprimer"
+
+ #: database.c:45
+ msgid "Name"
+@@ -255,7 +276,7 @@
+
+ #: database.c:46
+ msgid "E-mail addresses"
+-msgstr "Adresses email:"
++msgstr "Adresses email"
+
+ #: database.c:47
+ msgid "Address"
+@@ -313,195 +334,240 @@
+ msgid "Anniversary day"
+ msgstr "Date d'anniversaire"
+
+-#: database.c:166
++#: database.c:61
++msgid "Groups"
++msgstr ""
++
++#: database.c:167
+ msgid "field already defined"
+ msgstr "champ déjà défini"
+
+-#: database.c:170
++#: database.c:171
+ msgid "standard field does not need to be declared"
+ msgstr "les champs standard n'ont pas besoin d'être déclarés"
+
+-#: database.c:185
++#: database.c:186
+ msgid "unknown type"
+ msgstr "type inconnu"
+
+-#: database.c:585
++#: database.c:648
+ msgid "Invalid field value defined in configuration"
+ msgstr "Valeur de champ invalide définie dans la configuration"
+
+-#: database.c:588
++#: database.c:651
+ msgid "Invalid field value for sorting"
+ msgstr "Valeur de champ invalide pour le classement"
+
+-# Comment traduire 'tab' ?
+-#: edit.c:51
++#: edit.c:59
+ msgid "Tab name too wide for screen"
+ msgstr "Intitulé d'onglet trop large pour l'écran"
+
+-#: edit.c:353
++#: edit.c:360
+ msgid "keybindings_new_123456789|n123456789"
+ msgstr "n123456789"
+
+-#: edit.c:355
++#: edit.c:362
+ #, c-format
+ msgid "Choose %s to modify (<1>%s%c%s%s."
+ msgstr "Choisir %s à modifier (<1>%s%c%s%s."
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "email"
+ msgstr "email"
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "item"
+ msgstr "entrée"
+
+-#: edit.c:361
++#: edit.c:368
+ msgid " or <n>ew"
+ msgstr " ou <n>nouveau"
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "E-mail: "
+ msgstr "Emails: "
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "Item: "
+ msgstr "Entrée: "
+
+-#: edit.c:465
++#: edit.c:460
++msgid "%Y-%M-%D"
++msgstr ""
++
++#: edit.c:461
++msgid "--%M-%D"
++msgstr ""
++
++#: edit.c:539
+ msgid "Day: "
+ msgstr "Jour: "
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Month: "
+ msgstr "Mois: "
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Year (optional): "
+ msgstr "Année (optionnelle): "
+
+-#: edit.c:498
++#: edit.c:569
+ msgid "Invalid date"
+ msgstr "Date invalide"
+
+-#: edit.c:653
++#: edit.c:776
+ msgid "Name: "
+ msgstr "Nom: "
+
+-#: edit.h:14
++#: edit.h:18
+ msgid "?:help q:quit editor"
+-msgstr "?:aide q:quitter l'éditeur"
++msgstr "?: aide q: quitter l'éditeur"
+
+-#: filter.c:71 filter.c:82
++#: filter.c:88 filter.c:100
+ msgid "abook native format"
+ msgstr "format natif abook"
+
+-#: filter.c:72
++#: filter.c:89
+ msgid "ldif / Netscape addressbook"
+ msgstr "ldif / carnet d'adresses Netscape"
+
+-#: filter.c:73 filter.c:84
++#: filter.c:90 filter.c:103 filter.c:121
+ msgid "mutt alias"
+ msgstr "alias mutt"
+
+-#: filter.c:74 filter.c:86
++#: filter.c:91 filter.c:106
+ msgid "pine addressbook"
+ msgstr "carnet d'adresses pine"
+
+-#: filter.c:75 filter.c:88
++#: filter.c:92 filter.c:107
+ msgid "comma separated values"
+ msgstr "valeurs délimitées par des virgules"
+
+-#: filter.c:76 filter.c:89
++#: filter.c:93 filter.c:108
+ msgid "comma separated values (all fields)"
+ msgstr "valeurs délimitées par des virgules (tous les champs)"
+
+-#: filter.c:77 filter.c:90
++#: filter.c:94 filter.c:109
+ msgid "Palm comma separated values"
+ msgstr "valeur délimitées par des virgules, format Palm"
+
+-#: filter.c:83
++#: filter.c:95
++msgid "vCard file"
++msgstr ""
++
++#: filter.c:101
+ msgid "ldif / Netscape addressbook (.4ld)"
+ msgstr "ldif / carnet d'adresses Netscape (.41d)"
+
+-#: filter.c:85
++#: filter.c:102 filter.c:120
++msgid "vCard 2 file"
++msgstr ""
++
++#: filter.c:104
++msgid "mutt query format (internal use)"
++msgstr ""
++
++#: filter.c:105
+ msgid "html document"
+ msgstr "document html"
+
+-#: filter.c:87
+-msgid "GnomeCard (VCard) addressbook"
+-msgstr "carnet d'adresses GnomCard (VCard)"
+-
+-#: filter.c:91
++#: filter.c:110
+ msgid "elm alias"
+ msgstr "alias elm"
+
+-#: filter.c:92
++#: filter.c:111
+ msgid "plain text"
+ msgstr "texte simple"
+
+-#: filter.c:93
++#: filter.c:112
+ msgid "Wanderlust address book"
+ msgstr "carnet d'adresses Wanderlust"
+
+-#: filter.c:94
++#: filter.c:113
+ msgid "Spruce address book"
+ msgstr "carnet d'adresses Spruce"
+
+-#: filter.c:95
++#: filter.c:114
+ msgid "BSD calendar"
+-msgstr ""
++msgstr "Calendrier BSD"
++
++#: filter.c:115 filter.c:122
++#, fuzzy
++msgid "Custom format"
++msgstr "Personnalisé1"
+
+-#: filter.c:108
+-msgid "input:"
++#: filter.c:135
++#, fuzzy
++msgid "input formats:"
+ msgstr "entrée:"
+
+-#: filter.c:115
+-msgid "output:"
++#: filter.c:142
++#, fuzzy
++msgid "output formats:"
+ msgstr "sortie:"
+
+-#: filter.c:180
++#: filter.c:149
++msgid "query-compatible output formats:"
++msgstr ""
++
++#: filter.c:214
+ msgid "import database"
+ msgstr "importer la base de données"
+
+-#: filter.c:182 filter.c:299
++#: filter.c:216 filter.c:345
+ msgid "please select a filter"
+ msgstr "veuillez choisir un filtre"
+
+-#: filter.c:190 filter.c:307
++#: filter.c:224 filter.c:353
+ msgid "x -\tcancel"
+ msgstr "x - \tannuler"
+
+-#: filter.c:211 filter.c:345
++#: filter.c:245 filter.c:391
+ msgid "Filename: "
+ msgstr "Nom de fichier: "
+
+-#: filter.c:218
++#: filter.c:252
+ msgid "Error occured while opening the file"
+ msgstr "Une erreur est survenue à l'ouverture du fichier"
+
+-#: filter.c:220
++#: filter.c:254
+ msgid "File does not seem to be a valid addressbook"
+ msgstr "Le fichier spécifié ne semble pas être un carnet d'adresses valide"
+
+-#: filter.c:297
++#: filter.c:343
+ msgid "export database"
+ msgstr "exporter la base de données"
+
+-#: filter.c:330
++#: filter.c:376
+ msgid "Export <a>ll, export <s>elected, or <c>ancel?"
+ msgstr "Exporter <t>out, exporter les entrées <s>électionnées, ou <a>nnuler ?"
+
+-#: filter.c:331 ui.c:632
++#: filter.c:377 ui.c:769
+ msgid "keybindings:all/selected/cancel|asc"
+ msgstr "tsa"
+
+-#: filter.c:352
++#: filter.c:398
+ msgid "Error occured while exporting"
+ msgstr "Une erreur est survenue lors de l'exportation"
+
+-#: filter.c:1896
++#: filter.c:2469
+ #, c-format
+ msgid "%02d/%02d\tAnniversary of %s\n"
++msgstr "%02d/%02d\tAnniversaire de %s\n"
++
++#: filter.c:2498
++#, c-format
++msgid "parse_custom_format: fmt_string or ft not allocated\n"
++msgstr ""
++
++#: filter.c:2517
++#, c-format
++msgid "parse_custom_format: invalid placeholder: {%s}\n"
++msgstr ""
++
++#: filter.c:2565
++#, c-format
++msgid "%s: invalid format, index %ld\n"
+ msgstr ""
+
+ #: help.h:11
+@@ -540,155 +606,164 @@
+
+ #: help.h:20
+ msgid "\tr / del\t\tremove selected items\n"
+-msgstr "\tr / suppr\t\tsupprimer les entrées sélectionnées\n"
++msgstr "\tr / suppr\tsupprimer les entrées sélectionnées\n"
+
+ #: help.h:21
++msgid "\tM\t\tmerge selected items (into top one)\n"
++msgstr ""
++
++#: help.h:22
+ msgid "\tD\t\tduplicate item\n"
+ msgstr "\tD\t\tdupliquer une entrée\n"
+
+ #: help.h:23
++#, fuzzy
++msgid "\tU\t\tremove duplicates\n"
++msgstr "\tD\t\tdupliquer une entrée\n"
++
++#: help.h:25
+ msgid "\tspace\t\tselect item\n"
+ msgstr "\tespace\t\tsélectionner une entrée\n"
+
+-#: help.h:24
++#: help.h:26
+ msgid "\t+\t\tselect all\n"
+ msgstr "\t+\t\ttout sélectionner\n"
+
+-#: help.h:25
++#: help.h:27
+ msgid "\t-\t\tunselect all\n"
+ msgstr "\t-\t\ttout désélectionner\n"
+
+-#: help.h:26
++#: help.h:28
+ msgid "\t*\t\tinvert selection\n"
+ msgstr "\t*\t\tinverser la sélection\n"
+
+-#: help.h:28
++#: help.h:30
+ msgid "\tw\t\twrite database to disk\n"
+ msgstr "\tw\t\técrire la base de données sur le disque\n"
+
+-#: help.h:29
++#: help.h:31
+ msgid "\tl\t\tread database from disk\n"
+ msgstr "\tl\t\tlire la base de données depuis le disque\n"
+
+-#: help.h:30
++#: help.h:32
+ msgid "\tC\t\tclear whole database\n"
+ msgstr "\tC\t\teffacer entièrement la base de données\n"
+
+-#: help.h:31
++#: help.h:33
+ msgid "\ti\t\timport database\n"
+ msgstr "\ti\t\timporter une base de données\n"
+
+-#: help.h:32
++#: help.h:34
+ msgid "\te\t\texport database\n"
+ msgstr "\te\t\texporter la base de données\n"
+
+-#: help.h:33
++#: help.h:35
+ msgid "\tp\t\tprint database\n"
+ msgstr "\tp\t\timprimer la base de données\n"
+
+-#: help.h:34
++#: help.h:36
+ msgid "\to\t\topen database\n"
+ msgstr "\to\t\touvrir une base de données\n"
+
+-#: help.h:36
++#: help.h:38
+ msgid "\ts\t\tsort database\n"
+ msgstr "\ts\t\tclasser la base de données\n"
+
+-#: help.h:37
++#: help.h:39
+ msgid "\tS\t\t\"surname sort\"\n"
+ msgstr "\tS\t\tclassement par nom de famille\n"
+
+-#: help.h:38
++#: help.h:40
+ msgid "\tF\t\tsort by field (defined in configuration file)\n"
+ msgstr ""
+ "\tF\t\tclassement par champ\n"
+ "\t\t\t(défini dans le fichier de configuration)\n"
+
+-#: help.h:40
++#: help.h:42
+ msgid "\t/\t\tsearch\n"
+ msgstr "\t/\t\trechercher\n"
+
+-#: help.h:41
++#: help.h:43
+ msgid "\t\\\t\tsearch next occurrence\n"
+ msgstr "\t\\\t\trechercher la correspondance suivante\n"
+
+-#: help.h:43
++#: help.h:45
+ msgid "\tA\t\tmove current item up\n"
+ msgstr "\tA\t\tdéplacer l'entrée courante vers le haut\n"
+
+-#: help.h:44
++#: help.h:46
+ msgid "\tZ\t\tmove current item down\n"
+ msgstr "\tZ\t\tdéplacer l'entrée courante vers le bas\n"
+
+-#: help.h:46
++#: help.h:48
+ msgid "\tm\t\tsend mail with mutt\n"
+ msgstr "\tm\t\tenvoyer un courrier électronique avec mutt\n"
+
+-#: help.h:47
++#: help.h:49
+ msgid "\tv\t\tview URL with web browser\n"
+ msgstr "\tv\t\tvisualiser l'URL avec un navigateur web\n"
+
+-#: help.h:55
++#: help.h:57
+ msgid "\tarrows/h,l\t\tchange tab\n"
+-msgstr "\tflèches/h,l\tchanger de \"tab\"\n"
++msgstr "\tflèches/h,l\tchanger d'onglet\n"
+
+-#: help.h:57
++#: help.h:59
+ msgid "\tq\t\t\tquit to main screen\n"
+ msgstr "\tq\t\tretourner à l'écran principal\n"
+
+-#: help.h:59
++#: help.h:61
+ msgid "\t1 - 5 A - Z\t\tedit fields\n"
+ msgstr "\t1 - 5 A - Z\t\t\téditer les champs\n"
+
+-#: help.h:61
++#: help.h:63
+ msgid "\tk or <\t\t\tprevious item\n"
+ msgstr "\tk ou <\t\t\tentrée précédente\n"
+
+-#: help.h:62
++#: help.h:64
+ msgid "\tj or >\t\t\tnext item\n"
+ msgstr "\tj ou >\t\t\tentrée suivante\n"
+
+-#: help.h:64
++#: help.h:66
+ msgid "\tr\t\t\troll e-mail addresses up\n"
+ msgstr "\tr\t\t\trotation des adresses email vers le haut\n"
+
+-#: help.h:65
++#: help.h:67
+ msgid "\tESC-r\t\t\troll e-mail addresses down\n"
+ msgstr "\tESC-r\t\t\trotation des adresses email vers le bas\n"
+
+-#: help.h:67
++#: help.h:69
+ msgid "\tu\t\t\tundo\n"
+ msgstr "\tu\t\t\tannuler\n"
+
+-#: help.h:69
++#: help.h:71
+ msgid "\tm\t\t\tsend mail with mutt\n"
+ msgstr "\tm\t\t\tenvoyer un courrier électronique avec mutt\n"
+
+-#: help.h:70
++#: help.h:72
+ msgid "\tv\t\t\tview url with web browser\n"
+ msgstr "\tv\t\t\tvisualiser l'URL avec un navigateur web\n"
+
+-#: options.c:250
++#: options.c:272
+ msgid "quote mismatch"
+ msgstr "problème de correspondance de guillemets"
+
+-#: options.c:256
++#: options.c:278
+ msgid "no assignment character found"
+ msgstr "pas de caractère d'affectation trouvé"
+
+-#: options.c:259
++#: options.c:281
+ msgid "error in comma separated list"
+ msgstr "erreur dans la liste de valeurs délimitées par des virgules"
+
+-#: options.c:289 options.c:308
++#: options.c:311 options.c:330
+ msgid "invalid value"
+ msgstr "valeur invalide"
+
+-#: options.c:329
++#: options.c:351
+ msgid "unknown option"
+ msgstr "option inconnue"
+
+-#: options.c:341
++#: options.c:363
+ #, c-format
+ msgid ""
+ "valid values for the 'preserve_fields' option are 'all', "
+@@ -697,7 +772,7 @@
+ "les valeurs correctes pour 'preserve_fields' sont 'all', "
+ "'standard' (défaut), et 'none'\n"
+
+-#: options.c:350
++#: options.c:372
+ #, c-format
+ msgid ""
+ "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
+@@ -706,11 +781,11 @@
+ "les valeurs correctes pour 'address_style' sont 'eu' (défaut), 'uk', et "
+ "'us'\n"
+
+-#: options.c:372
++#: options.c:394
+ msgid "invalid value assignment"
+ msgstr "affectation de valeur invalide"
+
+-#: options.c:380
++#: options.c:402
+ msgid ""
+ "customfield: obsolete command - please use the 'field' and 'view' commands "
+ "instead"
+@@ -718,88 +793,98 @@
+ "customfield: commande obsolète - veuillez utiliser les commandes 'field' et "
+ "'view'"
+
+-#: options.c:398
++#: options.c:420
+ msgid "no view name provided"
+ msgstr "aucun nom de vue donné"
+
+-#: options.c:428
++#: options.c:450
+ msgid "no field identifier provided"
+ msgstr "aucun identifieur de champ donné"
+
+-#: options.c:434
++#: options.c:456
+ msgid "no field name provided"
+ msgstr "aucun nom de champ donné"
+
+-#: options.c:490
++#: options.c:512
+ #, c-format
+ msgid "%s: parse error at line %d: "
+ msgstr "%s: erreur d'analyse lexicale à la ligne %d: "
+
+-#: options.c:494
++#: options.c:516
+ #, c-format
+ msgid "unknown token %s\n"
+ msgstr "symbole inconnu %s\n"
+
+-#: ui.c:145
++#: ui.c:234
+ #, c-format
+ msgid "Your terminal size is %dx%d\n"
+ msgstr "La taille de votre terminal est de %dx%d\n"
+
+-#: ui.c:146
++#: ui.c:235
+ #, c-format
+ msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
+ msgstr "Terminal trop petit. Taille minimale de terminal pour abook: %dx%d\n"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (Y/n)?"
+ msgstr " (O/n) ?"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (y/N)?"
+ msgstr " (o/N) ?"
+
+-#: ui.c:410
++#: ui.c:502
+ msgid "help"
+ msgstr "aide"
+
+-#: ui.c:419
++#: ui.c:511
+ msgid "Press any key to continue..."
+ msgstr "Appuyez sur une touche pour continuer..."
+
+-#: ui.c:539
++#: ui.c:656
+ msgid "Remove selected item(s)"
+ msgstr "Supprimer les entrées sélectionnées"
+
+-#: ui.c:549
++#: ui.c:666
++#, fuzzy
++msgid "Merge selected items"
++msgstr "Pas d'entrée sélectionnée"
++
++#: ui.c:675
++#, fuzzy
++msgid "Remove duplicates"
++msgstr "Supprimer les entrées sélectionnées"
++
++#: ui.c:685
+ msgid "Clear WHOLE database"
+ msgstr "Effacer ENTIÈREMENT la base de données"
+
+-#: ui.c:582
++#: ui.c:718
+ msgid "Search hit bottom, continuing at top"
+ msgstr "La recherche a atteint la fin, poursuite au début"
+
+-#: ui.c:607
++#: ui.c:744
+ #, c-format
+ msgid "Your current data will be lost - Press '%c' to continue"
+ msgstr "Vos données actuelles seront perdues - Appuyez sur '%c' pour continuer"
+
+-#: ui.c:632
++#: ui.c:769
+ msgid "Print <a>ll, print <s>elected, or <c>ancel?"
+ msgstr "Imprimer <t>out, imprimer les entrées <s>électionnées, ou <a>nnuler ?"
+
+-#: ui.c:638
++#: ui.c:775
+ msgid "No selected items"
+ msgstr "Pas d'entrée sélectionnée"
+
+-#: ui.c:664
++#: ui.c:801
+ msgid "File to open: "
+ msgstr "Fichier à ouvrir: "
+
+-#: ui.c:674
++#: ui.c:811
+ msgid "Save current database"
+ msgstr "Sauvegarder la base de données"
+
+-#: ui.c:682
++#: ui.c:819
+ msgid "Sorry, the specified file appears not to be a valid abook addressbook"
+ msgstr ""
+ "Désolé, le fichier spécifié ne semble pas être un carnet d'adresses valide"
+@@ -856,11 +941,5 @@
+ msgid "Custom5"
+ msgstr "Personnalisé5"
+
+-#~ msgid "sorry, input for this field type is not yet implemented"
+-#~ msgstr "désolé, l'entrée pour ce type de champ n'est pas encore implémentée"
+-
+-#~ msgid "?:help c:contact a:address p:phone o:other"
+-#~ msgstr "?:aide c:contact a:adresse p:téléphone o:autre"
+-
+-#~ msgid "invalid custom field number"
+-#~ msgstr "numéro de champ personnalisé invalide"
++#~ msgid "GnomeCard (VCard) addressbook"
++#~ msgstr "carnet d'adresses GnomCard (VCard)"
+diff -urN BUILD/abook-0.6.0pre2/po/insert-header.sin abook/po/insert-header.sin
+--- BUILD/abook-0.6.0pre2/po/insert-header.sin 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/insert-header.sin 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,23 @@
++# Sed script that inserts the file called HEADER before the header entry.
++#
++# At each occurrence of a line starting with "msgid ", we execute the following
++# commands. At the first occurrence, insert the file. At the following
++# occurrences, do nothing. The distinction between the first and the following
++# occurrences is achieved by looking at the hold space.
++/^msgid /{
++x
++# Test if the hold space is empty.
++s/m/m/
++ta
++# Yes it was empty. First occurrence. Read the file.
++r HEADER
++# Output the file's contents by reading the next line. But don't lose the
++# current line while doing this.
++g
++N
++bb
++:a
++# The hold space was nonempty. Following occurrences. Do nothing.
++x
++:b
++}
+Binarne pliki BUILD/abook-0.6.0pre2/po/it.gmo i abook/po/it.gmo różnią się
+diff -urN BUILD/abook-0.6.0pre2/po/it.po abook/po/it.po
+--- BUILD/abook-0.6.0pre2/po/it.po 2006-09-06 16:14:38.000000000 +0200
++++ abook/po/it.po 2013-03-13 15:07:45.000000000 +0100
+@@ -7,10 +7,11 @@
+ msgstr ""
+ "Project-Id-Version: abook 0.5.5\n"
+ "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
+-"POT-Creation-Date: 2006-09-06 17:14+0300\n"
++"POT-Creation-Date: 2013-01-17 14:44+0100\n"
+ "PO-Revision-Date: 2006-08-26 01:26+0200\n"
+ "Last-Translator: Claudio Stazzone <c.stazzo@jumpy.it>\n"
+ "Language-Team: none\n"
++"Language: it\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-15\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -19,49 +20,49 @@
+ "X-Poedit-Country: ITALY\n"
+ "X-Poedit-SourceCharset: iso-8859-15\n"
+
+-#: abook.c:93
++#: abook.c:99
+ #, c-format
+ msgid "Cannot create directory %s\n"
+ msgstr "Non posso creare la directory %s\n"
+
+-#: abook.c:99
++#: abook.c:105
+ #, c-format
+ msgid "%s is not a directory\n"
+ msgstr "%s non è una directory\n"
+
+-#: abook.c:117
++#: abook.c:123
+ #, c-format
+ msgid "Memory allocation failure: %s\n"
+ msgstr "Allocazione di memoria fallita: %s\n"
+
+-#: abook.c:128
++#: abook.c:134
+ #, c-format
+ msgid "Press enter to continue...\n"
+ msgstr "Premi invio per continuare...\n"
+
+-#: abook.c:143
++#: abook.c:149
+ #, c-format
+ msgid "File %s is not writeable"
+ msgstr "Il file %s non è scrivibile"
+
+-#: abook.c:148
++#: abook.c:154
+ msgid "If you continue all changes will be lost. Do you want to continue?"
+ msgstr "Se continui i cambiamenti verranno persi. Vuoi continuare?"
+
+-#: abook.c:167
++#: abook.c:173
+ msgid "Save database"
+ msgstr "Salva il database"
+
+-#: abook.c:169
++#: abook.c:175
+ msgid "Quit without saving"
+ msgstr "Esci senza salvare"
+
+-#: abook.c:225
++#: abook.c:233
+ #, c-format
+ msgid "%s is not a valid HOME directory\n"
+ msgstr "%s non è una directory HOME valida\n"
+
+-#: abook.c:256
++#: abook.c:264
+ #, c-format
+ msgid ""
+ "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
+@@ -70,33 +71,43 @@
+ "Non posso combinare le opzioni --mutt-query, --convert, --add-email o --add-"
+ "email-quiet\n"
+
+-#: abook.c:287
++#: abook.c:295
+ #, c-format
+ msgid "please use option --%s after --convert option\n"
+ msgstr "per favore usa l'opzione --%s dopo --convert option\n"
+
+-#: abook.c:386
++#: abook.c:382
++#, fuzzy, c-format
++msgid "please use option --outformat after --convert or --mutt-query option\n"
++msgstr "per favore usa l'opzione --%s dopo --convert option\n"
++
++#: abook.c:420
++#, fuzzy, c-format
++msgid "Invalid custom format string\n"
++msgstr "Valore di campo errato per l'ordinamento"
++
++#: abook.c:428
+ #, c-format
+ msgid "%s: unrecognized arguments on command line\n"
+ msgstr "%s: argomenti non validi\n"
+
+-#: abook.c:408
++#: abook.c:450
+ msgid " -h\t--help\t\t\t\tshow usage"
+ msgstr " -h\t--help\t\t\t\tmostra l'utilizzo"
+
+-#: abook.c:409
++#: abook.c:451
+ msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
+ msgstr " -C\t--config\t<file>\t\tusa un file di configurazione diverso"
+
+-#: abook.c:410
++#: abook.c:452
+ msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
+ msgstr "\t--datafile\t<file>\t\tusa un file di rubrica diverso"
+
+-#: abook.c:411
++#: abook.c:453
+ msgid "\t--mutt-query\t<string>\tmake a query for mutt"
+ msgstr "\t--mutt-query\t<string>\tesegue una ricerca per mutt"
+
+-#: abook.c:412
++#: abook.c:454
+ msgid ""
+ "\t--add-email\t\t\tread an e-mail message from stdin and\n"
+ "\t\t\t\t\tadd the sender to the addressbook"
+@@ -104,7 +115,7 @@
+ "\t--add-email\t\t\tlegge un messaggio da standard input e\n"
+ "\t\t\t\t\taggiunge il mittente alla rubrica"
+
+-#: abook.c:416
++#: abook.c:458
+ msgid ""
+ "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
+ "\t\t\t\t\trequire to confirm adding"
+@@ -112,66 +123,75 @@
+ "\t--add-email-quiet\t\tlo stesso che --add-email ma non\n"
+ "\t\t\t\t\trichiede la conferma"
+
+-#: abook.c:420
++#: abook.c:462
+ msgid "\t--convert\t\t\tconvert address book files"
+ msgstr "\t--convert\t\t\tconverte i file di rubrica"
+
+-#: abook.c:421
++#: abook.c:463
+ msgid "\toptions to use with --convert:"
+ msgstr "\topzioni da usare con --convert:"
+
+-#: abook.c:422
++#: abook.c:464
+ msgid "\t--informat\t<format>\tformat for input file"
+ msgstr "\t--informat\t<format>\tformato del file di input"
+
+-#: abook.c:423
++#: abook.c:465
+ msgid "\t\t\t\t\t(default: abook)"
+ msgstr "\t\t\t\t\t(predefinito: abook)"
+
+-#: abook.c:424
++#: abook.c:466
+ msgid "\t--infile\t<file>\t\tsource file"
+ msgstr "\t--infile\t<file>\t\tfile sorgente"
+
+-#: abook.c:425
++#: abook.c:467
+ msgid "\t\t\t\t\t(default: stdin)"
+ msgstr "\t\t\t\t\t(predefinito: standard input)"
+
+-#: abook.c:426
++#: abook.c:468
+ msgid "\t--outformat\t<format>\tformat for output file"
+ msgstr "\t--outformat\t<format>\tformato file di output"
+
+-#: abook.c:427
++#: abook.c:469
+ msgid "\t\t\t\t\t(default: text)"
+ msgstr "\t\t\t\t\t(predefinito: testo)"
+
+-#: abook.c:428
++#: abook.c:470
+ msgid "\t--outfile\t<file>\t\tdestination file"
+ msgstr "\t--outfile\t<file>\t\tfile di destinazione"
+
+-#: abook.c:429
++#: abook.c:471
+ msgid "\t\t\t\t\t(default: stdout)"
+ msgstr "\t\t\t\t\t(predefinito: standard output)"
+
+-#: abook.c:430
++#: abook.c:472
++#, fuzzy
++msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
++msgstr "\t--outformat\t<format>\tformato file di output"
++
++#: abook.c:473
++msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
++msgstr ""
++
++#: abook.c:474
+ msgid "\t--formats\t\t\tlist available formats"
+ msgstr "\t--formats\t\t\tlista dei formati disponibili"
+
+-#: abook.c:501
++#: abook.c:528
+ #, c-format
+ msgid "Cannot open database\n"
+ msgstr "Non posso aprire il database\n"
+
+-#: abook.c:627
++#: abook.c:654
+ #, c-format
+ msgid "too few arguments to make conversion\n"
+ msgstr "argomenti insufficienti per convertire\n"
+
+-#: abook.c:628
++#: abook.c:655
+ #, c-format
+ msgid "try --help\n"
+ msgstr "prova --help\n"
+
+-#: abook.c:633
++#: abook.c:660
+ #, c-format
+ msgid ""
+ "input and output formats are the same\n"
+@@ -180,46 +200,46 @@
+ "i formati di input e output sono gli stessi\n"
+ "uscita...\n"
+
+-#: abook.c:647
++#: abook.c:674
+ #, c-format
+ msgid "input format %s not supported\n"
+ msgstr "formato di input %s non supportato\n"
+
+-#: abook.c:651
++#: abook.c:678
+ #, c-format
+ msgid "cannot read file %s\n"
+ msgstr "non posso leggere il file %s\n"
+
+-#: abook.c:660
++#: abook.c:687
+ #, c-format
+ msgid "output format %s not supported\n"
+ msgstr "formato di output %s non supportato\n"
+
+-#: abook.c:666
++#: abook.c:693
+ #, c-format
+ msgid "cannot write file %s\n"
+ msgstr "non posso scrivere il file %s\n"
+
+-#: abook.c:687
++#: abook.c:714
+ #, c-format
+ msgid "cannot open %s\n"
+ msgstr "non posso aprire %s\n"
+
+-#: abook.c:690
++#: abook.c:717
+ #, c-format
+ msgid "%d item(s) added to %s\n"
+ msgstr "%d oggetto/i aggiunto/i a %s\n"
+
+-#: abook.c:692
++#: abook.c:719
+ msgid "Valid sender address not found"
+ msgstr "Impossibile trovare un valido indirizzo del mittente"
+
+-#: abook.c:732
++#: abook.c:760
+ #, c-format
+ msgid "Address %s already in addressbook\n"
+ msgstr "Indirizzo %s già presente in rubrica\n"
+
+-#: abook.c:742
++#: abook.c:770
+ #, c-format
+ msgid ""
+ "cannot open /dev/tty\n"
+@@ -228,20 +248,20 @@
+ "non posso aprire /dev/tty\n"
+ "puoi usare --add-email-quiet\n"
+
+-#: abook.c:748
++#: abook.c:776
+ #, c-format
+ msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
+ msgstr "Aggiungi \"%s <%s>\" a %s? (%c/%c)\n"
+
+-#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
++#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
+ msgid "keybinding for yes|y"
+ msgstr "s"
+
+-#: abook.c:753 abook.c:755 ui.c:341
++#: abook.c:781 abook.c:783 ui.c:432
+ msgid "keybinding for no|n"
+ msgstr "n"
+
+-#: abook.c:780
++#: abook.c:808
+ #, c-format
+ msgid "stdin is a directory or cannot stat stdin\n"
+ msgstr "standard input è una directory o non posso usare standard input\n"
+@@ -314,197 +334,243 @@
+ msgid "Anniversary day"
+ msgstr "Anniversario"
+
+-#: database.c:166
++#: database.c:61
++msgid "Groups"
++msgstr ""
++
++#: database.c:167
+ msgid "field already defined"
+ msgstr "campo già definito"
+
+-#: database.c:170
++#: database.c:171
+ msgid "standard field does not need to be declared"
+ msgstr "campo standard non necessita dichiarazione"
+
+-#: database.c:185
++#: database.c:186
+ msgid "unknown type"
+ msgstr "tipo sconosciuto"
+
+-#: database.c:585
++#: database.c:648
+ msgid "Invalid field value defined in configuration"
+ msgstr "Valore di campo errato nella configurazione"
+
+-#: database.c:588
++#: database.c:651
+ msgid "Invalid field value for sorting"
+ msgstr "Valore di campo errato per l'ordinamento"
+
+-#: edit.c:51
++#: edit.c:59
+ msgid "Tab name too wide for screen"
+ msgstr "Nome etichetta troppo largo per lo schermo"
+
+-#: edit.c:353
++#: edit.c:360
+ msgid "keybindings_new_123456789|n123456789"
+ msgstr "keybindings_new_123456789|n123456789"
+
+-#: edit.c:355
++#: edit.c:362
+ #, c-format
+ msgid "Choose %s to modify (<1>%s%c%s%s."
+ msgstr "Scegli %s per modificare (<1>%s%c%s%s."
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "email"
+ msgstr "email"
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "item"
+ msgstr "oggetto"
+
+-#: edit.c:361
++#: edit.c:368
+ msgid " or <n>ew"
+ msgstr "o <n>uovo"
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "E-mail: "
+ msgstr "E-mails:"
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "Item: "
+ msgstr "Oggetto:"
+
+-#: edit.c:465
++#: edit.c:460
++msgid "%Y-%M-%D"
++msgstr ""
++
++#: edit.c:461
++msgid "--%M-%D"
++msgstr ""
++
++#: edit.c:539
+ msgid "Day: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Month: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Year (optional): "
+ msgstr ""
+
+-#: edit.c:498
++#: edit.c:569
+ #, fuzzy
+ msgid "Invalid date"
+ msgstr "valore non valido"
+
+-#: edit.c:653
++#: edit.c:776
+ msgid "Name: "
+ msgstr "Nome: "
+
+-#: edit.h:14
++#: edit.h:18
+ msgid "?:help q:quit editor"
+ msgstr "?:aiuto q:esci editor"
+
+-#: filter.c:71 filter.c:82
++#: filter.c:88 filter.c:100
+ msgid "abook native format"
+ msgstr "formato nativo di abook"
+
+-#: filter.c:72
++#: filter.c:89
+ msgid "ldif / Netscape addressbook"
+ msgstr "ldif / rubrica Netscape"
+
+-#: filter.c:73 filter.c:84
++#: filter.c:90 filter.c:103 filter.c:121
+ msgid "mutt alias"
+ msgstr "alias di mutt"
+
+-#: filter.c:74 filter.c:86
++#: filter.c:91 filter.c:106
+ msgid "pine addressbook"
+ msgstr "rubrica di Pine"
+
+-#: filter.c:75 filter.c:88
++#: filter.c:92 filter.c:107
+ msgid "comma separated values"
+ msgstr "valori separati da virgole"
+
+-#: filter.c:76 filter.c:89
++#: filter.c:93 filter.c:108
+ msgid "comma separated values (all fields)"
+ msgstr "valori separati da virgole (tutti i campi)"
+
+-#: filter.c:77 filter.c:90
++#: filter.c:94 filter.c:109
+ msgid "Palm comma separated values"
+ msgstr "Valori separati da virgole per Palm"
+
+-#: filter.c:83
++#: filter.c:95
++msgid "vCard file"
++msgstr ""
++
++#: filter.c:101
+ msgid "ldif / Netscape addressbook (.4ld)"
+ msgstr "ldif / rubrica Netscape (.4ld)"
+
+-#: filter.c:85
++#: filter.c:102 filter.c:120
++msgid "vCard 2 file"
++msgstr ""
++
++#: filter.c:104
++msgid "mutt query format (internal use)"
++msgstr ""
++
++#: filter.c:105
+ msgid "html document"
+ msgstr "documento html"
+
+-#: filter.c:87
+-msgid "GnomeCard (VCard) addressbook"
+-msgstr "Rubrica GnomeCard (VCard)"
+-
+-#: filter.c:91
++#: filter.c:110
+ msgid "elm alias"
+ msgstr "alias di elm"
+
+-#: filter.c:92
++#: filter.c:111
+ msgid "plain text"
+ msgstr "testo puro"
+
+-#: filter.c:93
++#: filter.c:112
+ msgid "Wanderlust address book"
+ msgstr "Rubrica Wanderlust"
+
+-#: filter.c:94
++#: filter.c:113
+ msgid "Spruce address book"
+ msgstr "Rubrica Spruce"
+
+-#: filter.c:95
++#: filter.c:114
+ msgid "BSD calendar"
+ msgstr ""
+
+-#: filter.c:108
+-msgid "input:"
++#: filter.c:115 filter.c:122
++#, fuzzy
++msgid "Custom format"
++msgstr "Personalizzato 1"
++
++#: filter.c:135
++#, fuzzy
++msgid "input formats:"
+ msgstr "input:"
+
+-#: filter.c:115
+-msgid "output:"
++#: filter.c:142
++#, fuzzy
++msgid "output formats:"
+ msgstr "output:"
+
+-#: filter.c:180
++#: filter.c:149
++msgid "query-compatible output formats:"
++msgstr ""
++
++#: filter.c:214
+ msgid "import database"
+ msgstr "importa un database"
+
+-#: filter.c:182 filter.c:299
++#: filter.c:216 filter.c:345
+ msgid "please select a filter"
+ msgstr "seleziona un filtro"
+
+-#: filter.c:190 filter.c:307
++#: filter.c:224 filter.c:353
+ msgid "x -\tcancel"
+ msgstr "x -\tcancella"
+
+-#: filter.c:211 filter.c:345
++#: filter.c:245 filter.c:391
+ msgid "Filename: "
+ msgstr "Nome del file:"
+
+-#: filter.c:218
++#: filter.c:252
+ msgid "Error occured while opening the file"
+ msgstr "Errore nell'apertura del file"
+
+-#: filter.c:220
++#: filter.c:254
+ msgid "File does not seem to be a valid addressbook"
+ msgstr "Il file non sembra essere una rubrica valida"
+
+-#: filter.c:297
++#: filter.c:343
+ msgid "export database"
+ msgstr "esporta il database"
+
+-#: filter.c:330
++#: filter.c:376
+ msgid "Export <a>ll, export <s>elected, or <c>ancel?"
+ msgstr "Esporta <t>utti, esporta <s>elezionati, o <c>ancella?"
+
+-#: filter.c:331 ui.c:632
++#: filter.c:377 ui.c:769
+ msgid "keybindings:all/selected/cancel|asc"
+ msgstr "tsc"
+
+-#: filter.c:352
++#: filter.c:398
+ msgid "Error occured while exporting"
+ msgstr "Errore nell'esportazione"
+
+-#: filter.c:1896
++#: filter.c:2469
+ #, c-format
+ msgid "%02d/%02d\tAnniversary of %s\n"
+ msgstr ""
+
++#: filter.c:2498
++#, c-format
++msgid "parse_custom_format: fmt_string or ft not allocated\n"
++msgstr ""
++
++#: filter.c:2517
++#, c-format
++msgid "parse_custom_format: invalid placeholder: {%s}\n"
++msgstr ""
++
++#: filter.c:2565
++#, c-format
++msgid "%s: invalid format, index %ld\n"
++msgstr ""
++
+ #: help.h:11
+ msgid "\t?\t\thelp\n"
+ msgstr "\t?\t\taiuto\n"
+@@ -544,152 +610,161 @@
+ msgstr "\tr / del\t\tcancella oggetti selezionati\n"
+
+ #: help.h:21
++msgid "\tM\t\tmerge selected items (into top one)\n"
++msgstr ""
++
++#: help.h:22
+ msgid "\tD\t\tduplicate item\n"
+ msgstr "\tD\t\tduplica oggetto\n"
+
+ #: help.h:23
++#, fuzzy
++msgid "\tU\t\tremove duplicates\n"
++msgstr "\tD\t\tduplica oggetto\n"
++
++#: help.h:25
+ msgid "\tspace\t\tselect item\n"
+ msgstr "\tspace\t\tseleziona oggetto\n"
+
+-#: help.h:24
++#: help.h:26
+ msgid "\t+\t\tselect all\n"
+ msgstr "\t+\t\tseleziona tutti\n"
+
+-#: help.h:25
++#: help.h:27
+ msgid "\t-\t\tunselect all\n"
+ msgstr "\t-\t\tdeseleziona tutti\n"
+
+-#: help.h:26
++#: help.h:28
+ msgid "\t*\t\tinvert selection\n"
+ msgstr "\t*\t\tinverti selezione\n"
+
+-#: help.h:28
++#: help.h:30
+ msgid "\tw\t\twrite database to disk\n"
+ msgstr "\tw\t\tscrivi database su disco\n"
+
+-#: help.h:29
++#: help.h:31
+ msgid "\tl\t\tread database from disk\n"
+ msgstr "\tl\t\tleggi database da disco\n"
+
+-#: help.h:30
++#: help.h:32
+ msgid "\tC\t\tclear whole database\n"
+ msgstr "\tC\t\tcancella l'intero database\n"
+
+-#: help.h:31
++#: help.h:33
+ msgid "\ti\t\timport database\n"
+ msgstr "\ti\t\timporta database\n"
+
+-#: help.h:32
++#: help.h:34
+ msgid "\te\t\texport database\n"
+ msgstr "\te\t\tesporta database\n"
+
+-#: help.h:33
++#: help.h:35
+ msgid "\tp\t\tprint database\n"
+ msgstr "\tp\t\tstampa database\n"
+
+-#: help.h:34
++#: help.h:36
+ msgid "\to\t\topen database\n"
+ msgstr "\to\t\tapri database\n"
+
+-#: help.h:36
++#: help.h:38
+ msgid "\ts\t\tsort database\n"
+ msgstr "\ts\t\tordina database\n"
+
+-#: help.h:37
++#: help.h:39
+ msgid "\tS\t\t\"surname sort\"\n"
+ msgstr "\tS\t\tordinamento per cognome\n"
+
+-#: help.h:38
++#: help.h:40
+ msgid "\tF\t\tsort by field (defined in configuration file)\n"
+ msgstr ""
+ "\tF\t\tordina per campo (definito nel file di\n"
+ "\t\t\tconfigurazione)\n"
+
+-#: help.h:40
++#: help.h:42
+ msgid "\t/\t\tsearch\n"
+ msgstr "\t/\t\tcerca\n"
+
+-#: help.h:41
++#: help.h:43
+ msgid "\t\\\t\tsearch next occurrence\n"
+ msgstr "\t\\\t\tricerca occorrenza successiva\n"
+
+-#: help.h:43
++#: help.h:45
+ msgid "\tA\t\tmove current item up\n"
+ msgstr "\tA\t\tmuovi oggetto corrente in alto\n"
+
+-#: help.h:44
++#: help.h:46
+ msgid "\tZ\t\tmove current item down\n"
+ msgstr "\tZ\t\tmuovi oggetto corrente in basso\n"
+
+-#: help.h:46
++#: help.h:48
+ msgid "\tm\t\tsend mail with mutt\n"
+ msgstr "\tm\t\tspedisci mail con mutt\n"
+
+-#: help.h:47
++#: help.h:49
+ msgid "\tv\t\tview URL with web browser\n"
+ msgstr "\tv\t\tmostra URL con browser html\n"
+
+-#: help.h:55
++#: help.h:57
+ msgid "\tarrows/h,l\t\tchange tab\n"
+ msgstr "\tfrecce/h,l\tcambia tab\n"
+
+-#: help.h:57
++#: help.h:59
+ msgid "\tq\t\t\tquit to main screen\n"
+ msgstr "\tq\t\t\tvai allo schermo principale\n"
+
+-#: help.h:59
++#: help.h:61
+ msgid "\t1 - 5 A - Z\t\tedit fields\n"
+ msgstr "\t1 - 5 A - Z\t\tmodifica campi\n"
+
+-#: help.h:61
++#: help.h:63
+ msgid "\tk or <\t\t\tprevious item\n"
+ msgstr "\tk or <\t\t\toggetto precedente\n"
+
+-#: help.h:62
++#: help.h:64
+ msgid "\tj or >\t\t\tnext item\n"
+ msgstr "\tj or >\t\t\toggetto successivo\n"
+
+-#: help.h:64
++#: help.h:66
+ msgid "\tr\t\t\troll e-mail addresses up\n"
+ msgstr "\tr\t\t\tporta verso l'alto indirizzi e-mail\n"
+
+-#: help.h:65
++#: help.h:67
+ msgid "\tESC-r\t\t\troll e-mail addresses down\n"
+ msgstr "\tESC-r\t\t\tporta verso il basso indirizzi e-mail\n"
+
+-#: help.h:67
++#: help.h:69
+ msgid "\tu\t\t\tundo\n"
+ msgstr "\tu\t\t\tannulla\n"
+
+-#: help.h:69
++#: help.h:71
+ msgid "\tm\t\t\tsend mail with mutt\n"
+ msgstr "\tm\t\t\tspedisci mail con mutt\n"
+
+-#: help.h:70
++#: help.h:72
+ msgid "\tv\t\t\tview url with web browser\n"
+ msgstr "\tv\t\t\tmostra url con browser html\n"
+
+-#: options.c:250
++#: options.c:272
+ msgid "quote mismatch"
+ msgstr "manca una virgoletta"
+
+-#: options.c:256
++#: options.c:278
+ msgid "no assignment character found"
+ msgstr "errore di assegnamento"
+
+-#: options.c:259
++#: options.c:281
+ msgid "error in comma separated list"
+ msgstr "errore nei valori separati da virgole"
+
+-#: options.c:289 options.c:308
++#: options.c:311 options.c:330
+ msgid "invalid value"
+ msgstr "valore non valido"
+
+-#: options.c:329
++#: options.c:351
+ msgid "unknown option"
+ msgstr "opzione sconosciuta"
+
+-#: options.c:341
++#: options.c:363
+ #, c-format
+ msgid ""
+ "valid values for the 'preserve_fields' option are 'all', "
+@@ -698,7 +773,7 @@
+ "valori validi per l'opzione 'preserved_fields' sono 'all', "
+ "'standard' (predefinito), e 'none'\n"
+
+-#: options.c:350
++#: options.c:372
+ #, c-format
+ msgid ""
+ "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
+@@ -707,99 +782,109 @@
+ "valori validi per l'opzione 'address_style' sono 'eu' (predefinito), 'uk', e "
+ "'us'\n"
+
+-#: options.c:372
++#: options.c:394
+ msgid "invalid value assignment"
+ msgstr "assegnazione di valore errata"
+
+-#: options.c:380
++#: options.c:402
+ msgid ""
+ "customfield: obsolete command - please use the 'field' and 'view' commands "
+ "instead"
+ msgstr "customfield: comando obsoleto - usare i comandi 'field' e 'view'"
+
+-#: options.c:398
++#: options.c:420
+ msgid "no view name provided"
+ msgstr "nessun nome della vista fornito"
+
+-#: options.c:428
++#: options.c:450
+ msgid "no field identifier provided"
+ msgstr "nessun identificatore di campo fornito"
+
+-#: options.c:434
++#: options.c:456
+ msgid "no field name provided"
+ msgstr "nome campo non fornito"
+
+-#: options.c:490
++#: options.c:512
+ #, c-format
+ msgid "%s: parse error at line %d: "
+ msgstr "%s: errore interpretazione linea %d: "
+
+-#: options.c:494
++#: options.c:516
+ #, c-format
+ msgid "unknown token %s\n"
+ msgstr "istruzione %s sconosciuta\n"
+
+-#: ui.c:145
++#: ui.c:234
+ #, c-format
+ msgid "Your terminal size is %dx%d\n"
+ msgstr "La dimensione del terminale è %dx%d\n"
+
+-#: ui.c:146
++#: ui.c:235
+ #, c-format
+ msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
+ msgstr ""
+ "Il terminale è troppo piccolo. La dimensione minima per abook è %dx%d\n"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (Y/n)?"
+ msgstr " (S/n)?"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (y/N)?"
+ msgstr " (s/N)?"
+
+-#: ui.c:410
++#: ui.c:502
+ msgid "help"
+ msgstr "aiuto"
+
+-#: ui.c:419
++#: ui.c:511
+ msgid "Press any key to continue..."
+ msgstr "Premi un tasto per continuare..."
+
+-#: ui.c:539
++#: ui.c:656
+ msgid "Remove selected item(s)"
+ msgstr "Cancella l'oggetto/gli oggetti selezionato/i"
+
+-#: ui.c:549
++#: ui.c:666
++#, fuzzy
++msgid "Merge selected items"
++msgstr "Nessun oggetto selezionato"
++
++#: ui.c:675
++#, fuzzy
++msgid "Remove duplicates"
++msgstr "Cancella l'oggetto/gli oggetti selezionato/i"
++
++#: ui.c:685
+ msgid "Clear WHOLE database"
+ msgstr "Cancella TUTTO il database"
+
+-#: ui.c:582
++#: ui.c:718
+ msgid "Search hit bottom, continuing at top"
+ msgstr "La ricerca è finita, continuo dall'inizio"
+
+-#: ui.c:607
++#: ui.c:744
+ #, c-format
+ msgid "Your current data will be lost - Press '%c' to continue"
+ msgstr "I dati correnti saranno persi - Premi '%c' per continuare"
+
+-#: ui.c:632
++#: ui.c:769
+ msgid "Print <a>ll, print <s>elected, or <c>ancel?"
+ msgstr "Stampa <t>utti, stampa <s>elezionati, o <c>ancella?"
+
+-#: ui.c:638
++#: ui.c:775
+ msgid "No selected items"
+ msgstr "Nessun oggetto selezionato"
+
+-#: ui.c:664
++#: ui.c:801
+ msgid "File to open: "
+ msgstr "File da aprire:"
+
+-#: ui.c:674
++#: ui.c:811
+ msgid "Save current database"
+ msgstr "Salva il database corrente"
+
+-#: ui.c:682
++#: ui.c:819
+ msgid "Sorry, the specified file appears not to be a valid abook addressbook"
+ msgstr "Mi dispiace, il file selezionato non è una rubrica valida per Abook"
+
+@@ -855,6 +940,9 @@
+ msgid "Custom5"
+ msgstr "Personalizzato 5"
+
++#~ msgid "GnomeCard (VCard) addressbook"
++#~ msgstr "Rubrica GnomeCard (VCard)"
++
+ #~ msgid "sorry, input for this field type is not yet implemented"
+ #~ msgstr "mi dispiace, questo tipo di campo non e' ancora stato implementato"
+
+Binarne pliki BUILD/abook-0.6.0pre2/po/ja.gmo i abook/po/ja.gmo różnią się
+diff -urN BUILD/abook-0.6.0pre2/po/ja.po abook/po/ja.po
+--- BUILD/abook-0.6.0pre2/po/ja.po 2006-09-06 16:14:38.000000000 +0200
++++ abook/po/ja.po 2013-03-13 15:07:45.000000000 +0100
+@@ -5,57 +5,58 @@
+ msgstr ""
+ "Project-Id-Version: 0.5.5\n"
+ "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
+-"POT-Creation-Date: 2006-09-06 17:14+0300\n"
++"POT-Creation-Date: 2013-01-17 14:44+0100\n"
+ "PO-Revision-Date: 2005-10-18 18:10+0200\n"
+ "Last-Translator: TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>\n"
+ "Language-Team: japanese\n"
++"Language: ja\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=euc-jp\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: abook.c:93
++#: abook.c:99
+ #, c-format
+ msgid "Cannot create directory %s\n"
+ msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬ºîÀ®¤Ç¤¤Þ¤»¤ó\n"
+
+-#: abook.c:99
++#: abook.c:105
+ #, c-format
+ msgid "%s is not a directory\n"
+ msgstr "%s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+
+-#: abook.c:117
++#: abook.c:123
+ #, c-format
+ msgid "Memory allocation failure: %s\n"
+ msgstr "¥á¥â¥ê¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
+-#: abook.c:128
++#: abook.c:134
+ #, c-format
+ msgid "Press enter to continue...\n"
+ msgstr "³¤±¤ë¤Ë¤Ï Enter ¥¡¼¤ò...\n"
+
+-#: abook.c:143
++#: abook.c:149
+ #, c-format
+ msgid "File %s is not writeable"
+ msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï½ñ¤¹þ¤ßÉÔ²Äǽ¤Ç¤¹"
+
+-#: abook.c:148
++#: abook.c:154
+ msgid "If you continue all changes will be lost. Do you want to continue?"
+ msgstr "¤³¤Î¤Þ¤Þ¤À¤ÈÊѹ¹ÅÀ¤¬¤¹¤Ù¤Æ¾Ã¤¨¤Æ¤·¤Þ¤¤¤Þ¤¹¤¬¡¢Â³¤±¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
+
+-#: abook.c:167
++#: abook.c:173
+ msgid "Save database"
+ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊݸ"
+
+-#: abook.c:169
++#: abook.c:175
+ msgid "Quit without saving"
+ msgstr "Êݸ¤»¤º¤Ë½ªÎ»"
+
+-#: abook.c:225
++#: abook.c:233
+ #, c-format
+ msgid "%s is not a valid HOME directory\n"
+ msgstr "%s ¤ÏÀµ¤·¤¤ HOME ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+
+-#: abook.c:256
++#: abook.c:264
+ #, c-format
+ msgid ""
+ "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
+@@ -64,35 +65,45 @@
+ "¼¡¤Î¥ª¥×¥·¥ç¥ó¤òƱ»þ¤ËÊ£¿ô»ÈÍѤ¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó: --mutt-query, --convert, "
+ "--add-email, --add-email-quiet\n"
+
+-#: abook.c:287
++#: abook.c:295
+ #, c-format
+ msgid "please use option --%s after --convert option\n"
+ msgstr "--%s ¥ª¥×¥·¥ç¥ó¤Ï --convert ¥ª¥×¥·¥ç¥ó¤Î¸å¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤\n"
+
+-#: abook.c:386
++#: abook.c:382
++#, fuzzy, c-format
++msgid "please use option --outformat after --convert or --mutt-query option\n"
++msgstr "--%s ¥ª¥×¥·¥ç¥ó¤Ï --convert ¥ª¥×¥·¥ç¥ó¤Î¸å¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤\n"
++
++#: abook.c:420
++#, fuzzy, c-format
++msgid "Invalid custom format string\n"
++msgstr "ÉÔÀµ¤Ê¹àÌÜ̾¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
++
++#: abook.c:428
+ #, c-format
+ msgid "%s: unrecognized arguments on command line\n"
+ msgstr "%s: ǧ¼±¤Ç¤¤Ê¤¤¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Ç¤¹\n"
+
+-#: abook.c:408
++#: abook.c:450
+ msgid " -h\t--help\t\t\t\tshow usage"
+ msgstr " -h\t--help\t\t\t\t»ÈÍÑÊýË¡"
+
+-#: abook.c:409
++#: abook.c:451
+ msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
+ msgstr ""
+ " -C\t--config\t<¥Õ¥¡¥¤¥ë>\t\tÄ̾ï¤Î¾ì½ê°Ê³°¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»È¤¦"
+
+-#: abook.c:410
++#: abook.c:452
+ msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
+ msgstr ""
+ "\t--datafile\t<¥Õ¥¡¥¤¥ë>\t\tÄ̾ï¤Î¾ì½ê°Ê³°¤Ë¤¢¤ë¥¢¥É¥ì¥¹Ä¢¥Õ¥¡¥¤¥ë¤ò»È¤¦"
+
+-#: abook.c:411
++#: abook.c:453
+ msgid "\t--mutt-query\t<string>\tmake a query for mutt"
+ msgstr "\t--mutt-query\t<ʸ»úÎó>\tÌ䤤¹ç¤ï¤»¤ËÂФ·¤Æ mutt ÍѤËÀ°·Á½ÐÎϤ¹¤ë"
+
+-#: abook.c:412
++#: abook.c:454
+ msgid ""
+ "\t--add-email\t\t\tread an e-mail message from stdin and\n"
+ "\t\t\t\t\tadd the sender to the addressbook"
+@@ -100,7 +111,7 @@
+ "\t--add-email\t\t\t¥á¡¼¥ë¤òɸ½àÆþÎϤ«¤éÆɤ߽Ф·¤Æ\n"
+ "\t\t\t\t\t¤½¤Îº¹½Ð¿Í¤ò¥¢¥É¥ì¥¹Ä¢¤ËÄɲ乤ë"
+
+-#: abook.c:416
++#: abook.c:458
+ msgid ""
+ "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
+ "\t\t\t\t\trequire to confirm adding"
+@@ -108,66 +119,75 @@
+ "\t--add-email-quiet\t\t--add-email ¤ÈƱ¤¸¡£¤¿¤À¤·\n"
+ "\t\t\t\t\tÄɲ乤ëÁ°¤Ë³Îǧ¤òµá¤á¤Ê¤¤"
+
+-#: abook.c:420
++#: abook.c:462
+ msgid "\t--convert\t\t\tconvert address book files"
+ msgstr "\t--convert\t\t\t¥¢¥É¥ì¥¹Ä¢¥Õ¥¡¥¤¥ë¤ò¾·Á¼°¤ØÊÑ´¹¤¹¤ë"
+
+-#: abook.c:421
++#: abook.c:463
+ msgid "\toptions to use with --convert:"
+ msgstr "\t--convert ¤Ç»È¤¦¥ª¥×¥·¥ç¥ó:"
+
+-#: abook.c:422
++#: abook.c:464
+ msgid "\t--informat\t<format>\tformat for input file"
+ msgstr "\t--informat\t<·Á¼°>\tÊÑ´¹¸µ¥Õ¥¡¥¤¥ë¤Î·Á¼°"
+
+-#: abook.c:423
++#: abook.c:465
+ msgid "\t\t\t\t\t(default: abook)"
+ msgstr "\t\t\t\t\t(´ûÄêÃÍ: abook)"
+
+-#: abook.c:424
++#: abook.c:466
+ msgid "\t--infile\t<file>\t\tsource file"
+ msgstr "\t--infile\t<¥Õ¥¡¥¤¥ë>\t\tÊÑ´¹¸µ¥Õ¥¡¥¤¥ë"
+
+-#: abook.c:425
++#: abook.c:467
+ msgid "\t\t\t\t\t(default: stdin)"
+ msgstr "\t\t\t\t\t(´ûÄêÃÍ: ɸ½àÆþÎÏ)"
+
+-#: abook.c:426
++#: abook.c:468
+ msgid "\t--outformat\t<format>\tformat for output file"
+ msgstr "\t--outformat\t<·Á¼°>\t½ÐÎÏÀè¥Õ¥¡¥¤¥ë¤Î·Á¼°"
+
+-#: abook.c:427
++#: abook.c:469
+ msgid "\t\t\t\t\t(default: text)"
+ msgstr "\t\t\t\t\t(´ûÄêÃÍ: text)"
+
+-#: abook.c:428
++#: abook.c:470
+ msgid "\t--outfile\t<file>\t\tdestination file"
+ msgstr "\t--outfile\t<¥Õ¥¡¥¤¥ë>\t\t½ÐÎÏÀè¥Õ¥¡¥¤¥ë"
+
+-#: abook.c:429
++#: abook.c:471
+ msgid "\t\t\t\t\t(default: stdout)"
+ msgstr "\t\t\t\t\t(´ûÄêÃÍ: ɸ½à½ÐÎÏ)"
+
+-#: abook.c:430
++#: abook.c:472
++#, fuzzy
++msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
++msgstr "\t--outformat\t<·Á¼°>\t½ÐÎÏÀè¥Õ¥¡¥¤¥ë¤Î·Á¼°"
++
++#: abook.c:473
++msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
++msgstr ""
++
++#: abook.c:474
+ msgid "\t--formats\t\t\tlist available formats"
+ msgstr "\t--formats\t\t\tÍøÍѲÄǽ¤Ê·Á¼°°ìÍ÷¤òɽ¼¨¤¹¤ë"
+
+-#: abook.c:501
++#: abook.c:528
+ #, c-format
+ msgid "Cannot open database\n"
+ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬³«¤±¤Þ¤»¤ó\n"
+
+-#: abook.c:627
++#: abook.c:654
+ #, c-format
+ msgid "too few arguments to make conversion\n"
+ msgstr "ÊÑ´¹¤ËɬÍפʥª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+
+-#: abook.c:628
++#: abook.c:655
+ #, c-format
+ msgid "try --help\n"
+ msgstr "--help ¤ò¤´Í÷¤¯¤À¤µ¤¤\n"
+
+-#: abook.c:633
++#: abook.c:660
+ #, c-format
+ msgid ""
+ "input and output formats are the same\n"
+@@ -176,46 +196,46 @@
+ "ÆþÎϤȽÐÎϤηÁ¼°¤¬Æ±¤¸¤Ç¤¹\n"
+ "½ªÎ»¤·¤Þ¤¹\n"
+
+-#: abook.c:647
++#: abook.c:674
+ #, c-format
+ msgid "input format %s not supported\n"
+ msgstr "ÆþÎÏ·Á¼°¤È¤·¤Æ %s ¤Ï¤´ÍøÍѤ¤¤¿¤À¤±¤Þ¤»¤ó\n"
+
+-#: abook.c:651
++#: abook.c:678
+ #, c-format
+ msgid "cannot read file %s\n"
+ msgstr "¥Õ¥¡¥¤¥ë %s ¤¬Æɤ߽Ф»¤Þ¤»¤ó\n"
+
+-#: abook.c:660
++#: abook.c:687
+ #, c-format
+ msgid "output format %s not supported\n"
+ msgstr "½ÐÎÏ·Á¼°¤È¤·¤Æ %s ¤Ï¤´ÍøÍѤ¤¤¿¤À¤±¤Þ¤»¤ó\n"
+
+-#: abook.c:666
++#: abook.c:693
+ #, c-format
+ msgid "cannot write file %s\n"
+ msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤¹þ¤á¤Þ¤»¤ó\n"
+
+-#: abook.c:687
++#: abook.c:714
+ #, c-format
+ msgid "cannot open %s\n"
+ msgstr "%s ¤¬³«¤±¤Þ¤»¤ó\n"
+
+-#: abook.c:690
++#: abook.c:717
+ #, c-format
+ msgid "%d item(s) added to %s\n"
+ msgstr "%d ¸Ä¤Î¹àÌܤò %s ¤ËÄɲä·¤Þ¤·¤¿\n"
+
+-#: abook.c:692
++#: abook.c:719
+ msgid "Valid sender address not found"
+ msgstr "ǧ¼±²Äǽ¤Êº¹½Ð¿Í¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+
+-#: abook.c:732
++#: abook.c:760
+ #, c-format
+ msgid "Address %s already in addressbook\n"
+ msgstr "¥¢¥É¥ì¥¹ %s ¤Ï´û¤Ë¥¢¥É¥ì¥¹Ä¢¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹\n"
+
+-#: abook.c:742
++#: abook.c:770
+ #, c-format
+ msgid ""
+ "cannot open /dev/tty\n"
+@@ -224,20 +244,20 @@
+ "/dev/tty ¤¬³«¤±¤Þ¤»¤ó\n"
+ "--add-email-quiet ¤ò¤´ÍøÍѤˤʤä¿Êý¤¬Îɤ¤¤«¤â¤·¤ì¤Þ¤»¤ó\n"
+
+-#: abook.c:748
++#: abook.c:776
+ #, c-format
+ msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
+ msgstr "\"%s <%s>\" ¤ò %s ¤ËÄɲä·¤Þ¤¹¤«? (%c/%c)\n"
+
+-#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
++#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
+ msgid "keybinding for yes|y"
+ msgstr "y"
+
+-#: abook.c:753 abook.c:755 ui.c:341
++#: abook.c:781 abook.c:783 ui.c:432
+ msgid "keybinding for no|n"
+ msgstr "n"
+
+-#: abook.c:780
++#: abook.c:808
+ #, c-format
+ msgid "stdin is a directory or cannot stat stdin\n"
+ msgstr "ɸ½àÆþÎϤ¬¥Ç¥£¥ì¥¯¥È¥ê¤«¡¢stat ÉÔ²Äǽ¤Ç¤¹\n"
+@@ -311,202 +331,248 @@
+ msgid "Anniversary day"
+ msgstr ""
+
+-#: database.c:166
++#: database.c:61
++msgid "Groups"
++msgstr ""
++
++#: database.c:167
+ msgid "field already defined"
+ msgstr ""
+
+-#: database.c:170
++#: database.c:171
+ msgid "standard field does not need to be declared"
+ msgstr ""
+
+-#: database.c:185
++#: database.c:186
+ #, fuzzy
+ msgid "unknown type"
+ msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹"
+
+-#: database.c:585
++#: database.c:648
+ msgid "Invalid field value defined in configuration"
+ msgstr "ÉÔÀµ¤Ê¹àÌÜ̾¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
+
+-#: database.c:588
++#: database.c:651
+ #, fuzzy
+ msgid "Invalid field value for sorting"
+ msgstr "ÉÔÀµ¤Ê¹àÌÜ̾¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
+
+-#: edit.c:51
++#: edit.c:59
+ msgid "Tab name too wide for screen"
+ msgstr "¥¿¥Ö̾¤¬²èÌ̤«¤é¤Ï¤ß½Ð¤Þ¤¹"
+
+-#: edit.c:353
++#: edit.c:360
+ msgid "keybindings_new_123456789|n123456789"
+ msgstr ""
+
+-#: edit.c:355
++#: edit.c:362
+ #, c-format
+ msgid "Choose %s to modify (<1>%s%c%s%s."
+ msgstr ""
+
+-#: edit.c:356
++#: edit.c:363
+ #, fuzzy
+ msgid "email"
+ msgstr "¥¢¥É¥ì¥¹"
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "item"
+ msgstr ""
+
+-#: edit.c:361
++#: edit.c:368
+ msgid " or <n>ew"
+ msgstr ""
+
+-#: edit.c:379
++#: edit.c:386
+ #, fuzzy
+ msgid "E-mail: "
+ msgstr "¥¢¥É¥ì¥¹"
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "Item: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:460
++msgid "%Y-%M-%D"
++msgstr ""
++
++#: edit.c:461
++msgid "--%M-%D"
++msgstr ""
++
++#: edit.c:539
+ msgid "Day: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Month: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Year (optional): "
+ msgstr ""
+
+-#: edit.c:498
++#: edit.c:569
+ #, fuzzy
+ msgid "Invalid date"
+ msgstr "ÉÔÀµ¤ÊÃͤǤ¹"
+
+-#: edit.c:653
++#: edit.c:776
+ #, fuzzy
+ msgid "Name: "
+ msgstr "»á̾"
+
+-#: edit.h:14
++#: edit.h:18
+ msgid "?:help q:quit editor"
+ msgstr ""
+
+-#: filter.c:71 filter.c:82
++#: filter.c:88 filter.c:100
+ msgid "abook native format"
+ msgstr "abook Æȼ«·Á¼°"
+
+-#: filter.c:72
++#: filter.c:89
+ msgid "ldif / Netscape addressbook"
+ msgstr "ldif / Netscape ¥¢¥É¥ì¥¹Ä¢"
+
+-#: filter.c:73 filter.c:84
++#: filter.c:90 filter.c:103 filter.c:121
+ msgid "mutt alias"
+ msgstr "mutt alias"
+
+-#: filter.c:74 filter.c:86
++#: filter.c:91 filter.c:106
+ msgid "pine addressbook"
+ msgstr "pine ¥¢¥É¥ì¥¹Ä¢"
+
+-#: filter.c:75 filter.c:88
++#: filter.c:92 filter.c:107
+ msgid "comma separated values"
+ msgstr "¥³¥ó¥Þ¶èÀÚ¤ê¥Æ¥¥¹¥È"
+
+-#: filter.c:76 filter.c:89
++#: filter.c:93 filter.c:108
+ msgid "comma separated values (all fields)"
+ msgstr "¥³¥ó¥Þ¶èÀÚ¤ê¥Æ¥¥¹¥È (Á´¹àÌÜ)"
+
+-#: filter.c:77 filter.c:90
++#: filter.c:94 filter.c:109
+ msgid "Palm comma separated values"
+ msgstr "Palm ÍÑ¥³¥ó¥Þ¶èÀÚ¤ê¥Æ¥¥¹¥È"
+
+-#: filter.c:83
++#: filter.c:95
++msgid "vCard file"
++msgstr ""
++
++#: filter.c:101
+ msgid "ldif / Netscape addressbook (.4ld)"
+ msgstr "ldif / Netscape ¥¢¥É¥ì¥¹Ä¢ (.4ld)"
+
+-#: filter.c:85
++#: filter.c:102 filter.c:120
++msgid "vCard 2 file"
++msgstr ""
++
++#: filter.c:104
++msgid "mutt query format (internal use)"
++msgstr ""
++
++#: filter.c:105
+ msgid "html document"
+ msgstr "HTML ʸ½ñ"
+
+-#: filter.c:87
+-msgid "GnomeCard (VCard) addressbook"
+-msgstr "GnomeCard (vCard) ¥¢¥É¥ì¥¹Ä¢"
+-
+-#: filter.c:91
++#: filter.c:110
+ msgid "elm alias"
+ msgstr "elm alias"
+
+-#: filter.c:92
++#: filter.c:111
+ msgid "plain text"
+ msgstr "¥×¥ì¡¼¥ó¥Æ¥¥¹¥È"
+
+-#: filter.c:93
++#: filter.c:112
+ msgid "Wanderlust address book"
+ msgstr "Wanderlust ¥¢¥É¥ì¥¹Ä¢"
+
+-#: filter.c:94
++#: filter.c:113
+ msgid "Spruce address book"
+ msgstr "Spruce ¥¢¥É¥ì¥¹Ä¢"
+
+-#: filter.c:95
++#: filter.c:114
+ msgid "BSD calendar"
+ msgstr ""
+
+-#: filter.c:108
+-msgid "input:"
++#: filter.c:115 filter.c:122
++#, fuzzy
++msgid "Custom format"
++msgstr "³ÈÄ¥¾ðÊó1"
++
++#: filter.c:135
++#, fuzzy
++msgid "input formats:"
+ msgstr "ÆþÎÏ:"
+
+-#: filter.c:115
+-msgid "output:"
++#: filter.c:142
++#, fuzzy
++msgid "output formats:"
+ msgstr "½ÐÎÏ:"
+
+-#: filter.c:180
++#: filter.c:149
++msgid "query-compatible output formats:"
++msgstr ""
++
++#: filter.c:214
+ msgid "import database"
+ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¼è¤ê¹þ¤ß"
+
+-#: filter.c:182 filter.c:299
++#: filter.c:216 filter.c:345
+ msgid "please select a filter"
+ msgstr "·Á¼°¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤"
+
+-#: filter.c:190 filter.c:307
++#: filter.c:224 filter.c:353
+ msgid "x -\tcancel"
+ msgstr "x -\t̾ȧ"
+
+-#: filter.c:211 filter.c:345
++#: filter.c:245 filter.c:391
+ msgid "Filename: "
+ msgstr "¥Õ¥¡¥¤¥ë̾: "
+
+-#: filter.c:218
++#: filter.c:252
+ msgid "Error occured while opening the file"
+ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯ºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+
+-#: filter.c:220
++#: filter.c:254
+ msgid "File does not seem to be a valid addressbook"
+ msgstr "¥Õ¥¡¥¤¥ë¤¬Àµ¤·¤¤¥¢¥É¥ì¥¹Ä¢¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹"
+
+-#: filter.c:297
++#: filter.c:343
+ msgid "export database"
+ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î½ÐÎÏ"
+
+-#: filter.c:330
++#: filter.c:376
+ msgid "Export <a>ll, export <s>elected, or <c>ancel?"
+ msgstr "½ÐÎÏÂÐ¾Ý a:¤¹¤Ù¤Æ s:ÁªÂòÉôʬ¤Î¤ß c:Ãæ»ß?"
+
+-#: filter.c:331 ui.c:632
++#: filter.c:377 ui.c:769
+ msgid "keybindings:all/selected/cancel|asc"
+ msgstr "asc"
+
+-#: filter.c:352
++#: filter.c:398
+ msgid "Error occured while exporting"
+ msgstr "½ÐÎÏÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+
+-#: filter.c:1896
++#: filter.c:2469
+ #, c-format
+ msgid "%02d/%02d\tAnniversary of %s\n"
+ msgstr ""
+
++#: filter.c:2498
++#, c-format
++msgid "parse_custom_format: fmt_string or ft not allocated\n"
++msgstr ""
++
++#: filter.c:2517
++#, c-format
++msgid "parse_custom_format: invalid placeholder: {%s}\n"
++msgstr ""
++
++#: filter.c:2565
++#, c-format
++msgid "%s: invalid format, index %ld\n"
++msgstr ""
++
+ #: help.h:11
+ msgid "\t?\t\thelp\n"
+ msgstr "\t?\t\t¥Ø¥ë¥×\n"
+@@ -544,261 +610,280 @@
+ msgstr "\tr / Del\t\tÁªÂò¹àÌܤκï½ü\n"
+
+ #: help.h:21
++msgid "\tM\t\tmerge selected items (into top one)\n"
++msgstr ""
++
++#: help.h:22
+ msgid "\tD\t\tduplicate item\n"
+ msgstr "\tD\t\t¹àÌܤÎÊ£À½\n"
+
+ #: help.h:23
++#, fuzzy
++msgid "\tU\t\tremove duplicates\n"
++msgstr "\tD\t\t¹àÌܤÎÊ£À½\n"
++
++#: help.h:25
+ msgid "\tspace\t\tselect item\n"
+ msgstr "\t¥¹¥Ú¡¼¥¹¥¡¼\t¹àÌܤÎÁªÂò\n"
+
+-#: help.h:24
++#: help.h:26
+ msgid "\t+\t\tselect all\n"
+ msgstr "\t+\t\t¤¹¤Ù¤ÆÁªÂò\n"
+
+-#: help.h:25
++#: help.h:27
+ msgid "\t-\t\tunselect all\n"
+ msgstr "\t-\t\t¤¹¤Ù¤ÆÁªÂò²ò½ü\n"
+
+-#: help.h:26
++#: help.h:28
+ msgid "\t*\t\tinvert selection\n"
+ msgstr "\t*\t\tÁªÂò¤òȿž\n"
+
+-#: help.h:28
++#: help.h:30
+ msgid "\tw\t\twrite database to disk\n"
+ msgstr "\tw\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥Ç¥£¥¹¥¯¤Ø½ñ¤¹þ¤ß\n"
+
+-#: help.h:29
++#: help.h:31
+ msgid "\tl\t\tread database from disk\n"
+ msgstr "\tl\t\t¥Ç¥£¥¹¥¯¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆɤ߽Ф·\n"
+
+-#: help.h:30
++#: help.h:32
+ msgid "\tC\t\tclear whole database\n"
+ msgstr "\tC\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÁ´¾Ãµî\n"
+
+-#: help.h:31
++#: help.h:33
+ msgid "\ti\t\timport database\n"
+ msgstr "\ti\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¼è¤ê¹þ¤ß\n"
+
+-#: help.h:32
++#: help.h:34
+ msgid "\te\t\texport database\n"
+ msgstr "\te\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î½ÐÎÏ\n"
+
+-#: help.h:33
++#: help.h:35
+ msgid "\tp\t\tprint database\n"
+ msgstr "\tp\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î°õºþ\n"
+
+-#: help.h:34
++#: help.h:36
+ msgid "\to\t\topen database\n"
+ msgstr "\to\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò³«¤¯\n"
+
+-#: help.h:36
++#: help.h:38
+ msgid "\ts\t\tsort database\n"
+ msgstr "\ts\t\t¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀ°Îó\n"
+
+-#: help.h:37
++#: help.h:39
+ msgid "\tS\t\t\"surname sort\"\n"
+ msgstr "\tS\t\t²¼¤Î̾Á°¤ÇÀ°Îó\n"
+
+-#: help.h:38
++#: help.h:40
+ msgid "\tF\t\tsort by field (defined in configuration file)\n"
+ msgstr "\tF\t\tÀßÄê¥Õ¥¡¥¤¥ë¤Ç»ØÄꤷ¤¿¹àÌܤˤè¤ëÀ°Îó\n"
+
+-#: help.h:40
++#: help.h:42
+ msgid "\t/\t\tsearch\n"
+ msgstr "\t/\t\t¸¡º÷\n"
+
+-#: help.h:41
++#: help.h:43
+ msgid "\t\\\t\tsearch next occurrence\n"
+ msgstr "\t\\\t\t¼¡¤ò¸¡º÷\n"
+
+-#: help.h:43
++#: help.h:45
+ msgid "\tA\t\tmove current item up\n"
+ msgstr "\tA\t\t¹àÌܤò¾å¤Ë°ÜÆ°\n"
+
+-#: help.h:44
++#: help.h:46
+ msgid "\tZ\t\tmove current item down\n"
+ msgstr "\tZ\t\t¹àÌܤò²¼¤Ë°ÜÆ°\n"
+
+-#: help.h:46
++#: help.h:48
+ msgid "\tm\t\tsend mail with mutt\n"
+ msgstr "\tm\t\tMutt ¤Ç¥á¡¼¥ë¤òÁ÷¤ë\n"
+
+-#: help.h:47
++#: help.h:49
+ msgid "\tv\t\tview URL with web browser\n"
+ msgstr "\tv\t\tURL ¤ò¥Ö¥é¥¦¥¶¤Ç±ÜÍ÷¤¹¤ë\n"
+
+-#: help.h:55
++#: help.h:57
+ #, fuzzy
+ msgid "\tarrows/h,l\t\tchange tab\n"
+ msgstr "\ta,c,p,o,C/Ìð°õ/h,l\t¥¿¥Ö¤ÎÊѹ¹\n"
+
+-#: help.h:57
++#: help.h:59
+ #, fuzzy
+ msgid "\tq\t\t\tquit to main screen\n"
+ msgstr "\tQ\t\tÊݸ¤»¤º¤Ë½ªÎ»\n"
+
+-#: help.h:59
++#: help.h:61
+ #, fuzzy
+ msgid "\t1 - 5 A - Z\t\tedit fields\n"
+ msgstr "\t1 - 5\t\t\t¹àÌܤÎÊÔ½¸\n"
+
+-#: help.h:61
++#: help.h:63
+ msgid "\tk or <\t\t\tprevious item\n"
+ msgstr "\tk,<\t\t\tÁ°¤Î¹àÌÜ\n"
+
+-#: help.h:62
++#: help.h:64
+ msgid "\tj or >\t\t\tnext item\n"
+ msgstr "\tj,>\t\t\t¼¡¤Î¹àÌÜ\n"
+
+-#: help.h:64
++#: help.h:66
+ #, fuzzy
+ msgid "\tr\t\t\troll e-mail addresses up\n"
+ msgstr "\tr\t\t\t¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î½çÈÖ¤òÊѤ¨¤ë\n"
+
+-#: help.h:65
++#: help.h:67
+ #, fuzzy
+ msgid "\tESC-r\t\t\troll e-mail addresses down\n"
+ msgstr "\tr\t\t\t¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î½çÈÖ¤òÊѤ¨¤ë\n"
+
+-#: help.h:67
++#: help.h:69
+ msgid "\tu\t\t\tundo\n"
+ msgstr "\tu\t\t\t¥¢¥ó¥É¥¥ (°ì¤ÄÁ°¤Î¾õÂÖ¤ËÌ᤹)\n"
+
+-#: help.h:69
++#: help.h:71
+ msgid "\tm\t\t\tsend mail with mutt\n"
+ msgstr "\tm\t\t\tMutt ¤Ç¥á¡¼¥ë¤òÁ÷¤ë\n"
+
+-#: help.h:70
++#: help.h:72
+ msgid "\tv\t\t\tview url with web browser\n"
+ msgstr "\tv\t\t\tURL ¤ò¥Ö¥é¥¦¥¶¤Ç±ÜÍ÷\n"
+
+-#: options.c:250
++#: options.c:272
+ msgid "quote mismatch"
+ msgstr ""
+
+-#: options.c:256
++#: options.c:278
+ msgid "no assignment character found"
+ msgstr ""
+
+-#: options.c:259
++#: options.c:281
+ #, fuzzy
+ msgid "error in comma separated list"
+ msgstr "¥³¥ó¥Þ¶èÀÚ¤ê¥Æ¥¥¹¥È"
+
+-#: options.c:289 options.c:308
++#: options.c:311 options.c:330
+ msgid "invalid value"
+ msgstr "ÉÔÀµ¤ÊÃͤǤ¹"
+
+-#: options.c:329
++#: options.c:351
+ msgid "unknown option"
+ msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹"
+
+-#: options.c:341
++#: options.c:363
+ #, c-format
+ msgid ""
+ "valid values for the 'preserve_fields' option are 'all', "
+ "'standard' (default), and 'none'\n"
+ msgstr ""
+
+-#: options.c:350
++#: options.c:372
+ #, c-format
+ msgid ""
+ "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
+ "'us'\n"
+ msgstr ""
+
+-#: options.c:372
++#: options.c:394
+ msgid "invalid value assignment"
+ msgstr "ÉÔÀµ¤ÊÂåÆþ¤Ç¤¹"
+
+-#: options.c:380
++#: options.c:402
+ msgid ""
+ "customfield: obsolete command - please use the 'field' and 'view' commands "
+ "instead"
+ msgstr ""
+
+-#: options.c:398
++#: options.c:420
+ msgid "no view name provided"
+ msgstr ""
+
+-#: options.c:428
++#: options.c:450
+ msgid "no field identifier provided"
+ msgstr ""
+
+-#: options.c:434
++#: options.c:456
+ msgid "no field name provided"
+ msgstr ""
+
+-#: options.c:490
++#: options.c:512
+ #, c-format
+ msgid "%s: parse error at line %d: "
+ msgstr "%s: ʸˡ¥¨¥é¡¼¤¬ %d ¹ÔÌܤˤ¢¤ê¤Þ¤¹: "
+
+-#: options.c:494
++#: options.c:516
+ #, c-format
+ msgid "unknown token %s\n"
+ msgstr "%s ¤ÏÉÔÌÀ¤ÊÀßÄꥳ¥Þ¥ó¥É¤Ç¤¹\n"
+
+-#: ui.c:145
++#: ui.c:234
+ #, c-format
+ msgid "Your terminal size is %dx%d\n"
+ msgstr "²èÌÌ¥µ¥¤¥º¤Ï %dx%d ¤Ç¤¹\n"
+
+-#: ui.c:146
++#: ui.c:235
+ #, c-format
+ msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
+ msgstr "²èÌ̤¬¾®¤µ¤¹¤®¤Þ¤¹¡£¾¯¤Ê¤¯¤È¤â %dx%d ¤ÏɬÍפǤ¹\n"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (Y/n)?"
+ msgstr " (Y/n)?"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (y/N)?"
+ msgstr " (y/N)?"
+
+-#: ui.c:410
++#: ui.c:502
+ msgid "help"
+ msgstr "¥Ø¥ë¥×"
+
+-#: ui.c:419
++#: ui.c:511
+ msgid "Press any key to continue..."
+ msgstr "²¿¤«¥¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤..."
+
+-#: ui.c:539
++#: ui.c:656
+ msgid "Remove selected item(s)"
+ msgstr "ÁªÂò¹àÌܤòºï½ü¤·¤Þ¤¹¤«"
+
+-#: ui.c:549
++#: ui.c:666
++#, fuzzy
++msgid "Merge selected items"
++msgstr "²¿¤âÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
++
++#: ui.c:675
++#, fuzzy
++msgid "Remove duplicates"
++msgstr "ÁªÂò¹àÌܤòºï½ü¤·¤Þ¤¹¤«"
++
++#: ui.c:685
+ msgid "Clear WHOLE database"
+ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Á´ÂΤò¾Ãµî¤·¤Þ¤¹¤«"
+
+-#: ui.c:582
++#: ui.c:718
+ msgid "Search hit bottom, continuing at top"
+ msgstr "ºÇ¸å¤Þ¤Ç¸¡º÷¤·¤Þ¤·¤¿¡£ºÇ½é¤«¤é¤â¸¡º÷¤·¤Æ¤¤¤Þ¤¹"
+
+-#: ui.c:607
++#: ui.c:744
+ #, c-format
+ msgid "Your current data will be lost - Press '%c' to continue"
+ msgstr "¸½ºß¤Î¥Ç¡¼¥¿¤Ï¾Ã¤¨¤Æ¤·¤Þ¤¤¤Þ¤¹¡£¤è¤í¤·¤±¤ì¤Ð '%c' ¤Ç³¤±¤Æ¤¯¤À¤µ¤¤"
+
+-#: ui.c:632
++#: ui.c:769
+ msgid "Print <a>ll, print <s>elected, or <c>ancel?"
+ msgstr "°õºþÂÐ¾Ý a:¤¹¤Ù¤Æ s:ÁªÂò¹àÌÜ¤Î¤ß c:Ãæ»ß?"
+
+-#: ui.c:638
++#: ui.c:775
+ msgid "No selected items"
+ msgstr "²¿¤âÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+-#: ui.c:664
++#: ui.c:801
+ msgid "File to open: "
+ msgstr "³«¤¯¥Õ¥¡¥¤¥ë: "
+
+-#: ui.c:674
++#: ui.c:811
+ msgid "Save current database"
+ msgstr "¸½ºß¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊݸ¤·¤Þ¤¹¤«"
+
+-#: ui.c:682
++#: ui.c:819
+ msgid "Sorry, the specified file appears not to be a valid abook addressbook"
+ msgstr ""
+ "¿½¤·Ìõ¤¢¤ê¤Þ¤»¤ó¤¬¡¢¤´»ØÄê¤Î¥Õ¥¡¥¤¥ë¤ÏÀµµ¬¤Î abook ¥¢¥É¥ì¥¹Ä¢¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹"
+@@ -858,6 +943,9 @@
+ msgid "Custom5"
+ msgstr "³ÈÄ¥¾ðÊó5"
+
++#~ msgid "GnomeCard (VCard) addressbook"
++#~ msgstr "GnomeCard (vCard) ¥¢¥É¥ì¥¹Ä¢"
++
+ #~ msgid "?:help c:contact a:address p:phone o:other"
+ #~ msgstr "?:¥Ø¥ë¥× c:Ï¢ÍíÀè a:½»½ê p:ÅÅÏà o:¤½¤Î¾"
+
+diff -urN BUILD/abook-0.6.0pre2/po/Makefile.in.in abook/po/Makefile.in.in
+--- BUILD/abook-0.6.0pre2/po/Makefile.in.in 2006-08-04 22:30:07.000000000 +0200
++++ abook/po/Makefile.in.in 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+ # Makefile for PO directory in any package using GNU gettext.
+-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ #
+ # This file can be copied and used freely without restrictions. It can
+ # be used in projects which are not available under the GNU General Public
+@@ -8,7 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.14.4
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+@@ -23,19 +24,38 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = @datadir@
+ datarootdir = @datarootdir@
++datadir = @datadir@
+ localedir = @localedir@
+ gettextsrcdir = $(datadir)/gettext/po
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
+-XGETTEXT = @XGETTEXT@
++# We use $(mkdir_p).
++# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
++# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
++# @install_sh@ does not start with $(SHELL), so we add it.
++# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
++# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
++# versions, $(mkinstalldirs) and $(install_sh) are unused.
++mkinstalldirs = $(SHELL) @install_sh@ -d
++install_sh = $(SHELL) @install_sh@
++MKDIR_P = @MKDIR_P@
++mkdir_p = @mkdir_p@
++
++GMSGFMT_ = @GMSGFMT@
++GMSGFMT_no = @GMSGFMT@
++GMSGFMT_yes = @GMSGFMT_015@
++GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
++MSGFMT_ = @MSGFMT@
++MSGFMT_no = @MSGFMT@
++MSGFMT_yes = @MSGFMT_015@
++MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
++XGETTEXT_ = @XGETTEXT@
++XGETTEXT_no = @XGETTEXT@
++XGETTEXT_yes = @XGETTEXT_015@
++XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+ MSGMERGE = msgmerge
+ MSGMERGE_UPDATE = @MSGMERGE@ --update
+ MSGINIT = msginit
+@@ -68,19 +88,26 @@
+ .po.gmo:
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+ .sin.sed:
+ sed -e '/^#/d' $< > t-$@
+ mv t-$@ $@
+
+
+-all: all-@USE_NLS@
++all: check-macro-version all-@USE_NLS@
+
+ all-yes: stamp-po
+ all-no:
+
++# Ensure that the gettext macros and this Makefile.in.in are in sync.
++check-macro-version:
++ @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
++ || { 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; \
++ exit 1; \
++ }
++
+ # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+ # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+ # we don't want to bother translators with empty POT files). We assume that
+@@ -111,16 +138,34 @@
+ # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+ # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
++ if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
++ package_gnu='GNU '; \
++ else \
++ package_gnu=''; \
++ fi; \
+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+ else \
+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+ fi; \
+- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+- --files-from=$(srcdir)/POTFILES.in \
+- --copyright-holder='$(COPYRIGHT_HOLDER)' \
+- --msgid-bugs-address="$$msgid_bugs_address"
++ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
++ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
++ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
++ --files-from=$(srcdir)/POTFILES.in \
++ --copyright-holder='$(COPYRIGHT_HOLDER)' \
++ --msgid-bugs-address="$$msgid_bugs_address" \
++ ;; \
++ *) \
++ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
++ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
++ --files-from=$(srcdir)/POTFILES.in \
++ --copyright-holder='$(COPYRIGHT_HOLDER)' \
++ --package-name="$${package_gnu}@PACKAGE@" \
++ --package-version='@VERSION@' \
++ --msgid-bugs-address="$$msgid_bugs_address" \
++ ;; \
++ esac
+ test ! -f $(DOMAIN).po || { \
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+@@ -148,8 +193,15 @@
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
++ cd $(srcdir) \
++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
++ esac; \
++ }; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
+@@ -159,7 +211,7 @@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ for file in $(DISTFILES.common) Makevars.template; do \
+ $(INSTALL_DATA) $(srcdir)/$$file \
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
+@@ -172,13 +224,12 @@
+ fi
+ install-data-no: all
+ install-data-yes: all
+- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+- $(mkinstalldirs) $(DESTDIR)$$dir; \
++ $(mkdir_p) $(DESTDIR)$$dir; \
+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+@@ -218,19 +269,18 @@
+ installdirs-exec:
+ installdirs-data: installdirs-data-@USE_NLS@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ else \
+ : ; \
+ fi
+ installdirs-data-no:
+ installdirs-data-yes:
+- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+- $(mkinstalldirs) $(DESTDIR)$$dir; \
++ $(mkdir_p) $(DESTDIR)$$dir; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+@@ -350,9 +400,15 @@
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ cd $(srcdir); \
+- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ esac; \
++ }; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+@@ -373,10 +429,13 @@
+ update-gmo: Makefile $(GMOFILES)
+ @:
+
++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
++# because execution permission bits may not work on the current file system.
++# Use @SHELL@, which is the shell determined by autoconf for the use by its
++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+ cd $(top_builddir) \
+- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+- $(SHELL) ./config.status
++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+ force:
+
+diff -urN BUILD/abook-0.6.0pre2/po/Makevars abook/po/Makevars
+--- BUILD/abook-0.6.0pre2/po/Makevars 2006-08-05 14:25:47.000000000 +0200
++++ abook/po/Makevars 2013-03-13 15:07:45.000000000 +0100
+@@ -38,4 +38,4 @@
+
+ # This is the list of locale categories, beyond LC_MESSAGES, for which the
+ # message catalogs shall be used. It is usually empty.
+-EXTRA_LOCALE_CATEGORIES =
++EXTRA_LOCALE_CATEGORIES = LC_TIME
+diff -urN BUILD/abook-0.6.0pre2/po/Makevars.template abook/po/Makevars.template
+--- BUILD/abook-0.6.0pre2/po/Makevars.template 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/Makevars.template 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,41 @@
++# Makefile variables for PO directory in any package using GNU gettext.
++
++# Usually the message domain is the same as the package name.
++DOMAIN = $(PACKAGE)
++
++# These two variables depend on the location of this directory.
++subdir = po
++top_builddir = ..
++
++# These options get passed to xgettext.
++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
++
++# This is the copyright holder that gets inserted into the header of the
++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
++# package. (Note that the msgstr strings, extracted from the package's
++# sources, belong to the copyright holder of the package.) Translators are
++# expected to transfer the copyright for their translations to this person
++# or entity, or to disclaim their copyright. The empty string stands for
++# the public domain; in this case the translators are expected to disclaim
++# their copyright.
++COPYRIGHT_HOLDER = Free Software Foundation, Inc.
++
++# This is the email address or URL to which the translators shall report
++# bugs in the untranslated strings:
++# - Strings which are not entire sentences, see the maintainer guidelines
++# in the GNU gettext documentation, section 'Preparing Strings'.
++# - Strings which use unclear terms or require additional context to be
++# understood.
++# - Strings which make invalid assumptions about notation of date, time or
++# money.
++# - Pluralisation problems.
++# - Incorrect English spelling.
++# - Incorrect formatting.
++# It can be your email address, or a mailing list address where translators
++# can write to without being subscribed, or the URL of a web page through
++# which the translators can contact you.
++MSGID_BUGS_ADDRESS =
++
++# This is the list of locale categories, beyond LC_MESSAGES, for which the
++# message catalogs shall be used. It is usually empty.
++EXTRA_LOCALE_CATEGORIES =
+diff -urN BUILD/abook-0.6.0pre2/po/quot.sed abook/po/quot.sed
+--- BUILD/abook-0.6.0pre2/po/quot.sed 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/quot.sed 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,6 @@
++s/"\([^"]*\)"/“\1”/g
++s/`\([^`']*\)'/‘\1’/g
++s/ '\([^`']*\)' / ‘\1’ /g
++s/ '\([^`']*\)'$/ ‘\1’/g
++s/^'\([^`']*\)' /‘\1’ /g
++s/“”/""/g
+diff -urN BUILD/abook-0.6.0pre2/po/Rules-quot abook/po/Rules-quot
+--- BUILD/abook-0.6.0pre2/po/Rules-quot 1970-01-01 01:00:00.000000000 +0100
++++ abook/po/Rules-quot 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,47 @@
++# Special Makefile rules for English message catalogs with quotation marks.
++
++DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
++
++.SUFFIXES: .insert-header .po-update-en
++
++en@quot.po-create:
++ $(MAKE) en@quot.po-update
++en@boldquot.po-create:
++ $(MAKE) en@boldquot.po-update
++
++en@quot.po-update: en@quot.po-update-en
++en@boldquot.po-update: en@boldquot.po-update-en
++
++.insert-header.po-update-en:
++ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
++ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
++ tmpdir=`pwd`; \
++ echo "$$lang:"; \
++ ll=`echo $$lang | sed -e 's/@.*//'`; \
++ LC_ALL=C; export LC_ALL; \
++ cd $(srcdir); \
++ 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 \
++ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
++ rm -f $$tmpdir/$$lang.new.po; \
++ else \
++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
++ :; \
++ else \
++ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
++ exit 1; \
++ fi; \
++ fi; \
++ else \
++ echo "creation of $$lang.po failed!" 1>&2; \
++ rm -f $$tmpdir/$$lang.new.po; \
++ fi
++
++en@quot.insert-header: insert-header.sin
++ sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
++
++en@boldquot.insert-header: insert-header.sin
++ sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
++
++mostlyclean: mostlyclean-quot
++mostlyclean-quot:
++ rm -f *.insert-header
+Binarne pliki BUILD/abook-0.6.0pre2/po/sv.gmo i abook/po/sv.gmo różnią się
+diff -urN BUILD/abook-0.6.0pre2/po/sv.po abook/po/sv.po
+--- BUILD/abook-0.6.0pre2/po/sv.po 2006-09-06 16:14:38.000000000 +0200
++++ abook/po/sv.po 2013-03-13 15:07:45.000000000 +0100
+@@ -7,59 +7,60 @@
+ msgstr ""
+ "Project-Id-Version: abook 0.5.4\n"
+ "Report-Msgid-Bugs-To: <abook-devel@lists.sourceforge.net>\n"
+-"POT-Creation-Date: 2006-09-06 17:14+0300\n"
++"POT-Creation-Date: 2013-01-17 14:44+0100\n"
+ "PO-Revision-Date: 2006-08-05 14:20+0200\n"
+ "Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\n"
+ "Language-Team: none\n"
++"Language: sv\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+-#: abook.c:93
++#: abook.c:99
+ #, c-format
+ msgid "Cannot create directory %s\n"
+ msgstr "Kan inte skapa mapp %s\n"
+
+-#: abook.c:99
++#: abook.c:105
+ #, c-format
+ msgid "%s is not a directory\n"
+ msgstr "%s är inte en mapp\n"
+
+-#: abook.c:117
++#: abook.c:123
+ #, c-format
+ msgid "Memory allocation failure: %s\n"
+ msgstr "Fel vid tilldelning av minne: %s\n"
+
+-#: abook.c:128
++#: abook.c:134
+ #, c-format
+ msgid "Press enter to continue...\n"
+ msgstr "Tryck enter för att fortsätta...\n"
+
+-#: abook.c:143
++#: abook.c:149
+ #, c-format
+ msgid "File %s is not writeable"
+ msgstr "Filen %s kan inte skrivas"
+
+-#: abook.c:148
++#: abook.c:154
+ msgid "If you continue all changes will be lost. Do you want to continue?"
+ msgstr ""
+ "Om du fortsätter så kommer alla ändringar att gå förlorade. Vill du fortsätta"
+
+-#: abook.c:167
++#: abook.c:173
+ msgid "Save database"
+ msgstr "Spara databasen"
+
+-#: abook.c:169
++#: abook.c:175
+ msgid "Quit without saving"
+ msgstr "Avsluta utan att spara"
+
+-#: abook.c:225
++#: abook.c:233
+ #, c-format
+ msgid "%s is not a valid HOME directory\n"
+ msgstr "%s är inte en giltig hemmamapp\n"
+
+-#: abook.c:256
++#: abook.c:264
+ #, c-format
+ msgid ""
+ "Cannot combine options --mutt-query, --convert, --add-email or --add-email-"
+@@ -68,33 +69,43 @@
+ "Det går inte att kombinera flaggorna --mutt-query, --convert, --add-email "
+ "eller --add-email-quiet\n"
+
+-#: abook.c:287
++#: abook.c:295
+ #, c-format
+ msgid "please use option --%s after --convert option\n"
+ msgstr "var god och använd flaggan --%s efter flaggan --convert\n"
+
+-#: abook.c:386
++#: abook.c:382
++#, fuzzy, c-format
++msgid "please use option --outformat after --convert or --mutt-query option\n"
++msgstr "var god och använd flaggan --%s efter flaggan --convert\n"
++
++#: abook.c:420
++#, fuzzy, c-format
++msgid "Invalid custom format string\n"
++msgstr "Ogiltigt fältvärde i konfigurationen"
++
++#: abook.c:428
+ #, c-format
+ msgid "%s: unrecognized arguments on command line\n"
+ msgstr "%s: okända parametrar på kommandoraden\n"
+
+-#: abook.c:408
++#: abook.c:450
+ msgid " -h\t--help\t\t\t\tshow usage"
+ msgstr " -h\t--help\t\t\t\tvisa användning"
+
+-#: abook.c:409
++#: abook.c:451
+ msgid " -C\t--config\t<file>\t\tuse an alternative configuration file"
+ msgstr " -C\t--config\t<fil>\t\tanvänd en alternative konfigurationsfil"
+
+-#: abook.c:410
++#: abook.c:452
+ msgid "\t--datafile\t<file>\t\tuse an alternative addressbook file"
+ msgstr "\t--datafile\t<fil>\t\tanvänd en alternative adressboksfil"
+
+-#: abook.c:411
++#: abook.c:453
+ msgid "\t--mutt-query\t<string>\tmake a query for mutt"
+ msgstr "\t--mutt-query\t<sträng>\tgör en förfrågan till mutt"
+
+-#: abook.c:412
++#: abook.c:454
+ msgid ""
+ "\t--add-email\t\t\tread an e-mail message from stdin and\n"
+ "\t\t\t\t\tadd the sender to the addressbook"
+@@ -102,7 +113,7 @@
+ "\t--add-email\t\t\tläs ett ebrev från stdin och\n"
+ "\t\t\t\t\tlägg till avsändaren i adressboken"
+
+-#: abook.c:416
++#: abook.c:458
+ msgid ""
+ "\t--add-email-quiet\t\tsame as --add-email but doesn't\n"
+ "\t\t\t\t\trequire to confirm adding"
+@@ -110,66 +121,75 @@
+ "\t--add-email-quiet\t\tsamma som --add-email men utan\n"
+ "\t\t\t\t\tanvändarbekräftelse"
+
+-#: abook.c:420
++#: abook.c:462
+ msgid "\t--convert\t\t\tconvert address book files"
+ msgstr "\t--convert\t\t\tkonvertera adressbokfiler"
+
+-#: abook.c:421
++#: abook.c:463
+ msgid "\toptions to use with --convert:"
+ msgstr "\tflaggor som kan användas med --convert:"
+
+-#: abook.c:422
++#: abook.c:464
+ msgid "\t--informat\t<format>\tformat for input file"
+ msgstr "\t--informat\t<format>\tinputfilens format"
+
+-#: abook.c:423
++#: abook.c:465
+ msgid "\t\t\t\t\t(default: abook)"
+ msgstr "\t\t\t\t\t(förvalt: abook)"
+
+-#: abook.c:424
++#: abook.c:466
+ msgid "\t--infile\t<file>\t\tsource file"
+ msgstr "\t--infile\t<fil>\t\tkällfil"
+
+-#: abook.c:425
++#: abook.c:467
+ msgid "\t\t\t\t\t(default: stdin)"
+ msgstr "\t\t\t\t\t(förvalt: stdin)"
+
+-#: abook.c:426
++#: abook.c:468
+ msgid "\t--outformat\t<format>\tformat for output file"
+ msgstr "\t--outformat\t<format>\toutputfilens format"
+
+-#: abook.c:427
++#: abook.c:469
+ msgid "\t\t\t\t\t(default: text)"
+ msgstr "\t\t\t\t\t(förvalt: text)"
+
+-#: abook.c:428
++#: abook.c:470
+ msgid "\t--outfile\t<file>\t\tdestination file"
+ msgstr "\t--outfile\t<fil>\t\tmålfil"
+
+-#: abook.c:429
++#: abook.c:471
+ msgid "\t\t\t\t\t(default: stdout)"
+ msgstr "\t\t\t\t\t(förvalt: stdout)"
+
+-#: abook.c:430
++#: abook.c:472
++#, fuzzy
++msgid "\t--outformatstr\t<str> \tformat to use for \"custom\" --outformat"
++msgstr "\t--outformat\t<format>\toutputfilens format"
++
++#: abook.c:473
++msgid "\t\t\t\t\t(default: \"{nick} ({name}): {mobile}\")"
++msgstr ""
++
++#: abook.c:474
+ msgid "\t--formats\t\t\tlist available formats"
+ msgstr "\t--formats\t\t\tlista tillgängliga format"
+
+-#: abook.c:501
++#: abook.c:528
+ #, c-format
+ msgid "Cannot open database\n"
+ msgstr "Kan inte öppna databasen\n"
+
+-#: abook.c:627
++#: abook.c:654
+ #, c-format
+ msgid "too few arguments to make conversion\n"
+ msgstr "alltför få parametrar för att kunna konvertera\n"
+
+-#: abook.c:628
++#: abook.c:655
+ #, c-format
+ msgid "try --help\n"
+ msgstr "prova --help\n"
+
+-#: abook.c:633
++#: abook.c:660
+ #, c-format
+ msgid ""
+ "input and output formats are the same\n"
+@@ -178,46 +198,46 @@
+ "input- och outputformat är identiska\n"
+ "avslutar...\n"
+
+-#: abook.c:647
++#: abook.c:674
+ #, c-format
+ msgid "input format %s not supported\n"
+ msgstr "inputformater %s stöds ej\n"
+
+-#: abook.c:651
++#: abook.c:678
+ #, c-format
+ msgid "cannot read file %s\n"
+ msgstr "kan inte läsa filen %s\n"
+
+-#: abook.c:660
++#: abook.c:687
+ #, c-format
+ msgid "output format %s not supported\n"
+ msgstr "outputformatet %s stöds ej\n"
+
+-#: abook.c:666
++#: abook.c:693
+ #, c-format
+ msgid "cannot write file %s\n"
+ msgstr "kan inte skriva till filen %s\n"
+
+-#: abook.c:687
++#: abook.c:714
+ #, c-format
+ msgid "cannot open %s\n"
+ msgstr "kan inte öppna %s\n"
+
+-#: abook.c:690
++#: abook.c:717
+ #, c-format
+ msgid "%d item(s) added to %s\n"
+ msgstr "%d post(er) har lagts till i %s\n"
+
+-#: abook.c:692
++#: abook.c:719
+ msgid "Valid sender address not found"
+ msgstr "Kunde inte hitta en giltig avsändaradress"
+
+-#: abook.c:732
++#: abook.c:760
+ #, c-format
+ msgid "Address %s already in addressbook\n"
+ msgstr "Addressen %s finns redan i adressboken\n"
+
+-#: abook.c:742
++#: abook.c:770
+ #, c-format
+ msgid ""
+ "cannot open /dev/tty\n"
+@@ -226,20 +246,20 @@
+ "kan inte öppna /dev/tty\n"
+ "du bör kanske använda --add-email-quiet\n"
+
+-#: abook.c:748
++#: abook.c:776
+ #, fuzzy, c-format
+ msgid "Add \"%s <%s>\" to %s? (%c/%c)\n"
+ msgstr "Lägg till \"%s <%s>\" i %s? (j/n)\n"
+
+-#: abook.c:752 abook.c:759 ui.c:343 ui.c:609
++#: abook.c:780 abook.c:787 ui.c:434 ui.c:746
+ msgid "keybinding for yes|y"
+ msgstr "j"
+
+-#: abook.c:753 abook.c:755 ui.c:341
++#: abook.c:781 abook.c:783 ui.c:432
+ msgid "keybinding for no|n"
+ msgstr "n"
+
+-#: abook.c:780
++#: abook.c:808
+ #, c-format
+ msgid "stdin is a directory or cannot stat stdin\n"
+ msgstr ""
+@@ -315,202 +335,248 @@
+ msgid "Anniversary day"
+ msgstr ""
+
+-#: database.c:166
++#: database.c:61
++msgid "Groups"
++msgstr ""
++
++#: database.c:167
+ msgid "field already defined"
+ msgstr ""
+
+-#: database.c:170
++#: database.c:171
+ msgid "standard field does not need to be declared"
+ msgstr ""
+
+-#: database.c:185
++#: database.c:186
+ #, fuzzy
+ msgid "unknown type"
+ msgstr "okänd flagga"
+
+-#: database.c:585
++#: database.c:648
+ msgid "Invalid field value defined in configuration"
+ msgstr "Ogiltigt fältvärde i konfigurationen"
+
+-#: database.c:588
++#: database.c:651
+ #, fuzzy
+ msgid "Invalid field value for sorting"
+ msgstr "Ogiltigt fältvärde i konfigurationen"
+
+-#: edit.c:51
++#: edit.c:59
+ msgid "Tab name too wide for screen"
+ msgstr "Flikrubrik för bred för skärmen"
+
+-#: edit.c:353
++#: edit.c:360
+ msgid "keybindings_new_123456789|n123456789"
+ msgstr ""
+
+-#: edit.c:355
++#: edit.c:362
+ #, c-format
+ msgid "Choose %s to modify (<1>%s%c%s%s."
+ msgstr ""
+
+-#: edit.c:356
++#: edit.c:363
+ #, fuzzy
+ msgid "email"
+ msgstr "Ebrev"
+
+-#: edit.c:356
++#: edit.c:363
+ msgid "item"
+ msgstr ""
+
+-#: edit.c:361
++#: edit.c:368
+ msgid " or <n>ew"
+ msgstr ""
+
+-#: edit.c:379
++#: edit.c:386
+ #, fuzzy
+ msgid "E-mail: "
+ msgstr "Ebrev"
+
+-#: edit.c:379
++#: edit.c:386
+ msgid "Item: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:460
++msgid "%Y-%M-%D"
++msgstr ""
++
++#: edit.c:461
++msgid "--%M-%D"
++msgstr ""
++
++#: edit.c:539
+ msgid "Day: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Month: "
+ msgstr ""
+
+-#: edit.c:465
++#: edit.c:539
+ msgid "Year (optional): "
+ msgstr ""
+
+-#: edit.c:498
++#: edit.c:569
+ #, fuzzy
+ msgid "Invalid date"
+ msgstr "ogiltigt värde"
+
+-#: edit.c:653
++#: edit.c:776
+ msgid "Name: "
+ msgstr "Namn: "
+
+-#: edit.h:14
++#: edit.h:18
+ msgid "?:help q:quit editor"
+ msgstr ""
+
+-#: filter.c:71 filter.c:82
++#: filter.c:88 filter.c:100
+ msgid "abook native format"
+ msgstr "abooks eget format"
+
+-#: filter.c:72
++#: filter.c:89
+ msgid "ldif / Netscape addressbook"
+ msgstr "ldif / adressbok fr Netscape"
+
+-#: filter.c:73 filter.c:84
++#: filter.c:90 filter.c:103 filter.c:121
+ msgid "mutt alias"
+ msgstr "mutt-alias"
+
+-#: filter.c:74 filter.c:86
++#: filter.c:91 filter.c:106
+ msgid "pine addressbook"
+ msgstr "pine-adressbok"
+
+-#: filter.c:75 filter.c:88
++#: filter.c:92 filter.c:107
+ msgid "comma separated values"
+ msgstr "kommaseparerade värden"
+
+-#: filter.c:76 filter.c:89
++#: filter.c:93 filter.c:108
+ msgid "comma separated values (all fields)"
+ msgstr "kommaseparerade värden (alla fält)"
+
+-#: filter.c:77 filter.c:90
++#: filter.c:94 filter.c:109
+ msgid "Palm comma separated values"
+ msgstr "kommaseparerade värden från Palm"
+
+-#: filter.c:83
++#: filter.c:95
++msgid "vCard file"
++msgstr ""
++
++#: filter.c:101
+ msgid "ldif / Netscape addressbook (.4ld)"
+ msgstr "ldif / adressbok fr Netscape (.4ld)"
+
+-#: filter.c:85
++#: filter.c:102 filter.c:120
++msgid "vCard 2 file"
++msgstr ""
++
++#: filter.c:104
++msgid "mutt query format (internal use)"
++msgstr ""
++
++#: filter.c:105
+ msgid "html document"
+ msgstr "html-dokument"
+
+-#: filter.c:87
+-msgid "GnomeCard (VCard) addressbook"
+-msgstr "GnomeCard-adressbok (VCard)"
+-
+-#: filter.c:91
++#: filter.c:110
+ msgid "elm alias"
+ msgstr "elm-alias"
+
+-#: filter.c:92
++#: filter.c:111
+ msgid "plain text"
+ msgstr "ren text"
+
+-#: filter.c:93
++#: filter.c:112
+ #, fuzzy
+ msgid "Wanderlust address book"
+ msgstr "pine-adressbok"
+
+-#: filter.c:94
++#: filter.c:113
+ msgid "Spruce address book"
+ msgstr "Spruce-adressbok"
+
+-#: filter.c:95
++#: filter.c:114
+ msgid "BSD calendar"
+ msgstr ""
+
+-#: filter.c:108
+-msgid "input:"
++#: filter.c:115 filter.c:122
++#, fuzzy
++msgid "Custom format"
++msgstr "Egen1"
++
++#: filter.c:135
++#, fuzzy
++msgid "input formats:"
+ msgstr "input:"
+
+-#: filter.c:115
+-msgid "output:"
++#: filter.c:142
++#, fuzzy
++msgid "output formats:"
+ msgstr "output:"
+
+-#: filter.c:180
++#: filter.c:149
++msgid "query-compatible output formats:"
++msgstr ""
++
++#: filter.c:214
+ msgid "import database"
+ msgstr "importera databaser"
+
+-#: filter.c:182 filter.c:299
++#: filter.c:216 filter.c:345
+ msgid "please select a filter"
+ msgstr "var god och välj filter"
+
+-#: filter.c:190 filter.c:307
++#: filter.c:224 filter.c:353
+ msgid "x -\tcancel"
+ msgstr "x -\tavbryt"
+
+-#: filter.c:211 filter.c:345
++#: filter.c:245 filter.c:391
+ msgid "Filename: "
+ msgstr "Filnamn:"
+
+-#: filter.c:218
++#: filter.c:252
+ msgid "Error occured while opening the file"
+ msgstr "Fel vid öppnandet av filen"
+
+-#: filter.c:220
++#: filter.c:254
+ msgid "File does not seem to be a valid addressbook"
+ msgstr "Den angivna filen verkar inte vara en giltig adressbok"
+
+-#: filter.c:297
++#: filter.c:343
+ msgid "export database"
+ msgstr "exportera databasen"
+
+-#: filter.c:330
++#: filter.c:376
+ msgid "Export <a>ll, export <s>elected, or <c>ancel?"
+ msgstr ""
+
+-#: filter.c:331 ui.c:632
++#: filter.c:377 ui.c:769
+ msgid "keybindings:all/selected/cancel|asc"
+ msgstr ""
+
+-#: filter.c:352
++#: filter.c:398
+ msgid "Error occured while exporting"
+ msgstr "Fel vid export"
+
+-#: filter.c:1896
++#: filter.c:2469
+ #, c-format
+ msgid "%02d/%02d\tAnniversary of %s\n"
+ msgstr ""
+
++#: filter.c:2498
++#, c-format
++msgid "parse_custom_format: fmt_string or ft not allocated\n"
++msgstr ""
++
++#: filter.c:2517
++#, c-format
++msgid "parse_custom_format: invalid placeholder: {%s}\n"
++msgstr ""
++
++#: filter.c:2565
++#, c-format
++msgid "%s: invalid format, index %ld\n"
++msgstr ""
++
+ #: help.h:11
+ msgid "\t?\t\thelp\n"
+ msgstr "\t?\t\thjälp\n"
+@@ -548,263 +614,282 @@
+ msgstr "\tr / del\t\tta bort valda poster\n"
+
+ #: help.h:21
++msgid "\tM\t\tmerge selected items (into top one)\n"
++msgstr ""
++
++#: help.h:22
+ msgid "\tD\t\tduplicate item\n"
+ msgstr "\tD\t\tduplicera post\n"
+
+ #: help.h:23
++#, fuzzy
++msgid "\tU\t\tremove duplicates\n"
++msgstr "\tD\t\tduplicera post\n"
++
++#: help.h:25
+ msgid "\tspace\t\tselect item\n"
+ msgstr "\tspace\t\tvälj post\n"
+
+-#: help.h:24
++#: help.h:26
+ msgid "\t+\t\tselect all\n"
+ msgstr "\t+\t\tvälj alla\n"
+
+-#: help.h:25
++#: help.h:27
+ msgid "\t-\t\tunselect all\n"
+-msgstr "\t+\t\avmarkera alla\n"
++msgstr "\t+\t\avmarkera alla\n"
+
+-#: help.h:26
++#: help.h:28
+ msgid "\t*\t\tinvert selection\n"
+ msgstr "\t*\t\tinvertera urval\n"
+
+-#: help.h:28
++#: help.h:30
+ msgid "\tw\t\twrite database to disk\n"
+ msgstr "\tw\t\tskriv databasen till disken\n"
+
+-#: help.h:29
++#: help.h:31
+ msgid "\tl\t\tread database from disk\n"
+ msgstr "\tl\t\tläs databasen från disken\n"
+
+-#: help.h:30
++#: help.h:32
+ msgid "\tC\t\tclear whole database\n"
+ msgstr "\tC\t\tnollställ hela databasen\n"
+
+-#: help.h:31
++#: help.h:33
+ msgid "\ti\t\timport database\n"
+ msgstr "\ti\t\timportera databas\n"
+
+-#: help.h:32
++#: help.h:34
+ msgid "\te\t\texport database\n"
+ msgstr "\te\t\texportera databasen\n"
+
+-#: help.h:33
++#: help.h:35
+ msgid "\tp\t\tprint database\n"
+ msgstr "\tp\t\tskriv ut databasen\n"
+
+-#: help.h:34
++#: help.h:36
+ msgid "\to\t\topen database\n"
+ msgstr "\to\t\töppna databas\n"
+
+-#: help.h:36
++#: help.h:38
+ msgid "\ts\t\tsort database\n"
+ msgstr "\ts\t\tsortera databasen\n"
+
+-#: help.h:37
++#: help.h:39
+ msgid "\tS\t\t\"surname sort\"\n"
+ msgstr "\tS\t\t\"sortera efter efternamn\"\n"
+
+-#: help.h:38
++#: help.h:40
+ msgid "\tF\t\tsort by field (defined in configuration file)\n"
+ msgstr "\tF\t\tsortera efter fält (angivet i konfigurationsfilen)\n"
+
+-#: help.h:40
++#: help.h:42
+ msgid "\t/\t\tsearch\n"
+ msgstr "\t/\t\tsök\n"
+
+-#: help.h:41
++#: help.h:43
+ msgid "\t\\\t\tsearch next occurrence\n"
+ msgstr "\t\\\t\tsök efter nästa förekomst\n"
+
+-#: help.h:43
++#: help.h:45
+ msgid "\tA\t\tmove current item up\n"
+ msgstr "\tA\t\tflytta denna post uppåt\n"
+
+-#: help.h:44
++#: help.h:46
+ msgid "\tZ\t\tmove current item down\n"
+ msgstr "\tZ\t\tflytta denna post nedåt\n"
+
+-#: help.h:46
++#: help.h:48
+ msgid "\tm\t\tsend mail with mutt\n"
+ msgstr "\tm\t\tskicka post med mutt\n"
+
+-#: help.h:47
++#: help.h:49
+ msgid "\tv\t\tview URL with web browser\n"
+ msgstr "\tv\t\tvisa URL i webbläsare\n"
+
+-#: help.h:55
++#: help.h:57
+ #, fuzzy
+ msgid "\tarrows/h,l\t\tchange tab\n"
+ msgstr "\ta,c,p,o,C/pilar/h,l\tbyt flik\n"
+
+-#: help.h:57
++#: help.h:59
+ #, fuzzy
+ msgid "\tq\t\t\tquit to main screen\n"
+ msgstr "\tQ\t\tavsluta utan att spara\n"
+
+-#: help.h:59
++#: help.h:61
+ #, fuzzy
+ msgid "\t1 - 5 A - Z\t\tedit fields\n"
+ msgstr "\t1 - 5\t\t\tredigera fält\n"
+
+-#: help.h:61
++#: help.h:63
+ msgid "\tk or <\t\t\tprevious item\n"
+ msgstr "\tk or <\t\t\tföregående post\n"
+
+-#: help.h:62
++#: help.h:64
+ msgid "\tj or >\t\t\tnext item\n"
+ msgstr "\tj or >\t\t\tnästa post\n"
+
+-#: help.h:64
++#: help.h:66
+ #, fuzzy
+ msgid "\tr\t\t\troll e-mail addresses up\n"
+ msgstr "\tr\t\t\trotera ebrevsadresser\n"
+
+-#: help.h:65
++#: help.h:67
+ #, fuzzy
+ msgid "\tESC-r\t\t\troll e-mail addresses down\n"
+ msgstr "\tr\t\t\trotera ebrevsadresser\n"
+
+-#: help.h:67
++#: help.h:69
+ msgid "\tu\t\t\tundo\n"
+ msgstr "\tu\t\t\tångra\n"
+
+-#: help.h:69
++#: help.h:71
+ msgid "\tm\t\t\tsend mail with mutt\n"
+ msgstr "\tm\t\t\tskicka post med mutt\n"
+
+-#: help.h:70
++#: help.h:72
+ msgid "\tv\t\t\tview url with web browser\n"
+ msgstr "\tv\t\t\tvisa url i webbläsare\n"
+
+-#: options.c:250
++#: options.c:272
+ msgid "quote mismatch"
+ msgstr ""
+
+-#: options.c:256
++#: options.c:278
+ msgid "no assignment character found"
+ msgstr ""
+
+-#: options.c:259
++#: options.c:281
+ #, fuzzy
+ msgid "error in comma separated list"
+ msgstr "kommaseparerade värden"
+
+-#: options.c:289 options.c:308
++#: options.c:311 options.c:330
+ msgid "invalid value"
+ msgstr "ogiltigt värde"
+
+-#: options.c:329
++#: options.c:351
+ msgid "unknown option"
+ msgstr "okänd flagga"
+
+-#: options.c:341
++#: options.c:363
+ #, c-format
+ msgid ""
+ "valid values for the 'preserve_fields' option are 'all', "
+ "'standard' (default), and 'none'\n"
+ msgstr ""
+
+-#: options.c:350
++#: options.c:372
+ #, c-format
+ msgid ""
+ "valid values for the 'address_style' option are 'eu' (default), 'uk', and "
+ "'us'\n"
+ msgstr ""
+
+-#: options.c:372
++#: options.c:394
+ msgid "invalid value assignment"
+ msgstr "tilldelat ogiltigt värde"
+
+-#: options.c:380
++#: options.c:402
+ msgid ""
+ "customfield: obsolete command - please use the 'field' and 'view' commands "
+ "instead"
+ msgstr ""
+
+-#: options.c:398
++#: options.c:420
+ msgid "no view name provided"
+ msgstr ""
+
+-#: options.c:428
++#: options.c:450
+ msgid "no field identifier provided"
+ msgstr ""
+
+-#: options.c:434
++#: options.c:456
+ msgid "no field name provided"
+ msgstr ""
+
+-#: options.c:490
++#: options.c:512
+ #, c-format
+ msgid "%s: parse error at line %d: "
+ msgstr "%s: parsning misslyckades på rad %d: "
+
+-#: options.c:494
++#: options.c:516
+ #, c-format
+ msgid "unknown token %s\n"
+ msgstr "okänd symbol %s\n"
+
+-#: ui.c:145
++#: ui.c:234
+ #, c-format
+ msgid "Your terminal size is %dx%d\n"
+ msgstr "Storleken på ditt terminalfönster är %dx%d\n"
+
+-#: ui.c:146
++#: ui.c:235
+ #, fuzzy, c-format
+ msgid "Terminal is too small. Minimum terminal size for abook is %dx%d\n"
+ msgstr ""
+ "Terminalfönstret är alltför litet. Den minsta tillåtna storleken för abook "
+ "är %dx%d\n"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (Y/n)?"
+ msgstr "(J/n)"
+
+-#: ui.c:332
++#: ui.c:423
+ msgid " (y/N)?"
+ msgstr "(j/N)"
+
+-#: ui.c:410
++#: ui.c:502
+ msgid "help"
+ msgstr "hjälp"
+
+-#: ui.c:419
++#: ui.c:511
+ msgid "Press any key to continue..."
+ msgstr "Tryck på en tangent för att fortsätta..."
+
+-#: ui.c:539
++#: ui.c:656
+ msgid "Remove selected item(s)"
+ msgstr "Ta bort valda post(er)"
+
+-#: ui.c:549
++#: ui.c:666
++#, fuzzy
++msgid "Merge selected items"
++msgstr "Inga poster valda"
++
++#: ui.c:675
++#, fuzzy
++msgid "Remove duplicates"
++msgstr "Ta bort valda post(er)"
++
++#: ui.c:685
+ msgid "Clear WHOLE database"
+ msgstr "Nollställ HELA databasen"
+
+-#: ui.c:582
++#: ui.c:718
+ msgid "Search hit bottom, continuing at top"
+ msgstr "Sök nådde slutet, fortsätter från början"
+
+-#: ui.c:607
++#: ui.c:744
+ #, fuzzy, c-format
+ msgid "Your current data will be lost - Press '%c' to continue"
+ msgstr "Nuvarande data kommer att förloras - Tryck på 'y' för att fortsätta"
+
+-#: ui.c:632
++#: ui.c:769
+ msgid "Print <a>ll, print <s>elected, or <c>ancel?"
+ msgstr ""
+
+-#: ui.c:638
++#: ui.c:775
+ msgid "No selected items"
+ msgstr "Inga poster valda"
+
+-#: ui.c:664
++#: ui.c:801
+ msgid "File to open: "
+ msgstr "Öppna fil: "
+
+-#: ui.c:674
++#: ui.c:811
+ msgid "Save current database"
+ msgstr "Spara denna databas"
+
+-#: ui.c:682
++#: ui.c:819
+ msgid "Sorry, the specified file appears not to be a valid abook addressbook"
+ msgstr ""
+ "Förlåt, men den angivna filen verkar inte vara en giltig abook-adressbok"
+@@ -864,6 +949,9 @@
+ msgid "Custom5"
+ msgstr "Egen5"
+
++#~ msgid "GnomeCard (VCard) addressbook"
++#~ msgstr "GnomeCard-adressbok (VCard)"
++
+ #~ msgid "?:help c:contact a:address p:phone o:other"
+ #~ msgstr "?:hjälp c:kontact a:adress p:telefon o:annat"
+
+diff -urN BUILD/abook-0.6.0pre2/README abook/README
+--- BUILD/abook-0.6.0pre2/README 2006-09-05 10:05:33.000000000 +0200
++++ abook/README 2013-03-13 15:07:45.000000000 +0100
+@@ -46,6 +46,9 @@
+ It's also recommended to set pipe_decode variable in mutt configuration.
+ See the mutt manual for details.
+
++Abook can also convert from/to mutt alias files and a number of other formats.
++Mutt groups are fully supported.
++
+ UPGRADING FROM VERSION 0.5
+
+ See RELEASE_NOTES .
+diff -urN BUILD/abook-0.6.0pre2/RELEASE_NOTES abook/RELEASE_NOTES
+--- BUILD/abook-0.6.0pre2/RELEASE_NOTES 2006-09-04 20:29:24.000000000 +0200
++++ abook/RELEASE_NOTES 2013-03-13 15:07:45.000000000 +0100
+@@ -3,8 +3,34 @@
+ A more comprehensive list of changes can be found in the ChangeLog file.
+
+ --
++Git:
++ * support for mouse
++ * support for a colored UI
++ * added "groups" as a default field
++ * the UI now support merging selected entries [key M]
++ and removing duplicates [key U]
++ * a "custom" output filter allow the specification of an output
++ format using placeholders
++ * search-next is now bound to "/" too
++ * some output filters can now be used in the context
++ of --mutt-query. This is the case of "vcard" and "custom"
++ [ no --query option has been created and --mutt-query is fully
++ backward compatible ]
++ * ldif output filter has been fixed [output modified] in multiple
++ ways, does not force output to latin1 anymore and support input
++ from stdin.
++ * vcard input/output support:
++ An original input filter implementation was provided soon
++ after 0.6.0pre2.
++ In 2012, an optional build-time option to link against libvformat
++ was added for the very same task: parsing vcard.
++ - It depends on the --enable-vformat ./configure switch
++ - It's only used as an input filter, especially useful to
++ deal with multi-valued fields and encoded characters.
+
+-0.6.0pre2:
++0.6.0pre2 (2010-07-22):
++ * Added anniversary as a default field
++ * Display dates according to current locale
+ * The four following configuration options have been deprecated and will
+ no longer be accepted by abook:
+ * emailpos
+diff -urN BUILD/abook-0.6.0pre2/sample.abookrc abook/sample.abookrc
+--- BUILD/abook-0.6.0pre2/sample.abookrc 2006-09-04 21:24:18.000000000 +0200
++++ abook/sample.abookrc 2013-03-13 15:07:45.000000000 +0100
+@@ -108,3 +108,9 @@
+ # show cursor in main display
+ set show_cursor=false
+
++# colors
++set use_colors = true
++set color_header_fg = red
++set color_header_bg = default
++set color_list_header_fg = blue
++set color_list_header_bg = default
+diff -urN BUILD/abook-0.6.0pre2/stamp-h.in abook/stamp-h.in
+--- BUILD/abook-0.6.0pre2/stamp-h.in 1970-01-01 01:00:00.000000000 +0100
++++ abook/stamp-h.in 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1 @@
++timestamp
+diff -urN BUILD/abook-0.6.0pre2/THANKS abook/THANKS
+--- BUILD/abook-0.6.0pre2/THANKS 2006-09-06 16:27:14.000000000 +0200
++++ abook/THANKS 2013-03-13 15:07:45.000000000 +0100
+@@ -21,6 +21,5 @@
+ Marc Tardif
+ Gerfried Fuchs
+ Josef Schugt
+-Guillem Jover
+
+ See also AUTHORS
+diff -urN BUILD/abook-0.6.0pre2/TODO abook/TODO
+--- BUILD/abook-0.6.0pre2/TODO 2006-09-05 10:34:24.000000000 +0200
++++ abook/TODO 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,3 @@
+-0.6
+- - allcsv should export all fields
+-
+ generic:
+ - grouping
+ - new file format (xml?)
+diff -urN BUILD/abook-0.6.0pre2/ui.c abook/ui.c
+--- BUILD/abook-0.6.0pre2/ui.c 2006-09-06 07:26:10.000000000 +0200
++++ abook/ui.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,6 +1,6 @@
+
+ /*
+- * $Id: ui.c,v 1.58 2006/09/06 02:24:33 cduval Exp $
++ * $Id$
+ *
+ * by JH <jheinonen@users.sourceforge.net>
+ *
+@@ -25,6 +25,8 @@
+ #include "options.h"
+ #include "filter.h"
+ #include "xmalloc.h"
++#include "color.h"
++#include <sys/time.h>
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+@@ -50,6 +52,8 @@
+
+ static bool should_resize = FALSE;
+ static bool can_resize = FALSE;
++static struct timeval last_click_time;
++static int double_click_interval = 200; /* maximum time in milliseconds */
+
+ static WINDOW *top = NULL, *bottom = NULL;
+
+@@ -129,7 +133,92 @@
+ noecho();
+ nonl();
+ intrflush(stdscr, FALSE);
++ if(opt_get_bool(BOOL_USE_MOUSE)) {
++ mouseinterval(0);
++ timerclear(&last_click_time);
++ ui_enable_mouse(TRUE);
++ }
+ keypad(stdscr, TRUE);
++ if(opt_get_bool(BOOL_USE_COLORS) && has_colors()) {
++ start_color();
++ use_default_colors();
++ ui_init_color_pairs_user();
++ }
++}
++
++void
++ui_enable_mouse(bool enabled)
++{
++ mmask_t mask;
++ if(enabled) {
++ mask = BUTTON1_CLICKED | BUTTON4_PRESSED;
++#if NCURSES_MOUSE_VERSION == 2
++ mask |= BUTTON5_PRESSED;
++#endif
++ } else {
++ mask = 0;
++ }
++ mousemask(mask, NULL);
++}
++
++/** Check the time elapsed since last click and tell if it should be
++ * interpreted as a double click
++ */
++static bool
++was_double_click() {
++ struct timeval click_time, click_diff, maxdiff;
++ maxdiff.tv_sec = double_click_interval / 1000;
++ maxdiff.tv_usec = (double_click_interval % 1000)*1000;
++ gettimeofday(&click_time, NULL);
++
++ timersub(&click_time, &last_click_time, &click_diff);
++ last_click_time = click_time;
++ return !timercmp(&click_diff, &maxdiff, >);
++}
++
++#define CHECK_COLOR_NAME(value, name, DEFNAME) \
++ if(!strcmp((name), (value))){ \
++ return DEFNAME; \
++ }
++short
++opt_color_to_color(enum str_opts enum_name)
++{
++ char* name = opt_get_str(enum_name);
++ CHECK_COLOR_NAME(name, "default", COLOR_DEFAULT)
++ else CHECK_COLOR_NAME(name, "black", COLOR_BLACK)
++ else CHECK_COLOR_NAME(name, "red", COLOR_RED)
++ else CHECK_COLOR_NAME(name, "green", COLOR_GREEN)
++ else CHECK_COLOR_NAME(name, "yellow", COLOR_YELLOW)
++ else CHECK_COLOR_NAME(name, "blue", COLOR_BLUE)
++ else CHECK_COLOR_NAME(name, "magenta", COLOR_MAGENTA)
++ else CHECK_COLOR_NAME(name, "cyan", COLOR_CYAN)
++ else CHECK_COLOR_NAME(name, "white", COLOR_WHITE)
++ else return COLOR_DEFAULT;
++}
++
++void
++ui_init_color_pairs_user()
++{
++ init_pair(CP_HEADER, opt_color_to_color(STR_COLOR_HEADER_FG),
++ opt_color_to_color(STR_COLOR_HEADER_BG));
++ init_pair(CP_FOOTER, opt_color_to_color(STR_COLOR_FOOTER_FG),
++ opt_color_to_color(STR_COLOR_FOOTER_BG));
++ init_pair(CP_LIST_EVEN, opt_color_to_color(STR_COLOR_LIST_EVEN_FG),
++ opt_color_to_color(STR_COLOR_LIST_EVEN_BG));
++ init_pair(CP_LIST_ODD, opt_color_to_color(STR_COLOR_LIST_ODD_FG),
++ opt_color_to_color(STR_COLOR_LIST_ODD_BG));
++ init_pair(CP_LIST_HEADER, opt_color_to_color(STR_COLOR_LIST_HEADER_FG),
++ opt_color_to_color(STR_COLOR_LIST_HEADER_BG));
++ init_pair(CP_LIST_HIGHLIGHT, opt_color_to_color(STR_COLOR_LIST_HIGHLIGHT_FG),
++ opt_color_to_color(STR_COLOR_LIST_HIGHLIGHT_BG));
++ init_pair(CP_TAB_BORDER, opt_color_to_color(STR_COLOR_TAB_BORDER_FG),
++ opt_color_to_color(STR_COLOR_TAB_BORDER_BG));
++ init_pair(CP_TAB_LABEL, opt_color_to_color(STR_COLOR_TAB_LABEL_FG),
++ opt_color_to_color(STR_COLOR_TAB_LABEL_BG));
++ init_pair(CP_FIELD_NAME, opt_color_to_color(STR_COLOR_FIELD_NAME_FG),
++ opt_color_to_color(STR_COLOR_FIELD_NAME_BG));
++ init_pair(CP_FIELD_VALUE, opt_color_to_color(STR_COLOR_FIELD_VALUE_FG),
++ opt_color_to_color(STR_COLOR_FIELD_VALUE_BG));
+ }
+
+ int
+@@ -179,6 +268,8 @@
+ {
+ werase(top);
+
++ wattrset(top, COLOR_PAIR(CP_HEADER));
++ mvwhline(top, 0, 0, ' ', COLS);
+ mvwhline(top, 1, 0, UI_HLINE_CHAR, COLS);
+
+ mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str);
+@@ -355,6 +446,7 @@
+ {
+ werase(bottom);
+
++ wattrset(bottom, COLOR_PAIR(CP_FOOTER));
+ mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS);
+
+ refresh();
+@@ -448,6 +540,28 @@
+ if(!opt_get_bool(BOOL_SHOW_CURSOR))
+ show_cursor();
+ can_resize = FALSE; /* it's not safe to resize anymore */
++ if(ch == KEY_MOUSE) {
++ MEVENT event;
++ bool double_clicked = was_double_click();
++ if(getmouse(&event) == OK) {
++ if(event.bstate & BUTTON1_CLICKED
++ || event.bstate & BUTTON1_DOUBLE_CLICKED) {
++ if(event.y == 0) {
++ return;
++ }
++ list_set_curitem(event.y + list_get_firstitem() - LIST_TOP);
++ if(double_clicked) {
++ edit_item(-1);
++ } else {
++ refresh_list();
++ }
++ } else if(event.bstate & BUTTON4_PRESSED) {
++ scroll_up();
++ } else if(event.bstate & BUTTON5_PRESSED) {
++ scroll_down();
++ }
++ }
++ }
+ switch(ch) {
+ case 'q': return;
+ case 'Q': quit_abook(QUIT_DONTSAVE); break;
+@@ -463,7 +577,9 @@
+ case KEY_DC:
+ case 'd':
+ case 'r': ui_remove_items(); break;
++ case 'M': ui_merge_items(); break;
+ case 'D': duplicate_item(); break;
++ case 'U': ui_remove_duplicates(); break;
+ case 12: refresh_screen(); break;
+
+ case 'k':
+@@ -494,6 +610,7 @@
+ case 'F': sort_by_field(NULL); break;
+
+ case '/': ui_find(0); break;
++ case 'n':
+ case '\\': ui_find(1); break;
+
+ case ' ': if(list_get_curitem() >= 0) {
+@@ -544,6 +661,25 @@
+ }
+
+ void
++ui_merge_items()
++{
++ if(statusline_ask_boolean(_("Merge selected items"), TRUE))
++ merge_selected_items();
++
++ clear_statusline();
++ refresh_list();
++}
++
++void ui_remove_duplicates()
++{
++ if(statusline_ask_boolean(_("Remove duplicates"), TRUE))
++ remove_duplicates();
++
++ clear_statusline();
++ refresh_list();
++}
++
++void
+ ui_clear_database()
+ {
+ if(statusline_ask_boolean(_("Clear WHOLE database"), FALSE)) {
+@@ -593,6 +729,7 @@
+ char *str = strdup_printf(" " "|%3d/%3d",
+ selected_items(), db_n_items());
+
++ attrset(COLOR_PAIR(CP_HEADER));
+ mvaddstr(0, COLS-strlen(str), str);
+
+ free(str);
+diff -urN BUILD/abook-0.6.0pre2/ui.h abook/ui.h
+--- BUILD/abook-0.6.0pre2/ui.h 2006-04-10 10:15:46.000000000 +0200
++++ abook/ui.h 2013-03-13 15:07:45.000000000 +0100
+@@ -10,6 +10,8 @@
+
+ int is_ui_initialized();
+ void ui_init_curses();
++void ui_init_color_pairs_user();
++void ui_enable_mouse(bool enabled);
+ int init_ui();
+ void close_ui();
+ void headerline(const char *str);
+@@ -27,6 +29,8 @@
+ void refresh_statusline();
+ void get_commands();
+ void ui_remove_items();
++void ui_merge_items();
++void ui_remove_duplicates();
+ void ui_clear_database();
+ void ui_find(int next);
+ void ui_print_number_of_items();
+@@ -35,6 +39,9 @@
+ void ui_print_database();
+ void ui_open_datafile();
+
++#if NCURSES_MOUSE_VERSION != 2
++#define BUTTON5_PRESSED (0x80 | 0x8000000)
++#endif
+
+ #include "options.h" /* needed for options_get_bool */
+
+diff -urN BUILD/abook-0.6.0pre2/vcard.c abook/vcard.c
+--- BUILD/abook-0.6.0pre2/vcard.c 1970-01-01 01:00:00.000000000 +0100
++++ abook/vcard.c 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,171 @@
++
++/*
++ * Copyright 2012, Raphaël Droz <raphael.droz+floss@gmail.com>
++ *
++ * abook's wrapper for libvformat:
++ * fits a vcard parsed by libvformat into a usable abook item list
++ *
++ * see:
++ * libvformat's vf_iface.h
++ * http://www.imc.org/pdi/vcard-21.txt
++ * rfc 2426
++ * rfc 2739
++ */
++
++#include <stdio.h>
++#include <string.h>
++
++#include "database.h"
++#include "options.h" // bool
++#include "misc.h" // abook_list_to_csv
++#include "xmalloc.h"
++
++#include "vcard.h"
++
++int vcard_parse_file_libvformat(char *filename) {
++ VF_OBJECT_T* vfobj;
++ if (!vf_read_file(&vfobj, filename)) {
++ fprintf(stderr, "Could not read VCF file %s\n", filename);
++ return 1;
++ }
++
++ // a libvformat property
++ VF_PROP_T* prop;
++ // property number (used for multivalued properties)
++ int props = 0;
++ // temporary values
++ abook_list *multivalues = NULL;
++ char *propval = 0;
++ bool phone_found;
++
++ do {
++ list_item item = item_create();
++ phone_found = false;
++ /* Note: libvformat use va_args, we *must* cast the last
++ NULL argument to (char*) for arch where
++ sizeof(int) != sizeof(char *) */
++
++ // fullname [ or struct-name [ or name ] ]
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "FN", (char*)0))
++ if ((propval = vf_get_prop_value_string(prop, 0)))
++ item_fput(item, NAME, xstrdup(propval));
++
++ if (!propval && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "N", (char*)0)) {
++ // TODO: GIVENNAME, FAMILYNAME
++ propval = vf_get_prop_value_string(prop, 0);
++ if(propval)
++ item_fput(item, NAME, xstrdup(propval));
++ }
++
++ if (!propval && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "NAME", (char*)0)) {
++ propval = vf_get_prop_value_string(prop, 0);
++ if(propval)
++ item_fput(item, NAME, xstrdup(propval));
++ }
++
++ // email(s). (TODO: EMAIL;PREF: should be abook's first)
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "EMAIL", (char*)0)) {
++ do {
++ props = 0;
++ while ((propval = vf_get_prop_value_string(prop, props++))) {
++ abook_list_append(&multivalues, propval);
++ }
++ } while (vf_get_next_property(&prop));
++ item_fput(item, EMAIL, abook_list_to_csv(multivalues));
++ abook_list_free(&multivalues);
++ }
++
++ // format for ADR:
++ // PO Box, Extended Addr, Street, Locality, Region, Postal Code, Country
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "ADR", (char*)0)) {
++ props = 0;
++ // PO Box: abook ignores
++ vf_get_prop_value_string(prop, props++);
++
++ // ext-address
++ propval = vf_get_prop_value_string(prop, props++);
++ if(propval) item_fput(item, ADDRESS2, xstrdup(propval));
++ // address (street)
++ propval = vf_get_prop_value_string(prop, props++);
++ if(propval) item_fput(item, ADDRESS, xstrdup(propval));
++ // locality (city)
++ propval = vf_get_prop_value_string(prop, props++);
++ if(propval) item_fput(item, CITY, xstrdup(propval));
++ // region (state)
++ propval = vf_get_prop_value_string(prop, props++);
++ if(propval) item_fput(item, STATE, xstrdup(propval));
++ // postal-code (zip)
++ propval = vf_get_prop_value_string(prop, props++);
++ if(propval) item_fput(item, ZIP, xstrdup(propval));
++ // country
++ propval = vf_get_prop_value_string(prop, props++);
++ if(propval) item_fput(item, COUNTRY, xstrdup(propval));
++ }
++
++ // phone numbers
++ // home
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "HOME", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
++ item_fput(item, PHONE, xstrdup(propval)); phone_found = true;
++ }
++ // workphone
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "WORK", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
++ item_fput(item, WORKPHONE, xstrdup(propval)); phone_found = true;
++ }
++
++ // fax
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "FAX", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
++ item_fput(item, FAX, xstrdup(propval)); phone_found = true;
++ }
++
++ // cellphone
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", "CELL", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
++ item_fput(item, MOBILEPHONE, xstrdup(propval)); phone_found = true;
++ }
++
++ // or grab any other one as default
++ if(! phone_found && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "TEL", (char*)0) && (propval = vf_get_prop_value_string(prop, 0))) {
++ item_fput(item, PHONE, xstrdup(propval));
++ }
++
++ // nick
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "NICKNAME", (char*)0)) {
++ propval = vf_get_prop_value_string(prop, 0);
++ item_fput(item, NICK, xstrdup(propval));
++ }
++
++ // url
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "URL", (char*)0)) {
++ propval = vf_get_prop_value_string(prop, 0);
++ item_fput(item, URL, xstrdup(propval));
++ }
++
++ // notes
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "NOTE", (char*)0)) {
++ propval = vf_get_prop_value_string(prop, 0);
++ item_fput(item, NOTES, xstrdup(propval));
++ }
++
++ // anniversary
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "BDAY", (char*)0)) {
++ propval = vf_get_prop_value_string(prop, 0);
++ item_fput(item, ANNIVERSARY, xstrdup(propval));
++ }
++
++ // (mutt) groups
++ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "CATEGORIES", (char*)0)) {
++ do {
++ props = 0;
++ while ((propval = vf_get_prop_value_string(prop, props++))) {
++ abook_list_append(&multivalues, propval);
++ }
++ } while (vf_get_next_property(&prop));
++ item_fput(item, GROUPS, abook_list_to_csv(multivalues));
++ abook_list_free(&multivalues);
++ }
++
++ add_item2database(item);
++ item_free(&item);
++ } while (vf_get_next_object(&vfobj));
++
++ return 0;
++}
+diff -urN BUILD/abook-0.6.0pre2/vcard.h abook/vcard.h
+--- BUILD/abook-0.6.0pre2/vcard.h 1970-01-01 01:00:00.000000000 +0100
++++ abook/vcard.h 2013-03-13 15:07:45.000000000 +0100
+@@ -0,0 +1,8 @@
++#ifndef _VCARD_H
++#define _VCARD_H
++
++#include <vf_iface.h>
++
++int vcard_parse_file_libvformat(char *filename);
++
++#endif
+diff -urN BUILD/abook-0.6.0pre2/views.c abook/views.c
+--- BUILD/abook-0.6.0pre2/views.c 2006-08-08 08:19:05.000000000 +0200
++++ abook/views.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: views.c,v 1.2 2006/08/07 15:06:53 cduval Exp $
++ * $Id$
+ *
+ * by Cedric Duval <cedricduval@free.fr>
+ *
+@@ -140,7 +140,7 @@
+ { N_("ADDRESS"),
+ { ADDRESS, ADDRESS2, CITY, STATE, ZIP, COUNTRY, -1 } },
+ { N_("PHONE"), { PHONE, WORKPHONE, FAX, MOBILEPHONE, -1 } },
+- { N_("OTHER"), { NICK, URL, NOTES, -1 } },
++ { N_("OTHER"), { NICK, URL, NOTES, ANNIVERSARY, GROUPS, -1 } },
+ { 0 }
+ };
+
+diff -urN BUILD/abook-0.6.0pre2/xmalloc.c abook/xmalloc.c
+--- BUILD/abook-0.6.0pre2/xmalloc.c 2005-09-26 17:59:04.000000000 +0200
++++ abook/xmalloc.c 2013-03-13 15:07:45.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: xmalloc.c,v 1.7 2005/09/26 15:59:04 cduval Exp $
++ * $Id$
+ *
+ * Common xmalloc memory allocation routines
+ *
projects / packages / abook.git / commitdiff