Request 4288 (accepted)

Overview

Request 4288 (accepted)

No description set

Created by Aloysius about 6 years ago
In state accepted
Package maintainers: bitstreamout and enzokiel

Submit grip

Submit package home:Aloysius:branches:Multimedia / grip to package Multimedia / grip

grip.changes Changed

@@ -1,4 +1,60 @@
 -------------------------------------------------------------------
+Wed Oct 10 10:29:07 UTC 2018 - aloisio@gmx.com
+
+- Update to version v3.9.0
+  * Add freedb.musicbrainz.org as secondary default cd database
+  version 3.8.1
+  * Fedora patch: Search paths for executables during config
+    switches
+  * Reformat manpage, to ease maintanability
+  * Add COPYING-LGPL: 4 files are licensed under the LGPLv2+
+  * Sync Chinese (simplified) from Translatin Troject
+  version 3.8.0
+  * Add default encode configuration for
+    + faac (bug #143)
+    + opus (bug #117)
+  * Fedora patch: put oggenc to the top of config list
+    Apparently, without this patch, the config files are ignored
+  version 3.7.1
+  * Sync Spanish translation from Translation Project
+  version 3.7.0
+  * Sync Brazilian Portuguese from Translation Project
+  * Patch by Phil Stracchino: extended genres to genre list
+  version 3.6.3
+  * Sync ukranian and hungarian translations from Translation
+    Project
+  * Patch from Adrian Reber: fix compiler warning with gcc 8.0
+  * Update the FSF postal address in source files
+  version 3.6.2
+  * Translation updates: German, Italian, Brazilian Portuguese,
+    Serbian
+  version 3.6.1
+  * Patch from Adrian Reber: fix compiler warning
+    and enable -Werror and -Wall by default
+  * Translation update: Norwegian
+  version 3.6.0
+  * Patch from Mike Gilbode: Select DiscDB entry from multiple
+    results
+  * Translation updates.
+  version 3.5.2
+  * Patch from Adrian Reber: Fix more compiler warnings
+  version 3.5.1
+  * Make icons transparent
+  * Fix typo in userguide
+  version 3.5.0
+  * Apply Fedora patch from Adrian Reber (Fedora bug #1474010)
+    The «blind-write-fix» patch from Mageia (originally from
+    Mandriva in 2003) breaks Tagging of files other that MP3
+  * Patch from Adrian Reber: Fix compiler warnings
+  * Install manpage when running «make install»
+  * Install grip-audiocd.desktop, which makes grip one of the
+    popup options
+    for ripping when inserting a CD in KDE/Plasma
+  * Install icons into the hicolor tree
+
+- Refreshed grip-configure.patch
+
+-------------------------------------------------------------------
 Thu Jul 06 13:39:41 UTC 2017 - joerg.lorenzen@ki.tng.de
 
 - Update to version 3.4.3

grip.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package grip
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 Packman Team <packman@links2linux.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
 
 Name:           grip
-Url:            https://sourceforge.net/projects/grip
-License:        GPL-2.0+
-Group:          Productivity/Multimedia/CD/Grabbers
-Version:        3.4.3
+Version:        3.9.0
 Release:        0
 Summary:        An Audio CD Ripping Application
-Source:         %{name}-%{version}.tar.gz
+License:        GPL-2.0-or-later
+Group:          Productivity/Multimedia/CD/Grabbers
+URL:            https://sourceforge.net/projects/grip
+Source:         https://sourceforge.net/projects/grip/files/%{version}/%{name}-%{version}.tar.gz
 Patch0:         grip-configure.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -34,23 +34,23 @@
 BuildRequires:  help2man
 BuildRequires:  id3lib-devel
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libcddb)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libgnomeui-2.0)
 BuildRequires:  pkgconfig(vte)
-BuildRequires:  update-desktop-files
-Requires(post):  update-desktop-files
-Requires(postun):  update-desktop-files
 Requires:       cdparanoia
 Requires:       flac
 Requires:       lame
 Requires:       vorbis-tools
 Requires:       wavpack
+Requires(post): update-desktop-files
+Requires(postun): update-desktop-files
 Recommends:     %{name}-lang = %{version}
 Obsoletes:      grip2 < %{version}
 Provides:       grip2 = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Grip automates the process of extracting audio CD data, encoding it
@@ -59,9 +59,10 @@
 repectivly FLAC encoder installed.
 
 %lang_package
+
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 autoreconf -fiv
@@ -73,35 +74,32 @@
 sed -ri '/manual page for GNOME/ { s/GNOME grip/grip/; s/GNOME/grip/}' grip.1
 
 %install
-%makeinstall
-mkdir -p %{buildroot}%{_mandir}/man1
-install -m 0644 grip.1 %{buildroot}%{_mandir}/man1/
-mkdir -p %{buildroot}%{_datadir}/apps/solid/actions
-install -m 0644 grip-audiocd.desktop %{buildroot}%{_datadir}/apps/solid/actions/grip-audiocd.desktop
+%make_install
 echo DocPath=grip >> %{buildroot}%{_datadir}/applications/grip.desktop
-sed -ri '/^Icon=grip$/{ s/grip/gripicon/ }' %{buildroot}%{_datadir}/applications/grip.desktop
-sed -ri '/^Icon=grip$/{ s/grip/gripicon/ }' %{buildroot}%{_datadir}/apps/solid/actions/grip-audiocd.desktop
 %suse_update_desktop_file -r grip AudioVideo AudioVideoEditing
 %find_lang grip
 %fdupes %{buildroot}
 
+%if 0%{?suse_version} < 1500
 %post
 %desktop_database_post
 
 %postun
 %desktop_database_postun
+%endif
 
 %files
-%defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS COPYING CREDITS ChangeLog README TODO
+%license COPYING COPYING-LGPL
+%doc ABOUT-NLS AUTHORS CREDITS ChangeLog README TODO
 %{_bindir}/grip
 %{_datadir}/applications/grip.desktop
 %dir %{_datadir}/apps/
 %dir %{_datadir}/apps/solid
 %dir %{_datadir}/apps/solid/actions
 %{_datadir}/apps/solid/actions/grip-audiocd.desktop
+%{_datadir}/icons/hicolor/*/apps/grip.*
 %{_datadir}/pixmaps/grip*.png
-%{_mandir}/man1/grip.1.*
+%{_mandir}/man1/grip.1%{?ext_man}
 
 %files lang -f grip.lang

grip-configure.patch Changed

@@ -1,6 +1,8 @@
---- src/grip.c.orig	2017-05-20 23:54:06.476878916 +0200
-+++ src/grip.c	2017-05-20 23:54:06.524878002 +0200
-@@ -868,8 +868,8 @@
+Index: grip-3.9.0/src/grip.c
+===================================================================
+--- grip-3.9.0.orig/src/grip.c
++++ grip-3.9.0/src/grip.c
+@@ -873,8 +873,8 @@ static void DoLoadConfig(GripInfo *ginfo
    ginfo->using_builtin_cdp=FALSE;
  #endif
    ginfo->in_rip_thread=FALSE;
@@ -11,8 +13,8 @@
  #ifdef __linux__
    FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename));
    strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w");
-@@ -895,8 +895,8 @@
-   ginfo->selected_encoder=6;
+@@ -900,8 +900,8 @@ static void DoLoadConfig(GripInfo *ginfo
+   ginfo->selected_encoder=0;
    strcpy(ginfo->mp3cmdline,"-o %m -a %a -l %d -t %n -b %b %w -N %t -G %G -d %y");
    FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename));
 -  strcpy(ginfo->mp3fileformat,"~/ogg/%A/%d/%t_%n.%x");
@@ -22,7 +24,7 @@
    strcpy(ginfo->mp3extension,"ogg");
    ginfo->mp3nice=0;
    *ginfo->mp3_filter_cmd='\0';
-@@ -904,7 +904,7 @@
+@@ -909,7 +909,7 @@ static void DoLoadConfig(GripInfo *ginfo
    ginfo->add_to_db=FALSE;
    ginfo->add_m3u=TRUE;
    ginfo->rel_m3u=TRUE;

grip-3.4.3.tar.gz/ABOUT-NLS -> grip-3.9.0.tar.gz/ABOUT-NLS Changed

@@ -1,265 +1,1348 @@
-Notes on the Free Translation Project
-*************************************
+1 Notes on the Free Translation Project
+***************************************
 
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
+Free software is going international!  The Free Translation Project is a
+way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
 
-   If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
+   If you found this 'ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU 'gettext' internally,
 itself available at your nearest GNU archive site.  But you do _not_
-need to install GNU `gettext' prior to configuring, installing or using
+need to install GNU 'gettext' prior to configuring, installing or using
 this package with messages translated.
 
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
+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 INSTALL Matters
+===================
 
-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'.
-
-INSTALL Matters
-===============
-
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU 'gettext'.  Other packages have their own ways to
+internationalization, predating GNU 'gettext'.
 
    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 GNU `gettext' own
-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:
-
-     ./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.
-
-   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 be not what is 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
+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
 
-to prevent auto-detection.
+will _totally_ disable translation of messages.
 
-   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.
+   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' 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 have usually many `po/LL.po' files, where
+   Internationalized packages usually have many 'po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable `LINGUAS'
+translations have been forbidden at 'configure' time by using the
+'--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable 'LINGUAS'
 may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
+'LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-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
-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').
-This can be done from your `.login' or `.profile' file, once and for
-all.
+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.  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').  This can be done from your
+'.login' or '.profile' file, once and for all.
 
    You might think that the country code specification is redundant.
 But in fact, some languages have dialects in different countries.  For
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil.  The
 country code serves to distinguish the dialects.
 
+   The locale naming convention of 'LL_CC', with 'LL' denoting the
+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 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
 understand other languages, you can set up a priority list of languages.
 This is done through a different environment variable, called
-`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
-for the purpose of message handling, but you still need to have `LANG'
+'LANGUAGE'.  GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG'
+for the purpose of message handling, but you still need to have 'LANG'
 set to the primary language; this is required by other parts of the
-system libraries.  For example, some Swedish users who would rather
-read translations in German than English for when Swedish is not
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+system libraries.  For example, some Swedish users who would rather read
+translations in German than English for when Swedish is not available,
+set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from 'no' to 'nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under 'nb' and some older ones under 'no', it's recommended
+for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and
+older translations are used.
 
-   In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
-to denote the language's main dialect.  For example, `de' is equivalent
-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
-(Portuguese as spoken in Portugal) in this context.
+   In the 'LANGUAGE' environment variable, but not in the 'LANG'
+environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to
+denote the language's main dialect.  For example, 'de' is equivalent to
+'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese
+as spoken in Portugal) in this context.
 
-Translating Teams
-=================
+1.3 Translating Teams
+=====================
 
-   For the Free Translation Project to be a success, we need interested
+For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 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.
 The subscribing address is _not_ the same as the list itself, it has
-`-request' appended.  For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
+'-request' appended.  For example, speakers of Swedish can send a
+message to 'sv-request@li.org', having this message body:
 
      subscribe
 
-   Keep in mind that team members are expected to participate
-_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
+   Keep in mind that team members are expected to participate _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 '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.
 
-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 May 2001.
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of Jun 2014.
 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    bg cs da de el en eo es et fi fr gl hr id it
-                     +----------------------------------------------+
-     a2ps            |          []             []                   |
-     bash            |          []       [] []       []             |
-     bison           |          []          [] []    []             |
-     clisp           |          []    []    []       []             |
-     cpio            |       [] []          []       []             |
-     diffutils       |       [] []       [] []       [] []    []    |
-     enscript        |          []                   []             |
-     error           |                               []             |
-     fileutils       |    [] [] [] []       []       [] []          |
-     findutils       |       [] []          [] []    [] []    [] [] |
-     flex            |       []             []       []             |
-     gawk            |                                              |
-     gcal            |                                              |
-     gcc             |       []                                     |
-     gettext         |    [] [] [] []       []       [] []    [] [] |
-     gnupg           |          []       []    []    []          [] |
-     grep            |                   []    []                [] |
-     hello           |       [] []       [] [] [] [] []       [] [] |
-     id-utils        |       []                      []             |
-     indent          |       [] []             []    [] []          |
-     libc            |    [] [] [] []       []       [] []       [] |
-     lilypond        |                                              |
-     lynx            |    [] [] []                                  |
-     m4              |    [] [] [] []                [] []    []    |
-     make            |          []          []       [] []          |
-     parted          |          []                      []          |
-     ptx             |       [] []          [] []    [] []    []    |
-     python          |                                              |
-     recode          |       [] [] []    [] []       [] []       [] |
-     sed             |    []    [] []    []    []    [] []    [] [] |
-     sh-utils        |    [] [] [] []       [] []    [] []       [] |
-     sharutils       |    [] [] [] []       []       [] []          |
-     soundtracker    |                                              |
-     sp              |                                              |
-     tar             |    [] [] []          [] []    []       [] [] |
-     texinfo         |    []    []       []          []             |
-     textutils       |    [] [] [] []       []       [] []          |
-     util-linux      |    []                                        |
-     wdiff           |    [] []             [] []    [] []    []    |
-     wget            |    [] [] [] []       [] []    [] []       [] |
-                     +----------------------------------------------+
-                       bg cs da de el en eo es et fi fr gl hr id it
-                        0 14 21 27 10  1  8 20 13  1 28 17  0  9 11
-     
-                       ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh
-                     +----------------------------------------------+
-     a2ps            |          []                []    []          |  5
-     bash            |                                              |  4
-     bison           | []       []                []                |  7
-     clisp           |          []                                  |  5
-     cpio            |    []    []    []     []   []                |  9
-     diffutils       |                []          []       []       | 10
-     enscript        |          []           []   []                |  5
-     error           |                                              |  1
-     fileutils       | [] []    []    []     []   [] [] [] []       | 16
-     findutils       |    []    []    []     []   []       []       | 14
-     flex            |    []                      []       []       |  6
-     gawk            |                                              |  0
-     gcal            |                                              |  0
-     gcc             | []                                           |  2
-     gettext         | [] []    []    []     []   []    [] [] [] [] | 19
-     gnupg           | []             []                   []       |  8
-     grep            |                                              |  3
-     hello           | [] []    []    []     []   [] []    []       | 17
-     id-utils        |          []                []       []       |  5
-     indent          |    []    []    []          [] []    [] []    | 12
-     libc            | [] []       [] []     []      []    []       | 15
-     lilypond        |          []                                  |  1
-     lynx            | []       []           []   []       []       |  8
-     m4              | []       []    []          []       []       | 12
-     make            | []       []    []     []   []                |  9
-     parted          | []       []                []                |  5
-     ptx             |          [] [] [] []       []       []       | 13
-     python          |                                              |  0
-     recode          |                            []    [] []       | 11
-     sed             | []       []           []   [] [] [] []       | 16
-     sh-utils        | []       [] [] []     []   [] [] [] []    [] | 19
-     sharutils       | []       []                []       []       | 11
-     soundtracker    |                                              |  0
-     sp              |                                              |  0
-     tar             | []       [] [] []     []   []    [] []       | 16
-     texinfo         | []                         []                |  6
-     textutils       | []       [] [] []     []   [] [] []          | 15
-     util-linux      |                       []                     |  2
-     wdiff           |          []    []          [] []    []       | 12
-     wget            | []          []        []   [] [] [] []    [] | 17
-                     +----------------------------------------------+
-       29 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh
-       40 domains      18  8  0 23  6 16  1  15   26  9  9 20  2  3  336
+     Ready PO files       af am an ar as ast az be bg bn bn_IN bs ca crh cs
+                        +---------------------------------------------------+
+     a2ps               |                       []                []     [] |
+     aegis              |                                                   |
+     anubis             |                                                   |
+     aspell             |                []                       []     [] |
+     bash               |                          []             []     [] |
+     bfd                |                                                   |
+     binutils           |                                         []        |
+     bison              |                                                   |
+     bison-runtime      |                []                                 |
+     buzztrax           |                                                [] |
+     ccd2cue            |                                                   |
+     ccide              |                                                   |
+     cflow              |                                                   |
+     clisp              |                                                   |
+     coreutils          |                                         []     [] |
+     cpio               |                                                   |
+     cppi               |                                                   |
+     cpplib             |                                         []        |
+     cryptsetup         |                                                [] |
+     datamash           |                                                   |
+     denemo             |                                         []     [] |
+     dfarc              |                                         []        |
+     dialog             |       []                                []     [] |
+     dico               |                                                   |
+     diffutils          |                                                [] |
+     dink               |                                         []        |
+     direvent           |                                                   |
+     doodle             |                                                [] |
+     dos2unix           |                                                   |
+     dos2unix-man       |                                                   |
+     e2fsprogs          |                                         []     [] |
+     enscript           |                                         []        |
+     exif               |                                                [] |
+     fetchmail          |                                         []     [] |
+     findutils          |                                                [] |
+     flex               |                                         []        |
+     freedink           |                                         []     [] |
+     fusionforge        |                                                   |
+     gas                |                                                   |
+     gawk               |                                         []        |
+     gcal               |                                         []        |
+     gcc                |                                                   |
+     gdbm               |                                                   |
+     gettext-examples   | []             []        []             []     [] |
+     gettext-runtime    |                          []             []     [] |
+     gettext-tools      |                          []             []        |
+     gjay               |                                                   |
+     glunarclock        |                []        []                    [] |
+     gnubiff            |                                                [] |
+     gnubik             |          []                                       |
+     gnucash            |          ()              ()             []        |
+     gnuchess           |                                                   |
+     gnulib             |                                                [] |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gold               |                                                   |
+     gphoto2            |                                                [] |
+     gprof              |                          []                       |
+     gramadoir          |                                                   |
+     grep               |                          []             []     [] |
+     grub               |                                         []        |
+     gsasl              |                                                   |
+     gss                |                                                   |
+     gst-plugins-bad    |                          []                    [] |
+     gst-plugins-base   |                          []             []     [] |
+     gst-plugins-good   |                          []             []     [] |
+     gst-plugins-ugly   |                          []             []     [] |
+     gstreamer          |                []        []             []     [] |
+     gtick              |                                                [] |
+     gtkam              |                       []                       [] |
+     gtkspell           | []             []     []                []     [] |
+     guix               |                                                   |
+     guix-packages      |                                                   |
+     gutenprint         |                                         []        |
+     hello              |                                         []        |
+     help2man           |                                                   |
+     help2man-texi      |                                                   |
+     hylafax            |                                                   |
+     idutils            |                                                   |
+     iso_15924          |                                                [] |
+     iso_3166           | []          []        [] [] []  []   [] [] []  [] |
+     iso_3166_2         |                                                   |
+     iso_4217           |                                                [] |
+     iso_639            |             [] []     [] [] []  []      [] []  [] |
+     iso_639_3          |                []                          []     |
+     iso_639_5          |                                                   |
+     jwhois             |                                                   |
+     kbd                |                                                [] |
+     klavaro            |          []              [] []          []     [] |
+     ld                 |                          []                       |
+     leafpad            |                       [] []             []     [] |
+     libc               |                          []             []     [] |
+     libexif            |                       ()                          |
+     libextractor       |                                                   |
+     libgnutls          |                                                [] |
+     libgphoto2         |                                                [] |
+     libgphoto2_port    |                                                [] |
+     libgsasl           |                                                   |
+     libiconv           |                          []                    [] |
+     libidn             |                                                [] |
+     liferea            |          []    []                       []     [] |
+     lilypond           |                                         []     [] |
+     lordsawar          |                                         []        |
+     lprng              |                                                   |
+     lynx               |                                         []     [] |
+     m4                 |                                                [] |
+     mailfromd          |                                                   |
+     mailutils          |                                                   |
+     make               |                                                [] |
+     man-db             |                                         []     [] |
+     man-db-manpages    |                                                   |
+     midi-instruments   |          []                             []     [] |
+     minicom            |                                                [] |
+     mkisofs            |                                                [] |
+     myserver           |                                                [] |
+     nano               |                          []             []     [] |
+     opcodes            |                                                   |
+     parted             |                                                [] |
+     pies               |                                                   |
+     pnmixer            |                                                   |
+     popt               |                                                [] |
+     procps-ng          |                                                   |
+     procps-ng-man      |                                                   |
+     psmisc             |                                                [] |
+     pspp               |                                         []        |
+     pushover           |                                                [] |
+     pwdutils           |                                                   |
+     pyspread           |                                                   |
+     radius             |                                         []        |
+     recode             |                       []                []     [] |
+     recutils           |                                                   |
+     rpm                |                                                   |
+     rush               |                                                   |
+     sarg               |                                                   |
+     sed                |                []        []             []     [] |
+     sharutils          |                                                [] |
+     shishi             |                                                   |
+     skribilo           |                                                   |
+     solfege            |                                         []     [] |
+     solfege-manual     |                                                   |
+     spotmachine        |                                                   |
+     sudo               |                                         []     [] |
+     sudoers            |                                         []     [] |
+     sysstat            |                                                [] |
+     tar                |                          []             []     [] |
+     texinfo            |                                         []     [] |
+     texinfo_document   |                                         []     [] |
+     tigervnc           |                          []                       |
+     tin                |                                                   |
+     tin-man            |                                                   |
+     tracgoogleappsa... |                                                   |
+     trader             |                                                   |
+     util-linux         |                                                [] |
+     ve                 |                                                   |
+     vice               |                                                   |
+     vmm                |                                                   |
+     vorbis-tools       |                                                [] |
+     wastesedge         |                                                   |
+     wcd                |                                                   |
+     wcd-man            |                                                   |
+     wdiff              |                                         []     [] |
+     wget               |                                                [] |
+     wyslij-po          |                                                   |
+     xboard             |                                                   |
+     xdg-user-dirs      | []    []    [] []     [] []     []      [] []  [] |
+     xkeyboard-config   |                          []             []     [] |
+                        +---------------------------------------------------+
+                          af am an ar as ast az be bg bn bn_IN bs ca crh cs
+                           4  0  2  5  3 11   0  8 25  3   3    1 55  4  74
+
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
+                        +--------------------------------------------------+
+     a2ps               | []  []  []     []         [] [] []       []  []  |
+     aegis              | []  []                       []              []  |
+     anubis             | []  []                       []          []  []  |
+     aspell             | []  []         []         [] []          []  []  |
+     bash               |                           [] []              []  |
+     bfd                | []                           []          []  []  |
+     binutils           |                              []          []  []  |
+     bison              | []  []  []                [] [] []       []  []  |
+     bison-runtime      | []  []  []                [] [] []       []  []  |
+     buzztrax           | []  []                                   []  []  |
+     ccd2cue            | []  []                    []                 []  |
+     ccide              | []  []                    [] []          []  []  |
+     cflow              | []  []                    []             []  []  |
+     clisp              | []  []     []                []              []  |
+     coreutils          | []  []                       [] []           []  |
+     cpio               | []  []                       []          []  []  |
+     cppi               | []  []                    []             []  []  |
+     cpplib             | []  []                    [] []          []  []  |
+     cryptsetup         | []  []                       []          []  []  |
+     datamash           | []  []                    []                 []  |
+     denemo             | []                                               |
+     dfarc              | []  []                    [] []          []  []  |
+     dialog             | []  []  []                [] []    [] [] []  []  |
+     dico               | []  []                                   []  []  |
+     diffutils          | []  []  []                [] []              []  |
+     dink               | []  []                    [] []          []  []  |
+     direvent           | []  []                    []                 []  |
+     doodle             | []  []                    []             []      |
+     dos2unix           | []  []                    [] []              []  |
+     dos2unix-man       |     []                       []              []  |
+     e2fsprogs          | []  []                    [] []              []  |
+     enscript           | []  []         []         []             []  []  |
+     exif               | []  []                    [] []          []  []  |
+     fetchmail          | []  ()  []     []         [] []              []  |
+     findutils          | []  []  []                [] [] []       []  []  |
+     flex               | []  []                    [] []          []  []  |
+     freedink           | []  []  []                [] []    []    []  []  |
+     fusionforge        |     []                       []              []  |
+     gas                |                              []          []  []  |
+     gawk               | []  []                       []          []  []  |
+     gcal               | []  []                       []              []  |
+     gcc                |     []                                           |
+     gdbm               | []  []                    []             []  []  |
+     gettext-examples   | []  []  []                [] []          []  []  |
+     gettext-runtime    | []  []                    [] []          []  []  |
+     gettext-tools      | []  []                       []          []  []  |
+     gjay               |     []                    []             []  []  |
+     glunarclock        | []  []                    []             []  []  |
+     gnubiff            |     ()                    []             []  ()  |
+     gnubik             | []  []                    []             []  []  |
+     gnucash            | []  ()  ()     ()            ()          ()  ()  |
+     gnuchess           |     []                    [] []              []  |
+     gnulib             | []  []                    [] [] []       []  []  |
+     gnunet             |                              []                  |
+     gnunet-gtk         |     []                                           |
+     gold               |                              []          []  []  |
+     gphoto2            | []  ()                    []                 []  |
+     gprof              | []  []                    [] []          []  []  |
+     gramadoir          | []  []                    []             []  []  |
+     grep               | []  []                    [] [] []       []  []  |
+     grub               | []  []                       []          []  []  |
+     gsasl              | []  []                    []             []  []  |
+     gss                | []  []                    []             []  []  |
+     gst-plugins-bad    | []  []                                       []  |
+     gst-plugins-base   | []  []  []                   []          []  []  |
+     gst-plugins-good   | []  []  []                   []    []    []  []  |
+     gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
+     gstreamer          | []  []  []                   []    []    []  []  |
+     gtick              | []  ()                    []             []  []  |
+     gtkam              | []  ()                    [] []          []  []  |
+     gtkspell           | []  []  []                [] []    []    []  []  |
+     guix               | []                        []                     |
+     guix-packages      |                                                  |
+     gutenprint         | []  []                                   []  []  |
+     hello              | []  []  []                [] [] []       []  []  |
+     help2man           | []  []  []                [] []          []  []  |
+     help2man-texi      |     []                       []              []  |
+     hylafax            |     []                       []                  |
+     idutils            | []  []                    []             []  []  |
+     iso_15924          | []  ()                    [] []    ()    []  ()  |
+     iso_3166           | []  ()  []                [] [] [] ()    []  ()  |
+     iso_3166_2         | []  ()                             ()        ()  |
+     iso_4217           | []  ()  []                   [] [] ()    []  ()  |
+     iso_639            | []  ()                    [] []    ()    []  ()  |
+     iso_639_3          |     ()                             ()        ()  |
+     iso_639_5          |     ()                             ()        ()  |
+     jwhois             |     []                    [] []          []  []  |
+     kbd                | []  []  []                [] []              []  |
+     klavaro            | []  []  []                [] []    []        []  |
+     ld                 | []                           []          []  []  |
+     leafpad            | []  []  []                [] []    []    []  []  |
+     libc               | []  []                       []          []  []  |
+     libexif            | []  []         ()            []              []  |
+     libextractor       |     []                                           |
+     libgnutls          |     []                    []             []  []  |
+     libgphoto2         | []  ()                                       []  |
+     libgphoto2_port    | []  ()                       []    []    []  []  |
+     libgsasl           | []  []                    []             []  []  |
+     libiconv           | []  []                    [] [] []       []  []  |
+     libidn             | []  []                    []             []  []  |
+     liferea            | []  ()  []                   []    []    []  []  |
+     lilypond           | []  []  []                [] []              []  |
+     lordsawar          | []  []                                           |
+     lprng              |                                                  |
+     lynx               | []  []                    []    []       []  []  |
+     m4                 | []  []  []                []             []  []  |
+     mailfromd          |                                              []  |
+     mailutils          |     []                       []          []  []  |
+     make               | []  []                       []          []  []  |
+     man-db             | []  []                    []                 []  |
+     man-db-manpages    |     []                                       []  |
+     midi-instruments   | []  []  []                [] [] []    [] []  []  |
+     minicom            | []  []                       []          []  []  |
+     mkisofs            |                           []             []  []  |
+     myserver           |     []                    []             []  []  |
+     nano               | []  []                    [] []    []    []  []  |
+     opcodes            | []  []                       []          []  []  |
+     parted             | []  []                                       []  |
+     pies               |     []                                           |
+     pnmixer            |     []                                       []  |
+     popt               | []  []                    [] []          []  []  |
+     procps-ng          |     []                                       []  |
+     procps-ng-man      |     []                                       []  |
+     psmisc             | []  []  []                []       []    []  []  |
+     pspp               |     []                       []              []  |
+     pushover           |     ()                    [] []              []  |
+     pwdutils           | []  []                                       []  |
+     pyspread           | []  []                                       []  |
+     radius             |                              []              []  |
+     recode             | []  []  []                [] []          []  []  |
+     recutils           |     []                       []          []  []  |
+     rpm                | []  []                    []             []  []  |
+     rush               |     []                                   []  []  |
+     sarg               | []                                           []  |
+     sed                | []  []  []                [] [] []       []  []  |
+     sharutils          |     []                    []    []           []  |
+     shishi             |     []                                   []  []  |
+     skribilo           | []                           []              []  |
+     solfege            | []  []                    [] [] []    [] []  []  |
+     solfege-manual     |     []                    [] [] []           []  |
+     spotmachine        | []  []                    []             []  []  |
+     sudo               | []  []                    [] []          []  []  |
+     sudoers            | []  []  []                []             []  []  |
+     sysstat            | []  []                    [] []          []  []  |
+     tar                | []  []                    [] [] []       []  []  |
+     texinfo            | []  []                    [] []              []  |
+     texinfo_document   |     []                    [] []              []  |
+     tigervnc           | []  []  []                []             []  []  |
+     tin                | []  []                          []           []  |
+     tin-man            |                []                                |
+     tracgoogleappsa... | []  []                    []             []  []  |
+     trader             | []  []         []         []             []  []  |
+     util-linux         | []  []                       []              []  |
+     ve                 |     []                    [] []          []  []  |
+     vice               | ()  ()                                       ()  |
+     vmm                |     []                                   []      |
+     vorbis-tools       | []  []                    []                 []  |
+     wastesedge         | []                                               |
+     wcd                |     []                    [] []          []      |
+     wcd-man            |     []                                           |
+     wdiff              | []  []                    [] [] []       []  []  |
+     wget               |     []                    [] [] []       []  []  |
+     wyslij-po          |     []                    []             []  []  |
+     xboard             | []  []                       []              []  |
+     xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
+     xkeyboard-config   | []  []  []                [] []          []  []  |
+                        +--------------------------------------------------+
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
+                          119 131 32  1   6     0   94 95 22 13  4 102 139
+
+                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
+                        +-------------------------------------------------+
+     a2ps               |                   []          []    [] []       |
+     aegis              |                                     []          |
+     anubis             |                   [] []       []    []          |
+     aspell             | []                []          []    [] []       |
+     bash               |                      []       []    [] []       |
+     bfd                |                               []       []       |
+     binutils           |                               []    [] []       |
+     bison              |                   []                            |
+     bison-runtime      | []    []          [] []    [] []    [] []       |
+     buzztrax           |                                                 |
+     ccd2cue            |                      []                         |
+     ccide              |                   [] []                         |
+     cflow              | []                []          []                |
+     clisp              |                                                 |
+     coreutils          |                      []                []       |
+     cpio               | []                [] []       []    [] []       |
+     cppi               |       []          [] []             [] []       |
+     cpplib             |                               []       []       |
+     cryptsetup         |                                     []          |
+     datamash           |                                                 |
+     denemo             |                                     []          |
+     dfarc              |                   [] []             []          |
+     dialog             | [] [] []          [] []    [] [] [] [] []       |
+     dico               |                                                 |
+     diffutils          |                      []       []    [] []       |
+     dink               |                      []                         |
+     direvent           |                      []                         |
+     doodle             | []                                  []          |
+     dos2unix           |                      []                []       |
+     dos2unix-man       |                                                 |
+     e2fsprogs          |                      []       []                |
+     enscript           | []                []          []                |
+     exif               |       []          []          [] [] [] []       |
+     fetchmail          |                               []    [] []       |
+     findutils          | []    []          [] []       []    [] []       |
+     flex               | []                                              |
+     freedink           |                   [] []       []    []          |
+     fusionforge        |                                                 |
+     gas                |                               []                |
+     gawk               |                               []    () []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gdbm               |                                                 |
+     gettext-examples   | []    []          [] []       []    [] []       |
+     gettext-runtime    | []    []          [] []       []    [] []       |
+     gettext-tools      |                               []    [] []       |
+     gjay               |       []                                        |
+     glunarclock        | []    []          [] []       []    []          |
+     gnubiff            |                      []       []    ()          |
+     gnubik             |       []          []                []          |
+     gnucash            |          () () ()    ()             ()          |
+     gnuchess           |                                                 |
+     gnulib             | []    []             []             [] []       |
+     gnunet             |                                                 |
+     gnunet-gtk         |                                                 |
+     gold               |                               []    []          |
+     gphoto2            |                      []       []    [] []       |
+     gprof              | []                   []       []    []          |
+     gramadoir          | []                   []       []                |
+     grep               | []    []          [] []       []    [] []       |
+     grub               |       []             []             []          |
+     gsasl              | []                [] []       []    []          |
+     gss                | []                [] []       []    []          |
+     gst-plugins-bad    |                   [] []       []                |
+     gst-plugins-base   |       []          [] []       []                |
+     gst-plugins-good   |       []          [] []       []    [] []       |
+     gst-plugins-ugly   |       []          [] []       []    [] []       |
+     gstreamer          |       []          [] []       []    []          |
+     gtick              | []    []             []       []    []          |
+     gtkam              |                      []       [] [] [] []       |
+     gtkspell           | []    []    []    [] [] []    [] [] [] []       |
+     guix               |                                                 |
+     guix-packages      |                                                 |
+     gutenprint         |       []             []             []          |
+     hello              | []    []          [] []       []                |
+     help2man           |                   []                [] []       |
+     help2man-texi      |                                                 |
+     hylafax            |                               []                |
+     idutils            |                      []       []                |
+     iso_15924          |       []             []    [] [] [] []          |
+     iso_3166           | []    [] [] [] [] [] []    [] [] [] [] []    [] |
+     iso_3166_2         |                               []    []          |
+     iso_4217           |                   [] []       [] [] [] []       |
+     iso_639            | []    [] []       [] []       [] [] [] []       |
+     iso_639_3          |       []                            []          |
+     iso_639_5          |                                                 |
+     jwhois             |       []             []       []    []          |
+     kbd                |                      []       []    []          |
+     klavaro            |       []          [] []             []       [] |
+     ld                 | []                            []    [] []       |
+     leafpad            | []    []    []    [] []       []    [] ()       |
+     libc               |       []          []          []    [] []       |
+     libexif            |                                     []          |
+     libextractor       |                                                 |
+     libgnutls          |                                     []          |
+     libgphoto2         |                                     [] []       |
+     libgphoto2_port    |                                     [] []       |
+     libgsasl           | []                   []       []    []          |
+     libiconv           | []    []          [] []       []    [] []       |
+     libidn             |                   [] []       []    []          |
+     liferea            |       []    []       []             [] []       |
+     lilypond           |                                     []          |
+     lordsawar          |                                                 |
+     lprng              |                               []                |
+     lynx               |                      []       []    [] []       |
+     m4                 | []    []          []          []       []       |
+     mailfromd          |                                                 |
+     mailutils          |                                                 |
+     make               |                   []          []    [] []       |
+     man-db             |                               []       []       |
+     man-db-manpages    |                               []       []       |
+     midi-instruments   |       []    []    [] [] []    [] [] [] []       |
+     minicom            |                      []       []       []       |
+     mkisofs            |                               []    []          |
+     myserver           |                                     []          |
+     nano               | []    []          [] []             [] []       |
+     opcodes            | []                            []    []          |
+     parted             |       []             []       []    [] []       |
+     pies               |                                                 |
+     pnmixer            |                   []                []          |
+     popt               | []    [] []       [] []    [] [] [] [] []       |
+     procps-ng          |                                                 |
+     procps-ng-man      |                                                 |
+     psmisc             |                   [] []       []    []          |
+     pspp               |       []                               []       |
+     pushover           |                                     []          |
+     pwdutils           |                               []                |
+     pyspread           |                                                 |
+     radius             |                               []                |
+     recode             | []    []    []    [] []       []    []          |
+     recutils           |                                                 |
+     rpm                |                               []                |
+     rush               |       []                                        |
+     sarg               |                                                 |
+     sed                | []    []          [] []       []    [] []       |
+     sharutils          |                                                 |
+     shishi             |                                                 |
+     skribilo           |                      []                         |
+     solfege            |       []                            []          |
+     solfege-manual     |                                                 |
+     spotmachine        |                                                 |
+     sudo               |       []          []                [] []       |
+     sudoers            |                   []                [] []       |
+     sysstat            |                   [] []       []       []       |
+     tar                | []                [] []       []    [] []       |
+     texinfo            |                   []          []    []          |
+     texinfo_document   |                   [] []             []          |
+     tigervnc           |                                                 |
+     tin                |                                                 |
+     tin-man            |                                                 |
+     tracgoogleappsa... |       []    []    [] []                         |
+     trader             |                   [] []                         |
+     util-linux         |                                        []       |
+     ve                 |                                     []          |
+     vice               |                      ()             ()          |
+     vmm                |                                                 |
+     vorbis-tools       |                   []          []                |
+     wastesedge         |                                     []          |
+     wcd                |                                                 |
+     wcd-man            |                                                 |
+     wdiff              |       []             []             []          |
+     wget               |                   [] []             [] []       |
+     wyslij-po          |       []          []          []                |
+     xboard             |                                                 |
+     xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
+     xkeyboard-config   |       []          [] []       []    [] []       |
+                        +-------------------------------------------------+
+                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
+                          35  2 47  4  8  2 60 71  2  6 81 11 87 57  0  3
+
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
+                        +--------------------------------------------------+
+     a2ps               |                                  []          []  |
+     aegis              |                                              []  |
+     anubis             |                                  []    []    []  |
+     aspell             |                            []                []  |
+     bash               |                                        []    []  |
+     bfd                |                                                  |
+     binutils           |                                                  |
+     bison              |                                              []  |
+     bison-runtime      |          []    [] []             []    []    []  |
+     buzztrax           |                                                  |
+     ccd2cue            |                                                  |
+     ccide              |                   []                         []  |
+     cflow              |                                              []  |
+     clisp              |                                              []  |
+     coreutils          |                                        []    []  |
+     cpio               |                                              []  |
+     cppi               |                                                  |
+     cpplib             |                                              []  |
+     cryptsetup         |                                              []  |
+     datamash           |                                        []    []  |
+     denemo             |                                                  |
+     dfarc              |                      []                      []  |
+     dialog             |       []       [] []             []    []    []  |
+     dico               |                                                  |
+     diffutils          |                   []                   []    []  |
+     dink               |                                              []  |
+     direvent           |                                              []  |
+     doodle             |                                              []  |
+     dos2unix           |                                        []    []  |
+     dos2unix-man       |                                              []  |
+     e2fsprogs          |                                              []  |
+     enscript           |                                              []  |
+     exif               |    []             []                         []  |
+     fetchmail          |                                              []  |
+     findutils          |                                        []    []  |
+     flex               |                                              []  |
+     freedink           |                                        []    []  |
+     fusionforge        |                                                  |
+     gas                |                                                  |
+     gawk               |                                              []  |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gdbm               |                                                  |
+     gettext-examples   |          []       []             [] [] []    []  |
+     gettext-runtime    |    []                                  []    []  |
+     gettext-tools      |    []                                            |
+     gjay               |                                                  |
+     glunarclock        |                   []                         []  |
+     gnubiff            |                                              []  |
+     gnubik             |                                        []    []  |
+     gnucash            | () ()          () ()          ()       () () []  |
+     gnuchess           |                                        []    []  |
+     gnulib             |                                              []  |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gold               |                                                  |
+     gphoto2            |                                              []  |
+     gprof              |                                  []          []  |
+     gramadoir          |                                              []  |
+     grep               |                                        []    []  |
+     grub               |                []                      []    []  |
+     gsasl              |                                              []  |
+     gss                |                                                  |
+     gst-plugins-bad    |                   []                   []    []  |
+     gst-plugins-base   |                   []                   []    []  |
+     gst-plugins-good   |                [] []                   []    []  |
+     gst-plugins-ugly   |                   []             [] [] []    []  |
+     gstreamer          |                []                      []    []  |
+     gtick              |                                              []  |
+     gtkam              |                                        []    []  |
+     gtkspell           |          []    [] []       []    []    []    []  |
+     guix               |                                                  |
+     guix-packages      |                                                  |
+     gutenprint         |                                              []  |
+     hello              |                   []                   []    []  |
+     help2man           |                                        []        |
+     help2man-texi      |                                                  |
+     hylafax            |                                              []  |
+     idutils            |                                              []  |
+     iso_15924          |                () []                         []  |
+     iso_3166           | [] [] []       () [] [] []    []       []    []  |
+     iso_3166_2         |                ()                            []  |
+     iso_4217           |                () []                   []    []  |
+     iso_639            | [] []          () []    []    []             []  |
+     iso_639_3          | []             ()             []                 |
+     iso_639_5          |                ()                                |
+     jwhois             |                   []                         []  |
+     kbd                |                                              []  |
+     klavaro            |                                        []    []  |
+     ld                 |                                                  |
+     leafpad            |    []    []    [] []                         []  |
+     libc               |    []                                        []  |
+     libexif            |                                              []  |
+     libextractor       |                                              []  |
+     libgnutls          |                                  []          []  |
+     libgphoto2         |                                              []  |
+     libgphoto2_port    |                                              []  |
+     libgsasl           |                                              []  |
+     libiconv           |                []                            []  |
+     libidn             |                                              []  |
+     liferea            |                [] []                         []  |
+     lilypond           |                                              []  |
+     lordsawar          |                                                  |
+     lprng              |                                                  |
+     lynx               |                                              []  |
+     m4                 |                                              []  |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               |    []                                        []  |
+     man-db             |                                              []  |
+     man-db-manpages    |                                              []  |
+     midi-instruments   |    [] []       []          []    []       [] []  |
+     minicom            |                                        []        |
+     mkisofs            |                                              []  |
+     myserver           |                                                  |
+     nano               |                                  []    []    []  |
+     opcodes            |                                              []  |
+     parted             |    []                                        []  |
+     pies               |                                                  |
+     pnmixer            |                                              []  |
+     popt               | [] []             []                   []    []  |
+     procps-ng          |                                                  |
+     procps-ng-man      |                                                  |
+     psmisc             |                                              []  |
+     pspp               |                []                            []  |
+     pushover           |                                                  |
+     pwdutils           |                                              []  |
+     pyspread           |                                                  |
+     radius             |                                              []  |
+     recode             |                                        []    []  |
+     recutils           |                                              []  |
+     rpm                |                                              []  |
+     rush               |                                              []  |
+     sarg               |                                                  |
+     sed                |                                        []    []  |
+     sharutils          |                                              []  |
+     shishi             |                                                  |
+     skribilo           |                                                  |
+     solfege            |                                        []    []  |
+     solfege-manual     |                                              []  |
+     spotmachine        |                                              []  |
+     sudo               |    []                                  []    []  |
+     sudoers            |    []                                  []    []  |
+     sysstat            |                                        []    []  |
+     tar                |          []                            []    []  |
+     texinfo            |                                              []  |
+     texinfo_document   |                                              []  |
+     tigervnc           |                                              []  |
+     tin                |                                                  |
+     tin-man            |                                                  |
+     tracgoogleappsa... |                   []                   []    []  |
+     trader             |                                        []        |
+     util-linux         |                                              []  |
+     ve                 |                                              []  |
+     vice               |                                              []  |
+     vmm                |                                              []  |
+     vorbis-tools       |                                              []  |
+     wastesedge         |                                              []  |
+     wcd                |                                              []  |
+     wcd-man            |                                              []  |
+     wdiff              |                                              []  |
+     wget               |                                        []    []  |
+     wyslij-po          |                                              []  |
+     xboard             |                                              []  |
+     xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
+     xkeyboard-config   |    []          []                            []  |
+                        +--------------------------------------------------+
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
+                           5 15  4  6  0 13 23  3  3  3  4 11  2 42  1 125
+
+                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                        +------------------------------------------------+
+     a2ps               |          []     []  []   [] []       []    []  |
+     aegis              |                     []      []                 |
+     anubis             |          []                 []             []  |
+     aspell             |          []         []   [] []    [] []    []  |
+     bash               |          []         []      []    [] []    []  |
+     bfd                |                             []             []  |
+     binutils           |                             []             []  |
+     bison              |          []         []                     []  |
+     bison-runtime      |          []     []  []   [] []       [] [] []  |
+     buzztrax           |                     []                         |
+     ccd2cue            |                     []                     []  |
+     ccide              |          []                 []             []  |
+     cflow              |          []         []                     []  |
+     clisp              |                             []                 |
+     coreutils          |          []                 []       []    []  |
+     cpio               |          []                 []             []  |
+     cppi               |          []         []                     []  |
+     cpplib             |                     []      []             []  |
+     cryptsetup         |          []         []                     []  |
+     datamash           |                     []                     []  |
+     denemo             |                                                |
+     dfarc              |          []         []                     []  |
+     dialog             |          []         []   [] []    [] []    []  |
+     dico               |          []                                    |
+     diffutils          |          []         []                     []  |
+     dink               |                                                |
+     direvent           |          []         []                     []  |
+     doodle             |                                         [] []  |
+     dos2unix           |          []         []      []             []  |
+     dos2unix-man       |          []         []                         |
+     e2fsprogs          |          []                                    |
+     enscript           |          []         []   [] []       []    []  |
+     exif               |          []         []   [] []    []       []  |
+     fetchmail          |          []                 []          []     |
+     findutils          |          []         []      []    [] []    []  |
+     flex               |          []         []   [] []             []  |
+     freedink           |          []         []      []       []    []  |
+     fusionforge        |                                                |
+     gas                |                                                |
+     gawk               |          []                                    |
+     gcal               |                                                |
+     gcc                |                                                |
+     gdbm               |          []         []                     []  |
+     gettext-examples   |          []     []  []   [] []    [] []    []  |
+     gettext-runtime    | []       []     []  []   [] []    [] []    []  |
+     gettext-tools      |          []         []   [] []    [] []    []  |
+     gjay               |                                            []  |
+     glunarclock        |          []         []   []       [] []    []  |
+     gnubiff            |                                            []  |
+     gnubik             |          []         []               []    []  |
+     gnucash            |          ()     ()  ()   () ()             []  |
+     gnuchess           |                     []                     []  |
+     gnulib             |          []         []      []       []    []  |
+     gnunet             |                                                |
+     gnunet-gtk         |                                                |
+     gold               |                                                |
+     gphoto2            |          []         []   [] []             []  |
+     gprof              |                     []   [] []             []  |
+     gramadoir          |                                   []       []  |
+     grep               |          []         []      []    [] []    []  |
+     grub               |          []         []      []       []    []  |
+     gsasl              |          []                       []       []  |
+     gss                |          []              []       []       []  |
+     gst-plugins-bad    |          []         []      []    []       []  |
+     gst-plugins-base   |          []         []      []    [] []    []  |
+     gst-plugins-good   |          []         []   [] []    [] []    []  |
+     gst-plugins-ugly   |          []         []   [] []    [] []    []  |
+     gstreamer          |          []         []   [] []    [] []    []  |
+     gtick              |          []         []      []    []       []  |
+     gtkam              |       [] []         []      []    []       []  |
+     gtkspell           |          []     []  []   [] []    [] [] [] []  |
+     guix               |                                                |
+     guix-packages      |                                                |
+     gutenprint         |                                   [] []        |
+     hello              |          []         []      []    [] []    []  |
+     help2man           |          []         []      []             []  |
+     help2man-texi      |          []                                    |
+     hylafax            |                                                |
+     idutils            |          []                 []             []  |
+     iso_15924          |          []     ()       [] []       []    []  |
+     iso_3166           | [] [] [] []     ()  []   [] [] [] [] [] [] []  |
+     iso_3166_2         |          []     ()                         []  |
+     iso_4217           | []       []     ()       [] [] []    []    []  |
+     iso_639            |    [] [] []     ()       [] [] [] [] []    []  |
+     iso_639_3          |       []        ()                             |
+     iso_639_5          |                 ()                         []  |
+     jwhois             |          []         []   []                []  |
+     kbd                |          []                 []                 |
+     klavaro            |       [] []         []      []       []        |
+     ld                 |                                                |
+     leafpad            | []       []     []  []      []    [] []    []  |
+     libc               |          []                 []    []           |
+     libexif            |          []         ()            []           |
+     libextractor       |          []                                    |
+     libgnutls          |          []                                    |
+     libgphoto2         |          []                                    |
+     libgphoto2_port    |          []         []      []    []       []  |
+     libgsasl           |          []              []       []       []  |
+     libiconv           |          []         []            [] []    []  |
+     libidn             |          []         []                     []  |
+     liferea            |          []     []  []   [] ()    []    []     |
+     lilypond           |                                                |
+     lordsawar          |                                                |
+     lprng              |          []                                    |
+     lynx               |                     []      []                 |
+     m4                 |          []         []   [] []             []  |
+     mailfromd          |          []                                    |
+     mailutils          |          []                                    |
+     make               |          []         []      []                 |
+     man-db             |          []                 []             []  |
+     man-db-manpages    |          []                 []             []  |
+     midi-instruments   |          []     []  []   [] []    [] []    []  |
+     minicom            |          []         []   [] []                 |
+     mkisofs            |          []                 []             []  |
+     myserver           |                                      []    []  |
+     nano               |          []         []   [] []       []    []  |
+     opcodes            |                                                |
+     parted             |          []         []      []    [] []    []  |
+     pies               |          []                                    |
+     pnmixer            |                             []                 |
+     popt               |          []     []  []      []       []    []  |
+     procps-ng          |          []                                    |
+     procps-ng-man      |          []                                    |
+     psmisc             |          []         []      []             []  |
+     pspp               |          []                 []                 |
+     pushover           |                                                |
+     pwdutils           |          []                                    |
+     pyspread           | []                  []                         |
+     radius             |          []                 []                 |
+     recode             |          []     []  []   [] []    [] []    []  |
+     recutils           |                     []                     []  |
+     rpm                |          []                                    |
+     rush               |          []         []                     []  |
+     sarg               |                     []      []                 |
+     sed                |          []     []  []   [] []    [] []    []  |
+     sharutils          |          []         []                     []  |
+     shishi             |          []                                []  |
+     skribilo           |                                            []  |
+     solfege            |          []         []      []                 |
+     solfege-manual     |          []         []                         |
+     spotmachine        |                     []                     []  |
+     sudo               |          []         []      []    [] []    []  |
+     sudoers            |          []         []               []    []  |
+     sysstat            |          []         []      []    []       []  |
+     tar                |          []         []      []       []    []  |
+     texinfo            |          []         []      []                 |
+     texinfo_document   |          []         []                         |
+     tigervnc           |                     []      []             []  |
+     tin                |                             []                 |
+     tin-man            |                                                |
+     tracgoogleappsa... |          []         []      []             []  |
+     trader             |                             []             []  |
+     util-linux         |          []         []                         |
+     ve                 |          []         []                     []  |
+     vice               |                                                |
+     vmm                |                                                |
+     vorbis-tools       |          []                          []    []  |
+     wastesedge         |                                                |
+     wcd                |                                                |
+     wcd-man            |                                                |
+     wdiff              |          []         []      []       []    []  |
+     wget               |          []         []      []    []       []  |
+     wyslij-po          | []       []         []                     []  |
+     xboard             |          []                 []             []  |
+     xdg-user-dirs      | [] [] [] []  [] []  []   [] []    [] [] [] []  |
+     xkeyboard-config   |          []         []      []       []        |
+                        +------------------------------------------------+
+                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                           7  3  6 114  1 12  88   32 82  3 40 45  7 101
+
+                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                        +----------------------------------------------+
+     a2ps               | []              [] [] []     []              |
+     aegis              |                              []              |
+     anubis             | []                 [] []     []              |
+     aspell             | []                    []     []  []     []   |
+     bash               | []                    []     []         []   |
+     bfd                | []                    []     []              |
+     binutils           | []                    []     []              |
+     bison              | []                    []     []         []   |
+     bison-runtime      | []              [] [] []     []         []   |
+     buzztrax           | []                           []         []   |
+     ccd2cue            |                       []     []         []   |
+     ccide              | []                    []     []         []   |
+     cflow              | []                    []     []         []   |
+     clisp              |                                              |
+     coreutils          | []                    []     []              |
+     cpio               | []                 [] []     []         []   |
+     cppi               | []                    []     []         []   |
+     cpplib             | []                 [] []     []         []   |
+     cryptsetup         |                       []     []         []   |
+     datamash           | []                    []     []              |
+     denemo             |                                         []   |
+     dfarc              | []                           []              |
+     dialog             | []  []          []           []  []     []   |
+     dico               |                       []                     |
+     diffutils          | []                 [] []     []         []   |
+     dink               | []                                           |
+     direvent           |                       []     []              |
+     doodle             | []                           []              |
+     dos2unix           | []                    []     []         []   |
+     dos2unix-man       | []                    []                []   |
+     e2fsprogs          | []                    []     []         []   |
+     enscript           | []                 [] []     []              |
+     exif               | []                 [] []     []         []   |
+     fetchmail          | []                 []        []         []   |
+     findutils          | []                 [] []     []         []   |
+     flex               | []                 []        []         []   |
+     freedink           | []              []           []              |
+     fusionforge        |                                              |
+     gas                |                       []                     |
+     gawk               | []                           []         []   |
+     gcal               | []                 []                   []   |
+     gcc                | []                                           |
+     gdbm               |                       []     []              |
+     gettext-examples   | []                 [] []     []         []   |
+     gettext-runtime    | []                 [] []     []         []   |
+     gettext-tools      | []                 [] []     []         []   |
+     gjay               |                 []           []         []   |
+     glunarclock        | []                           []  []     []   |
+     gnubiff            | []                           []              |
+     gnubik             | []                    []     []         []   |
+     gnucash            |        () ()              () ()         []   |
+     gnuchess           |                       []     []         []   |
+     gnulib             | []                    []     []         []   |
+     gnunet             |                                              |
+     gnunet-gtk         |                                              |
+     gold               |                       []     []              |
+     gphoto2            | []                    []     []         []   |
+     gprof              | []                 [] []     []              |
+     gramadoir          | []                           []         []   |
+     grep               | []              []    []     []         []   |
+     grub               | []                 [] []     []              |
+     gsasl              | []                    []     []         []   |
+     gss                | []                           []         []   |
+     gst-plugins-bad    | []                 [] []     []         []   |
+     gst-plugins-base   | []                 [] []     []         []   |
+     gst-plugins-good   | []                 [] []     []         []   |
+     gst-plugins-ugly   | []                 [] []     []         []   |
+     gstreamer          | []                 [] []     []         []   |
+     gtick              |                       []     []         []   |
+     gtkam              | []                    []     []         []   |
+     gtkspell           | []              [] [] []     []  []     []   |
+     guix               |                                              |
+     guix-packages      |                                              |
+     gutenprint         |                    [] []     []         []   |
+     hello              | []              [] [] []     []         []   |
+     help2man           |                       []     []         []   |
+     help2man-texi      |                       []                     |
+     hylafax            |                              []              |
+     idutils            |                       []     []         []   |
+     iso_15924          | []              () [] []     ()         []   |
+     iso_3166           | []        []    () [] []     ()  []     []   |
+     iso_3166_2         |                 () [] []     ()         []   |
+     iso_4217           | []              () [] []     ()         []   |
+     iso_639            | []     [] []    () [] []     ()  []     []   |
+     iso_639_3          |        []       () [] []     ()              |
+     iso_639_5          |                 ()    []     ()              |
+     jwhois             | []                 []        []         []   |
+     kbd                | []                    []     []         []   |
+     klavaro            | []                    []  [] []     []  []   |
+     ld                 | []                 [] []     []         []   |
+     leafpad            | []              [] [] []     []         []   |
+     libc               | []                 [] []     []         []   |
+     libexif            | []                           []         ()   |
+     libextractor       |                       []     []              |
+     libgnutls          | []                    []     []         []   |
+     libgphoto2         | []                    []     []              |
+     libgphoto2_port    | []                    []     []         []   |
+     libgsasl           | []                    []     []         []   |
+     libiconv           | []                    []     []  []     []   |
+     libidn             | ()                    []     []         []   |
+     liferea            | []                 [] []     []         []   |
+     lilypond           |                              []              |
+     lordsawar          |                                              |
+     lprng              |                              []              |
+     lynx               | []                 [] []     []              |
+     m4                 | []                           []         []   |
+     mailfromd          |                       []     []              |
+     mailutils          |                              []              |
+     make               | []                    []     []         []   |
+     man-db             | []                           []         []   |
+     man-db-manpages    | []                                      []   |
+     midi-instruments   | []              [] [] []     []         []   |
+     minicom            | []                           []              |
+     mkisofs            |                       []     []         []   |
+     myserver           |                              []              |
+     nano               | []                    []     []         []   |
+     opcodes            |                       []     []         []   |
+     parted             | []                 [] []     []         []   |
+     pies               |                       []     []              |
+     pnmixer            |                       []     []         []   |
+     popt               | []     []       [] [] []     []         []   |
+     procps-ng          |                       []     []              |
+     procps-ng-man      |                       []                     |
+     psmisc             | []                    []     []         []   |
+     pspp               |                    [] []                []   |
+     pushover           | []                                           |
+     pwdutils           | []                           []              |
+     pyspread           |                       []                     |
+     radius             |                       []     []              |
+     recode             | []                 []        []         []   |
+     recutils           | []                    []     []              |
+     rpm                | []                    []     []         []   |
+     rush               |                       []     []              |
+     sarg               |                                              |
+     sed                | []                 [] []     []         []   |
+     sharutils          | []                    []     []         []   |
+     shishi             |                              []         []   |
+     skribilo           | []                    []                     |
+     solfege            | []                 []        []         []   |
+     solfege-manual     |                    []                        |
+     spotmachine        | []                    []     []              |
+     sudo               | []                 [] []     []         []   |
+     sudoers            | []                    []     []         []   |
+     sysstat            | []                 [] []     []         []   |
+     tar                | []                 [] []     []         []   |
+     texinfo            |                    [] []     []              |
+     texinfo_document   |                       []                     |
+     tigervnc           | []                    []                []   |
+     tin                |                                         []   |
+     tin-man            |                                              |
+     tracgoogleappsa... | []              []    []     []         []   |
+     trader             | []                                           |
+     util-linux         | []                    []     []         []   |
+     ve                 | []                    []     []         []   |
+     vice               | ()                 ()                        |
+     vmm                |                                              |
+     vorbis-tools       | []                           []              |
+     wastesedge         |                                              |
+     wcd                |                       []     []         []   |
+     wcd-man            |                       []                     |
+     wdiff              | []                    []     []         []   |
+     wget               |                       []     []         []   |
+     wyslij-po          |                       []     []              |
+     xboard             |                       []                []   |
+     xdg-user-dirs      | []     [] []    [] [] []     []         []   |
+     xkeyboard-config   | []                 [] []     []              |
+                        +----------------------------------------------+
+                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                          106  1  4  3  0 13 51 115  1 125  7  1  100 
+
+                          zh_HK zh_TW
+                        +-------------+
+     a2ps               |             | 30
+     aegis              |             |  9
+     anubis             |             | 19
+     aspell             |             | 29
+     bash               |        []   | 23
+     bfd                |             | 11
+     binutils           |             | 12
+     bison              |        []   | 18
+     bison-runtime      |        []   | 38
+     buzztrax           |             |  9
+     ccd2cue            |             | 10
+     ccide              |             | 17
+     cflow              |             | 16
+     clisp              |             | 10
+     coreutils          |             | 18
+     cpio               |             | 20
+     cppi               |             | 17
+     cpplib             |        []   | 19
+     cryptsetup         |             | 14
+     datamash           |             | 11
+     denemo             |             |  5
+     dfarc              |             | 17
+     dialog             |        []   | 42
+     dico               |             |  6
+     diffutils          |             | 22
+     dink               |             | 10
+     direvent           |             | 11
+     doodle             |             | 12
+     dos2unix           |        []   | 18
+     dos2unix-man       |             |  9
+     e2fsprogs          |             | 15
+     enscript           |             | 21
+     exif               |             | 27
+     fetchmail          |             | 19
+     findutils          |             | 29
+     flex               |        []   | 19
+     freedink           |             | 24
+     fusionforge        |             |  3
+     gas                |             |  5
+     gawk               |             | 13
+     gcal               |             |  8
+     gcc                |             |  2
+     gdbm               |             | 10
+     gettext-examples   |  []    []   | 40
+     gettext-runtime    |  []    []   | 35
+     gettext-tools      |        []   | 24
+     gjay               |             |  9
+     glunarclock        |        []   | 27
+     gnubiff            |             |  9
+     gnubik             |             | 19
+     gnucash            |        ()   |  6
+     gnuchess           |             | 11
+     gnulib             |             | 23
+     gnunet             |             |  1
+     gnunet-gtk         |             |  1
+     gold               |             |  7
+     gphoto2            |        []   | 19
+     gprof              |             | 21
+     gramadoir          |             | 14
+     grep               |        []   | 31
+     grub               |             | 21
+     gsasl              |        []   | 19
+     gss                |             | 17
+     gst-plugins-bad    |             | 21
+     gst-plugins-base   |             | 27
+     gst-plugins-good   |             | 32
+     gst-plugins-ugly   |             | 34
+     gstreamer          |        []   | 32
+     gtick              |             | 19
+     gtkam              |             | 24
+     gtkspell           |  []    []   | 48
+     guix               |             |  2
+     guix-packages      |             |  0
+     gutenprint         |             | 15
+     hello              |        []   | 30
+     help2man           |             | 18
+     help2man-texi      |             |  5
+     hylafax            |             |  5
+     idutils            |             | 14
+     iso_15924          |        []   | 23
+     iso_3166           |  []    []   | 58
+     iso_3166_2         |             |  9
+     iso_4217           |  []    []   | 28
+     iso_639            |  []    []   | 46
+     iso_639_3          |             | 10
+     iso_639_5          |             |  2
+     jwhois             |        []   | 20
+     kbd                |             | 17
+     klavaro            |             | 30
+     ld                 |        []   | 15
+     leafpad            |        []   | 39
+     libc               |        []   | 24
+     libexif            |             | 10
+     libextractor       |             |  5
+     libgnutls          |             | 13
+     libgphoto2         |             | 10
+     libgphoto2_port    |        []   | 19
+     libgsasl           |             | 18
+     libiconv           |        []   | 29
+     libidn             |             | 17
+     liferea            |             | 29
+     lilypond           |             | 11
+     lordsawar          |             |  3
+     lprng              |             |  3
+     lynx               |             | 19
+     m4                 |        []   | 22
+     mailfromd          |             |  4
+     mailutils          |             |  6
+     make               |             | 19
+     man-db             |             | 15
+     man-db-manpages    |             | 10
+     midi-instruments   |        []   | 43
+     minicom            |        []   | 17
+     mkisofs            |             | 13
+     myserver           |             |  9
+     nano               |        []   | 30
+     opcodes            |             | 12
+     parted             |        []   | 23
+     pies               |             |  4
+     pnmixer            |             |  9
+     popt               |        []   | 36
+     procps-ng          |             |  5
+     procps-ng-man      |             |  4
+     psmisc             |        []   | 22
+     pspp               |             | 13
+     pushover           |             |  6
+     pwdutils           |             |  8
+     pyspread           |             |  6
+     radius             |             |  9
+     recode             |             | 31
+     recutils           |             | 10
+     rpm                |        []   | 13
+     rush               |             | 10
+     sarg               |             |  4
+     sed                |        []   | 35
+     sharutils          |             | 13
+     shishi             |             |  7
+     skribilo           |             |  7
+     solfege            |             | 21
+     solfege-manual     |             |  9
+     spotmachine        |             | 11
+     sudo               |             | 26
+     sudoers            |             | 22
+     sysstat            |             | 23
+     tar                |        []   | 30
+     texinfo            |             | 17
+     texinfo_document   |             | 13
+     tigervnc           |             | 14
+     tin                |        []   |  7
+     tin-man            |             |  1
+     tracgoogleappsa... |        []   | 22
+     trader             |             | 12
+     util-linux         |             | 13
+     ve                 |             | 14
+     vice               |             |  1
+     vmm                |             |  3
+     vorbis-tools       |             | 13
+     wastesedge         |             |  3
+     wcd                |             |  8
+     wcd-man            |             |  3
+     wdiff              |        []   | 23
+     wget               |             | 21
+     wyslij-po          |             | 14
+     xboard             |             | 10
+     xdg-user-dirs      |  []    []   | 68
+     xkeyboard-config   |        []   | 28
+                        +-------------+
+       89 teams           zh_HK zh_TW
+      166 domains           7    42    2809
 
    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
@@ -267,30 +1350,30 @@
 dialects.
 
    For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer.  There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
-   If May 2001 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'.
-
-Using `gettext' in new packages
-===============================
-
-   If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course the GNU Public License applies to your sources from
-then if you include `gettext' directly in your distribution on but
-since you are writing free software anyway this is no restriction.
-
-   Once the sources are change appropriately and the setup can handle to
-use of `gettext' the only thing missing are the translations.  The Free
-Translation Project is also available for packages which are not
+which it applies should also have been internationalized and distributed
+as such by its maintainer.  There might be an observable lag between the
+mere existence a PO file and its wide availability in a distribution.
+
+   If Jun 2014 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://translationproject.org/extra/matrix.html'.
+
+1.5 Using 'gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU 'gettext' in your
+package.  Of course you have to respect the GNU Lesser General Public
+License which covers the use of the GNU 'gettext' library.  This means
+in particular that even non-free programs can use 'libintl' as a shared
+library, whereas only free software can use 'libintl' as a static
+library or use modified versions of 'libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of 'gettext' the only thing missing are the translations.  The
+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.

grip-3.4.3.tar.gz/AUTHORS -> grip-3.9.0.tar.gz/AUTHORS Changed

grip-3.9.0.tar.gz/COPYING-LGPL Added

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+&#xc;
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+&#xc;
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+&#xc;
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+&#xc;
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+&#xc;
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+&#xc;
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+&#xc;
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+&#xc;
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+&#xc;
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

grip-3.4.3.tar.gz/CREDITS -> grip-3.9.0.tar.gz/CREDITS Changed

grip-3.4.3.tar.gz/ChangeLog -> grip-3.9.0.tar.gz/ChangeLog Changed

@@ -1,3 +1,72 @@
+v3.9.0 2018-07-10  Johnny A. Solbu <johnny@solbu.net>
+
+	* Add freedb.musicbrainz.org as secondary default cd database
+
+v3.8.1 2018-05-26  Johnny A. Solbu <johnny@solbu.net>
+
+	* Fedora patch: Search paths for executables during config switches
+	* Reformat manpage, to ease maintanability
+	* Add COPYING-LGPL: 4 files are licensed under the LGPLv2+
+	* Sync Chinese (simplified) from Translatin Troject
+
+v3.8.0 2018-05-13  Johnny A. Solbu <johnny@solbu.net>
+
+	* Add default encode configuration for
+	    - faac (bug #143)
+	    - opus (bug #117)
+	* Fedora patch: put oggenc to the top of config list
+	  Apparently, without this patch, the config files are ignored
+
+v3.7.1 2018-04-10  Johnny A. Solbu <johnny@solbu.net>
+
+	* Sync Spanish translation from Translation Project
+
+v3.7.0 2018-03-19  Johnny A. Solbu <johnny@solbu.net>
+
+	* Sync Brazilian Portuguese from Translation Project
+	* Patch by Phil Stracchino: extended genres to genre list
+
+v3.6.3 2018-01-31  Johnny A. Solbu <johnny@solbu.net>
+
+	* Sync ukranian and hungarian translations from Translation Project
+	* Patch from Adrian Reber: fix compiler warning with gcc 8.0
+	* Update the FSF postal address in source files
+
+v3.6.2 2017-11-29  Johnny A. Solbu <johnny@solbu.net>
+
+	* Translation updates: German, Italian, Brazilian Portuguese, Serbian
+
+v3.6.1 2017-10-04 Johnny A. Solbu <johnny@solbu.net>
+
+	* Patch from Adrian Reber: fix compiler warning
+	  and enable -Werror and -Wall by default
+	* Translation update: Norwegian
+
+v3.6.0 2017-09-14 Johnny A. Solbu <johnny@solbu.net>
+
+	* Patch from Mike Gilbode: Select DiscDB entry from multiple results
+	* Translation updates.
+
+v3.5.2 2017-08-05 Johnny A. Solbu <johnny@solbu.net>
+
+	* Patch from Adrian Reber: Fix more compiler warnings
+
+v3.5.1 2017-07-30 Johnny A. Solbu <johnny@solbu.net>
+
+	* Make icons transparent
+	* Fix typo in userguide
+
+v3.5.0 2017-07-29 Johnny A. Solbu <johnny@solbu.net>
+
+	* Apply Fedora patch from Adrian Reber (Fedora bug #1474010)
+	  The «blind-write-fix» patch from Mageia (originally from Mandriva in 2003)
+	  breaks Tagging of files other that MP3
+	* Patch from Adrian Reber: Fix compiler warnings
+	* Install manpage when running «make install»
+	* Install grip-audiocd.desktop, which makes grip one of the popup options
+	  for ripping when inserting a CD in KDE/Plasma
+	* Install icons into the hicolor tree
+
 v3.4.3 2017-07-05 Johnny A. Solbu <johnny@solbu.net>
 
 	* Add patch from Thomas Jaksch: Fix tray not ejecting

grip-3.4.3.tar.gz/INSTALL -> grip-3.9.0.tar.gz/INSTALL Changed

grip-3.4.3.tar.gz/Makefile.am -> grip-3.9.0.tar.gz/Makefile.am Changed

grip-3.4.3.tar.gz/Makefile.in -> grip-3.9.0.tar.gz/Makefile.in Changed

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 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.
@@ -13,161 +13,428 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = .
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in mkinstalldirs $(dist_man_MANS) ABOUT-NLS \
+	COPYING TODO compile config.guess config.sub depcomp \
+	install-sh missing ltmain.sh ltconfig
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-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 \
+	tags-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
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(soliddatadir)"
+NROFF = nroff
+MANS = $(dist_man_MANS)
+DATA = $(Applications_DATA) $(soliddata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_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__post_remove_distdir = $(am__remove_distdir)
+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
+DIST_TARGETS = dist-gzip
+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@
 AMTAR = @AMTAR@
-AS = @AS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CDPAR_LIBS = @CDPAR_LIBS@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNOME_CFLAGS = @GNOME_CFLAGS@
+GNOME_LIBS = @GNOME_LIBS@
+GREP = @GREP@
 ID3_LIBS = @ID3_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
+TERMINAL_WIDGET_CFLAGS = @TERMINAL_WIDGET_CFLAGS@
+TERMINAL_WIDGET_LIBS = @TERMINAL_WIDGET_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+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@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+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@
 SUBDIRS = po src pixmaps doc contrib
-
 EXTRA_DIST = \
 	grip.desktop \
 	grip-audiocd.desktop \
-	grip.1 \
-	CREDITS
-
+	CREDITS \
+	COPYING-LGPL
 
 Applicationsdir = $(datadir)/applications
 Applications_DATA = grip.desktop
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-DIST_SOURCES =
-DATA = $(Applications_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
-	Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess \
-	config.h.in config.sub configure configure.in depcomp \
-	install-sh ltconfig ltmain.sh missing \
-	mkinstalldirs
-DIST_SUBDIRS = $(SUBDIRS)
+soliddatadir = $(datadir)/apps/solid/actions
+soliddata_DATA = grip-audiocd.desktop
+dist_man_MANS = grip.1
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	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 \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(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
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 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: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
@@ -179,38 +446,113 @@
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-ApplicationsDATA_INSTALL = $(INSTALL_DATA)
+	-rm -f libtool config.lt
+install-man1: $(dist_man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(dist_man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-ApplicationsDATA: $(Applications_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
-	@list='$(Applications_DATA)'; for p in $$list; do \
+	@list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(Applicationsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(ApplicationsDATA_INSTALL) $$d$$p $(DESTDIR)$(Applicationsdir)/$$f"; \
-	  $(ApplicationsDATA_INSTALL) $$d$$p $(DESTDIR)$(Applicationsdir)/$$f; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Applicationsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Applicationsdir)" || exit $$?; \
 	done
 
 uninstall-ApplicationsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(Applications_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(Applicationsdir)/$$f"; \
-	  rm -f $(DESTDIR)$(Applicationsdir)/$$f; \
+	@list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(Applicationsdir)'; $(am__uninstall_files_from_dir)
+install-soliddataDATA: $(soliddata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(soliddata_DATA)'; test -n "$(soliddatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(soliddatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(soliddatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(soliddatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(soliddatadir)" || exit $$?; \
 	done
 
+uninstall-soliddataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(soliddata_DATA)'; test -n "$(soliddatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(soliddatadir)'; $(am__uninstall_files_from_dir)
+
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (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; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -218,192 +560,281 @@
 	  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; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(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; }'`; \
-	mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test ! -f $$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; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$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"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distcleancheck_listfiles = find . -type f -print
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/. $(distdir)/po
-	@list='$(DISTFILES)'; for file in $$list; do \
+	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"; \
-	    $(mkinstalldirs) "$(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='$(SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (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
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(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) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
-	  && cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-	      || { echo "ERROR: files left after uninstall:" ; \
-	           find $$dc_install_base -type f -print ; \
-	           exit 1; } >&2 ) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-	  && rm -f $(distdir).tar.gz \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@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)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left after distclean:" ; \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA) config.h
+all-am: Makefile $(MANS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
-
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Applicationsdir)" "$(DESTDIR)$(soliddatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -414,16 +845,22 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-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"
@@ -434,56 +871,95 @@
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
+html-am:
+
 info: info-recursive
 
 info-am:
 
-install-data-am: install-ApplicationsDATA
+install-data-am: install-ApplicationsDATA install-man \
+	install-soliddataDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
 
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
-install-man:
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-uninstall-am: uninstall-ApplicationsDATA uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive dist dist-all \
-	dist-gzip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-recursive distclean-tags \
-	distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-ApplicationsDATA install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-ApplicationsDATA uninstall-am \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-ApplicationsDATA uninstall-man \
+	uninstall-soliddataDATA
+
+uninstall-man: uninstall-man1
+
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-ApplicationsDATA install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-soliddataDATA install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-ApplicationsDATA uninstall-am uninstall-man \
+	uninstall-man1 uninstall-soliddataDATA
+
 
 # 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.

grip-3.4.3.tar.gz/README -> grip-3.9.0.tar.gz/README Changed

grip-3.4.3.tar.gz/TODO -> grip-3.9.0.tar.gz/TODO Changed

grip-3.4.3.tar.gz/aclocal.m4 -> grip-3.9.0.tar.gz/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# 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,968 +11,1801 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+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'.])])
+
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
 
-# 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.
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
 
-# 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.
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# 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,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
 
-# 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.
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [USE_NLS=yes
+    AC_SUBST(USE_NLS)
 
-# 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.
+    gt_cv_have_gettext=no
 
-# serial 8
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
 
-# 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,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
 
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+         [return !ngettext ("","", 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
+        ])
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include <libintl.h>
+],
+	          [return !dgettext ("","")],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
+      fi
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
 
-AC_PREREQ([2.52])
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
 
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+  	  AC_CHECK_LIB(intl, ngettext,
+          	[AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)],
+		:,-liconv)
+        fi
 
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[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])
-fi
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
 
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
 
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
 
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
 
-_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
-AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
 
-# Copyright 2002  Free Software Foundation, Inc.
+    # We need to process the po/ directory.
+    POSUB=po
 
-# 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.
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
 
-# 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.
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.ac.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
 
-# 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
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
 
-# 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.6"])
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
 
-# AM_SET_CURRENT_AUTOMAKE_VERSION
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   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 is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.6.3])])
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
+])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_ac,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
 
-# Copyright 2001, 2002  Free Software Foundation, Inc.
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
 
-# 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,
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# 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.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
 
-# _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)])
+# serial 57 LT_INIT
 
-# _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)])])
 
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
 
-#
-# Check to make sure that the build environment is sane.
-#
 
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+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.
 
-# 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.
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
 
-# 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.
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
 
-# serial 3
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
 
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# 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`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # 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".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
 
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
 
-#  -*- Autoconf -*-
+_LT_SETUP
 
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
 
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
-# 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.
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
 
-# 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
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
 
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
 
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# 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"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
 fi
 ])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
 
-# AM_AUX_DIR_EXPAND
+_LT_CHECK_OBJDIR
 
-# Copyright 2001 Free Software Foundation, Inc.
+m4_require([_LT_TAG_COMPILER])dnl
 
-# 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.
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
 
-# 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.
+# Global variables:
+ofile=libtool
+can_build_shared=yes
 
-# 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.
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
 
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
+with_gnu_ld="$lt_cv_prog_gnu_ld"
 
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
 
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
 
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
+_LT_CC_BASENAME([$compiler])
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+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.
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
 
-# 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.
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
 
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$[["`\\]]$/\\\1/g'
 
-# AM_PROG_INSTALL_STRIP
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 
-# 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.
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
 
-# 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.
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
 
-# 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.
 
-# 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
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# 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.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# serial 4						-*- Autoconf -*-
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
 
-# Copyright 1999, 2000, 2001 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.
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$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.
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
 
-# 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.
 
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
 
-# 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,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
 
 
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
 
-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], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
 
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[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
 
-  am_cv_$1_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
-    # 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.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
 
-    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
-      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=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type=$depmode
-      break
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
 ])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
 ])
 
 
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
 ])
 
 
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
 ])
 
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
 
-# 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.
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 
-# 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 2
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
 
-# _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
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # 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 -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //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
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
 done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
 
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+_LT_OUTPUT_LIBTOOL_INIT
 ])
 
-# Copyright 2001 Free Software Foundation, Inc.             -*- 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.
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
 
-# 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.
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
 
-# 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_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
 
-# serial 2
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
 
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-doit:
-	@echo done
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-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 | fgrep -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
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
 fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
-rm -f confinc confmf
-])
+_LTEOF
 
-# AM_CONDITIONAL                                              -*- Autoconf -*-
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
 
-# Copyright 1997, 2000, 2001 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.
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
 
-# 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.
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
 
-# 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.
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
 
-# serial 5
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
 
-AC_PREREQ(2.52)
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
 
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[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])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional \"$1\" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
+_LT_EOF
 
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
 
-# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
+  _LT_PROG_LTMAIN
 
-# 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.
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 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.
+  _LT_PROG_REPLACE_SHELLFNS
 
-# 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.
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
 
-# serial 1
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
 
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
 
-# Copyright 1996, 1997, 2000, 2001 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.
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
 
-# 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.
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
 
-AC_PREREQ([2.52])
 
-# serial 6
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
 
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  We must strip everything past the first ":",
-# and everything past the last "/".
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
-       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-	      m4_if(regexp([$1], [^//$[^/]\|$$]), -1,
-		    m4_if(regexp([$1], [^/.*]), -1,
-			  [.],
-			  patsubst([$1], [^$/$.*], [\1])),
-		    patsubst([$1], [^$//$$[^/].*\|$$], [\1])),
-	      patsubst([$1], [^$.*[^/]$//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
 
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
-                               [:.*])))/stamp-h[]_AM_STAMP_Count])
 
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
 
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h.  But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-AC_CONFIG_HEADERS([$1],
-                  [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
-                  [$3])
-])# _AM_CONFIG_HEADER
 
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
 
-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# --------------------------------------------------------------
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# AM_CONFIG_HEADER
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
 
-# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
 
-# serial 46 AC_PROG_LIBTOOL
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
 
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
 
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([LT_AC_PROG_SED])dnl
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
 
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
 
-_LT_AC_PROG_ECHO_BACKSLASH
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
 esac
 
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
 
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
 
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
-*-*-irix6*)
+ia64-*-hpux*)
   # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
     esac
   fi
   rm -rf conftest*
@@ -983,450 +1816,394 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
   ;;
-  ])
 esac
 
-_LT_AC_LTCONFIG_HACK
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
 
-])
 
-# AC_LIBTOOL_HEADER_ASSERT
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
-[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
-    [lt_cv_func_assert_works],
-    [case $host in
-    *-*-solaris*)
-      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
-        case `$CC --version 2>/dev/null` in
-        [[12]].*) lt_cv_func_assert_works=no ;;
-        *)        lt_cv_func_assert_works=yes ;;
-        esac
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
       fi
-      ;;
-    esac])
+      rm -f conftest.* libconftest.a
+     ])
+  ])
 
-if test "x$lt_cv_func_assert_works" = xyes; then
-  AC_CHECK_HEADERS(assert.h)
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
 fi
-])# AC_LIBTOOL_HEADER_ASSERT
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)
-])# _LT_AC_CHECK_DLFCN
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
 
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
 
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
 
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern char \1;/p'"
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern char \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
 
-# Handle CRLF in mingw tool chain
-opt_cr=
 case $host_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
 esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
 
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[[ABCDGISTW]]'
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
 fi
+])# _LT_COMPILER_OPTION
 
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]$$symcode$symcode*$[[ 	]][[ 	]]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
 
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
 
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
 
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
 
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  sed "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr) 0}
-};
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  save_LIBS="$LIBS"
-	  save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$save_LIBS"
-	  CFLAGS="$save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
-      fi
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
     else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
     fi
-  else
-    echo "$progname: failed program was:" >&AC_FD_CC
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-  global_symbol_to_c_name_address=
-else
-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-fi
-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-# ---------------------------------
-AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
-[# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
-  PATH_SEPARATOR=$lt_cv_sys_path_separator
-fi
-])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-			      [AC_DIVERT_PUSH(NOTICE)])
-_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
 
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
 
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
     fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
     fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
     fi
-  fi
-fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
 fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-AC_DIVERT_POP
-])# _LT_AC_PROG_ECHO_BACKSLASH
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[if test "$cross_compiling" = yes; then :
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
   [$4]
 else
-  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1467,11 +2244,13 @@
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
 #endif
 
-void fnord() { int i=42;}
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1480,20 +2259,26 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
-    exit (status);
+  return status;
 }]
-EOF
+_LT_EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
       x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
+      x$lt_dlunknown|x*) $3 ;;
     esac
   else :
     # compilation failed
@@ -1501,12 +2286,14 @@
   fi
 fi
 rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
+])# _LT_TRY_DLOPEN_SELF
 
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[if test "x$enable_dlopen" != xyes; then
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -1521,24 +2308,39 @@
     lt_cv_dlopen_self=yes
     ;;
 
-  cygwin* | mingw* | pw32*)
+  mingw* | pw32* | cegcc*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
-   ;;
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
 
   *)
     AC_CHECK_FUNC([shl_load],
-          [lt_cv_dlopen="shl_load"],
+	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
-	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
 	    [AC_CHECK_LIB([svld], [dlopen],
-	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1556,27 +2358,26 @@
   case $lt_cv_dlopen in
   dlopen)
     save_CPPFLAGS="$CPPFLAGS"
-    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     AC_CACHE_CHECK([whether a program can dlopen itself],
 	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
+	  _LT_TRY_DLOPEN_SELF(
 	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
 	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
       ])
@@ -1598,1188 +2399,286 @@
   *) enable_dlopen_self_static=unknown ;;
   esac
 fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-AC_DEFUN([_LT_AC_LTCONFIG_HACK],
-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/$[[\\"\\`$\\\\]]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[[\\"\\`\\\\]]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-need_locks="$enable_libtool_lock"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-if test x"$host" != x"$build"; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case $host_os in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
-esac
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="[$]2"
-
-AC_MSG_CHECKING([for objdir])
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-AC_MSG_RESULT($objdir)
-
-
-AC_ARG_WITH(pic,
-[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-pic_mode="$withval", pic_mode=default)
-test -z "$pic_mode" && pic_mode=default
-
-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-# in isolation, and that seeing it set (from the cache) indicates that
-# the associated values are set (in the cache) correctly too.
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-AC_CACHE_VAL(lt_cv_prog_cc_pic,
-[ lt_cv_prog_cc_pic=
-  lt_cv_prog_cc_shlib=
-  lt_cv_prog_cc_wl=
-  lt_cv_prog_cc_static=
-  lt_cv_prog_cc_no_builtin=
-  lt_cv_prog_cc_can_build_shared=$can_build_shared
-
-  if test "$GCC" = yes; then
-    lt_cv_prog_cc_wl='-Wl,'
-    lt_cv_prog_cc_static='-static'
-
-    case $host_os in
-    aix*)
-      # Below there is a dirty hack to force normal static linking with -ldl
-      # The problem is because libdl dynamically linked with both libc and
-      # libC (AIX C++ library), which obviously doesn't included in libraries
-      # list by gcc. This cause undefined symbols with -static flags.
-      # This hack allows C programs to be linked with "-static -ldl", but
-      # not sure about C++ programs.
-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_cv_prog_cc_pic='-fno-common'
-      ;;
-    cygwin* | mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	 lt_cv_prog_cc_pic=-Kconform_pic
-      fi
-      ;;
-    *)
-      lt_cv_prog_cc_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for PIC flags for the system compiler.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      lt_cv_prog_cc_wl='-Wl,'
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_cv_prog_cc_static='-Bstatic'
-      else
-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-      lt_cv_prog_cc_wl='-Wl,'
-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-      lt_cv_prog_cc_pic='+Z'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_cv_prog_cc_wl='-Wl,'
-      lt_cv_prog_cc_static='-non_shared'
-      # PIC (with -KPIC) is the default.
-      ;;
-
-    cygwin* | mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-      ;;
-
-    newsos6)
-      lt_cv_prog_cc_pic='-KPIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      # All OSF/1 code is PIC.
-      lt_cv_prog_cc_wl='-Wl,'
-      lt_cv_prog_cc_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_cv_prog_cc_pic='-Kpic'
-      lt_cv_prog_cc_static='-dn'
-      lt_cv_prog_cc_shlib='-belf'
-      ;;
-
-    solaris*)
-      lt_cv_prog_cc_pic='-KPIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      lt_cv_prog_cc_wl='-Wl,'
-      ;;
-
-    sunos4*)
-      lt_cv_prog_cc_pic='-PIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      lt_cv_prog_cc_wl='-Qoption ld '
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_cv_prog_cc_pic='-KPIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      lt_cv_prog_cc_wl='-Wl,'
-      ;;
-
-    uts4*)
-      lt_cv_prog_cc_pic='-pic'
-      lt_cv_prog_cc_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_cv_prog_cc_pic='-Kconform_pic'
-	lt_cv_prog_cc_static='-Bstatic'
-      fi
-      ;;
-
-    *)
-      lt_cv_prog_cc_can_build_shared=no
-      ;;
-    esac
-  fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
 ])
-if test -z "$lt_cv_prog_cc_pic"; then
-  AC_MSG_RESULT([none])
-else
-  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
-
-  # Check to make sure the pic_flag actually works.
-  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
-  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-    AC_TRY_COMPILE([], [], [dnl
-      case $host_os in
-      hpux9* | hpux10* | hpux11*)
-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-	# they create non-PIC objects.  So, if there were any warnings, we
-	# assume that PIC is not supported.
-	if test -s conftest.err; then
-	  lt_cv_prog_cc_pic_works=no
-	else
-	  lt_cv_prog_cc_pic_works=yes
-	fi
-	;;
-      *)
-	lt_cv_prog_cc_pic_works=yes
-	;;
-      esac
-    ], [dnl
-      lt_cv_prog_cc_pic_works=no
-    ])
-    CFLAGS="$save_CFLAGS"
-  ])
-
-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-    lt_cv_prog_cc_pic=
-    lt_cv_prog_cc_can_build_shared=no
-  else
-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-  fi
-
-  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$lt_cv_prog_cc_shlib"; then
-  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
-  else
-   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
 
-AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
-AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
-  lt_cv_prog_cc_static_works=no
-  save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
-  LDFLAGS="$save_LDFLAGS"
-])
-
-# Belt *and* braces to stop my trousers falling down:
-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
-
-pic_flag="$lt_cv_prog_cc_pic"
-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-wl="$lt_cv_prog_cc_wl"
-link_static_flag="$lt_cv_prog_cc_static"
-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-can_build_shared="$lt_cv_prog_cc_can_build_shared"
-
-
-# Check to see if options -o and -c are simultaneously supported by compiler
-AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
-AC_CACHE_VAL([lt_cv_compiler_c_o], [
-$rm -r conftest 2>/dev/null
-mkdir conftest
-cd conftest
-echo "int some_variable = 0;" > conftest.$ac_ext
-mkdir out
-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-# that will create temporary files in the current directory regardless of
-# the output directory.  Thus, making CWD read-only will cause this test
-# to fail, enabling locking or at least warning the user not to do parallel
-# builds.
-chmod -w .
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-compiler_c_o=no
-if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-  # The compiler can only warn and ignore the option if not recognized
-  # So say no if there are warnings
-  if test -s out/conftest.err; then
-    lt_cv_compiler_c_o=no
-  else
-    lt_cv_compiler_c_o=yes
-  fi
-else
-  # Append any errors to the config.log.
-  cat out/conftest.err 1>&AC_FD_CC
-  lt_cv_compiler_c_o=no
-fi
-CFLAGS="$save_CFLAGS"
-chmod u+w .
-$rm conftest* out/*
-rmdir out
-cd ..
-rmdir conftest
-$rm -r conftest 2>/dev/null
-])
-compiler_c_o=$lt_cv_compiler_c_o
-AC_MSG_RESULT([$compiler_c_o])
-
-if test x"$compiler_c_o" = x"yes"; then
-  # Check to see if we can write to a .lo
-  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
-  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
-  lt_cv_compiler_o_lo=no
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -c -o conftest.lo"
-  save_objext="$ac_objext"
-  ac_objext=lo
-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-    if test -s conftest.err; then
-      lt_cv_compiler_o_lo=no
-    else
-      lt_cv_compiler_o_lo=yes
-    fi
-  ])
-  ac_objext="$save_objext"
-  CFLAGS="$save_CFLAGS"
-  ])
-  compiler_o_lo=$lt_cv_compiler_o_lo
-  AC_MSG_RESULT([$compiler_o_lo])
-else
-  compiler_o_lo=no
-fi
 
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
 # Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
 hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING([if we can lock with hard links])
   hard_links=yes
-  $rm conftest*
+  $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   AC_MSG_RESULT([$hard_links])
   if test "$hard_links" = no; then
-    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
     need_locks=warn
   fi
 else
   need_locks=no
 fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
 
-if test "$GCC" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-  compiler_rtti_exceptions=no
-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-    if test -s conftest.err; then
-      compiler_rtti_exceptions=no
-    else
-      compiler_rtti_exceptions=yes
-    fi
-  ])
-  CFLAGS="$save_CFLAGS"
-  AC_MSG_RESULT([$compiler_rtti_exceptions])
-
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-fi
-
-# See if the linker supports building shared libraries.
-AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
-
-allow_undefined_flag=
-no_undefined_flag=
-need_lib_prefix=unknown
-need_version=unknown
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-archive_cmds=
-archive_expsym_cmds=
-old_archive_from_new_cmds=
-old_archive_from_expsyms_cmds=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-thread_safe_flag_spec=
-hardcode_into_libs=no
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-link_all_deplibs=unknown
-always_export_symbols=no
-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-# include_expsyms should be a list of space-separated symbols to be *always*
-# included in the symbol list
-include_expsyms=
-# exclude_expsyms can be an egrep regular expression of symbols to exclude
-# it will be wrapped by ` (' and `)$', so one must not match beginning or
-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-# as well as any symbol that contains `d'.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-# platforms (ab)use it in PIC code, but their linkers get confused if
-# the symbol is explicitly referenced.  Since portable code cannot
-# rely on this symbol name, it's probably fine to never include it in
-# preloaded symbol tables.
-extract_expsyms_cmds=
-
-case $host_os in
-cygwin* | mingw* | pw32*)
-  # 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++.
-  if test "$GCC" != yes; then
-    with_gnu_ld=no
-  fi
-  ;;
-openbsd*)
-  with_gnu_ld=no
-  ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # If archive_cmds runs LD, not CC, wlarc should be empty
-  wlarc='${wl}'
-
-  # See if GNU ld supports shared libraries.
-  case $host_os in
-  aix3* | aix4* | aix5*)
-    # On AIX, the GNU linker is very broken
-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-    ld_shlibs=no
-    cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-
-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-    # that the semantics of dynamic libraries on AmigaOS, at least up
-    # to version 4, is to share data among multiple programs linked
-    # with the same dynamic library.  Since this doesn't match the
-    # behavior of shared libraries on other platforms, we can use
-    # them.
-    ld_shlibs=no
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-
-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-      else $CC -o impgen impgen.c ; fi)~
-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-
-    # cygwin and mingw dlls have different entry points and sets of symbols
-    # to exclude.
-    # FIXME: what about values for MSVC?
-    dll_entry=__cygwin_dll_entry@12
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-    case $host_os in
-    mingw*)
-      # mingw values
-      dll_entry=_DllMainCRTStartup@12
-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-      ;;
-    esac
-
-    # mingw and cygwin differ, and it's simplest to just exclude the union
-    # of the two symbol sets.
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-
-    # recent cygwin and mingw systems supply a stub DllMain which the user
-    # can override, but on older systems we have to supply one (in ltdll.c)
-    if test "x$lt_cv_need_dllmain" = "xyes"; then
-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-    else
-      ltdll_obj=
-      ltdll_cmds=
-    fi
-
-    # Extract the symbol export list from an `--export-all' def file,
-    # then regenerate the def file from the symbol export list, so that
-    # the compiled dll only exports the symbol export list.
-    # Be careful not to strip the DATA tag left be newer dlltools.
-    export_symbols_cmds="$ltdll_cmds"'
-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-
-    # If the export-symbols file already is a .def file (1st line
-    # is EXPORTS), use it as is.
-    # If DATA tags from a recent dlltool are present, honour them!
-    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname-def;
-      else
-	echo EXPORTS > $output_objdir/$soname-def;
-	_lt_hint=1;
-	cat $export_symbols | while read symbol; do
-	 set dummy \$symbol;
-	 case \[$]# in
-	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-	 esac;
-	 _lt_hint=`expr 1 + \$_lt_hint`;
-	done;
-      fi~
-      '"$ltdll_cmds"'
-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-      wlarc=
-    else
-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    fi
-    ;;
-
-  solaris* | sysv5*)
-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-      ld_shlibs=no
-      cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    wlarc=
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
 
-  if test "$ld_shlibs" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    case $host_os in
-    cygwin* | mingw* | pw32*)
-      # dlltool doesn't understand --whole-archive et. al.
-      whole_archive_flag_spec=
-      ;;
-    *)
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-	whole_archive_flag_spec=
-      fi
-      ;;
-    esac
-  fi
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
 else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case $host_os in
-  aix3*)
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-    # Note: this linker hardcodes the directories in LIBPATH if there
-    # are no directories specified by -L.
-    hardcode_minus_L=yes
-    if test "$GCC" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
-    fi
-    ;;
-
-  aix4* | aix5*)
-    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.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # 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*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	  ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    hardcode_direct=yes
-    archive_cmds=''
-    hardcode_libdir_separator=':'
-    if test "$GCC" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  hardcode_direct=yes
-	else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	fi
-      esac
-
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	shared_flag='${wl}-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall can do strange things, so it is better to
-    # generate a list of symbols to export.
-    always_export_symbols=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag='-berok'
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-    else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag="-z nodefs"
-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='${wl}-berok'
-	# This is a bit strange, but is similar to how AIX traditionally builds
-	# it's shared libraries.
-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
-      fi
-    fi
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    # see comment about different semantics on the GNU ld section
-    ld_shlibs=no
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec=' '
-    allow_undefined_flag=unsupported
-    # Tell ltmain to make .lib files, not .a files.
-    libext=lib
-    # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-    # The linker will automatically build a .lib file if we build a DLL.
-    old_archive_from_new_cmds='true'
-    # FIXME: Should let the user specify the lib program.
-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-    fix_srcfile_path='`cygpath -w "$srcfile"`'
-    ;;
-
-  darwin* | rhapsody*)
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    # FIXME: Relying on posixy $() will cause problems for
-    #        cross-compilation, but unfortunately the echo tests do not
-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-    #	     `"' quotes if we put them in here... so don't!
-    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-    # We need to add '_' to the symbols in $export_symbols first
-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    whole_archive_flag_spec='-all_load $convenience'
-    ;;
-
-  freebsd1*)
-    ld_shlibs=no
-    ;;
-
-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-  # support.  Future versions do this automatically, but an explicit c++rt0.o
-  # does not break anything, and helps significantly (at the cost of a little
-  # extra space).
-  freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-  freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-  freebsd*)
-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    case $host_os in
-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6* | nonstopux*)
-    if test "$GCC" = yes; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    else
-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      hardcode_libdir_flag_spec='-rpath $libdir'
-    fi
-    hardcode_libdir_separator=:
-    link_all_deplibs=yes
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-    else
-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-    fi
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  newsos6)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_direct=yes
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-    else
-      case "$host_os" in
-      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_libdir_flag_spec='-R$libdir'
-        ;;
-      *)
-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-        ;;
-      esac
-    fi
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-    ;;
-
-  osf3*)
-    if test "$GCC" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-    if test "$GCC" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-      #Both c and cxx compiler support -rpath directly
-      hardcode_libdir_flag_spec='-rpath $libdir'
-    fi
-    hardcode_libdir_separator=:
-    ;;
-
-  sco3.2v5*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    runpath_var=LD_RUN_PATH
-    hardcode_runpath_var=yes
-    export_dynamic_flag_spec='${wl}-Bexport'
-    ;;
-
-  solaris*)
-    # gcc --version < 3.0 without binutils cannot create self contained
-    # shared libraries reliably, requiring libgcc.a to resolve some of
-    # the object symbols generated in some cases.  Libraries that use
-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-    # a copy of libgcc.a into every shared library to guarantee resolving
-    # such symbols causes other problems:  According to Tim Van Holder
-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-    # (to the application) exception stack for one thing.
-    no_undefined_flag=' -z defs'
-    if test "$GCC" = yes; then
-      case `$CC --version 2>/dev/null` in
-      [[12]].*)
-	cat <<EOF 1>&2
-
-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-*** create self contained shared libraries on Solaris systems, without
-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-*** -no-undefined support, which will at least allow you to build shared
-*** libraries.  However, you may find that when you link such libraries
-*** into an application without using GCC, you have to manually add
-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-*** upgrade to a newer version of GCC.  Another option is to rebuild your
-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-
-EOF
-        no_undefined_flag=
-	;;
-      esac
-    fi
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_shlibpath_var=no
-    case $host_os in
-    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-    esac
-    link_all_deplibs=yes
-    ;;
-
-  sunos4*)
-    if test "x$host_vendor" = xsequent; then
-      # Use $CC to link under sequent, because it throws in some extra .o
-      # files that make .init and .fini sections work.
-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-    else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-    fi
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4)
-    case $host_vendor in
-      sni)
-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-        hardcode_direct=yes # is this really true???
-        ;;
-      siemens)
-        ## LD is ld it makes a PLAMLIB
-        ## CC just makes a GrossModule.
-        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-        reload_cmds='$CC -r -o $output$reload_objs'
-        hardcode_direct=no
-        ;;
-      motorola)
-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-        ;;
-    esac
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    export_dynamic_flag_spec='-Bexport'
-    ;;
-
-  sysv5*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-    hardcode_libdir_flag_spec=
-    hardcode_shlibpath_var=no
-    runpath_var='LD_RUN_PATH'
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    fi
-    ;;
-
-  sysv4.2uw2*)
-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_direct=yes
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    hardcode_runpath_var=yes
-    runpath_var=LD_RUN_PATH
-    ;;
-
-  sysv5uw7* | unixware7*)
-    no_undefined_flag='${wl}-z ${wl}text'
-    if test "$GCC" = yes; then
-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-    else
-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-    fi
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    ;;
-  esac
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
 fi
-AC_MSG_RESULT([$ld_shlibs])
-test "$ld_shlibs" = no && can_build_shared=no
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
 
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
 # Check hardcoding attributes.
-AC_MSG_CHECKING([how to hardcode library paths into programs])
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; then
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$hardcode_shlibpath_var" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
     # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
+    _LT_TAGVAR(hardcode_action, $1)=relink
   else
     # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
+    _LT_TAGVAR(hardcode_action, $1)=immediate
   fi
 else
   # We cannot hardcode anything, or else we can only hardcode existing
   # directories.
-  hardcode_action=unsupported
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
 fi
-AC_MSG_RESULT([$hardcode_action])
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
 
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
 striplib=
 old_striplib=
 AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   AC_MSG_RESULT([yes])
 else
-  AC_MSG_RESULT([no])
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
 fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
 
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
 # PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=$[[A-Za-z]]:$,\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/$[[A-Za-z]]:$,\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -2789,26 +2688,31 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
-  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so$major'
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
-  version_type=linux
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
   if test "$host_cpu" = ia64; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
@@ -2818,90 +2722,174 @@
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[[01]] | aix4.[[01]].*)
-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	     echo ' yes '
-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	  :
-	else
-	  can_build_shared=no
-	fi
-	;;
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can
-    # not hardcode correct soname into executable. Probably we can
-    # add versioning support to collect2, so additional links can
-    # be useful in future.
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
     if test "$aix_use_runtimelinking" = yes; then
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
     else
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
       library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}.so$major'
+      soname_spec='${libname}${release}${shared_ext}$major'
     fi
     shlibpath_var=LIBPATH
   fi
-  hardcode_into_libs=yes
   ;;
 
 amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
   ;;
 
 beos*)
-  library_names_spec='${libname}.so'
+  library_names_spec='${libname}${shared_ext}'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
-  version_type=linux
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  export_dynamic_flag_spec=-rdynamic
   # the default ld.so.conf also contains /usr/contrib/lib and
   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
-  case $GCC,$host_os in
-  yes,cygwin*)
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog .libs/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    ;;
-  yes,mingw*)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
     ;;
-  yes,pw32*)
-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
+
   *)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2911,88 +2899,179 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
-freebsd1*)
-  dynamic_linker=no
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
-  *)
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
-  dynamic_linker="$host_os dld.sl"
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
   ;;
 
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
-    *)          version_type=irix ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
     ;;
   *)
     case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
     *) libsuff= shlibsuff= libmagic=never-match;;
     esac
     ;;
@@ -3001,40 +3080,49 @@
   shlibpath_overrides_runpath=no
   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
   ;;
 
 # No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-
-  # Find out which ABI we are using (multilib Linux x86_64 hack).
+  # find out which ABI we are using
   libsuff=
   case "$host_cpu" in
-  x86_64*|s390x*)
+  x86_64*|s390x*|powerpc64*)
     echo '[#]line __oline__ "configure"' > conftest.$ac_ext
     if AC_TRY_EVAL(ac_compile); then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -3045,24 +3133,36 @@
     fi
     rm -rf conftest*
     ;;
-  *)
-    ;;
   esac
+
   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
   ;;
 
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-    soname_spec='${libname}${release}.so$major'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -3071,65 +3171,80 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
 
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case "$host_os" in
-    openbsd2.[[89]] | openbsd2.[[89]].*)
-      shlibpath_overrides_runpath=no
-      ;;
-    *)
-      shlibpath_overrides_runpath=yes
-      ;;
-    esac
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
   else
     shlibpath_overrides_runpath=yes
   fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 os2*)
   libname_spec='$name'
+  shrext_cmds=".dll"
   need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
+  library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=LIBPATH
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
+  need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  hardcode_into_libs=yes
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
+rdos*)
+  dynamic_linker=no
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -3139,7 +3254,7 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3149,16 +3264,15 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -3173,29 +3287,53 @@
   esac
   ;;
 
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
-dgux*)
-  version_type=linux
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
   ;;
 
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-    soname_spec='$libname.so.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 *)
@@ -3205,801 +3343,88 @@
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
-# Report the final consequences.
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-AC_LIBTOOL_DLOPEN_SELF
-
-if test "$enable_shared" = yes && test "$GCC" = yes; then
-  case $archive_cmds in
-  *'~'*)
-    # FIXME: we may have to deal with multi-command sequences.
-    ;;
-  '$CC '*)
-    # Test whether the compiler implicitly links with -lc since on some
-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-    # to ld, don't add -lc before -lgcc.
-    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
-    [$rm conftest*
-    echo 'static int dummy;' > conftest.$ac_ext
-
-    if AC_TRY_EVAL(ac_compile); then
-      soname=conftest
-      lib=conftest
-      libobjs=conftest.$ac_objext
-      deplibs=
-      wl=$lt_cv_prog_cc_wl
-      compiler_flags=-v
-      linker_flags=-v
-      verstring=
-      output_objdir=.
-      libname=conftest
-      save_allow_undefined_flag=$allow_undefined_flag
-      allow_undefined_flag=
-      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-      then
-	lt_cv_archive_cmds_need_lc=no
-      else
-	lt_cv_archive_cmds_need_lc=yes
-      fi
-      allow_undefined_flag=$save_allow_undefined_flag
-    else
-      cat conftest.err 1>&5
-    fi])
-    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
-    ;;
-  esac
-fi
-need_lc=${lt_cv_archive_cmds_need_lc-yes}
-
-# The second clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  :
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  test -f Makefile && make "$ltmain"
-fi
-
-if test -f "$ltmain"; then
-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-  $rm -f "${ofile}T"
-
-  echo creating $ofile
-
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS SED \
-    AR AR_FLAGS CC LD LN_S NM SHELL \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-    library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-    old_striplib striplib file_magic_cmd export_symbols_cmds \
-    deplibs_check_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-    global_symbol_to_c_name_address \
-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-
-    case $var in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  cat <<__EOF__ > "${ofile}T"
-#! $SHELL
-
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="${SED} -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# The default C compiler.
-CC=$lt_CC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_pic_flag
-pic_mode=$pic_mode
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_compiler_c_o
-
-# Can we write directly to a .lo ?
-compiler_o_lo=$lt_compiler_o_lo
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_link_static_flag
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "${ofile}T"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 fi
-EOF
-    ;;
-  esac
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | os2*)
-    cat <<'EOF' >> "${ofile}T"
-      # This is a source program that is used to create dlls on Windows
-      # Don't remove nor modify the starting and closing comments
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-	# This is a source program that is used to create import libraries
-	# on Windows for dlls which lack them. Don't remove nor modify the
-	# starting and closing comments
-# /* impgen.c starts here */
-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-#
-#  This file is part of GNU libtool.
-#
-#  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#  */
-#
-# #include <stdio.h>		/* for printf() */
-# #include <unistd.h>		/* for open(), lseek(), read() */
-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-# #include <string.h>		/* for strdup() */
-#
-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-# #ifndef O_BINARY
-# #define O_BINARY 0
-# #endif
-#
-# static unsigned int
-# pe_get16 (fd, offset)
-#      int fd;
-#      int offset;
-# {
-#   unsigned char b[2];
-#   lseek (fd, offset, SEEK_SET);
-#   read (fd, b, 2);
-#   return b[0] + (b[1]<<8);
-# }
-#
-# static unsigned int
-# pe_get32 (fd, offset)
-#     int fd;
-#     int offset;
-# {
-#   unsigned char b[4];
-#   lseek (fd, offset, SEEK_SET);
-#   read (fd, b, 4);
-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-# }
-#
-# static unsigned int
-# pe_as32 (ptr)
-#      void *ptr;
-# {
-#   unsigned char *b = ptr;
-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-# }
-#
-# int
-# main (argc, argv)
-#     int argc;
-#     char *argv[];
-# {
-#     int dll;
-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-#     unsigned long name_rvas, nexp;
-#     unsigned char *expdata, *erva;
-#     char *filename, *dll_name;
-#
-#     filename = argv[1];
-#
-#     dll = open(filename, O_RDONLY|O_BINARY);
-#     if (dll < 1)
-# 	return 1;
-#
-#     dll_name = filename;
-#
-#     for (i=0; filename[i]; i++)
-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-# 	    dll_name = filename + i +1;
-#
-#     pe_header_offset = pe_get32 (dll, 0x3c);
-#     opthdr_ofs = pe_header_offset + 4 + 20;
-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-#
-#     if (num_entries < 1) /* no exports */
-# 	return 1;
-#
-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-#     secptr = (pe_header_offset + 4 + 20 +
-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-#
-#     expptr = 0;
-#     for (i = 0; i < nsections; i++)
-#     {
-# 	char sname[8];
-# 	unsigned long secptr1 = secptr + 40 * i;
-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-# 	lseek(dll, secptr1, SEEK_SET);
-# 	read(dll, sname, 8);
-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-# 	{
-# 	    expptr = fptr + (export_rva - vaddr);
-# 	    if (export_rva + export_size > vaddr + vsize)
-# 		export_size = vsize - (export_rva - vaddr);
-# 	    break;
-# 	}
-#     }
-#
-#     expdata = (unsigned char*)malloc(export_size);
-#     lseek (dll, expptr, SEEK_SET);
-#     read (dll, expdata, export_size);
-#     erva = expdata - export_rva;
-#
-#     nexp = pe_as32 (expdata+24);
-#     name_rvas = pe_as32 (expdata+32);
-#
-#     printf ("EXPORTS\n");
-#     for (i = 0; i<nexp; i++)
-#     {
-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-#     }
-#
-#     return 0;
-# }
-# /* impgen.c ends here */
-
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-
-  mv -f "${ofile}T" "$ofile" || \
-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-  chmod +x "$ofile"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 fi
 
-])# _LT_AC_LTCONFIG_HACK
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
 
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 [case $MAGIC_CMD in
-  /*)
+[[\\/*] |  ?:[\\/]*])
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
   for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$1; then
       lt_cv_path_MAGIC_CMD="$ac_dir/$1"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
+	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -4010,15 +3435,15 @@
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
 esac])
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
@@ -4027,36 +3452,52 @@
 else
   AC_MSG_RESULT(no)
 fi
-])
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
 
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
 
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
   else
     MAGIC_CMD=:
   fi
 fi
-])
+])# _LT_PATH_MAGIC
 
 
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_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
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4066,12 +3507,12 @@
   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%/%"`
+      # Canonicalize the pathname 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"
       ;;
@@ -4091,22 +3532,26 @@
 fi
 AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_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.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
@@ -4117,34 +3562,78 @@
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
 
-# AC_PROG_LD_GNU -
-AC_DEFUN([AC_PROG_LD_GNU],
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
-else
+  ;;
+*)
   lt_cv_prog_gnu_ld=no
-fi])
+  ;;
+esac])
 with_gnu_ld=$lt_cv_prog_gnu_ld
-])
+])# _LT_PATH_LD_GNU
+
 
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
 #   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
 reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
 
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -4156,12 +3645,12 @@
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
+# which responds to the $file_magic_cmd with a given extended regex.
 # If you have `file' or equivalent on your system and you're not sure
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4169,37 +3658,50 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin* | mingw* | pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[[012]])
-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4213,50 +3715,53 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*)
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
   fi
   ;;
 
@@ -4266,37 +3771,35 @@
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sco3.2v5*)
+rdos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
-sysv5uw[[78]]* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -4317,615 +3820,6659 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
-AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
       fi
-    fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  : ${lt_cv_path_NM=no}
 fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
 ])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $lib[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
   ;;
 esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]$$symcode$symcode*$[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
 ])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
 
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and LTDLINCL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and LTDLINCL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and LTDLINCL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  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++.
+    if test "$GCC" != yes; then
+      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
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	  *\ $GNU\ Binutils$\ 2.[[2-9]]*) ;;
+	  *\ $GNU\ Binutils$\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # 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.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    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.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# 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]].*|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
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    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
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
   else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      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.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # 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]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+	  _LT_TAGVAR(link_all_deplibs, $1)=no
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+ac_compile='$CC -c $GCJFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
+ac_link='$CC -o conftest$ac_exeext --main=conftest $GCJFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD'
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
 
+m4_ifndef([AC_PROG_SED], [
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
 #  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
+
+m4_defun([AC_PROG_SED],
 [AC_MSG_CHECKING([for a sed that does not truncate output])
 AC_CACHE_VAL(lt_cv_path_SED,
 [# Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
-as_executable_p="test -f"
 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_prog in sed gsed; do
+  for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
-
-  # Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=$TMPDIR/sed$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-   { (exit 1); exit 1; }
-}
-  _max=0
-  _count=0
-  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-  # along with /bin/sed that truncates output.
-  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-    test ! -f ${_sed} && break
-    cat /dev/null > "$tmp/sed.in"
-    _count=0
-    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-    # Check for GNU sed and select it if it is found.
-    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-      lt_cv_path_SED=${_sed}
-      break
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
     fi
-    while true; do
-      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-      mv "$tmp/sed.tmp" "$tmp/sed.in"
-      cp "$tmp/sed.in" "$tmp/sed.nl"
-      echo >>"$tmp/sed.nl"
-      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-      # 40000 chars as input seems more than enough
-      test $_count -gt 10 && break
-      _count=`expr $_count + 1`
-      if test $_count -gt $_max; then
-        _max=$_count
-        lt_cv_path_SED=$_sed
-      fi
-    done
   done
-  rm -rf "$tmp"
+done
 ])
-if test "X$SED" != "X"; then
-  lt_cv_path_SED=$SED
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
 else
-  SED=$lt_cv_path_SED
+  lt_unset=false
 fi
-AC_MSG_RESULT([$SED])
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^$[	 ]$], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
 ])
 
 
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
 
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# 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 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
+
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# 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 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
+
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# 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.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
+
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# 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 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
 
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# Copyright (C) 2002-2013 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.
+
+# 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.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.14'
+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.14.1], [],
+      [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 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.14.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+# 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.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
 #
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
 #
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
 
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
+# 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.
 
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+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='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
 
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
+# Copyright (C) 1999-2013 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.
 
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# 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,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
+
+# 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,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" 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=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[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
+
+  am_cv_$1_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
+  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
+    # 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 10 /bin/sh.
+      echo '/* dummy */' > 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_$1_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
+
+  cd ..
+  rm -rf conftest.dir
 else
-  AC_MSG_RESULT(no)
+  am_cv_$1_dependencies_compiler_type=none
 fi
-AC_SUBST($1)dnl
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 ])
 
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
 
-    gt_cv_have_gettext=no
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
 
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
 
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+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])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
 
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-          [return (int) dgettext ("","")],
-	  gt_cv_func_dgettext_libc=yes,
-          gt_cv_func_dgettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, dgettext,
-		          gt_cv_func_dgettext_libintl=yes)])
+# Copyright (C) 1999-2013 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.
 
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-          AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)
-        fi
 
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf 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"`
+    # 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'`; 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
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
 
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-	  AC_CHECK_FUNCS(dcgettext)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [CATOBJEXT=.mo
-             DATADIRNAME=lib])
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
 
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
+# Do all the work for Automake.                             -*- Autoconf -*-
 
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
+# Copyright (C) 1996-2013 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.
 
-    # We need to process the po/ directory.
-    POSUB=po
+# 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.
 
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
 
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# 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.65])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
+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
 
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
 
-# AM_GLIB_GNU_GETTEXT
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ 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], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [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
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+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([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro 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
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+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.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# 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
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2013 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.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+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])])
+
+# Copyright (C) 2003-2013 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.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996-2013 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.
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 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.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[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.
+AC_MSG_CHECKING([for style of include used by $am_make])
+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
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 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.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+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 --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 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.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 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.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_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],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2013 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.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 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.
+
+# AM_RUN_LOG(COMMAND)
 # -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
 
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
+# Copyright (C) 1996-2013 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.
 
-   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 is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# 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
 
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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`
      fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
+	# If neither matched, then we have a broken ls.  This can happen
+	# 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".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
 else
-  localedir=`eval echo "${datadir}/locale"`
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
 fi
-prefix="$glib_save_prefix"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
 ])
 
+# Copyright (C) 2009-2013 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.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
 dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 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.
+
+# 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
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# 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.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2013 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.
+
+# _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($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2013 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.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_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}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR

grip-3.9.0.tar.gz/compile Added

@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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, 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# 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:

grip-3.4.3.tar.gz/config.h.in -> grip-3.9.0.tar.gz/config.h.in Changed

grip-3.4.3.tar.gz/configure -> grip-3.9.0.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for grip 3.4.3.
+# Generated by GNU Autoconf 2.69 for grip 3.9.0.
 #
 # Report bugs to <https://sourceforge.net/projects/grip>.
 #
@@ -198,7 +198,15 @@
   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"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -556,165 +564,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
-  PATH_SEPARATOR=$lt_cv_sys_path_separator
-fi
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -739,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='grip'
 PACKAGE_TARNAME='grip'
-PACKAGE_VERSION='3.4.3'
-PACKAGE_STRING='grip 3.4.3'
+PACKAGE_VERSION='3.9.0'
+PACKAGE_STRING='grip 3.9.0'
 PACKAGE_BUGREPORT='https://sourceforge.net/projects/grip'
 PACKAGE_URL=''
 
@@ -781,7 +632,9 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
 LIBOBJS
 ID3_LIBS
 CDPAR_LIBS
@@ -798,6 +651,7 @@
 CATALOGS
 XGETTEXT
 GMSGFMT
+MSGFMT_OPTS
 MSGFMT
 USE_NLS
 GETTEXT_PACKAGE
@@ -805,11 +659,28 @@
 TERMINAL_WIDGET_CFLAGS
 GNOME_LIBS
 GNOME_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
-LIBTOOL
+CXXCPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
 RANLIB
-ECHO
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
 LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
 host_os
 host_vendor
 host_cpu
@@ -818,14 +689,20 @@
 build_vendor
 build_cpu
 build
+LIBTOOL
 EGREP
 GREP
 CPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
 CXXDEPMODE
 ac_ct_CXX
 CXXFLAGS
 CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -842,12 +719,21 @@
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
 SET_MAKE
 AWK
+mkdir_p
+MKDIR_P
 INSTALL_STRIP_PROGRAM
 STRIP
 install_sh
-AMTAR
 MAKEINFO
 AUTOHEADER
 AUTOMAKE
@@ -855,6 +741,8 @@
 ACLOCAL
 VERSION
 PACKAGE
+CYGPATH_W
+am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -899,18 +787,21 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 enable_shared_cdpar
 enable_cdpar
 enable_id3
 enable_shared_id3
+enable_werror
 enable_dependency_tracking
 enable_shared
 enable_static
+with_pic
 enable_fast_install
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
-with_pic
 '
       ac_precious_vars='build_alias
 host_alias
@@ -923,7 +814,15 @@
 CXX
 CXXFLAGS
 CCC
-CPP'
+CPP
+CXXCPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+GNOME_CFLAGS
+GNOME_LIBS
+TERMINAL_WIDGET_CFLAGS
+TERMINAL_WIDGET_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1464,7 +1363,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures grip 3.4.3 to adapt to many kinds of systems.
+\`configure' configures grip 3.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1534,7 +1433,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of grip 3.4.3:";;
+     short | recursive ) echo "Configuration of grip 3.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1542,24 +1441,34 @@
   --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]
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
   --disable-shared-cdpar  use static cdparanoia lib
   --disable-cdpar         do not compile with cdparanoia
   --disable-id3           do not compile with id3lib
   --disable-shared-id3    use static id3lib
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors
-  --enable-shared=PKGS  build shared libraries default=yes
-  --enable-static=PKGS  build static libraries default=yes
-  --enable-fast-install=PKGS  optimize for fast installation default=yes
+  --disable-werror        do not treat warnings as errors
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-pic              try to use only PIC/non-PIC objects default=use both
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
 
 Some influential environment variables:
   CC          C compiler command
@@ -1572,6 +1481,19 @@
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
+  CXXCPP      C++ preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  GNOME_CFLAGS
+              C compiler flags for GNOME, overriding pkg-config
+  GNOME_LIBS  linker flags for GNOME, overriding pkg-config
+  TERMINAL_WIDGET_CFLAGS
+              C compiler flags for TERMINAL_WIDGET, overriding pkg-config
+  TERMINAL_WIDGET_LIBS
+              linker flags for TERMINAL_WIDGET, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1639,7 +1561,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-grip configure 3.4.3
+grip configure 3.9.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2042,11 +1964,94 @@
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_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_cxx_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_cxx_try_link
 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 grip $as_me 3.4.3, which was
+It was created by grip $as_me 3.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2395,7 +2400,8 @@
 
 
 
-am__api_version="1.6"
+am__api_version='1.14'
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -2520,32 +2526,50 @@
 
 { $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
-# Do `set' in a subshell so we don't clobber the current shell's
+# 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`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # 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".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# 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".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2557,6 +2581,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2567,20 +2601,177 @@
 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 "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $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;}
+  { $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 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
+
+# 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 "$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_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
+IFS=$as_save_IFS
+
+fi
+fi
+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
+  { $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
+{ $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; }
+
 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.
@@ -2654,15 +2845,77 @@
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
- # test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+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
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
 fi
 
+
 # Define the identity of the package.
- PACKAGE=grip
- VERSION=3.4.3
+ PACKAGE='grip'
+ VERSION='3.9.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2690,115 +2943,70 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# 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}'
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
-# 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 "$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_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
-IFS=$as_save_IFS
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
 
-fi
-fi
-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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
-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
-{ $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="\${SHELL} \$(install_sh) -c -s"
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
 
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -2812,9 +3020,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -2825,13 +3031,9 @@
   MAINT=$MAINTAINER_MODE_TRUE
 
 
-# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
 ac_config_headers="$ac_config_headers config.h"
 
 
-
-
 # Check whether --enable-shared_cdpar was given.
 if test "${enable_shared_cdpar+set}" = set; then :
   enableval=$enable_shared_cdpar;
@@ -2864,6 +3066,17 @@
 fi
 
 
+warning_flags="$CFLAGS -Wall"
+werror_flags="$warning_flags -Werror"
+
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror; CFLAGS=$warning_flags
+else
+  CFLAGS=$werror_flags
+fi
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3652,24 +3865,75 @@
 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 .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
 fi
-rmdir .deps 2>/dev/null
+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
 
+DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
-	@echo done
+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
@@ -3679,24 +3943,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 | fgrep -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
 
 
@@ -3712,10 +3976,9 @@
 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
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3725,7 +3988,6 @@
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -3737,49 +3999,98 @@
   # 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'.
+  # 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
 
   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
+
   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.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > 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 10 /bin/sh.
+      echo '/* dummy */' > 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
+      # 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
-    # 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=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       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
-      am_cv_CC_dependencies_compiler_type=$depmode
-      break
+      # 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
 
@@ -3794,6 +4105,16 @@
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
+ 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
+
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4063,49 +4384,98 @@
   # 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'.
+  # 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
 
   am_cv_CXX_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
+
   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.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > 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 10 /bin/sh.
+      echo '/* dummy */' > 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
+      # 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
-    # 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=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       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
-      am_cv_CXX_dependencies_compiler_type=$depmode
-      break
+      # 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_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -4120,16 +4490,24 @@
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
 
 
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
-$as_echo_n "checking for strerror in -lcposix... " >&6; }
-if ${ac_cv_lib_cposix_strerror+:} false; then :
+{ $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_check_lib_save_LIBS=$LIBS
-LIBS="-lcposix  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4148,22 +4526,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cposix_strerror=yes
-else
-  ac_cv_lib_cposix_strerror=no
+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 conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
-$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
-if test "x$ac_cv_lib_cposix_strerror" = xyes; then :
-  LIBS="$LIBS -lcposix"
+    conftest$ac_exeext
+  if ${ac_cv_search_strerror+:} false; then :
+  break
 fi
+done
+if ${ac_cv_search_strerror+:} false; then :
 
+else
+  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
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4602,71 +4995,30 @@
 done
 
 
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
-else
-  enable_shared=yes
-fi
 
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
 
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -4739,16 +5091,242 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
-  PATH_SEPARATOR=$lt_cv_sys_path_separator
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$["`$\\]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$["`\\]$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_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
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_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 '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "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_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_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
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_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 fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_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 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "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_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_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
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 # Check whether --with-gnu-ld was given.
@@ -4761,8 +5339,8 @@
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4772,12 +5350,12 @@
   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%/%"`
+      # Canonicalize the pathname 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"
       ;;
@@ -4801,22 +5379,26 @@
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_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.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -4836,32 +5418,30 @@
 if ${lt_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.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
-else
+  ;;
+*)
   lt_cv_prog_gnu_ld=no
-fi
+  ;;
+esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4869,120 +5449,198 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
       fi
-    fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  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_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$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
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-NM="$lt_cv_path_NM"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
-$as_echo "$NM" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${lt_cv_path_SED+:} false; then :
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+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_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_executable_p="test -f"
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-      fi
-    done
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$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
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
 done
 
-  # Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  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
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
 
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=$TMPDIR/sed$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-   { (exit 1); exit 1; }
-}
-  _max=0
-  _count=0
-  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-  # along with /bin/sed that truncates output.
-  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-    test ! -f ${_sed} && break
-    cat /dev/null > "$tmp/sed.in"
-    _count=0
-    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-    # Check for GNU sed and select it if it is found.
-    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-      lt_cv_path_SED=${_sed}
-      break
-    fi
-    while true; do
-      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-      mv "$tmp/sed.tmp" "$tmp/sed.in"
-      cp "$tmp/sed.in" "$tmp/sed.nl"
-      echo >>"$tmp/sed.nl"
-      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-      # 40000 chars as input seems more than enough
-      test $_count -gt 10 && break
-      _count=`expr $_count + 1`
-      if test $_count -gt $_max; then
-        _max=$_count
-        lt_cv_path_SED=$_sed
-      fi
-    done
-  done
-  rm -rf "$tmp"
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
 fi
+test -z "$NM" && NM=nm
+
+
+
 
-if test "X$SED" != "X"; then
-  lt_cv_path_SED=$SED
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  SED=$lt_cv_path_SED
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-$as_echo "$SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
@@ -4995,8 +5653,425 @@
 $as_echo "no, using $LN_S" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5
-$as_echo_n "checking how to recognise dependent libraries... " >&6; }
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump"
+    $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
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; 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_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump"
+    $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_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  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
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if ${lt_cv_deplibs_check_method+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5010,12 +6085,12 @@
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
+# which responds to the $file_magic_cmd with a given extended regex.
 # If you have `file' or equivalent on your system and you're not sure
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5023,37 +6098,50 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin* | mingw* | pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -5067,50 +6155,53 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*)
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
   fi
   ;;
 
@@ -5120,37 +6211,35 @@
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sco3.2v5*)
+rdos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
-sysv5uw[78]* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@@ -5171,15 +6260,611 @@
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool"
+    $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
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; 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_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_DLLTOOL="dlltool"
+    $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_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  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
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  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_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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_AR="$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
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+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_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="$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
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  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
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+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 "$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_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
+IFS=$as_save_IFS
+
+fi
+fi
+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
+  { $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
+{ $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
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $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
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+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
+{ $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_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $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_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  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
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -5187,9 +6872,33 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output" >&5
-$as_echo_n "checking command to parse $NM output... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if ${lt_cv_sys_global_symbol_pipe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5203,26 +6912,18 @@
 # Regexp to match symbols that can be accessed directly from C.
 sympat='$[_A-Za-z][_A-Za-z0-9]*$'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
 # Define system-specific variables.
 case $host_os in
 aix*)
   symcode='[BCDT]'
   ;;
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   symcode='[ABCDGISTW]'
   ;;
-hpux*) # Its linker distinguishes data from code symbols
-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern char \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
   ;;
 irix* | nonstopux*)
   symcode='[BCDEGRST]'
@@ -5230,47 +6931,91 @@
 osf*)
   symcode='[BCDEGQRST]'
   ;;
-solaris* | sysv5*)
-  symcode='[BDT]'
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
   ;;
 sysv4)
   symcode='[DFNSTU]'
   ;;
 esac
 
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[^ ]*$[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $lib[^ ]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"lib\2\", (void *) \&\2},/p'"
+
 # Handle CRLF in mingw tool chain
 opt_cr=
-case $host_os in
+case $build_os in
 mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
   ;;
 esac
 
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTW]'
-fi
-
-# Try without a prefix undercore, then with it.
+# Try without a prefix underscore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]$$symcode$symcode*$[ 	][ 	]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]$$symcode$symcode*$[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
+
   rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
+  cat > conftest.$ac_ext <<_LT_EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
 char nm_test_var;
-void nm_test_func(){}
+void nm_test_func(void);
+void nm_test_func(void){}
 #ifdef __cplusplus
 }
 #endif
 int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
+_LT_EOF
 
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -5279,8 +7024,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -5292,57 +7037,71 @@
       fi
 
       # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-EOF
+_LT_EOF
 	  # Now generate the symbol file.
-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
+	  cat <<_LT_EOF >> conftest.$ac_ext
 
-/* The mapping between symbol names and symbols. */
-const struct {
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
   const char *name;
-  lt_ptr address;
+  void       *address;
 }
-lt_preloaded_symbols[] =
+lt__PROGRAM__LTX_preloaded_symbols[] =
 {
-EOF
-	  sed "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr) 0}
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
 };
 
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif
-EOF
+_LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  save_LIBS="$LIBS"
-	  save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$save_LIBS"
-	  CFLAGS="$save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -5356,7 +7115,7 @@
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -5368,16 +7127,10 @@
 
 fi
 
-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-  global_symbol_to_c_name_address=
-else
-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+  lt_cv_sys_global_symbol_to_cdecl=
 fi
-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-then
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
@@ -5385,172 +7138,596 @@
 $as_echo "ok" >&6; }
 fi
 
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
 fi
 
-done
 
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  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
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
   ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
   ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
+esac
 
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
+need_locks="$enable_libtool_lock"
 
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; 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_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; 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_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_MANIFEST_TOOL="mt"
+    $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_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  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
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
 
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
 
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; 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_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil"
+    $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_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
   else
-    MAGIC_CMD=:
+    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
+    DSYMUTIL=$ac_ct_DSYMUTIL
   fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
 fi
 
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit"
+    $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
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; 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_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit"
+    $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_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  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
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
 
-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
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; 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_RANLIB+:} false; then :
+if ${ac_cv_prog_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5559,7 +7736,7 @@
   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_RANLIB="${ac_tool_prefix}ranlib"
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5569,10 +7746,10 @@
 
 fi
 fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -5580,17 +7757,17 @@
 
 
 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
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; 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_RANLIB+:} false; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5599,7 +7776,7 @@
   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_RANLIB="ranlib"
+    ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5609,17 +7786,17 @@
 
 fi
 fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -5627,22 +7804,22 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    RANLIB=$ac_ct_RANLIB
+    LIPO=$ac_ct_LIPO
   fi
 else
-  RANLIB="$ac_cv_prog_RANLIB"
+  LIPO="$ac_cv_prog_LIPO"
 fi
 
-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
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; 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 :
+if ${ac_cv_prog_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5651,7 +7828,7 @@
   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_STRIP="${ac_tool_prefix}strip"
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5661,10 +7838,10 @@
 
 fi
 fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -5672,17 +7849,17 @@
 
 
 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
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; 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 :
+if ${ac_cv_prog_ac_ct_OTOOL+:} 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_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5691,7 +7868,7 @@
   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"
+    ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5701,17 +7878,17 @@
 
 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; }
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&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=":"
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -5719,66 +7896,176 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    STRIP=$ac_ct_STRIP
+    OTOOL=$ac_ct_OTOOL
   fi
 else
-  STRIP="$ac_cv_prog_STRIP"
+  OTOOL="$ac_cv_prog_OTOOL"
 fi
 
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # 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_OTOOL64="${ac_tool_prefix}otool64"
+    $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
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-enable_dlopen=no
-enable_win32_dll=no
 
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
 fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; 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_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_OTOOL64="otool64"
+    $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
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 5744 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  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
+    OTOOL64=$ac_ct_OTOOL64
   fi
-  rm -rf conftest*
-  ;;
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&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
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5790,86 +8077,335 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
+  lt_cv_ld_exported_symbols_list=yes
 else
-  lt_cv_cc_needs_belf=no
+  lt_cv_ld_exported_symbols_list=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext 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
+	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'
 
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g'
 
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Constants:
-rm="rm -f"
 
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-need_locks="$enable_libtool_lock"
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
 
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
 
-if test x"$host" != x"$build"; then
-  ac_tool_prefix=${host_alias}-
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
 else
-  ac_tool_prefix=
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
 
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case $host_os in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
-esac
 
 case $host_os in
 aix3*)
@@ -5883,418 +8419,845 @@
   ;;
 esac
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
+# Global variables:
+ofile=libtool
+can_build_shared=yes
 
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
 fi
-rmdir .libs 2>/dev/null
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $objdir" >&5
-$as_echo "$objdir" >&6; }
 
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  pic_mode=default
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
 fi
 
-test -z "$pic_mode" && pic_mode=default
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-# in isolation, and that seeing it set (from the cache) indicates that
-# the associated values are set (in the cache) correctly too.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_cc_pic+:} false; then :
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+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
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-   lt_cv_prog_cc_pic=
-  lt_cv_prog_cc_shlib=
-  lt_cv_prog_cc_wl=
-  lt_cv_prog_cc_static=
-  lt_cv_prog_cc_no_builtin=
-  lt_cv_prog_cc_can_build_shared=$can_build_shared
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
 
   if test "$GCC" = yes; then
-    lt_cv_prog_cc_wl='-Wl,'
-    lt_cv_prog_cc_static='-static'
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
 
     case $host_os in
-    aix*)
-      # Below there is a dirty hack to force normal static linking with -ldl
-      # The problem is because libdl dynamically linked with both libc and
-      # libC (AIX C++ library), which obviously doesn't included in libraries
-      # list by gcc. This cause undefined symbols with -static flags.
-      # This hack allows C programs to be linked with "-static -ldl", but
-      # not sure about C++ programs.
-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
       ;;
+
     amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
+
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      lt_cv_prog_cc_pic='-fno-common'
+      lt_prog_compiler_pic='-fno-common'
       ;;
-    cygwin* | mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
       ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
     sysv4*MP*)
       if test -d /usr/nec; then
-	 lt_cv_prog_cc_pic=-Kconform_pic
+	lt_prog_compiler_pic=-Kconform_pic
       fi
       ;;
+
     *)
-      lt_cv_prog_cc_pic='-fPIC'
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
-    # PORTME Check for PIC flags for the system compiler.
+    # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
-    aix3* | aix4* | aix5*)
-      lt_cv_prog_cc_wl='-Wl,'
-      # All AIX code is PIC.
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
       if test "$host_cpu" = ia64; then
 	# AIX 5 now supports IA64 processor
-	lt_cv_prog_cc_static='-Bstatic'
+	lt_prog_compiler_static='-Bstatic'
       else
-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
 
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
     hpux9* | hpux10* | hpux11*)
-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-      lt_cv_prog_cc_wl='-Wl,'
-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-      lt_cv_prog_cc_pic='+Z'
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
-      lt_cv_prog_cc_wl='-Wl,'
-      lt_cv_prog_cc_static='-non_shared'
+      lt_prog_compiler_wl='-Wl,'
       # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
       ;;
 
-    cygwin* | mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
       ;;
 
     newsos6)
-      lt_cv_prog_cc_pic='-KPIC'
-      lt_cv_prog_cc_static='-Bstatic'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
       ;;
 
     osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
       # All OSF/1 code is PIC.
-      lt_cv_prog_cc_wl='-Wl,'
-      lt_cv_prog_cc_static='-non_shared'
+      lt_prog_compiler_static='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_cv_prog_cc_pic='-Kpic'
-      lt_cv_prog_cc_static='-dn'
-      lt_cv_prog_cc_shlib='-belf'
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
       ;;
 
     solaris*)
-      lt_cv_prog_cc_pic='-KPIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      lt_cv_prog_cc_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
       ;;
 
     sunos4*)
-      lt_cv_prog_cc_pic='-PIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      lt_cv_prog_cc_wl='-Qoption ld '
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_cv_prog_cc_pic='-KPIC'
-      lt_cv_prog_cc_static='-Bstatic'
-      lt_cv_prog_cc_wl='-Wl,'
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
 
-    uts4*)
-      lt_cv_prog_cc_pic='-pic'
-      lt_cv_prog_cc_static='-Bstatic'
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec ;then
-	lt_cv_prog_cc_pic='-Kconform_pic'
-	lt_cv_prog_cc_static='-Bstatic'
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
     *)
-      lt_cv_prog_cc_can_build_shared=no
+      lt_prog_compiler_can_build_shared=no
       ;;
     esac
   fi
 
-fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
 
-if test -z "$lt_cv_prog_cc_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic" >&5
-$as_echo "$lt_cv_prog_cc_pic" >&6; }
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
-  # Check to make sure the pic_flag actually works.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... " >&6; }
-  if ${lt_cv_prog_cc_pic_works+:} false; then :
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-      save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-        case $host_os in
-      hpux9* | hpux10* | hpux11*)
-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-	# they create non-PIC objects.  So, if there were any warnings, we
-	# assume that PIC is not supported.
-	if test -s conftest.err; then
-	  lt_cv_prog_cc_pic_works=no
-	else
-	  lt_cv_prog_cc_pic_works=yes
-	fi
-	;;
-      *)
-	lt_cv_prog_cc_pic_works=yes
-	;;
-      esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
 else
-        lt_cv_prog_cc_pic_works=no
-
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    CFLAGS="$save_CFLAGS"
 
 fi
 
 
-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-    lt_cv_prog_cc_pic=
-    lt_cv_prog_cc_can_build_shared=no
-  else
-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-  fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic_works" >&5
-$as_echo "$lt_cv_prog_cc_pic_works" >&6; }
-fi
 
-# Check for any special shared library compilation flags.
-if test -n "$lt_cv_prog_cc_shlib"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
-$as_echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-$as_echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-$as_echo_n "checking if $compiler static flag $lt_cv_prog_cc_static works... " >&6; }
-if ${lt_cv_prog_cc_static_works+:} false; then :
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-    lt_cv_prog_cc_static_works=no
-  save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_prog_cc_static_works=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS="$save_LDFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
 fi
 
 
-# Belt *and* braces to stop my trousers falling down:
-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_static_works" >&5
-$as_echo "$lt_cv_prog_cc_static_works" >&6; }
 
-pic_flag="$lt_cv_prog_cc_pic"
-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-wl="$lt_cv_prog_cc_wl"
-link_static_flag="$lt_cv_prog_cc_static"
-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
 
-# Check to see if options -o and -c are simultaneously supported by compiler
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_compiler_c_o+:} false; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-
-$rm -r conftest 2>/dev/null
-mkdir conftest
-cd conftest
-echo "int some_variable = 0;" > conftest.$ac_ext
-mkdir out
-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-# that will create temporary files in the current directory regardless of
-# the output directory.  Thus, making CWD read-only will cause this test
-# to fail, enabling locking or at least warning the user not to do parallel
-# builds.
-chmod -w .
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-compiler_c_o=no
-if { (eval echo configure:6216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-  # The compiler can only warn and ignore the option if not recognized
-  # So say no if there are warnings
-  if test -s out/conftest.err; then
-    lt_cv_compiler_c_o=no
-  else
-    lt_cv_compiler_c_o=yes
-  fi
-else
-  # Append any errors to the config.log.
-  cat out/conftest.err 1>&5
-  lt_cv_compiler_c_o=no
-fi
-CFLAGS="$save_CFLAGS"
-chmod u+w .
-$rm conftest* out/*
-rmdir out
-cd ..
-rmdir conftest
-$rm -r conftest 2>/dev/null
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
-compiler_c_o=$lt_cv_compiler_c_o
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_c_o" >&5
-$as_echo "$compiler_c_o" >&6; }
-
-if test x"$compiler_c_o" = x"yes"; then
-  # Check to see if we can write to a .lo
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.lo" >&5
-$as_echo_n "checking if $compiler supports -c -o file.lo... " >&6; }
-  if ${lt_cv_compiler_o_lo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-  lt_cv_compiler_o_lo=no
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -c -o conftest.lo"
-  save_objext="$ac_objext"
-  ac_objext=lo
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
-int some_variable = 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-      # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-    if test -s conftest.err; then
-      lt_cv_compiler_o_lo=no
-    else
-      lt_cv_compiler_o_lo=yes
-    fi
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_objext="$save_objext"
-  CFLAGS="$save_CFLAGS"
 
-fi
 
-  compiler_o_lo=$lt_cv_compiler_o_lo
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_o_lo" >&5
-$as_echo "$compiler_o_lo" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  compiler_o_lo=no
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
 
-# Check to see if we can do hard links to lock some files if needed
 hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
-  $rm conftest*
+  $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
@@ -6310,242 +9273,305 @@
   need_locks=no
 fi
 
-if test "$GCC" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-  compiler_rtti_exceptions=no
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
-int some_variable = 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-      # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-    if test -s conftest.err; then
-      compiler_rtti_exceptions=no
-    else
-      compiler_rtti_exceptions=yes
-    fi
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$save_CFLAGS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_rtti_exceptions" >&5
-$as_echo "$compiler_rtti_exceptions" >&6; }
 
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-fi
 
-# See if the linker supports building shared libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the linker ($LD) supports shared libraries... " >&6; }
 
-allow_undefined_flag=
-no_undefined_flag=
-need_lib_prefix=unknown
-need_version=unknown
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-archive_cmds=
-archive_expsym_cmds=
-old_archive_from_new_cmds=
-old_archive_from_expsyms_cmds=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-thread_safe_flag_spec=
-hardcode_into_libs=no
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-link_all_deplibs=unknown
-always_export_symbols=no
-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-# include_expsyms should be a list of space-separated symbols to be *always*
-# included in the symbol list
-include_expsyms=
-# exclude_expsyms can be an egrep regular expression of symbols to exclude
-# it will be wrapped by ` (' and `)$', so one must not match beginning or
-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-# as well as any symbol that contains `d'.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-# platforms (ab)use it in PIC code, but their linkers get confused if
-# the symbol is explicitly referenced.  Since portable code cannot
-# rely on this symbol name, it's probably fine to never include it in
-# preloaded symbol tables.
-extract_expsyms_cmds=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-case $host_os in
-cygwin* | mingw* | pw32*)
-  # 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++.
-  if test "$GCC" != yes; then
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  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++.
+    if test "$GCC" != yes; then
+      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
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	  *\ $GNU\ Binutils$\ 2.[2-9]*) ;;
+	  *\ $GNU\ Binutils$\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
   fi
-  ;;
-openbsd*)
-  with_gnu_ld=no
-  ;;
-esac
 
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # If archive_cmds runs LD, not CC, wlarc should be empty
-  wlarc='${wl}'
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # 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.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
 
-  # See if GNU ld supports shared libraries.
-  case $host_os in
-  aix3* | aix4* | aix5*)
-    # On AIX, the GNU linker is very broken
-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-    ld_shlibs=no
-    cat <<EOF 1>&2
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
-EOF
-    ;;
+_LT_EOF
+      fi
+      ;;
 
-  amigaos*)
-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-
-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-    # that the semantics of dynamic libraries on AmigaOS, at least up
-    # to version 4, is to share data among multiple programs linked
-    # with the same dynamic library.  Since this doesn't match the
-    # behavior of shared libraries on other platforms, we can use
-    # them.
-    ld_shlibs=no
-    ;;
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
 
-  beos*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
-  cygwin* | mingw* | pw32*)
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-
-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-      else $CC -o impgen impgen.c ; fi)~
-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-
-    # cygwin and mingw dlls have different entry points and sets of symbols
-    # to exclude.
-    # FIXME: what about values for MSVC?
-    dll_entry=__cygwin_dll_entry@12
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-    case $host_os in
-    mingw*)
-      # mingw values
-      dll_entry=_DllMainCRTStartup@12
-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
       ;;
-    esac
 
-    # mingw and cygwin differ, and it's simplest to just exclude the union
-    # of the two symbol sets.
-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-
-    # recent cygwin and mingw systems supply a stub DllMain which the user
-    # can override, but on older systems we have to supply one (in ltdll.c)
-    if test "x$lt_cv_need_dllmain" = "xyes"; then
-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-    else
-      ltdll_obj=
-      ltdll_cmds=
-    fi
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
 
-    # Extract the symbol export list from an `--export-all' def file,
-    # then regenerate the def file from the symbol export list, so that
-    # the compiled dll only exports the symbol export list.
-    # Be careful not to strip the DATA tag left be newer dlltools.
-    export_symbols_cmds="$ltdll_cmds"'
-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-
-    # If the export-symbols file already is a .def file (1st line
-    # is EXPORTS), use it as is.
-    # If DATA tags from a recent dlltool are present, honour them!
-    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname-def;
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
       else
-	echo EXPORTS > $output_objdir/$soname-def;
-	_lt_hint=1;
-	cat $export_symbols | while read symbol; do
-	 set dummy \$symbol;
-	 case \$# in
-	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
-	 esac;
-	 _lt_hint=`expr 1 + \$_lt_hint`;
-	done;
-      fi~
-      '"$ltdll_cmds"'
-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-      wlarc=
-    else
-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    fi
-    ;;
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
 
-  solaris* | sysv5*)
-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-      ld_shlibs=no
-      cat <<EOF 1>&2
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
 *** create shared libraries on Solaris systems.  Therefore, libtool
@@ -6554,114 +9580,146 @@
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
-EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    wlarc=
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
 
-  *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-  if test "$ld_shlibs" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    case $host_os in
-    cygwin* | mingw* | pw32*)
-      # dlltool doesn't understand --whole-archive et. al.
-      whole_archive_flag_spec=
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
       ;;
+
     *)
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
-	whole_archive_flag_spec=
+	ld_shlibs=no
       fi
       ;;
     esac
-  fi
-else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case $host_os in
-  aix3*)
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-    # Note: this linker hardcodes the directories in LIBPATH if there
-    # are no directories specified by -L.
-    hardcode_minus_L=yes
-    if test "$GCC" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
     fi
-    ;;
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
 
-  aix4* | aix5*)
-    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.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
+    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.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
 
-      # 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*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
+	# 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].*|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
-	done
-      esac
+	esac
 
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
 
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    hardcode_direct=yes
-    archive_cmds=''
-    hardcode_libdir_separator=':'
-    if test "$GCC" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
 	  # We have reworked collect2
-	  hardcode_direct=yes
-	else
+	  :
+	  else
 	  # We have old collect2
 	  hardcode_direct=unsupported
 	  # It fails to find uninstalled libraries when the uninstalled
@@ -6670,438 +9728,1021 @@
 	  hardcode_minus_L=yes
 	  hardcode_libdir_flag_spec='-L$libdir'
 	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-      esac
-
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	shared_flag='${wl}-G'
+	link_all_deplibs=no
       else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
 	else
-	  shared_flag='${wl}-bM:SRE'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
 	fi
       fi
-    fi
 
-    # It seems that -bexpall can do strange things, so it is better to
-    # generate a list of symbols to export.
-    always_export_symbols=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag='-berok'
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-    else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag="-z nodefs"
-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-	# Warning - without using the other run time loading flags,
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='${wl}-berok'
-	# This is a bit strange, but is similar to how AIX traditionally builds
-	# it's shared libraries.
-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
-      fi
-    fi
-    ;;
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  amigaos*)
-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    # see comment about different semantics on the GNU ld section
-    ld_shlibs=no
-    ;;
+int
+main ()
+{
 
-  cygwin* | mingw* | pw32*)
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec=' '
-    allow_undefined_flag=unsupported
-    # Tell ltmain to make .lib files, not .a files.
-    libext=lib
-    # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-    # The linker will automatically build a .lib file if we build a DLL.
-    old_archive_from_new_cmds='true'
-    # FIXME: Should let the user specify the lib program.
-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-    fix_srcfile_path='`cygpath -w "$srcfile"`'
-    ;;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
 
-  darwin* | rhapsody*)
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
       ;;
-    *) # Darwin 1.3 on
-      allow_undefined_flag='-flat_namespace -undefined suppress'
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
       ;;
-    esac
-    # FIXME: Relying on posixy $() will cause problems for
-    #        cross-compilation, but unfortunately the echo tests do not
-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-    #	     `"' quotes if we put them in here... so don't!
-    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-    # We need to add '_' to the symbols in $export_symbols first
-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    whole_archive_flag_spec='-all_load $convenience'
-    ;;
 
-  freebsd1*)
-    ld_shlibs=no
-    ;;
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
 
-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-  # support.  Future versions do this automatically, but an explicit c++rt0.o
-  # does not break anything, and helps significantly (at the cost of a little
-  # extra space).
-  freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
+    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
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
 
-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-  freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
+    darwin* | rhapsody*)
 
-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-  freebsd*)
-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
 
-  hpux9* | hpux10* | hpux11*)
-    case $host_os in
-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
-  irix5* | irix6* | nonstopux*)
-    if test "$GCC" = yes; then
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    else
-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      hardcode_libdir_flag_spec='-rpath $libdir'
-    fi
-    hardcode_libdir_separator=:
-    link_all_deplibs=yes
-    ;;
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
 
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-    else
-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-    fi
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
+  else
+  ld_shlibs=no
+  fi
 
-  newsos6)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_direct=yes
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_shlibpath_var=no
-    ;;
+      ;;
 
-  openbsd*)
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      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
       export_dynamic_flag_spec='${wl}-E'
-    else
-      case "$host_os" in
-      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_libdir_flag_spec='-R$libdir'
-        ;;
-      *)
-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-        ;;
-      esac
-    fi
-    ;;
+      ;;
 
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-    ;;
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
 
-  osf3*)
-    if test "$GCC" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
 
-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-    if test "$GCC" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      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_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
 
-      #Both c and cxx compiler support -rpath directly
-      hardcode_libdir_flag_spec='-rpath $libdir'
-    fi
-    hardcode_libdir_separator=:
-    ;;
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-  sco3.2v5*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    runpath_var=LD_RUN_PATH
-    hardcode_runpath_var=yes
-    export_dynamic_flag_spec='${wl}-Bexport'
-    ;;
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
 
-  solaris*)
-    # gcc --version < 3.0 without binutils cannot create self contained
-    # shared libraries reliably, requiring libgcc.a to resolve some of
-    # the object symbols generated in some cases.  Libraries that use
-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-    # a copy of libgcc.a into every shared library to guarantee resolving
-    # such symbols causes other problems:  According to Tim Van Holder
-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-    # (to the application) exception stack for one thing.
-    no_undefined_flag=' -z defs'
-    if test "$GCC" = yes; then
-      case `$CC --version 2>/dev/null` in
-      [12].*)
-	cat <<EOF 1>&2
-
-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-*** create self contained shared libraries on Solaris systems, without
-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-*** -no-undefined support, which will at least allow you to build shared
-*** libraries.  However, you may find that when you link such libraries
-*** into an application without using GCC, you have to manually add
-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-*** upgrade to a newer version of GCC.  Another option is to rebuild your
-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
 
-EOF
-        no_undefined_flag=
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
 	;;
       esac
-    fi
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_shlibpath_var=no
-    case $host_os in
-    solaris2.[0-5] | solaris2.[0-5].*) ;;
-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-    esac
-    link_all_deplibs=yes
-    ;;
+      link_all_deplibs=yes
+      ;;
 
-  sunos4*)
-    if test "x$host_vendor" = xsequent; then
-      # Use $CC to link under sequent, because it throws in some extra .o
-      # files that make .init and .fini sections work.
-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-    else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-    fi
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-  sysv4)
-    case $host_vendor in
-      sni)
-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-        hardcode_direct=yes # is this really true???
-        ;;
-      siemens)
-        ## LD is ld it makes a PLAMLIB
-        ## CC just makes a GrossModule.
-        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-        reload_cmds='$CC -r -o $output$reload_objs'
-        hardcode_direct=no
-        ;;
-      motorola)
-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
         ;;
-    esac
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
 
-  sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_shlibpath_var=no
-    export_dynamic_flag_spec='-Bexport'
-    ;;
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
 
-  sysv5*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-    hardcode_libdir_flag_spec=
-    hardcode_shlibpath_var=no
-    runpath_var='LD_RUN_PATH'
-    ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
 
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
 
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
-  sysv4*MP*)
-    if test -d /usr/nec; then
+    uts4*)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
       hardcode_shlibpath_var=no
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    fi
-    ;;
+      ;;
 
-  sysv4.2uw2*)
-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-    hardcode_direct=yes
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    hardcode_runpath_var=yes
-    runpath_var=LD_RUN_PATH
-    ;;
+    *)
+      ld_shlibs=no
+      ;;
+    esac
 
-  sysv5uw7* | unixware7*)
-    no_undefined_flag='${wl}-z ${wl}text'
-    if test "$GCC" = yes; then
-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-    else
-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
     fi
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
+  fi
 
-  *)
-    ld_shlibs=no
-    ;;
-  esac
-fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
-# Check hardcoding attributes.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; then
+with_gnu_ld=$with_gnu_ld
 
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$hardcode_shlibpath_var" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
 
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
-# PORTME Fill in your ld.so characteristics
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=$[A-Za-z]:$,\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/$[A-Za-z]:$,\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -7111,26 +10752,31 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
-  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so$major'
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
-  version_type=linux
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
   if test "$host_cpu" = ia64; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
@@ -7140,90 +10786,174 @@
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	     echo ' yes '
-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	  :
-	else
-	  can_build_shared=no
-	fi
-	;;
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
     esac
-    # AIX (on Power*) has no versioning support, so currently we can
-    # not hardcode correct soname into executable. Probably we can
-    # add versioning support to collect2, so additional links can
-    # be useful in future.
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
     if test "$aix_use_runtimelinking" = yes; then
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
     else
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
       library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}.so$major'
+      soname_spec='${libname}${release}${shared_ext}$major'
     fi
     shlibpath_var=LIBPATH
   fi
-  hardcode_into_libs=yes
   ;;
 
 amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
   ;;
 
 beos*)
-  library_names_spec='${libname}.so'
+  library_names_spec='${libname}${shared_ext}'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
-  version_type=linux
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  export_dynamic_flag_spec=-rdynamic
   # the default ld.so.conf also contains /usr/contrib/lib and
   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
-  case $GCC,$host_os in
-  yes,cygwin*)
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog .libs/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    ;;
-  yes,mingw*)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
     ;;
-  yes,pw32*)
-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
+
   *)
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -7233,88 +10963,179 @@
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
-freebsd1*)
-  dynamic_linker=no
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
-  *)
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
-  dynamic_linker="$host_os dld.sl"
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
   ;;
 
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
-    *)          version_type=irix ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
     ;;
   *)
     case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
     *) libsuff= shlibsuff= libmagic=never-match;;
     esac
     ;;
@@ -7323,41 +11144,69 @@
   shlibpath_overrides_runpath=no
   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
   ;;
 
 # No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-
-  # Find out which ABI we are using (multilib Linux x86_64 hack).
+  # find out which ABI we are using
   libsuff=
   case "$host_cpu" in
-  x86_64*|s390x*)
-    echo '#line 7360 "configure"' > conftest.$ac_ext
+  x86_64*|s390x*|powerpc64*)
+    echo '#line 11209 "configure"' > conftest.$ac_ext
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7371,24 +11220,36 @@
     fi
     rm -rf conftest*
     ;;
-  *)
-    ;;
   esac
+
   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
   ;;
 
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-    soname_spec='${libname}${release}.so$major'
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
@@ -7397,65 +11258,80 @@
   ;;
 
 newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
 
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  need_version=no
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case "$host_os" in
-    openbsd2.[89] | openbsd2.[89].*)
-      shlibpath_overrides_runpath=no
-      ;;
-    *)
-      shlibpath_overrides_runpath=yes
-      ;;
-    esac
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
   else
     shlibpath_overrides_runpath=yes
   fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 os2*)
   libname_spec='$name'
+  shrext_cmds=".dll"
   need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
+  library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=LIBPATH
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
+  need_lib_prefix=no
   need_version=no
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  hardcode_into_libs=yes
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
+rdos*)
+  dynamic_linker=no
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@ -7465,7 +11341,7 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -7475,16 +11351,15 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -7499,29 +11374,53 @@
   esac
   ;;
 
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
-dgux*)
-  version_type=linux
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
   ;;
 
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-    soname_spec='$libname.so.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 *)
@@ -7532,44 +11431,139 @@
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-# Report the final consequences.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
 
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
 
-aix4*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
 
-if test "$hardcode_action" = relink; then
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -7578,12 +11572,12 @@
   enable_fast_install=needless
 fi
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
 
-if test "x$enable_dlopen" != xyes; then
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -7598,10 +11592,65 @@
     lt_cv_dlopen_self=yes
     ;;
 
-  cygwin* | mingw* | pw32*)
+  mingw* | pw32* | cegcc*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
-   ;;
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -7645,7 +11694,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
@@ -7766,7 +11815,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -7796,10 +11845,10 @@
   case $lt_cv_dlopen in
   dlopen)
     save_CPPFLAGS="$CPPFLAGS"
-        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -7812,10 +11861,10 @@
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 7818 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7856,11 +11905,13 @@
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
 #endif
 
-void fnord() { int i=42;}
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -7869,24 +11920,30 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
     esac
   else :
     # compilation failed
@@ -7901,7 +11958,7 @@
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self_static+:} false; then :
@@ -7910,10 +11967,10 @@
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 7916 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7954,11 +12011,13 @@
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
 #endif
 
-void fnord() { int i=42;}
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -7967,24 +12026,30 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
     esac
   else :
     # compilation failed
@@ -8017,636 +12082,3359 @@
 fi
 
 
-if test "$enable_shared" = yes && test "$GCC" = yes; then
-  case $archive_cmds in
-  *'~'*)
-    # FIXME: we may have to deal with multi-command sequences.
-    ;;
-  '$CC '*)
-    # Test whether the compiler implicitly links with -lc since on some
-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-    # to ld, don't add -lc before -lgcc.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-    if ${lt_cv_archive_cmds_need_lc+:} false; then :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+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
+
+CC="$lt_save_CC"
+
+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $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; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  $rm conftest*
-    echo 'static int dummy;' > conftest.$ac_ext
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-      soname=conftest
-      lib=conftest
-      libobjs=conftest.$ac_objext
-      deplibs=
-      wl=$lt_cv_prog_cc_wl
-      compiler_flags=-v
-      linker_flags=-v
-      verstring=
-      output_objdir=.
-      libname=conftest
-      save_allow_undefined_flag=$allow_undefined_flag
-      allow_undefined_flag=
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      then
-	lt_cv_archive_cmds_need_lc=no
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+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 $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+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
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# 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
+
+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 $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&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.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname 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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_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="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_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 ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
       else
-	lt_cv_archive_cmds_need_lc=yes
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
       fi
-      allow_undefined_flag=$save_allow_undefined_flag
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
     else
-      cat conftest.err 1>&5
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
     fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      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.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # 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].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+	  link_all_deplibs_CXX=no
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	ld_shlibs_CXX=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$[^()0-9A-Za-z{}]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+	      '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+	      '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
 fi
-need_lc=${lt_cv_archive_cmds_need_lc-yes}
 
-# The second clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  :
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  test -f Makefile && make "$ltmain"
-fi
-
-if test -f "$ltmain"; then
-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-  $rm -f "${ofile}T"
-
-  echo creating $ofile
-
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS SED \
-    AR AR_FLAGS CC LD LN_S NM SHELL \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-    library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-    old_striplib striplib file_magic_cmd export_symbols_cmds \
-    deplibs_check_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-    global_symbol_to_c_name_address \
-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-
-    case $var in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
       ;;
     *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      lt_prog_compiler_pic_CXX='-fPIC'
       ;;
     esac
-  done
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
 
-  cat <<__EOF__ > "${ofile}T"
-#! $SHELL
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+# Check to make sure the PIC flag actually works.
 #
-# 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.
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+
+
 #
-# 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.
+# Check to make sure the static flag actually works.
 #
-# 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.
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs_CXX=no
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
 #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-# A sed that does not truncate output.
-SED=$lt_SED
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
 
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="${SED} -e s/^X//"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
-# ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
 
-# The host system.
-host_alias=$host_alias
-host=$host
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
 
-# The default C compiler.
-CC=$lt_CC
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
 
-# The linker used to build libraries.
-LD=$lt_LD
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
 
-# A BSD-compatible nm program.
-NM=$lt_NM
 
-# A symbol stripping program
-STRIP=$STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
 
-# Used on cygwin: assembler.
-AS="$AS"
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
 
-# How to pass a linker flag through the compiler.
-wl=$lt_wl
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
 
-# Old archive suffix (normally "a").
-libext="$libext"
 
-# Executable file suffix (normally "").
-exeext="$exeext"
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_pic_flag
-pic_mode=$pic_mode
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_compiler_c_o
 
-# Can we write directly to a .lo ?
-compiler_o_lo=$lt_compiler_o_lo
 
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
 
-# Do we need a version for libraries?
-need_version=$need_version
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_link_static_flag
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_no_builtin_flag
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
 
-# Library versioning type.
-version_type=$version_type
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_global_symbol_pipe
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
 
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
-# ### END LIBTOOL CONFIG
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
 
-__EOF__
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  aix3*)
-    cat <<\EOF >> "${ofile}T"
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
 
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  cygwin* | mingw* | pw32* | os2*)
-    cat <<'EOF' >> "${ofile}T"
-      # This is a source program that is used to create dlls on Windows
-      # Don't remove nor modify the starting and closing comments
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-	# This is a source program that is used to create import libraries
-	# on Windows for dlls which lack them. Don't remove nor modify the
-	# starting and closing comments
-# /* impgen.c starts here */
-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-#
-#  This file is part of GNU libtool.
-#
-#  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#  */
-#
-# #include <stdio.h>		/* for printf() */
-# #include <unistd.h>		/* for open(), lseek(), read() */
-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-# #include <string.h>		/* for strdup() */
-#
-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-# #ifndef O_BINARY
-# #define O_BINARY 0
-# #endif
-#
-# static unsigned int
-# pe_get16 (fd, offset)
-#      int fd;
-#      int offset;
-# {
-#   unsigned char b[2];
-#   lseek (fd, offset, SEEK_SET);
-#   read (fd, b, 2);
-#   return b[0] + (b[1]<<8);
-# }
-#
-# static unsigned int
-# pe_get32 (fd, offset)
-#     int fd;
-#     int offset;
-# {
-#   unsigned char b[4];
-#   lseek (fd, offset, SEEK_SET);
-#   read (fd, b, 4);
-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-# }
-#
-# static unsigned int
-# pe_as32 (ptr)
-#      void *ptr;
-# {
-#   unsigned char *b = ptr;
-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-# }
-#
-# int
-# main (argc, argv)
-#     int argc;
-#     char *argv[];
-# {
-#     int dll;
-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-#     unsigned long name_rvas, nexp;
-#     unsigned char *expdata, *erva;
-#     char *filename, *dll_name;
-#
-#     filename = argv[1];
-#
-#     dll = open(filename, O_RDONLY|O_BINARY);
-#     if (dll < 1)
-# 	return 1;
-#
-#     dll_name = filename;
-#
-#     for (i=0; filename[i]; i++)
-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-# 	    dll_name = filename + i +1;
-#
-#     pe_header_offset = pe_get32 (dll, 0x3c);
-#     opthdr_ofs = pe_header_offset + 4 + 20;
-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-#
-#     if (num_entries < 1) /* no exports */
-# 	return 1;
-#
-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-#     secptr = (pe_header_offset + 4 + 20 +
-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-#
-#     expptr = 0;
-#     for (i = 0; i < nsections; i++)
-#     {
-# 	char sname[8];
-# 	unsigned long secptr1 = secptr + 40 * i;
-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-# 	lseek(dll, secptr1, SEEK_SET);
-# 	read(dll, sname, 8);
-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-# 	{
-# 	    expptr = fptr + (export_rva - vaddr);
-# 	    if (export_rva + export_size > vaddr + vsize)
-# 		export_size = vsize - (export_rva - vaddr);
-# 	    break;
-# 	}
-#     }
-#
-#     expdata = (unsigned char*)malloc(export_size);
-#     lseek (dll, expptr, SEEK_SET);
-#     read (dll, expdata, export_size);
-#     erva = expdata - export_rva;
-#
-#     nexp = pe_as32 (expdata+24);
-#     name_rvas = pe_as32 (expdata+32);
-#
-#     printf ("EXPORTS\n");
-#     for (i = 0; i<nexp; i++)
-#     {
-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-#     }
-#
-#     return 0;
-# }
-# /* impgen.c ends here */
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
 
-EOF
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '#line 15066 "configure"' > conftest.$ac_ext
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        ;;
+      esac
+    fi
+    rm -rf conftest*
     ;;
   esac
 
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
+  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
 
-  mv -f "${ofile}T" "$ofile" || \
-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-  chmod +x "$ofile"
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
 
 
 
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-# Prevent multiple expansion
 
 
 
 
-  succeeded=no
 
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
@@ -8672,7 +15460,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
@@ -8686,74 +15473,19 @@
 fi
 
 
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnomeui-2.0 >= 2.2.0" >&5
-$as_echo_n "checking for libgnomeui-2.0 >= 2.2.0... " >&6; }
-
-        if $PKG_CONFIG --exists "libgnomeui-2.0 >= 2.2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOME_CFLAGS" >&5
-$as_echo_n "checking GNOME_CFLAGS... " >&6; }
-            GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_CFLAGS" >&5
-$as_echo "$GNOME_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOME_LIBS" >&5
-$as_echo_n "checking GNOME_LIBS... " >&6; }
-            GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_LIBS" >&5
-$as_echo "$GNOME_LIBS" >&6; }
-        else
-            GNOME_CFLAGS=""
-            GNOME_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.2.0"`
-            echo $GNOME_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     LIBS="$LIBS $GNOME_LIBS"
-                   CFLAGS="$CFLAGS $GNOME_CFLAGS"
-  else
-     as_fn_error $? "Library requirements (libgnomeui-2.0 >= 2.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
-
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; 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_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $PKG_CONFIG in
+  case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8763,7 +15495,7 @@
   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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_ac_pt_PKG_CONFIG="$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
@@ -8771,72 +15503,231 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  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
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME" >&5
+$as_echo_n "checking for GNOME... " >&6; }
+
+if test -n "$GNOME_CFLAGS"; then
+    pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GNOME_LIBS"; then
+    pkg_cv_GNOME_LIBS="$GNOME_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgnomeui-2.0 >= 2.2.0" 2>&1`
+        else
+	        GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgnomeui-2.0 >= 2.2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GNOME_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libgnomeui-2.0 >= 2.2.0) were not met:
 
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vte" >&5
-$as_echo_n "checking for vte... " >&6; }
+$GNOME_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GNOME_CFLAGS
+and GNOME_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GNOME_CFLAGS
+and GNOME_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-        if $PKG_CONFIG --exists "vte" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
+	GNOME_LIBS=$pkg_cv_GNOME_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-            succeeded=yes
+	LIBS="$LIBS $GNOME_LIBS"
+                   CFLAGS="$CFLAGS $GNOME_CFLAGS"
+fi
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking TERMINAL_WIDGET_CFLAGS" >&5
-$as_echo_n "checking TERMINAL_WIDGET_CFLAGS... " >&6; }
-            TERMINAL_WIDGET_CFLAGS=`$PKG_CONFIG --cflags "vte"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TERMINAL_WIDGET_CFLAGS" >&5
-$as_echo "$TERMINAL_WIDGET_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking TERMINAL_WIDGET_LIBS" >&5
-$as_echo_n "checking TERMINAL_WIDGET_LIBS... " >&6; }
-            TERMINAL_WIDGET_LIBS=`$PKG_CONFIG --libs "vte"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TERMINAL_WIDGET_LIBS" >&5
-$as_echo "$TERMINAL_WIDGET_LIBS" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TERMINAL_WIDGET" >&5
+$as_echo_n "checking for TERMINAL_WIDGET... " >&6; }
+
+if test -n "$TERMINAL_WIDGET_CFLAGS"; then
+    pkg_cv_TERMINAL_WIDGET_CFLAGS="$TERMINAL_WIDGET_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "vte") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TERMINAL_WIDGET_CFLAGS=`$PKG_CONFIG --cflags "vte" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$TERMINAL_WIDGET_LIBS"; then
+    pkg_cv_TERMINAL_WIDGET_LIBS="$TERMINAL_WIDGET_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "vte") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TERMINAL_WIDGET_LIBS=`$PKG_CONFIG --libs "vte" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        TERMINAL_WIDGET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte" 2>&1`
         else
-            TERMINAL_WIDGET_CFLAGS=""
-            TERMINAL_WIDGET_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            TERMINAL_WIDGET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vte"`
-            echo $TERMINAL_WIDGET_PKG_ERRORS
+	        TERMINAL_WIDGET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte" 2>&1`
         fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$TERMINAL_WIDGET_PKG_ERRORS" >&5
 
+	as_fn_error $? "Package requirements (vte) were not met:
 
+$TERMINAL_WIDGET_PKG_ERRORS
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-  if test $succeeded = yes; then
-     :
-  else
-     as_fn_error $? "Library requirements (vte) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-  fi
+Alternatively, you may set the environment variables TERMINAL_WIDGET_CFLAGS
+and TERMINAL_WIDGET_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables TERMINAL_WIDGET_CFLAGS
+and TERMINAL_WIDGET_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	TERMINAL_WIDGET_CFLAGS=$pkg_cv_TERMINAL_WIDGET_CFLAGS
+	TERMINAL_WIDGET_LIBS=$pkg_cv_TERMINAL_WIDGET_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
+fi
 CFLAGS="$TERMINAL_WIDGET_CFLAGS $CFLAGS"
 
 ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
@@ -8897,7 +15788,7 @@
 #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
 _ACEOF
 
-ALL_LINGUAS="be bg ca de es fi fr hu it ja uk nb nl pl pt_BR ru sr vi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="be bg ca de es fi fr fur hu it ja uk nb nl pl pt_BR ru sr vi zh_CN zh_HK zh_TW"
 
    for ac_header in locale.h
 do :
@@ -8961,7 +15852,38 @@
       #
       # First check in libc
       #
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
+$as_echo_n "checking for ngettext in libc... " >&6; }
+if ${gt_cv_func_ngettext_libc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !ngettext ("","", 1)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_ngettext_libc=yes
+else
+  gt_cv_func_ngettext_libc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
 if ${gt_cv_func_dgettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -8974,7 +15896,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return !dgettext ("","")
   ;
   return 0;
 }
@@ -8990,8 +15912,9 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
 $as_echo "$gt_cv_func_dgettext_libc" >&6; }
+      fi
 
-      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
         for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
@@ -9009,6 +15932,7 @@
       # If we don't have everything we want, check in libintl
       #
       if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
@@ -9048,6 +15972,43 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
 if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if ${ac_cv_lib_intl_ngettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_ngettext=yes
+else
+  ac_cv_lib_intl_ngettext=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_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
 if ${ac_cv_lib_intl_dgettext+:} false; then :
@@ -9090,13 +16051,52 @@
 
 fi
 
+fi
+
 
 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if ${ac_cv_lib_intl_ngettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_ngettext=yes
+else
+  ac_cv_lib_intl_ngettext=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_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
 if ${ac_cv_lib_intl_dcgettext+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -9139,12 +16139,16 @@
   :
 fi
 
+else
+  :
+fi
+
         fi
 
         #
         # If we found libintl, then check in it for bind_textdomain_codeset();
         # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext
+        # and both have dgettext and ngettext
         #
         if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
           glib_save_LIBS="$LIBS"
@@ -9166,7 +16170,8 @@
           if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
             gt_cv_func_dgettext_libc=no
           else
-            if test "$gt_cv_func_dgettext_libc" = "yes"; then
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
               gt_cv_func_dgettext_libintl=no
             fi
           fi
@@ -9222,6 +16227,8 @@
 $as_echo "no" >&6; }
 fi
 	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
 	  for ac_func in dcgettext
 do :
   ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
@@ -9233,6 +16240,35 @@
 fi
 done
 
+	  MSGFMT_OPTS=
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
+	  cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
 	  # 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
@@ -9326,11 +16362,31 @@
   CATOBJEXT=.gmo
              DATADIRNAME=share
 else
+  case $host in
+	    *-*-solaris*)
+	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+  CATOBJEXT=.gmo
+               DATADIRNAME=share
+else
   CATOBJEXT=.mo
-             DATADIRNAME=lib
+               DATADIRNAME=lib
+fi
+
+	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
+          LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
 	else
 	  gt_cv_have_gettext=no
@@ -9387,10 +16443,26 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
 $as_echo_n "checking for catalogs to be installed... " >&6; }
        NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
        done
        LINGUAS=$NEW_LINGUAS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
@@ -9744,7 +16816,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -9759,6 +16830,22 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -9767,6 +16854,14 @@
   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
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -10164,7 +17259,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by grip $as_me 3.4.3, which was
+This file was extended by grip $as_me 3.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10230,7 +17325,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-grip config.status 3.4.3
+grip config.status 3.9.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -10241,6 +17336,7 @@
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF
@@ -10351,6 +17447,381 @@
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -10361,6 +17832,7 @@
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -10817,6 +18289,11 @@
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$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
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -10871,6 +18348,7 @@
 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" \
@@ -10915,6 +18393,40 @@
       && 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.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+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
  ;;
 
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
@@ -10924,20 +18436,28 @@
 
 
   case $ac_file$ac_mode in
-    "config.h":H) # update the timestamp
-echo 'timestamp for config.h' >"./stamp-h1"
- ;;
-    "depfiles":C) 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=`$as_dirname -- "$mf" ||
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf 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$//$$' \| \
@@ -10960,34 +18480,26 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # 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 -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //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" ||
+    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"`
+    # 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'`; 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$//$$' \| \
@@ -11010,11 +18522,809 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    as_dir=$dirpart/$fdir; as_fn_mkdir_p
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
  ;;
     "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile

grip-3.4.3.tar.gz/configure.in -> grip-3.9.0.tar.gz/configure.in Changed

grip-3.4.3.tar.gz/contrib/Makefile.in -> grip-3.9.0.tar.gz/contrib/Makefile.in Changed

grip-3.4.3.tar.gz/doc/C/Makefile.in -> grip-3.9.0.tar.gz/doc/C/Makefile.in Changed

grip-3.4.3.tar.gz/doc/C/grip.xml -> grip-3.9.0.tar.gz/doc/C/grip.xml Changed

grip-3.4.3.tar.gz/doc/Makefile.in -> grip-3.9.0.tar.gz/doc/Makefile.in Changed

grip-3.4.3.tar.gz/grip.1 -> grip-3.9.0.tar.gz/grip.1 Changed

@@ -1,746 +1,475 @@
-.rn '' }`
-''' $RCSfile$$Revision$$Date$
-'''
-''' $Log$
-'''
-.de Sh
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
+.TH grip 1 "2018-05-22" "" ""
+.SH NAME
+\fBgrip \fP- A gtk-based cd-player and cd-ripper.
 .PP
-..
-.de Sp
-.if t .sp .5v
-.if n .sp
-..
-.de Ip
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.de Vb
-.ft CW
+\fBgcd \fP- A gtk-based cd-player (used as part of grip, or alone).
+\fB
+.SH SYNOPSIS
 .nf
-.ne \\$1
-..
-.de Ve
-.ft R
+.fam C
+\fBgrip\fP [\fB-d\fP <device>] [\fB-s\fP] [\fB-l\fP]
 
+\fBgcd\fP [\fB-d\fP <device>] [\fB-f\fP] [\fB-l\fP]
+
+.fam T
 .fi
-..
-'''
-'''
-'''     Set up \*(-- to give an unbreakable dash;
-'''     string Tr holds user defined translation string.
-'''     Bell System Logo is used as a dummy character.
-'''
-.tr \(*W-|\(bv\*(Tr
-.ie n \{\
-.ds -- \(*W-
-.ds PI pi
-.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-.ds L" ""
-.ds R" ""
-'''   \*(M", \*(S", \*(N" and \*(T" are the equivalent of
-'''   \*(L" and \*(R", except that they are used on ".xx" lines,
-'''   such as .IP and .SH, which do another additional levels of
-'''   double-quote interpretation
-.ds M" """
-.ds S" """
-.ds N" """""
-.ds T" """""
-.ds L' '
-.ds R' '
-.ds M' '
-.ds S' '
-.ds N' '
-.ds T' '
-'br\}
-.el\{\
-.ds -- \(em\|
-.tr \*(Tr
-.ds L" ``
-.ds R" ''
-.ds M" ``
-.ds S" ''
-.ds N" ``
-.ds T" ''
-.ds L' `
-.ds R' '
-.ds M' `
-.ds S' '
-.ds N' `
-.ds T' '
-.ds PI \(*p
-'br\}
-.\"	If the F register is turned on, we'll generate
-.\"	index entries out stderr for the following things:
-.\"		TH	Title 
-.\"		SH	Header
-.\"		Sh	Subsection 
-.\"		Ip	Item
-.\"		X<>	Xref  (embedded
-.\"	Of course, you have to process the output yourself
-.\"	in some meaninful fashion.
-.if \nF \{
-.de IX
-.tm Index:\\$1\t\\n%\t"\\$2"
-..
-.nr % 0
-.rr F
-.\}
-.TH GRIP 1 "Gtk Applications" "7/Nov/1999" " "
-.UC
-.if n .hy 0
-.if n .na
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.de CQ          \" put $1 in typewriter font
-.ft CW
-'if n "\c
-'if t \\&\\$1\c
-'if n \\&\\$1\c
-'if n \&"
-\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7
-'.ft R
-..
-.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
-.	\" AM - accent mark definitions
-.bd B 3
-.	\" fudge factors for nroff and troff
-.if n \{\
-.	ds #H 0
-.	ds #V .8m
-.	ds #F .3m
-.	ds #[ \f1
-.	ds #] \fP
-.\}
-.if t \{\
-.	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.	ds #V .6m
-.	ds #F 0
-.	ds #[ \&
-.	ds #] \&
-.\}
-.	\" simple accents for nroff and troff
-.if n \{\
-.	ds ' \&
-.	ds ` \&
-.	ds ^ \&
-.	ds , \&
-.	ds ~ ~
-.	ds ? ?
-.	ds ! !
-.	ds /
-.	ds q
-.\}
-.if t \{\
-.	ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.	ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.	ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.	ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.	ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.	ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10'
-.	ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m'
-.	ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.	ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10'
-.\}
-.	\" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
-.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
-.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
-.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.ds oe o\h'-(\w'o'u*4/10)'e
-.ds Oe O\h'-(\w'O'u*4/10)'E
-.	\" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.	\" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.	ds : e
-.	ds 8 ss
-.	ds v \h'-1'\o'\(aa\(ga'
-.	ds _ \h'-1'^
-.	ds . \h'-1'.
-.	ds 3 3
-.	ds o a
-.	ds d- d\h'-1'\(ga
-.	ds D- D\h'-1'\(hy
-.	ds th \o'bp'
-.	ds Th \o'LP'
-.	ds ae ae
-.	ds Ae AE
-.	ds oe oe
-.	ds Oe OE
-.\}
-.rm #[ #] #H #V #F C
-.SH "NAME"
-grip \- A gtk-based cd-player and cd-ripper.
-.PP
-gcd \- A gtk-based cd-player (used as part of grip, or alone).
-.SH "SYNOPSIS"
-.PP
-.Vb 1
-\&  grip [-d <device>] [-s] [-l]
-.Ve
-.Vb 1
-\&  gcd [-d <device>] [-f] [-l]
-.Ve
-.SH "DESCRIPTION"
-Grip is a gtk-based cd-player and cd-ripper. It has the ripping capabilities
-of cdparanoia builtin, but can also use external rippers (such as
-cdda2wav). It also provides an automated frontend for MP3 encoders, letting
-you take a disc and transform it easily straight into MP3s. The CDDB
-protocol is supported for retrieving track information from disc database
-servers. Grip works with DigitalDJ to provide a unified \*(L"computerized\*(R"
-version of your music collection. GCD is the cd-player only version of Grip.
+.fam T
+.fi
+.SH DESCRIPTION
+Grip is a gtk-based cd-player and cd-ripper. It has the ripping
+capabilities of cdparanoia builtin, but can also use external rippers
+(such as cdda2wav). It also provides an automated frontend for MP3
+encoders, letting you take a disc and transform it easily straight into
+MP3s. The CDDB protocol is supported for retrieving track information
+from disc database servers. Grip works with DigitalDJ to provide a
+unified "computerized" version of your music collection. GCD is the cd-
+player only version of Grip.
 .PP
-Because Grip and GCD share much of their functionality, this file documents
-both of them. If you installed only GCD, you should ignore the bits that
-talk about \*(L"ripping\*(R" and \*(L"encoding\*(R" of tracks.
+Because Grip and GCD share much of their functionality, this file
+documents both of them. If you installed only GCD, you should ignore
+the bits that talk about "ripping" and "encoding" of tracks.
 .PP
-Grip is designed to work closely with DigitalDJ, my SQL\-based mp3 jukebox
-system (although it does not require it).
+Grip is designed to work closely with DigitalDJ, my SQL-based mp3
+jukebox system (although it does not require it).
+.SH OPTIONS
+These are the command-line options for \fBgrip\fP:
 .PP
-.SH "OPTIONS"
-These are the command-line options for grip:
-.Ip "\f(CW-d <device>\fR" 5
-Use <device> as the cd-rom device (default: \f(CW/dev/cdrom\fR).
-.Ip "\f(CW-s\fR" 5
-Launch grip in a \*(L"small\*(R" (cd-only) mode.
-.Ip "\f(CW-l\fR" 5
-\*(L"local\*(R" mode -- don't try to use \s-1CDDB\s0.
-.Ip "\f(CW-v\fR" 5
+\fB-d\fP <device>
+Use <device> as the cd-rom device (default: /dev/cdrom).
+.TP
+.B
+\fB-s\fP
+Launch \fBgrip\fP in a "small" (cd-only) mode.
+.TP
+.B
+\fB-l\fP
+"local" mode -- don't try to use CDDB.
+.TP
+.B
+\fB--version\fP
+Print version string, and exit.
+.TP
+.B
+\fB-v\fP
 Verbose (debug) mode.
 .PP
-These are gcd's command-line options:
-.Ip "\f(CW-d <device>\fR" 5
-Use <device> as the cd-rom device (default: \f(CW/dev/cdrom\fR).
-.Ip "\f(CW-f\fR" 5
-Launch gcd in \*(L"full\*(R" (track-display) mode.
-.Ip "\f(CW-l\fR" 5
-\*(L"local\*(R" mode -- Don't try to use \s-1CDDB\s0.
-.Ip "\f(CW-v\fR" 5
+These are \fBgcd\fP's command-line options:
+.PP
+\fB-d\fP <device>
+Use <device> as the cd-rom device (default: /dev/cdrom).
+.TP
+.B
+\fB-f\fP
+Launch \fBgcd\fP in "full" (track-display) mode.
+.TP
+.B
+\fB-l\fP
+"local" mode -- Don't try to use CDDB.
+.TP
+.B
+\fB-v\fP
 Verbose (debug) mode.
-.SH "USAGE"
-The most handy way to launch Grip/GCD is from your window manager's doc. A
-dock icon (\f(CWgripicon.tif\fR/\f(CWgcdicon.tif\fR) is included with the distribution.
+.SH USAGE
+The most handy way to launch Grip/GCD is from your window manager's
+doc. A dock icon (gripicon.tif/gcdicon.tif) is included with the
+distribution.
 .PP
 Grip's operation should be pretty self-explanatory. Tracks to rip are
 selected with the right mouse button. To select all tracks on the disc,
-click the \*(L"Rip\*(R" column label. When you select \*(L"Rip\*(R" or \*(L"MP3-encode\*(R" from the
-\*(L"Rip\*(R" page, Grip will rip or rip/encode the tracks you have selected. If you
-select \*(L"Rip partial track\*(R", only the current select of the current track
-will be ripped or encoded. Start/End sector values are ignored if partial
-track ripping is not enabled.
+click the "Rip" column label. When you select "Rip" or "MP3-encode"
+from the "Rip" page, Grip will rip or rip/encode the tracks you have
+selected. If you select "Rip partial track", only the current select of
+the current track will be ripped or encoded. Start/End sector values
+are ignored if partial track ripping is not enabled.
 .PP
 Grip and GCD used to be installed as setuid root. This was for several
-reasons. First, most people have their systems configured such that their
-user account does not have access to the cd drive. Secondly, cdparanoia
-requires access to both the cd device and (for SCSI drives) the generic SCSI
-device (usually \f(CW/dev/sg\fR<something>). Despite this, I no longer install the
-programs setuid root. This means that you will have to set the permissions
-correctly on the appropriate devices, or run the program as root.
-.PP
-\fBIMPORTANT!\fR
-.PP
-If you have trouble with Grip or GCD, read the \*(L"Common Questions\*(R"
-section. I'm getting bogged down in email these days. This being said, I do
-appreciate feedback on Grip. If, after reading through this document
-carefully, you still have a question, or have a feature request, feel free
-to email me. Do read the file TODO first, however, to check whether it's
-already on my list.
-.PP
-\fBIMPORTANT!\fR
-.SH "CONFIGURATION"
-The \*(L"Config\*(R" menu allows you to configure your ripping program and your CDDB
-database. Rip/Encode/ID3 options are only available in Grip.
+reasons. First, most people have their systems configured such that
+their user account does not have access to the cd drive. Secondly,
+cdparanoia requires access to both the cd device and (for SCSI drives)
+the generic SCSI device (usually /dev/sg<something>). Despite this, I
+no longer install the programs setuid root. This means that you will
+have to set the permissions correctly on the appropriate devices, or
+run the program as root.
+.SH CONFIGURATION
+The "Config" menu allows you to configure your ripping program and your
+CDDB database. Rip/Encode/ID3 options are only available in Grip.
 .PP
 Here are the options:
-.Sh "\s-1CD\s0 options:"
-.Ip "Don't interrupt playback on exit/startup" 5
-If this is not selected, Grip
-will stop play when it starts
-and when it stops.
-.Ip "Rewind when stopped" 5
-If selected, Grip will rewind to the first track
-when play is stopped.
-.Ip "Startup with first track if not playing" 5
-If this is not selected, Grip
-will begin with whatever track
-the cd-player played last.
-.Ip "Reshuffle before each playback" 5
-If selected, Grip will re-randomize the
-tracks each time playback begins when in
-shuffle-play mode.
 .PP
-Rip Options:
-.Ip "\fBRipper\fR" 5
+.SH CD options:
+.TP
+Don't interrupt playback on exit/startup
+If this is not selected, Grip will stop play when it starts and
+when it stops.
+.TP
+.B Rewind when stopped
+If selected, Grip will rewind to the first track when play is
+stopped.
+.TP
+Startup with first track if not playing
+If this is not selected, Grip will begin with whatever track the
+cd-player played last.
+.TP
+Reshuffle before each playback
+If selected, Grip will re-randomize the tracks each time playback
+begins when in shuffle-play mode.
+.PP
+.SH Rip Options:
+.TP
+Ripper
+.br
 This allows you to select one of the preset rippers. This will
-fill in sensible default parameters for calling the ripper. If
-you select \*(L"grip (cdparanoia)\*(R", Grip will use its builtin version
-of cdparanoia (only available if paranoia has been compiled
-in). If the builtin ripper is selected, the following options are
+fill in sensible default parameters for calling the ripper. If you
+select "grip (cdparanoia)", Grip will use its builtin version of
+cdparanoia (only available if paranoia has been compiled in). If
+the builtin ripper is selected, the following options are
 available:
-.Ip "Disable paranoia" 5
+.TP
+Disable paranoia
 Disables all paranoia checking.
-.Ip "Disable extra paranoia" 5
+.TP
+Disable extra paranoia
 Only cdda2wav-style overlap checking will be done.
-.Ip "Disable scratch detection" 5
+.TP
+Disable scratch detection
 Do not look for scratches.
-.Ip "Disable scratch repair" 5
+.TP
+Disable scratch repair
 Disable scratch repair (still detect)
-.Ip "Ripping executable" 5
-This should be the full path to the program you want to use to rip tracks with.
-.Ip "Ripping command-line" 5
-These are the arguments that will be passed to the ripping program. The
-\&'\f(CW%\fR\*(R' switches are translated as follows:
-.Ip "\f(CW%t\fR" 10
+.TP
+Ripping executable
+This should be the full path to the program you want to use to rip
+tracks with.
+.TP
+Ripping command-line
+These are the arguments that will be passed to the ripping
+program. The '%' switches are translated as follows:
+.TP
+.B
+%t
 Track to be ripped
-.Ip "\f(CW%b\fR" 10
-Begin sector to be ripped (0 is start of track) 
-.Ip "\f(CW%e\fR" 10
+.TP
+.B
+%b
+Begin sector to be ripped (0 is start of track)
+.TP
+.B
+%e
 End sector of track
-.Ip "\f(CW%f\fR" 10
-Filename to put \f(CW.wav\fR data to
-.Ip "Rip file format" 5
-This specifies the format of the filename to write
-ripped data to. The \*(L'%\*(R' switches are translated as
-follows:
-.Ip "\f(CW%n\fR" 10
+.TP
+.B
+%f
+Filename to put .wav data to
+.TP
+Rip file format
+This specifies the format of the filename to write ripped data to.
+The '%' switches are translated as follows:
+.TP
+.B
+%n
 Name of track being ripped
-.Ip "\f(CW%t\fR" 10
+.TP
+.B
+%t
 Number of track being ripped
-.Ip "\f(CW%a\fR" 10
+.TP
+.B
+%a
 Artist of current track
-.Ip "\f(CW%A\fR" 10
+.TP
+.B
+%A
 Artist of the current disc
-.Ip "\f(CW%d\fR" 10
+.TP
+.B
+%d
 Name of current disc
-.Ip "\f(CW%b\fR" 10
-Begin sector to be ripped (0 is start of track) 
-.Ip "\f(CW%e\fR" 10
+.TP
+.B
+%b
+Begin sector to be ripped (0 is start of track)
+.TP
+.B
+%e
 End sector of track
-.Ip "\f(CW%c\fR" 10
+.TP
+.B
+%c
 cdrom device
-.Ip "\f(CW%i\fR" 10
-\s-1CDDB\s0 discid in hex format
-.Ip "\f(CW%g\fR" 10
-\s-1ID3\s0 genre tag as a number
-.Ip "\f(CW%G\fR" 10
-\s-1ID3\s0 genre tag as a word
-.Sp
-Adding a \*(L'*\*(R' between the \*(L'%\*(R' and the switch will cause
+.TP
+.B
+%i
+CDDB discid in hex format
+.TP
+.B
+%g
+ID3 genre tag as a number
+.TP
+.B
+%G
+ID3 genre tag as a word
+.PP
+Adding a '*' between the '%' and the switch will cause
 underscoring of the field to be skipped.
-.Ip "Rip \*(N'nice\*(T' value" 5
-The \*(L'nice\*(R' (priority) level to run the rip at.
-.Ip "Max non-encoded \f(CW.wav\fR's" 5
-The maximum number of non-encoded \f(CW.wav\fR files grip will keep around before
-pausing ripping.
-.Ip "Auto-rip on insert" 5
-If selected, Grip will automatically select all
-tracks and begin ripping when a new (ie: no local
-disc data) disc is inserted.
-.Ip "Auto-eject after rip" 5
-If selected, Grip will automatically eject the disc
-when ripping is finished.
-.Ip "Wav filter command" 5
-This command will be run after ripping but before
-encoding. It can be used to call a program to
-manipulate the .wav file in some way (such as doing
-normalization). It accepts a single switch, \f(CW%f\fR, which
-translates as the ripped .wav file.
-.Sh "\s-1MP3\s0 options:"
-.Ip "Encoder" 5
+.TP
+Rip 'nice' value
+The 'nice' (priority) level to run the rip at.
+.TP
+Max non-encoded .wav's
+The maximum number of non-encoded .wav files Grip will keep around
+before pausing ripping.
+.TP
+Auto-rip on insert
+If selected, Grip will automatically select all tracks and begin
+ripping when a new (ie: no local disc data) disc is inserted.
+.TP
+Auto-eject after rip
+If selected, Grip will automatically eject the disc when ripping
+is finished.
+.TP
+Wav filter command
+This command will be run after ripping but before encoding. It can
+be used to call a program to manipulate the .wav file in some way
+(such as doing normalization). It accepts a single switch, %f,
+which translates as the ripped .wav file.
+.PP
+.SH Encode options:
+.TP
+Encoder
 This allows you to select one of the preset rippers. This will
 fill in sensible default parameters for calling the encoder.
-.Ip "\s-1MP3\s0 executable" 5
-This should be the full path to the program you want
-to use to \s-1MP3-\s0encode tracks with.
-.Ip "\s-1MP3\s0 command-line" 5
-These are the arguments that will be passed to the
-\s-1MP3\s0 encoder. The \*(L'%\*(R' switches are translated as
-follows:
-.Ip "\f(CW%b\fR" 10
+.TP
+MP3 executable
+This should be the full path to the program you want to use to
+MP3-encode tracks with.
+.TP
+MP3 command-line
+These are the arguments that will be passed to the MP3 encoder.
+The '%' switches are translated as follows:
+.TP
+.B
+%b
 Encode bitrate (kbits/sec)
-.Ip "\f(CW%f\fR" 10
+.TP
+.B
+%f
 Filename of the .wav data to be encoded
-.Ip "\f(CW%o\fR" 10
+.TP
+.B
+%o
 Filename to save mp3 data to
-.Ip "\s-1MP3\s0 file format" 5
-This specifies the format of the filename to write
-\s-1MP3\s0 data to. The \*(L'%\*(R' switches are the same as those
-used in the rip file format.
-.Ip "Delete \f(CW.wav\fR after encoding?" 5
+.TP
+MP3 file format
+This specifies the format of the filename to write MP3 data to.
+The '%' switches are the same as those used in the rip file
+format.
+.TP
+Delete .wav after encoding?
 If selected, this option will (surprise!)
-delete the ripped .wav file after encoding.
-.Ip "Insert into \s-1SQL\s0 database" 5
-If selected, and DigitalDJ is installed, Grip
-will place the song information into
-DigitalDJ's song database.
-.Ip "Number of CPUs to use" 5
+delete the ripped .wav
+file after encoding.
+.TP
+Insert into SQL database
+If selected, and DigitalDJ is installed, Grip will place the song
+information into DigitalDJ's song database.
+.TP
+Number of CPUs to use
 This is the number of simultaneous encode
-.Sp
-processes allowed. If you have an \s-1SMP\s0 system,
-increase this number to use more processes. Note
-that Grip must be restarted for changes in this
-option to take effect.
-.Ip "\s-1MP3\s0 \*(N'nice\*(T' value" 5
-The \*(L'nice\*(R' (priority) level to run the \s-1MP3\s0 encode at.
-.Sh "\s-1ID3\s0 options:"
-.Ip "\s-1ID3\s0 Executable" 5
-The full path to the program that will add \s-1ID3\s0 tags to an
-\s-1MP3\s0 file
-.Ip "\s-1ID3\s0 Command-line" 5
-The arguments to be passed to the \s-1ID3\s0 program. The %
-switches are translated as:
-.Ip "\f(CW%n\fR" 10
+processes allowed. If you have an SMP system, increase this number
+to use more processes. Note that Grip must be restarted for
+changes in this option to take effect.
+.TP
+MP3 'nice' value
+The 'nice' (priority) level to run the MP3 encode at.
+.PP
+.SH ID3 options:
+.TP
+ID3 Executable
+The full path to the program that will add ID3 tags to an MP3 file
+.TP
+ID3 Command-line
+The arguments to be passed to the ID3 program. The % switches are
+translated as:
+.TP
+.B
+%n
 Name of track
-.Ip "\f(CW%t\fR" 10
+.TP
+.B
+%t
 Number of track
-.Ip "\f(CW%a\fR" 10
+.TP
+.B
+%a
 Artist of current track
-.Ip "\f(CW%A\fR" 10
+.TP
+.B
+%A
 Artist of the current disc
-.Ip "\f(CW%d\fR" 10
+.TP
+.B
+%d
 Name of current disc
-.Ip "\f(CW%g\fR" 10
-\s-1ID3\s0 genre tag as a number
-.Ip "\f(CW%G\fR" 10
-\s-1ID3\s0 genre tag as a word
-.Ip "\f(CW%y\fR" 10
+.TP
+.B
+%g
+ID3 genre tag as a number
+.TP
+.B
+%G
+ID3 genre tag as a word
+.TP
+.B
+%y
 Year of track
-.Ip "\f(CW%f\fR" 10
-Name of the \s-1MP3\s0 file
-.Ip "Add \s-1ID3\s0 tags" 5
-If selected this option will cause \s-1ID3\s0 tags to be added to
-each \s-1MP3\s0 file after it is encoded.
-.Sh "\s-1CDDB\s0 options:"
-.Ip "Primary/Secondary \s-1CDDB\s0 server" 5
-These are your servers for looking up disc
-information over the net. If the disc is
-not found on the primary server, the
-secondary server will be checked.
-.Ip "\s-1DB\s0 server" 5
-The address of the \s-1CDDB\s0 server you wish to use.
-.Ip "\s-1DB\s0 \s-1CGI\s0 path" 5
-The path to the script on the server that handles \s-1HTTP\s0
-requests. This is generally \*(L"\f(CW~cddb/cddb.cgi\fR\*(R" or
-\*(L"\f(CWcgi-bin/cddb.cgi\fR\*(R".
-.Ip "Perform \s-1CDDB\s0 lookup automatically" 5
-If selected, Grip will always try
-to look up an unknown disc. If not
-selected, lookup must be initiated
-manually.
-.Sh "Proxy options:"
-.Ip "Use proxy server" 5
-If selected, \s-1CDDB\s0 requests will be sent through an
-\s-1HTTP\s0 proxy (useful for people behind firewalls).
-.Ip "Get server from \*(N'http_proxy\*(T' env. var:" 5
-If set, Grip will try to read the http server/port information from
-the environment variable \*(L"\f(CWhttp_proxy\fR\*(R", which should take the form
-\*(L"\f(CWhttp://server:port\fR\*(R".
-.Ip "Proxy server" 5
-The address of the \s-1HTTP\s0 proxy server to be used.
-.Ip "Proxy port" 5
+.TP
+.B
+%f
+Name of the MP3 file
+.TP
+Add ID3 tags
+If selected this option will cause ID3 tags to be added to each
+MP3 file after it is encoded.
+.PP
+.SH CDDB options:
+.TP
+Primary/Secondary CDDB server
+These are your servers for looking up disc information over the
+net. If the disc is not found on the primary server, the secondary
+server will be checked.
+.TP
+DB server
+The address of the CDDB server you wish to use.
+.TP
+DB CGI path
+The path to the script on the server that handles HTTP requests.
+This is generally "~cddb/cddb.cgi" or "cgi-bin/cddb.cgi".
+.TP
+Perform CDDB lookup automatically
+If selected, Grip will always try to look up an unknown disc. If
+not selected, lookup must be initiated manually.
+.PP
+.SH Proxy options:
+.TP
+Use proxy server
+If selected, CDDB requests will be sent through an HTTP proxy
+(useful for people behind firewalls).
+.TP
+Get server from 'http_proxy' env. var:
+If set, Grip will try to read the http server/port information
+from the environment variable "http_proxy", which should take the
+form "http://server:port".
+.TP
+Proxy server
+The address of the HTTP proxy server to be used.
+.TP
+Proxy port
 The port to talk to the proxy on.
-.Sh "Misc options:"
-.Ip "Output directory" 5
-The directory to place \s-1WAV\s0 and \s-1MP3\s0 files in. The same \*(L'\f(CW%\fR\*(R'
-switches as in the rip/encode filenames can be used.
-.Ip "Convert spaces to underscores" 5
-If selected, this will cause all spaces in
-filenames to underscores.
-.Ip "Also underscore" 5
-A list of characters to replace with underscores when
-constructing filenames.
-.Ip "Email address" 5
-The email address to be used as a reply address when
-submitting \s-1CDDB\s0 entries and bug reports.
-.Ip "\s-1CD\s0 update program" 5
-This program will be run whenever a disc is put in the
-drive. All sensible \*(L'\f(CW%\fR\*(R' switches can be used. I use
-this to call a program that generates a web page that
-tells what \s-1CD\s0 I'm currently playing.
-.Ip "Keep application minimum size" 5
-If selected, Grip will always try to keep
-its window a the minimum size possible.
-.SH "CDDB notes"
-I have declined to sign a license agreement with Escient, the company who
-owns \*(L"www.cddb.com\*(R" and runs the CDDB server \*(L"us.cddb.com\*(R". Their license
-would (among other things) have required me to place advertisements in Grip
-and restrict you, the user, to use only their databases. I am against this
-commercial use of the track information submitted by users such as
-yourself. For this reason, I encourage you to use free servers, such as
-\*(L"freecddb.freecddb.org\*(R".
-.SH "License and Disclaimer"
-Grip and GCD are Copyright (c) 1998 by Mike Oliphant. Grip and GCD may be
-used and distributed under the terms of the GNU General Public License. All
-other brand and product names are trademarks, registered trademarks or
-service marks of their respective holders.
+.PP
+.SH Misc options:
+.TP
+Output directory
+The directory to place WAV and MP3 files in. The same '%' switches
+as in the rip/encode filenames can be used.
+.TP
+Convert spaces to underscores
+If selected, this will cause all spaces in filenames to
+underscores.
+.TP
+Also underscore
+A list of characters to replace with underscores when constructing
+filenames.
+.TP
+Email address
+The email address to be used as a reply address when submitting
+CDDB entries and bug reports.
+.TP
+CD update program
+This program will be run whenever a disc is put in the drive. All
+sensible '%' switches can be used. I use this to call a program
+that generates a web page that tells what CD I'm currently
+playing.
+.TP
+Keep application minimum size
+If selected, Grip will always try to keep its window a the minimum
+size possible.
+.SH
+CDDB notes
+I have declined to sign a license agreement with Escient, the company
+who owns "www.cddb.com" and runs the CDDB server "us.cddb.com". Their
+license would (among other things) have required me to place
+advertisements in Grip and restrict you, the user, to use only their
+databases. I am against this commercial use of the track information
+submitted by users such as yourself. For this reason, I encourage you
+to use free servers, such as "freecddb.freecddb.org".
+.SH
+License and Disclaimer
+Grip and GCD are Copyright (c) 1998 by Mike Oliphant. Grip and GCD may
+be used and distributed under the terms of the GNU General Public
+License. All other brand and product names are trademarks, registered
+trademarks or service marks of their respective holders.
 .PP
 These programs are 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.
+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.
 .PP
-You should have received a copy of the GNU General Public License along with
-this distribution; if not, write to the Free Software Foundation, Inc., 59
-Temple Place, Suite 330, Boston, MA 02111, USA.
-.SH "Acknowledgments"
+You should have received a copy of the GNU General Public License in a file
+named COPYING along with this distribution; if not, you can contact
+the Free Software Foundation, Inc., https://www.fsf.org/.
+.SH
+Acknowledgments
 Thanks go to:
-.Ip "\(bu" 5
-Everyone involved in \s-1GTK\s0 development for a wonderful \s-1GUI\s0
-.Ip "\(bu" 5
-Tony Arcieri, for libcdaudio, which formed the basis of Grip's low-level
-cd control and \s-1CDDB\s0 access routines
-.Ip "\(bu" 5
+.TP
+.B
+*
+Everyone involved in GTK development for a wonderful GUI
+.TP
+.B
+*
+Tony Arcieri, for libcdaudio, which formed the basis of Grip's
+low-level cd control and CDDB access routines
+.TP
+.B
+*
 Monty, for cdparanoia and the paranoia library
-.Ip "\(bu" 5
+.TP
+.B
+*
 Heiko Eissfeldt for cdda2wav
-.Ip "\(bu" 5
+.TP
+.B
+*
 Tord Jansson for BladeEnc
-.Ip "\(bu" 5
-Mike Cheng, Mark Taylor and all the others who have worked on \s-1LAME\s0
-.Ip "\(bu" 5
-Ti Kan, for the xmcd button bitmaps, many of which I use in modified form
-.Ip "\(bu" 5
-Everyone has contributed code to Grip (see the \s-1CREDITS\s0 file)
-.Ip "\(bu" 5
+.TP
+.B
+*
+Mike Cheng, Mark Taylor and all the others who have worked on LAME
+.TP
+.B
+*
+Ti Kan, for the xmcd button bitmaps, many of which I use in
+modified form
+.TP
+.B
+*
+Everyone that has contributed code to Grip (see the CREDITS and ChangeLog files)
+.TP
+.B
+*
 Everyone else who has given me feedback and helped test Grip
-.SH "CHANGES"
-See the README file that came with the source code.
-.SH "AUTHOR"
-Grip and GCD written by Mike Oliphant (\f(CWoliphant@gtk.org\fR)
-.PP
-Documentation formatting by Aaron Sherman (\f(CWajs@ajs.com\fR)
-.PP
-.Vb 1
+.SH BUGS
+If you have trouble with Grip or GCD, read the "FAQ" section in the
+built in manual.  If you still have a question after reading through
+this document carefully, or have a feature request, feel free to
+send an email to the mailinglist, or open a bug repport on the
+bug tracker. Do read the file TODO first and skim through the
+feature request bug tracker, to check whether it's already on my list.
+.SH CHANGES
+See the ChangeLog file that came with the source code.
+.SH AUTHOR
+Grip and GCD written by Mike Oliphant (oliphant@gtk.org)
+.br
+Documentation formatting by Aaron Sherman (ajs@ajs.com)
+.br
 Project manager: Johnny A. Solbu (johnny@solbu.net)
-.Ve
-
-.rn }` ''
-.IX Title "GRIP 1"
-.IX Name "grip - A gtk-based cd-player and cd-ripper."
-
-.IX Header "NAME"
-
-.IX Header "SYNOPSIS"
-
-.IX Header "DESCRIPTION"
-
-.IX Header "OPTIONS"
-
-.IX Item "\f(CW-d <device>\fR"
-
-.IX Item "\f(CW-s\fR"
-
-.IX Item "\f(CW-l\fR"
-
-.IX Item "\f(CW-v\fR"
-
-.IX Item "\f(CW-d <device>\fR"
-
-.IX Item "\f(CW-f\fR"
-
-.IX Item "\f(CW-l\fR"
-
-.IX Item "\f(CW-v\fR"
-
-.IX Header "USAGE"
-
-.IX Header "CONFIGURATION"
-
-.IX Subsection "\s-1CD\s0 options:"
-
-.IX Item "Don't interrupt playback on exit/startup"
-
-.IX Item "Rewind when stopped"
-
-.IX Item "Startup with first track if not playing"
-
-.IX Item "Reshuffle before each playback"
-
-.IX Item "\fBRipper\fR"
-
-.IX Item "Disable paranoia"
-
-.IX Item "Disable extra paranoia"
-
-.IX Item "Disable scratch detection"
-
-.IX Item "Disable scratch repair"
-
-.IX Item "Ripping executable"
-
-.IX Item "Ripping command-line"
-
-.IX Item "\f(CW%t\fR"
-
-.IX Item "\f(CW%b\fR"
-
-.IX Item "\f(CW%e\fR"
-
-.IX Item "\f(CW%f\fR"
-
-.IX Item "Rip file format"
-
-.IX Item "\f(CW%n\fR"
-
-.IX Item "\f(CW%t\fR"
-
-.IX Item "\f(CW%a\fR"
-
-.IX Item "\f(CW%A\fR"
-
-.IX Item "\f(CW%d\fR"
-
-.IX Item "\f(CW%b\fR"
-
-.IX Item "\f(CW%e\fR"
-
-.IX Item "\f(CW%c\fR"
-
-.IX Item "\f(CW%i\fR"
-
-.IX Item "\f(CW%g\fR"
-
-.IX Item "\f(CW%G\fR"
-
-.IX Item "Rip \*(N'nice\*(T' value"
-
-.IX Item "Max non-encoded \f(CW.wav\fR's"
-
-.IX Item "Auto-rip on insert"
-
-.IX Item "Auto-eject after rip"
-
-.IX Item "Wav filter command"
-
-.IX Subsection "\s-1MP3\s0 options:"
-
-.IX Item "Encoder"
-
-.IX Item "\s-1MP3\s0 executable"
-
-.IX Item "\s-1MP3\s0 command-line"
-
-.IX Item "\f(CW%b\fR"
-
-.IX Item "\f(CW%f\fR"
-
-.IX Item "\f(CW%o\fR"
-
-.IX Item "\s-1MP3\s0 file format"
-
-.IX Item "Delete \f(CW.wav\fR after encoding?"
-
-.IX Item "Insert into \s-1SQL\s0 database"
-
-.IX Item "Number of CPUs to use"
-
-.IX Item "\s-1MP3\s0 \*(N'nice\*(T' value"
-
-.IX Subsection "\s-1ID3\s0 options:"
-
-.IX Item "\s-1ID3\s0 Executable"
-
-.IX Item "\s-1ID3\s0 Command-line"
-
-.IX Item "\f(CW%n\fR"
-
-.IX Item "\f(CW%t\fR"
-
-.IX Item "\f(CW%a\fR"
-
-.IX Item "\f(CW%A\fR"
-
-.IX Item "\f(CW%d\fR"
-
-.IX Item "\f(CW%g\fR"
-
-.IX Item "\f(CW%G\fR"
-
-.IX Item "\f(CW%y\fR"
-
-.IX Item "\f(CW%f\fR"
-
-.IX Item "Add \s-1ID3\s0 tags"
-
-.IX Subsection "\s-1CDDB\s0 options:"
-
-.IX Item "Primary/Secondary \s-1CDDB\s0 server"
-
-.IX Item "\s-1DB\s0 server"
-
-.IX Item "\s-1DB\s0 \s-1CGI\s0 path"
-
-.IX Item "Perform \s-1CDDB\s0 lookup automatically"
-
-.IX Subsection "Proxy options:"
-
-.IX Item "Use proxy server"
-
-.IX Item "Get server from \*(N'http_proxy\*(T' env. var:"
-
-.IX Item "Proxy server"
-
-.IX Item "Proxy port"
-
-.IX Subsection "Misc options:"
-
-.IX Item "Output directory"
-
-.IX Item "Convert spaces to underscores"
-
-.IX Item "Also underscore"
-
-.IX Item "Email address"
-
-.IX Item "\s-1CD\s0 update program"
-
-.IX Item "Keep application minimum size"
-
-.IX Header "Common Questions"
-
-.IX Header "CDDB notes"
-
-.IX Header "License and Disclaimer"
-
-.IX Header "Acknowledgments"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Item "\(bu"
-
-.IX Header "CHANGES"
-
-.IX Header "AUTHOR"
-

grip-3.4.3.tar.gz/ltmain.sh -> grip-3.9.0.tar.gz/ltmain.sh Changed

@@ -1,461 +1,2132 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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.
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
 #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.2
+TIMESTAMP=""
+package_revision=1.3337
+
+# define SED for historic ltconfig's generated by Libtool 1.3
+test -z "$SED" && SED=sed
+
+# Be Bourne compatible
+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
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
 
-# The name of this program.
-progname=`$echo "$0" | sed 's%^.*/%%'`
-modename="$progname"
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.4
-TIMESTAMP=" (1.920 2001/04/24 23:26:18)"
 
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/$[^/]*$.*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/$[\\`\\"$\\\\]$/\\\1/g'
-SP2NL='tr \040 \012'
-NL2SP='tr \015\012 \040\040'
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/$[`"$\\]$/\\\1/g'
 
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  echo "$modename: not configured to build any kind of library" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$["`\\]$/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\$[^$bs]\$$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^$[0-9]$/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/$(C)$[ 0-9,-]*$ [1-9][0-9]*$/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	p
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $opt_debug
+
+    func_error "missing argument for $1."
+    exit_cmd=exit
+}
+
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^$..$.*$/\1/;q'
+    my_sed_short_rest='1s/^..$.*$$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^$--[^=]*$=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-mode=$default_mode
 nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
+preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
-# Parse our command line options once, thoroughly.
-while test $# -gt 0
-do
-  arg="$1"
-  shift
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
 
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
 
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
       ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
     *)
-      eval "$prev=\$arg"
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
       ;;
+  esac
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
     esac
+  done
 
-    prev=
-    prevopt=
-    continue
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
   fi
 
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
 
-  --version)
-    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    exit 0
-    ;;
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
 
-  --config)
-    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-    exit 0
-    ;;
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
 
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
     ;;
+  esac
+}
 
-  --dry-run | -n)
-    run=:
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
     ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
 
-  --features)
-    echo "host: $host"
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
     if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
+      write_lobj=\'${2}\'
     else
-      echo "disable shared libraries"
+      write_lobj=none
     fi
+
     if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
+      write_oldobj=\'${3}\'
     else
-      echo "disable static libraries"
+      write_oldobj=none
     fi
-    exit 0
-    ;;
 
-  --finish) mode="finish" ;;
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
 
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
+# Name of the PIC object.
+pic_object=$write_lobj
 
-  --quiet | --silent)
-    show=:
-    ;;
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
 
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
 
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
 
-  *)
-    nonopt="$arg"
-    break
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
     ;;
   esac
-done
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
 
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-fi
 
-if test -z "$show_help"; then
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
 
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    case $nonopt in
-    *cc | *++ | gcc* | *-gcc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
       ;;
     *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
       ;;
-    esac
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
   fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
   fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    prev=
-    lastarg=
-    srcfile="$nonopt"
-    suppress_output=
 
-    user_target=no
-    for arg
-    do
-      case $prev in
-      "") ;;
-      xcompiler)
-	# Aesthetically quote the previous argument.
-	prev=
-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
 
-	case $arg in
-	# Double-quote args containing other shell metacharacters.
-	# Many Bourne shells cannot handle close brackets correctly
-	# in scan sets, so we specify it separately.
-	*[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
 
-	# Add the previous argument to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
 
-      # Accept any command-line options.
-      case $arg in
-      -o)
-	if test "$user_target" != "no"; then
-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	  exit 1
-	fi
-	user_target=next
-	;;
 
-      -static)
-	build_old_libs=yes
-	continue
-	;;
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
 
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
 
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
 
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
 
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	lastarg=
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
-	for arg in $args; do
-	  IFS="$save_ifs"
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
 
-	  # Double-quote args containing other shell metacharacters.
-	  # Many Bourne shells cannot handle close brackets correctly
-	  # in scan sets, so we specify it separately.
-	  case $arg in
-	    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    arg="\"$arg\""
-	    ;;
-	  esac
-	  lastarg="$lastarg $arg"
-	done
-	IFS="$save_ifs"
-	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
 
-	# Add the arguments to base_compile.
-	if test -z "$base_compile"; then
-	  base_compile="$lastarg"
-	else
-	  base_compile="$base_compile $lastarg"
-	fi
-	continue
-	;;
-      esac
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
 
-      case $user_target in
-      next)
-	# The next one is the -o target name
-	user_target=yes
-	continue
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
 	;;
-      yes)
-	# We got the output file
-	user_target=set
+
+      target )
 	libobj="$arg"
+	arg_mode=normal
 	continue
 	;;
-      esac
 
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
 
-      # Aesthetically quote the previous argument.
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
 
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
 
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      case $lastarg in
-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
 	;;
-      esac
+      esac    #  case $arg_mode
 
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-	base_compile="$lastarg"
-      else
-	base_compile="$base_compile $lastarg"
-      fi
-    done
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
 
-    case $user_target in
-    set)
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
       ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
       ;;
     *)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
       ;;
     esac
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSfmso]'
     case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
     esac
 
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
     case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
       ;;
     esac
 
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
     if test "$build_old_libs" = yes; then
-      removelist="$obj $libobj"
+      removelist="$obj $lobj $libobj ${libobj}T"
     else
-      removelist="$libobj"
+      removelist="$lobj $libobj ${libobj}T"
     fi
 
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -467,11 +2138,10 @@
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
     else
+      output_obj=
       need_locks=no
       lockfile=
     fi
@@ -479,13 +2149,13 @@
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-	echo "\
+	$ECHO "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -496,15 +2166,21 @@
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
-	exit 1
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
       fi
-      echo $srcfile > "$lockfile"
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
     fi
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
@@ -512,53 +2188,25 @@
       fbsd_hideous_sh_bug=$base_compile
 
       if test "$pic_mode" != no; then
-	# All platforms use -DPIC, to notify preprocessed assembler code.
-	command="$base_compile $srcfile $pic_flag -DPIC"
+	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       fi
-      if test "$build_old_libs" = yes; then
-	lo_libobj="$libobj"
-	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-	if test "X$dir" = "X$libobj"; then
-	  dir="$objdir"
-	else
-	  dir="$dir/$objdir"
-	fi
-	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
 
-	if test -d "$dir"; then
-	  $show "$rm $libobj"
-	  $run $rm $libobj
-	else
-	  $show "$mkdir $dir"
-	  $run $mkdir $dir
-	  status=$?
-	  if test $status -ne 0 && test ! -d $dir; then
-	    exit $status
-	  fi
-	fi
-      fi
-      if test "$compiler_o_lo" = yes; then
-	output_obj="$libobj"
-	command="$command -o $output_obj"
-      elif test "$compiler_c_o" = yes; then
-	output_obj="$obj"
-	command="$command -o $output_obj"
-      fi
+      func_mkdir_p "$xdir$objdir"
 
-      $run $rm "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit 1
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
       fi
 
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
       if test "$need_locks" = warn &&
-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-	echo "\
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -572,88 +2220,42 @@
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
-	exit 1
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
-      if test x"$output_obj" != x"$libobj"; then
-	$show "$mv $output_obj $libobj"
-	if $run $mv $output_obj $libobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # If we have no pic_flag, then copy the object into place and finish.
-      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
-	 test "$build_old_libs" = yes; then
-	# Rename the .lo from within objdir to obj
-	if test -f $obj; then
-	  $show $rm $obj
-	  $run $rm $obj
-	fi
-
-	$show "$mv $libobj $obj"
-	if $run $mv $libobj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-
-	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-	if test "X$xdir" = "X$obj"; then
-	  xdir="."
-	else
-	  xdir="$xdir"
-	fi
-	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
-	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-	# Now arrange that obj and lo_libobj become the same file
-	$show "(cd $xdir && $LN_S $baseobj $libobj)"
-	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-	  exit 0
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
 
       # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile$pie_flag"
       else
-	# All platforms use -DPIC, to notify preprocessed assembler code.
-	command="$base_compile $srcfile $pic_flag -DPIC"
+	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-	output_obj="$obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit 1
-      fi
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-	echo "\
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -667,55 +2269,2839 @@
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
-	exit 1
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
-      if test x"$output_obj" != x"$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=$[^ ]*$ .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
 	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
 	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
       fi
+    done
 
-      # Create an invalid libtool object if no PIC, so that we do not
-      # accidentally link it into a program.
-      if test "$build_libtool_libs" != yes; then
-	$show "echo timestamp > $libobj"
-	$run eval "echo timestamp > \$libobj" || exit $?
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/$[ ']$$sysroot_regex/\1/g;"
       else
-	# Move the .lo from within objdir
-	$show "$mv $libobj $lo_libobj"
-	if $run $mv $libobj $lo_libobj; then :
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/$[ ']-[LR]$=/\1/g; s/$[ ']$=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
 	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
+	  dest=$arg
+	  continue
 	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
       fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%$[^/]*$$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
     fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
 
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
     fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
 
-    exit 0
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+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
+  # 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
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
     ;;
 
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+volatile const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$[\\"]$/\\\1/g
+s/$/\\n/
+s/$[^\n]*$.*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
     case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
-      # flag for every libtool invokation.
+      # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
@@ -729,9 +5115,10 @@
       allow_undefined=yes
       ;;
     esac
-    libtool_args="$nonopt"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
 
     compile_rpath=
     finalize_rpath=
@@ -745,8 +5132,11 @@
     linker_flags=
     dllsearchpath=
     lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -759,6 +5149,8 @@
     module=no
     no_install=no
     objs=
+    non_pic_objects=
+    precious_files_regex=
     prefer_static_libs=no
     preload=no
     prev=
@@ -770,27 +5162,47 @@
     temp_rpath=
     thread_safe=no
     vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
-	else
+	  prefer_static_libs=yes
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
-	fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
-	prefer_static_libs=yes
 	break
 	;;
       esac
@@ -800,32 +5212,33 @@
     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
     # Go through the arguments, transforming them on the way.
-    while test $# -gt 0; do
+    while test "$#" -gt 0; do
       arg="$1"
       shift
-      case $arg in
-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
 	case $prev in
 	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
 	  ;;
 	esac
 
 	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
 	    preload=yes
 	  fi
 	  case $arg in
@@ -852,9 +5265,9 @@
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -863,10 +5276,8 @@
 	  ;;
 	expsyms)
 	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
-	  fi
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
@@ -875,6 +5286,125 @@
 	  prev=
 	  continue
 	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
 	release)
 	  release="-$arg"
 	  prev=
@@ -885,37 +5415,54 @@
 	  case $arg in
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
+	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
 	  continue
 	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
 	  continue
 	  ;;
 	*)
@@ -924,23 +5471,23 @@
 	  continue
 	  ;;
 	esac
-      fi # test -n $prev
+      fi # test -n "$prev"
 
       prevarg="$arg"
 
       case $arg in
       -all-static)
 	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
 	fi
 	continue
 	;;
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -948,6 +5495,11 @@
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -965,8 +5517,7 @@
 
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -976,44 +5527,74 @@
 	continue
 	;;
 
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
       -L[A-Z][A-Z]*:*)
 	case $with_gcc/$host in
-	no/*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
 	  ;;
 	esac
 	continue
 	;;
 
       -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
-	  fi
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
 	  dir="$absdir"
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -1023,17 +5604,41 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
-	  *-*-mingw* | *-*-os2*)
+	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
 	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
 	continue
 	;;
 
@@ -1042,6 +5647,34 @@
 	continue
 	;;
 
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -no-fast-install)
 	fast_install=no
 	continue
@@ -1049,11 +5682,11 @@
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -1066,8 +5699,18 @@
 	continue
 	;;
 
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
       -o) prev=output ;;
 
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
       -release)
 	prev=release
 	continue
@@ -1084,23 +5727,37 @@
 	;;
 
       -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
 	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
+	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
 
-      -static)
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -1119,41 +5776,48 @@
 	continue
 	;;
 
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
       -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
 	arg=
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
+	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
 	arg=
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
+	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Xcompiler)
@@ -1166,64 +5830,156 @@
 	continue
 	;;
 
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
       # Some other compiler flag.
       -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
 
-      *.lo | *.$objext)
-	# A library or standard object.
-	if test "$prev" = dlfiles; then
-	  # This file was specified with -dlopen.
-	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-	    dlfiles="$dlfiles $arg"
-	    prev=
-	    continue
-	  else
-	    # If libtool objects are unsupported, then we need to preload.
-	    prev=dlprefiles
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
 	  fi
-	fi
 
-	if test "$prev" = dlprefiles; then
-	  # Preload the old-style object.
-	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
-	  prev=
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
 	else
-	  case $arg in
-	  *.lo) libobjs="$libobjs $arg" ;;
-	  *) objs="$objs $arg" ;;
-	  esac
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
 	fi
 	;;
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
+	func_resolve_sysroot "$arg"
 	if test "$prev" = dlfiles; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -1232,69 +5988,59 @@
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
       esac # arg
 
       # Now actually substitute the argument into the commands.
       if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
       fi
     done # argument parsing loop
 
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
+    if test "$module" = yes ; then
+      # [Mandriva] dropping ld option "--no-undefined" which is wrong for plugins
+      linker_flags=`$ECHO "X $linker_flags" | $Xsed -e 's/ --no-undefined//'`
+      compiler_flags=`$ECHO "X $compiler_flags" | $Xsed -e 's/ -Wl,--no-undefined//'`
     fi
 
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
     fi
 
+    oldlibs=
     # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    func_basename "$output"
+    outputname="$func_basename_result"
     libobjs_save="$libobjs"
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
-    if test ! -d $output_objdir; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test $status -ne 0 && test ! -d $output_objdir; then
-	exit $status
-      fi
-    fi
+    func_mkdir_p "$output_objdir"
 
     # Determine the type of output
     case $output in
     "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
+      func_fatal_help "you must specify an output file"
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -1303,30 +6049,52 @@
     esac
 
     specialdeplibs=
+
     libs=
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      case "$libs " in
-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-      esac
-      libs="$libs $deplib"
+      if $opt_preserve_dup_deps ; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
     done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
     deplibs=
     newdependency_libs=
     newlib_search_path=
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
     notinst_path= # paths that contain not-installed libtool libraries
+
     case $linkmode in
     lib)
-	passes="conv link"
+	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
 	  *.la) ;;
 	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -1342,40 +6110,109 @@
     *)  passes="conv"
 	;;
     esac
+
     for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
       if test "$linkmode" = prog; then
-	# Determine which files to process
 	case $pass in
-	dlopen)
-	  libs="$dlfiles"
-	  save_deplibs="$deplibs" # Collect dlpreopened libraries
-	  deplibs=
-	  ;;
+	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
       for deplib in $libs; do
 	lib=
 	found=no
 	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
 	-l*)
-	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
 	    continue
 	  fi
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
 	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    # Search the libtool library
-	    lib="$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=yes
-	      break
-	    fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
 	  done
 	  if test "$found" != yes; then
 	    # deplib doesn't seem to be a libtool library
@@ -1387,15 +6224,64 @@
 	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
 	    fi
 	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
 	  fi
 	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
 	-L*)
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -1404,31 +6290,38 @@
 	    fi
 	    if test "$pass" = scan; then
 	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
+	    func_warning "\`-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
 	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -1436,18 +6329,41 @@
 	  fi
 	  case $linkmode in
 	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      echo
-	      echo "*** Warning: This library needs some functionality provided by $deplib."
-	      echo "*** I have the capability to make that library automatically link in when"
-	      echo "*** you link to this library.  But I can only do this if you have a"
-	      echo "*** shared version of the library, which you do not appear to have."
-	    else
-	      echo
-	      echo "*** Warning: Linking the shared library $output against the"
-	      echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
 	    continue
 	    ;;
 	  prog)
@@ -1462,14 +6378,18 @@
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	    # If there is no dlopen support or we're linking statically,
-	    # we need to preload.
-	    newdlprefiles="$newdlprefiles $deplib"
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    newdlfiles="$newdlfiles $deplib"
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
 	  fi
 	  continue
 	  ;;
@@ -1478,21 +6398,18 @@
 	  continue
 	  ;;
 	esac # case $deplib
-	if test $found = yes || test -f "$lib"; then :
+
+	if test "$found" = yes || test -f "$lib"; then :
 	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
 	fi
 
 	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
-	fi
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
 
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
 
 	dlname=
 	dlopen=
@@ -1500,22 +6417,33 @@
 	libdir=
 	library_names=
 	old_library=
+	inherited_linker_flags=
 	# If the library was installed with an old release of libtool,
-	# it will not redefine variable installed.
+	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
 
 	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
+	func_source "$lib"
 
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $[^ $]*$/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
-	   # Add dl[pre]opened files of deplib
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -1523,49 +6451,58 @@
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
+	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	      tmp_libs="$tmp_libs $deplib"
-	    done
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
+	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
+
 	# Get the name of the library we link against.
 	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
 	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
+	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
 
 	# This library was specified with -dlopen.
 	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
 	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
 	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.
-	    dlprefiles="$dlprefiles $lib"
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -1576,49 +6513,88 @@
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
 	    abs_ladir="$ladir"
 	  fi
 	  ;;
 	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	func_basename "$lib"
+	laname="$func_basename_result"
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
 	  else
-	    dir="$libdir"
-	    absdir="$libdir"
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
 	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
 	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
 	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
@@ -1629,13 +6605,14 @@
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	  else
-	    deplibs="$lib $deplibs"
+	    deplibs="$lib $deplibs" # used for prog,scan pass
 	  fi
 	  continue
 	fi
 
+
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -1647,31 +6624,43 @@
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test $linkalldeplibs = yes; then
+	    if test "$linkalldeplibs" = yes; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    tmp_libs="$tmp_libs $deplib"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
 
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  # Link against this shared library
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
 
-	  if test "$linkmode,$pass" = "prog,link" ||
-	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -1680,7 +6669,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -1689,21 +6678,10 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
-	    if test "$linkmode" = prog; then
-	      # We need to hardcode the library path
-	      if test -n "$shlibpath_var"; then
-		# Make sure the rpath contains only unique directories.
-		case "$temp_rpath " in
-		*" $dir "*) ;;
-		*" $absdir "*) ;;
-		*) temp_rpath="$temp_rpath $dir" ;;
-		esac
-	      fi
-	    fi
 	  fi # $linkmode,$pass = prog,link...
 
 	  if test "$alldeplibs" = yes &&
@@ -1713,26 +6691,89 @@
 	    # We only need to search for static libraries
 	    continue
 	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
 
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
 	  fi
 
 	  if test -n "$old_archive_from_expsyms_cmds"; then
 	    # figure out the soname
 	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
 	      soname="$dlname"
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin*)
-		major=`expr $current - $age`
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
 		versuffix="-$major"
 		;;
 	      esac
@@ -1743,41 +6784,29 @@
 
 	    # Make a new name for the extract_expsyms_cmds to use
 	    soroot="$soname"
-	    soname=`echo $soroot | sed -e 's/^.*\///'`
-	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      eval cmds=\"$extract_expsyms_cmds\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
 	    dir=$output_objdir
 	    linklib=$newlib
-	  fi # test -n $old_archive_from_expsyms_cmds
+	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -1786,6 +6815,30 @@
 	    immediate | unsupported)
 	      if test "$hardcode_direct" = no; then
 		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
 	      elif test "$hardcode_minus_L" = no; then
 		case $host in
 		*-*-sunos*) add_shlibpath="$dir" ;;
@@ -1800,10 +6853,19 @@
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes; then
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
 		add="-l$name"
 	      elif test "$hardcode_shlibpath_var" = yes; then
 		add_shlibpath="$dir"
@@ -1816,14 +6878,13 @@
 	    esac
 
 	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
+	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -1832,23 +6893,24 @@
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
 	      add_dir="-L$libdir"
@@ -1856,12 +6918,27 @@
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
 	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
 	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
 	      add="-l$name"
 	    fi
 
@@ -1874,15 +6951,6 @@
 	    fi
 	  fi
 	elif test "$linkmode" = prog; then
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-
-	  # Try to link the static library
 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 	  # is not unsupported.  This is valid on all known static and
 	  # shared platforms.
@@ -1903,30 +6971,29 @@
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
 	    echo
-	    echo "*** Warning: This library needs some functionality provided by $lib."
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
 	    echo "*** I have the capability to make that library automatically link in when"
 	    echo "*** you link to this library.  But I can only do this if you have a"
 	    echo "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      echo "*** Therefore, libtool will create a static module, that should work "
-	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-	        echo
-	        echo "*** However, this would only work if libtool was able to extract symbol"
-	        echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	        echo "*** not find such a program.  So, this module is probably useless."
-	        echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
-	        build_libtool_libs=module
-	        build_old_libs=yes
+		build_libtool_libs=module
+		build_old_libs=yes
 	      else
-	        build_libtool_libs=no
+		build_libtool_libs=no
 	      fi
 	    fi
 	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
 	    deplibs="$dir/$old_library $deplibs"
 	    link_static=yes
 	  fi
@@ -1934,79 +7001,121 @@
 
 	if test "$linkmode" = lib; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
-	       test $link_static = yes; }; then
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
 	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
-	    tmp_libs="$tmp_libs $deplib"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    func_warning "cannot determine absolute directory name of \`$dir'"
 		    absdir="$dir"
 		  fi
 		  ;;
 		esac
-		if grep "^installed=no" $deplib > /dev/null; then
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
 		  path="-L$absdir/$objdir"
+		  ;;
+		esac
 		else
-		  eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
+		  eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
 		  path="-L$absdir"
 		fi
 		;;
-	      *) continue ;;
 	      esac
 	      case " $deplibs " in
 	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
+	      *) deplibs="$path $deplibs" ;;
 	      esac
 	    done
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
       if test "$pass" = dlpreopen; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
@@ -2014,14 +7123,13 @@
 	done
       fi
       if test "$pass" != dlopen; then
-	test "$pass" != scan && dependency_libs="$newdependency_libs"
 	if test "$pass" != conv; then
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -2037,9 +7145,30 @@
 	  eval tmp_libs=\"\$$var\"
 	  new_libs=
 	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
 	    case $deplib in
 	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
 	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
 	      case " $specialdeplibs " in
 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
 	      *)
@@ -2058,169 +7187,217 @@
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
-      if test "$pass" = "conv" &&
-       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
-	libs="$deplibs" # reset libs
-	deplibs=
-      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
     done # for pass
     if test "$linkmode" = prog; then
       dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
       dlprefiles="$newdlprefiles"
     fi
 
     case $linkmode in
     oldlib)
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+	func_warning "\`-dlopen' is ignored for archives"
       fi
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
 
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
-      objs="$objs$old_deplibs"
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
       # Make sure we only generate libraries of the form `libNAME.la'.
       case $outputname in
       lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
 	  eval libname=\"$libname_spec\"
 	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
 	fi
 	;;
       esac
 
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
 	  echo
-	  echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
 	fi
       fi
 
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
-      if test $# -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
 
       oldlibs=
       if test -z "$rpath"; then
 	if test "$build_libtool_libs" = yes; then
 	  # Building a libtool convenience library.
-	  libext=al
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
 	  build_libtool_libs=convenience
 	  build_old_libs=yes
 	fi
 
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
 
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
+	save_ifs="$IFS"; IFS=':'
 	set dummy $vinfo 0 0 0
+	shift
 	IFS="$save_ifs"
 
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
 
-	current="$2"
-	revision="$3"
-	age="$4"
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
 
 	# Check that each of the things are valid numbers.
 	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
-	if test $age -gt $current; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -2233,10 +7410,13 @@
 	darwin)
 	  # Like Linux, but with the current version available in
 	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
@@ -2247,19 +7427,31 @@
 
 	freebsd-elf)
 	  major=".$current"
-	  versuffix=".$current";
+	  versuffix=".$current"
 	  ;;
 
-	irix)
-	  major=`expr $current - $age + 1`
-	  verstring="sgi$major.$revision"
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
-	  while test $loop != 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="sgi$major.$iface:$verstring"
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
 	  done
 
 	  # Before this point, $major must not contain `.'.
@@ -2267,26 +7459,35 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
-	  major=.`expr $current - $age`
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  ;;
 
 	osf)
-	  major=`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix=".$current.$age.$revision"
 	  verstring="$current.$age.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test $loop != 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
 	    verstring="$verstring:${iface}.0"
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
 	  ;;
 
 	sunos)
@@ -2297,21 +7498,29 @@
 	windows)
 	  # Use '-' rather than '.', since we only want one
 	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
+	  func_arith $current - $age
+	  major=$func_arith_result
 	  versuffix="-$major"
 	  ;;
 
 	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
+	  func_fatal_configuration "unknown library version type \`$version_type'"
 	  ;;
 	esac
 
 	# Clear the version info if we defaulted, and they specified a release.
 	if test -z "$vinfo" && test -n "$release"; then
 	  major=
-	  verstring="0.0"
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
 	  if test "$need_version" = no; then
 	    versuffix=
 	  else
@@ -2329,7 +7538,7 @@
 	# Check to see if the archive will have undefined symbols.
 	if test "$allow_undefined" = yes; then
 	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    func_warning "undefined symbols not allowed in $host shared libraries"
 	    build_libtool_libs=no
 	    build_old_libs=yes
 	  fi
@@ -2337,40 +7546,65 @@
 	  # Don't allow undefined symbols.
 	  allow_undefined_flag="$no_undefined_flag"
 	fi
+
       fi
 
-      if test "$mode" != relink; then
-	# Remove our outputs.
-	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_append libobjs " $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$opt_mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
       fi
 
       # Now set the variables for building old libraries.
       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
-	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
-	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
@@ -2381,7 +7615,7 @@
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
@@ -2391,27 +7625,36 @@
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -2437,7 +7680,7 @@
 	  # This might be a little naive.  We might want to check
 	  # whether the library exists or not.  But this is on
 	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behaviour.
+	  # implementing what was already the behavior.
 	  newdeplibs=$deplibs
 	  ;;
 	test_compile)
@@ -2445,90 +7688,139 @@
 	  # limits. Maybe even breaks it.  We compile a program, linking it
 	  # against the deplibs as a proxy for the library.  Then we can check
 	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
+	  $opt_dry_run || $RM conftest.c
 	  cat > conftest.c <<EOF
 	  int main() { return 0; }
 EOF
-	  $rm conftest
-	  $CC -o conftest conftest.c $deplibs
-	  if test $? -eq 0 ; then
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name="`expr $i : '-l$.*$'`"
-	      # If $name is empty we are operating on a -L argument.
-	      if test -n "$name" && test "$name" != "0"; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		set dummy $deplib_matches
-		deplib_match=$2
-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		  newdeplibs="$newdeplibs $i"
-		else
-		  droppeddeps=yes
-		  echo
-		  echo "*** Warning: This library needs some functionality provided by $i."
-		  echo "*** I have the capability to make that library automatically link in when"
-		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which you do not appear to have."
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=""
+		    ;;
+		  esac
 		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occured in the first compile.  Let's try to salvage the situation:
-	    # Compile a seperate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l$.*$'`"
-	     # If $name is empty we are operating on a -L argument.
-	      if test -n "$name" && test "$name" != "0"; then
-		$rm conftest
-		$CC -o conftest conftest.c $i
-		# Did it work?
-		if test $? -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
 		    echo
-		    echo "*** Warning: This library needs some functionality provided by $i."
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
 		    echo "*** I have the capability to make that library automatically link in when"
 		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which you do not appear to have."
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
 		  fi
 		else
 		  droppeddeps=yes
 		  echo
-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "***  make it link in!  You will probably need to install it or some"
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
 		  echo "*** library that it depends on before this library will be fully"
 		  echo "*** functional.  Installing it before continuing would be even better."
 		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
 	    done
 	  fi
 	  ;;
 	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 $.*$"`
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l$.*$'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      libname=`eval \\$echo \"$libname_spec\"`
-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		    for potent_lib in $potential_libs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
 			continue
 		      fi
 		      # The statement above tries to avoid entering an
@@ -2538,74 +7830,110 @@
 		      # but so what?
 		      potlib="$potent_lib"
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | sed 10q \
-			 | egrep "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
-		    done
-	      done
+		  done
+		done
+	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
 		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
 		echo "*** I have the capability to make that library automatically link in when"
 		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 $.*$"`
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l$.*$'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      libname=`eval \\$echo \"$libname_spec\"`
-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		for potent_lib in $potential_libs; do
-		  if eval echo \"$potent_lib\" 2>/dev/null \
-		      | sed 10q \
-		      | egrep "$match_pattern_regex" > /dev/null; then
-		    newdeplibs="$newdeplibs $a_deplib"
-		    a_deplib=""
-		    break 2
-		  fi
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
 		done
-	      done
+	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
 		echo
-		echo "*** Warning: This library needs some functionality provided by $a_deplib."
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
 		echo "*** I have the capability to make that library automatically link in when"
 		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have."
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-	     grep . >/dev/null; then
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
 	    echo
 	    if test "X$deplibs_check_method" = "Xnone"; then
 	      echo "*** Warning: inter-library dependencies are not supported in this platform."
@@ -2614,7 +7942,8 @@
 	    fi
 	    echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	  fi
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -2625,8 +7954,8 @@
 
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
@@ -2634,7 +7963,7 @@
 	  if test "$module" = yes; then
 	    echo
 	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
 	    echo "*** a static module, that should work as long as the dlopening"
 	    echo "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
@@ -2656,7 +7985,7 @@
 	    echo "*** automatically added whenever a program is linked with this library"
 	    echo "*** or is declared to -dlopen it."
 
-	    if test $allow_undefined = no; then
+	    if test "$allow_undefined" = no; then
 	      echo
 	      echo "*** Since this library must not contain undefined symbols,"
 	      echo "*** because either the platform does not support them or"
@@ -2675,6 +8004,41 @@
 	# Done checking deplibs!
 	deplibs=$newdeplibs
       fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -2683,15 +8047,22 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -2700,18 +8071,18 @@
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -2719,13 +8090,13 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -2733,152 +8104,491 @@
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
 
 	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
-	realname="$2"
-	shift; shift
+	shift
+	realname="$1"
+	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
 	else
 	  soname="$realname"
 	fi
-	test -z "$dlname" && dlname=$soname
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
 
 	lib="$output_objdir/$realname"
+	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
-	done
-
-	# Ensure that we have .o objects for linkers which dislike .lo
-	# (e.g. aix) in case we are running --disable-static
-	for obj in $libobjs; do
-	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$obj"; then
-	    xdir="."
-	  else
-	    xdir="$xdir"
-	  fi
-	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-	  if test ! -f $xdir/$oldobj; then
-	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-	  fi
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
 	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
+	    func_verbose "generating symbol list for \`$libname.la'"
 	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    eval cmds=\"$export_symbols_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd" || exit $?
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
 	    done
 	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
 	  fi
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	inst_prefix_arg=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    if test -n "$inst_prefix_dir" && test "$inst_prefix_dir" != "/" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then
+	    	func_append inst_prefix_arg " $test_deplib"
+	    else
+		func_append tmp_deplibs " $test_deplib"
+	    fi
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+	if test -n "$inst_prefix_arg"; then
+		deplibs="$inst_prefix_arg $deplibs"
 	fi
 
 	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
 	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "mkdir $gentop"
-	    $run mkdir "$gentop"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "mkdir $xdir"
-	      $run mkdir "$xdir"
-	      status=$?
-	      if test $status -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+	    func_append generated " $gentop"
 
-	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-	    done
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval cmds=\"$archive_expsym_cmds\"
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
 	else
-	  eval cmds=\"$archive_cmds\"
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
 	fi
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$opt_mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
 	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
 	done
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
 	fi
 
 	# Create links to the real library.
 	for linkname in $linknames; do
 	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
 	  fi
 	done
 
@@ -2891,38 +8601,35 @@
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+	func_warning "\`-dlopen' is ignored for objects"
       fi
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
 
       case $output in
       *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
 	;;
       *)
 	libobj=
@@ -2931,7 +8638,7 @@
       esac
 
       # Delete the old objects.
-      $run $rm $obj $libobj
+      $opt_dry_run || $RM $obj $libobj
 
       # Objects from convenience libraries.  This assumes
       # single-version convenience libraries.  Whenever we create
@@ -2940,150 +8647,141 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "mkdir $gentop"
-	  $run mkdir "$gentop"
-	  status=$?
-	  if test $status -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
+	  func_append generated " $gentop"
 
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "mkdir $xdir"
-	    $run mkdir "$xdir"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-	  done
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
-      eval cmds=\"$reload_cmds\"
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
       if test -z "$libobj"; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test "$build_libtool_libs" != yes; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
 	# Create an invalid libtool object if no PIC, so that we don't
 	# accidentally link it into a program.
-	$show "echo timestamp > $libobj"
-	$run eval "echo timestamp > $libobj" || exit $?
-	exit 0
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
       fi
 
       if test -n "$pic_flag" || test "$pic_mode" != default; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
 	output="$libobj"
-	eval cmds=\"$reload_cmds\"
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      else
-	# Just create a symlink.
-	$show $rm $libobj
-	$run $rm $libobj
-	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-	if test "X$xdir" = "X$libobj"; then
-	  xdir="."
-	else
-	  xdir="$xdir"
-	fi
-	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
+	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
       if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
+	func_show_eval '${RM}r "$gentop"'
       fi
 
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
 
     prog)
       case $host in
-	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
       esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
 
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
 	;;
       esac
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3091,7 +8789,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -3110,25 +8808,32 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -3154,18 +8859,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -3179,231 +8884,55 @@
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
 
-	    if test -n "$exclude_expsyms"; then
-	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "sed -e 's/$[][.*^$]$/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`echo "$arg" | sed -e 's%^.*/%%'`
-	    $run eval 'echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    sed -n -e 's/^: $[^ ]*$ $/  {\"\1\", (lt_ptr_t) 0},/p' \
-		-e 's/^. $[^ ]*$ $[^ ]*$$/  {"\2", (lt_ptr_t) \&\2},/p' \
-		  < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr_t) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
 
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
 	fi
 
-	exit $status
-      fi
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
 
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
+	exit $exit_status
       fi
 
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
@@ -3420,7 +8949,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -3428,7 +8957,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -3438,13 +8967,19 @@
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
-	$run $rm $output
+	$opt_dry_run || $RM $output
 	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit 0
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
       fi
 
       if test "$hardcode_action" = relink; then
@@ -3452,13 +8987,13 @@
 	link_command="$compile_var$compile_command$compile_rpath"
 	relink_command="$finalize_var$finalize_command$finalize_rpath"
 
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
       else
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -3470,245 +9005,99 @@
       fi
 
       # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
 
       # Now create the wrapper script.
-      $show "creating $output"
+      func_verbose "creating $output"
 
       # Quote the relink command for shipping.
       if test -n "$relink_command"; then
 	# Preserve any variables that may affect compiler behavior
 	for var in $variables_saved_for_relink; do
 	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	  fi
 	done
-	relink_command="cd `pwd`; $relink_command"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
 	# win32 will think the script is a binary if it has
 	# a .exe suffix, so we strip it off here.
 	case $output in
-	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
 	esac
 	# test for cygwin because mv fails w/o .exe extensions
 	case $host in
-	  *cygwin*) exeext=.exe ;;
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
 	  *) exeext= ;;
 	esac
-	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if (eval \$relink_command); then :
-      else
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
 	case $host in
-	# win32 systems need to use the prog path for dll
-	# lookup to work
-	*-*-cygwin* | *-*-pw32*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
 	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
 
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
-"
+	    func_emit_wrapper no > $output
+	    chmod +x $output
 	  ;;
 	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit 0
+      }
+      exit $EXIT_SUCCESS
       ;;
     esac
 
@@ -3716,7 +9105,7 @@
     for oldlib in $oldlibs; do
 
       if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
+	oldobjs="$libobjs_save $symfileobj"
 	addlibs="$convenience"
 	build_libtool_libs=no
       else
@@ -3724,110 +9113,179 @@
 	  oldobjs="$libobjs_save"
 	  build_libtool_libs=no
 	else
-	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    func_append oldobjs " $symfileobj"
+	  fi
 	fi
 	addlibs="$old_convenience"
       fi
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "mkdir $gentop"
-	$run mkdir "$gentop"
-	status=$?
-	if test $status -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
+	func_append generated " $gentop"
 
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "mkdir $xdir"
-	  $run mkdir "$xdir"
-	  status=$?
-	  if test $status -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
+	cmds=$old_archive_from_new_cmds
       else
-	# Ensure that we have .o objects in place in case we decided
-	# not to build a shared library, and have fallen back to building
-	# static libs even though --disable-static was passed!
-	for oldobj in $oldobjs; do
-	  if test ! -f $oldobj; then
-	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$oldobj"; then
-	      xdir="."
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
 	    else
-	      xdir="$xdir"
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
 	    fi
-	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
 	  fi
-	done
-
-	eval cmds=\"$old_archive_cmds\"
+	fi
       fi
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$cmds" 'exit $?'
     done
 
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
 
     # Now create the libtool archive.
     case $output in
     *.la)
       old_library=
       test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
+      func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
       for var in $variables_saved_for_relink; do
 	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
 
       # Only create the output if not a dry run.
-      if test -z "$run"; then
+      $opt_dry_run || {
 	for installed in no yes; do
 	  if test "$installed" = yes; then
 	    if test -z "$install_libdir"; then
@@ -3839,50 +9297,109 @@
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_basename "$deplib"
+		name="$func_basename_result"
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
 	    newdlfiles=
+
 	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`sed -n -e 's/^libdir=$.*$$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
-	  $rm $output
+	  $RM $output
 	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
 	  esac
-	  $echo > $output "\
+	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -3896,9 +9413,15 @@
 # The name of the static archive.
 old_library='$old_library'
 
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
 # Libraries that this one depends upon.
 dependency_libs='$dependency_libs'
 
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
 # Version information for $libname.
 current=$current
 age=$age
@@ -3907,694 +9430,39 @@
 # Is this an already installed library?
 installed=$installed
 
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
 # Files to dlopen/dlpreopen
 dlopen='$dlfiles'
 dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test $need_relink = yes; then
-	    $echo >> $output "\
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
 	done
-      fi
+      }
 
       # Do a symbolic link so that the libtool archive can be found in
       # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test $# -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-      done
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
       ;;
     esac
+    exit $EXIT_SUCCESS
+}
 
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test $# -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  eval cmds=\"$postinstall_cmds\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit 0
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Do a test to see if this is really a libtool program.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-	      else
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      eval cmds=\"$old_postinstall_cmds\"
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec $SHELL $0 --finish$current_libdirs
-      exit 1
-    fi
-
-    exit 0
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  eval cmds=\"$finish_cmds\"
-	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = ":" && exit 0
-
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      echo "   $libdir"
-    done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved enviroment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
 
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
 
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
     files=
     rmforce=
     exit_status=0
@@ -4606,49 +9474,47 @@
     for arg
     do
       case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
 
     rmdirs=
 
     for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$objdir"
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
       else
-	objdir="$dir/$objdir"
+	odir="$dir/$objdir"
       fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test $mode = uninstall && objdir="$dir"
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test $mode = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
       # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-        || (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-        :
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
       elif test -d "$file"; then
-        exit_status=1
+	exit_status=1
 	continue
       elif test "$rmforce" = yes; then
-        continue
+	continue
       fi
 
       rmfiles="$file"
@@ -4656,291 +9522,154 @@
       case $name in
       *.la)
 	# Possibly a libtool archive, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  if test $mode = uninstall; then
+	  case "$opt_mode" in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      eval cmds=\"$postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test $? != 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test $? != 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
       *.lo)
-	if test "$build_old_libs" = yes; then
-	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
-	  rmfiles="$rmfiles $dir/$oldobj"
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
 	fi
 	;;
 
       *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
+	if test "$opt_mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
 
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    fi
 	  fi
 	fi
 	;;
       esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
       fi
     done
 
     exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
-fi # test -z "$show_help"
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE."
-  exit 0
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
+}
 
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
 
-Remove libraries from an installation directory.
+test -z "$opt_mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
 
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
 
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
+exit $exit_status
 
-echo
-$echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
 # sh-indentation:2
 # End:
+# vi:sw=2
+

grip-3.9.0.tar.gz/pixmaps/16x16 Added

grip-3.9.0.tar.gz/pixmaps/16x16/apps Added

grip-3.9.0.tar.gz/pixmaps/16x16/apps/grip.png Added

grip-3.9.0.tar.gz/pixmaps/22x22 Added

grip-3.9.0.tar.gz/pixmaps/22x22/apps Added

grip-3.9.0.tar.gz/pixmaps/22x22/apps/grip.png Added

grip-3.9.0.tar.gz/pixmaps/24x24 Added

grip-3.9.0.tar.gz/pixmaps/24x24/apps Added

grip-3.9.0.tar.gz/pixmaps/24x24/apps/grip.png Added

grip-3.9.0.tar.gz/pixmaps/32x32 Added

grip-3.9.0.tar.gz/pixmaps/32x32/apps Added

grip-3.9.0.tar.gz/pixmaps/32x32/apps/grip.png Added

grip-3.9.0.tar.gz/pixmaps/48x48 Added

grip-3.9.0.tar.gz/pixmaps/48x48/apps Added

grip-3.9.0.tar.gz/pixmaps/48x48/apps/grip.png Added

grip-3.9.0.tar.gz/pixmaps/64x64 Added

grip-3.9.0.tar.gz/pixmaps/64x64/apps Added

grip-3.9.0.tar.gz/pixmaps/64x64/apps/grip.png Added

grip-3.9.0.tar.gz/pixmaps/72x72 Added

grip-3.9.0.tar.gz/pixmaps/72x72/apps Added

grip-3.9.0.tar.gz/pixmaps/72x72/apps/grip.png Added

grip-3.4.3.tar.gz/pixmaps/Makefile.am -> grip-3.9.0.tar.gz/pixmaps/Makefile.am Changed

grip-3.4.3.tar.gz/pixmaps/Makefile.in -> grip-3.9.0.tar.gz/pixmaps/Makefile.in Changed

grip-3.9.0.tar.gz/pixmaps/grip.gif Changed

grip-3.9.0.tar.gz/pixmaps/grip.png Changed

grip-3.9.0.tar.gz/pixmaps/scalable Added

grip-3.9.0.tar.gz/pixmaps/scalable/apps Added

grip-3.9.0.tar.gz/pixmaps/scalable/apps/grip.svg Added

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="75px" height="78px" viewBox="0 0 75 78" enable-background="new 0 0 75 78" xml:space="preserve">  <image id="image0" width="75" height="78" x="0" y="0"
+    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABOCAMAAABfXRtrAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACvlBMVEX/gP//Fiz/DSD/CTf/
+FSv/ETH/ETH/ECz/EC3/Dyr/Eyv/cIb/yNH/l6j/PVn/ES//ID3/2N7/6e3/p7X/ESz/iJr/Lkv/
+tMH/GTT/LEj/eo7/ES//vMf/ES7/SmT/V3D/YHj/FzT/aH7/IDzs9v//GTH/NVD/IkL/KFr/oLf/
+HEP/JVf/Ikj/NWH/uMv/M2n/LV//aI7/6Pr/Onf/KF3/PHr/W5Pt2v/61f//P3f/UKP/SJD/TZn/
+gP//LmP/OG//f7Lc1f/P2P//g9f/bdX/g/j/gPb5gP//kKr/2Ov/nsD/ibDrz/+kvf8Sj/8vnP8t
+ov8Tlf9Cjf+eh/+TgP8hhf//MXn/5P3t4f+hnv8Zmv+e0v+o2v88tf8Wjf9JjP9thP8Viv//W7L/
+J1r/T4v/UJP/ZcGdi/+53//M5/8Wjf8YjP8bjf8UjP//Y8P/a87/gPPciP+kif84jv8WjP+8gv//
+Pn5Yif+Aif+Viv+Ci/9Yjv9TjP8VjP8Xjf8ajv+ohv//W7P/VX7/qMT/3f3div9qjf8xj/8ujf8o
+jf9ai///Vqv/s/fT3f//jdf6hP9Qtf9Bq/8iov8Vjv8Sj///iv/Czv//wO3/PHfiwf/CiP9rwP/d
+8P/C5f83pP94wv+Ayf9+zv+q1f8orf9huf+Ruf9vyP9Uw/+9if/Qhf+My/9Urv+Pzv8tj/8oj/9I
+jf9Kj/9ijP99jP+Pi/+5jf9Ro/8nkv//gvvCo/+Fuf9ks/+rzf+qtv9zi/9Bmv+Wwv//m+L/bdT/
+YaXhkf95if81mv+xjf+iwP//e77/Vapui///aL290v//ct2Qi/+4xP+tyf+2q/9ajP99lP8jm/9g
+n/9CjP+tlv8glf9orv+Qqf+vsP//TaFEmv+ClP+ds///pub/mM3/pNP/d9//dMf/u/Vrzv//UHH/
+RXX///9fzwn6AAAA6XRSTlMEFyg4SFhoxN22d/b6+PSH7vr6+qf28vnF5/aX+dL29fXi9eL8m+nT
+p+uJZ3jU6HeJ2uJYR4jI1sq2WUcoGJXEydrlq2dIOCjq59jbydjS6vPfZUIoFznZ3bvp/Pz0mFA2
+JTi2wbaYffz8iV9BM0hYWGVwelA1Z0NSYG58iqd7bFJo1tvUU2CIlqZujLXpsWr09O+zwY7gxqnH
+j/T8/PT09fz68/TR9PRhR/fy+7DBmK+XfIuazM12t+7c7NOnyeywd7qbnNqm4rh7i6bphqHZ58Oo
+xOzQqbLf6ce8hbGyyrjHyo6pu/jm0hJasfAAAAABYktHROlR00eUAAAACXBIWXMAAA3XAAAN1wFC
+KJt4AAAAB3RJTUUH4QceFBoNxpkT8QAADENJREFUWMOlVgl7G9UVtWRpNBpLGs1osaPRNsokQJwA
+xmYLNpQlQIEqlmM7YMtylFLQYickVkjiRHJCiZdAgyyJQPFIdh05OMZL4kBCylLaUNIUWgpNga6U
+Ftr+jN73tFqWKXx9nz4vo/fO3Hvuuee+iopvuyQSaSUsqUQi+dZnlyPJ5LBkldL/F04iqZQRClJJ
+EQjt24BJCiv3RCojlFUqtYaks2jfHEcKS4KzQXgoQzmhZViG1WlIivhGYOgYQCCSK2WVmYVRIUN9
+FcsY1CpGbVQS8v8NlsGRyYBlAj4EJluGQGVyiqxmDTWKVSaGqSIpyPPrwHBECIcgKJrTK5UKhVJP
+EwSGhEdGhtHoOU6hMbM6LY3BJCsjVWIgvYU0Wm0mk8FgMNmtq3hSSVMUTSurWB3JoT95A2s2citH
+lkEiCJo02tVmhmHM1dU6HfpDVW3QkHpOz5tZB0eh1CmFDUJcEQwXSk7oeZuOYapNdo2RR0ur1dgN
+ZpbVreaUVpYx0oQMk8BpMmBlCpARNSA5zIy5ykgqOYqiEFGQEOJHYDQKi5pVKyikeiQPWqMC5HLV
+xCWnSLuK0dl4PYLJ1E+GKNdbdBCXRcOwNo7Akke7AUylpRBYGSilUcforKBqIqsCJCz0Cm61iq1S
+KKpYfBbFgfdzVkZHgs4ky6giSAfDOHiMVFmZ0zv6huI0LKPheR1rUBJZgjIvr2JsJZRloaDMGiVV
+AKrInpFTShOr4y1WhtUgfvKZyClex5RkiR+TOkatpQsWICm8hgItVClqTKyZpGTSolaX0xpWbSGK
+nuGoIAE1Wab9kTnQoAUNqQVA/dJzYEEGpjhWnDmpZk0WqoyT4AOghRpIMSuBJeloVUC/LI+FSDSx
+BgXqfOkyraD9DOuwQIo6nOISLELvYIzAWCFtfba4y80S9hOcnVUZ+eUpYix6FaNWELICWVqmrOiy
+KZKgBYUF9w+uvyRnKMiFOIsanc1nSKqBQGKFzpJTRpC7xWJAKWZCz3guMjSCXqM3oWbIhQXyBbLK
+djwKCzZXa/m1Ktahx8XBMGggYY9TroL2shD5sHRmvnyGCIviwUsVChPLWDksv0pZHofUWg3VLGvm
+iSzxnI2xF5NavCBqGvWPEiwCdnHYOQjc7VqNw1DNsCzLmE2kPE9tNZ/t2BVS1PFKvVYHgek5mqZw
+OCadikXLbHAYeSXiHrEFHm7nyhJfkesfh34Nx/EwMOwWC2+0Z8JhGZ3BZuQVHB69WVEbMkayHClj
+UkgL2OKVNpiMOhVOS6Uz2TSrFRAnlXEVJGoZoVUt6c6ioLAUFaAFC405Utqz4TisEI+FrEFQ2csF
+qqKctrF2bEElMWUsm+ZAC7bsuOAsVWqTbS1fYyF5UsGvtWqVdMFWilIsxZIiJCWpUYOXchSejjAv
+SQXJWyw1aJwA+dVkwe4RFl9d0rH5buBIKzoA44KmcI5r9DB6r1prq1JnyBewb0jyWJTWjHy3hHps
+HRozo1KrdTBSEfVYmmtxOJh8tcmkYq10vmhwhLKCIvJeVqQFpZ1RObQWBTDDwQJ6bAZdXgsarUIJ
+OxyFo4h6O/bF0rCwdWj0NI1Hv0WL5jjCgXCsWpjg8JBbY1SZ9ESOaXj9GgOzqpR6xLvSBEMZlw84
+N2JNVRvsGq1Fj8nDpSB1oKZcGyMs9fIy4pKoDAoaj0kop1bFmlGr4HbEAxg/Vhh0BWVKMBZfDgs1
+FugQj1oa7M4K+WZHsBQv6C7AKlg9PLgaxyUtxaKyWJV4bNdcU716Hfwny1wQ8QJKl8SFscxlc9Qy
+JiVYLfK82vUbrr2mZn1W4bmxCe+wlOZoUBmXY1Uif9SivpXLa6+7vu6GuuvrG6S5UZ6Tk0WNsfI5
+Ug5GU+qp2Ldt4Fo0VUvUXnfjTTffcuvG2xqbil+IsHgk88pCXKBVK11qE9gh1YzOqFiz7vY7vnPn
+XXffs+ne+5ZuwWMWaVWSxyLWgniXYSE2+PuZ7z7gqHvwoe85Nze7Wra0trWVuKSGsdEFLNzbaFQC
+VlvRXom0vaFWseEB8w1bH37okY5Od5ene1trdgf8bGtqbCdgThipfCcjkpXgOYS8sampzduWWxUV
+TY3bG+rXf3/Do4/+4LHHO3z+rkCwpzezwQu/vK2NDbV6g5ksygjdemyMZn399tbW3uzyeuHjbb3v
+vnt3bNq584ldu/ucXV0dgWCoJ7ejt2fbtj07nrzq2vsVcpm0wKCMWKV68OqNm7aEQqFgCK0eWLB/
+294t+/bt39/ff+BgwBP2RAbgG/w17At27zu06fBTW+vWFakJEVbzw6fv2HlksGUgEIhEBvAKBoOh
+7uBAS19f39DA0PDIyIhnKBIcCOIvIwORQORo/+5nnn14Q23Dkltc/bq6Hx17rt/jau6KjsacnkDc
+6UoAZgR+O8MdHQmPJ+7qSMD5AfSNx+OKjUa7ml0jzx9/4cX69sai22Vjw5N33Pnjl1xjbr8oisnO
+qCsFVYsHAuEut3t8wv0TVzgc65w84YF1wt052pHuRBv97jHX1N337NjeVIy1feMzz051uEVBEJN+
+UfBPToriSRTMmOiH/zsBa9Qvvhz2eMJpQfRNAhLaJwju2EvTp/YUYVU0bd+06/kOtyD4Z15JpdIz
+IkKYiIfD8Qk//DV7IhGOj4rCyTA8wej+2WgqFZ0VBdHd0T+411sk4KY9p3bPnQSo6Pzw0JDHmfbD
+qycS8Xh8Ak7OuMKecDgqiuPxcDw+7vf5kmnn8PDCgnMMQhtPDHb3FrDaWrft62/2CWL09JmDfX1A
+UxrePYOwIMTJDkQT5CiMxwFsXPD70/GhoQOLZ199LS0KydjR7m2Fbmlr2zs4DO+Ydb662D842BIJ
+nOsUBYw1IQhjYU8gEvAAXxOQYhzCn3EO9x3dv/v86xfOzQriGHSDtwDl7W2Zg6fpn75+fvrQvu6B
+iAdemMlR8I+CRCMRT1cuR2DCA1BH7jn2xptvwb6ZOGAV4vL2tLw9KfhTUz975+c7T20Z7POMZuJK
+IKwAElo2LshR9KeGAerwL+48fvHdlF+YdJZi/dINp967dPzYjTsPDfYNAzu5uE5grECXH+oIpYVq
+pBYWpw8/Cob2+BmE5SrGqvD2BFGO0TMXj9/1q8u7+g8MRwtxpQLQTgMIC+UYhhxfWfj1rvdvuevY
++cWFV5bl2NYTCowJwkT87MXjHxz7zeJBwMhxL54IQG9msUZGgC9xYu63Fz/84J3ziwdxbTyh3uIc
+e0MDqaTgSy2cvfjh7z569ePmJIprbg7l2IzjigBf4/G5ufBJ0e9L/f7CpdcBahhS9KciS7CAsAHn
+rCBMXll4972pC3/Y7PMn/Vks8USkpQWwoI4T4blPRsagwdyp1z49e2ZhJOUTQEgoxSLhA2GBWBI6
+IvqZ03kl6hb9SXEicfoTrImhlpbBo32oh+KfnI6PJTtnfL705nPOK2mASsYioWLqITJI0gOMCH5f
+Z6fPjxo3iwVVO3B0/6H9B6CyY+GP35pD/eiH/oZ90EH+rnBJWJBkKBiIpzpR74MFzPzxDVEYn3/v
+rXg06buyOH3kyPRizJfsGvn0T+eAe9/4TBIsR4AWbw4HEVtLsHp7gpFA2DU6NjM7EY3Nvz0uium3
+p/487IrFErsuX778l+cSV2Ku0xcu/BWwZuadzenx2Yl0szMSLCY+Rz7CAhEknInw/LnEDPD0tzcv
+XZr6/PNH/v7FF1/846HPp6am3vzo0znASiO/hr2eCJolS6LKxBUJxxPhBKz5ROIcFMjnOvvP9798
+56sXbn746a1bn77lq2ePffnY+cdHIOLo8PAQmgdoxHiXRpXpovCJl/91cnN8fn4+Ed88KYgn4/3T
+Txy+7vZbb6qrs9f9+z8v3nh45xPTi8PQj6NDfQPBEJ5UJUHlBIYs2jfW3PFZcxoc1tdxYPDUjtvq
+N9bX19ZStbW19fUbd5w6dNQDdRzNzEk0b0uRMgILBWIAJvrcbtCEOBkLtOzds729vb2hoUGGP+3t
+2/dsaQl0JX2xgRDKra2iLBRKMhTpSE8mM/Ml7YoEe7a1NjVJmzKXSWmjVNrU1NraHYHKgtLBlcvi
+ZO2wJxT0uFLp8fH0qMsDb+5FdxpJ8UKN2wOzNthThqdisDYEhowK7ApVKC8bSUVF/iKIwIBy79dB
+5ULDlwVYvSu9GC443pU4L9mXv+V4V9ycu1CVW/8FdvH1cqxxNGgAAAAldEVYdGRhdGU6Y3JlYXRl
+ADIwMTctMDctMzBUMjA6MjY6MTMrMDI6MDDlU27jAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTA3
+LTMwVDIwOjI2OjEzKzAyOjAwlA7WXwAAAABJRU5ErkJggg==" />
+</svg>

grip-3.4.3.tar.gz/po/be.po -> grip-3.9.0.tar.gz/po/be.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: grip.old\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2003-06-29 14:38+0300\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -90,12 +90,12 @@
 msgid "General"
 msgstr ""
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Запіс"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Кадаваньне"
 
@@ -140,11 +140,16 @@
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -154,383 +159,383 @@
 "Вы мусіце пераканфігураваць Grip.\n"
 "Ваш стары файл канфігурацыі будзе захаваны з канчаткам -old."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "паслужнік %s, порт %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Канфігурацыя"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Прылада CDRom"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не перарываць прайграваньне падчас выхаду/запуску"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Пераматаць назад пасьля спыненьня"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr ""
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Аўтапрайграваньне новага дыска"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Шуфляваць перад кожным прайграваньнем"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr ""
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Праграма запісу:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Каманда запісу"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Радок запісу"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Выключыць paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Выключыць extra paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Выключыць scratch"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "дэтэктаваньне"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "аднавіць"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr ""
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Фармат файла запіса"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Фармат файла запіса"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Прылада SCSI"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Праграма запісу"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Дакладнае значэньне запісу"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Максымум незакадаваных файлаў .wav"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Аўтазапіс з новага дыска"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Сыгнал пасьля запісу"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr ""
 "Вызваленьне дыска\n"
 "пасьля запісу"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr ""
 "Затрымка перад\n"
 "вызваленьнем"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Затрымка перад запісам"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Спыняць прыладу cdrom між трэкамі"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Каманда фільтрацыі для *.wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Каманда фільтрацыі дыска"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Выбары"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Кодэр:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Каманда кадаваньня"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Радок кадаваньня"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Фармат файла кадаваньня"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Фармат файла кадаваньня"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Фармат файла кадаваньня"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Кодэр"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Унесьці зьвесткі у базу даньняў SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Ствараць файлы .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Выкарыстоўваць адносны шлях ў файлах .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Фармат файла M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Бітавая хуткасьць кадаваньня (Кбіт/сэк)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Нумар працэсара для выкарыстаньня"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Дакладнае значэньне кадэра"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Каманда філтраваньня кодэра"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Дадаць тэг ID3 да кадаваных файлаў"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Дадаць тэг ID2 да кадаваных файлаў"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Поле камэнтара ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Паслужнік БД"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Шлях CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Першасны паслужнік"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Другасны паслужнік"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Адпраўка зьвестак у БД праз э.пошту"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 #, fuzzy
 msgid "DB Character set encoding"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Выкарыстоўваць пашырэньні freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Аўтаматычна запытваць зьвесткі аб дыске"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "БД дыскаў"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Выкарыстоўваць проксі"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr ""
 "Атрымаць зьвесткі аб проксі з пераменай\n"
 "асяродьдзя 'http_proxy'"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Паслужнік проксі"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Порт проксі"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Карыстальнік проксі"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Пароль да проксі"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Адрэса э.пошты"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Праграма абнаўленьня дыскаў"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Назвы файлаў не малымі літарамі"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr ""
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr ""
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Рознае"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
@@ -565,32 +570,36 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 #, fuzzy
 msgid "Cannot do lookup while ripping."
 msgstr "Немагчыма дасылаць запыт падчас запісу"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Невядомы дыск"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Трэк %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Запыт %s (праз %s) для дыска %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Запыт %s для дыска %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Няма супадзеньняў\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -599,176 +608,205 @@
 "Супадзеньне для \"%s / %s\"\n"
 "Загрузка даньняў...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Выканана\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Памылка захаваньня даньняў дыска\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Няма супадзеньняў\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 #, fuzzy
 msgid "Length"
 msgstr "Час"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Трэкі"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Трэк"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Выканана\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Памылка запісу даньняў дыска"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Рэжым паўтору прайграваньня"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Пераключыць паўтор прайграваньня"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Стан запісу"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Граць / прыпыніць"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Пераматаць назад"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Пераматаць наперад"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Перайсьці да папярэдняга трэка"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Перайсьці да наступнага трэка"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Пераключыць рэжым прайграваньня"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Наступны дыск"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Спыніць прайграваньне"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Вызваліць дыск"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Сканаваць дыск"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Пераключыць кіраваньне гучнасьцю"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Пераключыць рэдактар дыска"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Запытаць зьвесткі ў БД дыскаў"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Пераключыць адлюстраваньне запіса"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Выйсьці з Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "Немагчыма пераматаць падчас запісу"
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "Немагчыма пераматаць падчас запісу"
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "Немагчыма пераключаць дыскі падчас запісу"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Вызваліць дыск\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "Немагчыма вызваліць дыск падчас запісу"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Маецца дыск - вызваленьне\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "Немагчыма прайграваць падчас запісу"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "Немагчыма пераключыць запісы падчас запісу"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Праверка новага дыска\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat адшукаў дыск, прагляд запісаў\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Маецца дыск.\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr ""
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat паведамляе аб адсутнасьці дыска\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Бягучы сэктар: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Дыск адсутнічае"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -780,51 +818,56 @@
 "\n"
 "Вы жадаеце прыняць зьвесткі аб гэтым дыске?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Памылка: Немагчыма стварыць часовы файл"
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Памылка: Немагчыма запісаць даньні дыска"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr ""
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Сыстэмнае паведамленьне"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Запыт [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Памылка стану %d на %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Стварэньне каталёга %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Памылка: %s існуе, але гэта файл\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Памылка: Немагчыма адкрыць %s для запісу\n"
@@ -955,7 +998,7 @@
 msgstr "Адмяніць"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "невядомае поле ID3\n"
 
@@ -965,7 +1008,7 @@
 msgstr ""
 "Памылка: Немагчыма перакласьці назву файла. Адсутнічае карыстальнік як %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Збой выкананьня\n"
 
@@ -973,7 +1016,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "Памылка: Кепскі тып поля\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "Памылка: Недапушчальны файл канфігурацыі\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Памылка: Недапушчальны файл канфігурацыі\n"
 
@@ -1032,7 +1080,7 @@
 msgstr "Бягучы сэктар:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Запіс: Вольны"
 
@@ -1040,7 +1088,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Кадаваньне: Трк 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Кадаваньне: Вольны"
 
@@ -1123,32 +1171,32 @@
 msgid "Deleting [%s]\n"
 msgstr "Выдаленьне [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Запіс скончаны\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Выканаўца невядомы"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Назва невядома"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1158,7 +1206,7 @@
 "Недапушчальная каманда кадаваньня\n"
 "Праверце вашую канфігурацыю кодэра"
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1166,93 +1214,93 @@
 "Трэкі не вылучаны.\n"
 "Запісываць увесь дыск?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Запіс усяго дыска\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr ""
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Першы правераны запіс %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Недахоп правоў для запісу файла wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Запіс трэка %d у %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Запіс: Трк %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Файл %s ужо быў запісаны. Прапускаецца...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Недахоп прасторы ў каталёге для вываду"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Выклік CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, fuzzy, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Даданьне трэка %d да сьпіса кадаваньня\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Няма вольных працэсараў\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кадаваньне трэка %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "Недахоп правоў для запісу кадаванага файла"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Кадаваньне ў %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Кадаваньне: Трк %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Агульны памер запісанага: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Агульны памер кадаванага: %d\n"

grip-3.4.3.tar.gz/po/bg.po -> grip-3.9.0.tar.gz/po/bg.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 3.1\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2004-02-08 14:03+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -89,12 +89,12 @@
 msgid "General"
 msgstr "Основен"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Извличане"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Кодиране"
 
@@ -139,11 +139,16 @@
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -154,376 +159,376 @@
 "Grip трябва да бъде пренастроен.\n"
 "Старият конфигурационен фал е запазен с -old·в края."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сървър е·%s,·порт·%d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Настройки"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CDRom устройство"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не прекъсва музиката на излизане/стартиране"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Започва от начало, когато е музиката е спряна"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Започва с първата песен ако не свири"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Автоматично стартира диск при постяване в устройството"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Разбърква преди всяко изпълнение"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr ""
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Извличаща програма:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr ""
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Команден интерпретатор"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Изключва paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Изключва допъплнителна paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Изключва драскане"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "засичане"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "поправя"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr ""
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Формат на извлечения файл"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат на извлечения файл"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "SCSI устройство"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Програма за извличане"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Извлича \"добра\" стойност"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Максимално не-кодирани .wav файлове"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Автоматично извличане при вмъкване на CD"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Звуков сигнал след извличане"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Автоматично изваждане на диска след извличане"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Закъснение на автоматичното изваждане"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Закъснение преди извличането"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Закъснение на кодирането след като дискът е извлечен"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Спира CDRom устройството между песните"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Команда за филтър на Wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Команда за филтър на Диск"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Опции"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Кодираща програма:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr ""
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr ""
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Файлове формат при кодиране"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Файлове формат при кодиране"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Файлове формат при кодиране"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Кодираща програма"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Изтрива .wav файлът след кодиране"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Вмъква информация в SQL БазаДанни"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Създава .m3u файлове"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Използва свързани пътища в .m3u файловете"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U файлов формат"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Скорост на кодиране (килобита/сек.)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Процесори в употреба"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Извлича \"добра\" стойност"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Команда за филтър на Диск"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Изтрива .wav файлът след кодиране"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Добавя ID3 коментари в кодираните файлове"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Добавя ID3v2 коментари в кодираните файлове"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Добавя информация само във файлове завършващи с '.mp3'"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Поле за ID3 коментар"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Кодова таблица на ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "Кодова таблица на ID3v1"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Сървър База Данни"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Път на CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Основен сървър"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Втори сървър"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr ""
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Използва freedb разширения"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Изпълнява преглеждане на диск автоматично"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "ДискБД"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Използва прокси сървър"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr ""
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Прокси сървър"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Прокси порт"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Прокси потребителско име"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Прокси парола"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Електронна поща"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Програма за осъвременяване на CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Не прави имената на файловете с малки букви"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr ""
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Не променя интервалите в долни черти"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Допълнителни"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
@@ -559,32 +564,36 @@
 msgid "CDIOCEJECT"
 msgstr ""
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 #, fuzzy
 msgid "Cannot do lookup while ripping."
 msgstr "Прегледа е невъзможен по време на извличане"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Непознат Диск"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Песен %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Запитва·%s·(през·%s)·за диск·%02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Запитва·%s·за дискт·%02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Няма съвпадение\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -593,176 +602,205 @@
 "Намерена информация за·\"%s·/·%s\"\n"
 "Изтегляне на информация...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Готово\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Грешка при запазване на информацията за диска\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Няма съвпадение\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 #, fuzzy
 msgid "Length"
 msgstr "Дължина"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Песни"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Песен"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Готово\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Грешка при запазването на информацията за диска"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Режим въртене"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Режим пеобръщане"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Статус на извличането"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Изпълнява песен / Пауза"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Начало"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Напред"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Отива на предишната песен"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Отива на следващата песен"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Опции на изпълненията"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Следващ Диск"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Спира изпълението"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Изважда диск"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Сканира съдържанието на диска"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Сила на звука"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Редактор на дискове"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Прави/отказва заявка към БД за дискове"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Изобразяване на песните"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Напуска Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "Прескачането напред в невъзможно по време на извличане"
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "Връщането в началото е невъзможно по време на извличане"
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "Смяна на дискове е невъзможна по време на извличане"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Изважда диск\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "Дискът не може да бъде изваден докато се извлича информация"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Изважда диска\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "Не може да бъде изпълнен докато се извлича информация"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "Не може да се разменят песни по време на извличане"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Проверява за нов диск\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat намери диск, проверкана песните\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Валиден диск!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Песни с дължина над 0\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat докладва че няма диск\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Текущ селектор: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Няма Диск"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -774,51 +812,56 @@
 "\n"
 "Искате ли да изпратите информация за диска?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Грешка: Неуспешно създаване на временен файл"
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Грешка: Незъвможно записването на информация за диска"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Изпраща запис чрез Ел. Поща към %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Системно Съобщение"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "Адресът е %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Заявката е [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr ""
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Създава директория %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Грешка: %s съществува, но е файл\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Грешка: Не мога да отворя %s за да записвам\n"
@@ -956,7 +999,7 @@
 msgstr "Отказва"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "непознато ID3 поле\n"
 
@@ -966,7 +1009,7 @@
 msgstr ""
 "Грешка: не мога да преведа името на файла. Потребителят %s не същесвува\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Стартирането се провали\n"
 
@@ -974,7 +1017,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "Грешка: Лош тип на записа\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "Грешка: Невалиден конфигурационен файл\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Грешка: Невалиден конфигурационен файл\n"
 
@@ -1031,7 +1079,7 @@
 msgstr "Текущ сектор:······0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Извличане: Затихнало"
 
@@ -1039,7 +1087,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Код: Песен 99·(99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Код.: Затихнало"
 
@@ -1122,39 +1170,39 @@
 msgid "Deleting [%s]\n"
 msgstr "Изтрива·[%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Извличането приключи\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Няма Изпълнител"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Няма Заглавие"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1162,94 +1210,94 @@
 "Няма избрани песни.\n"
 "Извличане на целия CD?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Извлича цял CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr ""
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Първата избрана песен е %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Няма права за писане за да запише wav файлът"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Извлича песен %d в %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Извлича: Песен %d·(0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Файлът %s вече е извлечен. Пропуска...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Няма достатъчно място на твърдия диск"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Обръща се към CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Песента %d е добавена към списъка %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Няма свободни процесори\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кодира песен %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "Няма права за запис на кодирания файл"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr ""
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Кодира: Песен %d·(0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Не се извлича нищо в момента, нека да занулим стойностите на кодиране\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Общ размер на извлечената информация: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Общ размер на кодираната информация: %d\n"

grip-3.4.3.tar.gz/po/ca.po -> grip-3.9.0.tar.gz/po/ca.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: grip 3.1.10\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2004-04-16 02:42+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -90,12 +90,12 @@
 msgid "General"
 msgstr "General"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Extracció"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Codificació"
 
@@ -140,11 +140,16 @@
 msgid "Version %s"
 msgstr "Versió %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "Error: No s'ha pogut desar el fitxer de configuració"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Creat amb el Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -155,356 +160,356 @@
 "Tindreu que reconfigurar Grip.\n"
 "La vostra configuració antiga s'ha desat amb el sufixe -old."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "el servidor és %s, port %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Error: No s'ha pogut desar el fitxer de configuració"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Config"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Dispositiu CDRom"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "No interrompre la reproducció al sortir/executar"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Rebobina al parar"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Comença amb la primera pista si no s'està reproduint"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Autoreproducció a l'insertar"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Baralla abans de cada reproducció"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Evita expulsions defectuoses"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Escaneja la unitat de discs per a nous discs"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Interval entre escaneigs (segons)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Extractor:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Executable de l'extractor"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Ordre de extracció"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Deshabilita paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Deshabilita paranoia extra"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Ratlles: deshabilita la"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "detecció"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "reparació"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Calcula l'ajust de ganància"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Format de fitxer d'extracció"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Format de fitxer d'extracció"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Dispositiu genèric SCSI"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Extractor"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Valor «nice» de la extracció"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Núm. màxim de .wav no codificats"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Autoextracció a l'insertar"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Avisa després d'extraure"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Autoexpulsió després d'extraure"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Demora de l'auto-expulsió"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Pausa abans d'extraure"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Retarda la codificació fins que s'haja extret el disc"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Atura la unitat de cdrom entre pistes"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Ordre de filtre de wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Ordre de filtre de disc"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Opcions"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Executable del codificador"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Ordre del codificador"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Extensió de fitxer codificat"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Format de fitxer codificat"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Format de fitxer codificat"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Codificador"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Elimina els .wav després de codificar"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Inserta la info en una base de dades SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Crea fitxers .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Utilitza camins relatius en els fitxers .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Format del fitxer M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Bitrate de la codificació (kbits/seg)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Número de CPU a utilitzar"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Valor «nice» de la codificació"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Ordre de filtre de codificació"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Elimina els .wav després de codificar"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Afegeix tags ID3 als fitxers codificats"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Afegeix tags ID3v2 als fitxers codificats"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Només fica tags als fitxers acabats en «.mp3»"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Camp de comentari d'ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Codificació del joc de caràcters de l'ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Codificació del joc de caràcters de l'ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Servidor de BD"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Ruta de CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Servidor primari"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Servidor secundari"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Email d'enviament a la BD"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Codificació del joc de caràcters de la BD"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Utilitza extensions de freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Fa consultes de discs automàticament"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "BD de discs"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Utilitza un servidor intermedi"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Adquireix servidor de la var. d'entorn «http_proxy»"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Servidor intermedi"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Port del servidor intermedi"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Nom d'usuari del servidor intermedi"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Password del servidor intermedi"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Servidor Intermedi"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Programa d'actualització de CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "No fica els noms de fitxer en minúscules"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Permetre bits alts en els noms fitxer"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "No canvia espais a subratllats"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -512,20 +517,20 @@
 "Caràcters a no eliminar\n"
 "dels noms de fitxer"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Misc"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Error: No s'ha pogut desar la configuració de l'extractor"
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Error: No s'ha pogut desar la configuració del codificador"
@@ -560,32 +565,36 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 #, fuzzy
 msgid "Cannot do lookup while ripping."
 msgstr "No es pot consultar mentre s'extrau"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Disc desconegut"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Pista %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "S'està consultant a %s (a través de %s) el disc %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "S'està consultant a %s el disc %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "No hi ha coincidències\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -594,175 +603,204 @@
 "Coincidir amb «%s / %s»\n"
 "S'estan descarregant dades...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Fet\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "S'ha produït un error al desar les dades del disc\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "No hi ha coincidències\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Longitud"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Pistes"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Pista"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Fet\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Error saving disc data"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Rota el mode de reproducció"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Activa/Desactiva la repetició de la reproducció"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Estat de l'extracció"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Reprodueix la pista / Pausa la reproducció"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Rebobina"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Avanç ràpid"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Vés a la pista anterior"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Vés a la pista següent"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Mostra/oculta les opcions del mode de reproducció"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Següent disc"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Para la reproducció"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Expulsa el disc"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Escaneja els continguts del disc"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Mostra/oculta el control de volum"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Mostra/oculta l'editor de discs"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inicia/avorta les cerques de DiscDB"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Mostra/oculta les pistes"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Surt de Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "No es pot avançar ràpidament mentre s'extrau"
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "No es pot rebobinar mentre s'extrau"
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "No es pot canviar de disc mentre s'extrau"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Expulsa el disc\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "No es pot expular mentre s'extrau"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Teniu el disc -- expulsant\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "No es pot reproduir mentre s'extrau"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "No es pot canviar de pista mentre s'extrau"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "S'està comprovant si hi ha un nou disc\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat ha trobat un disc, s'estan comprovant les pistes\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Hi ha un disc vàlid!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "No hi ha pistes amb llargària no-zero\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat ha dit que no hi ha cap disc\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Sector actual: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "No hi ha disc"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -774,51 +812,56 @@
 "\n"
 "Voleu enviar la informació sobre aquest disc?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Error: No s'ha pogut crear un fitxer temporal"
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Error: No s'ha pogut escriure les dades del disc"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "S'està enviant l'entrada a %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "Error: No s'ha pogut desar la configuració del codificador"
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Missatge del sistema"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "La URI és %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "La consulta és [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Error de stat %d en %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "S'està creant el directori %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Error: %s existeix, però és un fitxer\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Error: No s'ha pogut obrir %s per a escriptura\n"
@@ -956,7 +999,7 @@
 msgstr "Cancel·la"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "camp ID3 desconegut\n"
 
@@ -966,7 +1009,7 @@
 msgstr ""
 "Error: no s'ha pogut traduir el nom de fitxer. No hi ha cap usuari «%s»\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Ha fallat l'exec\n"
 
@@ -974,7 +1017,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "Error: Tipus d'entrada errònia\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "Error: fitxer de configuració invàlid\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Error: fitxer de configuració invàlid\n"
 
@@ -1031,7 +1079,7 @@
 msgstr "Sector actual:       0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Extr: Inactiu"
 
@@ -1039,7 +1087,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod: Pista 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Cod: Inactiu"
 
@@ -1122,32 +1170,32 @@
 msgid "Deleting [%s]\n"
 msgstr "S'està eliminant [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "L'extracció ha finalitzat\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "SenseArtista"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "SenseTítol"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1157,7 +1205,7 @@
 "Executable de codificació invàlid\n"
 "Comproveu la vostra configuració de codificació"
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1165,95 +1213,95 @@
 "No hi ha cap pista seleccionada.\n"
 "Extraure el CD sencer?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "S'està extraient el CD sencer\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "En RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La primera pista comprovada és %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Extraient!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "No hi ha accés d'escriptura per a escriure el fitxer wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "S'està extraient la pista %d en %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Extracció: Pista %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "El fitxer %s ja s'ha extret. S'ignorarà...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "No hi ha espai disponible en el directori d'eixida"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "S'està cridant a CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "S'ha afegit la pista %d a la llista de codificació %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "No hi ha processadors lliures\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Cod pista %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "No hi ha accés d'escriptura per a escriure el fitxer codificat"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: S'està codificant en %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Enc: Pista %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "En CalculateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "No s'està extraient ara, així que es ficaran a zero els valors de "
 "codificació\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "La mida total d'extracció és: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "La mida total de codificació és: %d\n"

grip-3.4.3.tar.gz/po/de.po -> grip-3.9.0.tar.gz/po/de.po Changed

@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.2\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-06-17 20:13+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-10-04 20:02+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: src/main.c:56
 msgid "Specify the geometry of the main window"
@@ -92,12 +92,12 @@
 msgid "General"
 msgstr "Allgemein"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Auslesen"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Kodieren"
 
@@ -142,11 +142,15 @@
 msgid "Version %s"
 msgstr "Version %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Fehler: Homepage konnte nicht angezeigt werden."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Erstellt von Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -157,349 +161,349 @@
 "Sie müssen Grip nun neu konfigurieren.\n"
 "Die alte Konfigurationsdatei wurde durch Anhängen von -old umbenannt."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "Server ist %s, Port %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Fehler: Konfigurationsdatei konnte nicht gespeichert werden."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Konfiguration"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CD-ROM-Laufwerk"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Abspielen beim Start/Beenden nicht unterbrechen"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Zurückspulen wenn angehalten"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Beim Abspielen mit erstem Titel starten"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Automatisch nach Einlegen abspielen"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Neu mischen vor jedem Abspielen"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Fehlerhafte CD-Auswurfsfunktion umgehen"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Laufwerk nach neuer CD fragen"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Frageintervall (Sekunden)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Ausleser:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Auslese-Programm"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Befehlszeile"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Paranoia deaktivieren"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Extra-Paranoia deaktivieren"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Kratzer"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "-erkennung ausschalten"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "-reparatur ausschalten"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Verstärkungs-Anpassung berechnen"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Format der ausgelesenen Dateien"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr "Format der ausgelesenen Dateien (Mehrere Künstler)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Generisches SCSI-Gerät"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Ausleser"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Priorität des Auslesers"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Max. unkodierte .wav's"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Automatisch nach Einlegen auslesen"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Nach dem Rippen akustisch melden"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Automatisch auswerfen nach dem Auslesen"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Verzögerung vor automatischen Auswurf"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Verzögerung vor dem Auslesen"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Erst nach dem Auslesen der CD kodieren"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "CD-ROM-Laufwerk zwischen den Titeln stoppen"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Wav-Filter-Befehl"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "CD-Filter-Befehl"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Optionen"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Kodierer:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Kodier-Programm"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Befehlszeile"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Kodier-Dateinamensendung"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Kodier-Dateiformat"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr "Kodier-Dateiformat (Mehrere Künstler)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Kodierer"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr ".wav-Dateien nach dem Kodieren löschen"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Info in SQL-Datenbank einfügen"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr ".m3u-Dateien erstellen"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Relative Pfade in .m3u-Dateien verwenden"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U-Dateiformat"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Bitrate des Kodierers (kbits/s)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Anzahl von CPUs verwenden"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Priorität des Kodierers"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Kodier-Filter-Befehl"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Befehl nach dem Kodieren ausführen"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3-Tags zu kodierten Dateien hinzufügen"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2-Tags zu kodierten Dateien hinzufügen"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Tags nur in ».mp3«-Dateien schreiben"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ID3-Kommentarfeld"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-Zeichenkodierung"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-Zeichenkodierung"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Datenbankserver"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI-Pfad"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Primärer Server"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Sekundärer Server"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "DB-E-Mail-Adresse"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "DB-Zeichenkodierung"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "FreeDB-Erweiterungen verwenden"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Automatisch CDs nachschlagen"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Proxy-Server verwenden"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Server aus der »http_proxy«-Umgebungsvariable holen"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Proxy-Server"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Proxy-Portnummer"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Proxy-Benutzername"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Proxy-Passwort"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Programm zum Aktualisieren der CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Dateinamen nicht in Kleinbuchstaben umwandeln"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "»Hohe Bits« in Dateinamen erlauben"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Inkompatible Zeichen durch Hexadezimalzahlen ersetzen"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Leerzeichen nicht in Unterstriche umwandeln"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 "m3u-Dateien mit nicht-POSIX-kompatiblem Rückschrägstrich »\\« schreiben"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -507,19 +511,19 @@
 "Zeichen, die nicht aus Dateinamen \n"
 "entfernt werden sollen"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Benachrichtigungssymbol anzeigen"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Sonst."
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Fehler: Konfiguration des Auslesers konnte nicht gespeichert werden."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Fehler: Konfiguration des Kodierers konnte nicht gespeichert werden."
 
@@ -554,31 +558,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Die CD kann nicht während des Rippens nachgeschlagen werden."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Unbekannte CD"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Titel %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "%s wird abgefragt (über %s) nach CD %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
-msgstr "wird abgefragt %s nach CD %02x.\n"
+msgstr "Wird abgefragt %s nach CD %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Kein Treffer\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -587,168 +595,196 @@
 "Treffer für »%s / %s«\n"
 "Daten werden heruntergeladen …\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Fertig\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Fehler beim Speichern der CD-Daten\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Kein Treffer\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Länge"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Titel"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Vorigen CDDB-Eintrag auswählen."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "Nächsten CDDB-Eintrag auswählen."
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Titel"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "Keine Daten zur CD. Zurück.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Bereits im letzten Index. Zurück.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Fertig.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoPrevDiscDBEntry.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Bereits im ersten Index. Zurück.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Fehler beim Speichern der CD-Daten."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Abspielmodus rotieren"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Wiederholung an-/ausschalten"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Rip-Status"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Titel / Pause abspielen"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Zurückspulen"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Vorspulen"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Zum vorherigen Titel gehen"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Zum nächsten Titel gehen"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Abspielmodi an-/ausschalten"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Nächste CD"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Abspielen stoppen"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "CD auswerfen"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "CD-Verzeichnis lesen"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Lautstärkeregler an-/ausschalten"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "CD-Editor an-/ausschalten"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Start/Abbruch der DiscDB-Abfrage"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Titelanzeige an-/ausschalten"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Grip beenden"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Während des Auslesens kann nicht vorgespult werden."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Während des Auslesens kann nicht zurückgespult werden."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Während des Auslesens kann die CD nicht gewechselt werden."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "CD auswerfen\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Die CD kann während des Auslesens nicht ausgeworfen werden."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "CD vorhanden – wird ausgeworfen\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Die CD kann während des Auslesens nicht abgespielt werden."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Während des Auslesens kann der Titel nicht gewechselt werden."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Auf neue CD wird geprüft\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat fand eine CD, Titel werden überprüft\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Wir haben eine gültige CD!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Keine Titel mit einer Länge ungleich null\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat sagt, dass keine CD vorhanden ist\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Aktueller Sektor: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Keine CD"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -760,49 +796,53 @@
 "\n"
 "Möchten Sie diese CD-Information übertragen?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Fehler: Temporäre Datei konnte nicht angelegt werden."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Fehler: CD-Daten konnten nicht geschrieben werden."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Eintrag wird per E-Mail an %s gesendet\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Fehler: E-Mail-Befehl konnte nicht ausgeführt werden."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Systemnachricht"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "Adresse ist %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Anfrage ist [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Status-Fehler %d auf %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Ordner %s wird angelegt\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Fehler: %s existiert, ist aber eine Datei\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Fehler: %s konnte nicht zum Schreiben geöffnet werden\n"
@@ -934,7 +974,7 @@
 msgstr "Abbrechen"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "unbekanntes ID3-Feld\n"
 
@@ -945,7 +985,7 @@
 "Fehler: Dateiname konnte nicht übersetzt werden. Kein Benutzer namens %s "
 "bekannt\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Ausführen fehlgeschlagen\n"
 
@@ -953,7 +993,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Fehler: Falscher Eintragstyp\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Fehler: Lesen der Konfigurationsdatei\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Fehler: Ungültige Konfigurationsdatei\n"
 
@@ -1010,7 +1054,7 @@
 msgstr "Aktueller Sektor:    0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Ausl: Leerlauf"
 
@@ -1018,7 +1062,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Kod: Ttl 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Kod: Leerlauf"
 
@@ -1100,19 +1144,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Wird gelöscht [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Auslesen ist abgeschlossen\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "KeinKünstler"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "KeinTitel"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1120,7 +1164,7 @@
 "Es wurde keine CD im Laufwerk gefunden. Wenn eine CD im Laufwerk ist, dann "
 "prüfen Sie bitte die CD-ROM-Einstellungen unter Konfiguration->CD."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1130,7 +1174,7 @@
 "Prüfen Sie Ihre Ausleseeinstellungen und stellen Sie sicher, dass der "
 "vollständige Pfad zum Programm angegeben ist."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1140,7 +1184,7 @@
 "Prüfen Sie Ihre Kodierer-Einstellungen und stellen Sie sicher, dass der "
 "vollständige Pfad zum Kodierer angegeben ist."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1148,92 +1192,92 @@
 "Keine Titel ausgewählt,\n"
 "ganze CD auslesen?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Die ganze CD wird ausgelesen\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "In RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Erster markierter Titel ist %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Auslesen beginnt!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Kein Schreibzugriff zum Schreiben der Wav-Datei"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Titel %d wird nach %s ausgelesen\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ausl: Ttl %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Datei %s wurde bereits ausgelesen, wird übersprungen …\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Kein Platz mehr im Ausgabeordner"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "CDPRip wird aufgerufen\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Titel %d wurde zur %s-Liste hinzugefügt\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Keine freien CPUs\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Kod Titel %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Kein Schreibzugriff zum Schreiben der kodierten Datei."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Wird zu %s kodiert\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Kod: Ttl %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "In CalulateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Es wird gerade nichts ausgelesen, also Kodierwerte auf 0 setzen\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Gesamte ausgelesene Größe: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Gesamte kodierte Größe: %d\n"

grip-3.4.3.tar.gz/po/es.po -> grip-3.9.0.tar.gz/po/es.po Changed

@@ -1,27 +1,29 @@
-# Traducción al español de grip.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# El_Pavo_Asesino <ciehe@yahoo.com>, 2002
-#
-# Actualización y revisión:
-#
-# Javier Fernandez-Sanguino <jfs@debian.org>, 2006
-#
+# Spanish translation for grip 3.6.0.
+# Copyright (C) 2018 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grip package.
+# El_Pavo_Asesino <ciehe@yahoo.com>, 2002.
+# Javier Fernandez-Sanguino <jfs@debian.org>, 2006.
+# Francisco Javier Serrador <fserrador@gmail.com>, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip-3.3.1\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2006-02-27 01:11+0100\n"
-"Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
-"Language-Team: Grupo de traducción al español <es@li.org>\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2018-04-06 21:57+0200\n"
+"Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
+"Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: src/main.c:56
 msgid "Specify the geometry of the main window"
-msgstr "Especifica la geometría de la ventana principal"
+msgstr "Especifica la geometrÃa de la ventana principal"
 
 #: src/main.c:57
 msgid "GEOMETRY"
@@ -30,7 +32,7 @@
 #: src/main.c:65
 msgid "Specify the config file to use (in your home dir)"
 msgstr ""
-"Especifique el archivo de configuración a utilizar (en su directorio "
+"Especifique el fichero de configuraciÃ³n a utilizar (en su directorio "
 "personal)"
 
 #: src/main.c:66
@@ -47,23 +49,23 @@
 
 #: src/main.c:83
 msgid "Specify the generic scsi device to use"
-msgstr "Especifica el dispositivo SCSCI genérico a usar"
+msgstr "Especifica el dispositivo SCSCI genÃ©rico a usar"
 
 #: src/main.c:92
 msgid "Launch in \"small\" (cd-only) mode"
-msgstr "Lanzar en modo reducido (sólo el cdrom)"
+msgstr "Iniciar en modo reducido (sÃ³lo CD)"
 
 #: src/main.c:101
 msgid "\"Local\" mode -- do not look up disc info on the net"
-msgstr "Modo «local» -- no buscar la informacion del disco en la red"
+msgstr "Modo Â«localÂ» -- no buscar la informacion del disco en la red"
 
 #: src/main.c:110
 msgid "Do not do I/O redirection"
-msgstr "No hacer redirección de E/S"
+msgstr "No redireccionar E/S"
 
 #: src/main.c:119
 msgid "Run in verbose (debug) mode"
-msgstr "Correr en modo prolijo (depuración)"
+msgstr "Correr en modo prolijo (depuraciÃ³n)"
 
 #: src/grip.c:185
 msgid "Grip"
@@ -72,11 +74,11 @@
 #: src/grip.c:242
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
-msgstr "Error: No se pudo inicializar [%s]\n"
+msgstr "Error: no se pudo inicializar [%s]\n"
 
 #: src/grip.c:334
 msgid "Grip started successfully\n"
-msgstr "Grip arrancó con éxito\n"
+msgstr "Grip iniciado correctamente\n"
 
 #: src/grip.c:348
 msgid ""
@@ -84,7 +86,7 @@
 "Really shut down?"
 msgstr ""
 "Hay trabajos en proceso\n"
-"¿Reálmente quieres cerrar?"
+"Â¿Realmente quieres cerrar?"
 
 #: src/grip.c:399
 msgid "Status"
@@ -94,12 +96,12 @@
 msgid "General"
 msgstr "General"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Extraer"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Codificar"
 
@@ -109,15 +111,15 @@
 
 #: src/grip.c:494
 msgid "Table Of Contents"
-msgstr "Tabla de contenido"
+msgstr "DistribuciÃ³n de Contenidos"
 
 #: src/grip.c:500
 msgid "Playing CDs"
-msgstr "¿Cómo tocar CDs?"
+msgstr "Reproduciendo CD"
 
 #: src/grip.c:506
 msgid "Ripping CDs"
-msgstr "¿Cómo extraer música de CDs?"
+msgstr "Extrayendo CD"
 
 #: src/grip.c:512
 msgid "Configuring Grip"
@@ -125,434 +127,430 @@
 
 #: src/grip.c:518
 msgid "FAQ"
-msgstr "PUF (Preguntas de Uso Frecuente)"
+msgstr "P+F"
 
 #: src/grip.c:524
 msgid "Getting More Help"
-msgstr "¿Cómo obtener más ayuda?"
+msgstr "Obtener MÃ¡s Ayuda"
 
 #: src/grip.c:530
 msgid "Reporting Bugs"
-msgstr "Reportar errores"
+msgstr "Declarando Defectos"
 
 #: src/grip.c:550
 msgid "About"
-msgstr "Acerca de ..."
+msgstr "Acerca de..."
 
 #: src/grip.c:569
 #, c-format
 msgid "Version %s"
-msgstr "Versión %s"
+msgstr "VersiÃ³n %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Error: intentando mostrar pÃ¡gina inicial fallada."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Creado por Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
-"Tu archivo de configuración es muy antiguo, se establecerán los valores por "
-"omisiión.\n"
-"Necesitará reconfigurar Grip\n"
-"Se ha guardado su archivo de configuración antiguo añadiéndole un -old."
+"Tu fichero de configuraciÃ³n es muy antiguo, se establecerÃ¡n los valores por "
+"omisiiÃ³n.\n"
+"NecesitarÃ¡ reconfigurar Grip\n"
+"Se ha guardado su fichero de configuraciÃ³n antiguo aÃ±adiÃ©ndole un -old."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
-msgstr "El servidor es %s, puerto: %d\n"
+msgstr "servidor es %s, puerto: %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
-msgstr "Error: No pude guardar el archivo de configuración."
+msgstr "Error: no pude guardar el fichero de configuraciÃ³n."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Configurar"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Dispositivo CDROM"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
-msgstr "No interrumpir la musica al salir o al entrar"
+msgstr "No interrumpir la mÃºsica al salir/iniciar"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Rebobinar cuando se pare"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
-msgstr "Arrancar con la primer pista si no se está tocando"
+msgstr "Arrancar con la primer pista si no se estÃ¡ tocando"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
-msgstr "Auto-tocar cuando se inserte un disco"
+msgstr "Autoreproducir al insertar un disco"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Remezclar antes de tocar"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
-msgstr "Hacer algo si falla la expulsión"
+msgstr "Hacer algo si falla la expulsiÃ³n"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Consultar a la unidad de disco si hay discos nuevos"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Intervalo de consulta (segundos)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Extractor:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Ejecutable del extractor"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
-msgstr "Línea de órdenes para extraer"
+msgstr "LÃnea de Ã³rdenes para extraer"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
-msgstr "Deshabilitar paranoia"
+msgstr "Desactivar paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
-msgstr "Deshabilitar extra paranoia"
+msgstr "Desactivar paranoia adicional"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
-msgstr "Deshabilitar los rayones"
+msgstr "Desactivar rayones"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
-msgstr "detección"
+msgstr "detecciÃ³n"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "reparar"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Calcular el ajuste de ganancia"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
-msgstr "Formato de archivo de extracción"
+msgstr "Formato de fichero de extracciÃ³n"
 
-#: src/gripcfg.c:276
-#, fuzzy
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
-msgstr "Formato de archivo de extracción"
+msgstr "Formato de fichero de extracciÃ³n (Multi-artista)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
-msgstr "Dispositivo SCSI genérico"
+msgstr "Dispositivo SCSI genÃ©rico"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Extractor"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
-msgstr "Valor «nice» del extractor"
+msgstr "Valor Â«niceÂ» del extractor"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
-msgstr "Nº máximo de .wav sin codificar"
+msgstr "NÂº mÃ¡ximo de .wav sin codificar"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
-msgstr "Auto-extraer al intertar"
+msgstr "Autoextraer al insertar"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
-msgstr "Hacer «beep» al terminar de extraer"
+msgstr "Hacer Â«beepÂ» al terminar de extraer"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Auto-expulsar al terminar de extraer"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
-msgstr "Retardo de auto-expulsión"
+msgstr "Retardo de auto-expulsiÃ³n"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Retardo antes de extraer"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
-msgstr "Retraso en la codificación hasta que el disco se extraiga"
+msgstr "Retraso en la codificaciÃ³n hasta que el disco se extraiga"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Parar la unidad de CDROM entre pistas"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
-msgstr "Orden de filtro Wav"
+msgstr "Orden de filtro onda"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Orden de filtro de disco"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Opciones"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
-msgstr "Codificar"
+msgstr "Codificador:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
-msgstr "Ejecutable de codificación"
+msgstr "Ejecutable de codificaciÃ³n"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
-msgstr "Línea de órdenes para el codificador"
+msgstr "LÃnea de Ã³rdenes para el codificador"
 
-#: src/gripcfg.c:428
-#, fuzzy
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
-msgstr "Extensión del archivo codificado"
+msgstr "ExtensiÃ³n del fichero codificado"
 
-#: src/gripcfg.c:433
-#, fuzzy
+#: src/gripcfg.c:432
 msgid "Encoder file format"
-msgstr "Formato de archivo codificado"
+msgstr "Formato de fichero codificado"
 
-#: src/gripcfg.c:439
-#, fuzzy
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
-msgstr "Formato de archivo codificado"
+msgstr "Formato de fichero codificado (Multi-artista)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Codificador"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Borrar .wav despues de codificar"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
-msgstr "Insertar la información en una base de datos SQL"
+msgstr "Insertar la informaciÃ³n en una base de datos SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
-msgstr "Crear archivos .m3u"
+msgstr "Crear ficheros .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
-msgstr "Usar direcciones relativas en los archivos .m3u"
+msgstr "Usar direcciones relativas en los ficheros .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
-msgstr "Formato de archoivo M3u"
+msgstr "Formato de fichero M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
-msgstr "Tasa de bits de codificación (kbits/seg)"
+msgstr "Tasa de bit de codificaciÃ³n (kbits/seg)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
-msgstr "Número de CPUs a usar"
+msgstr "NÃºmero de CPU a emplear"
 
-#: src/gripcfg.c:488
-#, fuzzy
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
-msgstr "Valor «nice» del codificador"
+msgstr "Valor Â«niceÂ» del codificador"
 
-#: src/gripcfg.c:492
-#, fuzzy
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
-msgstr "Orden de filtro de codificación"
+msgstr "Orden de filtro de codificaciÃ³n"
 
-#: src/gripcfg.c:497
-#, fuzzy
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
-msgstr "Borrar .wav despues de codificar"
+msgstr "FunciÃ³n ejecutiva tras codificar"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
-msgstr "Añadir etiquetas ID3 a los archivos codificados"
+msgstr "AÃ±adir etiquetas ID3 a los ficheros codificados"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
-msgstr "Añadir etiquetas ID3v2 a los archivos codificados"
+msgstr "AÃ±adir etiquetas ID3v2 a los ficheros codificados"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
-msgstr "Sólo marcar archivos que terminan en «.mp3»"
+msgstr "SÃ³lo marcar ficheros que terminan en Â«.mp3Â»"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Comentarios en ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
-msgstr "Codificación dek conjunto de caracteres ID3v1"
+msgstr "CodificaciÃ³n del conjunto de caracteres ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
-msgstr "Codificación del conjunto de caracteres ID3v2"
+msgstr "CodificaciÃ³n del conjunto de caracteres ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
-msgstr "Servidor BBDD"
+msgstr "Servidor BD"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Ruta al CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Servidor primario"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Servidor secundario"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Correo-e para mandar a a la BD"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
-msgstr "Conjunto de caracteres para codificación de BBDD"
+msgstr "Conjunto de caracteres para codificaciÃ³n de BD"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Usar extensiones freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
-msgstr "Busqueda de información automática"
+msgstr "Busqueda de informaciÃ³n automÃ¡tica"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Usar servidor Proxy"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
-msgstr "Obtener el servidor desde la variable de entorno «http-proxy»"
+msgstr "Obtener el servidor desde var. ent. 'http-proxy'"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Puerto del proxy"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Nombre de usuario para el proxy"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
-msgstr "Contraseña Proxy"
+msgstr "ContraseÃ±a Proxy"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Direccion de correo-e"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
-msgstr "Programa de actualización CD"
+msgstr "Programa de actualizaciÃ³n CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
-msgstr "No convertir el nombre a minúsculas"
+msgstr "No modificar nombres a minÃºsculas"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
-msgstr "Permitir bits altos en los nombres de archivos"
+msgstr "Permitir bits altos en los nombres de ficheros"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
-msgstr "Reemplazar caracteres incompatibles por números hexadecimales"
+msgstr "Reemplazar caracteres incompatibles por nÃºmeros hexadecimales"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
-msgstr "No cambiar espacios a guión bajo"
+msgstr "No modificar espacios a guiÃ³n bajo"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
-msgstr ""
+msgstr "Escribe fichero m3s utilizando capacidadas no-posix '\\'s"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 "Caracteres que no se deben quitar\n"
-"de los nombres de archivo"
+"de los nombres de fichero"
 
-#: src/gripcfg.c:727
-#, fuzzy
+#: src/gripcfg.c:726
 msgid "Show tray icon"
-msgstr "Mostrar icono "
+msgstr "Mostrar icono de bandeja"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
-msgstr "Misc."
+msgstr "Misc"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
-msgstr "Error: No pude guardar la configuración del extractor."
+msgstr "Error: no pude guardar la configuraciÃ³n del extractor."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
-msgstr "Error: No pude guardar la configuración del codificador."
+msgstr "Error: no pude guardar la configuraciÃ³n del codificador."
 
 #: src/cddev.c:174 src/cddev.c:604
 #, c-format
 msgid "Drive status is %d\n"
-msgstr "El estado del dispositivo es %d\n"
+msgstr "Estado del dispositivo es %d\n"
 
 #: src/cddev.c:176
 msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n"
 msgstr ""
-"El dispositivo no soporta verificación de estado (asumir CDS_NO_INFO)\n"
+"El dispositivo no soporta verificaciÃ³n de estado (asumir CDS_NO_INFO)\n"
 
 #: src/cddev.c:179
 msgid "No disc\n"
-msgstr "No hay disco\n"
+msgstr "Sin disco\n"
 
 #: src/cddev.c:284 src/cddev.c:293 src/cddev.c:310 src/cddev.c:337
 msgid "Error: Failed to read disc contents\n"
-msgstr "Error: Fallo al leer el contenido del disco\n"
+msgstr "Error: fallado al leer el contenido del disco\n"
 
 #: src/cddev.c:607
 msgid "Drive doesn't support drive status check\n"
-msgstr "El dispositico no soporta verificación de estado\n"
+msgstr "El dispositico no soporta verificaciÃ³n de estado\n"
 
 #: src/cddev.c:627 src/cddev.c:632
 #, c-format
@@ -563,201 +561,233 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
-msgstr "No puedo hacer una búsqueda mientras estoy extrayendo."
+msgstr "No puedo hacer una bÃºsqueda mientras estoy extrayendo."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Disco desconocido"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Pista %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Consultando %s (por medio de %s) para el disco %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Consutando %s para el disco %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "No se encontrÃ³ coincidencia\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
 "Downloading data...\n"
 msgstr ""
-"coincidencia para \"%s / %s\"\n"
+"Coincidencia para Â«%s / %sÂ»\n"
 "Descargando datos...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
-msgstr "Hecho\n"
+msgstr "Finalizado\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Error al guardar los datos del disco\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "No se encontró coincidencia\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Longitud"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Pistas"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Seleccione precia entrada CDDB."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "Seleccione siguiente registro CDDB."
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Pista"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "NingÃºn datos de disco. Volviendo.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Ya al Ãºltimo Ãndice. Volviendo.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Finalizado.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoPrevDiscDBEntry.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Siempre al primer Ãndice. volviendo.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Error al guardar los datos del disco."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
-msgstr "Reproducción en rotación"
+msgstr "ReproducciÃ³n en rotaciÃ³n"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
-msgstr "Activar reproducción en bucle"
+msgstr "Conmutar reproducciÃ³n en bucle"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
-msgstr "Estado de la extracción"
+msgstr "Estado de la extracciÃ³n"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Reproducir pista / pausa"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
-msgstr "Avance rápido"
+msgstr "Avance rÃ¡pido"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Ir a la pista anterior"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Ir a la pista siguiente"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
-msgstr "Conmutar modos de reproducción"
+msgstr "Conmutar modos de reproducciÃ³n"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
-msgstr "Siguiente disco"
+msgstr "Siguiente Disco"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
-msgstr "Parar reproducción"
+msgstr "Parar reproducciÃ³n"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Expulsar disco"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
-msgstr "Analizar tabla de contenido"
+msgstr "Analizar Contenido DistribuÃdo"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
-msgstr "Mostrar control de volumen"
+msgstr "Conmutar control de volumen"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
-msgstr "Mostrar editor de pistas"
+msgstr "Conmutar editor de pistas"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Iniciar/abortar consulta a DiscDB"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
-msgstr "Mostrar lista de pistas"
+msgstr "Conmutar lista de pistas"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Salir de Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
-msgstr "No puedo avanzar mientras esté extrayendo datos."
+msgstr "No puedo avanzar mientras estÃ© extrayendo datos."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
-msgstr "No puede retroceder mientras esté extrayendo datos."
+msgstr "No puede retroceder mientras estÃ© extrayendo datos."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
-msgstr "No puedo cambiar de discos mientras esté extrayendo datos."
+msgstr "No puedo cambiar de discos mientras estÃ© extrayendo datos."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
-msgstr "Espulsar disco\n"
+msgstr "Expulsar disco\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
-msgstr "No puede expulsar mientras esté extrayendo datos."
+msgstr "No puede expulsar mientras estÃ© extrayendo datos."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Hay disco -- expulsando\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
-msgstr "No puedo reproducir mientras esté extrayendo datos."
+msgstr "No puedo reproducir mientras estÃ© extrayendo datos."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
-msgstr "No puedo cambiar de pistas mientras esté extrayendo datos."
+msgstr "No puedo cambiar de pistas mientras estÃ© extrayendo datos."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
-msgstr "Buscando un nuevo disco\n"
+msgstr "Comprobando un nuevo disco\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
-msgstr "CDStat encontró un disco, verificando pistas\n"
+msgstr "CDStat encontrÃ³ un disco, verificando pistas\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
-msgstr "Tenemos un disco válido\n"
+msgstr "Tenemos un disco vÃ¡lido\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "No hay pistas de longitud cero\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat dice que no hay disco\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Sector actual: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
-msgstr "No hay disco"
+msgstr "Sin Disco"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -767,94 +797,98 @@
 "Se ha encontrado este disco en su servidor secundario,\n"
 "pero no en su servidor primario.\n"
 "\n"
-"¿Deseas enviar la información del disco?"
+"Â¿Deseas enviar la informaciÃ³n del disco?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
-msgstr "Error: No pude crear un archivo temporal."
+msgstr "Error: no pude crear un fichero temporal."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
-msgstr "Error: No pude escribir los datos del disco."
+msgstr "Error: no pude escribir los datos del disco."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Enviando entrada a %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Error: no pude ejecutar orden de correo."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Mensaje de sistema"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI es %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "La consulta es [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Error de estado %d en %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Creando directorio %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
-msgstr "Error: %s existe, pero es un archivo\n"
+msgstr "Error: %s existe, pero es un fichero\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
-msgstr "Error: No pude abrir %s para escribir\n"
+msgstr "Error: no pude abrir %s para escribir\n"
 
 #: src/discedit.c:67
 msgid "Disc title"
-msgstr "Título del disco"
+msgstr "TÃtulo del disco"
 
 #: src/discedit.c:74 src/discedit.c:176
 msgid "Track name"
-msgstr "Nombre de la canción"
+msgstr "Nombre de pista"
 
 #: src/discedit.c:84
 msgid "W"
-msgstr "W"
+msgstr "O"
 
 #: src/discedit.c:110
 msgid "Disc artist"
-msgstr "Artista"
+msgstr "Artista del disco"
 
 #: src/discedit.c:127
 msgid "ID3 genre:"
-msgstr "Género ID3"
+msgstr "GÃ©nero ID3:"
 
 #: src/discedit.c:158
 msgid "Disc year"
-msgstr "Año del disco"
+msgstr "AÃ±o del disco"
 
 #: src/discedit.c:196
 msgid "Track artist"
-msgstr "Artista de la canción"
+msgstr "Artista de la pista"
 
 #: src/discedit.c:213
 msgid "Split:"
-msgstr "partir:"
+msgstr "Partir:"
 
 #: src/discedit.c:217
 msgid "Title/Artist"
-msgstr "Título/Artista"
+msgstr "TÃtulo/Artista"
 
 #: src/discedit.c:224
 msgid "Artist/Title"
-msgstr "Artista/Título"
+msgstr "Artista/TÃtulo"
 
 #: src/discedit.c:232
 msgid "Split chars"
@@ -866,7 +900,7 @@
 
 #: src/discedit.c:265
 msgid "Save disc info"
-msgstr "Guardar la información del disco"
+msgstr "Guardar la informaciÃ³n del disco"
 
 #: src/discedit.c:274
 msgid "Submit disc info"
@@ -874,15 +908,15 @@
 
 #: src/discedit.c:393
 msgid "No disc present."
-msgstr "No se ha encontrado ningún disco."
+msgstr "No se ha encontrado ningÃºn disco."
 
 #: src/discedit.c:543
 msgid "Cannot submit. No disc is present."
-msgstr "No se pueden enviar los datos. No se ha encontrado ningún disco."
+msgstr "No se pueden enviar los datos. No se ha encontrado ningÃºn disco."
 
 #: src/discedit.c:558
 msgid "You must enter a disc title."
-msgstr "Debes poner un título al disco."
+msgstr "Debes poner un tÃtulo al disco."
 
 #: src/discedit.c:565
 msgid "You must enter a disc artist."
@@ -898,13 +932,14 @@
 "\n"
 "Continue?"
 msgstr ""
-"Estas apunto de mandar la información de este disco\n"
-"a un servidor CDDB comercial. Los datos que envíe\n"
-"le pertenecerán al servidor. Esos servidores\n"
-"hacen negocio con su esfuerzo. Le sugerimos que mejor\n"
-"soportes a los servidores libres.\n"
+"Estas a punto de mandar la informaciÃ³n de este\n"
+"disco a un servidor CDDB comercial. Los datos\n"
+"que envÃe le pertenecerÃ¡n al servidor. Esos\n"
+"servidores hacen negocio con su esfuerzo. Le\n"
+"sugerimos que mejor soportes a los servidores\n"
+"libres.\n"
 "\n"
-"¿Desea continuar de todos modos?"
+"Â¿Desea continuar de todos modos?"
 
 #: src/discedit.c:584
 msgid ""
@@ -913,27 +948,27 @@
 "\n"
 "Continue?"
 msgstr ""
-"Está a punto de enviar esta\n"
-"información via correo-e.\n"
+"EstÃ¡ a punto de enviar esta\n"
+"informaciÃ³n vÃa correo-e.\n"
 "\n"
-"¿Desea continuar?"
+"Â¿Desea continuar?"
 
 #: src/discedit.c:601
 msgid "Genre selection"
-msgstr "Selección de género"
+msgstr "SelecciÃ³n de gÃ©nero"
 
 #: src/discedit.c:605
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
 msgstr ""
-"Es necesario especficar un género distinto de «unknown»\n"
-"para realizar el envío.\n"
-"Especifique un género DiscDB a continuación"
+"Es necesario especificar un gÃ©nero distinto de Â«desconocidoÂ»\n"
+"para realizar el envÃo.\n"
+"Especifique un gÃ©nero DiscDB a continuaciÃ³n"
 
 #: src/discedit.c:615
 msgid "DiscDB genre"
-msgstr "Género DiscDB"
+msgstr "GÃ©nero DiscDB"
 
 #: src/discedit.c:635
 msgid "Submit"
@@ -944,7 +979,7 @@
 msgstr "Cancelar"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "campo ID3 desconocido\n"
 
@@ -952,19 +987,23 @@
 #, c-format
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr ""
-"Error: No se pudo traducir el nombre de archivo. No hay un usuario %s\n"
+"Error: no se pudo traducir el nombre de fichero. No hay un usuario %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
-msgstr "Falló la ejecución\n"
+msgstr "FallÃ³ la ejecuciÃ³n\n"
 
 #: src/parsecfg.c:58
 msgid "Error: Bad entry type\n"
-msgstr "Error: Tipo de entrada inválida\n"
+msgstr "Error: tipo de registro equivocado\n"
+
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Error: leyendo fichero de configuraciÃ³n\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
-msgstr "Error: Archivo de configuración inválido\n"
+msgstr "Error: fichero de configuraciÃ³n invÃ¡lido\n"
 
 #: src/rip.c:104
 msgid "Rip+Encode"
@@ -976,7 +1015,7 @@
 
 #: src/rip.c:112
 msgid "Rip Only"
-msgstr "Sólo extraer"
+msgstr "SÃ³lo Extraer"
 
 #: src/rip.c:114
 msgid "Rip but do not encode selected tracks"
@@ -984,27 +1023,27 @@
 
 #: src/rip.c:120
 msgid "Abort Rip and Encode"
-msgstr "Interrumpir extracción y codificación"
+msgstr "Interrumpir extracciÃ³n y codificaciÃ³n"
 
 #: src/rip.c:122
 msgid "Kill all active rip and encode processes"
-msgstr "Mata todos los procesos activos de extracción y codificación"
+msgstr "Mata todos los procesos activos de extracciÃ³n y codificaciÃ³n"
 
 #: src/rip.c:130
 msgid "Abort Ripping Only"
-msgstr "Interrumpir sólo la extracción"
+msgstr "Interrumpir sÃ³lo la extracciÃ³n"
 
 #: src/rip.c:132
 msgid "Kill rip process"
-msgstr "Mata al proceso de extracción"
+msgstr "Mata al proceso de extracciÃ³n"
 
 #: src/rip.c:138
 msgid "DDJ Scan"
-msgstr "Análisis DDJ"
+msgstr "AnÃ¡lisis DDJ"
 
 #: src/rip.c:140
 msgid "Insert disc information into the DigitalDJ database"
-msgstr "Introduzca la información de disco en la base de datos DigitalDJ"
+msgstr "Introduzca la informaciÃ³n de disco en la base de datos DigitalDJ"
 
 #: src/rip.c:155
 msgid "Rip partial track"
@@ -1019,17 +1058,17 @@
 msgstr "Sector actual:       0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Ext: inactivo"
 
 #: src/rip.c:209
 msgid "Enc: Trk 99 (99.9x)"
-msgstr "Codif: Trk 99 (99.9x)"
+msgstr "Codif: Pis 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
-msgstr "Codif: En espera"
+msgstr "Codif: Inactiva"
 
 #: src/rip.c:264
 msgid "Overall indicators:"
@@ -1041,7 +1080,7 @@
 
 #: src/rip.c:332
 msgid "End sector"
-msgstr "Sector de fín"
+msgstr "Sector final"
 
 #: src/rip.c:384
 #, c-format
@@ -1050,21 +1089,21 @@
 
 #: src/rip.c:609
 msgid "Error: can't open m3u file."
-msgstr "Error: No se pudo abrir el archivo m3u."
+msgstr "Error: no se pudo abrir el fichero m3u."
 
 #: src/rip.c:703
 msgid "In KillRip\n"
-msgstr "En «KillRip»\n"
+msgstr "En Â«KillRipÂ»\n"
 
 #: src/rip.c:729
 #, c-format
 msgid "Now total enc size is: %d\n"
-msgstr "El tamaño total de codificación es: %d\n"
+msgstr "El tamaÃ±o total de codificaciÃ³n es: %d\n"
 
 #: src/rip.c:884
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
-msgstr "Ext: Trk %d (%3.1fx)"
+msgstr "Ext: Pis %d (%3.1fx)"
 
 #: src/rip.c:917
 #, c-format
@@ -1073,12 +1112,12 @@
 
 #: src/rip.c:937
 msgid "Rip finished\n"
-msgstr "Finalizó la extracción\n"
+msgstr "ExtracciÃ³n finalizada\n"
 
 #: src/rip.c:963
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
-msgstr "Ext. parcial %d  núm. wavs %d\n"
+msgstr "Ext. parcial %d  nÃºm. wavs %d\n"
 
 #: src/rip.c:966
 #, c-format
@@ -1092,7 +1131,7 @@
 #: src/rip.c:1014
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
-msgstr "Codif: Trk %d (%3.1fx)"
+msgstr "Codif: Pis %d (%3.1fx)"
 
 #: src/rip.c:1032
 #, c-format
@@ -1102,166 +1141,164 @@
 #: src/rip.c:1042
 #, c-format
 msgid "Finished encoding on cpu %d\n"
-msgstr "Finalizó la codificación en la CPU %d\n"
+msgstr "FinalizÃ³ la codificaciÃ³n en la CPU %d\n"
 
 #: src/rip.c:1060
 #, c-format
 msgid "Deleting [%s]\n"
 msgstr "Borrando [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
-msgstr "Finalizó la extracción\n"
+msgstr "ExtracciÃ³n estÃ¡ finalizada\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "SinArtista"
 
 # No poner el acento, se utiliza para crear directorios
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "SinTitulo"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
-"No se detectó ningún disco en la unidad. Por favor, compruebe la "
-"configuración de su dispositivo CDROM en Config->CD si tiene un disco en la "
+"No se detectÃ³ ningÃºn disco en la unidad. Por favor, compruebe la "
+"configuraciÃ³n de su dispositivo CDROM en Config->CD si tiene un disco en la "
 "unidad."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
-"Ejecutable para extraer inválido\n"
-"Compruebe su configuración de extracción y asegúrese de que especifica la "
-"ruta completa al ejecutable para la extracción."
+"Ejecutable para extraer invÃ¡lido\n"
+"Compruebe su configuraciÃ³n de extracciÃ³n y asegÃºrese de que especifica la "
+"ruta completa al ejecutable para la extracciÃ³n."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
-"Ejecutable de codificación inválido.\n"
-"Compruebe la configuración de su codificador y asegúrese de que especifica "
-"una ruta completa al ejecutable de codificación."
+"Ejecutable de codificaciÃ³n invÃ¡lido.\n"
+"Compruebe la configuraciÃ³n de su codificador y asegÃºrese de que especifica "
+"una ruta completa al ejecutable de codificaciÃ³n."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
 msgstr ""
 "No ha seleccionado ninguna pista.\n"
-"¿Desea extraer todo el CD?\n"
+"Â¿Desea extraer todo el CD?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Extrayendo todo el CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
-msgstr "En «RipNextTrack»\n"
+msgstr "En Â«RipNextTrackÂ»\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La primera pista comprobada es %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
-msgstr "¡Comienza la extracción!\n"
+msgstr "Â¡Comienza la extracciÃ³n!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
-msgstr "No tiene acceso de escritura para poder escribir en el archivo wav"
+msgstr "No tiene acceso de escritura para poder escribir en el fichero wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
-msgstr "Extrayendo la pista %d a %s\n"
+msgstr "Extrayendo pista %d a %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
-msgstr "Ext: Trk %d (0.0x)"
+msgstr "Ext: Pis %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Ya se ha extraído el archivo %s. Omitiéndolo...\n"
+msgstr "Ya se ha extraÃdo el fichero %s. OmitiÃ©ndolo...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "No queda espacio en el directorio de salida"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
-msgstr "Llamando a «CDPRip»\n"
+msgstr "Llamando a Â«CDPRipÂ»\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
-msgstr "Se añadió la pista %d a la lista %s\n"
+msgstr "Se aÃ±adiÃ³ la pista %d a la lista %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
-msgstr "No hay CPUs disponibles\n"
+msgstr "No hay CPU disponibles\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Codif pista %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr ""
-"No tiene acceso de escritura para poder escribir en el archivo de "
-"codificación."
+"No tiene acceso de escritura para poder escribir en el fichero de "
+"codificaciÃ³n."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Codificando a %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
-msgstr "Cod: Trk %d (0.0x)"
+msgstr "Codif: Pis %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
-msgstr "En «CalculateAll»\n"
+msgstr "En Â«CalculateAllÂ»\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
-"No estamos extrayendo ahora, ponemos a cero los valores de codificación\n"
+"No estamos extrayendo ahora, ponemos a cero los valores de codificaciÃ³n\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
-msgstr "El tamaño total de extracción es: %d\n"
+msgstr "El tamaÃ±o total de extracciÃ³n es: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
-msgstr "El tamaño total de codificación es: %d\n"
+msgstr "El tamaÃ±o total de codificaciÃ³n es: %d\n"
 
 #: src/tray.c:57
-#, fuzzy
 msgid "Artist"
-msgstr "SinArtista"
+msgstr "Artista"
 
 # No poner el acento, se utiliza para crear directorios
 #: src/tray.c:58
-#, fuzzy
 msgid "Title"
-msgstr "SinTitulo"
+msgstr "TÃtulo"
 
 #: src/tray.c:83
 #, c-format
@@ -1269,16 +1306,18 @@
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
+"%s - %s\n"
+"%02d:%02d de %02d:%02d"
 
 #: src/tray.c:87
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr ""
+msgstr "Extrayendo  Pista %02d:\t%6.2f%% (%6.2f%% )"
 
 #: src/tray.c:88
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr ""
+msgstr "Codificando Pista %02d:\t%6.2f%% (%6.2f%%)"
 
 #: src/tray.c:89
 #, c-format
@@ -1286,6 +1325,8 @@
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
+"%s - %s\n"
+"%s%s%s"
 
 #: src/tray.c:92
 #, c-format
@@ -1293,43 +1334,42 @@
 "%s - %s\n"
 "Idle"
 msgstr ""
+"%s - %s\n"
+"Inactivo"
 
 #: src/tray.c:191
 msgid "Pause"
-msgstr ""
+msgstr "Pausar"
 
 #: src/tray.c:196
-#, fuzzy
 msgid "Stop"
-msgstr "Parar reproducción"
+msgstr "Detener"
 
 #: src/tray.c:204
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #: src/tray.c:209
-#, fuzzy
 msgid "Next"
-msgstr "Siguiente disco"
+msgstr "Siguiente"
 
 #: src/tray.c:217
-#, fuzzy
 msgid "Rip and Encode"
-msgstr "Interrumpir extracción y codificación"
+msgstr "ExtracciÃ³n y CodificaciÃ³n"
 
 #: src/tray.c:224
 msgid "Quit"
-msgstr ""
+msgstr "Salir"
 
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."
 #~ msgstr ""
-#~ "Esta es una versión de desarrollo de Gripo. Se le recomienda utilizar la "
-#~ "última versión estable si se encuentra con problemas."
+#~ "Esta es una versiÃ³n de desarrollo de Gripo. Se le recomienda utilizar la "
+#~ "Ãºltima versiÃ³n estable si se encuentra con problemas."
 
 #~ msgid "Keep application minimum size"
-#~ msgstr "Mantener el tamaño de la aplicación lo más minimo posible"
+#~ msgstr "Mantener el tamaÃ±o de la aplicaciÃ³n lo mÃ¡s minimo posible"
 
 #~ msgid "Reply is [%s]\n"
 #~ msgstr "La repsuesta es [%s]\n"
@@ -1339,7 +1379,7 @@
 #~ msgstr "Conjunto de caracteres para archivos del sistema"
 
 #~ msgid "Could not parse geometry string `%s'"
-#~ msgstr "No pude analizar la cadena de geometría `%s'"
+#~ msgstr "No pude analizar la cadena de geometrÃa `%s'"
 
 #~ msgid "Aborted\n"
 #~ msgstr "Abortado\n"

grip-3.4.3.tar.gz/po/fi.po -> grip-3.9.0.tar.gz/po/fi.po Changed

@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: grip 3.1.8\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2004-03-30 12:00+0300\n"
 "Last-Translator: Flammie Pirinen <flammie@gnome-fi.org>\n"
 "Language-Team: Finnish <lokalisointi-laatu@lists.linux-aktivaattori.org>\n"
@@ -95,12 +95,12 @@
 msgid "General"
 msgstr "Yleiset"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Kopiointi"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Koodaus"
 
@@ -145,11 +145,16 @@
 msgid "Version %s"
 msgstr "Versio %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "Virhe: Asetustiedostoa ei voitu tallentaa"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Tehty Gripillä"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -159,356 +164,356 @@
 "Gripin asetukset täytyy tehdä uudelleen.\n"
 "Vanha asetustiedostosi tallennettiin -old-päätteellä."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "palvelin on %s, portti %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Virhe: Asetustiedostoa ei voitu tallentaa"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Asetukset"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CD-aseman laitetiedosto"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Älä keskeytä soittoa aloitettaessa tai lopetettaessa"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Kelaa alkuun pysäytettäessä"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Aloita ensimmäisestä raidasta jos ei soiteta"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Soita levyä heti asemaan asettamisen jälkeen"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Sekoita ennen jokaista soittokertaa"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Kierrä rikkinäinen levynpoistotoiminto"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Tarkkaile asemaa uuden levyn varalta"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Tarkkailuväli sekunteina"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Kopioija:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Kopiointiohjelma"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Kopioinnin komentojono"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Poista virheenkorjaus"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Poista tarkempi virheenkorjaus"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Poista naarmujen"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "tunnistus"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "korjaus"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Laske GAIN-säätöarvot"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Levykopion tiedostonimi"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Levykopion tiedostonimi"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "SCSI-laitetiedosto"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Kopioija"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Kopioinnin 'nice'-arvo"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Suurin koodaamattomien .wav-tiedostojen määrä"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Kopioi automaattisesti"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Äänimerkki valmistuttua"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Poista levy kopioinnin jälkeen"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Poiston viive"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Tauko ennen kopiointia"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Aloita koodaus vasta levyn kopioiduttua"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Pysäytä CD-asema raitojen välillä"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Wav-tiedostojen suodatuskomento"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Levyn suodatuskomento"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Koodaaja:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Koodausohjelma"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Koodauksen komentorivi"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Koodauksen tiedostopääte"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Koodattava tiedostonimi"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Koodattava tiedostonimi"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Koodaaja"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Poista .wav-tiedosto koodauksen jälkeen"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Syötä tiedot SQL-kantaan"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Tee .m3u-soittolistat"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Käytä .m3u-soittolistoissa suhteellisia polkuja"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U:n tiedostonimi"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Koodauksen bittinopeus (kilobittiä sekunnissa)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Käytettävien prosessorien määrä"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Koodauksen 'nice'-arvo"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Koodauksen filtteröintikomento"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Poista .wav-tiedosto koodauksen jälkeen"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Lisää ID3-merkinnät koodattuihin tiedostoihin"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Lisää ID3v2-merkinnät koodattuihin tiedostoihin"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Merkitse vain .mp3-tiedostot"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ID3-kommenttikenttä"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-merkistökoodaus"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-merkistökoodaus"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Tietokantapalvelin"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI-polku"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Ensisijainen palvelin"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Toissijainen palvelin"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Tietokantaan lähettämisen postiosoite"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Tietokannan merkistökoodaus"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Käytä freedb-laajennuksia"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Tee levyn tietojen haut automaattisesti"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Käytä välityspalvelinta"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Hae palvelin 'http_proxy'-ympäristömuuttujasta"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Välipalvelin"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Välipalvelimen portti"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Välipalvelimen käyttäjänimi"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Välipalvelimen salasana"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "CD-päivitysohjelma"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Älä muuta tiedostonimiä pienaakkosiksi"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Hyväksy korkeat bitit tiedostonimissä"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Älä muuta välilyöntejä alaviivoiksi"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -516,20 +521,20 @@
 "Merkit joita ei poisteta\n"
 "tiedostonimistä"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Muut"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Virhe: Kopioijan asetustiedostoa ei voitu tallentaa"
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Virhe: Koodaajan asetustiedostoa ei voitu tallentaa"
@@ -564,32 +569,36 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 #, fuzzy
 msgid "Cannot do lookup while ripping."
 msgstr "Ei voida hakea kopioitaessa"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Tuntematon levy"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Raita %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Haetaan osoitteesta %s (%s:n kautta) tietoja levylle %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Haetaan osoitteesta %s tietoja levylle %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Ei vastinetta\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -598,175 +607,204 @@
 "Vastine löydetty \"%s / %s\"\n"
 "Ladataan tietoja...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Valmis\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Virhe levyn tietoja tallennettaessa\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Ei vastinetta\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Pituus"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Raidat"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Raita"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Valmis\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Virhe levyn tietoja tallennettaessa"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Kierrätä soittotapaa"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Aseta soittolistan toisto"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Kopiointitila"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Soita raita / Keskeytä soitto"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Kelaa taaksepäin"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Kelaa eteenpäin"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Edelliseen raitaan"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Seuraavaan raitaan"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Vaihda soittotavan asetuksia"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Seuraava levy"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Pysäytä soitto"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Poista levy asemasta"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Lue levyn sisältö"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Vaihda äänenvoimakkuussäädintä"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Vaihda levyn tietoja"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Käynnistä tai lopeta DiscDB-haku"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Vaihda raitojen näyttöä"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Poistu Gripistä"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "Kopioitaessa ei voi kelata eteenpäin"
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "Kopioitaessa ei voi kelata taaksepäin"
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "Kopioitaessa ei voi vaihtaa levyä"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Poista levy asemasta\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "Kopioitaessa ei voi poistaa levyä asemasta"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Ota levy -- poistetaan asemasta\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "Kopioitaessa ei voida soittaa"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "Kopioitaessa ei voida vaihtaa raitoja"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Luetaan uutta levyä\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat löysi levyn, luetaan raitoja\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Levy on toimiva!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Ei epätyhjiä raitoja\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat ei huomannut levyä\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Nykyinen sektori: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Ei levyä"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -778,51 +816,56 @@
 "\n"
 "Lähetetäänkö levyn tiedot?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Virhe: Väliaikaistiedoston luonti ei onnistu"
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Virhe: Levyn tietoja ei voitu kirjoittaa"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Postitetaan tiedot osoitteeseen %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "Virhe: Koodaajan asetustiedostoa ei voitu tallentaa"
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Järjestelmäviesti"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI on %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Haku on [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Hakuvirhe %d %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Luodaan hakemisto %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Virhe: %s on olemassa mutta tiedostona\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Virhe: kohdetta %s ei voitu avata kirjoittamista varten\n"
@@ -960,7 +1003,7 @@
 msgstr "Peruuta"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "tuntematon ID3-kenttä\n"
 
@@ -969,7 +1012,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Virhe: Tiedostonimeä ei voitu kääntää. Käyttäjää %s ei ole\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Suoritus epäonnistui\n"
 
@@ -977,7 +1020,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "Virhe: Virheellinen kentän tyyppi\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "Virhe: Väärä asetustiedosto\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Virhe: Väärä asetustiedosto\n"
 
@@ -1035,7 +1083,7 @@
 msgstr "Nykyinen sektori: 0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Kopiointi: Jouten"
 
@@ -1043,7 +1091,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Koodaus: Raita 99 (99,9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Koodaus: Jouten"
 
@@ -1126,32 +1174,32 @@
 msgid "Deleting [%s]\n"
 msgstr "Poistetaan [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Kopiointi loppui\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "EiArtistia"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Nimetön"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1161,7 +1209,7 @@
 "Toimimaton koodauskomento\n"
 "Tarkista koodausasetuksesi"
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1169,93 +1217,93 @@
 "Ei raitoja valittuna\n"
 "Kopioidaanko koko CD?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Kopioidaan koko CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "Komennossa RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Ensimmäinen tarkastettu raita on %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Kopioidaan pois!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Ei kirjoitusoikeuksia wav-tiedostoon"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Kopioidaan raita %d tiedostoon %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Kopiointi: Raita %d (0,0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Tiedosto %s on jo kopioitu, ohitamme... \n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Tila loppui hakemistossa"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Kutsutaan komentoa CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Lisättiin raita %d listaan %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Ei vapaita prosessoreja\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Koodaataan raitaa %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "Ei kirjoitusoikeutta koodattuun tiedostoon"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Koodataan kohteeseen %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Koodaus: Raita %d (0,0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "Komennossa CalculateAll:\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Emme kopioi nyt joten nollatkaamme koodausarvoja\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Kopion kokonaiskoko: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Koodauksen kokonaiskoko: %d\n"

grip-3.4.3.tar.gz/po/fr.po -> grip-3.9.0.tar.gz/po/fr.po Changed

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.0\n"
+"Project-Id-Version: grip 3.5.2\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-04-29 21:17+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-08-21 23:15+0200\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -94,12 +94,12 @@
 msgid "General"
 msgstr "Général"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Extraction"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Encodage"
 
@@ -144,11 +144,15 @@
 msgid "Version %s"
 msgstr "Version %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Erreur : l’affichage de la page d’acceuil a échoué."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Créé par Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -158,351 +162,349 @@
 "Grip utilisera les valeurs par défaut et vous devrez le reconfigurer\n"
 "Votre ancien fichier a été sauvé avec l’extension -old."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "Le serveur est %s, port %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Erreur : impossible de sauver le fichier de configuration."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Configuration"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Périphérique CDROM"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Ne pas interrompre la musique lors du démarrage ou de l’arrêt de Grip"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Revenir au début lors de l’arrêt"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Démarrer avec la première piste"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Lecture automatique à l’insertion"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Mélanger avant chaque lecture"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Contourner les problèmes d’éjection erronée"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Interroger le lecteur pour un nouveau disque"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Intervalle d’interrogation (secondes)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Extracteur :"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Programme d’extraction"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Ligne de commande de l’extracteur"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Désactiver le mode « paranoïa »"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Désactiver le mode « extra paranoïa »"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Désactiver la détection des rayures"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "Détection"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "Réparation"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Calcul du gain d’ajustement"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Format du fichier d’extraction"
 
-#: src/gripcfg.c:276
-#, fuzzy
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
-msgstr "Format du fichier d’extraction"
+msgstr "Format du fichier d’extraction (Multi-artist)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Périphérique SCSI générique"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Extracteur"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Valeur de « nice » pour l’extraction"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Nombre max de fichiers WAV non codés"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Extraction automatique à l’insertion"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Biper après l’extraction"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Éjection automatique après l’extraction"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Délai d’éjection automatique"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Délai avant l’extraction"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Retarder l’encodage après la fin de l’extraction du disque"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Arrête le CDROM entre les pistes"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Commande du filtre de fichier WAV"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Commande du filtre pour le disque"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Options"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Encodeur :"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Programme d’encodage"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Ligne de commande de l’encodeur"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Extension de fichier d’encodeur"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Format du fichier d’encodeur"
 
-#: src/gripcfg.c:439
-#, fuzzy
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
-msgstr "Format du fichier d’encodeur"
+msgstr "Format du fichier encodé (Multi-artist)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Encodeur"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Effacer les fichiers WAV après encodage"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Insérer les informations dans la base de données SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Créer des fichiers M3U"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Utiliser des chemins relatifs dans les fichiers M3U"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Format des fichiers M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Débit binaire du codage (kbits/sec)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Nombre de processeurs à utiliser"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Valeur de « nice » de l’encodeur"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Commande du filtre de l’encodeur"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Exécute la commande après l’encodage"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Ajouter les informations ID3 aux fichiers encodés"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Ajouter les informations ID3v2 aux fichiers encodés"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "N’ajouter les informations ID3 qu’aux fichiers de suffixe « .mp3 »"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Champ commentaire ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Codage du jeu de caractères ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Codage du jeu de caractères ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Serveur DB"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Chemin du script CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Serveur primaire"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Serveur secondaire"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "courriel pour la soumission DB"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Jeu de caractères de DB"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Utiliser les extensions freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Lancer la recherche de disque automatiquement"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Utiliser un serveur proxy"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Récupérer le serveur depuis la variable d'environnement « http_proxy »"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Port du proxy"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Nom d’utilisateur du proxy"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Mot de passe du proxy"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "courriel"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Programme de mise à jour de CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Ne pas passer les fichiers en minuscules"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Autoriser les caractères 8 bits dans les noms de fichiers"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 "Remplace les caractères incompatibles par leur représentation hexadécimale"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Ne pas changer les espaces en caractères de soulignement (_)"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Ecrit les fichiers M3U en utilisant la syntaxe non Posix '\\'s"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -510,19 +512,19 @@
 "Caractères à ne pas enlever\n"
 "dans les noms de fichiers"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Affiche l’icône dans la barre des tâches"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Erreur : impossible de sauver la configuration de l’extracteur."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Erreur : impossible de sauver la configuration de l’encodeur."
 
@@ -558,31 +560,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Recherche impossible pendant l’extraction."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Disque inconnu"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Piste %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Recherche %s (via %s) sur le disque %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Recherche %s sur le disque %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Pas de correspondance\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -591,168 +597,197 @@
 "Correspondance pour \"%s / %s\"\n"
 "Téléchargement des données…\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Terminé\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Erreur d’enregistrement des données du disque\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Pas de correspondance\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Durée"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Pistes"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Piste"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Terminé\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Erreur d’enregistrement des données du disque."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Mode de lecture par rotation"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Passer en lecture continu"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "État d’extraction"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Lire la piste / mettre en pause"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Retour"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Avance rapide"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Aller à la piste précédente"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Aller à la piste suivante"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Changer les options de lecture"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Disque suivant"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Arrêter la lecture"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Éjecter le disque"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Analyse du disque"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Basculer l’affichage du contrôle de volume"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Basculer l’éditeur de disque"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Démarrer/arrêter la recherche DiscDB"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Basculer l’affichage des pistes"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Sortir de Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Avance rapide impossible pendant l’extraction."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Retour arrière impossible pendant l’extraction."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Changement de disque impossible pendant l’extraction."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Éjection du disque\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Éjection impossible pendant l’extraction."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Disque présent -- éjection\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Lecture impossible pendant l’extraction."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Changement de piste impossible pendant l’extraction."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Vérification de la présence d’un nouveau disque\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDstat a trouvé un disque, vérification des pistes\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Disque valide détecté !\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Pas de piste de durée non-nulle\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDstat n’a pas trouvé de disque\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Secteur courant : %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Pas de disque"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -764,49 +799,53 @@
 "\n"
 "Voulez-vous soumettre les informations de ce disque ?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Erreur : impossible de créer un fichier temporaire."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Erreur : impossible d’enregistrer les données du disque."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Envoi de l’entrée à %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Erreur : impossible d’exécuter la commande mail."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Message système"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "L’URI est %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "La recherche est [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Erreur %d lors du « stat » de %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Création du répertoire %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Erreur : %s existe, mais c’est un fichier\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Erreur : impossible d’ouvrir %s en écriture\n"
@@ -937,7 +976,7 @@
 msgstr "Annuler"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "Champ ID3 inconnu\n"
 
@@ -947,7 +986,7 @@
 msgstr ""
 "Erreur : impossible de changer le nom de fichier. Utilisateur %s inconnu\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Exécution échouée\n"
 
@@ -955,7 +994,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Erreur : entrée de type erroné\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Erreur de lecture du fichier de configuration\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Erreur : fichier de configuration invalide\n"
 
@@ -1012,7 +1055,7 @@
 msgstr "Secteur courant :      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Ext : innocupé"
 
@@ -1020,7 +1063,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod : piste 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Enc : innocupé"
 
@@ -1102,19 +1145,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Destruction [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Extraction terminée\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Sans artiste"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Sans titre"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1123,7 +1166,7 @@
 "lecteur, vérifiez la configuration du périphérique CDRom sous "
 "« Configuration > CD »."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1133,7 +1176,7 @@
 "Vérifier la configuration, et assurez vous de donnner le chemin complet vers "
 "le programme d’extraction."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1143,7 +1186,7 @@
 "Vérifier la configuration, et assurez vous de donner le chemin complet vers "
 "l’encodeur."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1151,92 +1194,92 @@
 "Pas de piste sélectionnée.\n"
 "Extraction de tout le CD ?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Extraction intégrale du CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "Dans ExtractionPisteSuivante\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La première piste choisie est la %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Extraction !\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Pas d’accès en écriture au fichier WAV"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Extraction piste %d vers %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ext : piste %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Le fichier %s est déjà extrait. Passage au suivant…\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Plus d’espace disponible dans le répertoire destination"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Appel à CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Ajout de la piste %d dans la liste %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Pas de CPU disponible\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Enc piste %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Pas d’accès en écriture au fichier encodé."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i : encodage vers %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Enc : piste %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "Dans CalculeTout\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Pas d’extraction en cours, on met à zéro les valeurs d’encodage\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Taille totale de l’extraction : %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Taille totale de l’encodage : %d\n"

grip-3.9.0.tar.gz/po/fur.po Added

@@ -0,0 +1,1353 @@
+# Traduzion di Grip par Furlan.
+# Copyright (C) 2017 THE GRIP'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the grip package.
+# Fabio Tomat <f.t.public@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grip-3.4.2\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-07-27 15:50+0200\n"
+"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
+"Language-Team: Friulian <f.t.public@gmail.com>\n"
+"Language: fur\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/main.c:56
+msgid "Specify the geometry of the main window"
+msgstr "Specifiche la gjeometrie dal barcon principâl"
+
+#: src/main.c:57
+msgid "GEOMETRY"
+msgstr "GJEOMETRIE"
+
+#: src/main.c:65
+msgid "Specify the config file to use (in your home dir)"
+msgstr "Specifiche il file di configurazion di doprâ (inte tô cartele home)"
+
+#: src/main.c:66
+msgid "CONFIG"
+msgstr "CONFIGURAZION"
+
+#: src/main.c:74
+msgid "Specify the cdrom device to use"
+msgstr "Specifiche il dispositîf cdrom di doprâ"
+
+#: src/main.c:75 src/main.c:84
+msgid "DEVICE"
+msgstr "DISPOSITÎF"
+
+#: src/main.c:83
+msgid "Specify the generic scsi device to use"
+msgstr "Specifiche il dispositîf scsi gjeneric di doprâ"
+
+#: src/main.c:92
+msgid "Launch in \"small\" (cd-only) mode"
+msgstr "Invie in modalitât “piçule” (dome-cd)"
+
+#: src/main.c:101
+msgid "\"Local\" mode -- do not look up disc info on the net"
+msgstr "Modalitât “locâl” -- no sta cirî su internet lis informazions sul disc"
+
+#: src/main.c:110
+msgid "Do not do I/O redirection"
+msgstr "No sta fâ l'indreçament di direzion I/O"
+
+#: src/main.c:119
+msgid "Run in verbose (debug) mode"
+msgstr "Eseguìs in modalitât lungje/fetose (debug)"
+
+#: src/grip.c:185
+msgid "Grip"
+msgstr "Grip"
+
+#: src/grip.c:242
+#, c-format
+msgid "Error: Unable to initialize [%s]\n"
+msgstr "Erôr: impussibil inizializâ [%s]\n"
+
+#: src/grip.c:334
+msgid "Grip started successfully\n"
+msgstr "Grip si è inviât cun sucès\n"
+
+#: src/grip.c:348
+msgid ""
+"Work is in progress.\n"
+"Really shut down?"
+msgstr ""
+"Lavôr in cors.\n"
+"Distudâ pardabon?"
+
+#: src/grip.c:399
+msgid "Status"
+msgstr "Stât"
+
+#: src/grip.c:414
+msgid "General"
+msgstr "Gjenerâl"
+
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
+#: src/rip.c:95
+msgid "Rip"
+msgstr "Estrazion"
+
+#: src/grip.c:444 src/gripcfg.c:511
+msgid "Encode"
+msgstr "Codifiche"
+
+#: src/grip.c:489
+msgid "Help"
+msgstr "Jutori"
+
+#: src/grip.c:494
+msgid "Table Of Contents"
+msgstr "Tabele dai contignûts"
+
+#: src/grip.c:500
+msgid "Playing CDs"
+msgstr "Riproduzion dai CD"
+
+#: src/grip.c:506
+msgid "Ripping CDs"
+msgstr "Estrazion dai CD"
+
+#: src/grip.c:512
+msgid "Configuring Grip"
+msgstr "Configure Grip"
+
+#: src/grip.c:518
+msgid "FAQ"
+msgstr "FAQ"
+
+#: src/grip.c:524
+msgid "Getting More Help"
+msgstr "Par vê plui jutori"
+
+#: src/grip.c:530
+msgid "Reporting Bugs"
+msgstr "Segnalazion erôrs"
+
+#: src/grip.c:550
+msgid "About"
+msgstr "Informazions"
+
+#: src/grip.c:569
+#, c-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "Erôr: impussibil salvâ il file di configurazion."
+
+#: src/grip.c:918
+msgid "Created by Grip"
+msgstr "Creât di Grip"
+
+#: src/grip.c:936
+msgid ""
+"Your config file is out of date -- resetting to defaults.\n"
+"You will need to re-configure Grip.\n"
+"Your old config file has been saved with -old appended."
+msgstr ""
+"Il to file di configurazion al è masse vieli -- si ristabilìs ai "
+"predefinîts.\n"
+"Al coventarà tornâ a configurâ Grip.\n"
+"Il to vecjo file di configurazion al è stât salvât zontant tal non \"-old\"."
+
+#: src/grip.c:1019
+#, c-format
+msgid "server is %s, port %d\n"
+msgstr "il servidôr al è %s, puarte %d\n"
+
+#: src/grip.c:1040
+msgid "Error: Unable to save config file."
+msgstr "Erôr: impussibil salvâ il file di configurazion."
+
+#: src/gripcfg.c:104
+msgid "Config"
+msgstr "Configurazion"
+
+#: src/gripcfg.c:112
+msgid "CDRom device"
+msgstr "Dispositîf CDRom"
+
+#: src/gripcfg.c:117
+msgid "Don't interrupt playback on exit/startup"
+msgstr "No sta interompi la riproduzion in jessude o tal inviament"
+
+#: src/gripcfg.c:121
+msgid "Rewind when stopped"
+msgstr "Torne fâs sù al inizi se al ven fermât"
+
+#: src/gripcfg.c:126
+msgid "Startup with first track if not playing"
+msgstr "Tache cun la prin toc/linie se nol è in riproduzion"
+
+#: src/gripcfg.c:131
+msgid "Auto-play on disc insert"
+msgstr "Riprodûs in automatic al inseriment dal disc"
+
+#: src/gripcfg.c:136
+msgid "Reshuffle before each playback"
+msgstr "Torne messede prime di ogni riproduzion"
+
+#: src/gripcfg.c:141
+msgid "Work around faulty eject"
+msgstr "Soluzion se no si rive a parâ fûr"
+
+#: src/gripcfg.c:146
+msgid "Poll disc drive for new disc"
+msgstr "Consulte la unitât dal disc par savê se e à un gnûf disc"
+
+#: src/gripcfg.c:150
+msgid "Poll interval (seconds)"
+msgstr "Interval par consultâ (seconts)"
+
+#: src/gripcfg.c:158
+msgid "CD"
+msgstr "CD"
+
+#: src/gripcfg.c:174
+msgid "Ripper:"
+msgstr "Estratôr:"
+
+#: src/gripcfg.c:219
+msgid "Ripping executable"
+msgstr "Eseguibil dal estratôr"
+
+#: src/gripcfg.c:224
+msgid "Rip command-line"
+msgstr "Rie di comant par estrai"
+
+#: src/gripcfg.c:235
+msgid "Disable paranoia"
+msgstr "Disabilite paranoia"
+
+#: src/gripcfg.c:240
+msgid "Disable extra paranoia"
+msgstr "Disabilite lis opzions extra di paranoia"
+
+#: src/gripcfg.c:246
+msgid "Disable scratch"
+msgstr "Disabilite lis sgriadis"
+
+#: src/gripcfg.c:250
+msgid "detection"
+msgstr "rilevament"
+
+#: src/gripcfg.c:254
+msgid "repair"
+msgstr "comedament"
+
+#: src/gripcfg.c:262
+msgid "Calculate gain adjustment"
+msgstr "Calcole il justament dal vuadagn"
+
+#: src/gripcfg.c:270
+msgid "Rip file format"
+msgstr "Formât dal file di estrazion"
+
+#: src/gripcfg.c:275
+msgid "Rip file format (Multi-artist)"
+msgstr "Formât dal file di estrazion (artiscj-multiplis)"
+
+#: src/gripcfg.c:279
+msgid "Generic SCSI device"
+msgstr "Dispositîf SCSI gjeneric"
+
+#: src/gripcfg.c:287
+msgid "Ripper"
+msgstr "Estratôr"
+
+#: src/gripcfg.c:296
+msgid "Rip 'nice' value"
+msgstr "Valôr 'nice' dal estratôr"
+
+#: src/gripcfg.c:300
+msgid "Max non-encoded .wav's"
+msgstr "Numar massim di file .wav no codificâts"
+
+#: src/gripcfg.c:306
+msgid "Auto-rip on insert"
+msgstr "Estrai in automatic al inseriment"
+
+#: src/gripcfg.c:310
+msgid "Beep after rip"
+msgstr "Beep dopo vê estrat"
+
+#: src/gripcfg.c:320
+msgid "Auto-eject after rip"
+msgstr "Pare fûr in automatic dopo vê estrat"
+
+#: src/gripcfg.c:324
+msgid "Auto-eject delay"
+msgstr "Ritart tal parâ fûr in automatic"
+
+#: src/gripcfg.c:332
+msgid "Delay before ripping"
+msgstr "Ritart prime di estrai"
+
+#: src/gripcfg.c:337
+msgid "Delay encoding until disc is ripped"
+msgstr "Ritarde la codifiche fintremai che il disc nol sedi estrat"
+
+#: src/gripcfg.c:342
+msgid "Stop cdrom drive between tracks"
+msgstr "Ferme la unitât cdrom tra i tocs/liniis"
+
+#: src/gripcfg.c:346
+msgid "Wav filter command"
+msgstr "Comant dal filtri wav"
+
+#: src/gripcfg.c:351
+msgid "Disc filter command"
+msgstr "Comant dal filtri disc"
+
+#: src/gripcfg.c:359 src/gripcfg.c:504
+msgid "Options"
+msgstr "Opzions"
+
+#: src/gripcfg.c:381
+msgid "Encoder:"
+msgstr "Codificadôr:"
+
+#: src/gripcfg.c:416
+msgid "Encoder executable"
+msgstr "Eseguibil dal codificadôr"
+
+#: src/gripcfg.c:421
+msgid "Encoder command-line"
+msgstr "Rie di comant dal codificadôr"
+
+#: src/gripcfg.c:427
+msgid "Encoder file extension"
+msgstr "Estension dal file dal codificadôr"
+
+#: src/gripcfg.c:432
+msgid "Encoder file format"
+msgstr "Formât dal file dal codificadôr"
+
+#: src/gripcfg.c:438
+msgid "Encode file format (Multi-artist)"
+msgstr "Formât dal file codificât (artiscj-multiplis)"
+
+#: src/gripcfg.c:446
+msgid "Encoder"
+msgstr "Codificadôr"
+
+#: src/gripcfg.c:456
+msgid "Delete .wav after encoding"
+msgstr "Elimine il file .wav dopo vê codificât"
+
+#: src/gripcfg.c:461
+msgid "Insert info into SQL database"
+msgstr "Inserìs informazions te base di dâts SQL"
+
+#: src/gripcfg.c:465
+msgid "Create .m3u files"
+msgstr "Cree i file .m3u"
+
+#: src/gripcfg.c:470
+msgid "Use relative paths in .m3u files"
+msgstr "Dopre i percors relatîfs tai file .m3u"
+
+#: src/gripcfg.c:474
+msgid "M3U file format"
+msgstr "Formât dal file M3U"
+
+#: src/gripcfg.c:479
+msgid "Encoding bitrate (kbits/sec)"
+msgstr "Velocitât di codifiche (kbits/s)"
+
+#: src/gripcfg.c:483
+msgid "Number of CPUs to use"
+msgstr "Numar di CPU di doprâ"
+
+#: src/gripcfg.c:487
+msgid "Encoder 'nice' value"
+msgstr "Valôr 'nice' dal codificadôr"
+
+#: src/gripcfg.c:491
+msgid "Encoder filter command"
+msgstr "Comant dal filtri dal codificadôr"
+
+#: src/gripcfg.c:496
+msgid "Execute command after encode"
+msgstr "Eseguìs il comant dopo vê codificât"
+
+#: src/gripcfg.c:520
+msgid "Add ID3 tags to encoded files"
+msgstr "Zonte etichetis ID3 ai file codificâts"
+
+#: src/gripcfg.c:526
+msgid "Add ID3v2 tags to encoded files"
+msgstr "Zonte etichetis ID3v2 ai file codificâts"
+
+#: src/gripcfg.c:532
+msgid "Only tag files ending in '.mp3'"
+msgstr "Met etichetis dome ai file che a finissin cun '.mp3'"
+
+#: src/gripcfg.c:536
+msgid "ID3 comment field"
+msgstr "Cjamp coment ID3"
+
+#: src/gripcfg.c:541
+msgid "ID3v1 Character set encoding"
+msgstr "Codifiche de cumbinazion di caratars ID3v1"
+
+#: src/gripcfg.c:547
+msgid "ID3v2 Character set encoding"
+msgstr "Codifiche de cumbinazion di caratars ID3v2"
+
+#: src/gripcfg.c:555
+msgid "ID3"
+msgstr "ID3"
+
+#: src/gripcfg.c:572 src/gripcfg.c:592
+msgid "DB server"
+msgstr "Servidôr Base Dâts"
+
+#: src/gripcfg.c:576 src/gripcfg.c:596
+msgid "CGI path"
+msgstr "Percors CGI"
+
+#: src/gripcfg.c:583
+msgid "Primary Server"
+msgstr "Servidôr primari"
+
+#: src/gripcfg.c:603
+msgid "Secondary Server"
+msgstr "Servidôr secondari"
+
+#: src/gripcfg.c:613
+msgid "DB Submit email"
+msgstr "E-mail par inviâ ae Base Dâts"
+
+#: src/gripcfg.c:618
+msgid "DB Character set encoding"
+msgstr "Codifiche de cumbinazion di caratars des Basis di Dâts (DB)"
+
+#: src/gripcfg.c:623
+msgid "Use freedb extensions"
+msgstr "Dopre estensions freedb"
+
+#: src/gripcfg.c:628
+msgid "Perform disc lookups automatically"
+msgstr "Fâs in automatic lis ricercjis sul disc"
+
+#: src/gripcfg.c:636
+msgid "DiscDB"
+msgstr "DiscDB"
+
+#: src/gripcfg.c:645
+msgid "Use proxy server"
+msgstr "Dopre servidôr proxy"
+
+#: src/gripcfg.c:652
+msgid "Get server from 'http_proxy' env. var"
+msgstr "Individue il servidôr leint la variabile di ambient 'http_proxy'"
+
+#: src/gripcfg.c:656
+msgid "Proxy server"
+msgstr "Servidôr proxy"
+
+#: src/gripcfg.c:660
+msgid "Proxy port"
+msgstr "Puarte dal proxy"
+
+#: src/gripcfg.c:664
+msgid "Proxy username"
+msgstr "Non utent dal proxy"
+
+#: src/gripcfg.c:670
+msgid "Proxy password"
+msgstr "Password dal proxy"
+
+#: src/gripcfg.c:678
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/gripcfg.c:687
+msgid "Email address"
+msgstr "Direzion e-mail"
+
+#: src/gripcfg.c:691
+msgid "CD update program"
+msgstr "Program di inzornament CD"
+
+#: src/gripcfg.c:696
+msgid "Do not lowercase filenames"
+msgstr "No sta meti in minuscul i nons dai file"
+
+#: src/gripcfg.c:701
+msgid "Allow high bits in filenames"
+msgstr "Permet i bit alts tai nons dai file"
+
+#: src/gripcfg.c:706
+msgid "Replace incompatible characters by hexadecimal numbers"
+msgstr "Sostituìs i caratars incompatibii cun numars esadecimâi"
+
+#: src/gripcfg.c:711
+msgid "Do not change spaces to underscores"
+msgstr "No sta cambiâ i spazis cun liniis bassis"
+
+#: src/gripcfg.c:716
+msgid "Write m3u files using non-posix compliant '\\'s"
+msgstr "Scrîf i file m3u doprant lis sbaris '\\' che no son conformis a posix"
+
+#: src/gripcfg.c:721
+msgid ""
+"Characters to not strip\n"
+"in filenames"
+msgstr ""
+"Caratar di no gjavâ\n"
+"tai nons dai file"
+
+#: src/gripcfg.c:726
+msgid "Show tray icon"
+msgstr "Mostre icone te guantiere di notifiche"
+
+#: src/gripcfg.c:733
+msgid "Misc"
+msgstr "Variis"
+
+#: src/gripcfg.c:839
+msgid "Error: Unable to save ripper config."
+msgstr "Erôr: impussibil salvâ la configurazion dal estratôr."
+
+#: src/gripcfg.c:913
+msgid "Error: Unable to save encoder config."
+msgstr "Erôr: impussibil salvâ la configurazion dal codificadôr."
+
+#: src/cddev.c:174 src/cddev.c:604
+#, c-format
+msgid "Drive status is %d\n"
+msgstr "Il stât de unitât al è %d\n"
+
+#: src/cddev.c:176
+msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n"
+msgstr "La unitât no supuarte il control dal so stât (assumi CDS_NO_INFO)\n"
+
+#: src/cddev.c:179
+msgid "No disc\n"
+msgstr "Nissun disc\n"
+
+#: src/cddev.c:284 src/cddev.c:293 src/cddev.c:310 src/cddev.c:337
+msgid "Error: Failed to read disc contents\n"
+msgstr "Erôr: no si è rivâts a lei i contignûts dal disc\n"
+
+#: src/cddev.c:607
+msgid "Drive doesn't support drive status check\n"
+msgstr "La unitât no supuarte il control dal so stât\n"
+
+#: src/cddev.c:627 src/cddev.c:632
+#, c-format
+msgid "Unlock failed: %d"
+msgstr "No si è rivâts a sblocâ: %d"
+
+#: src/cddev.c:636
+msgid "CDIOCEJECT"
+msgstr "CDIOCEJECT"
+
+#: src/cdplay.c:88
+msgid "Cannot do lookup while ripping."
+msgstr "Impussibil fâ ricercjis intant che si fâs estrazions."
+
+#. "misc"
+#: src/cdplay.c:125
+msgid "Unknown Disc"
+msgstr "Disc no cognossût"
+
+#: src/cdplay.c:129
+#, c-format
+msgid "Track %02d"
+msgstr "Linie %02d"
+
+#: src/cdplay.c:183
+#, c-format
+msgid "Querying %s (through %s) for disc %02x.\n"
+msgstr "Daûr a interogâ %s (par mieç di %s) pal disc %02x.\n"
+
+#: src/cdplay.c:188
+#, c-format
+msgid "Querying %s for disc %02x.\n"
+msgstr "Daûr a interogâ %s pal disc %02x.\n"
+
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Nissune corispuindince\n"
+
+#: src/cdplay.c:237
+#, c-format
+msgid ""
+"Match for \"%s / %s\"\n"
+"Downloading data...\n"
+msgstr ""
+"Coincidence par \"%s / %s\"\n"
+"Daûr a discjariâ dâts...\n"
+
+#: src/cdplay.c:246
+msgid "Done\n"
+msgstr "Fat\n"
+
+#: src/cdplay.c:249
+msgid "Error saving disc data\n"
+msgstr "Erôr tal salvâ i dâts dal disc\n"
+
+#: src/cdplay.c:266 src/cdplay.c:377
+msgid "Length"
+msgstr "Lungjece"
+
+#: src/cdplay.c:321
+msgid "Tracks"
+msgstr "Liniis/Tocs"
+
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
+msgid "Track"
+msgstr "Linie/Toc"
+
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Fat\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
+msgid "Error saving disc data."
+msgstr "Erôr tal salvâ i dâts dal disc."
+
+#: src/cdplay.c:795
+msgid "Rotate play mode"
+msgstr "Riproduzion cicliche"
+
+#: src/cdplay.c:815
+msgid "Toggle loop play"
+msgstr "Comute riproduzion cicliche"
+
+#: src/cdplay.c:893 src/rip.c:230
+msgid "Rip status"
+msgstr "Stât de estrazion"
+
+#: src/cdplay.c:960
+msgid "Play track / Pause play"
+msgstr "Riprodûs toc / met in pause la riproduzion"
+
+#: src/cdplay.c:971
+msgid "Rewind"
+msgstr "Fâs sù"
+
+#: src/cdplay.c:982
+msgid "FastForward"
+msgstr "Indenant veloç"
+
+#: src/cdplay.c:992
+msgid "Go to previous track"
+msgstr "Va al toc prime"
+
+#: src/cdplay.c:1001
+msgid "Go to next track"
+msgstr "Va al prossim toc"
+
+#: src/cdplay.c:1010
+msgid "Toggle play mode options"
+msgstr "Comute lis opzions de modalitât di riproduzion"
+
+#: src/cdplay.c:1020
+msgid "Next Disc"
+msgstr "Prossim disc"
+
+#: src/cdplay.c:1034
+msgid "Stop play"
+msgstr "Ferme riproduzion"
+
+#: src/cdplay.c:1044
+msgid "Eject disc"
+msgstr "Pare fûr il disc"
+
+#: src/cdplay.c:1053
+msgid "Scan Disc Contents"
+msgstr "Analize contignûts dal disc"
+
+#: src/cdplay.c:1061
+msgid "Toggle Volume Control"
+msgstr "Comute il control dal volum"
+
+#: src/cdplay.c:1070
+msgid "Toggle disc editor"
+msgstr "Comute l'editôr dal disc"
+
+#: src/cdplay.c:1080
+msgid "Initiate/abort DiscDB lookup"
+msgstr "Inizie/termine la ricercje DiscDB"
+
+#: src/cdplay.c:1090
+msgid "Toggle track display"
+msgstr "Comute visualizazion linie/toc"
+
+#: src/cdplay.c:1097
+msgid "Exit Grip"
+msgstr "Jes di Grip"
+
+#: src/cdplay.c:1264
+msgid "Cannot fast forward while ripping."
+msgstr "Impussibil lâ indenant veloç intant che fâs estrazions."
+
+#: src/cdplay.c:1295
+msgid "Cannot rewind while ripping."
+msgstr "Impussibil fâ sù intant che si fâs estrazions."
+
+#: src/cdplay.c:1326
+msgid "Cannot switch discs while ripping."
+msgstr "Impussibil cambiâ discs intant che si fâs estrazions."
+
+#: src/cdplay.c:1344
+msgid "Eject disc\n"
+msgstr "Pare fûr il disc\n"
+
+#: src/cdplay.c:1348
+msgid "Cannot eject while ripping."
+msgstr "Impussibil parâ fûr intant che si fâs estrazions."
+
+#: src/cdplay.c:1358
+msgid "Have disc -- ejecting\n"
+msgstr "Cjo il disc -- daûr a parâ fûr\n"
+
+#: src/cdplay.c:1425
+msgid "Cannot play while ripping."
+msgstr "Impussibil riprodusi intant che si fâs estrazions."
+
+#: src/cdplay.c:1493 src/cdplay.c:1524
+msgid "Cannot switch tracks while ripping."
+msgstr "Impussibil cambiâ liniis/tocs intant che si fâs estrazions."
+
+#: src/cdplay.c:1615
+msgid "Checking for a new disc\n"
+msgstr "Daûr a cirî un gnûf disc\n"
+
+#: src/cdplay.c:1620
+msgid "CDStat found a disc, checking tracks\n"
+msgstr "CDStat al à cjatât un disc, control des liniis\n"
+
+#: src/cdplay.c:1623
+msgid "We have a valid disc!\n"
+msgstr "O vin un disc valit!\n"
+
+#: src/cdplay.c:1650
+msgid "No non-zero length tracks\n"
+msgstr "Nissune linie di lungjece divierse di zero\n"
+
+#: src/cdplay.c:1659
+msgid "CDStat said no disc\n"
+msgstr "CDStat al à dite: nissun disc\n"
+
+#: src/cdplay.c:1808 src/cdplay.c:1830
+#, c-format
+msgid "Current sector: %6d"
+msgstr "Setôr atuâl: %6d"
+
+#: src/cdplay.c:1931
+msgid "No Disc"
+msgstr "Nissun disc"
+
+#: src/cdplay.c:1983
+msgid ""
+"This disc has been found on your secondary server,\n"
+"but not on your primary server.\n"
+"\n"
+"Do you wish to submit this disc information?"
+msgstr ""
+"Chest disc al è stât cjatâ tal to servidôr secondari,\n"
+"ma no tal to servidôr primari.\n"
+"\n"
+"Inviâ cheste informazion sul disc?"
+
+#: src/cdplay.c:2012 src/cdplay.c:2021
+msgid "Error: Unable to create temporary file."
+msgstr "Erôr: Impussibil creâ il file temporani."
+
+#: src/cdplay.c:2039
+msgid "Error: Unable to write disc data."
+msgstr "Erôr: impussibil scrivi i dâts dal disc."
+
+#: src/cdplay.c:2048
+#, c-format
+msgid "Mailing entry to %s\n"
+msgstr "Notifiche imission a %s\n"
+
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "Erôr: impussibil salvâ la configurazion dal codificadôr."
+
+#: src/dialog.c:44
+msgid "System Message"
+msgstr "Messaç di sisteme"
+
+#: src/discdb.c:209
+#, c-format
+msgid "URI is %s\n"
+msgstr "Il URI al è %s\n"
+
+#: src/discdb.c:290
+#, c-format
+msgid "Query is [%s]\n"
+msgstr "La interogazion e je [%s]\n"
+
+#: src/discdb.c:792
+#, c-format
+msgid "Stat error %d on %s\n"
+msgstr "Erôr di stât %d su %s\n"
+
+#: src/discdb.c:796
+#, c-format
+msgid "Creating directory %s\n"
+msgstr "Daûr a creâ la cartele %s\n"
+
+#: src/discdb.c:801
+#, c-format
+msgid "Error: %s exists, but is a file\n"
+msgstr "Erôr: %s al esist, ma al è un file\n"
+
+#: src/discdb.c:808
+#, c-format
+msgid "Error: Unable to open %s for writing\n"
+msgstr "Erôr: impussibil vierzi %s pe scriture\n"
+
+#: src/discedit.c:67
+msgid "Disc title"
+msgstr "Titul disc"
+
+#: src/discedit.c:74 src/discedit.c:176
+msgid "Track name"
+msgstr "Non linie"
+
+#: src/discedit.c:84
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:110
+msgid "Disc artist"
+msgstr "Artist disc"
+
+#: src/discedit.c:127
+msgid "ID3 genre:"
+msgstr "Gjenar ID3:"
+
+#: src/discedit.c:158
+msgid "Disc year"
+msgstr "An disc"
+
+#: src/discedit.c:196
+msgid "Track artist"
+msgstr "Artist dal toc"
+
+#: src/discedit.c:213
+msgid "Split:"
+msgstr "Divît:"
+
+#: src/discedit.c:217
+msgid "Title/Artist"
+msgstr "Titul/Artist"
+
+#: src/discedit.c:224
+msgid "Artist/Title"
+msgstr "Artist/Titul"
+
+#: src/discedit.c:232
+msgid "Split chars"
+msgstr "Divît i caratars"
+
+#: src/discedit.c:254
+msgid "Multi-artist"
+msgstr "Artiscj-multiplis"
+
+#: src/discedit.c:265
+msgid "Save disc info"
+msgstr "Salve informazions disc"
+
+#: src/discedit.c:274
+msgid "Submit disc info"
+msgstr "Invie informazions disc"
+
+#: src/discedit.c:393
+msgid "No disc present."
+msgstr "Nissun disc presint."
+
+#: src/discedit.c:543
+msgid "Cannot submit. No disc is present."
+msgstr "Impussibil inviâ. Nol è presint nissun disc."
+
+#: src/discedit.c:558
+msgid "You must enter a disc title."
+msgstr "Si scugne inserî il titul di un disc."
+
+#: src/discedit.c:565
+msgid "You must enter a disc artist."
+msgstr "Si scugne inserî l'artist di un disc."
+
+#: src/discedit.c:575
+msgid ""
+"You are about to submit this disc information\n"
+"to a commercial CDDB server, which will then\n"
+"own the data that you submit. These servers make\n"
+"a profit out of your effort. We suggest that you\n"
+"support free servers instead.\n"
+"\n"
+"Continue?"
+msgstr ""
+"Si sta par inviâ la informazion su chest disc\n"
+"a un servidôr CDDB comerciâl, che al deventarà\n"
+"proprietari dai dâts che si inviarà. Chescj servidôrs a\n"
+"fasin bêçs cul to lavôr. Ti consein di supartâ invezit\n"
+"servidôrs libars.\n"
+"\n"
+"Continuâ?"
+
+#: src/discedit.c:584
+msgid ""
+"You are about to submit this\n"
+"disc information via email.\n"
+"\n"
+"Continue?"
+msgstr ""
+"Si sta par inviâ cheste\n"
+"informazions sul disc vie e-mail.\n"
+"\n"
+"Continuâ?"
+
+#: src/discedit.c:601
+msgid "Genre selection"
+msgstr "Selezion gjenar"
+
+#: src/discedit.c:605
+msgid ""
+"Submission requires a genre other than 'unknown'\n"
+"Please select a DiscDB genre below"
+msgstr ""
+"Par inviâ si scugne dâ un gjenar diviers di 'no cognossût'\n"
+"Selezione un gjenar DiscDB chi sot"
+
+#: src/discedit.c:615
+msgid "DiscDB genre"
+msgstr "Gjenar DiscDB"
+
+#: src/discedit.c:635
+msgid "Submit"
+msgstr "Invie"
+
+#: src/discedit.c:646
+msgid "Cancel"
+msgstr "Anule"
+
+#. Doh!
+#: src/id3.c:335
+msgid "unknown ID3 field\n"
+msgstr "cjamp ID3 no cognossût\n"
+
+#: src/launch.c:121
+#, c-format
+msgid "Error: unable to translate filename. No such user as %s\n"
+msgstr "Erôr: impussibil tradusi il non dal file. Utent %s inesistent\n"
+
+#: src/launch.c:312 src/rip.c:1638
+msgid "Exec failed\n"
+msgstr "Esecuzion falide\n"
+
+#: src/parsecfg.c:58
+msgid "Error: Bad entry type\n"
+msgstr "Erôr: gjenar di vôs sbaliade\n"
+
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "Erôr: file di configurazion no valit\n"
+
+#: src/parsecfg.c:87
+msgid "Error: Invalid config file\n"
+msgstr "Erôr: file di configurazion no valit\n"
+
+#: src/rip.c:104
+msgid "Rip+Encode"
+msgstr "Estrai e codifiche"
+
+#: src/rip.c:106
+msgid "Rip and encode selected tracks"
+msgstr "Estrai e codifiche i tocs selezionâts"
+
+#: src/rip.c:112
+msgid "Rip Only"
+msgstr "Dome estrai"
+
+#: src/rip.c:114
+msgid "Rip but do not encode selected tracks"
+msgstr "Estrai ma no sta codificâ i tocs selezionâts"
+
+#: src/rip.c:120
+msgid "Abort Rip and Encode"
+msgstr "Interomp estrazion e codifiche"
+
+#: src/rip.c:122
+msgid "Kill all active rip and encode processes"
+msgstr "Cope ducj i procès di estrazion e codifiche atîfs"
+
+#: src/rip.c:130
+msgid "Abort Ripping Only"
+msgstr "Interomp dome la estrazion"
+
+#: src/rip.c:132
+msgid "Kill rip process"
+msgstr "Cope i procès di estrazion"
+
+#: src/rip.c:138
+msgid "DDJ Scan"
+msgstr "Analisi DDJ"
+
+#: src/rip.c:140
+msgid "Insert disc information into the DigitalDJ database"
+msgstr "Inserìs la informazion dal disc su la base di dâts DigitalDJ"
+
+#: src/rip.c:155
+msgid "Rip partial track"
+msgstr "Estrai une linie parziâl"
+
+#: src/rip.c:166 src/tray.c:186
+msgid "Play"
+msgstr "Riprodûs"
+
+#: src/rip.c:173
+msgid "Current sector:      0"
+msgstr "Setôr atuâl:           0"
+
+#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+msgid "Rip: Idle"
+msgstr "Estr: inative"
+
+#: src/rip.c:209
+msgid "Enc: Trk 99 (99.9x)"
+msgstr "Cod: lin 99 (99.9x)"
+
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+msgid "Enc: Idle"
+msgstr "Cod: inative"
+
+#: src/rip.c:264
+msgid "Overall indicators:"
+msgstr "Indicadôrs complessîfs:"
+
+#: src/rip.c:327
+msgid "Start sector"
+msgstr "Setôr iniziâl"
+
+#: src/rip.c:332
+msgid "End sector"
+msgstr "Setôr finâl"
+
+#: src/rip.c:384
+#, c-format
+msgid "Inserting track %d into the ddj database\n"
+msgstr "Daûr a inserî il toc %d inte base di dâts ddj\n"
+
+#: src/rip.c:609
+msgid "Error: can't open m3u file."
+msgstr "Erôr: impussibil vierzi il file m3u."
+
+#: src/rip.c:703
+msgid "In KillRip\n"
+msgstr "In KillRip\n"
+
+#: src/rip.c:729
+#, c-format
+msgid "Now total enc size is: %d\n"
+msgstr "Cumò la dimension de codifiche totâl e je: %d\n"
+
+#: src/rip.c:884
+#, c-format
+msgid "Rip: Trk %d (%3.1fx)"
+msgstr "Estr: toc %d (%3.1fx)"
+
+#: src/rip.c:917
+#, c-format
+msgid "Rip: %6.2f%%"
+msgstr "Estr: %6.2f%%"
+
+#: src/rip.c:937
+msgid "Rip finished\n"
+msgstr "Estrazion finide\n"
+
+#: src/rip.c:963
+#, c-format
+msgid "Rip partial %d  num wavs %d\n"
+msgstr "Estr. parziâl %d  num. wavs %d\n"
+
+#: src/rip.c:966
+#, c-format
+msgid "Next track is %d, total is %d\n"
+msgstr "La prossime linie e je %d, il totâl al è %d\n"
+
+#: src/rip.c:972
+msgid "Check if we need to rip another track\n"
+msgstr "Controle se si scugne estrai une altre linie\n"
+
+#: src/rip.c:1014
+#, c-format
+msgid "Enc: Trk %d (%3.1fx)"
+msgstr "Cod: toc %d (%3.1fx)"
+
+#: src/rip.c:1032
+#, c-format
+msgid "Enc: %6.2f%%"
+msgstr "Cod: %6.2f%%"
+
+#: src/rip.c:1042
+#, c-format
+msgid "Finished encoding on cpu %d\n"
+msgstr "Codifiche finide su la cpu %d\n"
+
+#: src/rip.c:1060
+#, c-format
+msgid "Deleting [%s]\n"
+msgstr "Daûr a eliminâ [%s]\n"
+
+#: src/rip.c:1124
+msgid "Ripping is finished\n"
+msgstr "La estrazion e je finide\n"
+
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+msgid "NoArtist"
+msgstr "CenceArtist"
+
+#: src/rip.c:1258
+msgid "NoTitle"
+msgstr "CenceTitul"
+
+#: src/rip.c:1354
+msgid ""
+"No disc was detected in the drive. If you have a disc in your drive, please "
+"check your CDRom device setting under Config->CD."
+msgstr ""
+"Nol è stât rilevât nissun disc te unitât. Se si à un disc te unitât, "
+"controlâ lis impostazions dal dispositîf CDRom sot Config->CD."
+
+#: src/rip.c:1367
+msgid ""
+"Invalid rip executable.\n"
+"Check your rip config, and ensure it specifies the full path to the ripper "
+"executable."
+msgstr ""
+"Eseguibil par estrai no valit.\n"
+"Controla la configurazion de estrazion e sigurâsi che e specifichi il "
+"percors complet dal eseguibil estratôr."
+
+#: src/rip.c:1378
+msgid ""
+"Invalid encoder executable.\n"
+"Check your encoder config, and ensure it specifies the full path to the "
+"encoder executable."
+msgstr ""
+"Eseguibil codificadôr no valit.\n"
+"Controlâ la configurazion de codifiche e sigurâsi che e specifichi il "
+"percors complet dal eseguibil codificadôr."
+
+#: src/rip.c:1414
+msgid ""
+"No tracks selected.\n"
+"Rip whole CD?\n"
+msgstr ""
+"Nissune linie/toc selezionade.\n"
+"Estrai il CD intîr?\n"
+
+#: src/rip.c:1440
+msgid "Ripping whole CD\n"
+msgstr "Daûr a estrai il CD intîr\n"
+
+#: src/rip.c:1480
+msgid "In RipNextTrack\n"
+msgstr "In RipNextTrack\n"
+
+#: src/rip.c:1487
+#, c-format
+msgid "First checked track is %d\n"
+msgstr "La prime linie controlade e je %d\n"
+
+#: src/rip.c:1497
+msgid "Ripping away!\n"
+msgstr "E vie a tirâ fûr!\n"
+
+#: src/rip.c:1547
+msgid "No write access to write wav file"
+msgstr "No si à l'acès in scriture par scrivi il file wav"
+
+#: src/rip.c:1561
+#, c-format
+msgid "Ripping track %d to %s\n"
+msgstr "Daûr a estrai la linie %d a %s\n"
+
+#: src/rip.c:1565
+#, c-format
+msgid "Rip: Trk %d (0.0x)"
+msgstr "Estr: toc %d (0.0x)"
+
+#: src/rip.c:1570
+#, c-format
+msgid "File %s has already been ripped. Skipping...\n"
+msgstr "Il file %s al è za stât estrat. Lu si salte...\n"
+
+#: src/rip.c:1591 src/rip.c:1856
+msgid "Out of space in output directory"
+msgstr "Finît il spazi te cartele di jessude"
+
+#: src/rip.c:1673
+msgid "Calling CDPRip\n"
+msgstr "Daûr a clamâ CDPRip\n"
+
+#: src/rip.c:1762
+#, c-format
+msgid "Added track %d to %s list\n"
+msgstr "La linie %d e je stade zontade ae liste %s\n"
+
+#: src/rip.c:1789
+msgid "No free cpus\n"
+msgstr "Nissune cpu disponibile\n"
+
+#: src/rip.c:1805
+#, c-format
+msgid "Enc track %d\n"
+msgstr "Cod linie %d\n"
+
+#: src/rip.c:1830
+msgid "No write access to write encoded file."
+msgstr "No si à l'acès in scriture par scrivi il file codificât."
+
+#: src/rip.c:1841
+#, c-format
+msgid "%i: Encoding to %s\n"
+msgstr "%i: daûr a codificâ a %s\n"
+
+#: src/rip.c:1845
+#, c-format
+msgid "Enc: Trk %d (0.0x)"
+msgstr "Cod: toc %d (0.0x)"
+
+#: src/rip.c:1915
+msgid "In CalculateAll\n"
+msgstr "In CalculateAll\n"
+
+#: src/rip.c:1921
+msgid "We aren't ripping now, so let's zero encoding values\n"
+msgstr ""
+"Cumò no si è daûr a estrai, duncje metin a zero i valôrs di codifiche\n"
+
+#: src/rip.c:1937
+#, c-format
+msgid "Total rip size is: %d\n"
+msgstr "La dimension totâl di estrazion e je: %d\n"
+
+#: src/rip.c:1938
+#, c-format
+msgid "Total enc size is: %d\n"
+msgstr "La dimension totâl di codifiche e je: %d\n"
+
+#: src/tray.c:57
+msgid "Artist"
+msgstr "Artist"
+
+#: src/tray.c:58
+msgid "Title"
+msgstr "Titul"
+
+#: src/tray.c:83
+#, c-format
+msgid ""
+"%s - %s\n"
+"%02d:%02d of %02d:%02d"
+msgstr ""
+"%s - %s\n"
+"%02d:%02d di %02d:%02d"
+
+#: src/tray.c:87
+#, c-format
+msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
+msgstr "Estrazion  toc %02d:\t%6.2f%% (%6.2f%% )"
+
+#: src/tray.c:88
+#, c-format
+msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
+msgstr "Codifiche toc %02d:\t%6.2f%% (%6.2f%% )"
+
+#: src/tray.c:89
+#, c-format
+msgid ""
+"%s - %s\n"
+"%s%s%s"
+msgstr ""
+"%s - %s\n"
+"%s%s%s"
+
+#: src/tray.c:92
+#, c-format
+msgid ""
+"%s - %s\n"
+"Idle"
+msgstr ""
+"%s - %s\n"
+"Inatîf"
+
+#: src/tray.c:191
+msgid "Pause"
+msgstr "Pause"
+
+#: src/tray.c:196
+msgid "Stop"
+msgstr "Ferme"
+
+#: src/tray.c:204
+msgid "Previous"
+msgstr "Precedent"
+
+#: src/tray.c:209
+msgid "Next"
+msgstr "Sucessîf"
+
+#: src/tray.c:217
+msgid "Rip and Encode"
+msgstr "Estrai e codifiche"
+
+#: src/tray.c:224
+msgid "Quit"
+msgstr "Jes"

grip-3.4.3.tar.gz/po/grip.pot -> grip-3.9.0.tar.gz/po/grip.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\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"
@@ -88,12 +88,12 @@
 msgid "General"
 msgstr ""
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr ""
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr ""
 
@@ -138,377 +138,381 @@
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr ""
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr ""
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr ""
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr ""
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr ""
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr ""
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr ""
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr ""
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr ""
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr ""
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr ""
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr ""
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr ""
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr ""
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr ""
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr ""
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr ""
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr ""
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr ""
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr ""
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr ""
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr ""
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr ""
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr ""
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr ""
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr ""
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr ""
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr ""
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr ""
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr ""
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr ""
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr ""
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr ""
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr ""
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr ""
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr ""
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr ""
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr ""
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr ""
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr ""
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr ""
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr ""
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr ""
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr ""
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr ""
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr ""
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr ""
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr ""
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr ""
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr ""
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr ""
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr ""
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr ""
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr ""
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr ""
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr ""
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr ""
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr ""
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr ""
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr ""
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr ""
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr ""
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr ""
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr ""
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr ""
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr ""
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr ""
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr ""
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr ""
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr ""
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr ""
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr ""
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr ""
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr ""
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr ""
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr ""
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr ""
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr ""
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr ""
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr ""
 
@@ -542,199 +546,231 @@
 msgid "CDIOCEJECT"
 msgstr ""
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr ""
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr ""
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr ""
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr ""
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr ""
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr ""
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
 "Downloading data...\n"
 msgstr ""
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr ""
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr ""
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr ""
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr ""
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr ""
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr ""
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr ""
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr ""
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr ""
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr ""
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr ""
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr ""
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr ""
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr ""
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr ""
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr ""
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr ""
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr ""
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr ""
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr ""
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr ""
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr ""
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr ""
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr ""
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr ""
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr ""
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr ""
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr ""
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr ""
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr ""
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr ""
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr ""
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr ""
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr ""
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr ""
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr ""
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr ""
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr ""
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr ""
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr ""
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr ""
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -742,49 +778,53 @@
 "Do you wish to submit this disc information?"
 msgstr ""
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr ""
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr ""
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr ""
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr ""
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr ""
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr ""
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr ""
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr ""
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr ""
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr ""
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr ""
@@ -903,7 +943,7 @@
 msgstr ""
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr ""
 
@@ -912,7 +952,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr ""
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr ""
 
@@ -920,7 +960,11 @@
 msgid "Error: Bad entry type\n"
 msgstr ""
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr ""
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr ""
 
@@ -977,7 +1021,7 @@
 msgstr ""
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr ""
 
@@ -985,7 +1029,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr ""
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr ""
 
@@ -1067,130 +1111,130 @@
 msgid "Deleting [%s]\n"
 msgstr ""
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr ""
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr ""
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr ""
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
 msgstr ""
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr ""
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr ""
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr ""
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr ""
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr ""
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr ""
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr ""
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr ""
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr ""
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr ""
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr ""
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr ""
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr ""
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr ""
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr ""
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""

grip-3.4.3.tar.gz/po/hu.po -> grip-3.9.0.tar.gz/po/hu.po Changed

@@ -1,24 +1,27 @@
-# Translation of Grip to Hungarian.
-# This file is distributed under the same license as the PACKAGE package.
-# Ferenc Veres <lion@netngine.hu>, 2004.
+# Hungarian translation for Grip.
+# This file is distributed under the same license as the grip package.
 #
+# Ferenc Veres <lion@netngine.hu>, 2004.
+# Balázs Úr <urbalazs@gmail.com>, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip.old\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2004-06-06 23:58+0200\n"
-"Last-Translator: Ferenc Veres <lion@netngine.hu>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2018-01-20 16:19+0100\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/main.c:56
 msgid "Specify the geometry of the main window"
-msgstr "A főablak geometriája"
+msgstr "A főablak geometriájának megadása"
 
 #: src/main.c:57
 msgid "GEOMETRY"
@@ -26,7 +29,7 @@
 
 #: src/main.c:65
 msgid "Specify the config file to use (in your home dir)"
-msgstr "Beállításfájl (a sajátkönyvtárban)"
+msgstr "A használandó beállítófájl megadása (a saját könyvtárban)"
 
 #: src/main.c:66
 msgid "CONFIG"
@@ -34,7 +37,7 @@
 
 #: src/main.c:74
 msgid "Specify the cdrom device to use"
-msgstr "A használni kívánt CDROM eszköz"
+msgstr "A használandó CDROM eszköz megadása"
 
 #: src/main.c:75 src/main.c:84
 msgid "DEVICE"
@@ -42,19 +45,19 @@
 
 #: src/main.c:83
 msgid "Specify the generic scsi device to use"
-msgstr "A használni kívánt általnos SCSI eszköz"
+msgstr "A használandó általános SCSI eszköz megadása"
 
 #: src/main.c:92
 msgid "Launch in \"small\" (cd-only) mode"
-msgstr "Indítás \"apró\" (csak CD) módban"
+msgstr "Indítás „kis” (csak CD) módban"
 
 #: src/main.c:101
 msgid "\"Local\" mode -- do not look up disc info on the net"
-msgstr "\"Helyi\" mód -- nincs zenei információ-letöltés az internetről"
+msgstr "„Helyi” mód -- ne keressen lemezinformációkat a hálózaton"
 
 #: src/main.c:110
 msgid "Do not do I/O redirection"
-msgstr "Ne legyen I/O átirányítás"
+msgstr "Ne végezzen I/O átirányítás"
 
 #: src/main.c:119
 msgid "Run in verbose (debug) mode"
@@ -67,19 +70,19 @@
 #: src/grip.c:242
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
-msgstr "Hiba: A %s eszköz inicializáslása sikertelen\n"
+msgstr "Hiba: nem sikerült előkészíteni [%s]\n"
 
 #: src/grip.c:334
 msgid "Grip started successfully\n"
-msgstr ""
+msgstr "A Grip sikeresen elindítva\n"
 
 #: src/grip.c:348
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
 msgstr ""
-"Feldolgozás folyamatban.\n"
-"Biztos, hogy megállítja?"
+"A feldolgozás folyamatban van.\n"
+"Valóban leállítja?"
 
 #: src/grip.c:399
 msgid "Status"
@@ -89,14 +92,14 @@
 msgid "General"
 msgstr "Általános"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Beolvasás"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
-msgstr "Tömörítés"
+msgstr "Kódolás"
 
 #: src/grip.c:489
 msgid "Help"
@@ -108,11 +111,11 @@
 
 #: src/grip.c:500
 msgid "Playing CDs"
-msgstr "CD lejátszás"
+msgstr "CD lejátszása"
 
 #: src/grip.c:506
 msgid "Ripping CDs"
-msgstr "CD tömörítés"
+msgstr "CD beolvasása"
 
 #: src/grip.c:512
 msgid "Configuring Grip"
@@ -120,7 +123,7 @@
 
 #: src/grip.c:518
 msgid "FAQ"
-msgstr "Gyakori Kérdések"
+msgstr "GyIK"
 
 #: src/grip.c:524
 msgid "Getting More Help"
@@ -128,7 +131,7 @@
 
 #: src/grip.c:530
 msgid "Reporting Bugs"
-msgstr "Hibák bejelentése"
+msgstr "Hibák jelentése"
 
 #: src/grip.c:550
 msgid "About"
@@ -137,373 +140,368 @@
 #: src/grip.c:569
 #, c-format
 msgid "Version %s"
-msgstr ""
+msgstr "%s verzió"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Hiba: a honlap megjelenítésének kísérlete sikertelen."
+
+#: src/grip.c:918
 msgid "Created by Grip"
-msgstr ""
+msgstr "Létrehozta: Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
-"A beállításfájl elavult -- alapbeállítások használata.\n"
-"A Grip-et újbóli beállítása szükséges.\n"
-"Az elavult beállításfájl \"-old\" hozzáadásával elmentve."
+"A beállításfájlja elavult -- visszaállítás az alapértékekre.\n"
+"A Grip újbóli beállítása szükséges.\n"
+"A régi beállítófájlja „-old” hozzáadásával elmentve."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
-msgstr "a kiszolgáló: %s, kapu: %d\n"
+msgstr "a kiszolgáló: %s, port: %d\n"
 
-#: src/grip.c:1035
-#, fuzzy
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
-msgstr "Hiba: A beállításfájl mentése sikertelen"
+msgstr "Hiba: nem sikerült elmenteni a beállítófájlt."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Beállítások"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CDROM eszköz"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
-msgstr "Lejátszás folytatása kilépéskor és indításkor"
+msgstr "Ne szakítsa meg a lejátszást kilépéskor vagy indításkor"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Visszatekerés megállításkor"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
-msgstr "Inditás az első sávval ha nincs lejátszás"
+msgstr "Indítás az első sávval, ha nincs lejátszás"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
-msgstr "Automatikus lejátszás CD behelyezésekor"
+msgstr "Automatikus lejátszás a lemez behelyezésekor"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
-msgstr "Újrakeverés minden visszajátszás előtt"
+msgstr "Újrakeverés minden lejátszás előtt"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
-msgstr "Hibás kidobás kikerülése"
+msgstr "Hibás kiadás megkerülése"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
-msgstr "Meghajtó lekérdezése új lemezekért"
+msgstr "Lemezmeghajtó lekérdezése új lemezekért"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
-msgstr "Lekérzdezési időköz (másodperc)"
+msgstr "Lekérdezési időköz (másodperc)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Beolvasó:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Beolvasó futtatható program"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Beolvasás parancssora"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
-msgstr "Paranoia mód kikapcsolása"
+msgstr "Paranoia letiltása"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
-msgstr "Extra paranoia mód kikapcsolása"
+msgstr "További paranoia letiltása"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
-msgstr "Karcolás mód kikapcsolása"
+msgstr "Karcolás letiltása"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
-msgstr "detektálás"
+msgstr "felismerés"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "javítás"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Jelszint igazítás kiszámítása"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Beolvasás fájlformátuma"
 
-#: src/gripcfg.c:276
-#, fuzzy
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
-msgstr "Beolvasás fájlformátuma"
+msgstr "Beolvasás fájlformátuma (több előadó)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Általános SCSI eszköz"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Beolvasó"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
-msgstr "Beolvasás \"nice\" értéke"
+msgstr "Beolvasás „nice” értéke"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
-msgstr "Tömörítetlen .WAV fájlok max. száma"
+msgstr "Kódolatlan .WAV fájlok legnagyobb száma"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Automatikus beolvasás lemez behelyezésekor"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Csipogás a beolvasás befejezésekor"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
-msgstr "Lemez automatkis kidobása"
+msgstr "Automatikus kiadás beolvasás után"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
-msgstr "Automatikus kidobás késleltetése"
+msgstr "Automatikus kiadás késleltetése"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
-msgstr "Beolvasás késleltetése"
+msgstr "Késleltetés beolvasás előtt"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
-msgstr "Tömörítés a beolvasás befejezése után"
+msgstr "Kódolás késleltetése, amíg a lemez beolvasás alatt van"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
-msgstr "CDROM megállítása a sávok között"
+msgstr "CDROM meghajtó megállítása a sávok között"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "WAV szűrő parancs"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Lemez szűrő parancs"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Beállítások"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
-msgstr "Tömörítő:"
+msgstr "Kódoló:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
-msgstr "Tömörítő futtatható program"
+msgstr "Kódoló futtatható program"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
-msgstr "Tömörítés parancssora"
+msgstr "Kódoló parancssora"
 
-#: src/gripcfg.c:428
-#, fuzzy
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
-msgstr "Freedb kiterjesztések használata"
+msgstr "Kódoló fájlkiterjesztése"
 
-#: src/gripcfg.c:433
-#, fuzzy
+#: src/gripcfg.c:432
 msgid "Encoder file format"
-msgstr "Tömörítés fájlformátuma"
+msgstr "Kódoló fájlformátuma"
 
-#: src/gripcfg.c:439
-#, fuzzy
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
-msgstr "Tömörítés fájlformátuma"
+msgstr "Kódoló fájlformátuma (több előadó)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
-msgstr "Tömörítő"
+msgstr "Kódoló"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
-msgstr "WAV fájlok törlése tömörítés után"
+msgstr "WAV fájlok törlése kódolás után"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
-msgstr "Tárolás SQL adatbázisban"
+msgstr "Információk beszúrása SQL adatbázisba"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "M3U fájlok létrehozása"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
-msgstr "Relatív útvonalak az M3U fájlokban"
+msgstr "Relatív útvonalak használata az M3U fájlokban"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U fájlformátum"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
-msgstr "Tömörítés mértéke (kbit/sec)"
+msgstr "Kódolás bitsebessége (kbit/sec)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
-msgstr "Felhasznált processzorok"
+msgstr "Használandó processzorok száma"
 
-#: src/gripcfg.c:488
-#, fuzzy
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
-msgstr "Tömörítés \"nice\" értéke"
+msgstr "Kódoló „nice” értéke"
 
-#: src/gripcfg.c:492
-#, fuzzy
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
-msgstr "Tömörítés szűrő parancs"
+msgstr "Kódoló szűrő parancs"
 
-#: src/gripcfg.c:497
-#, fuzzy
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
-msgstr "WAV fájlok törlése tömörítés után"
+msgstr "Parancs végrehajtása kódolás után"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
-msgstr "ID3 információk hozzáadása"
+msgstr "ID3 címkék hozzáadása a kódolt fájlokhoz"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
-msgstr "ID3v2 információk hozzáadása"
+msgstr "ID3v2 információk hozzáadása a kódolt fájlokhoz"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
-msgstr "Csak .MP3 fájlokhoz"
+msgstr "Csak MP3 fájlokat címkézzen"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
-msgstr "ID megjegyzés mező"
+msgstr "ID3 megjegyzés mező"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
-msgstr "ID3v1 karakterkódolás"
+msgstr "ID3v1 karakterkészlet kódolása"
 
-#: src/gripcfg.c:548
-#, fuzzy
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
-msgstr "ID3v1 karakterkódolás"
+msgstr "ID3v2 karakterkészlet kódolása"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Adatbázis-kiszolgáló"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI útvonal"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Elsődleges kiszolgáló"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Másodlagos kiszolgáló"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Adatbázis hozzáadási e-mail"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
-msgstr "Adatbázis karakterkódolás"
+msgstr "Adatbázis karakterkészlet kódolása"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Freedb kiterjesztések használata"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
-msgstr "Automatikus lemezkeresés"
+msgstr "Automatikus lemezkeresések végrehajtása"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Proxy kiszolgáló használata"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
-msgstr "Beállítás a 'http_proxy' környezeti változóból"
+msgstr "Kiszolgáló lekérése a „http_proxy” környezeti változóból"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Proxy kiszolgáló"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
-msgstr "Proxy kapu"
+msgstr "Proxy port"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Proxy felhasználónév"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Proxy jelszó"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "E-mail cím"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "CD frissítő program"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Ne alakítsa kisbetűssé a fájlneveket"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
-msgstr "ASCII 128 feletti karakterek engedélyezése"
+msgstr "Magas bitek engedélyezése a fájlnevekben"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
-msgstr ""
+msgstr "Összeférhetetlen karakterek helyettesítése hexadecimális számokkal"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
-msgstr "Ne alakítsa a szóközöket aláhúzás karakterré"
+msgstr "Ne cserélje ki a szóközöket aláhúzás karakterre"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
-msgstr ""
+msgstr "M3U fájlok kiírása nem Posix megfelelő „\\”s használatával"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -511,33 +509,32 @@
 "Fájlnevekből nem kivágandó\n"
 "karakterek"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
-msgstr ""
+msgstr "Tálcaikon megjelenítése"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/gripcfg.c:840
-#, fuzzy
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
-msgstr "Hiba: A beállításfájl mentése sikertelen"
+msgstr "Hiba: nem sikerült elmenteni a beolvasó beállításait."
 
-#: src/gripcfg.c:911
-#, fuzzy
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
-msgstr "Hiba: A beállításfájl mentése sikertelen"
+msgstr "Hiba: nem sikerült elmenteni a kódoló beállításait."
 
 #: src/cddev.c:174 src/cddev.c:604
 #, c-format
 msgid "Drive status is %d\n"
-msgstr "Meghajtó állapotbájt: %d\n"
+msgstr "A meghajtó állapota: %d\n"
 
 #: src/cddev.c:176
 msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n"
 msgstr ""
-"A meghajtó nem támogatja az állapotlekérdezést (CDS_NO_INFO feltételezése)\n"
+"A meghajtó nem támogatja a meghajtóállapot-ellenőrzést (CDS_NO_INFO "
+"feltételezése)\n"
 
 #: src/cddev.c:179
 msgid "No disc\n"
@@ -545,284 +542,309 @@
 
 #: src/cddev.c:284 src/cddev.c:293 src/cddev.c:310 src/cddev.c:337
 msgid "Error: Failed to read disc contents\n"
-msgstr "Hiba: a lemez tartalmának beolvasásáa közben\n"
+msgstr "Hiba: a lemez tartalmának beolvasása sikertelen\n"
 
 #: src/cddev.c:607
 msgid "Drive doesn't support drive status check\n"
-msgstr "A meghajtó nem támogatja az állapotlekérdezést\n"
+msgstr "A meghajtó nem támogatja az meghajtóállapot-ellenőrzést\n"
 
 #: src/cddev.c:627 src/cddev.c:632
 #, c-format
 msgid "Unlock failed: %d"
-msgstr "Kinyitás sikertelen: %d"
+msgstr "Feloldás sikertelen: %d"
 
 #: src/cddev.c:636
 msgid "CDIOCEJECT"
-msgstr "CDIOEJECT"
+msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
-#, fuzzy
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
-msgstr "Beolvasás közben nem lehet lekérdezést végezni"
+msgstr "Nem lehet keresést végezni beolvasás közben."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Ismeretlen lemez"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
-msgstr "Sáv %02d"
+msgstr "%02d. sáv"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "%s lekérdezés (%s szerveren keresztül) a %02x lemezhez.\n"
+msgstr "%s lekérdezése (ezen keresztül:%s) a(z) %02x lemezhez.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
-msgstr "%s lekérdezés a %02x lemezhez.\n"
+msgstr "%s lekérdezése a(z) %02x lemezhez.\n"
+
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Nincs találat\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
 "Downloading data...\n"
 msgstr ""
-"Egyezés: \"%s / %s\"\n"
-"Adatok letöltése...\n"
+"Találat: „%s / %s”\n"
+"Adatok letöltése…\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Kész\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
-msgstr "Hiba a lemezadatok mentése közben\n"
+msgstr "Hiba a lemezadatok mentésekor\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Nincs egyezés\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
-#, fuzzy
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
-msgstr "Hossz "
+msgstr "Hossz"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Sávok"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Előző CDDB bejegyzés kiválasztása."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "következő CDDB bejegyzés kiválasztása."
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Sáv"
 
-#: src/cdplay.c:630 src/discedit.c:390
-#, fuzzy
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "Nincsenek lemezadatok. Visszatérés.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Már az utolsó indexnél van. Visszatérés.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Kész.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoPrevDiscDBEntry.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Már az első indexnél van. Visszatérés.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
-msgstr "Hiba a lemezadatok mentése közben"
+msgstr "Hiba a lemezadatok mentésekor."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
-msgstr "Lejátszási mód váltása"
+msgstr "Lejátszási mód forgatása"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Ismétlés ki/be"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Beolvasás állapota"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
-msgstr "Sáv lejátszása / Szünet"
+msgstr "Sáv lejátszása / lejátszás szüneteltetése"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Visszatekerés"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
-msgstr "Gyors Előre"
+msgstr "Gyors előre tekerés"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
-msgstr "Előző sáv"
+msgstr "Ugrás az előző sávra"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
-msgstr "Következő sáv"
+msgstr "Ugrás a következő sávra"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
-msgstr "Lejátszási mód váltási lehetőségek"
+msgstr "Lejátszási mód lehetőségek váltása"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
-msgstr "Követlező lemez"
+msgstr "Következő lemez"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
-msgstr "Megállítás"
+msgstr "Lejátszás megállítása"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
-msgstr "Lemez kidobása"
+msgstr "Lemez kiadása"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Lemeztartalom vizsgálata"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Hangerőszabályzó ki/be"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Lemezszerkesztő ki/be"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
-msgstr "DiskDB lekérdezés indítás/megszakítás"
+msgstr "DiscDB lekérdezés előkészítése/megszakítása"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
-msgstr "Sávlista ki/be"
+msgstr "Sávmegjelenítés ki/be"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
-msgstr "Kilépés"
+msgstr "Kilépés a Grip programból"
 
-#: src/cdplay.c:1170
-#, fuzzy
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
-msgstr "Beolvasás közben nem lehet léptetni"
+msgstr "Nem lehet gyorsan előre tekerni beolvasás közben."
 
-#: src/cdplay.c:1201
-#, fuzzy
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
-msgstr "Beolvasás közben nem lehet léptetni"
+msgstr "Nem lehet visszatekerni beolvasás közben."
 
-#: src/cdplay.c:1232
-#, fuzzy
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
-msgstr "Beolvasás közben nem lehet lemezt váltani"
+msgstr "Nem lehet lemezt váltani beolvasás közben."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
-msgstr "Lemezkidobás\n"
+msgstr "Lemez kiadása\n"
 
-#: src/cdplay.c:1254
-#, fuzzy
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
-msgstr "Beolvasás közben nem lehet lemezt kidobni"
+msgstr "Nem lehet kiadni beolvasás közben."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
-msgstr "Van lemez -- kidobás\n"
+msgstr "Van lemez -- kiadás\n"
 
-#: src/cdplay.c:1331
-#, fuzzy
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
-msgstr "Beolvasás közben nem lehet lejátszani"
+msgstr "Nem lehet lejátszani beolvasás közben."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
-#, fuzzy
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
-msgstr "Beolvasás közben nem lehet sávot váltani"
+msgstr "Nem lehet sávot váltani beolvasás közben."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Új lemez keresése\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
-msgstr "CDStat új lemezt talált, sávok vizsgálata\n"
+msgstr "A CDStat új lemezt talált, sávok ellenőrzése\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
-msgstr "Van lemez a meghajtóban!\n"
+msgstr "Érvényes lemez található!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
-msgstr "Nem nemnulla hosszúságú sávok MIVAN\n"
+msgstr "Nincsenek nem nulla hosszúságú sávok\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
-msgstr "CDStat nem érzékel lemezt\n"
+msgstr "A CDStat szerint nincs lemez\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
-msgstr "Aktuális szektor: %6d"
+msgstr "Jelenlegi szektor: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Nincs lemez"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
 "\n"
 "Do you wish to submit this disc information?"
 msgstr ""
-"A lemezinformációk megtalálhatók a másodlagos szerveren,\n"
-"de nincsenek meg az elsődlegesen.\n"
+"Ez a lemez megtalálható a másodlagos kiszolgálón,\n"
+"de nincs meg az elsődlegesen.\n"
 "\n"
-"Kívánja beküldeni a lemezinformációkat?"
+"Szeretné beküldeni a lemezinformációkat?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
-#, fuzzy
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
-msgstr "Hiba: Átmeneti fájl létrehozása sikertelen"
+msgstr "Hiba: nem sikerült létrehozni átmeneti fájlt."
 
-#: src/cdplay.c:1944
-#, fuzzy
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
-msgstr "Hiba: Lemezadatok írása sikertelen"
+msgstr "Hiba: nem sikerült kiírni a lemezadatokat."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
-msgstr "Bejegyzés elküldés: %s\n"
+msgstr "Bejegyzés elküldés ide: %s\n"
+
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Hiba: nem sikerült végrehajtani a levélküldési parancsot."
 
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Rendszerüzenet"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI: %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Lekérdezés: [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "%d lekérdezési hiba: %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Könyvtár létrehozása: %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Hiba: %s létezik, de fájl\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
-msgstr "Hiba: %s megnyitása írásra sikertelen\n"
+msgstr "Hiba: nem sikerült a(z) %s megnyitása írásra\n"
 
 #: src/discedit.c:67
 msgid "Disc title"
@@ -830,7 +852,7 @@
 
 #: src/discedit.c:74 src/discedit.c:176
 msgid "Track name"
-msgstr "Sáv címe"
+msgstr "Sáv neve"
 
 #: src/discedit.c:84
 msgid "W"
@@ -838,15 +860,15 @@
 
 #: src/discedit.c:110
 msgid "Disc artist"
-msgstr "Előadó"
+msgstr "Lemez előadója"
 
 #: src/discedit.c:127
 msgid "ID3 genre:"
-msgstr "ID3 stílus:"
+msgstr "ID3 műfaj:"
 
 #: src/discedit.c:158
 msgid "Disc year"
-msgstr "Kiadási év"
+msgstr "Lemez éve"
 
 #: src/discedit.c:196
 msgid "Track artist"
@@ -858,11 +880,11 @@
 
 #: src/discedit.c:217
 msgid "Title/Artist"
-msgstr "Cím/Szerző"
+msgstr "Cím/előadó"
 
 #: src/discedit.c:224
 msgid "Artist/Title"
-msgstr "Szerző/Cím"
+msgstr "Előadó/cím"
 
 #: src/discedit.c:232
 msgid "Split chars"
@@ -870,37 +892,31 @@
 
 #: src/discedit.c:254
 msgid "Multi-artist"
-msgstr "Többszerzős"
+msgstr "Több előadó"
 
 #: src/discedit.c:265
 msgid "Save disc info"
-msgstr "Mentés"
+msgstr "Lemezinformációk mentése"
 
 #: src/discedit.c:274
 msgid "Submit disc info"
-msgstr "Beküldés"
+msgstr "Lemezinformációk beküldése"
 
 #: src/discedit.c:393
-#, fuzzy
 msgid "No disc present."
-msgstr "Nincs lemez"
+msgstr "Nincs elérhető lemez."
 
 #: src/discedit.c:543
-#, fuzzy
 msgid "Cannot submit. No disc is present."
-msgstr ""
-"Sikertelen beküldés\n"
-"Nincs lemez a meghajtóban"
+msgstr "Nem sikerült beküldeni. Nincs elérhető lemez."
 
 #: src/discedit.c:558
-#, fuzzy
 msgid "You must enter a disc title."
-msgstr "A lemez cím megadása kötelező"
+msgstr "Meg kell adnia egy lemezcímet."
 
 #: src/discedit.c:565
-#, fuzzy
 msgid "You must enter a disc artist."
-msgstr "Az előadó megadása kötelező"
+msgstr "Meg kell adnia a lemez előadóját."
 
 #: src/discedit.c:575
 msgid ""
@@ -912,13 +928,13 @@
 "\n"
 "Continue?"
 msgstr ""
-"Az lemezinformációk beküldésére készül\n"
-"egy üzleti CDDB szerverre, amely ezután az\n"
-"adatok felett rendelkezhet. Az üzemeltető a beküldött\n"
-"adatokból anyagi hasznot nyer. Javasoljuk, hogy inkább egy szabad szerverre "
-"küldje be az adatokat.\n"
+"Az lemezinformációk beküldésére készül egy üzleti\n"
+"CDDB kiszolgálóra, amely ezután a beküldött adatok\n"
+"felett rendelkezhet. Az üzemeltetők a beküldött\n"
+"adatokból anyagi hasznot húznak. Azt javasoljuk,\n"
+"hogy inkább szabad kiszolgálókat támogasson.\n"
 "\n"
-"Folytatás?"
+"Folytatja?"
 
 #: src/discedit.c:584
 msgid ""
@@ -927,26 +943,26 @@
 "\n"
 "Continue?"
 msgstr ""
-"A lemezinformációkat e-mailben\n"
-"fogja továbbítani.\n"
+"A lemezinformációk e-mailben történő\n"
+"beküldésére készül.\n"
 "\n"
-"Folytatás?"
+"Folytatja?"
 
 #: src/discedit.c:601
 msgid "Genre selection"
-msgstr "Stílus választás"
+msgstr "Műfaj kiválasztása"
 
 #: src/discedit.c:605
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
 msgstr ""
-"A beküldéshez egy az 'ismeretlen'-től eltérő stílus\n"
-"kiválasztása szükséges, az alábbi listából"
+"A beküldéshez az „ismeretlentől” eltérő műfaj kiválasztása\n"
+"szükséges. Válasszon egy DiscDB műfajt az alábbiak közül"
 
 #: src/discedit.c:615
 msgid "DiscDB genre"
-msgstr "DiscDB stílus"
+msgstr "DiscDB műfaj"
 
 #: src/discedit.c:635
 msgid "Submit"
@@ -954,37 +970,42 @@
 
 #: src/discedit.c:646
 msgid "Cancel"
-msgstr "Mégsem"
+msgstr "Mégse"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "ismeretlen ID3 mező\n"
 
 #: src/launch.c:121
 #, c-format
 msgid "Error: unable to translate filename. No such user as %s\n"
-msgstr "Hiba: fájlnév átalakítása sikertelen. Ismeretlen felhasználó: %s\n"
+msgstr ""
+"Hiba: nem sikerült lefordítani a fájlnevet. Nincs ilyen felhasználó: %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
-msgstr "Futtatás sikertelen\n"
+msgstr "A futtatás sikertelen\n"
 
 #: src/parsecfg.c:58
 msgid "Error: Bad entry type\n"
-msgstr "Hiba: Hibás bejegyzés típus\n"
+msgstr "Hiba: rossz bejegyzéstípus\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Hiba: beállítófájl olvasása\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
-msgstr "Hiba: Hibás beállításfájl\n"
+msgstr "Hiba: érvénytelen beállítófájl\n"
 
 #: src/rip.c:104
 msgid "Rip+Encode"
-msgstr "Beolvasás+Tömörítés"
+msgstr "Beolvasás + kódolás"
 
 #: src/rip.c:106
 msgid "Rip and encode selected tracks"
-msgstr "A kiválasztott sávok beolvasása és tömörítése"
+msgstr "A kiválasztott sávok beolvasása és kódolása"
 
 #: src/rip.c:112
 msgid "Rip Only"
@@ -992,35 +1013,35 @@
 
 #: src/rip.c:114
 msgid "Rip but do not encode selected tracks"
-msgstr "A kiválasztott sávok beolvasása, nincs tömörítés"
+msgstr "A kiválasztott sávok beolvasása, nincs kódolás"
 
 #: src/rip.c:120
 msgid "Abort Rip and Encode"
-msgstr "Megszakítás"
+msgstr "Beolvasás és kódolás megszakítása"
 
 #: src/rip.c:122
 msgid "Kill all active rip and encode processes"
-msgstr "Minden aktuális olvasási és tömörítési folyamat megszakítása"
+msgstr "Az összes aktív beolvasási és kódolási folyamat kilövése"
 
 #: src/rip.c:130
 msgid "Abort Ripping Only"
-msgstr "Beolvasás megszakítása"
+msgstr "Csak beolvasás megszakítása"
 
 #: src/rip.c:132
 msgid "Kill rip process"
-msgstr "A beolvasó folyamat megszakítása"
+msgstr "A beolvasási folyamat kilövése"
 
 #: src/rip.c:138
 msgid "DDJ Scan"
-msgstr "DDJ Lekérdezés"
+msgstr "DDJ vizsgálat"
 
 #: src/rip.c:140
 msgid "Insert disc information into the DigitalDJ database"
-msgstr "Lemezinformációk hozzáadása a DigitalDJ adatbázishoz"
+msgstr "Lemezinformációk beszúrása a DigitalDJ adatbázisba"
 
 #: src/rip.c:155
 msgid "Rip partial track"
-msgstr "Sávtöredék beolvasása"
+msgstr "Részleges sáv beolvasás"
 
 #: src/rip.c:166 src/tray.c:186
 msgid "Play"
@@ -1028,20 +1049,20 @@
 
 #: src/rip.c:173
 msgid "Current sector:      0"
-msgstr "Aktuális szektor:      0"
+msgstr "Jelenlegi szektor:   0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
-msgstr "Olvasás: Vár"
+msgstr "Beolvasás: üresjárat"
 
 #: src/rip.c:209
 msgid "Enc: Trk 99 (99.9x)"
-msgstr "Tömörítés: Sáv 99 (99.9x)"
+msgstr "Kódolás: Sáv 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
-msgstr "Tömörítés: Vár"
+msgstr "Kódolás: üresjárat"
 
 #: src/rip.c:264
 msgid "Overall indicators:"
@@ -1056,42 +1077,41 @@
 msgstr "Végső szektor"
 
 #: src/rip.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "Inserting track %d into the ddj database\n"
-msgstr "Tárolás SQL adatbázisban"
+msgstr "%d. sáv beszúrása the DDJ adatbázisba\n"
 
 #: src/rip.c:609
-#, fuzzy
 msgid "Error: can't open m3u file."
-msgstr "Hiba: m3u fájl megnyitása sikertelen\n"
+msgstr "Hiba: nem sikerült megnyitni az M3U fájlt."
 
 #: src/rip.c:703
 msgid "In KillRip\n"
-msgstr "A KillRip-ben\n"
+msgstr "A beolvasás kilövésében\n"
 
 #: src/rip.c:729
 #, c-format
 msgid "Now total enc size is: %d\n"
-msgstr "Új teljes tömörítési méret: %d\n"
+msgstr "A mostani teljes kódolási méret: %d\n"
 
 #: src/rip.c:884
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
-msgstr "Olvasás: Sáv %d (%3.1fx)"
+msgstr "Beolvasás: Sáv %d (%3.1fx)"
 
 #: src/rip.c:917
 #, c-format
 msgid "Rip: %6.2f%%"
-msgstr "Olvasás: %6.2f%%"
+msgstr "Beolvasás: %6.2f%%"
 
 #: src/rip.c:937
 msgid "Rip finished\n"
-msgstr "Olvasás befejeződött\n"
+msgstr "Beolvasás befejezve\n"
 
 #: src/rip.c:963
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
-msgstr "Részlet olvasása %d wavok száma %d\n"
+msgstr "%d. részlet beolvasása  WAV fájlok száma: %d\n"
 
 #: src/rip.c:966
 #, c-format
@@ -1100,171 +1120,173 @@
 
 #: src/rip.c:972
 msgid "Check if we need to rip another track\n"
-msgstr "Következő sáv olvasás szükéségességének ellenőrzése\n"
+msgstr "Annak ellenőrzése, hogy szükséges-e egy másik sáv beolvasása\n"
 
 #: src/rip.c:1014
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
-msgstr "Tömörít: Sáv %d (%3.1fx)"
+msgstr "Kódolás: Sáv %d (%3.1fx)"
 
 #: src/rip.c:1032
 #, c-format
 msgid "Enc: %6.2f%%"
-msgstr "Tömörít: %6.2f%%"
+msgstr "Kódolás: %6.2f%%"
 
 #: src/rip.c:1042
 #, c-format
 msgid "Finished encoding on cpu %d\n"
-msgstr "A %d. CPU-n a tömörítés befejezve\n"
+msgstr "A(z) %d. processzoron a kódolás befejezve\n"
 
 #: src/rip.c:1060
 #, c-format
 msgid "Deleting [%s]\n"
 msgstr "Törlés: [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Beolvasás befejezve\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
-msgstr "NincsSzerző"
+msgstr "NincsElőadó"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "NincsCím"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
+"Nem észlelhető lemez a meghajtóban. Ha van lemez a meghajtóban, akkor "
+"ellenőrizze a CDROM eszköz beállítását a Beállítások->CD menüben."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
+"Érvénytelen beolvasó futtatható program.\n"
+"Ellenőrizze a beolvasó beállításait, és győződjön meg arról, hogy teljes "
+"útvonalat ad-e meg a beolvasó futtatható programhoz."
 
-#: src/rip.c:1374
-#, fuzzy
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
-"Érvénytelen tömörítő program\n"
-"Ellenőrizze a beállításokat"
+"Érvénytelen kódoló futtatható program.\n"
+"Ellenőrizze a kódoló beállításait, és győződjön meg arról, hogy teljes "
+"útvonalat ad-e meg a kódoló futtatható programhoz."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
 msgstr ""
-"Nincsnek sávok kiválasztva.\n"
-"Teljes CD beolvasása?\n"
+"Nincsenek sávok kiválasztva.\n"
+"Beolvassa a teljes CD-t?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Teljes CD beolvasása\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
-msgstr "RipNextTrack-ban\n"
+msgstr "A következő sáv beolvasásában\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
-msgstr "Első bejelölt sáv: %d\n"
+msgstr "Az első bejelölt sáv: %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Beolvasás!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
-msgstr "Nincs írásjog a wav fájl mentéséhez"
+msgstr "Nincs írási jogosultság a WAV fájl kiírásához"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
-msgstr "Sáv olvasás: %d: %s\n"
+msgstr "%d. sáv beolvasása ide: %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
-msgstr "Olvasás: Sáv %d (0.0x)"
+msgstr "Beolvasás: Sáv %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
-msgstr "A %s fájl már előzőleg beolvasva. Kihagyás...\n"
+msgstr "A(z) %s fájl már be lett olvasva. Kihagyás…\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
-msgstr "Elfogyott a lemezterület a célkönyvtárban"
+msgstr "Elfogyott a hely a kimeneti könyvtárban"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
-msgstr "CDPRip hívása\n"
+msgstr "CDPRip meghívása\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
-msgstr "A %d sáv hozzáadva a %s listához\n"
+msgstr "A(z) %d. sáv hozzáadva a(z) %s listához\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
-msgstr "Nincs szabad CPU\n"
+msgstr "Nincsenek szabad processzorok\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
-msgstr "Tömörített sáv: %d\n"
+msgstr "Kódolt sáv: %d\n"
 
-#: src/rip.c:1817
-#, fuzzy
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
-msgstr "Nincs írásjog a tömörített fájl mentéséhez"
+msgstr "Nincs írási jogosultság a kódolt fájl kiírásához."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
-msgstr "%i: Tömörítés: %s\n"
+msgstr "%i: Kódolás ide: %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
-msgstr "Tömörít: Sáv %d (0.0x)"
+msgstr "Kódolás: Sáv %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
-msgstr "CalculateAll-ban\n"
+msgstr "Az összes kiszámításában\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
-msgstr "Jelenleg nincs olvasás, tömörítési értékek nullázása\n"
+msgstr "Most épp beolvasunk, ezért nullázzuk a kódolási értéket\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
-msgstr "Teljes olvasási méret: %d\n"
+msgstr "Teljes beolvasási méret: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
-msgstr "Teljes tömörített méret: %d\n"
+msgstr "Teljes kódolási méret: %d\n"
 
 #: src/tray.c:57
-#, fuzzy
 msgid "Artist"
-msgstr "NincsSzerző"
+msgstr "Előadó"
 
 #: src/tray.c:58
-#, fuzzy
 msgid "Title"
-msgstr "NincsCím"
+msgstr "Cím"
 
 #: src/tray.c:83
 #, c-format
@@ -1272,16 +1294,18 @@
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
+"%s - %s\n"
+"%02d:%02d - %02d:%02d"
 
 #: src/tray.c:87
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr ""
+msgstr "Beolvasás: Sáv %02d:\t%6.2f%% (%6.2f%% )"
 
 #: src/tray.c:88
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr ""
+msgstr "Kódolás:   Sáv %02d:\t%6.2f%% (%6.2f%% )"
 
 #: src/tray.c:89
 #, c-format
@@ -1289,6 +1313,8 @@
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
+"%s - %s\n"
+"%s%s%s"
 
 #: src/tray.c:92
 #, c-format
@@ -1296,49 +1322,29 @@
 "%s - %s\n"
 "Idle"
 msgstr ""
+"%s - %s\n"
+"Üresjárat"
 
 #: src/tray.c:191
 msgid "Pause"
-msgstr ""
+msgstr "Szünet"
 
 #: src/tray.c:196
-#, fuzzy
 msgid "Stop"
-msgstr "Megállítás"
+msgstr "Leállítás"
 
 #: src/tray.c:204
 msgid "Previous"
-msgstr ""
+msgstr "Előző"
 
 #: src/tray.c:209
-#, fuzzy
 msgid "Next"
-msgstr "Követlező lemez"
+msgstr "Következő"
 
 #: src/tray.c:217
-#, fuzzy
 msgid "Rip and Encode"
-msgstr "Megszakítás"
+msgstr "Beolvasás és kódolás"
 
 #: src/tray.c:224
 msgid "Quit"
-msgstr ""
-
-#~ msgid "Write tags in unicode"
-#~ msgstr "Unicode formátumban"
-
-#~ msgid "File System Character set encoding"
-#~ msgstr "Fájlrendszer karakterkódolás"
-
-#~ msgid "Keep application minimum size"
-#~ msgstr "Minimális memóriahasználat"
-
-#~ msgid "Reply is [%s]\n"
-#~ msgstr "Válasz: [%s]\n"
-
-#~ msgid ""
-#~ "Invalid rip executable\n"
-#~ "Check your rip config"
-#~ msgstr ""
-#~ "Érvénytelen beolvasó program\n"
-#~ "Ellenőrizze a beállításokat"
+msgstr "Kilépés"

grip-3.4.3.tar.gz/po/it.po -> grip-3.9.0.tar.gz/po/it.po Changed

@@ -1,20 +1,23 @@
 # Translation of Grip to Italian.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the grip package.
+# Copyright © 2017, Free Software Foundation, Inc.
 # Kostantino <inverness1ATvirgilio.it>, 2005.
+# Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n", 2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip.old\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2005-03-02 10:02+0100\n"
-"Last-Translator: Kostantino <inverness1ATvirgilio.it>\n"
-"Language-Team: Italiano <tp@lists.linux.it>\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-10-29 18:56+0100\n"
+"Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: src/main.c:56
 msgid "Specify the geometry of the main window"
@@ -59,7 +62,7 @@
 
 #: src/main.c:119
 msgid "Run in verbose (debug) mode"
-msgstr "Avvia in modo prolisso (correzione)"
+msgstr "Avvia in modalità prolissa (debug)"
 
 #: src/grip.c:185
 msgid "Grip"
@@ -90,12 +93,12 @@
 msgid "General"
 msgstr "Generale"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Estrazione"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Codifica"
 
@@ -105,7 +108,7 @@
 
 #: src/grip.c:494
 msgid "Table Of Contents"
-msgstr "Indice generale"
+msgstr "Table Of Contents"
 
 #: src/grip.c:500
 msgid "Playing CDs"
@@ -117,7 +120,7 @@
 
 #: src/grip.c:512
 msgid "Configuring Grip"
-msgstr "Configura Grip"
+msgstr "Configurazione di Grip"
 
 #: src/grip.c:518
 msgid "FAQ"
@@ -129,381 +132,378 @@
 
 #: src/grip.c:530
 msgid "Reporting Bugs"
-msgstr "Riporta gli errori"
+msgstr "Segnala gli errori"
 
 #: src/grip.c:550
 msgid "About"
-msgstr "Riguardo"
+msgstr "Chi siamo"
 
 #: src/grip.c:569
 #, c-format
 msgid "Version %s"
 msgstr "Versione %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Errore: impossibile raggiungere la homepage."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Creato con Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
-"Il tuo file di configurazione è scaduto: sono stati ristabiliti i valori "
+"Il tuo file di configurazione è scaduto: sono stati ripristinati i valori "
 "predefiniti.\n"
 "Avrai bisogno di configurare Grip di nuovo.\n"
 "Il tuo vecchio file di configurazione è stato salvato con l'estensione 'old'."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
-msgstr "Il server è %s, la porta è %d\n"
+msgstr "il server è %s, la porta è %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Errore: non è possibile salvare il file di configurazione."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Configurazione"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Dispositivo CDRom"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Non interrompere la riproduzione in uscita o all'avvio"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Riavvolgi se fermato"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Parti con la prima traccia se non in riproduzione"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Riproduci automaticamente a disco inserito"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Rimescola prima di ogni riproduzione"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Intervieni sull'espulsione fallita"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Controlla il dispositivo per un nuovo disco"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Intervallo di controllo (secondi)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Estrattore:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Eseguibile dell'estrattore"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Linea di comando per estrarre"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Disabilita Paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Disabilita le opzioni extra di Paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Disabilita scratch"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "rilevamento"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "riparazione"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Calcola l'aggiustamento di guadagno"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Estrai il formato del file"
 
-#: src/gripcfg.c:276
-#, fuzzy
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
-msgstr "Estrai il formato del file"
+msgstr "Estrai formato del file (più artisti)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Dispositivo SCSI generico"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Estrattore"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Valore 'simpatico' dell'estrattore"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Numero massimo di file .wav non codificati"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Estrai automaticamente all'inserimento"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
-msgstr "Beep dopo aver estratto"
+msgstr "Emettere un bip a fine estrazione"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
-msgstr "Auto espulsione dopo aver estratto"
+msgstr "Espellere disco a fine estrazione"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
-msgstr "Ritarda l'auto espulsione"
+msgstr "Ritardo prima dell'espulsione"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
-msgstr "Ritarda prima di estrarre"
+msgstr "Ritardo prima dell'estrazione"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Ritarda la codifica finché il disco non è stato estratto"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Ferma il dispositivo cdrom tra le tracce"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Comando del filtro wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Comando del filtro disco"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Codificatore:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Eseguibile del codificatore"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Linea di comando del codificatore"
 
-#: src/gripcfg.c:428
-#, fuzzy
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
-msgstr "Codifica l'estensione del file"
+msgstr "Estensione file encoder"
 
-#: src/gripcfg.c:433
-#, fuzzy
+#: src/gripcfg.c:432
 msgid "Encoder file format"
-msgstr "Codifica il formato del file"
+msgstr "Formato file dell'encoder"
 
-#: src/gripcfg.c:439
-#, fuzzy
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
-msgstr "Codifica il formato del file"
+msgstr "Codifica formato del file (più artisti)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Codificatore"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Cancella i file .wav dopo la codifica"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Inserisci le informazione nell'archivio SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Crea i file .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Usa i percorsi relativi nei files .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Formato dei file M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Velocità di codifica (kbits/sec)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Numero di CPU da usare"
 
-#: src/gripcfg.c:488
-#, fuzzy
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
-msgstr "Valore 'simpatico' del codificatore"
+msgstr ""
 
-#: src/gripcfg.c:492
-#, fuzzy
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
-msgstr "Comando per il filtro del codificatore"
+msgstr ""
 
-#: src/gripcfg.c:497
-#, fuzzy
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
-msgstr "Cancella i file .wav dopo la codifica"
+msgstr "Eseguire comando dopo la codifica"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Aggiungi gli identificativi ID3 ai files codificati"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Aggiungi gli identificativi ID3v2 ai file codificati"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Identificativo solo per i file terminanti in '.mp3'"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Campo del commento ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Codifica dei caratteri ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Codifica dei caratteri ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Server DB"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Percorso CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Server primario"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Server secondario"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Invia posta elettronica a DB Submit"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Codifica dei caratteri DB"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Usa le estensioni freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Esegui automaticamente le ricerche sul disco"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
-msgstr "Usa un server proxy"
+msgstr "Usare un server proxy"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
-msgstr "Individua il server dalla variabile d'ambiente 'http_proxy'"
+msgstr "Individua server dalla variabile d'ambiente 'http_proxy'"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Server proxy"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Porta proxy"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Nome dell'utente per il proxy"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
-msgstr "Parola d'ordine per il proxy"
+msgstr "Password per il proxy"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Programma di aggiornamento del CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Non cambiare in minuscolo i nomi dei file"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Abilita il bit alto nei nomi dei file"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
-msgstr ""
+msgstr "Sostituisci caratteri incompatibili con numeri esadecimali"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Non cambiare gli spazi in trattini"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -511,20 +511,20 @@
 "Caratteri da non ridurre\n"
 "nei nomi di file"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
-msgstr "Mostra l'icona del cassetto"
+msgstr "Mostrare l'icona del cassetto"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Varie"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr ""
 "Errore: non è possibile salvare il file di configurazione dell'estrattore."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr ""
 "Errore: non è possibile salvare il file di configurazione del codificatore."
@@ -561,201 +561,233 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Non posso compiere alcuna ricerca durante un'estrazione."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Il disco è sconosciuto"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Traccia %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Ricerca %s (su %s) per il disco %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Ricerca %s per il disco %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Non è stato trovato alcun riscontro\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
 "Downloading data...\n"
 msgstr ""
-"E' stato trovato un riscontro per \"%s / %s\"\n"
+"È stato trovato un riscontro per \"%s / %s\"\n"
 "Sto scaricando i dati...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Fatto\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Si è verificato un errore salvando i dati del disco\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Non è stato trovato alcun riscontro\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
-msgstr "Lunghezza"
+msgstr "Durata"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Tracce"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Traccia"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Fatto.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Si è verificato un errore mentre salvavo i dati del disco."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Modalità di esecuzione ciclica"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Avvia/Ferma l'esecuzione ciclica"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Stato dell'estrazione"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Riproduci traccia / Pausa riproduzione"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Riavvolgi"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Avanti veloce"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Vai alla traccia precedente"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Vai alla traccia successiva"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Mostra/Nascondi le opzioni in riproduzione"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Prossimo disco"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Ferma l'esecuzione"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Espelli il disco"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Esamina i contenuti del disco"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Mostra/Nascondi il controllo del volume"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Mostra/Nascondi l'editor del disco"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inizia/termina la ricerca DiscoDB"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Mostra/Nascondi la visualizzazione delle tracce"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Esci da Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Con posso fare l'avanzamento veloce durante un'estrazione."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Non posso riavvolgere durante un'estrazione."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Non posso cambiare dischi durante un'estrazione."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Espelli il disco\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Non posso espellere alcun disco durante un'estrazione."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Ecco il disco... in espulsione\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Non posso riprodurre nulla durante un'estrazione."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Non posso cambiare traccia durante un'estrazione."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Controllo per un nuovo disco\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "StatusCD ha trovato un disco, controllo le tracce\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Abbiamo un disco valido!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Nessuna traccia di lunghezza zero\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "StatusCD dice che non c'è alcun disco\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Settore corrente: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Nessun disco"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -767,49 +799,53 @@
 "\n"
 "Vuoi davvero inviare questa informazione riguardo il disco?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Errore: non è possibile creare alcun file temporaneo."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Errore: non è possibile scrivere i dati del disco."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Notifica l'immissione a %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr ""
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Messaggio di sistema"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI è %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "La domanda è [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Errore di stato %d su %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Sto creando la cartella %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Errore: %s esiste, ma è un file\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Errore: non è possibile aprire %s in scrittura\n"
@@ -884,7 +920,7 @@
 
 #: src/discedit.c:565
 msgid "You must enter a disc artist."
-msgstr "Devi immettere un'artista. "
+msgstr "È necessario inserire un'artista."
 
 #: src/discedit.c:575
 msgid ""
@@ -941,18 +977,18 @@
 msgstr "Cancella"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
-msgstr "Il campo ID3 è sconosciuto\n"
+msgstr "campo ID3 sconosciuto\n"
 
 #: src/launch.c:121
 #, c-format
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr ""
 "Errore: non posso tradurre il nome del file. \n"
-"Nessun utente come %s\n"
+"Non esiste l'utente %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "L'esecuzione è fallita\n"
 
@@ -960,9 +996,13 @@
 msgid "Error: Bad entry type\n"
 msgstr "Errore: è stata immessa una voce errata\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Errore: lettura file di configurazione\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
-msgstr "Errore: il file di configurazione non è valido\n"
+msgstr "Errore: file di configurazione non valido\n"
 
 #: src/rip.c:104
 msgid "Rip+Encode"
@@ -1014,10 +1054,10 @@
 
 #: src/rip.c:173
 msgid "Current sector:      0"
-msgstr "Settore Corrente:      0"
+msgstr "Settore attuale:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Estrazione: in attesa"
 
@@ -1025,7 +1065,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Codifica: Trc 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Codifica: in attesa"
 
@@ -1044,11 +1084,11 @@
 #: src/rip.c:384
 #, c-format
 msgid "Inserting track %d into the ddj database\n"
-msgstr "Sto inserendo la  traccia %d nell'archivio DDJ\n"
+msgstr "Sto inserendo la traccia %d nell'archivio DDJ\n"
 
 #: src/rip.c:609
 msgid "Error: can't open m3u file."
-msgstr "Errore: non posso aprire il file m3u."
+msgstr "Errore: impossibile aprire il file m3u."
 
 #: src/rip.c:703
 msgid "In KillRip\n"
@@ -1071,7 +1111,7 @@
 
 #: src/rip.c:937
 msgid "Rip finished\n"
-msgstr "L'estrazione è terminata\n"
+msgstr "Estrazione completata\n"
 
 #: src/rip.c:963
 #, c-format
@@ -1100,26 +1140,26 @@
 #: src/rip.c:1042
 #, c-format
 msgid "Finished encoding on cpu %d\n"
-msgstr "E' stata terminata la codifica sulla cpu %d \n"
+msgstr "È stata terminata la codifica sulla cpu %d \n"
 
 #: src/rip.c:1060
 #, c-format
 msgid "Deleting [%s]\n"
-msgstr "Sto ritardando [%s]\n"
+msgstr "Cancellazione [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "L'estrazione è terminata\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Nessun artista"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Nessun titolo"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1128,7 +1168,7 @@
 "impostazioni del tuo lettore CDRom in Config->CD se è presente un disco nel "
 "dispositivo."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1138,7 +1178,7 @@
 "Controlla la tua configurazione  ed assicurati che specifichi il percorso "
 "completo all'eseguibile dell'estrattore."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1148,114 +1188,112 @@
 "Controlla la tua configurazione  ed assicurati che specifichi il percorso "
 "completo all'eseguibile del codificatore."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
 msgstr ""
 "Non è stata selezionata alcuna traccia.\n"
-"Devo estrarre l'intero CD?\n"
+"Estrarre l'intero CD?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Estrarre l'intero CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "In EstraiProssimaTraccia\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La prima traccia controllata è %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
-msgstr "L'estrazione è andata!\n"
+msgstr "L'estrazione è andata a buon fine!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Nessun accesso in scrittura al file .wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
-msgstr "Sto estraendo la traccia %d su %s\n"
+msgstr "Estrazione traccia %d su %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Estrai: Trc %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
-msgstr "File %s è già stato estratto. Lo salto...\n"
+msgstr "Il file %s è già stato estratto. Viene saltato...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
-msgstr "Non c'è più spazio nella cartella d'uscita"
+msgstr "Non c'è più spazio nella directory di output"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Sto richiamando CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "La traccia %d è stata aggiunta alla lista %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
-msgstr "Non è disponibile nessuna cpu\n"
+msgstr "Nessuna CPU disponibile\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Codifica la traccia %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Non vi sono accessi in scrittura al file codificato."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Codifica su %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Codifica: Trc %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
-msgstr "In Calcola Tutto\n"
+msgstr "In Calcola tutto\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Non stiamo estraendo nulla adesso, così azzeriamo i valori di codifica\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "La dimensione del totale estratto è: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "La dimensione del totale codificato è: %d\n"
 
 #: src/tray.c:57
-#, fuzzy
 msgid "Artist"
-msgstr "Nessun artista"
+msgstr "Artista"
 
 #: src/tray.c:58
-#, fuzzy
 msgid "Title"
-msgstr "Nessun titolo"
+msgstr "Titolo"
 
 #: src/tray.c:83
 #, c-format
@@ -1263,16 +1301,18 @@
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
+"%s - %s\n"
+"%02d:%02d di %02d:%02d"
 
 #: src/tray.c:87
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr ""
+msgstr "Estrazione traccia in corso %02d:\t%6.2f%% (%6.2f%% )"
 
 #: src/tray.c:88
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr ""
+msgstr "Codifica traccia in corso %02d:\t%6.2f%% (%6.2f%% )"
 
 #: src/tray.c:89
 #, c-format
@@ -1280,6 +1320,8 @@
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
+"%s - %s\n"
+"%s%s%s"
 
 #: src/tray.c:92
 #, c-format
@@ -1287,33 +1329,32 @@
 "%s - %s\n"
 "Idle"
 msgstr ""
+"%s - %s\n"
+"In attesa"
 
 #: src/tray.c:191
 msgid "Pause"
-msgstr ""
+msgstr "Pausa"
 
 #: src/tray.c:196
-#, fuzzy
 msgid "Stop"
-msgstr "Ferma l'esecuzione"
+msgstr "Stop"
 
 #: src/tray.c:204
 msgid "Previous"
-msgstr ""
+msgstr "Precedente"
 
 #: src/tray.c:209
-#, fuzzy
 msgid "Next"
-msgstr "Prossimo disco"
+msgstr "Successivo"
 
 #: src/tray.c:217
-#, fuzzy
 msgid "Rip and Encode"
-msgstr "Interrompi l'estrazione e la codifica"
+msgstr "Estrai e codifica"
 
 #: src/tray.c:224
 msgid "Quit"
-msgstr ""
+msgstr "Esci"
 
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "

grip-3.4.3.tar.gz/po/ja.po -> grip-3.9.0.tar.gz/po/ja.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: grip 3.1.9\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2004-04-04 12:27+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -89,12 +89,12 @@
 msgid "General"
 msgstr "全般"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "切り出し"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "エンコーダ"
 
@@ -139,11 +139,16 @@
 msgid "Version %s"
 msgstr "バージョン %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "エラー: 設定ファイルを保存できません"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Created by Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -153,356 +158,356 @@
 "Grip を再設定する必要があります。\n"
 "古い設定ファイルに '-old' を付けて保存しました。"
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "サーバ: %s  ポート番号: %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "エラー: 設定ファイルを保存できません"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "設定"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CD-ROM デバイス"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "終了時/起動時に再生割り込みをしない"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "終了時に巻き戻す"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "再生しない時に最初のトラックから開始する"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "ディスク挿入時に自動的に演奏する"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "再生する度にシャッフルする"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "不良時に取り出す"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "ディスク・ドライブを定期的に確認する"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "確認する間隔 (秒)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "切り出しツール:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "実行ファイル"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "オプション"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Paranoia を使用しない"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "拡張 Paranoia を使用しない"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Scratch を使用しない"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "検出する"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "修復する"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "ゲインの調整値を計算する"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "一般的な SCSI デバイス"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "切り出し"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "優先度 (nice 値)"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "エンコーディングしない最大ファイル数"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "挿入時に自動的に切り出す"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "完了したらビープ音を鳴らす"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "完了したら自動的に取り出す"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "自動取り出しまでの待機時間"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "切り出す前に遅延する"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "切り出しが完了するまでエンコーディングを遅らせる"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "次のトラックに移動する際に CD-ROM を停止する"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "フィルタコマンド(WAV)"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "フィルタコマンド(DISK)"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "オプション"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "エンコーダ:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "実行型式"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "コマンドライン引数"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "ファイルの拡張子"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "エンコーダ"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "完了後に .wav ファイルを削除する"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "SQLデータベースに追加する"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr ".m3uファイルを作成する"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr ".m3uファイルの中に関係するディレクトリを使用する"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "m3u ファイル書式"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "ビットレート (Kビット/秒)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "使用する CPU の数"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "優先度 (nice 値)"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "フィルタ・コマンド"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "完了後に .wav ファイルを削除する"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3 タグを追加する"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2 タグを追加する"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "拡張子が '.mp3' の場合にのみタグを付ける"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ID3 コメント"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1 の文字エンコーディング"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2 の文字エンコーディング"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "DB サーバ"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI のパス"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "プライマリ"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "セカンダリ"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "DB 確認メール"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "DB の文字エンコーディング"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "FreeDB を使用する"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "ディスク情報を自動的に取得する"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "プロキシサーバを使う"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "環境変数 $http_proxy からサーバを取得する"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "サーバ名"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "ポート番号"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "ユーザ名"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "パスワード"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "E-Mail アドレス"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "CD 更新プログラム"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "ファイル名の半角英字を小文字にしない"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "ファイル名に日本語 (EUC-JP) を使用する"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "空白をアンダースコア (_) に変換しない"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -510,20 +515,20 @@
 "ファイル名として\n"
 "許可する半角記号"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "その他"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "エラー: 切り出しの設定を保存できません"
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "エラー: エンコーディングの設定を保存できません"
@@ -559,32 +564,36 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 #, fuzzy
 msgid "Cannot do lookup while ripping."
 msgstr "切り出し中に検索はできません"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "不明なディスク"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "トラック %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "%s (%s を経由 : ディスク %02x) の問い合わせ中です\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "%s (DISC %02x) の問い合わせ中です\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "一致しませんでした\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -593,175 +602,204 @@
 "\"%s / %s\" が一致しました\n"
 "データのダウンロード中...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "完了\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "ディスクのデータ保存中にエラー\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "一致しませんでした\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "演奏時間"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "トラック"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "トラック"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "完了\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "ディスクデータの保存中にエラー"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "再生モードの切り替え"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "ループ再生の切り替え"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "切り出し状況"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "トラックの再生/演奏を一時停止します"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "巻き戻します"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "早送りします"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "前のトラックにジャンプします"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "次のトラックにジャンプします"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "再生オプションを切り替えます"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "次のディスク"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "演奏を停止します"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "ディスクを取り出します"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "ディスクの内容をスキャンします"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "ボリューム・コントロールに切り替えます"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "ディスク・エディタに切り替えます"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "DiscDB 検索を開始したり停止します"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "トラック番号表示に切り替えます"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Grip を終了します"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "切り出し中に早送りはできません"
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "切り出し中に巻き戻しはできません"
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "切り出し中にディスクの交換はできません"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "ディスクを取り出して下さい\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "切り出し中に取り出せません"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "ディスクがあります -- 取り出し中\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "切り出し中に再生はできません"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "切り出し中にトラックの交換はできません"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "新しいディスクをチェックする\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat はディスクを見つけました。トラックをチェックします\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "おかしなディスクがあります！\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "長さが 0 でないトラックがありません\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat よりディスクが無いとの報告です\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "現在のセクタ: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "ディスクがありません"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -773,51 +811,56 @@
 "\n"
 "このディスク情報を送信しますか？"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "エラー: 作業用ファイルが作成できません"
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "エラー: ディスクデータを書き込めません"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "エントリ %s をメール中です\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "エラー: エンコーディングの設定を保存できません"
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "システム・メッセージ"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI = %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "[%s] で検索\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "%d (%s) の Stat エラー\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "ディレクトリ %s が作成されました\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "エラー: %s が存在していますが、これはファイルです\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "エラー: 書き込みモードで %s ファイルを開けません\n"
@@ -955,7 +998,7 @@
 msgstr "キャンセル"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "不明な ID3 フィールド\n"
 
@@ -964,7 +1007,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "エラー: ファイル名を変換できません。 %s というユーザはありません\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "実行に失敗しました\n"
 
@@ -972,7 +1015,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "エラー: エントリの種類が不正です\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "エラー: 設定ファイルが正しくありません\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "エラー: 設定ファイルが正しくありません\n"
 
@@ -1029,7 +1077,7 @@
 msgstr "現在のセクタ:     0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "切り出し: 待機中"
 
@@ -1037,7 +1085,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "エンコーディング: 99曲目 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "エンコーディング: 待機中"
 
@@ -1120,32 +1168,32 @@
 msgid "Deleting [%s]\n"
 msgstr "[%s] を削除中です\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "切り出し終了\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "演奏者なし"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "タイトルなし"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1155,7 +1203,7 @@
 "エンコーダが正しくありません。\n"
 "切り出しの設定を確認して下さい。"
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1163,93 +1211,93 @@
 "トラックが指定されていません。\n"
 "音楽 CD 全体を切り出しますか？\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "音楽 CD 全体の切り出し\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "次のトラックを切り出し中\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "最初にチェックしたトラックは %d です\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "切り出し中止！\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "WAV ファイルに対する書き込み権限がありません"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "トラック %d を %s に切り出し中\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "切り出し: %d曲目 (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "ファイル %s は既に切り出し済みです。スキップします...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "出力するために必要な空き容量がありません"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "CDPRipを呼び出しています。\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "%d トラックを %s リストに追加しました\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "CPUに空きがありません\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "エンコーディングのトラック %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "エンコーディング・ファイルに対する書き込み権限がありません"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: %s へエンコーディング中\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "エンコーディング: %d曲目 (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "全て計算中\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "現在、切り出ししていないので、エンコーディング値を 0にして下さい\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "切り出しの合計サイズ: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "エンコーディングの合計サイズ: %d\n"

grip-3.4.3.tar.gz/po/nb.po -> grip-3.9.0.tar.gz/po/nb.po Changed

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.2\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-06-17 18:06+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-10-04 10:43+0200\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb_NO\n"
@@ -92,12 +92,12 @@
 msgid "General"
 msgstr "Generelt"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Ripp"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Omkode"
 
@@ -142,11 +142,15 @@
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Feil: Kunne ikke åpne hjemmesiden."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Laget med Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -156,348 +160,348 @@
 "Du trenger å rekonfigurere Grip.\n"
 "Din gamle konfigurasjonfil er lagret med «-old» lagt til."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "tjener er %s, port %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Feil: Kan ikke lagre konfigurasjonsfilen."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Innstillinger"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CDrom-enhet"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Ikke avbryt avspilling ved avslutting/oppstart"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Spol tilbake når stanset"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Start med første spor hvis det ikke spiller av"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Autoavspill plater ved innsettelse"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Endre rekkefølgen før hver avspilling"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Omgå defekt utløser"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Sjekk stasjonen for ny plate"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Sjekk-intervall"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Ripper:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Rippe-program"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Rippe-kommandolinje"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Slå av paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Slå av ekstra paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Deaktiver riper"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "oppdagelse"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "reparasjon"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Beregn forsterkningsjustering"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Rippeformat"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr "Rippe-filformat (Multi-artist)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Generisk SCSI-enhet"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Ripper"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Ripp «nice»-verdi"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Maksimum ikkekodede .wav-filer"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Autorippe plater ved innsettelse"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Bip etter ripping"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Auto-løs ut etter ripping"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Auto-løs utforsinkelse"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Forsinkelse før ripping"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Utsett koding til platen er rippet"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Stans cdrom-enheten mellom sporene"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Wav-filterkommando"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Plate-filterkommando"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Innstillinger"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Koder:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Kjørbar enkoderfil"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Enkoder-kommandolinje"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Enkoder-filetternavn"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Enkoder-filformat"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr "Enkoder-filformat (Multi-artist)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Koder"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Slett .wav etter omkoding"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Sett inn i SQL-database"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Lag .m3u-filer"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Bruk relative stier i .m3u-filer"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U-filformat"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Bitrate for koding (kbits/sek)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Antall CPU-er som skal brukes"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Omkoder «nice»-verdi"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Enkoder-filterkommando"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Kjør kommando etter koding"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Legg til ID3-tagger i kodede filer."
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Legg til ID3v2-tagger i kodede filer."
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Kun tagg filer som slutter på «.mp3»"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ID3 kommentarfelt"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1 tegnsett"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2 tegnsett"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "DB-server"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI-sti"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Hovedserver"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Sekundærserver"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "DB Send e-post"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "DB tegnsett"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Bruk freedb-utvidelser"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Utfør plateoppslag automatisk"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiskDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Bruk proxy-tjener"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Hent server fra miljøvariabelen «http_proxy»"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Proxy-tjener"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Proxy-port"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Proxy-brukernavn"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Proxy-passord"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "CD-oppdateringsprogram"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Ikke endre til små bokstaver i filnavn"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Tillat høye bit-er i filnavn"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Erstatt inkompatible tegn med heksadesimale tall"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Ikke endre mellomrom i filnavn"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Skriv M3U-filer ved bruk av ikke-POSIX-kompatible «\\»"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -505,19 +509,19 @@
 "Tegn som ikke skal\n"
 "strippes i filnavn"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Vis systemkurvikon"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Feil: Kan ikke lagre rippe-oppsett."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Feil: Kan ikke lagre omkodingsoppsett."
 
@@ -551,31 +555,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Kan ikke gjøre oppslag under ripping"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Ukjent plate"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Spor %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Søker %s (gjennom %s) etter plate %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Søker %s etter plate %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Ingen treff\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -584,168 +592,196 @@
 "Treff for \"%s / %s\"\n"
 "Laster ned data…\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Utført\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Feil ved lagring av data\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Ingen treff\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Lengde"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Spor"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Velg forrige CDDB-oppføring."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "Velg neste CDDB-oppføring."
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Spor"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "Ingen platedata. Returnerer.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Allerede ved siste plate-indeks. Returnerer.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Ferdig.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoPrevDiscDBEntry.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Allerede ved første plate-indeks. Returnerer.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Feil ved lagring av platedata"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Roter spillemodus"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "inverter loop-spilling"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Rippestatus"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Spill spor / Pause avspilling"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Spol tilbake"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Spol fremover"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Gå til forrige spor"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Gå til neste spor"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Inverter spillemodusvalg"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Neste plate"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Stopp avspilling"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Løs ut plate"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Skann plateinnhold"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Veksle volumkontroll"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Inverter plateredigerer"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Start/avbryt DiskDB-oppslag"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Veksle sporvisning"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Avslutt Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Kan ikke spole frem under ripping."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Kan ikke spole tilbake under ripping."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Kan ikke bytte plater under ripping."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Løs ut plate\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Kan ikke løse ut under ripping."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Har plate – løser ut\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Kan ikke spille av under ripping."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Kan ikke bytte spor under ripping."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Ser etter ny plate\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat fant en ny plate, sjekker spor\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Vi har en gyldig plate!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Ingen ikke-null-lengde spor\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat sa ingen plate\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Gjeldende sektor: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Ingen plate"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -757,49 +793,53 @@
 "\n"
 "Ønsker du å sende inn denne plateinformasjonen? "
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Feil: Kan ikke opprette midlertidig fil."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Feil: Kan ikke skrive platedata."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Mailer oppføringen til %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Feil: Kunne ikke kjøre e-postkommandoen."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Systemmelding"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI er %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Spørring er [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Stat-feil %d på %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Oppretter katalog %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Feil: %s eksisterer, men er en fil\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Feil: kunne ikke åpne %s for skriving\n"
@@ -931,7 +971,7 @@
 msgstr "Avbryt"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "ukjent ID3-felt\n"
 
@@ -940,7 +980,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Feil: Kan ikke oversette filnavn. Ingen slik bruker som %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Kjøring feilet\n"
 
@@ -948,7 +988,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Feil: dårlig oppføringstype \n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Feil ved lesing av konfigfilen\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Feil: ugyldig konfigurasjonsfil\n"
 
@@ -1005,7 +1049,7 @@
 msgstr "Gjeldende sektor:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Rip: inaktiv"
 
@@ -1013,7 +1057,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Koding: spor 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Koding: inaktiv"
 
@@ -1095,19 +1139,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Sletter [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Rippingen er ferdig\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Ingen Artist"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Ingen Tittel"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1115,7 +1159,7 @@
 "Ingen plate ble påvist i stasjonen. Hvis du har en plate i stasjonen kan du "
 "sjekke cdrom-enhetinnstillingen under Innstillinger-> CD."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1125,7 +1169,7 @@
 "Sjekk ripp-konfigurasjonen og sørg for at den angir den fullstendige banen "
 "til rippekommandofilen."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1135,7 +1179,7 @@
 "Sjekk omkodings-konfigurasjonen og sørg for at den angir den fullstendige "
 "banen til kodekommandofilen."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1143,92 +1187,92 @@
 "Ingen spor valg.\n"
 "Ripp hele CD-en?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Ripper hele CD-en\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "I RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Første kontrollerte spor er %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Ripper i vei!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Ingen skrivetilgang for å lagre wav-fil"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Ripper spor %d til %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ripp: Spor %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Filen %s er allerede rippet. Hopper over…\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Tomfor plass i lagringskatalogen"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Kaller CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "La til spor %d i %ss liste\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Ingen ledige cpu-er\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Kode spor %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Ingen skrivetilgang for å lagre enkodet fil."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Enkoder til %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Kode: Spor %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "I CalculateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Vi ripper ikke nå, så la oss nulle ut kodingsverdier\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Total rippestørrelse er: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Total enkodingsstørrelse er: %d\n"

grip-3.4.3.tar.gz/po/nl.po -> grip-3.9.0.tar.gz/po/nl.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: grip 3.4.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2017-04-18 16:09+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -91,12 +91,12 @@
 msgid "General"
 msgstr "Algemeen"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Rippen"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Coderen"
 
@@ -141,11 +141,16 @@
 msgid "Version %s"
 msgstr "Versie %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "Fout: kan configuratiebestand niet opslaan"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Gemaakt door Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -155,350 +160,350 @@
 "U zult Grip opnieuw moeten instellen.\n"
 "Uw oude configuratiebestand is opgeslagen met '-old' eraan toegevoegd."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "server is %s, poort %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Fout: kan configuratiebestand niet opslaan"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Configuratie"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CDRom-apparaat"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Afspelen niet onderbreken bij afsluiten/opstarten"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Terugspoelen wanneer gestopt"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Starten met het eerste nummer als er niets speelt"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Auto-afspelen bij invoegen van een CD"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Opnieuw husselen vóór elke keer afspelen"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Om gebrekkige uitwerping heenwerken"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "CD-speler polsen voor nieuwe CD"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Polsinterval (seconden)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Ripper:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Rip-programmabestand"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Rip-opdrachtregel"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Paranoia uitschakelen"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Extra paranoia uitschakelen"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Scratch uitschakelen"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "detectie"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "herstel"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Gain-aanpassing berekenen"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Rip-bestandsindeling"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Rip-bestandsindeling"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Algemeen SCSI-apparaat"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Ripper"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Rip-beleefdheidswaarde"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Max niet-gecodeerde .wav's"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Auto-rippen bij invoeren"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Piepen na het rippen"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Auto-uitwerpen na het rippen"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Auto-uitwerpvertraging"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Vertraging voor het rippen"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Coderen uitstellen totdat de schijf geript is"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "CD-speler stoppen tussen de nummers"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Wav-filteropdracht"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Schijf-filteropdracht"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Opties"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Encoder:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Encoder-programmabestand"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Encoder-opdrachtregel"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Bestandsextensie voor codering"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Bestandsindeling voor codering"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Bestandsindeling voor codering"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Coderingsprogramma"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr ".wav na het coderen verwijderen"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Informatie aan SQL-database toevoegen"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr ".m3u-bestanden aanmaken"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Relatieve paden gebruiken in .m3u-bestanden"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U-bestandsindeling"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Coderings-bitrate (kbit/sec)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Aantal te gebruiken CPU's"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Encoder-beleefdheidswaarde"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Encoder-filteropdracht"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Opdracht uitvoeren na het coderen"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3-tags toevoegen aan gecodeerde bestanden"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2-tags toevoegen aan gecodeerde bestanden"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Alleen bestanden die eindigen op '.mp3' taggen"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ID3-commentaarveld"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-tekensetcodering"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-tekensetcodering"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "DB-server"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI-pad"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Primaire server"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Secundaire server"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "DB-e-mail verzenden"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "DB-tekensetcodering"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Freedb-extensies gebruiken"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Schijven automatisch opzoeken"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Proxy-server gebruiken"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Server uit 'http_proxy'-omgevingsvariabele halen"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Proxy-server"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Proxy-poort"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Proxy-gebruikersnaam"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Proxy-wachtwoord"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "E-mailadres"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "CD-update-programma"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Bestandsnamen niet in kleine letters omzetten"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Hoge bits in bestandsnamen toestaan"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Incompatibele tekens vervangen door hexadecimale getallen"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Spaties niet vervangen door liggende streepjes"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "m3u-bestanden schrijven met niet-Posix '\\'"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -506,19 +511,19 @@
 "Tekens om niet te strippen\n"
 "in bestandsnamen"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Systeemvakpictogram tonen"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Diversen"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Fout: kan ripper-configuratie niet opslaan."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Fout: kan encoder-configuratie niet opslaan."
 
@@ -554,31 +559,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCUITWERPEN"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Kan niet opzoeken tijdens het rippen."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Onbekende schijf"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Nummer %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Opvragen van %s (door %s) voor schijf %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Opvragen van %s voor schijf %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Geen overeenkomst\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -587,168 +596,197 @@
 "Overeenkomst voor \"%s / %s\"\n"
 "Gegevens aan het downloaden...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Klaar\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Fout bij het opslaan van schijfgegevens\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Geen overeenkomst\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Lengte"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Nummers"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Nummer"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Klaar\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Fout tijdens het opslaan van schijfgegevens."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Afspeelmodus roteren"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Lus-afspelen omschakelen"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Rip-status"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Afspelen / Pauzeren"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Terugspoelen"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Snelvooruit"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Naar voorgaande nummer"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Naar volgende nummer"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Afspeelmodusopties omschakelen"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Volgende schijf"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Stoppen met afspelen"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Schijf uitwerpen"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Schijfinhoud scannen"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Volumeregelaar omschakelen"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Schijfbewerker omschakelen"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Opzoeken in DiscDB starten/afbreken"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Nummervenster omschakelen"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Grip afsluiten"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Kan niet vooruitspoelen tijdens het rippen."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Kan niet terugspoelen tijdens het rippen."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Kan niet van schijf wisselen tijdens het rippen."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Schijf uitwerpen\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Kan niet uitwerpen tijdens het rippen."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Heb de schijf -- bezig met uitwerpen\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Kan niet afspelen tijdens het rippen."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Kan niet van nummer wisselen tijdens het rippen."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Controleren op een nieuwe schijf\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat heeft een schijf gevonden, bezig met checken van nummers\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "We hebben een geldige schijf!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Geen nummers met een niet-nul lengte\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat gaf aan dat er geen schijf is\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Huidige sector: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Geen schijf"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -760,49 +798,54 @@
 "\n"
 "Wilt u deze schijfinformatie verzenden?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Fout: kan geen tijdelijk bestand aanmaken."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Fout: kan schijfgegevens niet schrijven"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Item wordt gemaild naar %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "Fout: kan encoder-configuratie niet opslaan."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Systeemmelding"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI is %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Verzoek is [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Stat-fout %d op %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Aanmaken van map %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Fout: %s bestaat, maar is een bestand\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Fout: kan %s niet openen om te schrijven\n"
@@ -936,7 +979,7 @@
 msgstr "Annuleren"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "onbekend ID3-veld\n"
 
@@ -945,7 +988,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Fout: kan bestandsnaam niet vertalen.  Gebruiker %s bestaat niet.\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Uitvoering is mislukt\n"
 
@@ -953,7 +996,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "Fout: onjuist item-type\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "Fout: ongeldig configuratiebestand\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Fout: ongeldig configuratiebestand\n"
 
@@ -1010,7 +1058,7 @@
 msgstr "Huidige sector:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Rip: inactief"
 
@@ -1018,7 +1066,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod: Nr 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Cod: inactief"
 
@@ -1100,19 +1148,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Verwijderen van [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Rippen is voltooid\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "GeenArtiest"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "GeenTitel"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1120,7 +1168,7 @@
 "Geen schijf gedetecteerd in het station.  Als er toch een schijf in de "
 "speler zit, controleer dan de apparaatinstellingen onder Config->CD."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1130,7 +1178,7 @@
 "Controleer uw rip-instellingen, en of het volledige pad naar het uitvoerbare "
 "bestand van de ripper gegeven is."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1140,7 +1188,7 @@
 "Controleer uw encoder-instellingen, en of het volledige pad naar het "
 "uitvoerbare bestand van de encoder gegeven is."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1148,93 +1196,93 @@
 "Geen nummers geselecteerd.\n"
 "Hele CD rippen?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Rippen van hele CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "in RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Eerste gecheckte nummer is %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Bezig met rippen!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Geen schrijftoegang om wav-bestand te schrijven"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Rippen van nummer %d naar %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Rip: Nr %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Bestand %s is al geript.  Wordt overgeslagen...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Er is geen ruimte meer in de uitvoermap"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Aanroepen van CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Nummer %d is toegevoegd aan %s-lijst\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Geen vrije CPU's\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Coderen van nummer %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Geen schrijftoegang om gecodeerd bestand te schrijven"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Coderen naar %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Cod: Nr %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "in CalculateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "We rippen nu niet, dus laten zetten we coderingswaarden op nul zetten\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Totale rip-grootte is: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Totale gecodeerde grootte is: %d\n"

grip-3.4.3.tar.gz/po/pl.po -> grip-3.9.0.tar.gz/po/pl.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: grip.old\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2005-03-10 11:22+0200\n"
 "Last-Translator: Piotr Adamocha <piotr@adamocha.net>\n"
 "Language-Team: Poland\n"
@@ -89,12 +89,12 @@
 msgid "General"
 msgstr "G³ówny"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Ripuj"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Zakoduj"
 
@@ -139,11 +139,16 @@
 msgid "Version %s"
 msgstr "Wersja %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "B³±d: Nie mo¿na zapisaæ pliku konfiguracyjnego"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Stworzone w Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -154,355 +159,355 @@
 "Twój stary plik konfiguracyjny zosta³ zapisany z do³±czeniem \"-old\" do "
 "nazwy."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "serwer to %s, port %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "B³±d: Nie mo¿na zapisaæ pliku konfiguracyjnego"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Konfiguracja"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Napêd CD"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Nie przerywaj grania podczas wyj¶cia/uruchomienia"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Przewiñ kiedy zatrzymane"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Rozpocznij od pierwszej ¶cie¿ki je¶li nie odtwarza"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Auto-play podczas w³o¿enia dysku"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Przetasuj przed ka¿dym odtwarzaniem"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Obej¶cie b³êdu wysuniêcia"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Sprawd¼ napêd w poszukiwaniu nowego dysku"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Okres sprawdzania (w sekundach)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Riper:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Program ripuj±cy"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Linia komend ripowania"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Wy³±cz tryb paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Wy³±cz tryb extra paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Wy³±cz zarysowanie"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "detekcja"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "naprawa"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Oblicz regulacjê wzmocnienia"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Format ripowanego pliku"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Format ripowanego pliku"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Standardowe urz±dzenie SCSI"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Ripper"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "'mi³a' warto¶æ ripowania"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Maksymalna ilo¶æ niezakodowanych plików .wav"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Auto-ripowanie podczas w³o¿enia"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "D¼wiêk po zripowaniu"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Auto-wysuwanie po zripowaniu"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Przerwa auto-wysuniêcia"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Przerwa przed ripowaniem"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Wstrzymaj kodowanie podczas ripowania dysku"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Zatrzymuj napêd cd pomiêdzy ¶cie¿kami"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Komenda filtra Wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Komenda filtra dysku"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Opcje"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Program koduj±cy:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Plik programu koduj±cego:"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Linia komend prog. koduj±cego"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Rozszerzenie kodowanego pliku"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Format kodowanego pliku"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Format kodowanego pliku"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr ""
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Usuñ .wav po kodowaniu"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Wstaw informacjê do bazy SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Twórz pliki .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "U¿ywaj relatywnych ¶cie¿ek w plikach .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Format pliku M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Próbkowanie kodowania (kbitów/sek)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Ilo¶æ CPU do u¿ycia"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "'mi³a' warto¶æ kodowania"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Komenda filtra kodowania"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Usuñ .wav po kodowaniu"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Dodaj tagi ID3 do zakodowanych plików"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Dodaj tagi ID3v2 do zakodowanych plików"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Taguj tylko pliki z rozszerzeniem .mp3"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Pole komentarza ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Kodowanie znaków ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Kodowanie znaków ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Serwer bazy danych"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "¦cie¿ka CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "G³ówny serwer"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Serwer pomocniczy"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Email wysy³any do bazy danych"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Kodowanie znaków bazy danych"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "U¿ywaj rozszerzeñ freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Automatycznie wykonuj sprawdzanie dysku"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "Baza danych p³yt"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "U¿yj serwera proxy"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "U¿yj serwera ze zmiennej ¶rod. 'http_proxy'"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Port proxy"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Nazwa u¿ytkownika dla proxy"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Has³o dla proxy"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Adres email"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Program uaktalniania CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Nie zmieniaj nazw plików na ma³e litery"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Dopu¶æ wysokie bity w nazwach plików"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Nie zmianiaj spacji do podkre¶leñ"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -510,19 +515,19 @@
 "Znaki do usuniêcia\n"
 "w plikach"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Poka¿ ikonê w tacce systemowej"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Ró¿ne"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "B³±d: Nie mo¿na zapisaæ konfiguracji rippera."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "B³±d: Nie mo¿na zapisaæ konfiguracji enkodera."
 
@@ -556,31 +561,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Nie mo¿na wykonaæ sprawdzenia podczas ripowania"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Nieznany dysk"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "¦cie¿ka %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Zapytanie %s (przez %s) dla dysku %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Zapytanie %s dla dysku %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Nie dopasowano\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -589,168 +598,197 @@
 "Dopasowano dla \"%s %s\"\n"
 "Pobieram dane...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Wykonano\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "B³±d podczas zapisywania danych dysku\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Nie dopasowano\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "D³ugo¶æ"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "¦cie¿ki"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "¦cie¿ka"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Wykonano\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "B³±d podczas zapisywania danych dysku"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Obróæ tryb odtwarzania"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Zmieñ pêtle odtwarzania"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Status ripowania"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Odtwarzaj / Pauzuj ¶cie¿kê"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Cofnij"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Przewin do przodu"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Do poprzedniej ¶cie¿ki"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Do nastêpnej ¶cie¿ki"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Zmieñ tryb odtwarzania"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Nastêpny dysk"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Zatrzymaj odtwarzanie"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Wysuñ dysk"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Skanuj zawarto¶æ dysku"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Zmieñ sterowanie g³o¶no¶ci±"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Zmieñ edytor dysku"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Rozpocznij/przerwij sprawdzanie bazy danych dysków"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Zmieñ wy¶wietlanie ¶cie¿ki"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Opu¶æ Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Nie mo¿na szybko przewijaæ podczas ripowania."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Nie mo¿na przewijaæ podczas ripowania."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Nie mo¿na zmieniaæ dyskow podczas ripowania"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Wysuñ dysk\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Nie mo¿na wysun±æ podczas ripowania."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Mam dysk -- wysuwanie\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Nie mo¿na odtwarzaæ podczas ripowania."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Nie mo¿na zmieniaæ ¶cie¿ek podczas ripowania."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Sprawd¼ w poszukiwaniu nowego dysku\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat znalaz³ dysk, trwa sprawdzanie ¶cie¿ek\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Mamy prawid³owy dysk!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Brak niezerowych d³ugo¶ci ¶cie¿ek\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat zwróci³ komunikat o braku dysku\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Aktualny sektor: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Brak dysku"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -762,49 +800,54 @@
 "\n"
 "Czy chcesz wys³aæ informacje o dysku?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "B³±d: Nie mo¿na stworzyæ pliku tymczasowego."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "B³±d: Nie mo¿na zapisaæ danych."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Wysy³am wiadomo¶æ do %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "B³±d: Nie mo¿na zapisaæ konfiguracji enkodera."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Wiadomo¶æ systemowa"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI to %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Kwerenda ma postaæ [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "B³±d %d w %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Tworzê katalog %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "B³±d: %s istnieje, ale jest plikiem\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "B³±d: Nie mo¿na otworzyæ %s do zapisu\n"
@@ -936,7 +979,7 @@
 msgstr "Anuluj"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "nieznane pole ID3\n"
 
@@ -947,7 +990,7 @@
 "B³±d: nie mo¿na przet³umaczyæ nazwy pliku. Nie ma takiego u¿ytkownika jak "
 "%s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Wykonanie nie powiod³o siê\n"
 
@@ -955,7 +998,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "B³±d: Z³y rodzaj wpisu\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "B³±d: Nieprawid³owy plik konfiguracyjny\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "B³±d: Nieprawid³owy plik konfiguracyjny\n"
 
@@ -1012,7 +1060,7 @@
 msgstr "Aktualny sektor:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Rip: Bezczynny"
 
@@ -1020,7 +1068,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Enk: ¦¿k 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Enk: Bezczynny"
 
@@ -1102,19 +1150,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Usuwanie [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Ripowanie zakoñczono\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Brak wykonawcy"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Brak tytu³u"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1122,7 +1170,7 @@
 "Nie wykryto p³yty w napêdzie. Je¿eli jednak p³yta jest w napêdzie sprawd¼ "
 "ustawienia napêdu CD w Konfiguracji->CD"
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1132,7 +1180,7 @@
 "Sprawd¼ konfiguracjê ripowania i upewnij siê, ¿e poda³e¶ pe³n± ¶cie¿kê do "
 "programu ripuj±cego."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1142,7 +1190,7 @@
 "Sprawd¼ konfiguracjê enkodowania i upewnij siê, ¿e poda³e¶ pe³n± ¶cie¿kê do "
 "programu enkoduj±cego."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1150,92 +1198,92 @@
 "Nie wybrano ¶cie¿ek.\n"
 "Zripowaæ ca³± p³ytê CD?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Ripowanie ca³ej p³yty CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "W nastêpnej ¶cie¿ce ripowania\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Pierwsza sprawdzona ¶cie¿ka to %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Rozpoczêto ripowanie!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Brak prawa zapisu do zapisywanego pliku wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Ripowanie ¶cie¿ki %d do %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Rip: ¦¿k %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Plik %s zosta³ wcze¶niej zripowany. Pomijam go...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Brak miejsca w katalogu wyj¶ciowym"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Wzywam CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Dodano ¶cie¿kê %d do listy %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Brak wolnych procesorów\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Enk ¶cie¿kê %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Brak prawa zapisu do zapisu zenkodowanego pliku."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Enkodowanie do %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Enk: ¦¿k %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "W ca³kowitym przeliczeniu\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Teraz nie ripujemy, wiêc zzerujmy warto¶ci enkodowania\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Ca³kowity rozmiar ripowania: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Ca³kowity rozmiar enkodowania: %d\n"

grip-3.4.3.tar.gz/po/pt_BR.po -> grip-3.9.0.tar.gz/po/pt_BR.po Changed

@@ -2,14 +2,14 @@
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the grip package.
 # Wellington Terumi Uemura <wellingtonuemura@hotmail.com>, 2002.
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2017.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.2\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-06-19 09:26-0200\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-10-08 13:15-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
 "net>\n"
 "Language: pt_BR\n"
@@ -93,12 +93,12 @@
 msgid "General"
 msgstr "Geral"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Extrair"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Codificar"
 
@@ -143,11 +143,15 @@
 msgid "Version %s"
 msgstr "Versão %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Erro: Tentativa de mostrar página inicial falhou."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Criado por Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -157,354 +161,354 @@
 "Você vai precisar reconfigurar o Grip.\n"
 "A sua configuração antiga foi arquivada em ~/.grip-old."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "servidor é %s, porta %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Erro: Não foi possível salvar o arquivo de configuração."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Configuração"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Dispositivo de CD-ROM"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Não interromper a reprodução ao sair/inicializar"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Retroceder quando parar"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Inicializar com a primeira faixa, se não estiver reproduzindo"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Reproduzir automaticamente ao inserir um disco"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Reembaralhar as músicas antes de cada reprodução"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Tentar contornar falha de ejeção de CD"
 
 # Em que pese monitorar não seja melhor tradução para poll, me pareceu melhor aqui -- Rafael
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Monitorar unidade de disco por novo disco"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Intervalo de monitoração (segundos)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Extrator:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Executável extrator"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Linha de comando do extrator"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Desabilitar paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Desabilitar paranoia extra"
 
 # Texto reorganizado para atender a idade original de 'scratch detection' ou 'scratch detection' -- Rafael
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Arranhos: desabilitar"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "detecção"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "correção"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Calcular ajuste de ganho"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Formato do arquivo extraído"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr "Formato do arquivo extraído (Múltiplos artistas)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Dispositivo SCSI genérico"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Extrator"
 
 # nice é programa de priorização de trabalho; não traduzir -- Rafael
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Valor \"nice\" na extração"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Máximo de arquivos .wav não codificados"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Extrair automaticamente ao inserir"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Alerta sonoro após extração"
 
 # Mensagem tem que ser curta, para o texto não ser cortado na GUI -- Rafael
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Autoejetar após extrair"
 
 # Mensagem tem que ser curta, para o texto não ser cortado na GUI -- Rafael
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Atraso de autoejeção"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Atrasar o início da extração"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Atrasar a codificação até que o disco esteja extraído"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Parar a unidade de cdrom entre faixas"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Comando do filtro do Wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Comando do filtro do disco"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Opções"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Executável codificador"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Linha de comando do codificador"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Extensão do arquivo codificado"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Formato do arquivo codificado"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr "Formato de arquivo codificado (Múltiplos artistas)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Codificador"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Excluir .wav após a codificação"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Inserir informações no banco de dados SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Criar arquivos .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Usar caminhos relativos em arquivos .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Formato do arquivo M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Taxa de bits da codificação (kbits/s)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Quantidade de CPUs para usar na codificação"
 
 # nice é programa de priorização de trabalho; não traduzir -- Rafael
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Valor \"nice\" do codificador"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Comando do filtro do codificador"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Executar comando após a codificação"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Adicionar etiquetas ID3 aos arquivos codificados"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Adicionar etiquetas ID3v2 aos arquivos codificados"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Apenas adicionar etiqueta a arquivos terminando com \".mp3\""
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Campo de comentários ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Conjunto de caracteres de ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Conjunto de caracteres de ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Servidor de BD"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Caminho do CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Servidor primário"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Servidor secundário"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Enviar e-mail ao BD"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Conjunto de caracteres do banco de dados"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Usar extensões do FreeDB"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Fazer procura por discos automaticamente"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "Banco de dados"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Usar servidor proxy"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Obter servidor da variável \"http_proxy\""
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Porta do proxy"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Nome de usuário no proxy"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Senha do proxy"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Programa de atualização de CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Não escrever nomes de arquivos em letras minúsculas"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Permitir bits altos em nomes de arquivos"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Substituir caracteres incompatíveis por números hexadecimais"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Não trocar espaços por sublinhado"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Escrever arquivos m3u usando \"\\\"s não compatíveis com posix"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -512,19 +516,19 @@
 "Caracteres que não serão removidos\n"
 "do nome dos arquivos"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Mostrar ícone na área de notificação"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Outros"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Erro: Não foi possível salvar a configuração do extrator."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Erro: Não foi possível salvar a configuração do codificador."
 
@@ -559,31 +563,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Não é possível procurar durante a extração."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Disco desconhecido"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Faixa %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Perguntando %s (através de %s) por disco %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Perguntando %s por disco %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Nada foi encontrado\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -592,168 +600,196 @@
 "Ocorrência para \"%s / %s\"\n"
 "Descarregando dados...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Feito\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Erro, gravando dados do disco\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Nada foi encontrado\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Duração"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Faixas"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Seleciona a entrada CDDB anterior."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "Seleciona a próxima entrada CDDB."
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Faixa"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "FazerProxEntradaBDDisco.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "Nenhum dado de disco. Retornando.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Já no último índice. Retornando.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Feito.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "FazerEntradaBDDiscoAnt.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Já no primeiro índice. Retornando.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Erro, gravando dados do disco."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Rotacionar modo de reprodução"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Ativar reprodução infinita"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Estado da extração"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Reproduz a faixa / Pausa a reprodução"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Retrocede"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Avança"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Vai para a faixa anterior"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Vai para a próxima faixa"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Ativa opções do modo de reprodução"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Próximo disco"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Para a reprodução"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Ejeta o disco"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Lê o conteúdo do disco"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Ativa o controle de volume"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Ativa editor de disco"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inicializa/Aborta procura no banco de dados de disco"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Mostra a faixa"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Sai do Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Não é possível avançar durante a extração."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Não é possível retroceder durante a extração."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Não é possível trocar de discos durante a extração."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Ejetar o disco\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Não é possível ejetar durante a extração."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Há disco -- ejetando\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Não é possível reproduzir durante a extração."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Não é possível trocar de faixa durante a extração."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Verificando se há um novo disco\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "O CDStat encontrou um disco, verificando faixas\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Nós temos um disco válido!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Nenhuma faixa de tamanho não zero\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "O CDStat disse: sem disco\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Setor atual: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Sem disco"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -765,50 +801,54 @@
 "\n"
 "Você deseja enviar as informações deste disco?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Erro: Não foi possível criar arquivo temporário."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Erro: Não foi possível gravar os dados do disco."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Enviando entradas para %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Erro: Não foi possível executar comando de e-mail."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Mensagem do sistema"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI é %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Pesquisa é [%s]\n"
 
 # %d é um número, %s é um diretório -- Rafael
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Erro %d ao obter estado de %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Criando diretório %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Erro: o %s existe, mas é um arquivo\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Erro: Não foi possível abrir o %s para escrita\n"
@@ -940,7 +980,7 @@
 msgstr "Cancelar"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "campo ID3 desconhecido\n"
 
@@ -950,7 +990,7 @@
 msgstr ""
 "Erro: Não foi possível traduzir o nome do arquivo. Usuário inexistente %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Exec falhou\n"
 
@@ -958,7 +998,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Erro: Tipo de entrada inválida\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Erro: Lendo arquivo de configuração\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Erro: Arquivo de configuração inválido\n"
 
@@ -1015,7 +1059,7 @@
 msgstr "Setor atual:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Extrator: ocioso"
 
@@ -1023,7 +1067,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Codificador: Faixa 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Codificador: ocioso"
 
@@ -1105,19 +1149,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Excluindo [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "A extração foi concluída\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Sem artista"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Sem título"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1126,7 +1170,7 @@
 "por favor verifique suas configurações do dispositivo de CDRom sob "
 "Configuração->CD."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1136,7 +1180,7 @@
 "Verifique a configuração do seu extrator e certifique-se de que ela "
 "especifica o caminho completo para o executável do extrator."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1146,7 +1190,7 @@
 "Verifique a configuração do seu codificador e certifique-se de que ela "
 "especifica o caminho completo para o executável do codificador."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1154,93 +1198,93 @@
 "Nenhuma faixa selecionada.\n"
 "Extrair o CD inteiro?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Extraindo o CD inteiro\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "Extrair faixa seguinte\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "A primeira faixa verificada é %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Extraindo!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Sem acesso de escrita para escrever o arquivo wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Extraindo faixa %d para %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Extrator: Faixa %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "O arquivo %s já foi extraído. Pulando...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Sem espaço no diretório de saída"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Chamando CDPRi\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Adicionada faixa %d para a lista %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Nenhuma CPU livre\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Codificar faixa %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Sem acesso de escrita para escrever o arquivo codificado."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Codificando para %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Codificador: Faixa %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "Em CalculateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Não estamos extraindo agora, então vamos zerar os valores de codificação\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Tamanho total extraído é: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Tamanho total codificado é: %d\n"

grip-3.4.3.tar.gz/po/ru.po -> grip-3.9.0.tar.gz/po/ru.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: grip 3.3.2\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2017-01-03 20:35+0300\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -93,12 +93,12 @@
 msgid "General"
 msgstr "ïÂÝÅÅ"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "éÚ×ÌÅÞÅÎÉÅ"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "óÖÁÔÉÅ"
 
@@ -143,11 +143,16 @@
 msgid "Version %s"
 msgstr "÷ÅÒÓÉÑ %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "óÏÚÄÁÎÏ × Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -157,354 +162,354 @@
 "÷ÁÍ ÎÕÖÎÏ ÐÅÒÅËÏÎÆÉÇÕÒÉÒÏ×ÁÔØ Grip.\n"
 "÷ÁÛ ÓÔÁÒÙÊ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÚÁÐÉÓÁÎ Ó ÄÏÂÁ×ÌÅÎÉÅÍ -old."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "ÓÅÒ×ÅÒ %s, ÐÏÒÔ %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "ðÒÉ×ÏÄ CD-ROM"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "îÅ ÐÒÅËÒÁÝÁÔØ ÐÒÏÉÇÒÙ×ÁÎÉÅ ÐÒÉ ×ÙÈÏÄÅ/ÓÔÁÒÔÅ"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "ðÅÒÅÍÁÔÙ×ÁÔØ ÐÒÉ ÏÓÔÁÎÏ×ËÅ"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "óÔÁÒÔÏ×ÁÔØ Ó ÐÅÒ×ÏÇÏ ÔÒÅËÁ, ÅÓÌÉ ÎÅ ÐÒÏÉÇÒÙ×ÁÅÔÓÑ"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÐÒÏÉÇÒÙ×ÁÔØ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÄÉÓËÁ"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "ðÅÒÅÍÅÛÉ×ÁÔØ ÐÅÒÅÄ ËÁÖÄÙÍ ÐÒÏÉÇÒÙ×ÁÎÉÅÍ"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "ïÂÈÏÄÉÔØ ÎÅÐÒÁ×ÉÌØÎÙÊ ×ÙÂÒÏÓ ÄÉÓËÁ"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "ïÐÒÁÛÉ×ÁÔØ ÐÒÉ×ÏÄ ÎÁ ÎÁÌÉÞÉÅ ÎÏ×ÏÇÏ ÄÉÓËÁ"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "éÎÔÅÒ×ÁÌ ÏÐÒÏÓÁ (ÓÅË)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "ðÒÏÇÒÁÍÍÁ ÉÚ×ÌÅÞÅÎÉÑ:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "éÓÐÏÌÎÉÍÙÊ ÆÁÊÌ"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "ëÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "ïÔËÌÀÞÉÔØ \"ÐÁÒÁÎÏÀ\""
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "ïÔËÌÀÞÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÐÁÒÁÎÏÀ"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "ãÁÒÁÐÉÎÙ"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "ÎÅ ÏÐÒÅÄÅÌÑÔØ"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "ÎÅ ×ÏÓÓÔÁÎÁ×ÌÉ×ÁÔØ"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "÷ÙÞÉÓÌÉÔØ ËÏÜÆÆÉÃÉÅÎÔ ÕÓÉÌÅÎÉÑ"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "æÏÒÍÁÔ ÉÚ×ÌÅÞ£ÎÎÏÇÏ ÆÁÊÌÁ"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "æÏÒÍÁÔ ÉÚ×ÌÅÞ£ÎÎÏÇÏ ÆÁÊÌÁ"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "ïÓÎÏ×ÎÏÅ SCSI-ÕÓÔÒÏÊÓÔ×Ï"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "ðÒÏÇÒÁÍÍÁ ÉÚ×ÌÅÞÅÎÉÑ"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "úÎÁÞÅÎÉÅ 'ÏÔÌÉÞÎÏ' ÄÌÑ ÉÚ×ÌÅÞÅÎÉÑ"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "íÁËÓÉÍÕÍ ÎÅÓÖÁÔÙÈ wav'Ï×"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "á×ÔÏÓÔÁÒÔ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÄÉÓËÁ"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "óÉÇÎÁÌ ÐÏÓÌÅ ÏÓ×ÏÂÏÖÄÅÎÉÑ ÄÉÓËÁ"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "á×ÔÏ×ÙÂÒÏÓ ÐÏÓÌÅ ÏÓ×ÏÂÏÖÄÅÎÉÑ ÄÉÓËÁ"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "úÁÄÅÒÖËÁ Á×ÔÏ×ÙÂÒÏÓÁ"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "úÁÄÅÒÖËÁ ÐÅÒÅÄ ÓÔÁÒÔÏÍ"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "úÁÄÅÒÖËÁ ÓÖÁÔÉÑ ÐÏËÁ ÄÉÓË ÉÚ×ÌÅËÁÅÔÓÑ"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "ïÓÔÁÎÁ×ÌÉ×ÁÔØ ÐÒÉ×ÏÄ ÍÅÖÄÕ ÔÒÅËÁÍÉ"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "ëÏÍÁÎÄÁ wav-ÆÉÌØÔÒÁ"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "ëÏÍÁÎÄÁ ÆÉÌØÔÒÁ ÄÉÓËÏ×"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "ïÐÃÉÉ"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "ðÒÏÇÒÁÍÍÁ ÓÖÁÔÉÑ:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "éÓÐÏÌÎÉÍÙÊ ÆÁÊÌ"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "ëÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "òÁÓÛÉÒÅÎÉÅ ÓÖÁÔÏÇÏ ÆÁÊÌÁ"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "æÏÒÍÁÔ ÓÖÁÔÏÇÏ ÆÁÊÌÁ"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "æÏÒÍÁÔ ÓÖÁÔÏÇÏ ÆÁÊÌÁ"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "ðÒÏÇÒÁÍÍÁ ÓÖÁÔÉÑ"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "õÄÁÌÑÔØ .wav ÐÏÓÌÅ ËÏÄÉÒÏ×ÁÎÉÑ"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "÷ÎÏÓÉÔØ ÉÎÆÏÒÍÁÃÉÀ × SQL âä"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "óÏÚÄÁ×ÁÔØ m3u-ÆÁÊÌÙ"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÏÔÎÏÓÉÔÅÌØÎÙÅ ÐÕÔÉ × m3u-ÆÁÊÌÁÈ"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "æÏÒÍÁÔ m3u-ÆÁÊÌÁ"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "âÉÔÒÅÊÔ (ËÂÉÔ/ÓÅË)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "óËÏÌØËÏ ÐÒÏÃÅÓÓÏÒÏ× ÉÓÐÏÌØÚÏ×ÁÔØ"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "úÎÁÞÅÎÉÅ 'ÏÔÌÉÞÎÏ' ÄÌÑ ÓÖÁÔÉÑ"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "ëÏÍÁÎÄÁ ÆÉÌØÔÒÁ ÓÖÁÔÉÑ"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "÷ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÐÏÓÌÅ ËÏÄÉÒÏ×ÁÎÉÑ"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "äÏÂÁ×ÌÑÔØ ÔÜÇÉ ID3 × ÓÖÁÔÙÅ ÆÁÊÌÙ"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "äÏÂÁ×ÌÑÔØ ÔÜÇÉ ID3v2 × ÓÖÁÔÙÅ ÆÁÊÌÙ"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "ôÜÇÉ ÔÏÌØËÏ × mp3-ÆÁÊÌÁÈ"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ðÏÌÅ ËÏÍÍÅÎÔÁÒÉÑ ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "îÁÂÏÒ ÓÉÍ×ÏÌÏ× ËÏÄÉÒÏ×ÁÎÉÑ ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "îÁÂÏÒ ÓÉÍ×ÏÌÏ× ËÏÄÉÒÏ×ÁÎÉÑ ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "óÅÒ×ÅÒ âä"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "ðÕÔØ CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "ïÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "÷ÔÏÒÉÞÎÙÊ ÓÅÒ×ÅÒ"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Email ÄÌÑ ÏÔÓÙÌËÉ × DB"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "îÁÂÏÒ ÓÉÍ×ÏÌÏ× ËÏÄÉÒÏ×ÁÎÉÑ âä"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÒÁÓÛÉÒÅÎÉÑ freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "÷ÙÐÏÌÎÑÔØ ÐÏÉÓË ÄÉÓËÁ Á×ÔÏÍÁÔÉÞÅÓËÉ"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "CDDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÐÒÏËÓÉ-ÓÅÒ×ÅÒ"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "÷ÚÑÔØ ÉÚ ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ 'http_proxy'"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "óÅÒ×ÅÒ"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "ðÏÒÔ"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "ðÁÒÏÌØ"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "ðÒÏËÓÉ"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "áÄÒÅÓ Email"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "ðÒÏÇÒÁÍÍÁ ÏÂÎÏ×ÌÅÎÉÑ CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "îÅ ÐÒÉ×ÏÄÉÔØ Ë ÎÉÖÎÅÍÕ ÒÅÇÉÓÔÒÕ ÉÍÅÎÁ ÆÁÊÌÏ×"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "òÁÚÒÅÛÉÔØ ÒÕÓÓËÉÅ ÂÕË×Ù × ÉÍÅÎÁÈ"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "úÁÍÅÎÑÔØ ÎÅÓÏ×ÍÅÓÔÉÍÙÅ ÓÉÍ×ÏÌÙ ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÙÍÉ ÞÉÓÌÁÍÉ"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "îÅ ÚÁÍÅÎÑÔØ ÐÒÏÂÅÌÙ ÎÁ ÐÏÄÞÅÒËÉ×ÁÎÉÅ"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -512,20 +517,20 @@
 "îÅ ÕÄÁÌÑÔØ ÜÔÉ ÓÉÍ×ÏÌÙ\n"
 "× ÉÍÅÎÁÈ ÆÁÊÌÏ×"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÉËÏÎËÕ × ÔÒÅÅ"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "òÁÚÎÏÅ"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr ""
 "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÐÒÏÇÒÁÍÍÙ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÐÒÏÇÒÁÍÍÙ ÓÖÁÔÉÑ."
 
@@ -559,31 +564,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÐÏÉÓË ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÄÉÓË"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "ôÒÅË %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "úÁÐÒÏÓ %s (ÞÅÒÅÚ %s) ÄÌÑ ÄÉÓËÁ %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "úÁÐÒÏÓ %s ÄÌÑ ÄÉÓËÁ %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "îÅÔ ÓÏ×ÐÁÄÅÎÉÑ\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -592,168 +601,197 @@
 "óÏ×ÐÁÄÅÎÉÅ ÄÌÑ \"%s / %s\"\n"
 "úÁÇÒÕÚËÁ ÄÁÎÎÙÈ...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "÷Ó£\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÄÁÎÎÙÈ Ï ÄÉÓËÅ\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "îÅÔ ÓÏ×ÐÁÄÅÎÉÑ\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "äÌÉÎÁ"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "ôÒÅËÉ"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "ôÒÅË"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "÷Ó£\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÄÁÎÎÙÈ Ï ÄÉÓËÅ."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "ðÏÒÑÄÏË ÐÒÏÉÇÒÙ×ÁÎÉÑ"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "ãÉËÌÉÞÅÓËÏÅ ÐÒÏÉÇÒÙ×ÁÎÉÅ"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "óÔÁÔÕÓ ÉÚ×ÌÅÞÅÎÉÑ"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "éÇÒÁÔØ ÔÒÅË / ðÁÕÚÁ"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "ðÅÒÅÍÏÔÁÔØ ÎÁÚÁÄ"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "ðÅÒÅÍÏÔÁÔØ ×ÐÅÒ£Ä"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "ðÅÒÅÊÔÉ Ë ÐÒÅÄÙÄÕÝÅÍÕ ÔÒÅËÕ"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "ðÅÒÅÊÔÉ Ë ÓÌÅÄÕÀÝÅÍÕ ÔÒÅËÕ"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ÏÐÃÉÊ ÐÒÏÉÇÒÙ×ÁÎÉÑ"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "óÌÅÄÕÀÝÉÊ ÄÉÓË"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÒÏÉÇÒÙ×ÁÎÉÅ"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "÷ÙÂÒÏÓ ÄÉÓËÁ"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "óËÁÎÉÒÏ×ÁÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ ÄÉÓËÁ"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "òÅÇÕÌÑÔÏÒ ÇÒÏÍËÏÓÔÉ"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "òÅÄÁËÔÏÒ ÄÉÓËÁ"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "éÎÉÃÉÉÒÏ×ÁÔØ/ÏÂÏÒ×ÁÔØ ÚÁÐÒÏÓ Ë CDDB"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ÒÅÖÉÍÁ ÏÔÏÂÒÁÖÅÎÉÑ"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "÷ÙÈÏÄ ÉÚ Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "îÅÌØÚÑ ÐÅÒÅÍÁÔÙ×ÁÔØ ×ÐÅÒ£Ä ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "îÅÌØÚÑ ÐÅÒÅÍÁÔÙ×ÁÔØ ÎÁÚÁÄ ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "îÅÌØÚÑ ÓÍÅÎÉÔØ ÄÉÓË ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "÷ÙÂÒÏÓ ÄÉÓËÁ\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "îÅÌØÚÑ ×ÙÂÒÏÓÉÔØ ÄÉÓË ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "éÍÅÀ ÄÉÓË -- ×ÙÂÒÁÓÙ×ÁÀ\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "îÅÌØÚÑ ×ÏÓÐÒÏÉÚ×ÏÄÉÔØ ÄÉÓË ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "îÅÌØÚÑ ÓÍÅÎÉÔØ ÔÒÅË ×Ï ×ÒÅÍÑ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "ðÒÏ×ÅÒËÁ ÎÁ ÎÁÌÉÞÉÅ ÎÏ×ÏÇÏ ÄÉÓËÁ\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat ÏÂÎÁÒÕÖÉÌ ÄÉÓË, ÐÏÉÓË ÔÒÅËÏ×\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "õ ÎÁÓ ÐÒÁ×ÉÌØÎÙÊ ÄÉÓË!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "ïÔÓÕÔÓÔ×ÕÀÔ ÎÅÐÕÓÔÙÅ ÔÒÅËÉ\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat ÓËÁÚÁÌ ÞÔÏ ÄÉÓËÁ ÎÅÔ\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "ôÅËÕÝÉÊ ÓÅËÔÏÒ: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "îÅÔ ÄÉÓËÁ"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -765,49 +803,54 @@
 "\n"
 "èÏÔÉÔÅ ÏÔÏÓÌÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï Î£Í?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÄÁÎÎÙÅ Ï ÄÉÓËÅ."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "ïÔÓÙÌËÁ ÄÁÎÎÙÈ ÎÁ %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÐÒÏÇÒÁÍÍÙ ÓÖÁÔÉÑ."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "óÉÓÔÅÍÎÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI - %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "úÁÐÒÏÓ [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "ïÛÉÂËÁ Stat %d ÎÁ %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "óÏÚÄÁÎÉÅ ËÁÔÁÌÏÇÁ %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "ïÛÉÂËÁ: %s ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÜÔÏ ÆÁÊÌ\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÚÁÐÉÓÉ\n"
@@ -939,7 +982,7 @@
 msgstr "ïÔÍÅÎÉÔØ"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ID3\n"
 
@@ -949,7 +992,7 @@
 msgstr ""
 "ïÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅ×ÅÓÔÉ ÉÍÑ ÆÁÊÌÁ. ðÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Exec ÎÅ ÕÄÁÌÓÑ\n"
 
@@ -957,7 +1000,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "ïÛÉÂËÁ: ðÌÏÈÏÊ ÔÉÐ ÚÁÐÉÓÉ\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "ïÛÉÂËÁ: ðÌÏÈÏÊ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "ïÛÉÂËÁ: ðÌÏÈÏÊ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ\n"
 
@@ -1014,7 +1062,7 @@
 msgstr "ôÅËÕÝÉÊ ÓÅËÔÏÒ:     0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "éÚ×ÌÅÞÅÎÉÅ: ÓÔÏÐ"
 
@@ -1022,7 +1070,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "óÖÁÔÉÅ: ôÒÅË 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "óÖÁÔÉÅ: ÓÔÏÐ"
 
@@ -1106,19 +1154,19 @@
 msgid "Deleting [%s]\n"
 msgstr "õÄÁÌÅÎÉÅ [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "éÚ×ÌÅÞÅÎÉÅ ÏËÏÎÞÅÎÏ\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "âÅÚéÓÐÏÌÎÉÔÅÌÑ"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "âÅÚîÁÚ×ÁÎÉÑ"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1126,7 +1174,7 @@
 "÷ ÐÒÉ×ÏÄÅ ÎÅ ÂÙÌÏ ÏÂÎÁÒÕÖÅÎÏ ÄÉÓËÁ. åÓÌÉ × ÐÒÉ×ÏÄÅ ÅÓÔØ ÄÉÓË, ÔÏ, "
 "ÐÏÖÁÌÕÊÓÔÁ, ÐÒÏ×ÅÒØÔÅ ÎÁÓÔÒÏÊËÉ ×ÁÛÅÇÏ ÐÒÉ×ÏÄÁ CD-ROM × ëÏÎÆÉÇÕÒÁÃÉÑ->CD."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1136,7 +1184,7 @@
 "ðÒÏ×ÅÒØÔÅ ËÏÎÆÉÇÕÒÁÃÉÀ ×ÁÛÅÊ ÐÒÏÇÒÁÍÍÙ ÉÚ×ÌÅÞÅÎÉÑ É ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÕËÁÚÁÎ "
 "ÐÏÌÎÙÊ ÐÕÔØ ÄÏ ÉÓÐÏÌÎÉÍÏÇÏ ÆÁÊÌÁ ÐÒÏÇÒÁÍÍÙ ÉÚ×ÌÅÞÅÎÉÑ."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1146,7 +1194,7 @@
 "ðÒÏ×ÅÒØÔÅ ËÏÎÆÉÇÕÒÁÃÉÀ ×ÁÛÅÊ ÐÒÏÇÒÁÍÍÙ ÓÖÁÔÉÑ É ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÕËÁÚÁÎ ÐÏÌÎÙÊ "
 "ÐÕÔØ ÄÏ ÉÓÐÏÌÎÉÍÏÇÏ ÆÁÊÌÁ ÐÒÏÇÒÁÍÍÙ ÓÖÁÔÉÑ."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1154,93 +1202,93 @@
 "îÅÔ ×ÙÂÒÁÎÎÙÈ ÔÒÅËÏ×.\n"
 "éÚ×ÌÅÞØ ×ÓÅ?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "éÚ×ÌÅÞÅÎÉÅ ×ÓÅÈ ÔÒÅËÏ×\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "éÚ×ÌÅÞØ ÓÌÅÄÕÀÝÉÊ ÔÒÅË\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "ðÅÒ×ÙÊ ÏÔÍÅÞÅÎÎÙÊ ÔÒÅË %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "éÚ×ÌÅËÁÀ!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "îÅÔ ÄÏÓÔÕÐÁ ÎÁ ÚÁÐÉÓØ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ wav-ÆÁÊÌÁ"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "éÚ×ÌÅÞÅÎÉÅ ÔÒÅËÁ %d × %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "óÖÁÔÉÅ: ÔÒÅË %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "æÁÊÌ %s ÕÖÅ ÂÙÌ ÐÏÌÕÞÅÎ. ðÒÏÐÕÓËÁÀ...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "îÅÔ ÍÅÓÔÁ × ËÁÔÁÌÏÇÅ ÄÌÑ ÚÁÐÉÓÉ"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "÷ÙÚÏ× CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "äÏÂÁ×ÌÅÎ ÔÒÅË %d × ÓÐÉÓÏË %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "îÅÔ Ó×ÏÂÏÄÎÙÈ ÐÒÏÃÅÓÓÏÒÏ×\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "óÖÁÔØ ÔÒÅË %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "îÅÔ ÄÏÓÔÕÐÁ ÎÁ ÚÁÐÉÓØ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÖÁÔÏÇÏ ÆÁÊÌÁ."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: ÓÖÁÔÉÅ × %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "óÖÁÔÉÅ: ÔÒÅË %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "÷ÙÞÉÓÌÉÔØ ×Ó£\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "íÙ ÎÅ ÉÚ×ÌÅËÁÅÍ ÓÅÊÞÁÓ, ÚÎÁÞÉÔ, ÐÏÚ×ÏÌÉÔÅÌØÎÙ ÎÕÌÅ×ÙÅ ÚÎÁÞÅÎÉÑ ËÏÄÉÒÏ×ÁÎÉÑ\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "ïÂÝÉÊ ÏÂß£Í ÉÚ×ÌÅÞ£ÎÎÏÇÏ: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "ïÂÝÉÊ ÏÂß£Í ÓÖÁÔÏÇÏ: %d\n"

grip-3.4.3.tar.gz/po/sr.po -> grip-3.9.0.tar.gz/po/sr.po Changed

@@ -4,10 +4,10 @@
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.2\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-06-18 08:41+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-11-05 08:47+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -93,12 +93,12 @@
 msgid "General"
 msgstr "Опште"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Извлачење"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Кодирање"
 
@@ -143,11 +143,15 @@
 msgid "Version %s"
 msgstr "Издање %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Грешка: Покушај приказа матичне странице није успео."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Направљено Грипом"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -157,304 +161,304 @@
 "Треба поново да подесите Грип.\n"
 "Ваша стара датотека подешавања је сачувана са придодатом опцијом „-old“."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сервер је „%s“, порт %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Грешка: Не могу да сачувам датотеку подешавања."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Подешавања"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "ЦД-РОМ уређај"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не прекидај пуштање при изласку/покретању"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Премотај на заустављање"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Покрени се са првом нумером ако не пушташ"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Сам пусти након убацивања диска"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Измешај пре сваког пуштања"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Прескочи погрешно избацивање"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Очисти уређај диска за нови диск"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Интервал чишћења (у секундама)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "ЦД"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Извлачивач:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Извршна извлачења"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Линија наредбе извлачења"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Искључи параноју"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Искључи додатну параноју"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Искључи „scratch“"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "откривање"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "оправка"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Израчунај дотеривање појачања"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Формат излазне датотеке"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат излазне датотеке (Више извођача)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Општи СЦСИ уређај"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Извлачивач"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "„nice“ вредност извлачења"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Највише некодираних „.wav“-са"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Сам извуци приликом убацивања"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Запишти након извалачења"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Сам избаци након извлачења"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Застој ауто-избацивања"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Застој пре извлачења"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Одложи кодирање док извлачиш са диска"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Заустави цд уређај између нумера"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Наредба вав филтера"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Наредба диск филтера"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Опције"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Енкодер:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Извршна енкодера"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Линија наредбе енкодера"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Проширење датотеке енкодера"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Запис датотеке енкодера"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr "Формат датотеке енкодера (Више извођача)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Енкодер"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Обриши „.wav“ након кодирања"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Уметни информације у СКуЛ базу података"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Направи „.m3u“ датотеке"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Користи релативне путање у .m3u“ датотекама"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Формат датотеке „M3U“"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Проток битова кодирања (у килобитовима по секунди)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Број процесора за коришћење"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "„nice“ вредност енкодера"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Наредба филтера енкодера"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Изврши наредбу након кодирања"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Додај ИД3 ознаке кодираним датотекама"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Додај ИД3в2 ознаке кодираним датотекама"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Само датотеке ознаке са завршетком на „.mp3“"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Поље ИД3 коментара"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Кодирање скупа ИД3в1 знакова"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Кодирање скупа ИД3в2 знакова"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ИД3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Сервер БП"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "ЦГИ путања"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Главни сервер"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Помоћни сервер"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Е-пошта слања БП"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Кодирање скупа знакова БП"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Користи проширења слободне БП"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Сам обави претрагу диска"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "БП диска"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Користи посреднички сервер"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Добави сервер из променљиве окружења „http_proxy“"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Посреднички сервер"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Порт посредника"
 
@@ -465,23 +469,23 @@
 # For consistent translation, here is the English text:
 #  msgstr "you must give the user name explicitly to this command"
 # Please translate the English msgstr, not the msgid.
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Корисничко име посредника"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Лозинка посредника"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Посредник"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Адреса е-поште"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Програм ажурирања ЦД-а"
 
@@ -495,7 +499,7 @@
 # For consistent translation, here is the English text:
 #  msgstr "file \"$filename\" may not be a test"
 # Please translate the English msgstr, not the msgid.
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Не пиши називе датотека малим словима"
 
@@ -510,23 +514,23 @@
 # For consistent translation, here is the English text:
 #  msgstr "attributes text left in the \"$filename\" file"
 # Please translate the English msgstr, not the msgid.
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Допусти високе битове у називима датотека"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Замени несагласне знакове хексадецималним бројевима"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Не мењај размаке у подвлаке"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Записуј „m3u“ користећи не-посикс комплијант „'\\'s“"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -534,19 +538,19 @@
 "Знакови који морају остати\n"
 "у називима датотека"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Прикажи иконицу фиоке"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Разно"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Грешка: Не могу да сачувам подешавања извлачивача."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Грешка: Не могу да сачувам подешавања енкодера."
 
@@ -580,31 +584,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Не могу да претражујем док извлачим."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Непознат диск"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "%02d. нумера"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Пропитујем „%s“ (кроз „%s“) за диск %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Пропитујем „%s“ за диск %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Нема поклапања\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -613,170 +621,198 @@
 "Поклапање за „%s / %s“\n"
 "Преузимам податке...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Готово\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Грешка чувања података диска\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Нема поклапања\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Трајање"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Нумере"
 
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Изаберите претходни унос БПЦД-а."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "Изаберите следећи унос БПЦД-а."
+
 #
 # File: libhylafax/FaxClient.c++, line: 1746
-#: src/cdplay.c:323
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Нумера"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "Одради следећи унос БП диска.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "Нема података о диску. Враћам се.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Већ сам на последњем индексу. Враћам се.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Готово.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "Одради претходни унос БП диска.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Већ сам на првом индексу. Враћам се.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Грешка чувања података диска."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Окрените режим пуштања"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Окините понављање пуштања"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Стање извлачења"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Пустите нумеру / Паузирајте пуштање"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Премотајте уназад"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Брзо премотајте унапред"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Идите на претходну нумеру"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Идите на следећу нумеру"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Окините опције режима пуштања"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Следећи диск"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Зауставите пуштање"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Избаците диск"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Прегледајте садржај диска"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Окините управљање гласноћом"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Окините уређивача диска"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Покрените/прекините претрагу БП диска"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Окините приказ нумере"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Изађите из програма"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Не могу брзо да премотам унапред док извлачим."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Не могу да премотам уназад док извлачим."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Не могу да променим диск док извлачим."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Избаците диск\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Не могу да избацим док извлачим."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Има диска — избацујем\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Не могу да пуштам док извлачим."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Не могу да променим нумере док извлачим."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Проверавам има ли новог диска\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "„CDStat“ је нашао диск, проверавам нумер\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Имамо исправан диск!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Нема нумера не-нулте дужине\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "„CDStat“ рече да нема диска\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Текући сектор: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Нема диска"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -788,49 +824,53 @@
 "\n"
 "Да ли желите да предате ове податке о диску?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Грешка: Не могу да направим привремену датотеку."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Грешка: Не могу да запишем податке диска."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Шаљем поштом унос на „%s“\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Грешка: Не могу да извршим наредбу поште."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Порука система"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "Путања је „%s“\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Упит је [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Грешка добављања података „%d“ на „%s“\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Правим директоријум „%s“\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Грешка: „%s“ постоји, али је датотека\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Грешка: Не могу да отворим „%s“ за писање\n"
@@ -962,7 +1002,7 @@
 msgstr "Откажи"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "Непознато поље ИД3\n"
 
@@ -972,7 +1012,7 @@
 msgstr ""
 "Грешка: не могу да преведем назив датотеке. Нема таквог корисника као „%s“\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Извршни није успео\n"
 
@@ -980,7 +1020,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Грешка: Лоша врста уноса\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Грешка: Читајући датотеку подешавања\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Грешка: Неисправна датотека подешавања\n"
 
@@ -1037,7 +1081,7 @@
 msgstr "Текући сектор:       0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Извлачење: Мирујем"
 
@@ -1045,7 +1089,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Енк: Нум 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Кодирање: Мирујем"
 
@@ -1127,19 +1171,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Бришем [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Извлачење је завршено\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "Нема извођача"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "Нема наслова"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1147,7 +1191,7 @@
 "Нисам нашао диск у уређају. Ако сте ставили диск у уређај, проверите ваша "
 "подешавања ЦД уређаја у изборнику „Подешавања→ЦД“."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1157,7 +1201,7 @@
 "Проверите ваша подешавања извлачења, и уверите се да је наведена пуна путања "
 "до његове извршне датотеке."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1167,7 +1211,7 @@
 "Проверите ваша подешавања енкодера, и уверите се да је наведена пуна путања "
 "до његове извршне датотеке."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1175,92 +1219,92 @@
 "Нисте изабрали нумере.\n"
 "Да извучем читав ЦД?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Извлачим читав ЦД\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "У „RipNextTrack“\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Прва проверена нумера је %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Извлачим!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Немате права писања за вав датотеку"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Извлачим %d. нумеру у „%s“\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Извлачење: %d. нумера (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Датотека „%s“ је већ извучена. Прескачем...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Нема места у директоријуму излаза"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Позивам „CDPRip“\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Додата је %d. нумера на списак „%s“\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Нема слободних процесора\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кодирам %d. нумеру\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Немам права писања за кодирану датотеку."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Кодирам у „%s“\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Енк: Нум %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "У „CalculateAll“\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Сада не извлачимо, зато имамо нулте вредности кодирања\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Укупна величина извлачења: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Укупна величина кодирања: %d\n"

grip-3.4.3.tar.gz/po/uk.po -> grip-3.9.0.tar.gz/po/uk.po Changed

@@ -5,10 +5,10 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip-3.4.2\n"
+"Project-Id-Version: grip-3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-06-17 15:10+0300\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-12-31 13:00+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -18,7 +18,7 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: src/main.c:56
 msgid "Specify the geometry of the main window"
@@ -95,12 +95,12 @@
 msgid "General"
 msgstr "Загальне"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Видобування"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Кодування"
 
@@ -145,11 +145,15 @@
 msgid "Version %s"
 msgstr "Версія %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Помилка: не вдалося показати домашню сторінку."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Створено Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -159,348 +163,348 @@
 "Вам доведеться повторно налаштувати Grip.\n"
 "Ваш старий файл налаштувань збережено із додаванням до назви «-old»."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сервер %s, порт %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Помилка: не вдалося зберегти файл налаштувань."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Налаштування"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Пристрій CDROM"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не переривати відтворення при виході/запуску"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Переходити до початку, якщо зупинено"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Запускати з першою композицією, якщо не відтворюється"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Автоматично відтворювати після вставляння диска"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Перемішувати композиції перед кожним відтворенням"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Обходити помилкове виштовхування диска"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Опитувати пристрій читання щодо нових дисків"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Інтервал опитування (у секундах)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "КД"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Засіб видобування:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Програма видобування"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Рядок команди видобування"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Вимкнути paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Вимкнути додаткову paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Вимкнути подряпини"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "виявлення"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "відновлення"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Обчислювати підсилення"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Формат файлів для видобування"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат файлів для видобування (декілька виконавців)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Загальний пристрій SCSI"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Видирач"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Пріоритетність процесу видобування"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Макс. незакодованих .wav"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Автоматично видобувати після вставлення"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Гудок після видирання"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Автоматично виштовхувати після видобування"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Затримка автовиштовхування"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Затримка перед видобуванням"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Затримати кодування до завершення видобування"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Зупиняти диск CDROM між доріжками"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Команда фільтрування wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Команда фільтрування дисків"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Параметри"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Кодувальник:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Засіб кодування"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Командний рядок засобу кодування"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Суфікс назв закодованих файлів"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Формат кодування файлів"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr "Формат кодування файлів (декілька виконавців)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Кодувальник"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Вилучати .wav після кодування"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Додавати дані до бази даних SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Створювати файли .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Використовувати відносні шляхи у файлах .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Формат файлів M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Бітова швидкість (кбіт/с)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Кількість процесорів для використання"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Пріоритетність процесу кодування"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Команда фільтрування кодування"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Виконати команду після кодування"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Додати мітки ID3 до закодованих файлів"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Додати мітки ID3v2 до закодованих файлів"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Додавати мітки тільки до .mp3"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Поле коментаря ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Кодування символів ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Кодування символів ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Сервер БД"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Шлях CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Основний сервер"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Допоміжний сервер"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Адреса для надсилання до БД"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Кодування символів БД"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Використовувати розширення freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Виконувати автоматичний пошук дисків"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Використовувати проксі-сервер"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Визначити сервер за змінною http_proxy"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Проксі-сервер"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Порт проксі-сервера"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Користувач проксі"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Пароль до проксі"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Адреса ел. пошти"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Програма оновлення КД"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Не переводити назви файлів у нижній регістр"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Дозволити нелатинські літери у назвах файлів"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Замінювати несумісні символи на шістнадцяткові числа"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Не замінювати пробіли підкреслюваннями"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Записувати файли m3u із використанням несумісних з POSIX «\\»"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -508,19 +512,19 @@
 "Символи, які не слід обрізати\n"
 "з назв файлів"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Показувати піктограму у лотку"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Інше"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Помилка: не вдалося зберегти налаштування засобу видобування."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Помилка: не вдалося зберегти налаштування засобу кодування."
 
@@ -556,31 +560,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Не можна виконувати пошук під час видобування."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Невідомий диск"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Доріжка %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Опитуємо %s (за допомогою %s) щодо диска %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Опитуємо %s щодо диска %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Немає відповідників\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -589,168 +597,196 @@
 "Відповідник до «%s / %s»\n"
 "Отримуємо дані…\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Виконано\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Помилка під час спроби зберегти дані диска\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Немає відповідників\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Тривалість"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Доріжки"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "Вибрати попередній запис CDDB."
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "Вибрати наступний запис CDDB."
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Доріжка"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "Немає даних на диску. Повертаємося.\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr "Вже на останній позиції у покажчику. Повертаємося.\n"
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "Виконано.\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoPrevDiscDBEntry.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr "Вже на першій позиції у покажчику. Повертаємося.\n"
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Помилка під час збереження даних диска."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Режим ротації відтворення"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Увімкнути/Вимкнути циклічне відтворення"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Стан видобування"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Відтворити доріжку / Призупинити відтворення"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Перемотати до початку"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "ШвидкВперед"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Перехід до попередньої композиції"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Перейти до наступної доріжки"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Увімкнути/Вимкнути параметри режиму відтворення"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Наступний диск"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Зупинити відтворення"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Виштовхнути диск"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Сканувати вміст диска"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Увімкнути/Вимкнути керування гучністю"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Увімкнути/Вимкнути редактор диска"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Почати/Перервати пошук у БД дисків"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Увімкнути/Вимкнути показ доріжки"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Вийти з Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Не можна перемотувати до кінця, доки триває видобування."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Не можна перемотувати, доки триває видобування."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Не можна перемикати диски, доки триває видобування."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Виштовхнути диск\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Не можна виштовхувати диск, доки триває видобування."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Маємо диск — виштовхуємо\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Не можна відтворювати дані, доки триває видобування."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Не можна перемикати доріжки, доки триває видобування."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Перевіряємо, чи є новий диск\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat виявлено диск, шукаємо доріжки\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Маємо коректний диск!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Доріжки ненульової тривалості\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat повідомила, що диска немає\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Поточний сектор: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Немає диска"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -762,49 +798,53 @@
 "\n"
 "Хочете надіслати дані щодо цього диска?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Помилка: не вдалося створити тимчасовий файл."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Помилка: не вдалося записати дані диска."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Надсилаємо запис електронною поштою до %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Помилка: не вдалося виконати команду mail."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Повідомлення системи"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "Адреса — %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Запит — [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Помилка побудови статистики %d на %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Створюємо каталог %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Помилка: %s існує, але не є файлом\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Помилка: не вдалося відкрити %s для запису\n"
@@ -936,7 +976,7 @@
 msgstr "Скасувати"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "невідоме поле ID3\n"
 
@@ -945,7 +985,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Помилка: не вдалося перекласти назву файла. Немає користувача %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Помилка запуску\n"
 
@@ -953,7 +993,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Помилка: помилковий тип запису\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Помилка: читаємо файл налаштувань\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Помилка: некоректний файл налаштувань\n"
 
@@ -1010,7 +1054,7 @@
 msgstr "Поточний сектор:"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Вид.: бездіяльний"
 
@@ -1018,7 +1062,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Код.: Дор. 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Код.: бездіяльний"
 
@@ -1100,19 +1144,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Вилучаємо [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Видобування завершено\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "НемаєВиконавця"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "НемаєНазви"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1121,7 +1165,7 @@
 "будь ласка, перевірте, чи правильно встановлено пристрій для читання компакт "
 "дисків за допомогою меню «Налаштування -> КД»."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1131,7 +1175,7 @@
 "Перевірте налаштування вашого засобу видобування і переконайтеся, що шлях до "
 "виконуваного файла засобу видобування вказано повністю."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1141,7 +1185,7 @@
 "Перевірте налаштування вашого засобу кодування і переконайтеся, що шлях до "
 "виконуваного файла засобу кодування вказано повністю."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1149,92 +1193,92 @@
 "Не позначено доріжок.\n"
 "Видобути увесь компакт-диск?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Видобуваємо увесь компакт-диск\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "У RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Першою позначеною доріжкою є %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Видобуваємо!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Немає доступу на запис до файла wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Видобуваємо доріжку %d до %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Вид.: дор. %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Файл %s вже видобуто. Пропускаємо…\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Немає вільного місця у каталозі для запису результатів"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Викликаємо CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Додано доріжку %d до списку %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Немає вільних процесорів\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кодуємо доріжку %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Немає доступ до запису закодованого файла."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: кодуємо до %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Код.: дор. %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "У CalculateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Зараз ми видобуваємо дані, отже занулюємо значення кодування\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Загалом видобуто: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Загалом закодовано: %d\n"

grip-3.4.3.tar.gz/po/vi.po -> grip-3.9.0.tar.gz/po/vi.po Changed

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.2\n"
+"Project-Id-Version: grip 3.5.2\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2017-06-19 08:23+0700\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2017-08-06 06:33+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -92,12 +92,12 @@
 msgid "General"
 msgstr "Chung"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "Trích nhạc"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
 msgstr "Mã hóa"
 
@@ -142,11 +142,15 @@
 msgid "Version %s"
 msgstr "Phiên bản %s"
 
-#: src/grip.c:913
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "Lỗi: Gặp lỗi khi cố hiển thị trang thông tin điện tử."
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr "Đã được tạo bởi Grip"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -156,348 +160,348 @@
 "Bạn sẽ cần cấu hình lại Grip.\n"
 "Tập tin cấu hình cũ của bạn đã được ghi lại với -old treo thêm."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "máy phục vụ là %s, cổng %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
 msgstr "Lỗi: Không thể lưu lại tập tin cấu hình."
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "Cấu hình"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "Thiết bị CDRom"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Đừng ngắt phát lại khi thoát/khởi động"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "Tua lại khi dừng"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "Bắt đầu với rãnh đầu tiên nếu không phát"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "Tự phát khi đĩa được đưa vào"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "Xáo trộn lại trước mỗi lần phát"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "Công việc xung quanh khiếm khuyết đẩy đĩa ra"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr "Thăm dò ổ đĩa để tìm đía mới"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr "Khoảng nhịp thăm dò (giây)"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "Bộ trích nhạc:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "Lệnh thực thi rút trích"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "Dòng lệnh trích nhạc"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "Tắt đoán nhận"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "Tắt đoán nhận mở rộng"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "Tắt xước"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "phát hiện"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "sửa chữa"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "Tính toán sự chỉnh sửa độ khuyếch đại"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "Định dạng tập tin trích nhạc"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
 msgstr "Định dạng tập tin trích nhạc (Nhiều-nghệ-sỹ)"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "Thiết bị SCSI đa dụng"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "Bộ trích nhạc"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "Giá trị “nice” trích nhạc"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "Chưa-mã-hóa tối đa của wav"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "Tự trích nhạc khi đưa đĩa vào"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "Kêu bíp sau khi trích nhạc"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "Tự động đẩy đĩa ra sau khi trích nhạc"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "Độ trễ tự động đẩy đĩa ra"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr "Độ trễ trước khi trích nhạc"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr "Độ trễ mã hóa cho đến khi đĩa được trích xong"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr "Dừng đĩa cdrom giữa các rãnh"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "Lệnh lọc wav"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "Lệnh lọc đĩa"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "Các tùy chọn"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "Bộ mã hóa:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
 msgstr "Phần mềm thực thi mã hóa"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
 msgstr "Dòng lệnh mã hóa"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
 msgstr "Đuôi tập tin bộ mã hóa"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 msgid "Encoder file format"
 msgstr "Định dạng tập tin bộ mã hóa"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
 msgstr "Định dạng tập tin bộ mã hóa (Nhiều-nghệ-sỹ)"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "Bộ mã hóa:"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "Xóa .wav sau khi mã hóa"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "Chèn thông tin vào cơ sở dữ liệu SQL"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "Tạo các tập tin .m3u"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "Dùng đường dẫn tương đối trong tập tin .m3u"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "Định dạng tập tin M3U"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Tốc độ bít mã hóa (kbits/giây)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "Số bộ xử lý cần dùng"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
 msgstr "Giá trị “nice” cho bộ mã hóa"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
 msgstr "Lệnh lọc bộ mã hóa"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
 msgstr "Lệnh thực hiện sau khi mã hóa"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
 msgstr "Thêm thẻ ID3 vào tập tin đã mã hóa"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Thêm thẻ ID3v2 vào tập tin đã mã hóa"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr "Chỉ đánh thẻ các các tập tin kết thúc bằng “.mp3”"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "Trường chú thích ID3"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr "Bảng mã bộ ký tự ID3v1"
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
 msgstr "Bảng mã bộ ký tự ID3v2"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "Máy phục vụ DB"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "Đường dẫn CGI"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "Máy phục vụ chính"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "Máy phục vụ phụ"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "Thư điện tử đệ trình DB"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
 msgstr "Bảng mã bộ ký tự DB"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "Dùng phần mở rộng freedb"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "Thực hiện tìm kiếm đĩa một cách tự động"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "Dùng máy phục vụ ủy nhiệm"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Lấy máy phục vụ từ biến môi trường “http_proxy”"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "Máy chủ ủy nhiệm"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "Cổng ủy nhiệm"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "Tên người dùng ủy nhiệm"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "Mật khẩu máy chủ ủy nhiệm"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "Ủy nhiệm"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "Địa chỉ thư điện tử"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "Chương trình cập nhật CD"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "Đừng chuyển đổi tên tập tin sang chữ thường"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "Cho phép các bít cao trong tên tập tin"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Thay thế các ký tự không tương thích bằng các số thập lục phân."
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "Đừng đổi khoảng trắng thành gạch dưới"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Ghi các tập tin m3u sử dụng “\\”s tương thích không-posix"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -505,19 +509,19 @@
 "Các ký tự sẽ không cắt bỏ\n"
 "trong các tên tập tin"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr "Hiện biểu tượng khay hệ thống"
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Linh tinh"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
 msgstr "Lỗi: Không thể lưu cấu hình bộ trích nhạc."
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
 msgstr "Lỗi: Không thể lưu cấu hình bộ mã hóa."
 
@@ -551,31 +555,35 @@
 msgid "CDIOCEJECT"
 msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
 msgstr "Không thể thực hiện việc tìm kiếm khi đang trích xuất nhạc."
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "Không biết Đĩa"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Rãnh %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "Truy vấn %s (thông qua %s) cho đĩa %02x.\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "Đang truy vấn %s cho đĩa %02x.\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "Không khớp\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -584,168 +592,197 @@
 "Khớp cho “%s / %s”\n"
 "Đang tải dữ liệu về…\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "Xong\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Gặp lỗi khi lưu dữ liệu đĩa\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "Không khớp\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
 msgstr "Độ dài"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "Rãnh"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "Rãnh"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "Xong\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
 msgstr "Gặp lỗi khi lưu dữ liệu đĩa."
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "Chế độ phát quay"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "Bật/tắt phát lặp"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "Tình trạng trích nhạc"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "Phát rãnh hay dừng phát"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Tua lại"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "Chuyển-tiếp-nhanh"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "Chuyển đến rãnh kế trước"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "Chuyển đến rãnh kế tiếp"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "Bật/tắt các tùy chọn chế độ phát"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "Đĩa kế"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "Dừng phát"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "Đẩy đĩa ra"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
 msgstr "Quét nội dung đĩa"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "Bật/tắt điều khiển âm lượng"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "Bật/tắt bộ soạn thảo đĩa"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Bắt đầu hay bãi bỏ tìm kiếm DiscDB"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "Bật/tắt hiển thị rãnh"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Thoát khỏi Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
 msgstr "Không thể tua nhanh trong khi đang trích nhạc."
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
 msgstr "Không thể tua trong khi đang trích nhạc."
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
 msgstr "Không thể chuyển đĩa trong khi đang trích nhạc."
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "Đẩy đĩa ra\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
 msgstr "Không thể đẩy đĩa ra trong khi đang trích nhạc."
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "Có đĩa -- đang đẩy ra\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
 msgstr "Không thể phát khi đang trích nhạc."
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
 msgstr "Không thể chuyển rãnh trong khi đang trích nhạc."
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "Đang kiểm tra cho đĩa mới\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat tìm thấy một đĩa, đang kiểm tra các rãnh\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "Chúng ta có một đĩa không hợp lệ!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "Không có rãnh nào có chiều dài khác không\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat nói rằng không có đĩa\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Cung hiện tại: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "Không có đĩa"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -757,49 +794,53 @@
 "\n"
 "Bạn có muốn gửi thông tin đĩa này không?"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
 msgstr "Lỗi: Không thể tạo tập tin tạm thời."
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
 msgstr "Lỗi: Không thể ghi dữ liệu đĩa."
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Đang gửi mục tin đến %s\n"
 
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "Lỗi: Không thể thực hiện lệnh gửi thư."
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "Lời nhắn từ hệ thống"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI là %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "Truy vấn là [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "Lỗi lấy thống kê %d trên %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "Đang tạo thư mục %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "Lỗi: %s đã có sắn, nhưng là một tập tin\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Lỗi: Không thể mở %s để ghi\n"
@@ -931,7 +972,7 @@
 msgstr "Thôi"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "trường ID3 chưa biết\n"
 
@@ -940,7 +981,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Lỗi: không thể biên dịch tên tập tin. Không có người nào là %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "Exec gặp lỗi\n"
 
@@ -948,7 +989,11 @@
 msgid "Error: Bad entry type\n"
 msgstr "Lỗi: Sai kiểu mục tin\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "Lỗi: Gặp lỗi khi đọc tập tin cấu hình\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "Lỗi: tập tin cấu hình không hợp lệ\n"
 
@@ -1005,7 +1050,7 @@
 msgstr "Cung từ hiện tại:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "Trích nhạc: Nghỉ"
 
@@ -1013,7 +1058,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Mhóa: Rãnh 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
 msgstr "Mhóa: Nghỉ"
 
@@ -1095,19 +1140,19 @@
 msgid "Deleting [%s]\n"
 msgstr "Đang xóa [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "Việc trích nhạc đã hoàn tất\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "KhôngNghệSỹ"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "KhôngTiêuĐề"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1115,7 +1160,7 @@
 "Không tìm thấy đĩa trong ổ đĩa. Nếu bạn có một đĩa trong ổ đĩa, vui lòng "
 "kiểm tra các cài đặt thiết bị CDRom dưới Cấu hình->CD."
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1125,7 +1170,7 @@
 "Hãy kiểm tra lại cấu hình rip, và đảm bảo rằng nó được đưa ra với đường dẫn "
 "phần mềm thực thi rip dạng đầy đủ."
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1135,7 +1180,7 @@
 "Hãy kiểm tra lại cấu hình mã hóa, và đảm bảo rằng nó được đưa ra với đường "
 "dẫn phần mềm thực thi mã hóa dạng đầy đủ."
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1143,94 +1188,94 @@
 "Chưa chọn rãnh nào.\n"
 "Trích nhạc từ toàn bộ CD?\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "Đang trích toàn bộ CD\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "Trong RipNextTrack\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Rãnh đã được kiểm tra đầu tiên là %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr "Cứ trích đi!\n"
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "Không có quyền ghi để ghi tập tin wav"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "Trích nhạc rãnh %d thành %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Trích: Rãnh %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "Tập tin %s đã được trích rồi. Nên bỏ qua…\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "Hết chỗ trống trong thư mục xuất"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "Đang gọi CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Đã thêm %d rãnh vào trong danh sách %s\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "Không còn cpu rảnh rỗi\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Mã hóa rãnh %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
 msgstr "Không có quyền ghi để ghi tập tin đã được mã hóa."
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: Đang mã hóa thành %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "MHóa: Rãnh %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr "Trong CalculateAll\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Chúng tôi hiện đang không trích nhạc, vậy thì hãy làm cho các giá trị mã hóa "
 "thành số không\n"
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Kích cỡ trích nhạc tổng thể là: %d\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Kích cỡ mã hóa tổng thể là: %d\n"

grip-3.4.3.tar.gz/po/zh_CN.po -> grip-3.9.0.tar.gz/po/zh_CN.po Changed

@@ -1,63 +1,67 @@
 # Chinese (simplified) translation for Grip.
+# This file is distributed under the same license as the grip package.
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Merlin Ma <merlin@turbolinux.com.cn>, 2002.
+# Boyuan Yang <073plan@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.0.0\n"
+"Project-Id-Version: grip 3.6.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
-"PO-Revision-Date: 2002-04-25 19:20+0800\n"
-"Last-Translator: Merlin Ma <merlin@turbolinux.com.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
+"PO-Revision-Date: 2018-05-26 17:11+0800\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 2.0.7\n"
 
 #: src/main.c:56
 msgid "Specify the geometry of the main window"
-msgstr "Ö¸¶¨Ö÷´°¿ÚµÄÎ»ÖÃ¼¸ºÎÊôÐÔ"
+msgstr "æå®ä¸»çªå£çä½ç½®å ä½å±æ§"
 
 #: src/main.c:57
 msgid "GEOMETRY"
-msgstr "¼¸ºÎÊôÐÔ"
+msgstr "å ä½å±æ§"
 
 #: src/main.c:65
 msgid "Specify the config file to use (in your home dir)"
-msgstr "ÇëÖ¸¶¨ÒªÊ¹ÓÃµÄÅäÖÆÎÄ¼þ(ÔÚÄúµÄÖ÷Ä¿Â¼ÖÐ)"
+msgstr "è¯·æå®è¦ä½¿ç¨çéå¶æä»¶(å¨æ¨çä¸»ç®å½ä¸)"
 
 #: src/main.c:66
 msgid "CONFIG"
-msgstr ""
+msgstr "éç½®"
 
 #: src/main.c:74
 msgid "Specify the cdrom device to use"
-msgstr "Ö¸¶¨ CDROM Éè±¸"
+msgstr "æå® CDROM è®¾å¤"
 
 #: src/main.c:75 src/main.c:84
 msgid "DEVICE"
-msgstr "Éè±¸"
+msgstr "è®¾å¤"
 
 #: src/main.c:83
 msgid "Specify the generic scsi device to use"
-msgstr "Ö¸¶¨ÒªÊ¹ÓÃµÄ³£¹æ SCSI Éè±¸"
+msgstr "æå®è¦ä½¿ç¨çå¸¸è§ SCSI è®¾å¤"
 
 #: src/main.c:92
 msgid "Launch in \"small\" (cd-only) mode"
-msgstr "ÔËÐÐÓÚÐ¡Ä£Ê½ (CD-only)"
+msgstr "è¿è¡äºå°æ¨¡å¼ (CD-only)"
 
 #: src/main.c:101
 msgid "\"Local\" mode -- do not look up disc info on the net"
-msgstr "ÔËÐÐÓÚ±¾µØÄ£Ê½©¤©¤²»²éÑ¯ÍøÂç"
+msgstr "è¿è¡äºæ¬å°æ¨¡å¼ââä¸æ¥è¯¢ç½ç»"
 
 #: src/main.c:110
 msgid "Do not do I/O redirection"
-msgstr "²»×ö I/O ÖØ¶¨Ïò"
+msgstr "ä¸å I/O éå®å"
 
 #: src/main.c:119
 msgid "Run in verbose (debug) mode"
-msgstr "ÔËÐÐÓÚ³ý´íÄ£Ê½"
+msgstr "è¿è¡äºé¤éæ¨¡å¼"
 
 #: src/grip.c:185
 msgid "Grip"
@@ -66,771 +70,785 @@
 #: src/grip.c:242
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
-msgstr "´íÎó: ÎÞ·¨³õÊ¼»¯ [%s]\n"
+msgstr "éè¯¯: æ æ³åå§å [%s]\n"
 
 #: src/grip.c:334
 msgid "Grip started successfully\n"
-msgstr ""
+msgstr "Grip æåå¯å¨\n"
 
 #: src/grip.c:348
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
 msgstr ""
-"ÕýÔÚ¹¤×÷ÖÐ¡£\n"
-"ÕæµÄÒª¹Ø±ÕÂð£¿"
+"æ£å¨å·¥ä½ä¸ã\n"
+"ççè¦å³éåï¼"
 
 #: src/grip.c:399
-#, fuzzy
 msgid "Status"
-msgstr "×¥¹ì×´Ì¬"
+msgstr "ç¶æ"
 
 #: src/grip.c:414
 msgid "General"
-msgstr ""
+msgstr "éç¨"
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
-msgstr "×¥¹ì"
+msgstr "æè½¨"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 msgid "Encode"
-msgstr "±àÂë"
+msgstr "ç¼ç "
 
 #: src/grip.c:489
 msgid "Help"
-msgstr "°ïÖú"
+msgstr "å¸®å©"
 
 #: src/grip.c:494
 msgid "Table Of Contents"
-msgstr "Ä¿Â¼"
+msgstr "ç®å½"
 
 #: src/grip.c:500
 msgid "Playing CDs"
-msgstr "²¥·Å CD"
+msgstr "ææ¾ CD"
 
 #: src/grip.c:506
 msgid "Ripping CDs"
-msgstr "CD ×¥¹ì"
+msgstr "CD æè½¨"
 
 #: src/grip.c:512
 msgid "Configuring Grip"
-msgstr "ÅäÖÃ Grip"
+msgstr "éç½® Grip"
 
 #: src/grip.c:518
 msgid "FAQ"
-msgstr "³£¼ûÎÊÌâ½â´ð"
+msgstr "å¸¸è§é®é¢è§£ç"
 
 #: src/grip.c:524
 msgid "Getting More Help"
-msgstr "»ñµÃ¸ü¶à°ïÖú"
+msgstr "è·å¾æ´å¤å¸®å©"
 
 #: src/grip.c:530
 msgid "Reporting Bugs"
-msgstr "±¨¸æ´íÎó"
+msgstr "æ¥åéè¯¯"
 
 #: src/grip.c:550
 msgid "About"
-msgstr "¹ØÓÚ"
+msgstr "å³äº"
 
 #: src/grip.c:569
 #, c-format
 msgid "Version %s"
-msgstr ""
+msgstr "çæ¬ %s"
+
+#: src/grip.c:639
+msgid "Error: Trying to show homepage failed."
+msgstr "éè¯¯ï¼å°è¯æ¾ç¤ºä¸»é¡µå¤±è´¥ã"
 
-#: src/grip.c:913
+#: src/grip.c:918
 msgid "Created by Grip"
-msgstr ""
+msgstr "ç± Grip åå»º"
 
-#: src/grip.c:931
+#: src/grip.c:936
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
-"ÄúµÄÅäÖÃÎÄ¼þÒÑ¾¹ýÆÚ©¤©¤ÖØÐÂÉè¶¨ÎªÈ±Ê¡Öµ¡£\n"
-"Äú¿ÉÄÜÐèÒªÖØÐÂÅäÖÃ Grip¡£\n"
-"¾ÉµÄÅäÖÃÎÄ¼þÒÑ¾±»¸½¼Ó -old ×÷ÎªÎÄ¼þÃû±£´æ."
+"æ¨çéç½®æä»¶å·²ç»è¿æââéæ°è®¾å®ä¸ºç¼ºçå¼ã\n"
+"æ¨å¯è½éè¦éæ°éç½® Gripã\n"
+"æ§çéç½®æä»¶å·²ç»è¢«éå  -old ä½ä¸ºæä»¶åä¿å."
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
-msgstr "·þÎñÆ÷ÊÇ %s, ¶Ë¿Ú %d\n"
+msgstr "æå¡å¨æ¯ %s, ç«¯å£ %d\n"
 
-#: src/grip.c:1035
-#, fuzzy
+#: src/grip.c:1040
 msgid "Error: Unable to save config file."
-msgstr "´íÎó: ÎÞ·¨±£´æÅäÖÃÎÄ¼þ"
+msgstr "éè¯¯: æ æ³ä¿åéç½®æä»¶ã"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
-msgstr "ÅäÖÃ"
+msgstr "éç½®"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
-msgstr "CDROM Éè±¸"
+msgstr "CDROM è®¾å¤"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
-msgstr "ÍË³öºÍÆô¶¯µÄÊ±ºò²»ÖÐ¶Ï·ÅÒô"
+msgstr "éåºåå¯å¨çæ¶åä¸ä¸ææ¾é³"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
-msgstr "Í£Ö¹Ê±ºóÍËµ½ÇúÊ×"
+msgstr "åæ¢æ¶åéå°æ²é¦"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
-msgstr "Èç¹ûÃ»ÓÐ¿ªÊ¼²¥·ÅÔò´ÓµÚÒ»Ê×¿ªÊ¼"
+msgstr "å¦ææ²¡æå¼å§ææ¾åä»ç¬¬ä¸é¦å¼å§"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
-msgstr "CD ²åÈëÊ±×Ô¶¯²¥·Å"
+msgstr "CD æå¥æ¶èªå¨ææ¾"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
-msgstr "Ã¿´Î²¥·ÅÇ°ÖØÐÂ´òÂÒ²¥·Å´ÎÐò"
+msgstr "æ¯æ¬¡ææ¾åéæ°æä¹±ææ¾æ¬¡åº"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
-msgstr "ÐÞÕý´íÎóµÄµ¯³ö"
+msgstr "ä¿®æ£éè¯¯çå¼¹åº"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
-msgstr ""
+msgstr "è½®è¯¢ççé©±å¨å¨ä»¥æ¥æ¾æ°åç"
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
-msgstr ""
+msgstr "è½®è¯¢é´éï¼ç§ï¼"
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
-msgstr "¹âÅÌ"
+msgstr "åç"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
-msgstr "×¥¹ì¹¤¾ß:"
+msgstr "æè½¨å·¥å·:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
-msgstr "×¥¹ì³ÌÐò"
+msgstr "æè½¨ç¨åº"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
-msgstr "×¥¹ìÆ÷ÔËÐÐ²ÎÊý"
+msgstr "æè½¨å¨è¿è¡åæ°"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
-msgstr "½ûÓÃ paranoia"
+msgstr "ç¦ç¨ paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
-msgstr "½ûÓÃÍâ²¿ paranoia"
+msgstr "ç¦ç¨å¤é¨ paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
-msgstr "½ûÓÃ²ÁºÛ"
+msgstr "ç¦ç¨æ¦ç"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
-msgstr "Õì²â"
+msgstr "ä¾¦æµ"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
-msgstr "ÐÞ¸´"
+msgstr "ä¿®å¤"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
-msgstr "¼ÆËãÔöÒæµ÷Õû"
+msgstr "è®¡ç®å¢çè°æ´"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
-msgstr "×¥¹ìÎÄ¼þ¸ñÊ½"
+msgstr "æè½¨æä»¶æ ¼å¼"
 
-#: src/gripcfg.c:276
-#, fuzzy
+#: src/gripcfg.c:275
 msgid "Rip file format (Multi-artist)"
-msgstr "×¥¹ìÎÄ¼þ¸ñÊ½"
+msgstr "æè½¨æä»¶æ ¼å¼ï¼å¤èºæ¯å®¶ï¼"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
-msgstr "³£¹æ SCSI Éè±¸"
+msgstr "å¸¸è§ SCSI è®¾å¤"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
-msgstr "×¥¹ì¹¤¾ß"
+msgstr "æè½¨å·¥å·"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
-msgstr "×¥¹ì 'nice' ÓÅÏÈÖµ"
+msgstr "æè½¨ 'nice' ä¼åå¼"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
-msgstr "×î´ó´ý±àÂëµÄ .wav ÎÄ¼þÊý"
+msgstr "æå¤§å¾ç¼ç ç .wav æä»¶æ°"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
-msgstr "¹âÅÌ²åÈë×Ô¶¯×¥¹ì"
+msgstr "åçæå¥èªå¨æè½¨"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
-msgstr "×¥¹ìÍê³ÉºóÏìÁå"
+msgstr "æè½¨å®æååé"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
-msgstr "×¥¹ìÍê³Éºó×Ô¶¯µ¯³ö¹âÅÌ"
+msgstr "æè½¨å®æåèªå¨å¼¹åºåç"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
-msgstr "×Ô¶¯µ¯³öÑÓ³Ù"
+msgstr "èªå¨å¼¹åºå»¶è¿"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
-msgstr ""
+msgstr "æè½¨åå»¶è¿"
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
-msgstr ""
+msgstr "å»¶è¿ç¼ç ç´å°ç¢çå®ææè½¨"
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
-msgstr ""
+msgstr "å¨æ²ç®ä¹é´åæ¢ CDROM é©±å¨å¨"
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
-msgstr "WAV ¹ýÂËÆ÷ÃüÁî"
+msgstr "WAV è¿æ»¤å¨å½ä»¤"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
-msgstr "¹âÅÌ¹ýÂËÆ÷ÃüÁî"
+msgstr "åçè¿æ»¤å¨å½ä»¤"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
-msgstr "Ñ¡Ïî"
+msgstr "éé¡¹"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
-msgstr "±àÂëÆ÷:"
+msgstr "ç¼ç å¨:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 msgid "Encoder executable"
-msgstr "±àÂëÆ÷³ÌÐò"
+msgstr "ç¼ç å¨ç¨åº"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 msgid "Encoder command-line"
-msgstr "±àÂëÆ÷ÃüÁîÐÐ"
+msgstr "ç¼ç å¨å½ä»¤è¡"
 
-#: src/gripcfg.c:428
-#, fuzzy
+#: src/gripcfg.c:427
 msgid "Encoder file extension"
-msgstr "±àÂëÎÄ¼þ¸ñÊ½"
+msgstr "ç¼ç å¨æä»¶æ©å±å"
 
-#: src/gripcfg.c:433
-#, fuzzy
+#: src/gripcfg.c:432
 msgid "Encoder file format"
-msgstr "±àÂëÎÄ¼þ¸ñÊ½"
+msgstr "ç¼ç å¨æä»¶æ ¼å¼"
 
-#: src/gripcfg.c:439
-#, fuzzy
+#: src/gripcfg.c:438
 msgid "Encode file format (Multi-artist)"
-msgstr "±àÂëÎÄ¼þ¸ñÊ½"
+msgstr "ç¼ç æä»¶æ ¼å¼ï¼å¤èºæ¯å®¶ï¼"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
-msgstr "±àÂëÆ÷"
+msgstr "ç¼ç å¨"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
-msgstr "±àÂëºóÉ¾³ý .wav ÎÄ¼þ"
+msgstr "ç¼ç åå é¤ .wav æä»¶"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
-msgstr "²åÈëÐÅÏ¢µ½ SQL Êý¾Ý¿â"
+msgstr "æå¥ä¿¡æ¯å° SQL æ°æ®åº"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
-msgstr "´´½¨ .m3u ÎÄ¼þ"
+msgstr "åå»º .m3u æä»¶"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
-msgstr "ÔÚ .m3u ÎÄ¼þÖÐÊ¹ÓÃÏà¶ÔÂ·¾¶"
+msgstr "å¨ .m3u æä»¶ä¸ä½¿ç¨ç¸å¯¹è·¯å¾"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
-msgstr "M3U ÎÄ¼þ¸ñÊ½"
+msgstr "M3U æä»¶æ ¼å¼"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
-msgstr "±àÂë±ÈÌØÂÊ (kbits/sec)"
+msgstr "ç¼ç æ¯ç¹ç (kbits/sec)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
-msgstr "CPU Ê¹ÓÃÊýÄ¿"
+msgstr "CPU ä½¿ç¨æ°ç®"
 
-#: src/gripcfg.c:488
-#, fuzzy
+#: src/gripcfg.c:487
 msgid "Encoder 'nice' value"
-msgstr "±àÂë 'nice' ÓÅÏÈÖµ"
+msgstr "ç¼ç å¨ 'nice' ä¼åå¼"
 
-#: src/gripcfg.c:492
-#, fuzzy
+#: src/gripcfg.c:491
 msgid "Encoder filter command"
-msgstr "±àÂë¹ýÂËÆ÷ÃüÁî"
+msgstr "ç¼ç å¨è¿æ»¤å¨å½ä»¤"
 
-#: src/gripcfg.c:497
-#, fuzzy
+#: src/gripcfg.c:496
 msgid "Execute command after encode"
-msgstr "±àÂëºóÉ¾³ý .wav ÎÄ¼þ"
+msgstr "ç¼ç åæ§è¡å½ä»¤"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 msgid "Add ID3 tags to encoded files"
-msgstr "ÌîÈë ID3 ±êÇ©µ½±àÂëºóµÄÎÄ¼þ"
+msgstr "å¡«å¥ ID3 æ ç¾å°ç¼ç åçæä»¶"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 msgid "Add ID3v2 tags to encoded files"
-msgstr "ÌîÈë ID3v2 ±êÇ©µ½±àÂëºóµÄÎÄ¼þ"
+msgstr "å¡«å¥ ID3v2 æ ç¾å°ç¼ç åçæä»¶"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
-msgstr "½ö½«±êÇ©Ð´µ½ .mp3 ½áÎ²µÄÎÄ¼þ"
+msgstr "ä»å°æ ç¾åå° .mp3 ç»å°¾çæä»¶"
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
-msgstr "ID3 ×¢ÊÍÐÅÏ¢"
+msgstr "ID3 æ³¨éä¿¡æ¯"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
-msgstr ""
+msgstr "ID3v1 åç¬¦éç¼ç "
 
-#: src/gripcfg.c:548
-#, fuzzy
+#: src/gripcfg.c:547
 msgid "ID3v2 Character set encoding"
-msgstr "±àÂëºóÉ¾³ý .wav ÎÄ¼þ"
+msgstr "ID3v2 åç¬¦éç¼ç "
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
-msgstr "±êÇ©"
+msgstr "æ ç¾"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
-msgstr "Êý¾Ý¿â·þÎñÆ÷"
+msgstr "æ°æ®åºæå¡å¨"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
-msgstr "CGI Â·¾¶"
+msgstr "CGI è·¯å¾"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
-msgstr "Ö÷·þÎñÆ÷"
+msgstr "ä¸»æå¡å¨"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
-msgstr "´Ó·þÎñÆ÷"
+msgstr "ä»æå¡å¨"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
-msgstr "DB Ìá½»µç×ÓÓÊ¼þ"
+msgstr "DB æäº¤çµåé®ä»¶"
 
-#: src/gripcfg.c:619
-#, fuzzy
+#: src/gripcfg.c:618
 msgid "DB Character set encoding"
-msgstr "±àÂëºóÉ¾³ý .wav ÎÄ¼þ"
+msgstr "æ°æ®åºåç¬¦éç¼ç "
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
-msgstr "Ê¹ÓÃ FreeDB À©Õ¹"
+msgstr "ä½¿ç¨ FreeDB æ©å±"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
-msgstr "×Ô¶¯½øÐÐ¹âÅÌ²éÑ¯"
+msgstr "èªå¨è¿è¡åçæ¥è¯¢"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
-msgstr "CDÊý¾Ý¿â"
+msgstr "CDæ°æ®åº"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
-msgstr "Ê¹ÓÃ´úÀí·þÎñÆ÷"
+msgstr "ä½¿ç¨ä»£çæå¡å¨"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
-msgstr "´Ó¡®http_proxy¡¯±äÁ¿Ö¸¶¨´úÀí·þÎñÆ÷"
+msgstr "ä»âhttp_proxyâåéæå®ä»£çæå¡å¨"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
-msgstr "´úÀí·þÎñÆ÷"
+msgstr "ä»£çæå¡å¨"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
-msgstr "´úÀí·þÎñÆ÷¶Ë¿Ú"
+msgstr "ä»£çæå¡å¨ç«¯å£"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
-msgstr "´úÀí·þÎñÆ÷ÓÃ»§Ãû"
+msgstr "ä»£çæå¡å¨ç¨æ·å"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
-msgstr "´úÀí·þÎñÆ÷¿ÚÁî"
+msgstr "ä»£çæå¡å¨å£ä»¤"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
-msgstr "´úÀí·þÎñÆ÷"
+msgstr "ä»£çæå¡å¨"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
-msgstr "µç×ÓÓÊ¼þ"
+msgstr "çµåé®ä»¶"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
-msgstr "CD ¸üÐÂ³ÌÐò"
+msgstr "CD æ´æ°ç¨åº"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
-msgstr "²»Òª½«ÎÄ¼þÃû×ª»»³ÉÐ¡Ð´×ÖÄ¸"
+msgstr "ä¸è¦å°æä»¶åè½¬æ¢æå°ååæ¯"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
-msgstr "ÔÊÐíÎÄ¼þÃûµÄ¸ß8Î»"
+msgstr "åè®¸æä»¶åçé«8ä½"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
-msgstr ""
+msgstr "å°ä¸å¼å®¹çåç¬¦æ¿æ¢ä¸ºååè¿å¶æ°å"
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
-msgstr "²»Òª½«¿Õ¸ñ×ª»»³ÉÏÂ»®Ïß"
+msgstr "ä¸è¦å°ç©ºæ ¼è½¬æ¢æä¸åçº¿"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
-msgstr ""
+msgstr "ä½¿ç¨é posix å¼å®¹ç '\\' åå¥ m3u æä»¶"
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
-msgstr ""
-"ÎÄ¼þÃûÖÐ²»È¥³ýµÄ×Ö·û\n"
-" "
+msgstr "æä»¶åä¸ä¸å»é¤çåç¬¦"
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
-msgstr ""
+msgstr "æ¾ç¤ºæçå¾æ "
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
-msgstr "ÔÓÏî"
+msgstr "æé¡¹"
 
-#: src/gripcfg.c:840
-#, fuzzy
+#: src/gripcfg.c:839
 msgid "Error: Unable to save ripper config."
-msgstr "´íÎó: ÎÞ·¨±£´æÅäÖÃÎÄ¼þ"
+msgstr "éè¯¯: æ æ³ä¿åæè½¨éç½®ã"
 
-#: src/gripcfg.c:911
-#, fuzzy
+#: src/gripcfg.c:913
 msgid "Error: Unable to save encoder config."
-msgstr "´íÎó: ÎÞ·¨±£´æÅäÖÃÎÄ¼þ"
+msgstr "éè¯¯: æ æ³ä¿åç¼ç å¨éç½®ã"
 
 #: src/cddev.c:174 src/cddev.c:604
 #, c-format
 msgid "Drive status is %d\n"
-msgstr "Çý¶¯Æ÷×´Ì¬ÊÇ %d\n"
+msgstr "é©±å¨å¨ç¶ææ¯ %d\n"
 
 #: src/cddev.c:176
 msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n"
-msgstr "Çý¶¯Æ÷²»Ö§³Ö×´Ì¬¼ì²â (¼Ù¶¨ CDS_NO_INFO)\n"
+msgstr "é©±å¨å¨ä¸æ¯æç¶ææ£æµ (åå® CDS_NO_INFO)\n"
 
 #: src/cddev.c:179
 msgid "No disc\n"
-msgstr "ÎÞ¹âÅÌ\n"
+msgstr "æ åç\n"
 
 #: src/cddev.c:284 src/cddev.c:293 src/cddev.c:310 src/cddev.c:337
 msgid "Error: Failed to read disc contents\n"
-msgstr "´íÎó: ¶ÁÈ¡¹âÅÌÄ¿Â¼Ê§°Ü\n"
+msgstr "éè¯¯: è¯»ååçç®å½å¤±è´¥\n"
 
 #: src/cddev.c:607
 msgid "Drive doesn't support drive status check\n"
-msgstr "Çý¶¯Æ÷²»Ö§³Ö×´Ì¬¼ì²â\n"
+msgstr "é©±å¨å¨ä¸æ¯æç¶ææ£æµ\n"
 
 #: src/cddev.c:627 src/cddev.c:632
 #, c-format
 msgid "Unlock failed: %d"
-msgstr "½âËøÊ§°Ü: %d"
+msgstr "è§£éå¤±è´¥: %d"
 
 #: src/cddev.c:636
 msgid "CDIOCEJECT"
-msgstr ""
+msgstr "CDIOCEJECT"
 
-#: src/cdplay.c:84
-#, fuzzy
+#: src/cdplay.c:88
 msgid "Cannot do lookup while ripping."
-msgstr "ÎÞ·¨ÔÚ×¥¹ì¹ý³ÌÖÐ²éÑ¯"
+msgstr "æ æ³å¨æè½¨è¿ç¨ä¸æ¥è¯¢ã"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
-msgstr "Î´Öª¹âÅÌ"
+msgstr "æªç¥åç"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Track %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "ÕýÔÚ (Í¨¹ý %2$s) Ïò %1$s ²éÑ¯¹âÅÌ %3$02x¡£\n"
+msgstr "æ£å¨ (éè¿ %2$s) å %1$s æ¥è¯¢åç %3$02xã\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
-msgstr "ÕýÔÚÏò %s ²éÑ¯¹âÅÌ %02x¡£\n"
+msgstr "æ£å¨å %s æ¥è¯¢åç %02xã\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "ä¸å¹é\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
 "Downloading data...\n"
 msgstr ""
-"ÕýÔÚÆ¥Åä \"%s / %s\"\n"
-"ÕýÔÚÏÂÔØÊý¾Ý...\n"
+"æ£å¨å¹é \"%s / %s\"\n"
+"æ£å¨ä¸è½½æ°æ®...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
-msgstr "Íê³É\n"
+msgstr "å®æ\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
-msgstr "±£´æ¹âÅÌÊý¾Ý´íÎó\n"
+msgstr "ä¿ååçæ°æ®éè¯¯\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "²»Æ¥Åä\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
-#, fuzzy
+#: src/cdplay.c:266 src/cdplay.c:377
 msgid "Length"
-msgstr "³¤¶È"
+msgstr "é¿åº¦"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
-msgstr "ÇúÄ¿"
+msgstr "æ²ç®"
+
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr "éæ©ä¸ä¸ä¸ª CDDB æ¡ç®ã"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr "éæ©ä¸ä¸ä¸ª CDDB æ¡ç®ã"
+
+#: src/cdplay.c:366
 msgid "Track"
-msgstr "ÇúÄ¿"
+msgstr "æ²ç®"
 
-#: src/cdplay.c:630 src/discedit.c:390
-#, fuzzy
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr "æ²¡æç¢çæ°æ®ãå°è¿åã\n"
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+msgid "Done.\n"
+msgstr "å®æã\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 msgid "Error saving disc data."
-msgstr "±£´æ¹âÅÌÐÅÏ¢´íÎó"
+msgstr "ä¿ååçä¿¡æ¯æ¶åºéã"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
-msgstr "Ñ»·²¥·ÅÄ£Ê½"
+msgstr "å¾ªç¯ææ¾æ¨¡å¼"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
-msgstr "ÇÐ»»Ñ»·²¥·Å"
+msgstr "åæ¢å¾ªç¯ææ¾"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
-msgstr "×¥¹ì×´Ì¬"
+msgstr "æè½¨ç¶æ"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
-msgstr "²¥·Å/ÔÝÍ£"
+msgstr "ææ¾/æå"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
-msgstr "µ¹ÍË"
+msgstr "åé"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
-msgstr "¿ì½ø"
+msgstr "å¿«è¿"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
-msgstr "ÉÏÒ»Çú"
+msgstr "ä¸ä¸æ²"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
-msgstr "ÏÂÒ»Çú"
+msgstr "ä¸ä¸æ²"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
-msgstr "ÇÐ»»·ÅÒôÄ£Ê½Ñ¡Ïî"
+msgstr "åæ¢æ¾é³æ¨¡å¼éé¡¹"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
-msgstr "ÏÂÒ»¹âÅÌ"
+msgstr "ä¸ä¸åç"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
-msgstr "Í£Ö¹·ÅÒô"
+msgstr "åæ¢æ¾é³"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
-msgstr "µ¯³ö¹âÅÌ"
+msgstr "å¼¹åºåç"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 msgid "Scan Disc Contents"
-msgstr "É¨Ãè¹âÅÌÄÚÈÝ"
+msgstr "æ«æåçåå®¹"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
-msgstr "ÇÐ»»ÒôÁ¿¿ØÖÆ"
+msgstr "åæ¢é³éæ§å¶"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
-msgstr "ÇÐ»»¹âÅÌ±à¼Æ÷"
+msgstr "åæ¢åçç¼è¾å¨"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
-msgstr "³õÊ¼»¯/È¡Ïû¹âÅÌ²éÑ¯"
+msgstr "åå§å/åæ¶åçæ¥è¯¢"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
-msgstr "ÇÐ»»ÇúÄ¿ÏÔÊ¾"
+msgstr "åæ¢æ²ç®æ¾ç¤º"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
-msgstr "ÍË³ö Grip"
+msgstr "éåº Grip"
 
-#: src/cdplay.c:1170
-#, fuzzy
+#: src/cdplay.c:1264
 msgid "Cannot fast forward while ripping."
-msgstr "×¥¹ì¹ý³ÌÖÐ²»ÄÜ¿ì½ø"
+msgstr "æè½¨è¿ç¨ä¸ä¸è½å¿«è¿ã"
 
-#: src/cdplay.c:1201
-#, fuzzy
+#: src/cdplay.c:1295
 msgid "Cannot rewind while ripping."
-msgstr "×¥¹ì¹ý³ÌÖÐ²»ÄÜµ¹ÍË"
+msgstr "æè½¨è¿ç¨ä¸ä¸è½åéã"
 
-#: src/cdplay.c:1232
-#, fuzzy
+#: src/cdplay.c:1326
 msgid "Cannot switch discs while ripping."
-msgstr "×¥¹ì¹ý³ÌÖÐ²»ÄÜÇÐ»»¹âÅÌ"
+msgstr "æè½¨è¿ç¨ä¸ä¸è½åæ¢åçã"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
-msgstr "µ¯³ö¹âÅÌ\n"
+msgstr "å¼¹åºåç\n"
 
-#: src/cdplay.c:1254
-#, fuzzy
+#: src/cdplay.c:1348
 msgid "Cannot eject while ripping."
-msgstr "²»ÄÜÔÚ×¥¹ì¹ý³ÌÖÐµ¯³ö¹âÅÌ"
+msgstr "ä¸è½å¨æè½¨è¿ç¨ä¸å¼¹åºåçã"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
-msgstr "ÓÐ¹âÅÌ©¤©¤ÕýÔÚµ¯³ö\n"
+msgstr "æåçââæ£å¨å¼¹åº\n"
 
-#: src/cdplay.c:1331
-#, fuzzy
+#: src/cdplay.c:1425
 msgid "Cannot play while ripping."
-msgstr "×¥¹ì¹ý³ÌÖÐ²»ÄÜ²¥·Å"
+msgstr "æè½¨è¿ç¨ä¸ä¸è½ææ¾ã"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
-#, fuzzy
+#: src/cdplay.c:1493 src/cdplay.c:1524
 msgid "Cannot switch tracks while ripping."
-msgstr "×¥¹ì¹ý³ÌÖÐ²»ÄÜ¸Ä±äÇúÄ¿"
+msgstr "æè½¨è¿ç¨ä¸ä¸è½æ¹åæ²ç®ã"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
-msgstr "ÕýÔÚ¼ì²éÐÂ¹âÅÌ\n"
+msgstr "æ£å¨æ£æ¥æ°åç\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
-msgstr "CDStat ·¢ÏÖ¹âÅÌ£¬ÕýÔÚ¼ì²éÇúÄ¿\n"
+msgstr "CDStat åç°åçï¼æ£å¨æ£æ¥æ²ç®\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
-msgstr "¹âÅÌºÏ·¨!\n"
+msgstr "åçåæ³!\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
-msgstr "Ã»ÓÐ·ÇÁã³¤¶ÈµÄÇúÄ¿\n"
+msgstr "æ²¡æéé¶é¿åº¦çæ²ç®\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
-msgstr "CDStat ËµÎÞ¹âÅÌ\n"
+msgstr "CDStat è¯´æ åç\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
-msgstr "µ±Ç°ÉÈÇø: %6d"
+msgstr "å½åæåº: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
-msgstr "ÎÞ¹âÅÌ"
+msgstr "æ åç"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
 "\n"
 "Do you wish to submit this disc information?"
 msgstr ""
-"´Ë¹âÅÌÐÅÏ¢ÔÚ´Ó·þÎñÆ÷ÖÐÕÒµ½£¬\n"
-"µ«ÊÇÃ»ÓÐÔÚÖ÷·þÎñÆ÷ÖÐÕÒµ½¡£\n"
+"æ¤åçä¿¡æ¯å¨ä»æå¡å¨ä¸æ¾å°ï¼\n"
+"ä½æ¯æ²¡æå¨ä¸»æå¡å¨ä¸æ¾å°ã\n"
 "\n"
-"ÄúÊÇ·ñÏëÌá½»´Ë¹âÅÌÐÅÏ¢£¿"
+"æ¨æ¯å¦æ³æäº¤æ¤åçä¿¡æ¯ï¼"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
-#, fuzzy
+#: src/cdplay.c:2012 src/cdplay.c:2021
 msgid "Error: Unable to create temporary file."
-msgstr "´íÎó: ÎÞ·¨´´½¨ÁÙÊ±ÎÄ¼þ"
+msgstr "éè¯¯: æ æ³åå»ºä¸´æ¶æä»¶ã"
 
-#: src/cdplay.c:1944
-#, fuzzy
+#: src/cdplay.c:2039
 msgid "Error: Unable to write disc data."
-msgstr "´íÎó: ÎÞ·¨Ð´¹âÅÌÊý¾Ý"
+msgstr "éè¯¯: æ æ³åå¥åçæ°æ®ã"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
-msgstr "·¢ËÍÓÊ¼þµ½ %s\n"
+msgstr "åéé®ä»¶å° %s\n"
+
+#: src/cdplay.c:2053
+msgid "Error: Unable to execute mail command."
+msgstr "éè¯¯: æ æ³æ§è¡ mail å½ä»¤ã"
 
 #: src/dialog.c:44
 msgid "System Message"
-msgstr "ÏµÍ³ÏûÏ¢"
+msgstr "ç³»ç»æ¶æ¯"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
-msgstr "URI ÊÇ %s\n"
+msgstr "URI æ¯ %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
-msgstr "²éÑ¯ÊÇ [%s]\n"
+msgstr "æ¥è¯¢æ¯ [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
-msgstr "×´Ì¬´íÎó  %d ÔÚ %s\n"
+msgstr "ç¶æéè¯¯  %d å¨ %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
-msgstr "´´½¨Ä¿Â¼ %s\n"
+msgstr "åå»ºç®å½ %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
-msgstr "´íÎó: %s ÒÑ¾´æÔÚ, µ«È´ÊÇÒ»¸öÎÄ¼þ\n"
+msgstr "éè¯¯: %s å·²ç»åå¨, ä½å´æ¯ä¸ä¸ªæä»¶\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
-msgstr "´íÎó: ÎÞ·¨´ò¿ª %s ½øÐÐÐ´²Ù×÷\n"
+msgstr "éè¯¯: æ æ³æå¼ %s è¿è¡åæä½\n"
 
 #: src/discedit.c:67
 msgid "Disc title"
-msgstr "¹âÅÌ±êÌâ"
+msgstr "åçæ é¢"
 
 #: src/discedit.c:74 src/discedit.c:176
 msgid "Track name"
-msgstr "Òô¹ìÇúÃû"
+msgstr "é³è½¨æ²å"
 
 #: src/discedit.c:84
 msgid "W"
@@ -838,69 +856,63 @@
 
 #: src/discedit.c:110
 msgid "Disc artist"
-msgstr "¹âÅÌ×÷Õß"
+msgstr "åçä½è"
 
 #: src/discedit.c:127
 msgid "ID3 genre:"
-msgstr "ID3Àà±ð:"
+msgstr "ID3ç±»å«:"
 
 #: src/discedit.c:158
 msgid "Disc year"
-msgstr "³öÆ·ÈÕÆÚ"
+msgstr "åºåæ¥æ"
 
 #: src/discedit.c:196
 msgid "Track artist"
-msgstr "ÇúÄ¿×÷Õß"
+msgstr "æ²ç®ä½è"
 
 #: src/discedit.c:213
 msgid "Split:"
-msgstr "·Ö¸î:"
+msgstr "åå²:"
 
 #: src/discedit.c:217
 msgid "Title/Artist"
-msgstr "±êÌâ/×÷Õß"
+msgstr "æ é¢/ä½è"
 
 #: src/discedit.c:224
 msgid "Artist/Title"
-msgstr "×÷Õß/±êÌâ"
+msgstr "ä½è/æ é¢"
 
 #: src/discedit.c:232
 msgid "Split chars"
-msgstr "·Ö¸î·û"
+msgstr "åå²ç¬¦"
 
 #: src/discedit.c:254
 msgid "Multi-artist"
-msgstr "¶à×÷Õß"
+msgstr "å¤ä½è"
 
 #: src/discedit.c:265
 msgid "Save disc info"
-msgstr "±£´æ¹âÅÌÐÅÏ¢"
+msgstr "ä¿ååçä¿¡æ¯"
 
 #: src/discedit.c:274
 msgid "Submit disc info"
-msgstr "Ìá½»¹âÅÌÐÅÏ¢"
+msgstr "æäº¤åçä¿¡æ¯"
 
 #: src/discedit.c:393
-#, fuzzy
 msgid "No disc present."
-msgstr "Ã»ÓÐ¹âÅÌ"
+msgstr "æ²¡æç¢çã"
 
 #: src/discedit.c:543
-#, fuzzy
 msgid "Cannot submit. No disc is present."
-msgstr ""
-"²»ÄÜÌá½»\n"
-"Ã»ÓÐ¹âÅÌ"
+msgstr "æ æ³æäº¤ãæ²¡æç¢çã"
 
 #: src/discedit.c:558
-#, fuzzy
 msgid "You must enter a disc title."
-msgstr "Äú±ØÐëÊäÈë¹âÅÌ±êÌâ"
+msgstr "æ¨å¿é¡»è¾å¥ç¢çæ é¢ã"
 
 #: src/discedit.c:565
-#, fuzzy
 msgid "You must enter a disc artist."
-msgstr "Äú±ØÐëÊäÈë×÷ÕßÃû³Æ"
+msgstr "æ¨å¿é¡»è¾å¥ç¢çèºæ¯å®¶åç§°ã"
 
 #: src/discedit.c:575
 msgid ""
@@ -912,13 +924,13 @@
 "\n"
 "Continue?"
 msgstr ""
-"Äú½«Òª½«ÕâÕÅ¹âÅÌµÄÐÅÏ¢Ìá½»µ½\n"
-"Ò»¸öÉÌÒµµÄ CDDB ·þÎñÆ÷ÉÏÈ¥, ËûÃÇ½«Õ¼ÓÐ\n"
-"ÄúËùÊäÈëµÄÐÅÏ¢. ÕâÐ©·þÎñÆ÷½«½è´Ë»ñµÃ\n"
-"ÀûÒæ. ÎÒÃÇ½¨ÒéÄú¶à¶àÖ§³ÖÄÄÐ©Ãâ·ÑµÄ·þÎñÆ÷\n"
-"À´È¡¶ø´úÖ®. \n"
+"æ¨å°è¦å°è¿å¼ åççä¿¡æ¯æäº¤å°\n"
+"ä¸ä¸ªåä¸ç CDDB æå¡å¨ä¸å», ä»ä»¬å°å æ\n"
+"æ¨æè¾å¥çä¿¡æ¯. è¿äºæå¡å¨å°åæ¤è·å¾\n"
+"å©ç. æä»¬å»ºè®®æ¨å¤å¤æ¯æåªäºåè´¹çæå¡å¨\n"
+"æ¥åèä»£ä¹. \n"
 "\n"
-"Äú»¹Òª¼ÌÐøÂð?"
+"æ¨è¿è¦ç»§ç»å?"
 
 #: src/discedit.c:584
 msgid ""
@@ -927,121 +939,125 @@
 "\n"
 "Continue?"
 msgstr ""
-"Äú½«Í¨¹ýµç×ÓÓÊ¼þÀ´\n"
-"Ìá½»´Ë¹âÅÌÐÅÏ¢.\n"
+"æ¨å°éè¿çµåé®ä»¶æ¥\n"
+"æäº¤æ¤åçä¿¡æ¯.\n"
 "\n"
-"¼ÌÐøÂð?"
+"ç»§ç»å?"
 
 #: src/discedit.c:601
 msgid "Genre selection"
-msgstr "Ñ¡ÔñÀà±ð"
+msgstr "éæ©ç±»å«"
 
 #: src/discedit.c:605
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
 msgstr ""
-"ÄúÐèÒªÖ¸¶¨¾ßÌåµÄÒôÀÖÀà±ð\n"
-"Çë´ÓÏÂÁÐÑ¡ÔñÒ»¸ö DiscDB Àà±ð"
+"æ¨éè¦æå®å·ä½çé³ä¹ç±»å«\n"
+"è¯·ä»ä¸åéæ©ä¸ä¸ª DiscDB ç±»å«"
 
 #: src/discedit.c:615
 msgid "DiscDB genre"
-msgstr "DiscDB Àà±ð"
+msgstr "DiscDB ç±»å«"
 
 #: src/discedit.c:635
 msgid "Submit"
-msgstr "Ìá½»"
+msgstr "æäº¤"
 
 #: src/discedit.c:646
 msgid "Cancel"
-msgstr "È¡Ïû"
+msgstr "åæ¶"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
-msgstr "Î´ÖªµÄ ID3 Óò\n"
+msgstr "æªç¥ç ID3 å\n"
 
 #: src/launch.c:121
 #, c-format
 msgid "Error: unable to translate filename. No such user as %s\n"
-msgstr "´íÎó: ÎÞ·¨×ª»»ÎÄ¼þÃû¡£ÎÞ´ËÓÃ»§ %s\n"
+msgstr "éè¯¯: æ æ³è½¬æ¢æä»¶åãæ æ¤ç¨æ· %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
-msgstr "Ö´ÐÐÊ§°Ü\n"
+msgstr "æ§è¡å¤±è´¥\n"
 
 #: src/parsecfg.c:58
 msgid "Error: Bad entry type\n"
-msgstr "´íÎó: »µµÄÏîÀàÐÍ\n"
+msgstr "éè¯¯: åçé¡¹ç±»å\n"
+
+#: src/parsecfg.c:81
+msgid "Error: Reading config file\n"
+msgstr "éè¯¯: è¯»åéç½®æä»¶\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
-msgstr "´íÎó: ·Ç·¨µÄÅäÖÃÎÄ¼þ\n"
+msgstr "éè¯¯: éæ³çéç½®æä»¶\n"
 
 #: src/rip.c:104
 msgid "Rip+Encode"
-msgstr "×¥¹ìºó±àÂë"
+msgstr "æè½¨åç¼ç "
 
 #: src/rip.c:106
 msgid "Rip and encode selected tracks"
-msgstr "×¥¹ìºÍ±àÂëÑ¡ÖÐµÄÇúÄ¿"
+msgstr "æè½¨åç¼ç éä¸çæ²ç®"
 
 #: src/rip.c:112
 msgid "Rip Only"
-msgstr "Ö»×¥¹ì"
+msgstr "åªæè½¨"
 
 #: src/rip.c:114
 msgid "Rip but do not encode selected tracks"
-msgstr "Ö»×¥¹ì²»±àÂë"
+msgstr "åªæè½¨ä¸ç¼ç "
 
 #: src/rip.c:120
 msgid "Abort Rip and Encode"
-msgstr "Í£Ö¹×¥¹ìºÍ±àÂë"
+msgstr "åæ¢æè½¨åç¼ç "
 
 #: src/rip.c:122
 msgid "Kill all active rip and encode processes"
-msgstr "É±µôËùÓÐ×¥¹ìºÍ±àÂë½ø³Ì"
+msgstr "æææææè½¨åç¼ç è¿ç¨"
 
 #: src/rip.c:130
 msgid "Abort Ripping Only"
-msgstr "½öÈ¡Ïû×¥¹ì"
+msgstr "ä»åæ¶æè½¨"
 
 #: src/rip.c:132
 msgid "Kill rip process"
-msgstr "É±µô×¥¹ì½ø³Ì"
+msgstr "æææè½¨è¿ç¨"
 
 #: src/rip.c:138
 msgid "DDJ Scan"
-msgstr "DDJ É¨Ãè"
+msgstr "DDJ æ«æ"
 
 #: src/rip.c:140
 msgid "Insert disc information into the DigitalDJ database"
-msgstr "²åÈë¹âÅÌÐÅÏ¢µ½ DigitalDJ Êý¾Ý¿â"
+msgstr "æå¥åçä¿¡æ¯å° DigitalDJ æ°æ®åº"
 
 #: src/rip.c:155
 msgid "Rip partial track"
-msgstr "×¥È¡²¿·ÖÒô¹ì"
+msgstr "æåé¨åé³è½¨"
 
 #: src/rip.c:166 src/tray.c:186
 msgid "Play"
-msgstr "·ÅÒô"
+msgstr "æ¾é³"
 
 #: src/rip.c:173
 msgid "Current sector:      0"
-msgstr "µ±Ç°ÉÈÇø:      0"
+msgstr "å½åæåº:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
-msgstr "×¥¹ì: ¿ÕÏÐ"
+msgstr "æè½¨: ç©ºé²"
 
 #: src/rip.c:209
 msgid "Enc: Trk 99 (99.9x)"
-msgstr "±àÂë: ÇúÄ¿ 99 (99.9x)"
+msgstr "ç¼ç : æ²ç® 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 msgid "Enc: Idle"
-msgstr "±àÂë: ¿ÕÏÐ"
+msgstr "ç¼ç : ç©ºé²"
 
 #: src/rip.c:264
 msgid "Overall indicators:"
@@ -1049,44 +1065,43 @@
 
 #: src/rip.c:327
 msgid "Start sector"
-msgstr "ÆðÊ¼ÉÈÇø"
+msgstr "èµ·å§æåº"
 
 #: src/rip.c:332
 msgid "End sector"
-msgstr "ÖÕÖ¹ÉÈÇø"
+msgstr "ç»æ¢æåº"
 
 #: src/rip.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "Inserting track %d into the ddj database\n"
-msgstr "²åÈëÐÅÏ¢µ½ SQL Êý¾Ý¿â"
+msgstr "æ£å¨æå¥æ²ç® %d å° ddj æ°æ®åºä¸\n"
 
 #: src/rip.c:609
-#, fuzzy
 msgid "Error: can't open m3u file."
-msgstr "´íÎó: ²»ÄÜ´ò¿ª m3u ÎÄ¼þ\n"
+msgstr "éè¯¯ï¼æ æ³æå¼ m3u æä»¶ã"
 
 #: src/rip.c:703
 msgid "In KillRip\n"
-msgstr ""
+msgstr "å¨ KillRip ä¸\n"
 
 #: src/rip.c:729
 #, c-format
 msgid "Now total enc size is: %d\n"
-msgstr ""
+msgstr "ç®åç¼ç æ»å¤§å°ä¸ºï¼%d\n"
 
 #: src/rip.c:884
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
-msgstr "×¥¹ì: ÇúÄ¿ %d (%3.1fx)"
+msgstr "æè½¨: æ²ç® %d (%3.1fx)"
 
 #: src/rip.c:917
 #, c-format
 msgid "Rip: %6.2f%%"
-msgstr ""
+msgstr "æè½¨ï¼%6.2f%%"
 
 #: src/rip.c:937
 msgid "Rip finished\n"
-msgstr "Íê³É×¥¹ì\n"
+msgstr "å®ææè½¨\n"
 
 #: src/rip.c:963
 #, c-format
@@ -1096,175 +1111,175 @@
 #: src/rip.c:966
 #, c-format
 msgid "Next track is %d, total is %d\n"
-msgstr "ÏÂÒ»Ê×ÊÇ %d, ×Ü¹² %d Ê×\n"
+msgstr "ä¸ä¸é¦æ¯ %d, æ»å± %d é¦\n"
 
 #: src/rip.c:972
 msgid "Check if we need to rip another track\n"
-msgstr "¼ì²éÊÇ·ñÐèÒª×¥È¡ÆäËûÇúÄ¿\n"
+msgstr "æ£æ¥æ¯å¦éè¦æåå¶ä»æ²ç®\n"
 
 #: src/rip.c:1014
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
-msgstr "±àÂë: ÇúÄ¿ %d (%3.1fx)"
+msgstr "ç¼ç : æ²ç® %d (%3.1fx)"
 
 #: src/rip.c:1032
 #, c-format
 msgid "Enc: %6.2f%%"
-msgstr ""
+msgstr "ç¼ç : %6.2f%%"
 
 #: src/rip.c:1042
 #, c-format
 msgid "Finished encoding on cpu %d\n"
-msgstr "Íê³É±àÂëÔÚ´¦ÀíÆ÷ %d\n"
+msgstr "å®æç¼ç å¨å¤çå¨ %d\n"
 
 #: src/rip.c:1060
 #, c-format
 msgid "Deleting [%s]\n"
-msgstr "ÕýÔÚÉ¾³ý [%s]\n"
+msgstr "æ£å¨å é¤ [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
-msgstr "×¥¹ìÍê³É\n"
+msgstr "æè½¨å®æ\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
-msgstr "ÎÞ×÷Õß"
+msgstr "æ ä½è"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
-msgstr "ÎÞ±êÌâ"
+msgstr "æ æ é¢"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
+"é©±å¨å¨ä¸æªæ¢æµå°ç¢çãå¦ææ¨å·²ç»å°ç¢çæå¥é©±å¨å¨ï¼è¯·å¨ éç½®->åç ä¸æ£æ¥æ¨ç "
+"CDROM è®¾å¤éç½®ã"
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
+"æ æçæè½¨å¯æ§è¡æä»¶ã\n"
+"è¯·æ£æ¥æ¨çæè½¨éç½®ï¼å¹¶ç¡®ä¿å·²æå®äºæè½¨å·¥å·å¯æ§è¡æä»¶çå®æ´è·¯å¾ã"
 
-#: src/rip.c:1374
-#, fuzzy
+#: src/rip.c:1378
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
-"·Ç·¨µÄ±àÂë³ÌÐò\n"
-"Çë¼ì²éÄãµÄ±àÂëÆ÷ÉèÖÃ"
+"éæ³çç¼ç å¨ç¨åºã\n"
+"è¯·æ£æ¥æ¨çç¼ç å¨è®¾ç½®ï¼å¹¶ç¡®ä¿å·²æå®äºç¼ç å¨å¯æ§è¡æä»¶çå®æ´è·¯å¾ã"
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
 msgstr ""
-"Ã»ÓÐÑ¡ÔñÇúÄ¿¡£\n"
-"×¥È¡ÕûÕÅ¹âÅÌÂð£¿\n"
+"æ²¡æéæ©æ²ç®ã\n"
+"æåæ´å¼ åçåï¼\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
-msgstr "ÕýÔÚ×¥È¡ÕûÕÅ¹âÅÌ\n"
+msgstr "æ£å¨æåæ´å¼ åç\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
-msgstr "ÔÚ×¥È¡ÏÂÒ»¹ì\n"
+msgstr "å¨æåä¸ä¸è½¨\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
-msgstr "µÚÒ»¸ö¼ì²éµÄÇúÄ¿ÊÇ %d\n"
+msgstr "ç¬¬ä¸ä¸ªæ£æ¥çæ²ç®æ¯ %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
-msgstr "Ã»ÓÐÐ´ wav ÎÄ¼þµÄÈ¨ÏÞ"
+msgstr "æ²¡æå wav æä»¶çæé"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
-msgstr "ÕýÔÚ×¥È¡ÇúÄ¿ %d µ½ %s\n"
+msgstr "æ£å¨æåæ²ç® %d å° %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
-msgstr "×¥¹ì: ÇúÄ¿ %d (0.0x)"
+msgstr "æè½¨: æ²ç® %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
-msgstr "ÎÄ¼þ %s ÒÑ¾×¥¹ý¡£Ìø¹ý...\n"
+msgstr "æä»¶ %s å·²ç»æè¿ãè·³è¿...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
-msgstr "Êä³öÄ¿Â¼¿Õ¼ä²»×ã"
+msgstr "è¾åºç®å½ç©ºé´ä¸è¶³"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
-msgstr "µ÷ÓÃ CDPRip\n"
+msgstr "è°ç¨ CDPRip\n"
 
-#: src/rip.c:1749
-#, fuzzy, c-format
+#: src/rip.c:1762
+#, c-format
 msgid "Added track %d to %s list\n"
-msgstr "Ìí¼ÓÇúÄ¿ %d µ½±àÂë¶ÓÁÐ\n"
+msgstr "æ·»å æ²ç® %d å° %s éå\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
-msgstr "Ã»ÓÐ¿ÕÏÐµÄ´¦ÀíÆ÷\n"
+msgstr "æ²¡æç©ºé²çå¤çå¨\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, c-format
 msgid "Enc track %d\n"
-msgstr "±àÂë ÇúÄ¿ %d\n"
+msgstr "ç¼ç  æ²ç® %d\n"
 
-#: src/rip.c:1817
-#, fuzzy
+#: src/rip.c:1830
 msgid "No write access to write encoded file."
-msgstr "Ã»ÓÐÐ´±àÂëºóµÄÎÄ¼þµÄÈ¨ÏÞ"
+msgstr "æ²¡æåç¼ç åçæä»¶çæéã"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
-msgstr "%i: ±àÂëµ½ %s\n"
+msgstr "%i: ç¼ç å° %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
-msgstr "±àÂë: ÇúÄ¿ %d (0.0x)"
+msgstr "ç¼ç : æ²ç® %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
-msgstr ""
+msgstr "å¨ CalculateAll ä¸\n"
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""
 
 #: src/tray.c:57
-#, fuzzy
 msgid "Artist"
-msgstr "ÎÞ×÷Õß"
+msgstr "èºæ¯å®¶"
 
 #: src/tray.c:58
-#, fuzzy
 msgid "Title"
-msgstr "ÎÞ±êÌâ"
+msgstr "æ é¢"
 
 #: src/tray.c:83
 #, c-format
@@ -1272,6 +1287,8 @@
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
+"%s - %s\n"
+"%02d:%02d å± %02d:%02d"
 
 #: src/tray.c:87
 #, c-format
@@ -1289,6 +1306,8 @@
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
+"%s - %s\n"
+"%s%s%s"
 
 #: src/tray.c:92
 #, c-format
@@ -1296,78 +1315,77 @@
 "%s - %s\n"
 "Idle"
 msgstr ""
+"%s - %s\n"
+"ç©ºé²"
 
 #: src/tray.c:191
 msgid "Pause"
-msgstr ""
+msgstr "æå"
 
 #: src/tray.c:196
-#, fuzzy
 msgid "Stop"
-msgstr "Í£Ö¹·ÅÒô"
+msgstr "åæ¢"
 
 #: src/tray.c:204
 msgid "Previous"
-msgstr ""
+msgstr "ä¸ä¸ä¸ª"
 
 #: src/tray.c:209
-#, fuzzy
 msgid "Next"
-msgstr "ÏÂÒ»¹âÅÌ"
+msgstr "ä¸ä¸ä¸ª"
 
 #: src/tray.c:217
-#, fuzzy
 msgid "Rip and Encode"
-msgstr "Í£Ö¹×¥¹ìºÍ±àÂë"
+msgstr "æè½¨å¹¶ç¼ç "
 
 #: src/tray.c:224
 msgid "Quit"
-msgstr ""
+msgstr "éåº"
 
 #~ msgid ""
 #~ "Invalid rip executable\n"
 #~ "Check your rip config"
 #~ msgstr ""
-#~ "·Ç·¨µÄ×¥¹ì³ÌÐò\n"
-#~ "Çë¼ì²éÄãµÄ×¥¹ìÆ÷ÉèÖÃ"
+#~ "éæ³çæè½¨ç¨åº\n"
+#~ "è¯·æ£æ¥ä½ çæè½¨å¨è®¾ç½®"
 
 #~ msgid "Keep application minimum size"
-#~ msgstr "±£³ÖÓ¦ÓÃ³ÌÐò´°¿Ú×îÐ¡³ß´ç"
+#~ msgstr "ä¿æåºç¨ç¨åºçªå£æå°å°ºå¯¸"
 
 #~ msgid "Reply is [%s]\n"
-#~ msgstr "»Ø¸´ÊÇ [%s]\n"
+#~ msgstr "åå¤æ¯ [%s]\n"
 
 #, fuzzy
 #~ msgid "File System Character set encoding"
-#~ msgstr "±àÂëºóÉ¾³ý .wav ÎÄ¼þ"
+#~ msgstr "ç¼ç åå é¤ .wav æä»¶"
 
 #~ msgid "Could not parse geometry string `%s'"
-#~ msgstr "ÎÞ·¨´¦Àí¼¸ºÎÊôÐÔ×Ö´®¡®%s¡¯"
+#~ msgstr "æ æ³å¤çå ä½å±æ§åä¸²â%sâ"
 
 #~ msgid "Aborted\n"
-#~ msgstr "È¡Ïû\n"
+#~ msgstr "åæ¶\n"
 
 #~ msgid "Exit GCD"
-#~ msgstr "ÍË³ö GCD"
+#~ msgstr "éåº GCD"
 
 #~ msgid "MP3 file format"
-#~ msgstr "MP3 ÎÄ¼þ¸ñÊ½"
+#~ msgstr "MP3 æä»¶æ ¼å¼"
 
 #~ msgid "MP3 'nice' value"
-#~ msgstr "±àÂëÆ÷ 'nice' ÓÅÏÈ¼¶"
+#~ msgstr "ç¼ç å¨ 'nice' ä¼åçº§"
 
 #~ msgid "MP3 filter command"
-#~ msgstr "MP3 ¹ýÂËÆ÷ÃüÁî"
+#~ msgstr "MP3 è¿æ»¤å¨å½ä»¤"
 
 #~ msgid "MP3"
-#~ msgstr "±àÂë"
+#~ msgstr "ç¼ç "
 
 #~ msgid ""
 #~ "Invalid MP3 executable\n"
 #~ "Check your MP3 config"
 #~ msgstr ""
-#~ "·Ç·¨µÄ±àÂë³ÌÐò\n"
-#~ "Çë¼ì²éÄãµÄ±àÂëÆ÷ÉèÖÃ"
+#~ "éæ³çç¼ç ç¨åº\n"
+#~ "è¯·æ£æ¥ä½ çç¼ç å¨è®¾ç½®"
 
 #~ msgid "MP3: Trk %d (0.0x)"
-#~ msgstr "±àÂë: ÇúÄ¿ %d (0.0x)"
+#~ msgstr "ç¼ç : æ²ç® %d (0.0x)"

grip-3.4.3.tar.gz/po/zh_HK.po -> grip-3.9.0.tar.gz/po/zh_HK.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: grip 3.0.0\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2017-07-05 08:35+0200\n"
+"POT-Creation-Date: 2018-07-10 17:38+0200\n"
 "PO-Revision-Date: 2002-04-25 18:30+0800\n"
 "Last-Translator: Anthony Fok <anthony@thizlinux.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -91,12 +91,12 @@
 msgid "General"
 msgstr ""
 
-#: src/grip.c:429 src/gripcfg.c:367 src/cdplay.c:252 src/cdplay.c:345
+#: src/grip.c:429 src/gripcfg.c:366 src/cdplay.c:275 src/cdplay.c:388
 #: src/rip.c:95
 msgid "Rip"
 msgstr "§ìy"
 
-#: src/grip.c:444 src/gripcfg.c:512
+#: src/grip.c:444 src/gripcfg.c:511
 #, fuzzy
 msgid "Encode"
 msgstr "½s½X¾¹"
@@ -142,11 +142,16 @@
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:913
+#: src/grip.c:639
+#, fuzzy
+msgid "Error: Trying to show homepage failed."
+msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
+
+#: src/grip.c:918
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:931
+#: src/grip.c:936
 #, fuzzy
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
@@ -157,362 +162,362 @@
 "±z¥i¯à»Ýn«·s³]©w Grip¡C\n"
 "ÂÂªº³]©wÀÉ¤w¸g³QÀx¦s¬° ~/.grip-old¡C"
 
-#: src/grip.c:1014
+#: src/grip.c:1019
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "¦øªA¾¹¬O %s¡A³s±µ°ð %d\n"
 
-#: src/grip.c:1035
+#: src/grip.c:1040
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/gripcfg.c:105
+#: src/gripcfg.c:104
 msgid "Config"
 msgstr "³]©w"
 
-#: src/gripcfg.c:113
+#: src/gripcfg.c:112
 msgid "CDRom device"
 msgstr "CDROM ¸Ë¸m"
 
-#: src/gripcfg.c:118
+#: src/gripcfg.c:117
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Â÷¶}©Î±Ò°Êªº®ÉÔ¤£¤¤Â_¼½©ñ"
 
-#: src/gripcfg.c:122
+#: src/gripcfg.c:121
 msgid "Rewind when stopped"
 msgstr "°±¤î®É«á°h¨ì¦±º"
 
-#: src/gripcfg.c:127
+#: src/gripcfg.c:126
 msgid "Startup with first track if not playing"
 msgstr "¦pªG¨S¦³¶}©l¼½©ñ«h±q²Ä¤@º¶}©l"
 
-#: src/gripcfg.c:132
+#: src/gripcfg.c:131
 msgid "Auto-play on disc insert"
 msgstr "CD ´¡¤J®É¦Û°Ê¼½©ñ"
 
-#: src/gripcfg.c:137
+#: src/gripcfg.c:136
 msgid "Reshuffle before each playback"
 msgstr "¨C¦¸¼½©ñ«e«·s¥´¶Ã¼½©ñ¦¸§Ç"
 
-#: src/gripcfg.c:142
+#: src/gripcfg.c:141
 msgid "Work around faulty eject"
 msgstr "×¥¿¿ù»~ªº¼u¥X"
 
-#: src/gripcfg.c:147
+#: src/gripcfg.c:146
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:151
+#: src/gripcfg.c:150
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:159
+#: src/gripcfg.c:158
 msgid "CD"
 msgstr "¥úºÐ"
 
-#: src/gripcfg.c:175
+#: src/gripcfg.c:174
 msgid "Ripper:"
 msgstr "§ìy¤u¨ã:"
 
-#: src/gripcfg.c:220
+#: src/gripcfg.c:219
 msgid "Ripping executable"
 msgstr "§ìyµ{¦¡"
 
-#: src/gripcfg.c:225
+#: src/gripcfg.c:224
 msgid "Rip command-line"
 msgstr "§ìy¾¹°õ¦æ°Ñ¼Æ"
 
-#: src/gripcfg.c:236
+#: src/gripcfg.c:235
 msgid "Disable paranoia"
 msgstr "°±¥Î paranoia"
 
-#: src/gripcfg.c:241
+#: src/gripcfg.c:240
 msgid "Disable extra paranoia"
 msgstr "°±¥Î¥~³¡ paranoia"
 
-#: src/gripcfg.c:247
+#: src/gripcfg.c:246
 msgid "Disable scratch"
 msgstr "°±¥ÎÀ¿²ª"
 
-#: src/gripcfg.c:251
+#: src/gripcfg.c:250
 msgid "detection"
 msgstr "°»´ú"
 
-#: src/gripcfg.c:255
+#: src/gripcfg.c:254
 msgid "repair"
 msgstr "×´_"
 
-#: src/gripcfg.c:263
+#: src/gripcfg.c:262
 msgid "Calculate gain adjustment"
 msgstr "pºâ¼W¯q½Õ¾ã"
 
-#: src/gripcfg.c:271
+#: src/gripcfg.c:270
 msgid "Rip file format"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:276
+#: src/gripcfg.c:275
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:280
+#: src/gripcfg.c:279
 msgid "Generic SCSI device"
 msgstr "³q¥Î SCSI ¸Ë¸m"
 
-#: src/gripcfg.c:288
+#: src/gripcfg.c:287
 msgid "Ripper"
 msgstr "§ìy¤u¨ã"
 
-#: src/gripcfg.c:297
+#: src/gripcfg.c:296
 msgid "Rip 'nice' value"
 msgstr "§ìy 'nice' Àu¥ýÈ"
 
-#: src/gripcfg.c:301
+#: src/gripcfg.c:300
 msgid "Max non-encoded .wav's"
 msgstr "³Ì¤j«Ý½s½Xªº .wav ÀÉ®×¼Æ"
 
-#: src/gripcfg.c:307
+#: src/gripcfg.c:306
 msgid "Auto-rip on insert"
 msgstr "¥úºÐ´¡¤J¦Û°Ê§ìy"
 
-#: src/gripcfg.c:311
+#: src/gripcfg.c:310
 msgid "Beep after rip"
 msgstr "§ìy§¹¦¨«áÅT¹a"
 
-#: src/gripcfg.c:321
+#: src/gripcfg.c:320
 msgid "Auto-eject after rip"
 msgstr "§ìy§¹¦¨«á¦Û°Ê¼u¥X¥úºÐ"
 
-#: src/gripcfg.c:325
+#: src/gripcfg.c:324
 msgid "Auto-eject delay"
 msgstr "¦Û°Ê¼u¥X©µ¿ð"
 
-#: src/gripcfg.c:333
+#: src/gripcfg.c:332
 msgid "Delay before ripping"
 msgstr ""
 
-#: src/gripcfg.c:338
+#: src/gripcfg.c:337
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:343
+#: src/gripcfg.c:342
 msgid "Stop cdrom drive between tracks"
 msgstr ""
 
-#: src/gripcfg.c:347
+#: src/gripcfg.c:346
 msgid "Wav filter command"
 msgstr "WAV ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:352
+#: src/gripcfg.c:351
 msgid "Disc filter command"
 msgstr "¥úºÐ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:360 src/gripcfg.c:505
+#: src/gripcfg.c:359 src/gripcfg.c:504
 msgid "Options"
 msgstr "¿ï¶µ"
 
-#: src/gripcfg.c:382
+#: src/gripcfg.c:381
 msgid "Encoder:"
 msgstr "½s½X¾¹:"
 
-#: src/gripcfg.c:417
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder executable"
 msgstr "½s½X¾¹µ{¦¡"
 
-#: src/gripcfg.c:422
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder command-line"
 msgstr "½s½X¾¹°õ¦æ°Ñ¼Æ"
 
-#: src/gripcfg.c:428
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:433
+#: src/gripcfg.c:432
 #, fuzzy
 msgid "Encoder file format"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:439
+#: src/gripcfg.c:438
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:447
+#: src/gripcfg.c:446
 msgid "Encoder"
 msgstr "½s½X¾¹"
 
-#: src/gripcfg.c:457
+#: src/gripcfg.c:456
 msgid "Delete .wav after encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:462
+#: src/gripcfg.c:461
 msgid "Insert info into SQL database"
 msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
 
-#: src/gripcfg.c:466
+#: src/gripcfg.c:465
 msgid "Create .m3u files"
 msgstr "«Ø¥ß .m3u ÀÉ®×"
 
-#: src/gripcfg.c:471
+#: src/gripcfg.c:470
 msgid "Use relative paths in .m3u files"
 msgstr "¦b .m3u ÀÉ®×¤¤¨Ï¥Î¬Û¹ï¸ô®|"
 
-#: src/gripcfg.c:475
+#: src/gripcfg.c:474
 msgid "M3U file format"
 msgstr "M3U ÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:480
+#: src/gripcfg.c:479
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "½s½X¦ì¤¸²v (kbits/sec)"
 
-#: src/gripcfg.c:484
+#: src/gripcfg.c:483
 msgid "Number of CPUs to use"
 msgstr "CPU ¨Ï¥Î¼Æ¥Ø"
 
-#: src/gripcfg.c:488
+#: src/gripcfg.c:487
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "§ìy 'nice' Àu¥ýÈ"
 
-#: src/gripcfg.c:492
+#: src/gripcfg.c:491
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "¥úºÐ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:497
+#: src/gripcfg.c:496
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:521
+#: src/gripcfg.c:520
 #, fuzzy
 msgid "Add ID3 tags to encoded files"
 msgstr "¶ñ¤J ID3 ¼ÐÅÒ¨ì MP3 ÀÉ®×"
 
-#: src/gripcfg.c:527
+#: src/gripcfg.c:526
 #, fuzzy
 msgid "Add ID3v2 tags to encoded files"
 msgstr "¶ñ¤J ID3v2 ¼ÐÅÒ¨ì MP3 ÀÉ®×"
 
-#: src/gripcfg.c:533
+#: src/gripcfg.c:532
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:537
+#: src/gripcfg.c:536
 msgid "ID3 comment field"
 msgstr "ID3 µùÄÀ¸ê°T"
 
-#: src/gripcfg.c:542
+#: src/gripcfg.c:541
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:548
+#: src/gripcfg.c:547
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:556
+#: src/gripcfg.c:555
 msgid "ID3"
 msgstr "¼ÐÅÒ"
 
-#: src/gripcfg.c:573 src/gripcfg.c:593
+#: src/gripcfg.c:572 src/gripcfg.c:592
 msgid "DB server"
 msgstr "¸ê®Æ®w¦øªA¾¹"
 
-#: src/gripcfg.c:577 src/gripcfg.c:597
+#: src/gripcfg.c:576 src/gripcfg.c:596
 msgid "CGI path"
 msgstr "CGI ¸ô®|"
 
-#: src/gripcfg.c:584
+#: src/gripcfg.c:583
 msgid "Primary Server"
 msgstr "¥D¦øªA¾¹"
 
-#: src/gripcfg.c:604
+#: src/gripcfg.c:603
 msgid "Secondary Server"
 msgstr "¦¸¦øªA¾¹"
 
-#: src/gripcfg.c:614
+#: src/gripcfg.c:613
 msgid "DB Submit email"
 msgstr "DB ´£¥æ¹q¤l¶l¥ó"
 
-#: src/gripcfg.c:619
+#: src/gripcfg.c:618
 #, fuzzy
 msgid "DB Character set encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:624
+#: src/gripcfg.c:623
 msgid "Use freedb extensions"
 msgstr "¨Ï¥Î FreeDB ÂX®i"
 
-#: src/gripcfg.c:629
+#: src/gripcfg.c:628
 msgid "Perform disc lookups automatically"
 msgstr "¦Û°Ê¶i¦æ¥úºÐ¬d¸ß"
 
-#: src/gripcfg.c:637
+#: src/gripcfg.c:636
 msgid "DiscDB"
 msgstr "CD¸ê®Æ®w"
 
-#: src/gripcfg.c:646
+#: src/gripcfg.c:645
 msgid "Use proxy server"
 msgstr "¨Ï¥Î¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:653
+#: src/gripcfg.c:652
 msgid "Get server from 'http_proxy' env. var"
 msgstr "±q 'http_proxy' Àô¹ÒÅÜ¼Æ«ü©w¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:657
+#: src/gripcfg.c:656
 msgid "Proxy server"
 msgstr "¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:661
+#: src/gripcfg.c:660
 msgid "Proxy port"
 msgstr "¥N²z¦øªA¾¹³s±µ°ð"
 
-#: src/gripcfg.c:665
+#: src/gripcfg.c:664
 msgid "Proxy username"
 msgstr "¥N²z¦øªA¾¹¨Ï¥ÎªÌ¦WºÙ"
 
-#: src/gripcfg.c:671
+#: src/gripcfg.c:670
 msgid "Proxy password"
 msgstr "¥N²z¦øªA¾¹±K½X"
 
-#: src/gripcfg.c:679
+#: src/gripcfg.c:678
 msgid "Proxy"
 msgstr "¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:688
+#: src/gripcfg.c:687
 msgid "Email address"
 msgstr "¹q¤l¶l¥ó"
 
-#: src/gripcfg.c:692
+#: src/gripcfg.c:691
 msgid "CD update program"
 msgstr "CD §ó·sµ{¦¡"
 
-#: src/gripcfg.c:697
+#: src/gripcfg.c:696
 msgid "Do not lowercase filenames"
 msgstr "¤£n±NÀÉ®×¦WÂà´«¦¨¤p¼g¦r¥À"
 
-#: src/gripcfg.c:702
+#: src/gripcfg.c:701
 msgid "Allow high bits in filenames"
 msgstr "¤¹³\ÀÉ¦W§t°ª 8 ¦ì¦r¤¸"
 
-#: src/gripcfg.c:707
+#: src/gripcfg.c:706
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:712
+#: src/gripcfg.c:711
 msgid "Do not change spaces to underscores"
 msgstr "¤£n±NªÅ®æÂà´«¦¨©³½u"
 
-#: src/gripcfg.c:717
+#: src/gripcfg.c:716
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:722
+#: src/gripcfg.c:721
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -520,20 +525,20 @@
 "ÀÉ¦W¤¤¤£¥h°£ªº¦r²Å\n"
 " "
 
-#: src/gripcfg.c:727
+#: src/gripcfg.c:726
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:734
+#: src/gripcfg.c:733
 msgid "Misc"
 msgstr "Âø¶µ"
 
-#: src/gripcfg.c:840
+#: src/gripcfg.c:839
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/gripcfg.c:911
+#: src/gripcfg.c:913
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
@@ -568,32 +573,36 @@
 msgid "CDIOCEJECT"
 msgstr ""
 
-#: src/cdplay.c:84
+#: src/cdplay.c:88
 #, fuzzy
 msgid "Cannot do lookup while ripping."
 msgstr "µLªk¦b§ìy¹Lµ{¤¤¬d¸ß"
 
 #. "misc"
-#: src/cdplay.c:121
+#: src/cdplay.c:125
 msgid "Unknown Disc"
 msgstr "¥¼ª¾¥úºÐ"
 
-#: src/cdplay.c:125
+#: src/cdplay.c:129
 #, c-format
 msgid "Track %02d"
 msgstr "Track %02d"
 
-#: src/cdplay.c:185
+#: src/cdplay.c:183
 #, c-format
 msgid "Querying %s (through %s) for disc %02x.\n"
 msgstr "¥¿¦b (³z¹L %2$s) ¦V %1$s ¬d¸ß¥úºÐ %3$02x¡C\n"
 
-#: src/cdplay.c:190
+#: src/cdplay.c:188
 #, c-format
 msgid "Querying %s for disc %02x.\n"
 msgstr "¥¿¦b¦V %s ¬d¸ß¥úºÐ %02x¡C\n"
 
-#: src/cdplay.c:207
+#: src/cdplay.c:210
+msgid "No match\n"
+msgstr "¤£¤Ç°t\n"
+
+#: src/cdplay.c:237
 #, c-format
 msgid ""
 "Match for \"%s / %s\"\n"
@@ -602,177 +611,206 @@
 "¥¿¦b¤Ç°t \"%s / %s\"\n"
 "¥¿¦b¤U¸ü¸ê®Æ...\n"
 
-#: src/cdplay.c:215
+#: src/cdplay.c:246
 msgid "Done\n"
 msgstr "§¹¦¨\n"
 
-#: src/cdplay.c:219
+#: src/cdplay.c:249
 msgid "Error saving disc data\n"
 msgstr "Àx¦s¥úºÐ¸ê®Æ¿ù»~\n"
 
-#: src/cdplay.c:225
-msgid "No match\n"
-msgstr "¤£¤Ç°t\n"
-
-#: src/cdplay.c:243 src/cdplay.c:334
+#: src/cdplay.c:266 src/cdplay.c:377
 #, fuzzy
 msgid "Length"
 msgstr "ªø«×"
 
-#: src/cdplay.c:299
+#: src/cdplay.c:321
 msgid "Tracks"
 msgstr "¦±¥Ø"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:338
+msgid "Select previous CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:346
+msgid "Select next CDDB entry."
+msgstr ""
+
+#: src/cdplay.c:366
 msgid "Track"
 msgstr "¦±¥Ø"
 
-#: src/cdplay.c:630 src/discedit.c:390
+#: src/cdplay.c:453
+msgid "DoNextDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:456 src/cdplay.c:483
+msgid "No disc data. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:461
+msgid "Already at last index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:470 src/cdplay.c:497
+#, fuzzy
+msgid "Done.\n"
+msgstr "§¹¦¨\n"
+
+#: src/cdplay.c:480
+msgid "DoPrevDiscDBEntry.\n"
+msgstr ""
+
+#: src/cdplay.c:488
+msgid "Already at first index. Returning.\n"
+msgstr ""
+
+#: src/cdplay.c:724 src/discedit.c:390
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Àx¦s¥úºÐ¸ê°T¿ù»~"
 
-#: src/cdplay.c:701
+#: src/cdplay.c:795
 msgid "Rotate play mode"
 msgstr "´`Àô¼½©ñ¼Ò¦¡"
 
-#: src/cdplay.c:721
+#: src/cdplay.c:815
 msgid "Toggle loop play"
 msgstr "¤Á´«´`Àô¼½©ñ"
 
-#: src/cdplay.c:799 src/rip.c:230
+#: src/cdplay.c:893 src/rip.c:230
 msgid "Rip status"
 msgstr "§ìyª¬ºA"
 
-#: src/cdplay.c:866
+#: src/cdplay.c:960
 msgid "Play track / Pause play"
 msgstr "¼½©ñ/¼È°±"
 
-#: src/cdplay.c:877
+#: src/cdplay.c:971
 msgid "Rewind"
 msgstr "Ë°h"
 
-#: src/cdplay.c:888
+#: src/cdplay.c:982
 msgid "FastForward"
 msgstr "§Ö¶i"
 
-#: src/cdplay.c:898
+#: src/cdplay.c:992
 msgid "Go to previous track"
 msgstr "¤W¤@¦±"
 
-#: src/cdplay.c:907
+#: src/cdplay.c:1001
 msgid "Go to next track"
 msgstr "¤U¤@¦±"
 
-#: src/cdplay.c:916
+#: src/cdplay.c:1010
 msgid "Toggle play mode options"
 msgstr "¤Á´«¼½©ñ¼Ò¦¡¿ï¶µ"
 
-#: src/cdplay.c:926
+#: src/cdplay.c:1020
 msgid "Next Disc"
 msgstr "¤U¤@¥úºÐ"
 
-#: src/cdplay.c:940
+#: src/cdplay.c:1034
 msgid "Stop play"
 msgstr "°±¤î¼½©ñ"
 
-#: src/cdplay.c:950
+#: src/cdplay.c:1044
 msgid "Eject disc"
 msgstr "¼u¥X¥úºÐ"
 
-#: src/cdplay.c:959
+#: src/cdplay.c:1053
 #, fuzzy
 msgid "Scan Disc Contents"
 msgstr "¥Ø¿ý"
 
-#: src/cdplay.c:967
+#: src/cdplay.c:1061
 msgid "Toggle Volume Control"
 msgstr "¤Á´«µ¶q±±¨î"
 
-#: src/cdplay.c:976
+#: src/cdplay.c:1070
 msgid "Toggle disc editor"
 msgstr "¤Á´«¥úºÐ½s¿è¾¹"
 
-#: src/cdplay.c:986
+#: src/cdplay.c:1080
 msgid "Initiate/abort DiscDB lookup"
 msgstr "ªì©l¤Æ/¨ú®ø¥úºÐ¬d¸ß"
 
-#: src/cdplay.c:996
+#: src/cdplay.c:1090
 msgid "Toggle track display"
 msgstr "¤Á´«¦±¥ØÅã¥Ü"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:1097
 msgid "Exit Grip"
 msgstr "Â÷¶} Grip"
 
-#: src/cdplay.c:1170
+#: src/cdplay.c:1264
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à§Ö¶i"
 
-#: src/cdplay.c:1201
+#: src/cdplay.c:1295
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯àË°h"
 
-#: src/cdplay.c:1232
+#: src/cdplay.c:1326
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à¤Á´«¥úºÐ"
 
-#: src/cdplay.c:1250
+#: src/cdplay.c:1344
 msgid "Eject disc\n"
 msgstr "¼u¥X¥úºÐ\n"
 
-#: src/cdplay.c:1254
+#: src/cdplay.c:1348
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "¤£¯à¦b§ìy¹Lµ{¤¤¼u¥X¥úºÐ"
 
-#: src/cdplay.c:1264
+#: src/cdplay.c:1358
 msgid "Have disc -- ejecting\n"
 msgstr "¦³¥úºÐ¢w¢w¥¿¦b¼u¥X\n"
 
-#: src/cdplay.c:1331
+#: src/cdplay.c:1425
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à¼½©ñ"
 
-#: src/cdplay.c:1399 src/cdplay.c:1430
+#: src/cdplay.c:1493 src/cdplay.c:1524
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à§ïÅÜ¦±¥Ø"
 
-#: src/cdplay.c:1521
+#: src/cdplay.c:1615
 msgid "Checking for a new disc\n"
 msgstr "¥¿¦bÀË¬d·s¥úºÐ\n"
 
-#: src/cdplay.c:1526
+#: src/cdplay.c:1620
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat µo²{¥úºÐ¡A¥¿¦bÀË¬d¦±¥Ø\n"
 
-#: src/cdplay.c:1529
+#: src/cdplay.c:1623
 msgid "We have a valid disc!\n"
 msgstr "¥úºÐ¦³®Ä¡I\n"
 
-#: src/cdplay.c:1556
+#: src/cdplay.c:1650
 msgid "No non-zero length tracks\n"
 msgstr "¨S¦³«D¹sªø«×ªº¦±¥Ø\n"
 
-#: src/cdplay.c:1565
+#: src/cdplay.c:1659
 msgid "CDStat said no disc\n"
 msgstr "CDStat »¡µL¥úºÐ\n"
 
-#: src/cdplay.c:1714 src/cdplay.c:1736
+#: src/cdplay.c:1808 src/cdplay.c:1830
 #, c-format
 msgid "Current sector: %6d"
 msgstr "·í«e®°°Ï: %6d"
 
-#: src/cdplay.c:1837
+#: src/cdplay.c:1931
 msgid "No Disc"
 msgstr "µL¥úºÐ"
 
-#: src/cdplay.c:1889
+#: src/cdplay.c:1983
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -784,51 +822,56 @@
 "\n"
 "±z¬O§_·Q´£¥æ¦¹¥úºÐ¸ê°T¡H"
 
-#: src/cdplay.c:1917 src/cdplay.c:1926
+#: src/cdplay.c:2012 src/cdplay.c:2021
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "¿ù»~: µLªk«Ø¥ß¼È¦sÀÉ"
 
-#: src/cdplay.c:1944
+#: src/cdplay.c:2039
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "¿ù»~: µLªk¼g¤J¥úºÐ¸ê®Æ"
 
-#: src/cdplay.c:1953
+#: src/cdplay.c:2048
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "µo°e¶l¥ó¨ì %s\n"
 
+#: src/cdplay.c:2053
+#, fuzzy
+msgid "Error: Unable to execute mail command."
+msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
+
 #: src/dialog.c:44
 msgid "System Message"
 msgstr "¨t²Î®ø®§"
 
-#: src/discdb.c:207
+#: src/discdb.c:209
 #, c-format
 msgid "URI is %s\n"
 msgstr "URI ¬O %s\n"
 
-#: src/discdb.c:287
+#: src/discdb.c:290
 #, c-format
 msgid "Query is [%s]\n"
 msgstr "¬d¸ß¬O [%s]\n"
 
-#: src/discdb.c:788
+#: src/discdb.c:792
 #, c-format
 msgid "Stat error %d on %s\n"
 msgstr "ª¬ºA¿ù»~ %d ¦b %s\n"
 
-#: src/discdb.c:792
+#: src/discdb.c:796
 #, c-format
 msgid "Creating directory %s\n"
 msgstr "«Ø¥ß¥Ø¿ý %s\n"
 
-#: src/discdb.c:797
+#: src/discdb.c:801
 #, c-format
 msgid "Error: %s exists, but is a file\n"
 msgstr "¿ù»~: %s ¤w¸g¦s¦b¡A¦ý«o¬O¤@ÓÀÉ®×\n"
 
-#: src/discdb.c:804
+#: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
 msgstr "¿ù»~: µLªk¶}±Ò %s ¶i¦æ¼g¤J\n"
@@ -955,7 +998,7 @@
 msgstr "¨ú®ø"
 
 #. Doh!
-#: src/id3.c:291
+#: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "¥¼ª¾ªº ID3 °ì\n"
 
@@ -964,7 +1007,7 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "¿ù»~: µLªkÂà´«ÀÉ¦W¡CµL¦¹¨Ï¥ÎªÌ %s\n"
 
-#: src/launch.c:315 src/rip.c:1629
+#: src/launch.c:312 src/rip.c:1638
 msgid "Exec failed\n"
 msgstr "°õ¦æ¥¢±Ñ\n"
 
@@ -972,7 +1015,12 @@
 msgid "Error: Bad entry type\n"
 msgstr "¿ù»~: Ãaªº¶µ¥ØÃþ«¬\n"
 
-#: src/parsecfg.c:84
+#: src/parsecfg.c:81
+#, fuzzy
+msgid "Error: Reading config file\n"
+msgstr "¿ù»~: µL®Äªº³]©wÀÉ\n"
+
+#: src/parsecfg.c:87
 msgid "Error: Invalid config file\n"
 msgstr "¿ù»~: µL®Äªº³]©wÀÉ\n"
 
@@ -1029,7 +1077,7 @@
 msgstr "¥Ø«e®°°Ï:      0"
 
 #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1133 src/rip.c:1134
+#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
 msgid "Rip: Idle"
 msgstr "§ìy: ¶¢¸m"
 
@@ -1038,7 +1086,7 @@
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "½s½X: ¦±¥Ø 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1104 src/rip.c:1118
+#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
 #, fuzzy
 msgid "Enc: Idle"
 msgstr "½s½X: ¶¢¸m"
@@ -1122,32 +1170,32 @@
 msgid "Deleting [%s]\n"
 msgstr "¥¿¦b§R°£ [%s]\n"
 
-#: src/rip.c:1126
+#: src/rip.c:1124
 msgid "Ripping is finished\n"
 msgstr "§ìy§¹¦¨\n"
 
-#: src/rip.c:1251 src/rip.c:1257 src/rip.c:1296
+#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
 msgid "NoArtist"
 msgstr "µL§@ªÌ"
 
-#: src/rip.c:1262
+#: src/rip.c:1258
 msgid "NoTitle"
 msgstr "µL¼ÐÃD"
 
-#: src/rip.c:1357
+#: src/rip.c:1354
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1366
+#: src/rip.c:1367
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1374
+#: src/rip.c:1378
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1157,7 +1205,7 @@
 "µL®Äªº§ìyµ{¦¡\n"
 "½ÐÀË¬d§Aªº§ìy¾¹³]©w"
 
-#: src/rip.c:1410
+#: src/rip.c:1414
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1165,93 +1213,93 @@
 "¨S¦³¿ï¾Ü¦±¥Ø¡C\n"
 "§ì¨ú¾ã¤ù¥úºÐ¶Ü¡H\n"
 
-#: src/rip.c:1436
+#: src/rip.c:1440
 msgid "Ripping whole CD\n"
 msgstr "¥¿¦b§ì¨ú¾ã¤ù¥úºÐ\n"
 
-#: src/rip.c:1476
+#: src/rip.c:1480
 msgid "In RipNextTrack\n"
 msgstr "¦b§ì¨ú¤U¤@y\n"
 
-#: src/rip.c:1483
+#: src/rip.c:1487
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "²Ä¤@ÓÀË¬dªº¦±¥Ø¬O %d\n"
 
-#: src/rip.c:1493
+#: src/rip.c:1497
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1543
+#: src/rip.c:1547
 msgid "No write access to write wav file"
 msgstr "¨S¦³¼g¤J wav ÀÉ®×ªºÅv"
 
-#: src/rip.c:1557
+#: src/rip.c:1561
 #, c-format
 msgid "Ripping track %d to %s\n"
 msgstr "¥¿¦b§ì¨ú¦±¥Ø %d ¨ì %s\n"
 
-#: src/rip.c:1561
+#: src/rip.c:1565
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "§ìy: ¦±¥Ø %d (0.0x)"
 
-#: src/rip.c:1566
+#: src/rip.c:1570
 #, c-format
 msgid "File %s has already been ripped. Skipping...\n"
 msgstr "ÀÉ®× %s ¤w¸g§ì¹L¡C¸õ¹L...\n"
 
-#: src/rip.c:1587 src/rip.c:1843
+#: src/rip.c:1591 src/rip.c:1856
 msgid "Out of space in output directory"
 msgstr "¿é¥X¥Ø¿ýªÅ¶¡¤£¨¬"
 
-#: src/rip.c:1663
+#: src/rip.c:1673
 msgid "Calling CDPRip\n"
 msgstr "©I¥s CDPRip\n"
 
-#: src/rip.c:1749
+#: src/rip.c:1762
 #, fuzzy, c-format
 msgid "Added track %d to %s list\n"
 msgstr "²K¥[¦±¥Ø %d ¨ì½s½X¶¤¦C\n"
 
-#: src/rip.c:1776
+#: src/rip.c:1789
 msgid "No free cpus\n"
 msgstr "¨S¦³¶¢¸mªº³B²z¾¹\n"
 
-#: src/rip.c:1792
+#: src/rip.c:1805
 #, fuzzy, c-format
 msgid "Enc track %d\n"
 msgstr "MP3 ¦±¥Ø %d\n"
 
-#: src/rip.c:1817
+#: src/rip.c:1830
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "¨S¦³¼g¤J mp3 ÀÉ®×ªºÅv"
 
-#: src/rip.c:1828
+#: src/rip.c:1841
 #, c-format
 msgid "%i: Encoding to %s\n"
 msgstr "%i: ½s½X¨ì %s\n"
 
-#: src/rip.c:1832
+#: src/rip.c:1845
 #, fuzzy, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "§ìy: ¦±¥Ø %d (0.0x)"
 
-#: src/rip.c:1898
+#: src/rip.c:1915
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1904
+#: src/rip.c:1921
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1920
+#: src/rip.c:1937
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1938
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""

grip-3.4.3.tar.gz/po/zh_TW.po -> grip-3.9.0.tar.gz/po/zh_TW.po Changed

grip-3.4.3.tar.gz/src/Makefile.in -> grip-3.9.0.tar.gz/src/Makefile.in Changed

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 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.
@@ -13,98 +13,323 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+bin_PROGRAMS = grip$(EXEEXT)
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_grip_OBJECTS = cppmain.$(OBJEXT) main.$(OBJEXT) grip.$(OBJEXT) \
+	cddev.$(OBJEXT) cdplay.$(OBJEXT) discedit.$(OBJEXT) \
+	rip.$(OBJEXT) cdpar.$(OBJEXT) id3.$(OBJEXT) discdb.$(OBJEXT) \
+	uihelper.$(OBJEXT) status_window.$(OBJEXT) dialog.$(OBJEXT) \
+	gripcfg.$(OBJEXT) parsecfg.$(OBJEXT) launch.$(OBJEXT) \
+	gain_analysis.$(OBJEXT) eggtrayicon.$(OBJEXT) tray.$(OBJEXT)
+grip_OBJECTS = $(am_grip_OBJECTS)
+am__DEPENDENCIES_1 =
+grip_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+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)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(grip_SOURCES)
+DIST_SOURCES = $(grip_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AS = @AS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CDPAR_LIBS = @CDPAR_LIBS@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNOME_CFLAGS = @GNOME_CFLAGS@
+GNOME_LIBS = @GNOME_LIBS@
+GREP = @GREP@
 ID3_LIBS = @ID3_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NM = @NM@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
+TERMINAL_WIDGET_CFLAGS = @TERMINAL_WIDGET_CFLAGS@
+TERMINAL_WIDGET_LIBS = @TERMINAL_WIDGET_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+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@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+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@
 INCLUDES = -I$(top_srcdir) -I$(includedir) \
 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
          -DG_LOG_DOMAIN=\"grip\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -114,9 +339,6 @@
         -DDATADIR=\""$(datadir)"\" \
         -DLIBDIR=\""$(libdir)"\"
 
-
-bin_PROGRAMS = grip
-
 grip_SOURCES = \
 	cppmain.cc \
         main.c \
@@ -157,104 +379,97 @@
 	tray.c \
 	tray.h 
 
-
 grip_LDADD = @TERMINAL_WIDGET_LIBS@ $(CDPAR_LIBS) $(ID3_LIBS)
-subdir = src
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = grip$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_grip_OBJECTS = cppmain.$(OBJEXT) main.$(OBJEXT) grip.$(OBJEXT) \
-	cddev.$(OBJEXT) cdplay.$(OBJEXT) discedit.$(OBJEXT) \
-	rip.$(OBJEXT) cdpar.$(OBJEXT) id3.$(OBJEXT) discdb.$(OBJEXT) \
-	uihelper.$(OBJEXT) status_window.$(OBJEXT) dialog.$(OBJEXT) \
-	gripcfg.$(OBJEXT) parsecfg.$(OBJEXT) launch.$(OBJEXT) \
-	gain_analysis.$(OBJEXT) eggtrayicon.$(OBJEXT) tray.$(OBJEXT)
-grip_OBJECTS = $(am_grip_OBJECTS)
-grip_DEPENDENCIES =
-grip_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cddev.Po ./$(DEPDIR)/cdpar.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cdplay.Po ./$(DEPDIR)/cppmain.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dialog.Po ./$(DEPDIR)/discdb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/discedit.Po ./$(DEPDIR)/eggtrayicon.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gain_analysis.Po ./$(DEPDIR)/grip.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gripcfg.Po ./$(DEPDIR)/id3.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/launch.Po ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/parsecfg.Po ./$(DEPDIR)/rip.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/status_window.Po ./$(DEPDIR)/tray.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/uihelper.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(grip_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(grip_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
-	  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 \
+	 || test -f $$p1 \
+	  ; 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) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(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:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-grip$(EXEEXT): $(grip_OBJECTS) $(grip_DEPENDENCIES) 
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+grip$(EXEEXT): $(grip_OBJECTS) $(grip_DEPENDENCIES) $(EXTRA_grip_DEPENDENCIES) 
 	@rm -f grip$(EXEEXT)
-	$(CXXLINK) $(grip_LDFLAGS) $(grip_OBJECTS) $(grip_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(grip_OBJECTS) $(grip_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -279,46 +494,47 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tray.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uihelper.Po@am__quote@
 
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
 .c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 .cc.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -326,78 +542,95 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(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; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@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"; \
-	    $(mkinstalldirs) "$(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
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -408,16 +641,22 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-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"
@@ -427,30 +666,54 @@
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
@@ -458,19 +721,32 @@
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am 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 maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
 
 # 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.

grip-3.4.3.tar.gz/src/cddev.c -> grip-3.9.0.tar.gz/src/cddev.c Changed

grip-3.4.3.tar.gz/src/cddev.h -> grip-3.9.0.tar.gz/src/cddev.h Changed

grip-3.4.3.tar.gz/src/cdpar.c -> grip-3.9.0.tar.gz/src/cdpar.c Changed

@@ -19,7 +19,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
  * USA
  */
 
@@ -89,7 +89,10 @@
 
 static void WriteWav(int f,long bytes)
 {
-  /* quick and dirty */
+  /* quick and dirty - ignore compiler warnings*/
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
 
   write(f,"RIFF",4);               /*  0-3 */
   PutNum(bytes+44-8,f,0,4);        /*  4-7 */
@@ -103,16 +106,16 @@
   PutNum(16,f,0,2);                /* 34-35 */
   write(f,"data",4);               /* 36-39 */
   PutNum(bytes,f,0,4);             /* 40-43 */
+#pragma GCC diagnostic pop
 }
 
 static void CDPCallback(long inpos,int function)
 {
-  static long c_sector=0,v_sector=0;
+  static long c_sector=0;
   static int last=0;
   static long lasttime=0;
   long sector,osector=0;
   struct timeval thistime;
-  static char heartbeat=' ';
   static int overlap=0;
   static int slevel=0;
   static int slast=0;
@@ -123,15 +126,12 @@
   sector=inpos/CD_FRAMEWORDS;
     
   if(function==-2){
-    v_sector=sector;
     return;
   }
 
   if(function==-1){
     last=8;
-    heartbeat='*';
     slevel=0;
-    v_sector=sector;
   } else
     switch(function){
     case PARANOIA_CB_VERIFY:
@@ -187,28 +187,7 @@
       last++;
       lasttime=test;
       if(last>7)last=0;
-      stimeout++;
-      switch(last){
-      case 0:
-	heartbeat=' ';
-	break;
-      case 1:case 7:
-	heartbeat='.';
-	break;
-      case 2:case 6:
-	heartbeat='o';
-	break;
-      case 3:case 5:  
-	heartbeat='0';
-	break;
-      case 4:
-	heartbeat='O';
-	break;
-      }
-
-      if(function==-1)
-	heartbeat='*';
-      
+        stimeout++;
     }
     if(slast!=slevel){
       stimeout=0;

grip-3.4.3.tar.gz/src/cdpar.h -> grip-3.9.0.tar.gz/src/cdpar.h Changed

grip-3.4.3.tar.gz/src/cdplay.c -> grip-3.9.0.tar.gz/src/cdplay.c Changed

@@ -16,7 +16,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
  * USA
  */
 
@@ -35,6 +35,10 @@
 static void ShutDownCB(GtkWidget *widget,gpointer data);
 static void DiscDBToggle(GtkWidget *widget,gpointer data);
 static void DoLookup(void *data);
+static void DoNextDiscDBEntry(GtkWidget *widget, gpointer data);
+static void DiscDBReadDisc(GripInfo *ginfo, DiscDBServer *server,
+		        DiscDBQuery *query, int query_idx);
+static void DoPrevDiscDBEntry(GtkWidget *widget, gpointer data);
 static void SetCurrentTrack(GripInfo *ginfo,int track);
 static void ToggleChecked(GripGUI *uinfo,int track);
 static void ClickColumn(GtkTreeViewColumn *column,gpointer data);
@@ -146,21 +150,16 @@
 static void DoLookup(void *data)
 {
   GripInfo *ginfo;
-  gboolean discdb_found=FALSE;
 
   ginfo=(GripInfo *)data;
 
   if(!DiscDBLookupDisc(ginfo,&(ginfo->dbserver))) {
     if(*(ginfo->dbserver2.name)) {
       if(DiscDBLookupDisc(ginfo,&(ginfo->dbserver2))) {
-        discdb_found=TRUE;
         ginfo->ask_submit=TRUE;
       }
     }
   }
-  else {
-    discdb_found=TRUE;
-  }
 
   if(ginfo->ddata.data_id3genre==-1)
     ginfo->ddata.data_id3genre=DiscDB2ID3(ginfo->ddata.data_genre);
@@ -173,7 +172,6 @@
 {
   DiscDBHello hello;
   DiscDBQuery query;
-  DiscDBEntry entry;
   gboolean success=FALSE;
   DiscInfo *disc;
   DiscData *ddata;
@@ -201,25 +199,12 @@
   if(!DiscDBDoQuery(disc,server,&hello,&query)) {
     ginfo->update_required=TRUE;
   } else {
+    ddata->data_query = query;
+	ddata->data_query_idx = 0;
     switch(query.query_match) {
     case MATCH_INEXACT:
     case MATCH_EXACT:
-      LogStatus(ginfo,_("Match for \"%s / %s\"\nDownloading data...\n"),
-		query.query_list[0].list_artist,
-                query.query_list[0].list_artist);
-
-      entry.entry_genre = query.query_list[0].list_genre;
-      entry.entry_id = query.query_list[0].list_id;
-      DiscDBRead(disc,server,&hello,&entry,ddata,ginfo->discdb_encoding);
-
-      Debug(_("Done\n"));
-      success=TRUE;
-		
-      if(DiscDBWriteDiscData(disc,ddata,NULL,TRUE,FALSE,"utf-8")<0)
-	g_print(_("Error saving disc data\n"));
-
-      ginfo->update_required=TRUE;
-      ginfo->is_new_disc=TRUE;
+		DiscDBReadDisc(ginfo, server, &query, 0);
       break;
     case MATCH_NOMATCH:
       LogStatus(ginfo,_("No match\n"));
@@ -230,6 +215,44 @@
   return success;
 }
 
+void DiscDBReadDisc(GripInfo *ginfo, DiscDBServer *server,
+		DiscDBQuery *query, int query_idx)
+{
+  DiscDBHello hello;
+  DiscDBEntry entry;
+  DiscInfo *disc;
+  DiscData *ddata;
+
+  disc=&(ginfo->disc);
+  ddata=&(ginfo->ddata);
+
+  strncpy(hello.hello_program,"Grip",256);
+  strncpy(hello.hello_version,VERSION,256);
+
+  if(ginfo->db_use_freedb)
+    hello.proto_version=6;
+  else
+    hello.proto_version=5;
+
+  LogStatus(ginfo,_("Match for \"%s / %s\"\nDownloading data...\n"),
+		  query->query_list[query_idx].list_artist,
+		  query->query_list[query_idx].list_artist);
+
+  entry.entry_genre = query->query_list[query_idx].list_genre;
+  entry.entry_id = query->query_list[query_idx].list_id;
+
+  DiscDBRead(disc,server,&hello,&entry,ddata,ginfo->discdb_encoding);
+
+  Debug(_("Done\n"));
+
+  if(DiscDBWriteDiscData(disc,ddata,NULL,TRUE,FALSE,"utf-8")<0)
+	  g_print(_("Error saving disc data\n"));
+
+  ginfo->update_required=TRUE;
+  ginfo->is_new_disc=TRUE;
+
+}
+
 int GetLengthRipWidth(GripInfo *ginfo)
 {
   GtkWidget *track_list;
@@ -270,7 +293,6 @@
   GtkWidget *track_list;
   GtkTreeViewColumn *column;
   int tot_width=0;
-  PangoLayout *layout;
 
   track_list=ginfo->gui_info.track_list;
 
@@ -309,6 +331,27 @@
   gtk_box_pack_start(GTK_BOX(vbox),uinfo->disc_artist_label,FALSE,FALSE,0);
   gtk_widget_show(uinfo->disc_artist_label);
 
+  uinfo->dbinfo_hbox=gtk_hbox_new(FALSE,0);
+
+  uinfo->dbinfo_back_button=gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
+  gtk_tooltips_set_tip(MakeToolTip(),uinfo->dbinfo_back_button,
+		  _("Select previous CDDB entry."),NULL);
+  gtk_signal_connect(GTK_OBJECT(uinfo->dbinfo_back_button),"clicked",
+		  GTK_SIGNAL_FUNC(DoPrevDiscDBEntry),(gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(uinfo->dbinfo_hbox),uinfo->dbinfo_back_button,FALSE,FALSE,0);
+  gtk_widget_show(uinfo->dbinfo_back_button);
+
+  uinfo->dbinfo_forward_button=gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+  gtk_tooltips_set_tip(MakeToolTip(),uinfo->dbinfo_forward_button,
+		  _("Select next CDDB entry."),NULL);
+  gtk_signal_connect(GTK_OBJECT(uinfo->dbinfo_forward_button),"clicked",
+		  GTK_SIGNAL_FUNC(DoNextDiscDBEntry),(gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(uinfo->dbinfo_hbox),uinfo->dbinfo_forward_button,FALSE,FALSE,0);
+  gtk_widget_show(uinfo->dbinfo_forward_button);
+
+  gtk_box_pack_start(GTK_BOX(vbox),uinfo->dbinfo_hbox,FALSE,FALSE,0);
+  gtk_widget_show(uinfo->dbinfo_hbox);
+
   uinfo->track_list_store=gtk_list_store_new(TRACKLIST_N_COLUMNS,
 					     G_TYPE_STRING,
 					     G_TYPE_STRING,
@@ -400,6 +443,60 @@
   gtk_widget_show(vbox);
 }
 
+void DoNextDiscDBEntry(GtkWidget *widget, gpointer data)
+{
+	GripInfo *ginfo;
+	ginfo=(GripInfo *)data;
+
+	DiscData *ddata = &(ginfo->ddata);
+
+	Debug(_("DoNextDiscDBEntry.\n"));
+
+	if (ddata == NULL) {
+	Debug(_("No disc data. Returning.\n"));
+		return;
+	}
+
+	if (ddata->data_query_idx >= (ddata->data_query.query_matches - 1)) {
+	Debug(_("Already at last index. Returning.\n"));
+		return;
+	}
+
+	ddata->data_query_idx++;
+
+	DiscDBReadDisc(ginfo, &(ginfo->dbserver), &(ddata->data_query),
+			ddata->data_query_idx);
+
+	Debug(_("Done.\n"));
+}
+
+void DoPrevDiscDBEntry(GtkWidget *widget, gpointer data)
+{
+	GripInfo *ginfo;
+	ginfo=(GripInfo *)data;
+
+	DiscData *ddata = &(ginfo->ddata);
+
+	Debug(_("DoPrevDiscDBEntry.\n"));
+
+	if (ddata == NULL) {
+	Debug(_("No disc data. Returning.\n"));
+		return;
+	}
+
+	if (ddata->data_query_idx <= 0) {
+	Debug(_("Already at first index. Returning.\n"));
+		return;
+	}
+
+	ddata->data_query_idx--;
+
+	DiscDBReadDisc(ginfo, &(ginfo->dbserver), &(ddata->data_query),
+			ddata->data_query_idx);
+
+	Debug(_("Done.\n"));
+}
+
 void SetCurrentTrackIndex(GripInfo *ginfo,int track)
 {
   /* Looks up the track of index track in the program */
@@ -415,7 +512,6 @@
 {
   char buf[256];
   int tracklen;
-  const gchar *st,*st2;
 
   GripGUI *uinfo;
 
@@ -596,10 +692,8 @@
   GtkTreeModel *model;
   int row=-1;
   GripInfo *ginfo;
-  GripGUI *uinfo;
  
   ginfo=(GripInfo *)data;
-  uinfo=&(ginfo->gui_info);
   
   if(gtk_tree_selection_get_selected(selection,&model,&iter)) {
     gtk_tree_model_get(model,&iter,TRACKLIST_NUM_COL,&row,-1);
@@ -1901,6 +1995,7 @@
 {
   GripInfo *ginfo;
   int fd;
+  int i;
   FILE *efp;
   char mailcmd[256];
   char filename[256];
@@ -1952,7 +2047,10 @@
 
       Debug(_("Mailing entry to %s\n"),ginfo->discdb_submit_email);
 
-      system(mailcmd);
+      i=system(mailcmd);
+      if (i!=0 && WIFEXITED(i)!=0)
+        gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+                          _("Error: Unable to execute mail command."));
 
       remove(filename);
     }

grip-3.4.3.tar.gz/src/cdplay.h -> grip-3.9.0.tar.gz/src/cdplay.h Changed

grip-3.4.3.tar.gz/src/common.h -> grip-3.9.0.tar.gz/src/common.h Changed

grip-3.4.3.tar.gz/src/dialog.c -> grip-3.9.0.tar.gz/src/dialog.c Changed

grip-3.4.3.tar.gz/src/dialog.h -> grip-3.9.0.tar.gz/src/dialog.h Changed

grip-3.4.3.tar.gz/src/discdb.c -> grip-3.9.0.tar.gz/src/discdb.c Changed

@@ -18,7 +18,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
  * USA
  *
  */
@@ -45,10 +45,11 @@
 #include "config.h"
 
 extern char *Program;
-static char *StrConvertEncoding(char *str,char *from,char *to,int max_len);
+static char *StrConvertEncoding(char *str,const char *from,
+                                const char *to,int max_len);
 gboolean DiscDBUTF8Validate(const DiscInfo *disc,const DiscData *data);
 static void DiscDBConvertEncoding(DiscInfo *disc,DiscData *data,
-                                  char *from,char *to);
+                                  const char *from,const char *to);
 static int DiscDBSum(int val);
 static char *DiscDBReadLine(char **dataptr);
 static GString *DiscDBMakeURI(DiscDBServer *server,DiscDBHello *hello,
@@ -170,7 +171,8 @@
 			       char *cmd)
 {
   GString *uri;
-  GString *proxy,*user;
+  GString *proxy=NULL;
+  GString *user=NULL;
   char user_agent[256];
   struct curl_slist *headers=NULL;
   FILE *outfile;
@@ -230,9 +232,8 @@
         data=(char *)malloc(filesize+1);
         
         if(data) {
-          fread(data,filesize,1,outfile);
-
-          data[filesize]='\0';
+          if (fread(data,filesize,1,outfile) > 0)
+            data[filesize]='\0';
         }
       }
       
@@ -246,10 +247,12 @@
     g_string_free(uri,TRUE);
 
     if(server->use_proxy) {
-      g_string_free(proxy,TRUE);
+      if (proxy)
+        g_string_free(proxy,TRUE);
 
       if(*server->proxy->username) {
-        g_string_free(user,TRUE);
+        if (user)
+          g_string_free(user,TRUE);
       }
     }
   }
@@ -496,7 +499,8 @@
   }
 }
 
-static char *StrConvertEncoding(char *str,char *from,char *to,int max_len)
+static char *StrConvertEncoding(char *str,const char *from,
+                                const char *to,int max_len)
 {
   char *conv_str;
   gsize rb,wb;
@@ -541,7 +545,7 @@
 
 
 static void DiscDBConvertEncoding(DiscInfo *disc,DiscData *data,
-                                  char *from,char *to)
+                                  const char *from,const char *to)
 {
   int track;

grip-3.4.3.tar.gz/src/discdb.h -> grip-3.9.0.tar.gz/src/discdb.h Changed

grip-3.4.3.tar.gz/src/discedit.c -> grip-3.9.0.tar.gz/src/discedit.c Changed

grip-3.4.3.tar.gz/src/discedit.h -> grip-3.9.0.tar.gz/src/discedit.h Changed

grip-3.4.3.tar.gz/src/eggtrayicon.c -> grip-3.9.0.tar.gz/src/eggtrayicon.c Changed

@@ -1,389 +1,389 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.c
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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 <string.h>
-#include <gdk/gdkx.h>
-#include "eggtrayicon.h"
-
-#define SYSTEM_TRAY_REQUEST_DOCK    0
-#define SYSTEM_TRAY_BEGIN_MESSAGE   1
-#define SYSTEM_TRAY_CANCEL_MESSAGE  2
-         
-static GtkPlugClass *parent_class = NULL;
-
-static void egg_tray_icon_init (EggTrayIcon *icon);
-static void egg_tray_icon_class_init (EggTrayIconClass *klass);
-
-static void egg_tray_icon_unrealize (GtkWidget *widget);
-
-static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
-
-GType
-egg_tray_icon_get_type (void)
-{
-  static GType our_type = 0;
-
-  our_type = g_type_from_name("EggTrayIcon");
-
-  if (our_type == 0)
-    {
-      static const GTypeInfo our_info =
-      {
-	sizeof (EggTrayIconClass),
-	(GBaseInitFunc) NULL,
-	(GBaseFinalizeFunc) NULL,
-	(GClassInitFunc) egg_tray_icon_class_init,
-	NULL, /* class_finalize */
-	NULL, /* class_data */
-	sizeof (EggTrayIcon),
-	0,    /* n_preallocs */
-	(GInstanceInitFunc) egg_tray_icon_init
-      };
-
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-    }
-  else if (parent_class == NULL) {
-    /* we're reheating the old class from a previous instance -  engage ugly hack =( */
-    egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
-  }
-
-  return our_type;
-}
-
-static void
-egg_tray_icon_init (EggTrayIcon *icon)
-{
-  icon->stamp = 1;
-  
-  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
-}
-
-static void
-egg_tray_icon_class_init (EggTrayIconClass *klass)
-{
-  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  widget_class->unrealize = egg_tray_icon_unrealize;
-}
-
-static GdkFilterReturn
-egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
-{
-  EggTrayIcon *icon = user_data;
-  XEvent *xev = (XEvent *)xevent;
-
-  if (xev->xany.type == ClientMessage &&
-      xev->xclient.message_type == icon->manager_atom &&
-      xev->xclient.data.l[1] == icon->selection_atom)
-    {
-      egg_tray_icon_update_manager_window (icon);
-    }
-  else if (xev->xany.window == icon->manager_window)
-    {
-      if (xev->xany.type == DestroyNotify)
-	{
-	  egg_tray_icon_update_manager_window (icon);
-	}
-    }
-  
-  return GDK_FILTER_CONTINUE;
-}
-
-static void
-egg_tray_icon_unrealize (GtkWidget *widget)
-{
-  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-  GdkWindow *root_window;
-
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if HAVE_GTK_MULTIHEAD
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-                                              icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-
-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-    }
-
-#if HAVE_GTK_MULTIHEAD
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
-
-  gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
-
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-egg_tray_icon_send_manager_message (EggTrayIcon *icon,
-				    long         message,
-				    Window       window,
-				    long         data1,
-				    long         data2,
-				    long         data3)
-{
-  XClientMessageEvent ev;
-  Display *display;
-  
-  ev.type = ClientMessage;
-  ev.window = window;
-  ev.message_type = icon->system_tray_opcode_atom;
-  ev.format = 32;
-  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-  ev.data.l[1] = message;
-  ev.data.l[2] = data1;
-  ev.data.l[3] = data2;
-  ev.data.l[4] = data3;
-
-#if HAVE_GTK_MULTIHEAD
-  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-  display = gdk_display;
-#endif
-  
-  gdk_error_trap_push ();
-  XSendEvent (display,
-	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
-  XSync (display, False);
-  gdk_error_trap_pop ();
-}
-
-static void
-egg_tray_icon_send_dock_request (EggTrayIcon *icon)
-{
-  egg_tray_icon_send_manager_message (icon,
-				      SYSTEM_TRAY_REQUEST_DOCK,
-				      icon->manager_window,
-				      gtk_plug_get_id (GTK_PLUG (icon)),
-				      0, 0);
-}
-
-static void
-egg_tray_icon_update_manager_window (EggTrayIcon *icon)
-{
-  Display *xdisplay;
-  
-#if HAVE_GTK_MULTIHEAD
-  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-  xdisplay = gdk_display;
-#endif
-  
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if HAVE_GTK_MULTIHEAD
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					      icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-      
-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-    }
-  
-  XGrabServer (xdisplay);
-  
-  icon->manager_window = XGetSelectionOwner (xdisplay,
-					     icon->selection_atom);
-
-  if (icon->manager_window != None)
-    XSelectInput (xdisplay,
-		  icon->manager_window, StructureNotifyMask);
-
-  XUngrabServer (xdisplay);
-  XFlush (xdisplay);
-  
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if HAVE_GTK_MULTIHEAD
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					      icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-      
-      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
-      /* Send a request that we'd like to dock */
-      egg_tray_icon_send_dock_request (icon);
-    }
-}
-
-EggTrayIcon *
-egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
-{
-  EggTrayIcon *icon;
-  char buffer[256];
-  GdkWindow *root_window;
-
-  g_return_val_if_fail (xscreen != NULL, NULL);
-  
-  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
-  gtk_window_set_title (GTK_WINDOW (icon), name);
-
-#if HAVE_GTK_MULTIHEAD
-  /* FIXME: this code does not compile, screen is undefined. Now try
-   * getting the GdkScreen from xscreen (:. Dunno how to solve this
-   * (there is prolly some easy way I cant think of right now)
-   */
-  gtk_plug_construct_for_display (GTK_PLUG (icon),
-				  gdk_screen_get_display (screen), 0);
-#else
-  gtk_plug_construct (GTK_PLUG (icon), 0);
-#endif
-  
-  gtk_widget_realize (GTK_WIDGET (icon));
-
-  /* Now see if there's a manager window around */
-  g_snprintf (buffer, sizeof (buffer),
-	      "_NET_SYSTEM_TRAY_S%d",
-	      XScreenNumberOfScreen (xscreen));
-  
-  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
-				      buffer, False);
-  
-  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
-				    "MANAGER", False);
-  
-  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
-					       "_NET_SYSTEM_TRAY_OPCODE", False);
-
-  egg_tray_icon_update_manager_window (icon);
-
-#if HAVE_GTK_MULTIHEAD
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
-  
-  /* Add a root window filter so that we get changes on MANAGER */
-  gdk_window_add_filter (root_window,
-			 egg_tray_icon_manager_filter, icon);
-		      
-  return icon;
-}
-
-#if HAVE_GTK_MULTIHEAD
-EggTrayIcon *
-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-{
-  EggTrayIcon *icon;
-  char buffer[256];
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
-}
-#endif
-
-EggTrayIcon*
-egg_tray_icon_new (const gchar *name)
-{
-  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
-}
-
-guint
-egg_tray_icon_send_message (EggTrayIcon *icon,
-			    gint         timeout,
-			    const gchar *message,
-			    gint         len)
-{
-  guint stamp;
-  
-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
-  g_return_val_if_fail (timeout >= 0, 0);
-  g_return_val_if_fail (message != NULL, 0);
-		     
-  if (icon->manager_window == None)
-    return 0;
-
-  if (len < 0)
-    len = strlen (message);
-
-  stamp = icon->stamp++;
-  
-  /* Get ready to send the message */
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      timeout, len, stamp);
-
-  /* Now to send the actual message */
-  gdk_error_trap_push ();
-  while (len > 0)
-    {
-      XClientMessageEvent ev;
-      Display *xdisplay;
-
-#if HAVE_GTK_MULTIHEAD
-      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-      xdisplay = gdk_display;
-#endif
-      
-      ev.type = ClientMessage;
-      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-      ev.format = 8;
-      ev.message_type = XInternAtom (xdisplay,
-				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-      if (len > 20)
-	{
-	  memcpy (&ev.data, message, 20);
-	  len -= 20;
-	  message += 20;
-	}
-      else
-	{
-	  memcpy (&ev.data, message, len);
-	  len = 0;
-	}
-
-      XSendEvent (xdisplay,
-		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
-      XSync (xdisplay, False);
-    }
-  gdk_error_trap_pop ();
-
-  return stamp;
-}
-
-void
-egg_tray_icon_cancel_message (EggTrayIcon *icon,
-			      guint        id)
-{
-  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
-  g_return_if_fail (id > 0);
-  
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      id, 0, 0);
-}
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* eggtrayicon.c
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <string.h>
+#include <gdk/gdkx.h>
+#include "eggtrayicon.h"
+
+#define SYSTEM_TRAY_REQUEST_DOCK    0
+#define SYSTEM_TRAY_BEGIN_MESSAGE   1
+#define SYSTEM_TRAY_CANCEL_MESSAGE  2
+         
+static GtkPlugClass *parent_class = NULL;
+
+static void egg_tray_icon_init (EggTrayIcon *icon);
+static void egg_tray_icon_class_init (EggTrayIconClass *klass);
+
+static void egg_tray_icon_unrealize (GtkWidget *widget);
+
+static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
+
+GType
+egg_tray_icon_get_type (void)
+{
+  static GType our_type = 0;
+
+  our_type = g_type_from_name("EggTrayIcon");
+
+  if (our_type == 0)
+    {
+      static const GTypeInfo our_info =
+      {
+	sizeof (EggTrayIconClass),
+	(GBaseInitFunc) NULL,
+	(GBaseFinalizeFunc) NULL,
+	(GClassInitFunc) egg_tray_icon_class_init,
+	NULL, /* class_finalize */
+	NULL, /* class_data */
+	sizeof (EggTrayIcon),
+	0,    /* n_preallocs */
+	(GInstanceInitFunc) egg_tray_icon_init
+      };
+
+      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
+    }
+  else if (parent_class == NULL) {
+    /* we're reheating the old class from a previous instance -  engage ugly hack =( */
+    egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
+  }
+
+  return our_type;
+}
+
+static void
+egg_tray_icon_init (EggTrayIcon *icon)
+{
+  icon->stamp = 1;
+  
+  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
+}
+
+static void
+egg_tray_icon_class_init (EggTrayIconClass *klass)
+{
+  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  widget_class->unrealize = egg_tray_icon_unrealize;
+}
+
+static GdkFilterReturn
+egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
+{
+  EggTrayIcon *icon = user_data;
+  XEvent *xev = (XEvent *)xevent;
+
+  if (xev->xany.type == ClientMessage &&
+      xev->xclient.message_type == icon->manager_atom &&
+      xev->xclient.data.l[1] == icon->selection_atom)
+    {
+      egg_tray_icon_update_manager_window (icon);
+    }
+  else if (xev->xany.window == icon->manager_window)
+    {
+      if (xev->xany.type == DestroyNotify)
+	{
+	  egg_tray_icon_update_manager_window (icon);
+	}
+    }
+  
+  return GDK_FILTER_CONTINUE;
+}
+
+static void
+egg_tray_icon_unrealize (GtkWidget *widget)
+{
+  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
+  GdkWindow *root_window;
+
+  if (icon->manager_window != None)
+    {
+      GdkWindow *gdkwin;
+
+#if HAVE_GTK_MULTIHEAD
+      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
+                                              icon->manager_window);
+#else
+      gdkwin = gdk_window_lookup (icon->manager_window);
+#endif
+
+      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
+    }
+
+#if HAVE_GTK_MULTIHEAD
+  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
+#else
+  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
+#endif
+
+  gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
+
+  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+}
+
+static void
+egg_tray_icon_send_manager_message (EggTrayIcon *icon,
+				    long         message,
+				    Window       window,
+				    long         data1,
+				    long         data2,
+				    long         data3)
+{
+  XClientMessageEvent ev;
+  Display *display;
+  
+  ev.type = ClientMessage;
+  ev.window = window;
+  ev.message_type = icon->system_tray_opcode_atom;
+  ev.format = 32;
+  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
+  ev.data.l[1] = message;
+  ev.data.l[2] = data1;
+  ev.data.l[3] = data2;
+  ev.data.l[4] = data3;
+
+#if HAVE_GTK_MULTIHEAD
+  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
+#else
+  display = gdk_display;
+#endif
+  
+  gdk_error_trap_push ();
+  XSendEvent (display,
+	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
+  XSync (display, False);
+  gdk_error_trap_pop ();
+}
+
+static void
+egg_tray_icon_send_dock_request (EggTrayIcon *icon)
+{
+  egg_tray_icon_send_manager_message (icon,
+				      SYSTEM_TRAY_REQUEST_DOCK,
+				      icon->manager_window,
+				      gtk_plug_get_id (GTK_PLUG (icon)),
+				      0, 0);
+}
+
+static void
+egg_tray_icon_update_manager_window (EggTrayIcon *icon)
+{
+  Display *xdisplay;
+  
+#if HAVE_GTK_MULTIHEAD
+  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
+#else
+  xdisplay = gdk_display;
+#endif
+  
+  if (icon->manager_window != None)
+    {
+      GdkWindow *gdkwin;
+
+#if HAVE_GTK_MULTIHEAD
+      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
+					      icon->manager_window);
+#else
+      gdkwin = gdk_window_lookup (icon->manager_window);
+#endif
+      
+      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
+    }
+  
+  XGrabServer (xdisplay);
+  
+  icon->manager_window = XGetSelectionOwner (xdisplay,
+					     icon->selection_atom);
+
+  if (icon->manager_window != None)
+    XSelectInput (xdisplay,
+		  icon->manager_window, StructureNotifyMask);
+
+  XUngrabServer (xdisplay);
+  XFlush (xdisplay);
+  
+  if (icon->manager_window != None)
+    {
+      GdkWindow *gdkwin;
+
+#if HAVE_GTK_MULTIHEAD
+      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
+					      icon->manager_window);
+#else
+      gdkwin = gdk_window_lookup (icon->manager_window);
+#endif
+      
+      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
+
+      /* Send a request that we'd like to dock */
+      egg_tray_icon_send_dock_request (icon);
+    }
+}
+
+EggTrayIcon *
+egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
+{
+  EggTrayIcon *icon;
+  char buffer[256];
+  GdkWindow *root_window;
+
+  g_return_val_if_fail (xscreen != NULL, NULL);
+  
+  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
+  gtk_window_set_title (GTK_WINDOW (icon), name);
+
+#if HAVE_GTK_MULTIHEAD
+  /* FIXME: this code does not compile, screen is undefined. Now try
+   * getting the GdkScreen from xscreen (:. Dunno how to solve this
+   * (there is prolly some easy way I cant think of right now)
+   */
+  gtk_plug_construct_for_display (GTK_PLUG (icon),
+				  gdk_screen_get_display (screen), 0);
+#else
+  gtk_plug_construct (GTK_PLUG (icon), 0);
+#endif
+  
+  gtk_widget_realize (GTK_WIDGET (icon));
+
+  /* Now see if there's a manager window around */
+  g_snprintf (buffer, sizeof (buffer),
+	      "_NET_SYSTEM_TRAY_S%d",
+	      XScreenNumberOfScreen (xscreen));
+  
+  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
+				      buffer, False);
+  
+  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
+				    "MANAGER", False);
+  
+  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
+					       "_NET_SYSTEM_TRAY_OPCODE", False);
+
+  egg_tray_icon_update_manager_window (icon);
+
+#if HAVE_GTK_MULTIHEAD
+  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen));
+#else
+  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
+#endif
+  
+  /* Add a root window filter so that we get changes on MANAGER */
+  gdk_window_add_filter (root_window,
+			 egg_tray_icon_manager_filter, icon);
+		      
+  return icon;
+}
+
+#if HAVE_GTK_MULTIHEAD
+EggTrayIcon *
+egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
+{
+  EggTrayIcon *icon;
+  char buffer[256];
+
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
+}
+#endif
+
+EggTrayIcon*
+egg_tray_icon_new (const gchar *name)
+{
+  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
+}
+
+guint
+egg_tray_icon_send_message (EggTrayIcon *icon,
+			    gint         timeout,
+			    const gchar *message,
+			    gint         len)
+{
+  guint stamp;
+  
+  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
+  g_return_val_if_fail (timeout >= 0, 0);
+  g_return_val_if_fail (message != NULL, 0);
+		     
+  if (icon->manager_window == None)
+    return 0;
+
+  if (len < 0)
+    len = strlen (message);
+
+  stamp = icon->stamp++;
+  
+  /* Get ready to send the message */
+  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
+				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
+				      timeout, len, stamp);
+
+  /* Now to send the actual message */
+  gdk_error_trap_push ();
+  while (len > 0)
+    {
+      XClientMessageEvent ev;
+      Display *xdisplay;
+
+#if HAVE_GTK_MULTIHEAD
+      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
+#else
+      xdisplay = gdk_display;
+#endif
+      
+      ev.type = ClientMessage;
+      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
+      ev.format = 8;
+      ev.message_type = XInternAtom (xdisplay,
+				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
+      if (len > 20)
+	{
+	  memcpy (&ev.data, message, 20);
+	  len -= 20;
+	  message += 20;
+	}
+      else
+	{
+	  memcpy (&ev.data, message, len);
+	  len = 0;
+	}
+
+      XSendEvent (xdisplay,
+		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
+      XSync (xdisplay, False);
+    }
+  gdk_error_trap_pop ();
+
+  return stamp;
+}
+
+void
+egg_tray_icon_cancel_message (EggTrayIcon *icon,
+			      guint        id)
+{
+  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
+  g_return_if_fail (id > 0);
+  
+  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
+				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
+				      id, 0, 0);
+}

grip-3.4.3.tar.gz/src/eggtrayicon.h -> grip-3.9.0.tar.gz/src/eggtrayicon.h Changed

@@ -1,76 +1,76 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.h
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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.
- */
-
-#ifndef __EGG_TRAY_ICON_H__
-#define __EGG_TRAY_ICON_H__
-
-#include <gtk/gtkplug.h>
-#include <gdk/gdkx.h>
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
-#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-	
-typedef struct _EggTrayIcon	  EggTrayIcon;
-typedef struct _EggTrayIconClass  EggTrayIconClass;
-
-struct _EggTrayIcon
-{
-  GtkPlug parent_instance;
-
-  guint stamp;
-  
-  Atom selection_atom;
-  Atom manager_atom;
-  Atom system_tray_opcode_atom;
-  Window manager_window;
-};
-
-struct _EggTrayIconClass
-{
-  GtkPlugClass parent_class;
-};
-
-GType        egg_tray_icon_get_type       (void);
-
-#if EGG_TRAY_ENABLE_MULTIHEAD
-EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-					   const gchar *name);
-#endif
-
-EggTrayIcon *egg_tray_icon_new            (const gchar *name);
-
-guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-					   gint         timeout,
-					   const char  *message,
-					   gint         len);
-void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-					   guint        id);
-
-
-					    
-G_END_DECLS
-
-#endif /* __EGG_TRAY_ICON_H__ */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* eggtrayicon.h
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __EGG_TRAY_ICON_H__
+#define __EGG_TRAY_ICON_H__
+
+#include <gtk/gtkplug.h>
+#include <gdk/gdkx.h>
+
+G_BEGIN_DECLS
+
+#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
+#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
+#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
+#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
+#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
+#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
+	
+typedef struct _EggTrayIcon	  EggTrayIcon;
+typedef struct _EggTrayIconClass  EggTrayIconClass;
+
+struct _EggTrayIcon
+{
+  GtkPlug parent_instance;
+
+  guint stamp;
+  
+  Atom selection_atom;
+  Atom manager_atom;
+  Atom system_tray_opcode_atom;
+  Window manager_window;
+};
+
+struct _EggTrayIconClass
+{
+  GtkPlugClass parent_class;
+};
+
+GType        egg_tray_icon_get_type       (void);
+
+#if EGG_TRAY_ENABLE_MULTIHEAD
+EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
+					   const gchar *name);
+#endif
+
+EggTrayIcon *egg_tray_icon_new            (const gchar *name);
+
+guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
+					   gint         timeout,
+					   const char  *message,
+					   gint         len);
+void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
+					   guint        id);
+
+
+					    
+G_END_DECLS
+
+#endif /* __EGG_TRAY_ICON_H__ */

grip-3.4.3.tar.gz/src/gain_analysis.c -> grip-3.9.0.tar.gz/src/gain_analysis.c Changed

@@ -1,398 +1,408 @@
-/*
- *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
- *  Copyright (C) 2001 David Robinson and Glen Sawyer
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser 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
- *
- *  concept and filter values by David Robinson (David@Robinson.org)
- *    -- blame him if you think the idea is flawed
- *  coding by Glen Sawyer (glensawyer@hotmail.com) 442 N 700 E, Provo, UT 84606 USA
- *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
- *
- *  For an explanation of the concepts and the basic algorithms involved, go to:
- *    http://www.replaygain.org/
- */
-
-/*
- *  Here's the deal. Call
- *
- *    InitGainAnalysis ( long samplefreq );
- *
- *  to initialize everything. Call
- *
- *    AnalyzeSamples ( const Float_t*  left_samples,
- *                     const Float_t*  right_samples,
- *                     size_t          num_samples,
- *                     int             num_channels );
- *
- *  as many times as you want, with as many or as few samples as you want.
- *  If mono, pass the sample buffer in through left_samples, leave
- *  right_samples NULL, and make sure num_channels = 1.
- *
- *    GetTitleGain()
- *
- *  will return the recommended dB level change for all samples analyzed
- *  SINCE THE LAST TIME you called GetTitleGain() OR InitGainAnalysis().
- *
- *    GetAlbumGain()
- *
- *  will return the recommended dB level change for all samples analyzed
- *  since InitGainAnalysis() was called and finalized with GetTitleGain().
- *
- *  Pseudo-code to process an album:
- *
- *    Float_t       l_samples [4096];
- *    Float_t       r_samples [4096];
- *    size_t        num_samples;
- *    unsigned int  num_songs;
- *    unsigned int  i;
- *
- *    InitGainAnalysis ( 44100 );
- *    for ( i = 1; i <= num_songs; i++ ) {
- *        while ( ( num_samples = getSongSamples ( song[i], left_samples, right_samples ) ) > 0 )
- *            AnalyzeSamples ( left_samples, right_samples, num_samples, 2 );
- *        fprintf ("Recommended dB change for song %2d: %+6.2f dB\n", i, GetTitleGain() );
- *    }
- *    fprintf ("Recommended dB change for whole album: %+6.2f dB\n", GetAlbumGain() );
- */
-
-/*
- *  So here's the main source of potential code confusion:
- *
- *  The filters applied to the incoming samples are IIR filters,
- *  meaning they rely on up to <filter order> number of previous samples
- *  AND up to <filter order> number of previous filtered samples.
- *
- *  I set up the AnalyzeSamples routine to minimize memory usage and interface
- *  complexity. The speed isn't compromised too much (I don't think), but the
- *  internal complexity is higher than it should be for such a relatively
- *  simple routine.
- *
- *  Optimization/clarity suggestions are welcome.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "gain_analysis.h"
-
-typedef unsigned short  Uint16_t;
-typedef signed short    Int16_t;
-typedef unsigned int    Uint32_t;
-typedef signed int      Int32_t;
-
-#define YULE_ORDER         10
-#define BUTTER_ORDER        2
-#define RMS_PERCENTILE      0.95        // percentile which is louder than the proposed level
-#define MAX_SAMP_FREQ   48000.          // maximum allowed sample frequency [Hz]
-#define RMS_WINDOW_TIME     0.050       // Time slice size [s]
-#define STEPS_per_dB      100.          // Table entries per dB
-#define MAX_dB            120.          // Table entries for 0...MAX_dB (normal max. values are 70...80 dB)
-
-#define MAX_ORDER               (BUTTER_ORDER > YULE_ORDER ? BUTTER_ORDER : YULE_ORDER)
-#define MAX_SAMPLES_PER_WINDOW  (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME)      // max. Samples per Time slice
-#define PINK_REF                64.82 //298640883795                              // calibration value
-
-Float_t          linprebuf [MAX_ORDER * 2];
-Float_t*         linpre;                                          // left input samples, with pre-buffer
-Float_t          lstepbuf  [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
-Float_t*         lstep;                                           // left "first step" (i.e. post first filter) samples
-Float_t          loutbuf   [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
-Float_t*         lout;                                            // left "out" (i.e. post second filter) samples
-Float_t          rinprebuf [MAX_ORDER * 2];
-Float_t*         rinpre;                                          // right input samples ...
-Float_t          rstepbuf  [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
-Float_t*         rstep;
-Float_t          routbuf   [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
-Float_t*         rout;
-unsigned int              sampleWindow;                                    // number of samples required to reach number of milliseconds required for RMS window
-unsigned long    totsamp;
-double           lsum;
-double           rsum;
-int              freqindex;
-int              first;
-static Uint32_t  A [(size_t)(STEPS_per_dB * MAX_dB)];
-static Uint32_t  B [(size_t)(STEPS_per_dB * MAX_dB)];
-
-// for each filter:
-// [0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz
-
-//#pragma warning ( disable : 4305 )
-
-const Float_t  AYule [9] [11] = {
-    { 1., -3.84664617118067,  7.81501653005538,-11.34170355132042, 13.05504219327545,-12.28759895145294,  9.48293806319790, -5.87257861775999,  2.75465861874613, -0.86984376593551, 0.13919314567432 },
-    { 1., -3.47845948550071,  6.36317777566148, -8.54751527471874,  9.47693607801280, -8.81498681370155,  6.85401540936998, -4.39470996079559,  2.19611684890774, -0.75104302451432, 0.13149317958808 },
-    { 1., -2.37898834973084,  2.84868151156327, -2.64577170229825,  2.23697657451713, -1.67148153367602,  1.00595954808547, -0.45953458054983,  0.16378164858596, -0.05032077717131, 0.02347897407020 },
-    { 1., -1.61273165137247,  1.07977492259970, -0.25656257754070, -0.16276719120440, -0.22638893773906,  0.39120800788284, -0.22138138954925,  0.04500235387352,  0.02005851806501, 0.00302439095741 },
-    { 1., -1.49858979367799,  0.87350271418188,  0.12205022308084, -0.80774944671438,  0.47854794562326, -0.12453458140019, -0.04067510197014,  0.08333755284107, -0.04237348025746, 0.02977207319925 },
-    { 1., -0.62820619233671,  0.29661783706366, -0.37256372942400,  0.00213767857124, -0.42029820170918,  0.22199650564824,  0.00613424350682,  0.06747620744683,  0.05784820375801, 0.03222754072173 },
-    { 1., -1.04800335126349,  0.29156311971249, -0.26806001042947,  0.00819999645858,  0.45054734505008, -0.33032403314006,  0.06739368333110, -0.04784254229033,  0.01639907836189, 0.01807364323573 },
-    { 1., -0.51035327095184, -0.31863563325245, -0.20256413484477,  0.14728154134330,  0.38952639978999, -0.23313271880868, -0.05246019024463, -0.02505961724053,  0.02442357316099, 0.01818801111503 },
-    { 1., -0.25049871956020, -0.43193942311114, -0.03424681017675, -0.04678328784242,  0.26408300200955,  0.15113130533216, -0.17556493366449, -0.18823009262115,  0.05477720428674, 0.04704409688120 }
-};
-
-const Float_t  BYule [9] [11] = {
-    { 0.03857599435200, -0.02160367184185, -0.00123395316851, -0.00009291677959, -0.01655260341619,  0.02161526843274, -0.02074045215285,  0.00594298065125,  0.00306428023191,  0.00012025322027,  0.00288463683916 },
-    { 0.05418656406430, -0.02911007808948, -0.00848709379851, -0.00851165645469, -0.00834990904936,  0.02245293253339, -0.02596338512915,  0.01624864962975, -0.00240879051584,  0.00674613682247, -0.00187763777362 },
-    { 0.15457299681924, -0.09331049056315, -0.06247880153653,  0.02163541888798, -0.05588393329856,  0.04781476674921,  0.00222312597743,  0.03174092540049, -0.01390589421898,  0.00651420667831, -0.00881362733839 },
-    { 0.30296907319327, -0.22613988682123, -0.08587323730772,  0.03282930172664, -0.00915702933434, -0.02364141202522, -0.00584456039913,  0.06276101321749, -0.00000828086748,  0.00205861885564, -0.02950134983287 },
-    { 0.33642304856132, -0.25572241425570, -0.11828570177555,  0.11921148675203, -0.07834489609479, -0.00469977914380, -0.00589500224440,  0.05724228140351,  0.00832043980773, -0.01635381384540, -0.01760176568150 },
-    { 0.44915256608450, -0.14351757464547, -0.22784394429749, -0.01419140100551,  0.04078262797139, -0.12398163381748,  0.04097565135648,  0.10478503600251, -0.01863887810927, -0.03193428438915,  0.00541907748707 },
-    { 0.56619470757641, -0.75464456939302,  0.16242137742230,  0.16744243493672, -0.18901604199609,  0.30931782841830, -0.27562961986224,  0.00647310677246,  0.08647503780351, -0.03788984554840, -0.00588215443421 },
-    { 0.58100494960553, -0.53174909058578, -0.14289799034253,  0.17520704835522,  0.02377945217615,  0.15558449135573, -0.25344790059353,  0.01628462406333,  0.06920467763959, -0.03721611395801, -0.00749618797172 },
-    { 0.53648789255105, -0.42163034350696, -0.00275953611929,  0.04267842219415, -0.10214864179676,  0.14590772289388, -0.02459864859345, -0.11202315195388, -0.04060034127000,  0.04788665548180, -0.02217936801134 }
-};
-
-const Float_t  AButter [9] [3] = {
-    { 1., -1.97223372919527, 0.97261396931306 },
-    { 1., -1.96977855582618, 0.97022847566350 },
-    { 1., -1.95835380975398, 0.95920349965459 },
-    { 1., -1.95002759149878, 0.95124613669835 },
-    { 1., -1.94561023566527, 0.94705070426118 },
-    { 1., -1.92783286977036, 0.93034775234268 },
-    { 1., -1.91858953033784, 0.92177618768381 },
-    { 1., -1.91542108074780, 0.91885558323625 },
-    { 1., -1.88903307939452, 0.89487434461664 }
-};
-
-const Float_t  BButter [9] [3] = {
-    { 0.98621192462708, -1.97242384925416, 0.98621192462708 },
-    { 0.98500175787242, -1.97000351574484, 0.98500175787242 },
-    { 0.97938932735214, -1.95877865470428, 0.97938932735214 },
-    { 0.97531843204928, -1.95063686409857, 0.97531843204928 },
-    { 0.97316523498161, -1.94633046996323, 0.97316523498161 },
-    { 0.96454515552826, -1.92909031105652, 0.96454515552826 },
-    { 0.96009142950541, -1.92018285901082, 0.96009142950541 },
-    { 0.95856916599601, -1.91713833199203, 0.95856916599601 },
-    { 0.94597685600279, -1.89195371200558, 0.94597685600279 }
-};
-
-//#pragma warning ( default : 4305 )
-
-// When calling this procedure, make sure that ip[-order] and op[-order] point to real data!
-
-static void
-filter ( const Float_t* input, Float_t* output, size_t nSamples, const Float_t* a, const Float_t* b, size_t order )
-{
-    double  y;
-    size_t  i;
-    size_t  k;
-
-    for ( i = 0; i < nSamples; i++ ) {
-        y = input[i] * b[0];
-        for ( k = 1; k <= order; k++ )
-            y += input[i-k] * b[k] - output[i-k] * a[k];
-        output[i] = (Float_t)y;
-    }
-}
-
-// returns a INIT_GAIN_ANALYSIS_OK if successful, INIT_GAIN_ANALYSIS_ERROR if not
-
-int
-ResetSampleFrequency ( long samplefreq ) {
-    int  i;
-
-    // zero out initial values
-    for ( i = 0; i < MAX_ORDER; i++ )
-        linprebuf[i] = lstepbuf[i] = loutbuf[i] = rinprebuf[i] = rstepbuf[i] = routbuf[i] = 0.;
-
-    switch ( (int)(samplefreq) ) {
-        case 48000: freqindex = 0; break;
-        case 44100: freqindex = 1; break;
-        case 32000: freqindex = 2; break;
-        case 24000: freqindex = 3; break;
-        case 22050: freqindex = 4; break;
-        case 16000: freqindex = 5; break;
-        case 12000: freqindex = 6; break;
-        case 11025: freqindex = 7; break;
-        case  8000: freqindex = 8; break;
-        default:    return INIT_GAIN_ANALYSIS_ERROR;
-    }
-
-    sampleWindow = (int) ceil (samplefreq * RMS_WINDOW_TIME);
-
-    lsum         = 0.;
-    rsum         = 0.;
-    totsamp      = 0;
-
-    memset ( A, 0, sizeof(A) );
-
-	return INIT_GAIN_ANALYSIS_OK;
-}
-
-int
-InitGainAnalysis ( long samplefreq )
-{
-	if (ResetSampleFrequency(samplefreq) != INIT_GAIN_ANALYSIS_OK) {
-		return INIT_GAIN_ANALYSIS_ERROR;
-	}
-
-    linpre       = linprebuf + MAX_ORDER;
-    rinpre       = rinprebuf + MAX_ORDER;
-    lstep        = lstepbuf  + MAX_ORDER;
-    rstep        = rstepbuf  + MAX_ORDER;
-    lout         = loutbuf   + MAX_ORDER;
-    rout         = routbuf   + MAX_ORDER;
-
-    memset ( B, 0, sizeof(B) );
-
-    return INIT_GAIN_ANALYSIS_OK;
-}
-
-// returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not
-
-int
-AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels )
-{
-    const Float_t*  curleft;
-    const Float_t*  curright;
-    long            batchsamples;
-    long            cursamples;
-    long            cursamplepos;
-    int             i;
-
-    if ( num_samples == 0 )
-        return GAIN_ANALYSIS_OK;
-
-    cursamplepos = 0;
-    batchsamples = num_samples;
-
-    switch ( num_channels) {
-    case  1: right_samples = left_samples;
-    case  2: break;
-    default: return GAIN_ANALYSIS_ERROR;
-    }
-
-    if ( num_samples < MAX_ORDER ) {
-        memcpy ( linprebuf + MAX_ORDER, left_samples , num_samples * sizeof(Float_t) );
-        memcpy ( rinprebuf + MAX_ORDER, right_samples, num_samples * sizeof(Float_t) );
-    }
-    else {
-        memcpy ( linprebuf + MAX_ORDER, left_samples,  MAX_ORDER   * sizeof(Float_t) );
-        memcpy ( rinprebuf + MAX_ORDER, right_samples, MAX_ORDER   * sizeof(Float_t) );
-    }
-
-    while ( batchsamples > 0 ) {
-        cursamples = batchsamples > sampleWindow-totsamp  ?  sampleWindow - totsamp  :  batchsamples;
-        if ( cursamplepos < MAX_ORDER ) {
-            curleft  = linpre+cursamplepos;
-            curright = rinpre+cursamplepos;
-            if (cursamples > MAX_ORDER - cursamplepos )
-                cursamples = MAX_ORDER - cursamplepos;
-        }
-        else {
-            curleft  = left_samples  + cursamplepos;
-            curright = right_samples + cursamplepos;
-        }
-
-        filter ( curleft , lstep + totsamp, cursamples, AYule[freqindex], BYule[freqindex], YULE_ORDER );
-        filter ( curright, rstep + totsamp, cursamples, AYule[freqindex], BYule[freqindex], YULE_ORDER );
-
-        filter ( lstep + totsamp, lout + totsamp, cursamples, AButter[freqindex], BButter[freqindex], BUTTER_ORDER );
-        filter ( rstep + totsamp, rout + totsamp, cursamples, AButter[freqindex], BButter[freqindex], BUTTER_ORDER );
-
-        for ( i = 0; i < cursamples; i++ ) {             // Get the squared values
-            lsum += lout [totsamp+i] * lout [totsamp+i];
-            rsum += rout [totsamp+i] * rout [totsamp+i];
-        }
-
-        batchsamples -= cursamples;
-        cursamplepos += cursamples;
-        totsamp      += cursamples;
-        if ( totsamp == sampleWindow ) {  // Get the Root Mean Square (RMS) for this set of samples
-            double  val  = STEPS_per_dB * 10. * log10 ( (lsum+rsum) / totsamp * 0.5 + 1.e-37 );
-            int     ival = (int) val;
-            if ( ival <                     0 ) ival = 0;
-            if ( ival >= sizeof(A)/sizeof(*A) ) ival = sizeof(A)/sizeof(*A) - 1;
-            A [ival]++;
-            lsum = rsum = 0.;
-            memmove ( loutbuf , loutbuf  + totsamp, MAX_ORDER * sizeof(Float_t) );
-            memmove ( routbuf , routbuf  + totsamp, MAX_ORDER * sizeof(Float_t) );
-            memmove ( lstepbuf, lstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) );
-            memmove ( rstepbuf, rstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) );
-            totsamp = 0;
-        }
-        if ( totsamp > sampleWindow )   // somehow I really screwed up: Error in programming! Contact author about totsamp > sampleWindow
-            return GAIN_ANALYSIS_ERROR;
-    }
-    if ( num_samples < MAX_ORDER ) {
-        memmove ( linprebuf,                           linprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) );
-        memmove ( rinprebuf,                           rinprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) );
-        memcpy  ( linprebuf + MAX_ORDER - num_samples, left_samples,          num_samples             * sizeof(Float_t) );
-        memcpy  ( rinprebuf + MAX_ORDER - num_samples, right_samples,         num_samples             * sizeof(Float_t) );
-    }
-    else {
-        memcpy  ( linprebuf, left_samples  + num_samples - MAX_ORDER, MAX_ORDER * sizeof(Float_t) );
-        memcpy  ( rinprebuf, right_samples + num_samples - MAX_ORDER, MAX_ORDER * sizeof(Float_t) );
-    }
-
-    return GAIN_ANALYSIS_OK;
-}
-
-
-static Float_t
-analyzeResult ( Uint32_t* Array, size_t len )
-{
-    Uint32_t  elems;
-    Int32_t   upper;
-    size_t    i;
-
-    elems = 0;
-    for ( i = 0; i < len; i++ )
-        elems += Array[i];
-    if ( elems == 0 )
-        return GAIN_NOT_ENOUGH_SAMPLES;
-
-    upper = (Int32_t) ceil (elems * (1. - RMS_PERCENTILE));
-    for ( i = len; i-- > 0; ) {
-        if ( (upper -= Array[i]) <= 0 )
-            break;
-    }
-
-    return (Float_t) ((Float_t)PINK_REF - (Float_t)i / (Float_t)STEPS_per_dB);
-}
-
-
-Float_t
-GetTitleGain ( void )
-{
-    Float_t  retval;
-    int    i;
-
-    retval = analyzeResult ( A, sizeof(A)/sizeof(*A) );
-
-    for ( i = 0; i < sizeof(A)/sizeof(*A); i++ ) {
-        B[i] += A[i];
-        A[i]  = 0;
-    }
-
-    for ( i = 0; i < MAX_ORDER; i++ )
-        linprebuf[i] = lstepbuf[i] = loutbuf[i] = rinprebuf[i] = rstepbuf[i] = routbuf[i] = 0.f;
-
-    totsamp = 0;
-    lsum    = rsum = 0.;
-    return retval;
-}
-
-
-Float_t
-GetAlbumGain ( void )
-{
-    return analyzeResult ( B, sizeof(B)/sizeof(*B) );
-}
-
-/* end of gain_analysis.c */
+/*
+ *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+ *  Copyright (C) 2001 David Robinson and Glen Sawyer
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  concept and filter values by David Robinson (David@Robinson.org)
+ *    -- blame him if you think the idea is flawed
+ *  coding by Glen Sawyer (glensawyer@hotmail.com) 442 N 700 E, Provo, UT 84606 USA
+ *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+ *
+ *  For an explanation of the concepts and the basic algorithms involved, go to:
+ *    http://www.replaygain.org/
+ */
+
+/*
+ *  Here's the deal. Call
+ *
+ *    InitGainAnalysis ( long samplefreq );
+ *
+ *  to initialize everything. Call
+ *
+ *    AnalyzeSamples ( const Float_t*  left_samples,
+ *                     const Float_t*  right_samples,
+ *                     size_t          num_samples,
+ *                     int             num_channels );
+ *
+ *  as many times as you want, with as many or as few samples as you want.
+ *  If mono, pass the sample buffer in through left_samples, leave
+ *  right_samples NULL, and make sure num_channels = 1.
+ *
+ *    GetTitleGain()
+ *
+ *  will return the recommended dB level change for all samples analyzed
+ *  SINCE THE LAST TIME you called GetTitleGain() OR InitGainAnalysis().
+ *
+ *    GetAlbumGain()
+ *
+ *  will return the recommended dB level change for all samples analyzed
+ *  since InitGainAnalysis() was called and finalized with GetTitleGain().
+ *
+ *  Pseudo-code to process an album:
+ *
+ *    Float_t       l_samples [4096];
+ *    Float_t       r_samples [4096];
+ *    size_t        num_samples;
+ *    unsigned int  num_songs;
+ *    unsigned int  i;
+ *
+ *    InitGainAnalysis ( 44100 );
+ *    for ( i = 1; i <= num_songs; i++ ) {
+ *        while ( ( num_samples = getSongSamples ( song[i], left_samples, right_samples ) ) > 0 )
+ *            AnalyzeSamples ( left_samples, right_samples, num_samples, 2 );
+ *        fprintf ("Recommended dB change for song %2d: %+6.2f dB\n", i, GetTitleGain() );
+ *    }
+ *    fprintf ("Recommended dB change for whole album: %+6.2f dB\n", GetAlbumGain() );
+ */
+
+/*
+ *  So here's the main source of potential code confusion:
+ *
+ *  The filters applied to the incoming samples are IIR filters,
+ *  meaning they rely on up to <filter order> number of previous samples
+ *  AND up to <filter order> number of previous filtered samples.
+ *
+ *  I set up the AnalyzeSamples routine to minimize memory usage and interface
+ *  complexity. The speed isn't compromised too much (I don't think), but the
+ *  internal complexity is higher than it should be for such a relatively
+ *  simple routine.
+ *
+ *  Optimization/clarity suggestions are welcome.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "gain_analysis.h"
+
+typedef unsigned short  Uint16_t;
+typedef signed short    Int16_t;
+typedef unsigned int    Uint32_t;
+typedef signed int      Int32_t;
+
+#define YULE_ORDER         10
+#define BUTTER_ORDER        2
+#define RMS_PERCENTILE      0.95        // percentile which is louder than the proposed level
+// This used to be 48000 and 0.050.
+// It changed to 480 and 5 as it is only needed to determine the
+// size of the arrays below (lstepbuf, loutbuf, rstepbuf, routbuf).
+// Current compilers give the following warnings without this change:
+//   warning: variably modified ‘lstepbuf’ at file scope
+// This silences the compiler warning and should not change the actual
+// size of the array.
+#define MAX_SAMP_FREQ   480          // maximum allowed sample frequency [Hz]
+#define RMS_WINDOW_TIME     5       // Time slice size [s] - adapted to MAX_SAMP_FREQ
+#define RMS_WINDOW_TIME_FLOAT 0.05       // Time slice size [s] - original value
+// The following two defines were also float and have been changed to
+// non-float for the same reason as above.
+#define STEPS_per_dB      100          // Table entries per dB
+#define MAX_dB            120          // Table entries for 0...MAX_dB (normal max. values are 70...80 dB)
+
+#define MAX_ORDER               (BUTTER_ORDER > YULE_ORDER ? BUTTER_ORDER : YULE_ORDER)
+#define MAX_SAMPLES_PER_WINDOW  (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME)      // max. Samples per Time slice
+#define PINK_REF                64.82 //298640883795                              // calibration value
+
+Float_t          linprebuf [MAX_ORDER * 2];
+Float_t*         linpre;                                          // left input samples, with pre-buffer
+Float_t          lstepbuf  [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+Float_t*         lstep;                                           // left "first step" (i.e. post first filter) samples
+Float_t          loutbuf   [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+Float_t*         lout;                                            // left "out" (i.e. post second filter) samples
+Float_t          rinprebuf [MAX_ORDER * 2];
+Float_t*         rinpre;                                          // right input samples ...
+Float_t          rstepbuf  [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+Float_t*         rstep;
+Float_t          routbuf   [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+Float_t*         rout;
+unsigned int              sampleWindow;                                    // number of samples required to reach number of milliseconds required for RMS window
+unsigned long    totsamp;
+double           lsum;
+double           rsum;
+int              freqindex;
+int              first;
+static Uint32_t  A [(size_t)(STEPS_per_dB * MAX_dB)];
+static Uint32_t  B [(size_t)(STEPS_per_dB * MAX_dB)];
+
+// for each filter:
+// [0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz
+
+//#pragma warning ( disable : 4305 )
+
+const Float_t  AYule [9] [11] = {
+    { 1., -3.84664617118067,  7.81501653005538,-11.34170355132042, 13.05504219327545,-12.28759895145294,  9.48293806319790, -5.87257861775999,  2.75465861874613, -0.86984376593551, 0.13919314567432 },
+    { 1., -3.47845948550071,  6.36317777566148, -8.54751527471874,  9.47693607801280, -8.81498681370155,  6.85401540936998, -4.39470996079559,  2.19611684890774, -0.75104302451432, 0.13149317958808 },
+    { 1., -2.37898834973084,  2.84868151156327, -2.64577170229825,  2.23697657451713, -1.67148153367602,  1.00595954808547, -0.45953458054983,  0.16378164858596, -0.05032077717131, 0.02347897407020 },
+    { 1., -1.61273165137247,  1.07977492259970, -0.25656257754070, -0.16276719120440, -0.22638893773906,  0.39120800788284, -0.22138138954925,  0.04500235387352,  0.02005851806501, 0.00302439095741 },
+    { 1., -1.49858979367799,  0.87350271418188,  0.12205022308084, -0.80774944671438,  0.47854794562326, -0.12453458140019, -0.04067510197014,  0.08333755284107, -0.04237348025746, 0.02977207319925 },
+    { 1., -0.62820619233671,  0.29661783706366, -0.37256372942400,  0.00213767857124, -0.42029820170918,  0.22199650564824,  0.00613424350682,  0.06747620744683,  0.05784820375801, 0.03222754072173 },
+    { 1., -1.04800335126349,  0.29156311971249, -0.26806001042947,  0.00819999645858,  0.45054734505008, -0.33032403314006,  0.06739368333110, -0.04784254229033,  0.01639907836189, 0.01807364323573 },
+    { 1., -0.51035327095184, -0.31863563325245, -0.20256413484477,  0.14728154134330,  0.38952639978999, -0.23313271880868, -0.05246019024463, -0.02505961724053,  0.02442357316099, 0.01818801111503 },
+    { 1., -0.25049871956020, -0.43193942311114, -0.03424681017675, -0.04678328784242,  0.26408300200955,  0.15113130533216, -0.17556493366449, -0.18823009262115,  0.05477720428674, 0.04704409688120 }
+};
+
+const Float_t  BYule [9] [11] = {
+    { 0.03857599435200, -0.02160367184185, -0.00123395316851, -0.00009291677959, -0.01655260341619,  0.02161526843274, -0.02074045215285,  0.00594298065125,  0.00306428023191,  0.00012025322027,  0.00288463683916 },
+    { 0.05418656406430, -0.02911007808948, -0.00848709379851, -0.00851165645469, -0.00834990904936,  0.02245293253339, -0.02596338512915,  0.01624864962975, -0.00240879051584,  0.00674613682247, -0.00187763777362 },
+    { 0.15457299681924, -0.09331049056315, -0.06247880153653,  0.02163541888798, -0.05588393329856,  0.04781476674921,  0.00222312597743,  0.03174092540049, -0.01390589421898,  0.00651420667831, -0.00881362733839 },
+    { 0.30296907319327, -0.22613988682123, -0.08587323730772,  0.03282930172664, -0.00915702933434, -0.02364141202522, -0.00584456039913,  0.06276101321749, -0.00000828086748,  0.00205861885564, -0.02950134983287 },
+    { 0.33642304856132, -0.25572241425570, -0.11828570177555,  0.11921148675203, -0.07834489609479, -0.00469977914380, -0.00589500224440,  0.05724228140351,  0.00832043980773, -0.01635381384540, -0.01760176568150 },
+    { 0.44915256608450, -0.14351757464547, -0.22784394429749, -0.01419140100551,  0.04078262797139, -0.12398163381748,  0.04097565135648,  0.10478503600251, -0.01863887810927, -0.03193428438915,  0.00541907748707 },
+    { 0.56619470757641, -0.75464456939302,  0.16242137742230,  0.16744243493672, -0.18901604199609,  0.30931782841830, -0.27562961986224,  0.00647310677246,  0.08647503780351, -0.03788984554840, -0.00588215443421 },
+    { 0.58100494960553, -0.53174909058578, -0.14289799034253,  0.17520704835522,  0.02377945217615,  0.15558449135573, -0.25344790059353,  0.01628462406333,  0.06920467763959, -0.03721611395801, -0.00749618797172 },
+    { 0.53648789255105, -0.42163034350696, -0.00275953611929,  0.04267842219415, -0.10214864179676,  0.14590772289388, -0.02459864859345, -0.11202315195388, -0.04060034127000,  0.04788665548180, -0.02217936801134 }
+};
+
+const Float_t  AButter [9] [3] = {
+    { 1., -1.97223372919527, 0.97261396931306 },
+    { 1., -1.96977855582618, 0.97022847566350 },
+    { 1., -1.95835380975398, 0.95920349965459 },
+    { 1., -1.95002759149878, 0.95124613669835 },
+    { 1., -1.94561023566527, 0.94705070426118 },
+    { 1., -1.92783286977036, 0.93034775234268 },
+    { 1., -1.91858953033784, 0.92177618768381 },
+    { 1., -1.91542108074780, 0.91885558323625 },
+    { 1., -1.88903307939452, 0.89487434461664 }
+};
+
+const Float_t  BButter [9] [3] = {
+    { 0.98621192462708, -1.97242384925416, 0.98621192462708 },
+    { 0.98500175787242, -1.97000351574484, 0.98500175787242 },
+    { 0.97938932735214, -1.95877865470428, 0.97938932735214 },
+    { 0.97531843204928, -1.95063686409857, 0.97531843204928 },
+    { 0.97316523498161, -1.94633046996323, 0.97316523498161 },
+    { 0.96454515552826, -1.92909031105652, 0.96454515552826 },
+    { 0.96009142950541, -1.92018285901082, 0.96009142950541 },
+    { 0.95856916599601, -1.91713833199203, 0.95856916599601 },
+    { 0.94597685600279, -1.89195371200558, 0.94597685600279 }
+};
+
+//#pragma warning ( default : 4305 )
+
+// When calling this procedure, make sure that ip[-order] and op[-order] point to real data!
+
+static void
+filter ( const Float_t* input, Float_t* output, size_t nSamples, const Float_t* a, const Float_t* b, size_t order )
+{
+    double  y;
+    size_t  i;
+    size_t  k;
+
+    for ( i = 0; i < nSamples; i++ ) {
+        y = input[i] * b[0];
+        for ( k = 1; k <= order; k++ )
+            y += input[i-k] * b[k] - output[i-k] * a[k];
+        output[i] = (Float_t)y;
+    }
+}
+
+// returns a INIT_GAIN_ANALYSIS_OK if successful, INIT_GAIN_ANALYSIS_ERROR if not
+
+int
+ResetSampleFrequency ( long samplefreq ) {
+    int  i;
+
+    // zero out initial values
+    for ( i = 0; i < MAX_ORDER; i++ )
+        linprebuf[i] = lstepbuf[i] = loutbuf[i] = rinprebuf[i] = rstepbuf[i] = routbuf[i] = 0.;
+
+    switch ( (int)(samplefreq) ) {
+        case 48000: freqindex = 0; break;
+        case 44100: freqindex = 1; break;
+        case 32000: freqindex = 2; break;
+        case 24000: freqindex = 3; break;
+        case 22050: freqindex = 4; break;
+        case 16000: freqindex = 5; break;
+        case 12000: freqindex = 6; break;
+        case 11025: freqindex = 7; break;
+        case  8000: freqindex = 8; break;
+        default:    return INIT_GAIN_ANALYSIS_ERROR;
+    }
+
+    sampleWindow = (int) ceil (samplefreq * RMS_WINDOW_TIME_FLOAT);
+
+    lsum         = 0.;
+    rsum         = 0.;
+    totsamp      = 0;
+
+    memset ( A, 0, sizeof(A) );
+
+	return INIT_GAIN_ANALYSIS_OK;
+}
+
+int
+InitGainAnalysis ( long samplefreq )
+{
+	if (ResetSampleFrequency(samplefreq) != INIT_GAIN_ANALYSIS_OK) {
+		return INIT_GAIN_ANALYSIS_ERROR;
+	}
+
+    linpre       = linprebuf + MAX_ORDER;
+    rinpre       = rinprebuf + MAX_ORDER;
+    lstep        = lstepbuf  + MAX_ORDER;
+    rstep        = rstepbuf  + MAX_ORDER;
+    lout         = loutbuf   + MAX_ORDER;
+    rout         = routbuf   + MAX_ORDER;
+
+    memset ( B, 0, sizeof(B) );
+
+    return INIT_GAIN_ANALYSIS_OK;
+}
+
+// returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not
+
+int
+AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels )
+{
+    const Float_t*  curleft;
+    const Float_t*  curright;
+    long            batchsamples;
+    long            cursamples;
+    long            cursamplepos;
+    int             i;
+
+    if ( num_samples == 0 )
+        return GAIN_ANALYSIS_OK;
+
+    cursamplepos = 0;
+    batchsamples = num_samples;
+
+    switch ( num_channels) {
+    case  1: right_samples = left_samples;
+    case  2: break;
+    default: return GAIN_ANALYSIS_ERROR;
+    }
+
+    if ( num_samples < MAX_ORDER ) {
+        memcpy ( linprebuf + MAX_ORDER, left_samples , num_samples * sizeof(Float_t) );
+        memcpy ( rinprebuf + MAX_ORDER, right_samples, num_samples * sizeof(Float_t) );
+    }
+    else {
+        memcpy ( linprebuf + MAX_ORDER, left_samples,  MAX_ORDER   * sizeof(Float_t) );
+        memcpy ( rinprebuf + MAX_ORDER, right_samples, MAX_ORDER   * sizeof(Float_t) );
+    }
+
+    while ( batchsamples > 0 ) {
+        cursamples = batchsamples > sampleWindow-totsamp  ?  sampleWindow - totsamp  :  batchsamples;
+        if ( cursamplepos < MAX_ORDER ) {
+            curleft  = linpre+cursamplepos;
+            curright = rinpre+cursamplepos;
+            if (cursamples > MAX_ORDER - cursamplepos )
+                cursamples = MAX_ORDER - cursamplepos;
+        }
+        else {
+            curleft  = left_samples  + cursamplepos;
+            curright = right_samples + cursamplepos;
+        }
+
+        filter ( curleft , lstep + totsamp, cursamples, AYule[freqindex], BYule[freqindex], YULE_ORDER );
+        filter ( curright, rstep + totsamp, cursamples, AYule[freqindex], BYule[freqindex], YULE_ORDER );
+
+        filter ( lstep + totsamp, lout + totsamp, cursamples, AButter[freqindex], BButter[freqindex], BUTTER_ORDER );
+        filter ( rstep + totsamp, rout + totsamp, cursamples, AButter[freqindex], BButter[freqindex], BUTTER_ORDER );
+
+        for ( i = 0; i < cursamples; i++ ) {             // Get the squared values
+            lsum += lout [totsamp+i] * lout [totsamp+i];
+            rsum += rout [totsamp+i] * rout [totsamp+i];
+        }
+
+        batchsamples -= cursamples;
+        cursamplepos += cursamples;
+        totsamp      += cursamples;
+        if ( totsamp == sampleWindow ) {  // Get the Root Mean Square (RMS) for this set of samples
+            double  val  = STEPS_per_dB * 10. * log10 ( (lsum+rsum) / totsamp * 0.5 + 1.e-37 );
+            int     ival = (int) val;
+            if ( ival <                     0 ) ival = 0;
+            if ( ival >= sizeof(A)/sizeof(*A) ) ival = sizeof(A)/sizeof(*A) - 1;
+            A [ival]++;
+            lsum = rsum = 0.;
+            memmove ( loutbuf , loutbuf  + totsamp, MAX_ORDER * sizeof(Float_t) );
+            memmove ( routbuf , routbuf  + totsamp, MAX_ORDER * sizeof(Float_t) );
+            memmove ( lstepbuf, lstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) );
+            memmove ( rstepbuf, rstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) );
+            totsamp = 0;
+        }
+        if ( totsamp > sampleWindow )   // somehow I really screwed up: Error in programming! Contact author about totsamp > sampleWindow
+            return GAIN_ANALYSIS_ERROR;
+    }
+    if ( num_samples < MAX_ORDER ) {
+        memmove ( linprebuf,                           linprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) );
+        memmove ( rinprebuf,                           rinprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) );
+        memcpy  ( linprebuf + MAX_ORDER - num_samples, left_samples,          num_samples             * sizeof(Float_t) );
+        memcpy  ( rinprebuf + MAX_ORDER - num_samples, right_samples,         num_samples             * sizeof(Float_t) );
+    }
+    else {
+        memcpy  ( linprebuf, left_samples  + num_samples - MAX_ORDER, MAX_ORDER * sizeof(Float_t) );
+        memcpy  ( rinprebuf, right_samples + num_samples - MAX_ORDER, MAX_ORDER * sizeof(Float_t) );
+    }
+
+    return GAIN_ANALYSIS_OK;
+}
+
+
+static Float_t
+analyzeResult ( Uint32_t* Array, size_t len )
+{
+    Uint32_t  elems;
+    Int32_t   upper;
+    size_t    i;
+
+    elems = 0;
+    for ( i = 0; i < len; i++ )
+        elems += Array[i];
+    if ( elems == 0 )
+        return GAIN_NOT_ENOUGH_SAMPLES;
+
+    upper = (Int32_t) ceil (elems * (1. - RMS_PERCENTILE));
+    for ( i = len; i-- > 0; ) {
+        if ( (upper -= Array[i]) <= 0 )
+            break;
+    }
+
+    return (Float_t) ((Float_t)PINK_REF - (Float_t)i / (Float_t)STEPS_per_dB);
+}
+
+
+Float_t
+GetTitleGain ( void )
+{
+    Float_t  retval;
+    int    i;
+
+    retval = analyzeResult ( A, sizeof(A)/sizeof(*A) );
+
+    for ( i = 0; i < sizeof(A)/sizeof(*A); i++ ) {
+        B[i] += A[i];
+        A[i]  = 0;
+    }
+
+    for ( i = 0; i < MAX_ORDER; i++ )
+        linprebuf[i] = lstepbuf[i] = loutbuf[i] = rinprebuf[i] = rstepbuf[i] = routbuf[i] = 0.f;
+
+    totsamp = 0;
+    lsum    = rsum = 0.;
+    return retval;
+}
+
+
+Float_t
+GetAlbumGain ( void )
+{
+    return analyzeResult ( B, sizeof(B)/sizeof(*B) );
+}
+
+/* end of gain_analysis.c */

grip-3.4.3.tar.gz/src/gain_analysis.h -> grip-3.9.0.tar.gz/src/gain_analysis.h Changed

@@ -1,56 +1,56 @@
-/*
- *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
- *  Copyright (C) 2001 David Robinson and Glen Sawyer
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser 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
- *
- *  concept and filter values by David Robinson (David@Robinson.org)
- *    -- blame him if you think the idea is flawed
- *  coding by Glen Sawyer (glensawyer@hotmail.com) 442 N 700 E, Provo, UT 84606 USA
- *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
- *
- *  For an explanation of the concepts and the basic algorithms involved, go to:
- *    http://www.replaygain.org/
- */
-
-#ifndef GAIN_ANALYSIS_H
-#define GAIN_ANALYSIS_H
-
-#include <stddef.h>
-
-#define GAIN_NOT_ENOUGH_SAMPLES  -24601
-#define GAIN_ANALYSIS_ERROR           0
-#define GAIN_ANALYSIS_OK              1
-
-#define INIT_GAIN_ANALYSIS_ERROR      0
-#define INIT_GAIN_ANALYSIS_OK         1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef double  Float_t;         // Type used for filtering
-
-int     InitGainAnalysis ( long samplefreq );
-int     AnalyzeSamples   ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
-int		ResetSampleFrequency ( long samplefreq );
-Float_t   GetTitleGain     ( void );
-Float_t   GetAlbumGain     ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GAIN_ANALYSIS_H */
+/*
+ *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+ *  Copyright (C) 2001 David Robinson and Glen Sawyer
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  concept and filter values by David Robinson (David@Robinson.org)
+ *    -- blame him if you think the idea is flawed
+ *  coding by Glen Sawyer (glensawyer@hotmail.com) 442 N 700 E, Provo, UT 84606 USA
+ *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+ *
+ *  For an explanation of the concepts and the basic algorithms involved, go to:
+ *    http://www.replaygain.org/
+ */
+
+#ifndef GAIN_ANALYSIS_H
+#define GAIN_ANALYSIS_H
+
+#include <stddef.h>
+
+#define GAIN_NOT_ENOUGH_SAMPLES  -24601
+#define GAIN_ANALYSIS_ERROR           0
+#define GAIN_ANALYSIS_OK              1
+
+#define INIT_GAIN_ANALYSIS_ERROR      0
+#define INIT_GAIN_ANALYSIS_OK         1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef double  Float_t;         // Type used for filtering
+
+int     InitGainAnalysis ( long samplefreq );
+int     AnalyzeSamples   ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
+int		ResetSampleFrequency ( long samplefreq );
+Float_t   GetTitleGain     ( void );
+Float_t   GetAlbumGain     ( void );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GAIN_ANALYSIS_H */

grip-3.4.3.tar.gz/src/grip.c -> grip-3.9.0.tar.gz/src/grip.c Changed

grip-3.4.3.tar.gz/src/grip.h -> grip-3.9.0.tar.gz/src/grip.h Changed

grip-3.4.3.tar.gz/src/grip_id3.h -> grip-3.9.0.tar.gz/src/grip_id3.h Changed

grip-3.4.3.tar.gz/src/gripcfg.c -> grip-3.9.0.tar.gz/src/gripcfg.c Changed

grip-3.4.3.tar.gz/src/gripcfg.h -> grip-3.9.0.tar.gz/src/gripcfg.h Changed

grip-3.4.3.tar.gz/src/id3.c -> grip-3.9.0.tar.gz/src/id3.c Changed

@@ -16,7 +16,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
  * USA
  */
 
@@ -33,7 +33,6 @@
 
 ID3Genre id3_genres[] = {
   {"Alternative",20},
-  {"Anime",146},
   {"Blues",0},
   {"Classical",32},
   {"Country",2},
@@ -45,27 +44,37 @@
   {"Reggae",16},
   {"Rock",17},
   {"Other",12},
+  {"Abstract",148},
   {"Acapella",123},
-  {"Acid",34},
   {"Acid Jazz",74},
   {"Acid Punk",73},
+  {"Acid",34},
   {"Acoustic",99},
   {"AlternRock",40},
   {"Ambient",26},
+  {"Anime",145},
+  {"Art Rock",149},
+  {"Audio Theatre",184},
+  {"Audiobook",183},
   {"Avantgarde",90},
   {"Ballad",116},
+  {"Baroque",150},
   {"Bass",41},
   {"Beat",135},
   {"Bebob",85},
+  {"Bhangra",151},
   {"Big Band",96},
+  {"Big Beat",152},
   {"Black Metal",138},
   {"Bluegrass",89},
   {"Booty Bass",107},
+  {"Breakbeat",153},
   {"BritPop",132},
   {"Cabaret",65},
   {"Celtic",88},
   {"Chamber Music",104},
   {"Chanson",102},
+  {"Chillout",154},
   {"Chorus",97},
   {"Christian Gangsta Rap",136},
   {"Christian Rap",61},
@@ -77,76 +86,108 @@
   {"Contemporary Christian",140},
   {"Crossover",139},
   {"Cult",58},
-  {"Dance",3},
   {"Dance Hall",125},
+  {"Dance",3},
   {"Darkwave",50},
   {"Death Metal",22},
   {"Disco",4},
+  {"Downtempo",155},
   {"Dream",55},
   {"Drum & Bass",127},
   {"Drum Solo",122},
+  {"Dub",156},
+  {"Dubstep",189},
   {"Duet",120},
+  {"EBM",157},
   {"Easy Listening",98},
+  {"Eclectic",158},
+  {"Electro",159},
+  {"Electroclash",160},
   {"Electronic",52},
+  {"Emo",161},
   {"Ethnic",48},
-  {"Eurodance",54},
-  {"Euro-house",124},
   {"Euro-Techno",25},
+  {"Euro-house",124},
+  {"Eurodance",54},
+  {"Experimental",162},
   {"Fast Fusion",84},
-  {"Folklore",115},
   {"Folk/Rock",81},
+  {"Folklore",115},
   {"Freestyle",119},
   {"Funk",5},
   {"Fusion",30},
+  {"G-Funk",188},
   {"Game",36},
   {"Gangsta",59},
+  {"Garage",163},
+  {"Garage Rock",190},
+  {"Global",164},
   {"Goa",126},
   {"Gospel",38},
-  {"Gothic",49},
   {"Gothic Rock",91},
+  {"Gothic",49},
   {"Grunge",6},
-  {"Hardcore",129},
   {"Hard Rock",79},
+  {"Hardcore",129},
   {"Heavy Metal",137},
   {"Hip-Hop",7},
   {"House",35},
   {"Humour",100},
+  {"IDM",165},
+  {"Illbient",166},
+  {"Indie Rock",187},
   {"Indie",131},
   {"Industrial",19},
-  {"Instrumental",33},
+  {"Industro-Goth",167},
   {"Instrumental Pop",46},
   {"Instrumental Rock",47},
+  {"Instrumental",33},
+  {"JPop",146},
+  {"Jam Band",168},
   {"Jazz+Funk",29},
-  {"JPop",145},
   {"Jungle",63},
+  {"Krautrock",169},
   {"Latin",86},
+  {"Leftfield",170},
   {"Lo-Fi",71},
+  {"Lounge",171},
+  {"Math Rock",172},
   {"Meditative",45},
   {"Merengue",142},
   {"Musical",77},
   {"National Folk",82},
   {"Native American",64},
   {"Negerpunk",133},
+  {"Neoclassical",182},
+  {"Neue Deutsche Welle",185},
   {"New Age",10},
+  {"New Romantic",173},
   {"New Wave",66},
   {"Noise",39},
+  {"Nu-Breakz",174},
   {"Oldies",11},
   {"Opera",103},
+  {"Podcast",186},
   {"Polka",75},
   {"Polsk Punk",134},
   {"Pop-Folk",53},
   {"Pop/Funk",62},
   {"Porn Groove",109},
+  {"Post-Punk",175},
+  {"Post-Rock",176},
   {"Power Ballad",117},
   {"Pranks",23},
   {"Primus",108},
   {"Progressive Rock",92},
-  {"Psychadelic",67},
+  {"Psybient",191},
+  {"Psychedelic",67},
   {"Psychedelic Rock",93},
-  {"Punk",43},
+  {"Psytrance",177},
   {"Punk Rock",121},
-  {"Rave",68},
+  {"Punk",43},
   {"R&B",14},
+  {"Rave",68},
+  {"Reggaestep",192},
   {"Retro",76},
   {"Revival",87},
   {"Rhythmic Soul",118},
@@ -154,6 +195,7 @@
   {"Salsa",143},
   {"Samba",114},
   {"Satire",110},
+  {"Shoegaze",178},
   {"Showtunes",69},
   {"Ska",21},
   {"Slow Jam",111},
@@ -163,6 +205,7 @@
   {"Sound Clip",37},
   {"Soundtrack",24},
   {"Southern Rock",56},
+  {"Space Rock",179},
   {"Space",44},
   {"Speech",101},
   {"Swing",83},
@@ -173,14 +216,16 @@
   {"Techno",18},
   {"Techno-Industrial",51},
   {"Terror",130},
+  {"Thrash Metal",144},
   {"Top 40",60},
   {"Trailer",70},
   {"Trance",31},
-  {"Trash Metal",144},
   {"Tribal",72},
   {"Trip-Hop",27},
+  {"Trop Rock",180},
   {"Vocal",28},
-  {NULL,145}
+  {"World Music",181},
+  {NULL,193}
 };
 
 /* This array maps CDDB_ genre numbers to closest id3 genre */
@@ -236,7 +281,6 @@
   ID3Frame *frames[ NUM_FRAMES ];
   int i;
   gboolean retval = TRUE;
-  luint frm_offset;
   mode_t mask;
   char *conv_str;
   gsize rb,wb;
@@ -244,7 +288,7 @@
   tag = ID3Tag_New();
 
   if(tag) {
-    frm_offset=ID3Tag_Link(tag,filename);
+    ID3Tag_Link(tag,filename);
     /* GRR. No error. */
     
     for ( i = 0; i < NUM_FRAMES; i++ ) {
@@ -253,7 +297,7 @@
       if ( frames[ i ] ) {
 	char *c_data = NULL;
 	char gen[ 6 ] = "(   )"; /* max unsigned char: 255 */
-	char trk[ 3 ] = "  "; /* max CDDA tracks: 99 */
+	char trk[ 4 ] = "  "; /* max CDDA tracks: 99 */
 	
 	switch( frameids[ i ] ) {
 	case ID3FID_TITLE:
@@ -283,7 +327,7 @@
 	  
 	case ID3FID_TRACKNUM:
 	  c_data = trk;
-	  snprintf( trk, 3, "%d", tracknum );
+	  snprintf( trk, 4, "%d", tracknum );
 	  break;
 	  
 	default: